From edf81049b1e89ed31f17722429e77fcba87f31c3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 20 Mar 2023 06:40:08 +0100 Subject: [PATCH] ocaml-ng.ocamlPackages_4_01_0.csv: remove at 1.5 --- pkgs/development/ocaml-modules/csv/1.5.nix | 38 ---------------------- pkgs/top-level/ocaml-packages.nix | 5 +-- 2 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/csv/1.5.nix diff --git a/pkgs/development/ocaml-modules/csv/1.5.nix b/pkgs/development/ocaml-modules/csv/1.5.nix deleted file mode 100644 index ef4ae4484d833..0000000000000 --- a/pkgs/development/ocaml-modules/csv/1.5.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchzip, ocaml, findlib, ocamlbuild }: - -stdenv.mkDerivation rec { - pname = "ocaml${ocaml.version}-csv"; - version = "1.5"; - - src = fetchzip { - url = "https://github.com/Chris00/ocaml-csv/releases/download/${version}/csv-${version}.tar.gz"; - sha256 = "1ca7jgg58j24pccs5fshis726s06fdcjshnwza5kwxpjgdbvc63g"; - }; - - nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - - strictDeps = true; - - createFindlibDestdir = true; - - configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests"; - - buildPhase = "ocaml setup.ml -build"; - - doCheck = true; - checkPhase = "ocaml setup.ml -test"; - - installPhase = '' - runHook preInstall - ocaml setup.ml -install - runHook postInstall - ''; - - meta = with lib; { - description = "A pure OCaml library to read and write CSV files"; - homepage = "https://github.com/Chris00/ocaml-csv"; - license = licenses.lgpl21; - maintainers = [ maintainers.vbgl ]; - inherit (ocaml.meta) platforms; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 28e3db6d64c99..32b96e2dbcc32 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -265,10 +265,7 @@ let cstruct-unix = callPackage ../development/ocaml-modules/cstruct/unix.nix {}; - csv = - if lib.versionAtLeast ocaml.version "4.2" - then callPackage ../development/ocaml-modules/csv { } - else callPackage ../development/ocaml-modules/csv/1.5.nix { }; + csv = callPackage ../development/ocaml-modules/csv { }; csv-lwt = callPackage ../development/ocaml-modules/csv/lwt.nix { };