From 0c8235e4ac0a864eeeb0c3bb192dae8f802417bb Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 6 Dec 2017 20:39:13 +0000
Subject: [PATCH 1/2] ocamlPackages.ocamlnet: 4.1.4 -> 4.1.5

---
 pkgs/development/ocaml-modules/ocamlnet/default.nix | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix
index 5de3993d961..573de26096c 100644
--- 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 ];

From d3e488c3a32f43b03649966121f6b192f0ba65db Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 6 Dec 2017 20:39:41 +0000
Subject: [PATCH 2/2] nettle: remove at 3.3

---
 pkgs/development/libraries/nettle/3.3.nix | 10 ----------
 pkgs/top-level/all-packages.nix           |  1 -
 2 files changed, 11 deletions(-)
 delete mode 100644 pkgs/development/libraries/nettle/3.3.nix

diff --git a/pkgs/development/libraries/nettle/3.3.nix b/pkgs/development/libraries/nettle/3.3.nix
deleted file mode 100644
index 3923daad6f4..00000000000
--- a/pkgs/development/libraries/nettle/3.3.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ callPackage, fetchurl, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "3.3";
-
-  src = fetchurl {
-    url = "mirror://gnu/nettle/nettle-${version}.tar.gz";
-    sha256 = "07mif3af077763vc35s1x8vzhzlgqcgxh67c1xr13jnhslkjd526";
-  };
-})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5c736af1e7b..e2dffc4407c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10056,7 +10056,6 @@ with pkgs;
   };
 
   nettle = callPackage ../development/libraries/nettle { };
-  nettle_3_3 = callPackage ../development/libraries/nettle/3.3.nix { };
 
   newt = callPackage ../development/libraries/newt { };