nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-02 07:31:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

ocamlnet: fixup build by bringing back nettle-3.3

Browse Source
This commit is contained in:
Vladimír Čunát 2017-11-30 12:28:35 +01:00
parent e9550f290c
commit d477bc353c
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/nettle/3.3.nix Normal file
View File

@ -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";
};
})

8
pkgs/development/ocaml-modules/ocamlnet/default.nix
View File

@ -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

1
pkgs/top-level/all-packages.nix
View File

@ -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 { };