diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-10-11 00:31:28 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-11 00:31:28 +0100 |
commit | c45a6fa041d798755c87cc0092fdb3f0bb775f02 (patch) | |
tree | 20e1335ec81caf475abadfcbafef99bb4a704815 /pkgs/top-level | |
parent | bde4483d1336333f7c0bcd099a110dd8954c539e (diff) | |
parent | 2fdd38ed2df0f6df08154a8982c87d77b9ca7b18 (diff) | |
download | nixlib-c45a6fa041d798755c87cc0092fdb3f0bb775f02.tar nixlib-c45a6fa041d798755c87cc0092fdb3f0bb775f02.tar.gz nixlib-c45a6fa041d798755c87cc0092fdb3f0bb775f02.tar.bz2 nixlib-c45a6fa041d798755c87cc0092fdb3f0bb775f02.tar.lz nixlib-c45a6fa041d798755c87cc0092fdb3f0bb775f02.tar.xz nixlib-c45a6fa041d798755c87cc0092fdb3f0bb775f02.tar.zst nixlib-c45a6fa041d798755c87cc0092fdb3f0bb775f02.zip |
Merge pull request #48159 from Zimmi48/remove-camlp5-transitional
Remove camlp5 transitional
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 5 | ||||
-rw-r--r-- | pkgs/top-level/coq-packages.nix | 3 | ||||
-rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 20 |
3 files changed, 6 insertions, 22 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9978b2969c91..3ef3780f9e7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21276,10 +21276,7 @@ with pkgs; libpoly = callPackage ../applications/science/logic/poly {}; - prooftree = (with ocaml-ng.ocamlPackages_4_01_0; - callPackage ../applications/science/logic/prooftree { - camlp5 = camlp5_transitional; - }); + prooftree = ocamlPackages.callPackage ../applications/science/logic/prooftree { }; prover9 = callPackage ../applications/science/logic/prover9 { }; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 305d9ba351ba..ca367aeb0d1a 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -56,8 +56,7 @@ in rec { filterCoqPackages coq self; coq_8_4 = callPackage ../applications/science/logic/coq/8.4.nix { - inherit (ocamlPackages_4_02) ocaml findlib lablgtk; - camlp5 = ocamlPackages_4_02.camlp5_transitional; + inherit (ocamlPackages_4_02) ocaml findlib lablgtk camlp5; }; coq_8_5 = callPackage ../applications/science/logic/coq { ocamlPackages = ocamlPackages_4_05; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 5f6d6fc9bc1d..c9df0f908ee2 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -88,15 +88,10 @@ let then callPackage ../development/tools/ocaml/camlp4 { } else null; - camlp5_6_strict = callPackage ../development/tools/ocaml/camlp5 { }; + camlp5 = callPackage ../development/tools/ocaml/camlp5 { }; - camlp5_6_transitional = callPackage ../development/tools/ocaml/camlp5 { - transitional = true; - }; - - camlp5_strict = camlp5_6_strict; - - camlp5_transitional = camlp5_6_transitional; + # Compatibility alias + camlp5_strict = camlp5; camlpdf = callPackage ../development/ocaml-modules/camlpdf { }; @@ -592,10 +587,6 @@ let ulex = callPackage ../development/ocaml-modules/ulex { }; - ulex08 = callPackage ../development/ocaml-modules/ulex/0.8 { - camlp5 = camlp5_transitional; - }; - textutils_p4 = callPackage ../development/ocaml-modules/textutils { }; tls = callPackage ../development/ocaml-modules/tls { @@ -1046,10 +1037,7 @@ let enableX11 = config.unison.enableX11 or true; }; - hol_light = callPackage ../applications/science/logic/hol_light { - inherit num; - camlp5 = camlp5_strict; - }; + hol_light = callPackage ../applications/science/logic/hol_light { }; }; in (ocamlPackages.janeStreet // ocamlPackages); |