diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2021-11-30 10:21:30 +0100 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2021-12-07 17:21:40 +0100 |
| commit | b3f426e083c89734d9ad3cc479c20f02a98532ef (patch) | |
| tree | 5147c83f8c906cc4c8352f27ad231bb5bd20577d | |
| parent | Merge pull request #149332 from NixOS/backport-147537-to-release-21.11 (diff) | |
| download | nixpkgs-b3f426e083c89734d9ad3cc479c20f02a98532ef.tar.gz | |
ocamlPackages.bin_prot: remove at 112.24.00 & 113.33.03
(cherry picked from commit 397d3302a96cb07d763b1554751baf7644e1af8d)
| -rw-r--r-- | pkgs/development/ocaml-modules/bin_prot/default.nix | 28 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/janestreet/bin_prot.nix | 17 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 9 |
3 files changed, 0 insertions, 54 deletions
diff --git a/pkgs/development/ocaml-modules/bin_prot/default.nix b/pkgs/development/ocaml-modules/bin_prot/default.nix deleted file mode 100644 index 3aa7cf0ec134..000000000000 --- a/pkgs/development/ocaml-modules/bin_prot/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, buildOcaml, fetchurl, ocaml, type_conv }: - -if lib.versionAtLeast ocaml.version "4.06" -then throw "bin_prot-112.24.00 is not available for OCaml ${ocaml.version}" -else - -buildOcaml rec { - pname = "bin_prot"; - version = "112.24.00"; - - minimumSupportedOcamlVersion = "4.00"; - - src = fetchurl { - url = "https://github.com/janestreet/bin_prot/archive/${version}.tar.gz"; - sha256 = "dc0c978a825c7c123990af3317637c218f61079e6f35dc878260651084f1adb4"; - }; - - propagatedBuildInputs = [ type_conv ]; - - hasSharedObjects = true; - - meta = with lib; { - homepage = "https://github.com/janestreet/bin_prot"; - description = "Binary protocol generator "; - license = licenses.asl20; - maintainers = [ maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/bin_prot.nix b/pkgs/development/ocaml-modules/janestreet/bin_prot.nix deleted file mode 100644 index d90d91cc229e..000000000000 --- a/pkgs/development/ocaml-modules/janestreet/bin_prot.nix +++ /dev/null @@ -1,17 +0,0 @@ -{lib, buildOcamlJane, type_conv}: - -buildOcamlJane { - pname = "bin_prot"; - version = "113.33.03"; - minimumSupportedOcamlVersion = "4.02"; - hash = "0jlarpfby755j0kikz6vnl1l6q0ga09b9zrlw6i84r22zchnqdsh"; - - propagatedBuildInputs = [ type_conv ]; - - meta = with lib; { - homepage = "https://github.com/janestreet/bin_prot"; - description = "Binary protocol generator "; - license = licenses.asl20; - maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index be9c1232e4cd..d719a965b623 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -135,8 +135,6 @@ let then callPackage ../development/ocaml-modules/biniou { } else callPackage ../development/ocaml-modules/biniou/1.0.nix { }; - bin_prot_p4 = callPackage ../development/ocaml-modules/bin_prot { }; - bisect_ppx = callPackage ../development/ocaml-modules/bisect_ppx { }; ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { }; @@ -1612,13 +1610,6 @@ let then callPackage ../development/ocaml-modules/janestreet/variantslib.nix {} else variantslib_p4; - bin_prot = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.bin_prot - else if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/bin_prot.nix {} - else bin_prot_p4; - core_bench = if lib.versionOlder "4.03" ocaml.version then janeStreet.core_bench else |