about summary refs log tree commit diff
path: root/pkgs/development/ocaml-modules/ppxlib
diff options
context:
space:
mode:
authorVincent Laporte <Vincent.Laporte@gmail.com>2020-12-08 21:50:14 +0100
committerVincent Laporte <vbgl@users.noreply.github.com>2020-12-18 21:03:56 +0100
commitb6f7f1f673046ad2851728cb8f3a2f0888a1dcf0 (patch)
treedc783d933b1a6d807d5c49afcf1fa0f9395cf515 /pkgs/development/ocaml-modules/ppxlib
parentc2e90c4433dacac61fd8f61ce6171c54acab2fc2 (diff)
ocamlPackages.janeStreet: 0.13 → 0.14
ocamlPackages.biocaml: 0.10.1 → 0.11.1

ocamlPackages.bistro: fix for Core 0.14

ocamlPackages.js_of_ocaml: 3.7.0 → 3.7.1

ocamlPackages.ocaml-r: 0.2.0 → 0.4.0

ocamlPackages.phylogenetics: 2020-01-25 → 2020-11-23

Co-authored-by: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Diffstat (limited to 'pkgs/development/ocaml-modules/ppxlib')
-rw-r--r--pkgs/development/ocaml-modules/ppxlib/default.nix9
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix
index 7b1e25a8f9b0e..822c30daf26d5 100644
--- a/pkgs/development/ocaml-modules/ppxlib/default.nix
+++ b/pkgs/development/ocaml-modules/ppxlib/default.nix
@@ -1,6 +1,7 @@
 { lib, fetchFromGitHub, buildDunePackage, ocaml
-, version ? "0.13.0"
+, version ? if lib.versionAtLeast ocaml.version "4.07" then "0.15.0" else "0.13.0"
 , ocaml-compiler-libs, ocaml-migrate-parsetree, ppx_derivers, stdio
+, stdlib-shims
 }:
 
 let param = {
@@ -11,6 +12,11 @@ let param = {
   "0.13.0" = {
     sha256 = "0c54g22pm6lhfh3f7s5wbah8y48lr5lj3cqsbvgi99bly1b5vqvl";
   };
+  "0.15.0" = {
+    sha256 = "1p037kqj5858xrhh0dps6vbf4fnijla6z9fjz5zigvnqp4i2xkrn";
+    min_version = "4.07";
+    useDune2 = true;
+  };
 }."${version}"; in
 
 if param ? max_version && lib.versionAtLeast ocaml.version param.max_version
@@ -33,6 +39,7 @@ buildDunePackage rec {
 
   propagatedBuildInputs = [
     ocaml-compiler-libs ocaml-migrate-parsetree ppx_derivers stdio
+    stdlib-shims
   ];
 
   meta = {