diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-11-30 12:28:35 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-11-30 12:28:35 +0100 |
| commit | d477bc353c7be703a54d735f4836e5d1088d7b58 (patch) | |
| tree | 514239b871b34851f67ae578ecbd70af5019a4d5 /pkgs | |
| parent | e9550f290c7536e0c23ebb6da146fb66b37197d3 (diff) | |
| download | nixlib-d477bc353c7be703a54d735f4836e5d1088d7b58.tar nixlib-d477bc353c7be703a54d735f4836e5d1088d7b58.tar.gz nixlib-d477bc353c7be703a54d735f4836e5d1088d7b58.tar.bz2 nixlib-d477bc353c7be703a54d735f4836e5d1088d7b58.tar.lz nixlib-d477bc353c7be703a54d735f4836e5d1088d7b58.tar.xz nixlib-d477bc353c7be703a54d735f4836e5d1088d7b58.tar.zst nixlib-d477bc353c7be703a54d735f4836e5d1088d7b58.zip | |
ocamlnet: fixup build by bringing back nettle-3.3
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/nettle/3.3.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/ocamlnet/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
3 files changed, 18 insertions, 1 deletions
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 { }; |