summary refs log tree commit diff
path: root/pkgs/development/ocaml-modules
diff options
context:
space:
mode:
authorVincent Laporte <Vincent.Laporte@gmail.com>2017-08-08 16:20:22 +0000
committerVincent Laporte <Vincent.Laporte@gmail.com>2017-08-08 16:49:19 +0000
commite60ffe642e68812dba4334da9867551bbd888c3c (patch)
treedb929e7783763e44b48c6f31c7b51c3d33aee447 /pkgs/development/ocaml-modules
parentd6c510927651edefc5d5a5ef7070a39dfc94144e (diff)
downloadnixpkgs-e60ffe642e68812dba4334da9867551bbd888c3c.tar
nixpkgs-e60ffe642e68812dba4334da9867551bbd888c3c.tar.gz
nixpkgs-e60ffe642e68812dba4334da9867551bbd888c3c.tar.bz2
nixpkgs-e60ffe642e68812dba4334da9867551bbd888c3c.tar.lz
nixpkgs-e60ffe642e68812dba4334da9867551bbd888c3c.tar.xz
nixpkgs-e60ffe642e68812dba4334da9867551bbd888c3c.tar.zst
nixpkgs-e60ffe642e68812dba4334da9867551bbd888c3c.zip
ocamlPackages.ocamlnet: 4.1.2 -> 4.1.3
Diffstat (limited to 'pkgs/development/ocaml-modules')
-rw-r--r--pkgs/development/ocaml-modules/ocamlnet/default.nix18
1 files changed, 14 insertions, 4 deletions
diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix
index 82747b7a876..7e0cad538d5 100644
--- a/pkgs/development/ocaml-modules/ocamlnet/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix
@@ -1,12 +1,23 @@
 { stdenv, fetchurl, pkgconfig, ncurses, ocaml, findlib, ocaml_pcre, camlzip
 , gnutls, nettle }:
 
+let param =
+  if stdenv.lib.versionAtLeast ocaml.version "4.03"
+  then {
+    version = "4.1.3";
+    sha256 = "1ifm3izml9hnr7cic1413spnd8x8ka795awsm2xpam3cs8z3j0ca";
+  } else {
+    version = "4.1.2";
+    sha256 = "1n0l9zlq7dc5yr43bpa4a0b6bxj3iyjkadbb41g59zlwa8hkk34i";
+  };
+in
+
 stdenv.mkDerivation {
-  name = "ocamlnet-4.1.2";
+  name = "ocaml${ocaml.version}-ocamlnet-${param.version}";
 
   src = fetchurl {
-    url = http://download.camlcity.org/download/ocamlnet-4.1.2.tar.gz;
-    sha256 = "1n0l9zlq7dc5yr43bpa4a0b6bxj3iyjkadbb41g59zlwa8hkk34i";
+    url = "http://download.camlcity.org/download/ocamlnet-${param.version}.tar.gz";
+    inherit (param) sha256;
   };
 
   buildInputs = [ ncurses ocaml findlib ocaml_pcre camlzip gnutls pkgconfig nettle ];
@@ -40,6 +51,5 @@ stdenv.mkDerivation {
     maintainers = [
       stdenv.lib.maintainers.z77z
     ];
-    broken = stdenv.lib.versionAtLeast ocaml.version "4.05";
   };
 }