diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2021-11-30 10:21:38 +0100 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2021-12-07 17:21:40 +0100 |
| commit | 3029164f9a99dcb82d7532d78de4226a98d02fdf (patch) | |
| tree | ec5392e222f21487d5a97c8b62ad7eb8796a1f79 | |
| parent | ocamlPackages.fieldslib: remove at 109.20.03 & 113.33.03 (diff) | |
| download | nixpkgs-3029164f9a99dcb82d7532d78de4226a98d02fdf.tar.gz | |
ocamlPackages.typerep: remove at 112.24.00 & 113.33.03
(cherry picked from commit f982e669db56728faec8b7986fe5b42605872a86)
| -rw-r--r-- | pkgs/development/ocaml-modules/janestreet/typerep.nix | 20 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/typerep/default.nix | 25 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 9 |
3 files changed, 0 insertions, 54 deletions
diff --git a/pkgs/development/ocaml-modules/janestreet/typerep.nix b/pkgs/development/ocaml-modules/janestreet/typerep.nix deleted file mode 100644 index 692c2d2286fb..000000000000 --- a/pkgs/development/ocaml-modules/janestreet/typerep.nix +++ /dev/null @@ -1,20 +0,0 @@ -{lib, buildOcamlJane, type_conv}: - -buildOcamlJane { - pname = "typerep"; - version = "113.33.03"; - - minimumSupportedOcamlVersion = "4.00"; - - hash = "1ss34nq20vfgx8hwi5sswpmn3my9lvrpdy5dkng746xchwi33ar7"; - - propagatedBuildInputs = [ type_conv ]; - - meta = with lib; { - homepage = "https://github.com/janestreet/typerep"; - description = "Runtime types for OCaml (beta version)"; - license = licenses.asl20; - maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; - }; - -} diff --git a/pkgs/development/ocaml-modules/typerep/default.nix b/pkgs/development/ocaml-modules/typerep/default.nix deleted file mode 100644 index c51d28f9e19b..000000000000 --- a/pkgs/development/ocaml-modules/typerep/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildOcaml, fetchFromGitHub, type_conv }: - -buildOcaml rec { - pname = "typerep"; - version = "112.24.00"; - - minimumSupportedOcamlVersion = "4.00"; - - src = fetchFromGitHub { - owner = "janestreet"; - repo = "typerep"; - rev = version; - sha256 = "sha256-XCdUZp9Buwmo6qPYAoPD2P/gUgyWHTR7boyecBPKlho="; - }; - - propagatedBuildInputs = [ type_conv ]; - - meta = with lib; { - homepage = "https://github.com/janestreet/typerep"; - description = "Runtime types for OCaml (beta version)"; - license = licenses.asl20; - maintainers = [ maintainers.ericbmerritt ]; - }; - -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 5974d89187b7..a119851b88f8 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1347,8 +1347,6 @@ let twt = callPackage ../development/ocaml-modules/twt { }; - typerep_p4 = callPackage ../development/ocaml-modules/typerep { }; - uchar = callPackage ../development/ocaml-modules/uchar { }; uecc = callPackage ../development/ocaml-modules/uecc { }; @@ -1580,13 +1578,6 @@ let # Core sublibs - typerep = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.typerep - else if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/typerep.nix {} - else typerep_p4; - sexplib = if lib.versionOlder "4.03" ocaml.version then janeStreet.sexplib |