summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Maurer <matthew.r.maurer@gmail.com>2016-09-13 22:03:10 -0400
committerMatthew Maurer <matthew.r.maurer@gmail.com>2016-09-14 02:36:07 -0400
commitf10067be1fc5e6afa9d04a61c0f92ccb2661c69b (patch)
tree3108335668d3adba31f4b99aeb062bfc3642284a
parent2acf031b81358363efed92d021b862492086c38b (diff)
downloadnixlib-f10067be1fc5e6afa9d04a61c0f92ccb2661c69b.tar
nixlib-f10067be1fc5e6afa9d04a61c0f92ccb2661c69b.tar.gz
nixlib-f10067be1fc5e6afa9d04a61c0f92ccb2661c69b.tar.bz2
nixlib-f10067be1fc5e6afa9d04a61c0f92ccb2661c69b.tar.lz
nixlib-f10067be1fc5e6afa9d04a61c0f92ccb2661c69b.tar.xz
nixlib-f10067be1fc5e6afa9d04a61c0f92ccb2661c69b.tar.zst
nixlib-f10067be1fc5e6afa9d04a61c0f92ccb2661c69b.zip
Legacy library + old compiler = normal name (OCaml)
For legacy camlp4 libraries, if we are using a pre-4.02 compiler, and
so don't have ppx access, allow access to the legacy library under the
normal name.
-rw-r--r--pkgs/top-level/all-packages.nix50
1 files changed, 40 insertions, 10 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 900a9899948a..fcd28fb8a430 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5560,25 +5560,55 @@ in
 
 
     # Core sublibs
-    typerep = callPackage ../development/ocaml-modules/janestreet/typerep.nix {};
+    typerep =
+      if lib.versionOlder "4.02" ocaml_version
+      then callPackage ../development/ocaml-modules/janestreet/typerep.nix {}
+      else typerep_p4;
 
-    fieldslib = callPackage ../development/ocaml-modules/janestreet/fieldslib.nix {};
+    fieldslib =
+      if lib.versionOlder "4.02" ocaml_version
+      then callPackage ../development/ocaml-modules/janestreet/fieldslib.nix {}
+      else fieldslib_p4;
 
-    sexplib = callPackage ../development/ocaml-modules/janestreet/sexplib.nix {};
+    sexplib =
+      if lib.versionOlder "4.02" ocaml_version
+      then callPackage ../development/ocaml-modules/janestreet/sexplib.nix {}
+      else sexplib_p4;
 
-    variantslib = callPackage ../development/ocaml-modules/janestreet/variantslib.nix {};
+    variantslib =
+      if lib.versionOlder "4.02" ocaml_version
+      then callPackage ../development/ocaml-modules/janestreet/variantslib.nix {}
+      else variantslib_p4;
 
-    bin_prot = callPackage ../development/ocaml-modules/janestreet/bin_prot.nix {};
+    bin_prot =
+      if lib.versionOlder "4.02" ocaml_version
+      then callPackage ../development/ocaml-modules/janestreet/bin_prot.nix {}
+      else bin_prot_p4;
 
-    core_kernel = callPackage ../development/ocaml-modules/janestreet/core_kernel.nix {};
+    core_kernel =
+      if lib.versionOlder "4.02" ocaml_version
+      then callPackage ../development/ocaml-modules/janestreet/core_kernel.nix {}
+      else core_kernel_p4;
 
-    core = callPackage ../development/ocaml-modules/janestreet/core.nix {};
+    core =
+      if lib.versionOlder "4.02" ocaml_version
+      then callPackage ../development/ocaml-modules/janestreet/core.nix {}
+      else core_p4;
 
-    re2 = callPackage ../development/ocaml-modules/janestreet/re2.nix {};
+    re2 =
+      if lib.versionOlder "4.02" ocaml_version
+      then callPackage ../development/ocaml-modules/janestreet/re2.nix {}
+      else re2_p4;
 
-    textutils = callPackage ../development/ocaml-modules/janestreet/textutils.nix {};
+    textutils =
+      if lib.versionOlder "4.02" ocaml_version
+      then callPackage ../development/ocaml-modules/janestreet/textutils.nix {}
+      else textutils_p4;
 
-    core_extended = callPackage ../development/ocaml-modules/janestreet/core-extended.nix {};
+    core_extended =
+      if lib.versionOlder "4.02" ocaml_version
+      then callPackage ../development/ocaml-modules/janestreet/core-extended.nix {}
+      else core_extended_p4;
   };
 
   ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0;