about summary refs log tree commit diff
path: root/pkgs/development/ocaml-modules/javalib
diff options
context:
space:
mode:
authorVincent Laporte <Vincent.Laporte@gmail.com>2017-06-30 16:55:04 +0000
committerVincent Laporte <Vincent.Laporte@gmail.com>2017-06-30 17:03:39 +0000
commitf97766566a339d390de56fd3a646d10b91006d3f (patch)
tree0de0eb500d337e366ef502d3030701738f653026 /pkgs/development/ocaml-modules/javalib
parentea052b6f6ba58142b7f939ffb9daf8461ae894fc (diff)
ocamlPackages.javalib: 2.3 -> 2.3.3
ocamlPackages.sawja: 1.5 -> 1.5.2
Diffstat (limited to 'pkgs/development/ocaml-modules/javalib')
-rw-r--r--pkgs/development/ocaml-modules/javalib/default.nix12
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix
index c0b1c32553e78..843cf44a15386 100644
--- a/pkgs/development/ocaml-modules/javalib/default.nix
+++ b/pkgs/development/ocaml-modules/javalib/default.nix
@@ -1,16 +1,20 @@
 {stdenv, fetchurl, which, ocaml, findlib, camlzip, extlib, camlp4}:
 
+if !stdenv.lib.versionAtLeast ocaml.version "4"
+then throw "javalib not supported for ocaml ${ocaml.version}"
+else
+
 let
   pname = "javalib";
   webpage = "http://sawja.inria.fr/";
 in
 stdenv.mkDerivation rec {
-  name = "ocaml-${pname}-${version}";
-  version = "2.3";
+  name = "ocaml${ocaml.version}-${pname}-${version}";
+  version = "2.3.3";
 
   src = fetchurl {
-    url = "https://gforge.inria.fr/frs/download.php/33090/${pname}-${version}.tar.bz2";
-    sha256 = "1i8djcanzm250mwilm3jfy37cz0k0x7jbnrz8a5vvdi91kyzh52j";
+    url = https://gforge.inria.fr/frs/download.php/file/36307/javalib-2.3.3.tar.bz2;
+    sha256 = "0427n3vfb2h51gy2p4878gdwlp0mb03asn3g9kp9v4wfxmksjj11";
   };
 
   buildInputs = [ which ocaml findlib camlp4 ];