Merge pull request #32400 from vbgl/ocamlnet-4.1.5

ocamlPackages.ocamlnet: 4.1.4 -> 4.1.5
NixOS · Dec 8, 2017 · b00f806 · b00f806
2 parents cdde22a + d3e488c
commit b00f806
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 20 deletions.
diff --git a/pkgs/development/libraries/nettle/3.3.nix b/pkgs/development/libraries/nettle/3.3.nix
diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix
@@ -1,20 +1,14 @@
 { stdenv, fetchurl, pkgconfig, ncurses, ocaml, findlib, ocaml_pcre, camlzip
-, gnutls, nettle_3_3 }:
+, gnutls, nettle }:
 
-# These overrides are just temporary, until ocamlnet supports nettle-3.4.
-let gnutls_orig = gnutls; in
-let gnutls = gnutls_orig.override { nettle = nettle_3_3; };
-    nettle = nettle_3_3;
-in
-
-let version = "4.1.4"; in
+let version = "4.1.5"; in
 
 stdenv.mkDerivation {
   name = "ocaml${ocaml.version}-ocamlnet-${version}";
 
   src = fetchurl {
     url = "http://download.camlcity.org/download/ocamlnet-${version}.tar.gz";
-    sha256 = "0hhi3s4xas5i3p7214qfji5pvr7d30d89vnmkznxsfqj4v7dmhs6";
+    sha256 = "1ppcd2zjhj6s3ib9q8dngnr53qlmkhvv7a8hzp88r79k6jygn4cm";
   };
 
   nativeBuildInputs = [ pkgconfig ];

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -10060,7 +10060,6 @@ with pkgs;
   };
 
   nettle = callPackage ../development/libraries/nettle { };
-  nettle_3_3 = callPackage ../development/libraries/nettle/3.3.nix { };
 
   newt = callPackage ../development/libraries/newt { };