diff options
| author | Théo Zimmermann <theo.zimmermann@univ-paris-diderot.fr> | 2018-10-10 17:27:19 +0200 |
|---|---|---|
| committer | Théo Zimmermann <theo.zimmermann@univ-paris-diderot.fr> | 2018-10-10 19:44:54 +0200 |
| commit | 2fdd38ed2df0f6df08154a8982c87d77b9ca7b18 (patch) | |
| tree | f9efce1d42b14e4d790c27ed59a23f94ffd98bbf /pkgs/top-level | |
| parent | eaf0de5985ef1316323c7da4026ed268399a3589 (diff) | |
| download | nixlib-2fdd38ed2df0f6df08154a8982c87d77b9ca7b18.tar nixlib-2fdd38ed2df0f6df08154a8982c87d77b9ca7b18.tar.gz nixlib-2fdd38ed2df0f6df08154a8982c87d77b9ca7b18.tar.bz2 nixlib-2fdd38ed2df0f6df08154a8982c87d77b9ca7b18.tar.lz nixlib-2fdd38ed2df0f6df08154a8982c87d77b9ca7b18.tar.xz nixlib-2fdd38ed2df0f6df08154a8982c87d77b9ca7b18.tar.zst nixlib-2fdd38ed2df0f6df08154a8982c87d77b9ca7b18.zip | |
camlp5_transitional: remove in favor of camlp5 (strict)
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/coq-packages.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 16 |
3 files changed, 6 insertions, 17 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7596a49bae29..f6db3528430e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21277,9 +21277,7 @@ with pkgs; libpoly = callPackage ../applications/science/logic/poly {}; - prooftree = ocamlPackages.callPackage ../applications/science/logic/prooftree { - camlp5 = ocamlPackages.camlp5_strict; - }; + 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 0840aa66100b..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 { }; @@ -1042,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); |