From d477bc353c7be703a54d735f4836e5d1088d7b58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 30 Nov 2017 12:28:35 +0100
Subject: [PATCH] ocamlnet: fixup build by bringing back nettle-3.3

---
 pkgs/development/libraries/nettle/3.3.nix           | 10 ++++++++++
 pkgs/development/ocaml-modules/ocamlnet/default.nix |  8 +++++++-
 pkgs/top-level/all-packages.nix                     |  1 +
 3 files changed, 18 insertions(+), 1 deletion(-)
 create 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
new file mode 100644
index 000000000000..3923daad6f4b
--- /dev/null
+++ b/pkgs/development/libraries/nettle/3.3.nix
@@ -0,0 +1,10 @@
+{ 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/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix
index 9944cf821c50..5de3993d9619 100644
--- a/pkgs/development/ocaml-modules/ocamlnet/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix
@@ -1,5 +1,11 @@
 { stdenv, fetchurl, pkgconfig, ncurses, ocaml, findlib, ocaml_pcre, camlzip
-, gnutls, nettle }:
+, gnutls, nettle_3_3 }:
+
+# 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
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f6b486177641..d1c1cb526370 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10046,6 +10046,7 @@ with pkgs;
   };
 
   nettle = callPackage ../development/libraries/nettle { };
+  nettle_3_3 = callPackage ../development/libraries/nettle/3.3.nix { };
 
   newt = callPackage ../development/libraries/newt { };