diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-04-09 18:28:16 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-04-12 18:46:15 +0000 |
commit | fd2e737e0678ee7d8081baef05b305146a2c0034 (patch) | |
tree | ac3e9b27576a0382335532d126f9a66d486bc638 /nixpkgs/pkgs/development/libraries/nettle | |
parent | cc207d720b6aa836e256c1ee9842bc739e630a8a (diff) | |
parent | 9e377a6ce42dccd9b624ae4ce8f978dc892ba0e2 (diff) | |
download | nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.gz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.bz2 nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.lz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.xz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.zst nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.zip |
Merge remote-tracking branch 'nixpkgs/nixos-unstable'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/nettle')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/nettle/default.nix | 10 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/nettle/generic.nix | 26 |
2 files changed, 17 insertions, 19 deletions
diff --git a/nixpkgs/pkgs/development/libraries/nettle/default.nix b/nixpkgs/pkgs/development/libraries/nettle/default.nix index 7c0c6476bd05..3eec9c97ff10 100644 --- a/nixpkgs/pkgs/development/libraries/nettle/default.nix +++ b/nixpkgs/pkgs/development/libraries/nettle/default.nix @@ -1,10 +1,10 @@ -{ callPackage, fetchurl, ... } @ args: +{ callPackage, fetchurl }: -callPackage ./generic.nix (args // rec { - version = "3.6"; +callPackage ./generic.nix rec { + version = "3.7.2"; src = fetchurl { url = "mirror://gnu/nettle/nettle-${version}.tar.gz"; - sha256 = "1wg3sprl0bzy49cmbwwm91vw67hk1x5i3ksdygsciyxz587hsk6j"; + sha256 = "0qpi1qp3bcvqdsaxy2pzg530db95x8qjahkynxgwvr6dy5760ald"; }; -}) +} diff --git a/nixpkgs/pkgs/development/libraries/nettle/generic.nix b/nixpkgs/pkgs/development/libraries/nettle/generic.nix index 735fe373533d..348faf56b56a 100644 --- a/nixpkgs/pkgs/development/libraries/nettle/generic.nix +++ b/nixpkgs/pkgs/development/libraries/nettle/generic.nix @@ -2,9 +2,9 @@ # Version specific args , version, src -, ...}: +}: -stdenv.mkDerivation ({ +stdenv.mkDerivation { name = "nettle-${version}"; inherit src; @@ -16,7 +16,14 @@ stdenv.mkDerivation ({ nativeBuildInputs = [ gnum4 ]; propagatedBuildInputs = [ gmp ]; - configureFlags = [ "--enable-fat" ]; # runtime selection of HW-accelerated code + configureFlags = + # runtime selection of HW-accelerated code; it's default since 3.7 + [ "--enable-fat" ] + # Make sure the right <gmp.h> is found, and not the incompatible + # /usr/include/mp.h from OpenSolaris. See + # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html> + # for details. + ++ lib.optional stdenv.isSunOS "--with-include-path=${gmp.dev}/include"; doCheck = (stdenv.hostPlatform.system != "i686-cygwin" && !stdenv.isDarwin); @@ -53,18 +60,9 @@ stdenv.mkDerivation ({ license = licenses.gpl2Plus; - homepage = "http://www.lysator.liu.se/~nisse/nettle/"; + homepage = "https://www.lysator.liu.se/~nisse/nettle/"; platforms = platforms.all; + maintainers = [ maintainers.vcunat ]; }; } - -// - -lib.optionalAttrs stdenv.isSunOS { - # Make sure the right <gmp.h> is found, and not the incompatible - # /usr/include/mp.h from OpenSolaris. See - # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html> - # for details. - configureFlags = [ "--with-include-path=${gmp.dev}/include" ]; -}) |