summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorVincent Laporte <Vincent.Laporte@gmail.com>2017-04-21 07:02:31 +0000
committerVincent Laporte <Vincent.Laporte@gmail.com>2017-04-21 07:02:31 +0000
commit59c70e446c39df37bb83e9d6386c7d2e95ae399c (patch)
tree68b08eea5d01c1bfb6453c0685d2e76ab3242d0e /pkgs
parent75b4bec6fb2b85be299d9bf246ebcdcad843e079 (diff)
downloadnixlib-59c70e446c39df37bb83e9d6386c7d2e95ae399c.tar
nixlib-59c70e446c39df37bb83e9d6386c7d2e95ae399c.tar.gz
nixlib-59c70e446c39df37bb83e9d6386c7d2e95ae399c.tar.bz2
nixlib-59c70e446c39df37bb83e9d6386c7d2e95ae399c.tar.lz
nixlib-59c70e446c39df37bb83e9d6386c7d2e95ae399c.tar.xz
nixlib-59c70e446c39df37bb83e9d6386c7d2e95ae399c.tar.zst
nixlib-59c70e446c39df37bb83e9d6386c7d2e95ae399c.zip
jbuilder: 1.0+beta5 -> 1.0+beta7
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/tools/ocaml/jbuilder/default.nix6
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/development/tools/ocaml/jbuilder/default.nix b/pkgs/development/tools/ocaml/jbuilder/default.nix
index 3fa0c2685ee1..f1bf5e33a617 100644
--- a/pkgs/development/tools/ocaml/jbuilder/default.nix
+++ b/pkgs/development/tools/ocaml/jbuilder/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchzip, ocaml, opam }:
 
 stdenv.mkDerivation {
-  name = "jbuilder-1.0+beta5";
+  name = "jbuilder-1.0+beta7";
   src = fetchzip {
-    url = http://github.com/janestreet/jbuilder/archive/1.0+beta5.tar.gz;
-    sha256 = "00kh83n3216g1n7rhh14mcmw9bj5vzq7kiixm1abrc09dhwh4m7a";
+    url = http://github.com/janestreet/jbuilder/archive/1.0+beta7.tar.gz;
+    sha256 = "10qjqs6gv9y8s580gvssjm56xw72pcxd5lkpzqpz6cz4390d45i8";
   };
 
   buildInputs = [ ocaml ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c32be2c6d8dd..807df4e57e75 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -988,9 +988,7 @@ with pkgs;
 
   interlock = callPackage ../servers/interlock {};
 
-  jbuilder = callPackage ../development/tools/ocaml/jbuilder {
-    inherit (ocaml-ng.ocamlPackages_4_03) ocaml;
-  };
+  jbuilder = callPackage ../development/tools/ocaml/jbuilder { };
 
   kapacitor = callPackage ../servers/monitoring/kapacitor { };