From c408cfdf50a7f152d1e695dedba0321e8ed4268e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 30 Nov 2021 10:21:41 +0100 Subject: [PATCH] ocamlPackages.variantslib: remove at 109.15.03 & 113.33.03 --- .../ocaml-modules/janestreet/variantslib.nix | 19 ------------- .../ocaml-modules/variantslib/default.nix | 28 ------------------- pkgs/top-level/ocaml-packages.nix | 9 ------ 3 files changed, 56 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/janestreet/variantslib.nix delete mode 100644 pkgs/development/ocaml-modules/variantslib/default.nix diff --git a/pkgs/development/ocaml-modules/janestreet/variantslib.nix b/pkgs/development/ocaml-modules/janestreet/variantslib.nix deleted file mode 100644 index dfb330f49d58..000000000000 --- a/pkgs/development/ocaml-modules/janestreet/variantslib.nix +++ /dev/null @@ -1,19 +0,0 @@ -{lib, buildOcamlJane, type_conv}: - -buildOcamlJane { - pname = "variantslib"; - version = "113.33.03"; - - minimumSupportedOcamlVersion = "4.00"; - - hash = "1hv0f75msrryxsl6wfnbmhc0n8kf7qxs5f82ry3b8ldb44s3wigp"; - - propagatedBuildInputs = [ type_conv ]; - - meta = with lib; { - homepage = "https://github.com/janestreet/variantslib"; - description = "OCaml variants as first class values"; - license = licenses.asl20; - maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/development/ocaml-modules/variantslib/default.nix b/pkgs/development/ocaml-modules/variantslib/default.nix deleted file mode 100644 index 25d379f51648..000000000000 --- a/pkgs/development/ocaml-modules/variantslib/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, buildOcaml, ocaml, fetchFromGitHub, type_conv }: - -if lib.versionAtLeast ocaml.version "4.06" -then throw "variantslib-109.15.03 is not available for OCaml ${ocaml.version}" -else - -buildOcaml rec { - pname = "variantslib"; - version = "109.15.03"; - - minimumSupportedOcamlVersion = "4.00"; - - src = fetchFromGitHub { - owner = "janestreet"; - repo = "variantslib"; - rev = version; - sha256 = "sha256-pz3i3od2CqKSrm7uTQ2jdidFFwx7m7g1QuG4UdLk01k="; - }; - - propagatedBuildInputs = [ type_conv ]; - - meta = with lib; { - homepage = "https://github.com/janestreet/variantslib"; - description = "OCaml variants as first class values"; - license = licenses.asl20; - maintainers = [ maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index a119851b88f8..6049da75a437 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1374,8 +1374,6 @@ let uuuu = callPackage ../development/ocaml-modules/uuuu { }; - variantslib_p4 = callPackage ../development/ocaml-modules/variantslib { }; - vchan = callPackage ../development/ocaml-modules/vchan { }; vg = callPackage ../development/ocaml-modules/vg { }; @@ -1585,13 +1583,6 @@ let then callPackage ../development/ocaml-modules/janestreet/sexplib.nix {} else null; - variantslib = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.variantslib - else if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/variantslib.nix {} - else variantslib_p4; - core_bench = if lib.versionOlder "4.03" ocaml.version then janeStreet.core_bench else