From e82d74132cd65d2c8aa0f1714fed0fcc39238f89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 22 Mar 2021 11:00:37 +0100 Subject: [PATCH] nettle: start maintaining the expression - consolidate configureFlags - remove double callPackage; I suspect it's unhealthy for overrides We haven't needed multiple nettle versions for years I think (d3e488c), but the split to {default,generic}.nix doesn't seem problematic, so I kept it to avoid making the history slightly harder to follow. --- pkgs/development/libraries/nettle/default.nix | 6 ++--- pkgs/development/libraries/nettle/generic.nix | 26 +++++++++---------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix index 343118fb587..3eec9c97ff1 100644 --- a/pkgs/development/libraries/nettle/default.nix +++ b/pkgs/development/libraries/nettle/default.nix @@ -1,10 +1,10 @@ -{ callPackage, fetchurl, ... } @ args: +{ callPackage, fetchurl }: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix rec { version = "3.7.2"; src = fetchurl { url = "mirror://gnu/nettle/nettle-${version}.tar.gz"; sha256 = "0qpi1qp3bcvqdsaxy2pzg530db95x8qjahkynxgwvr6dy5760ald"; }; -}) +} diff --git a/pkgs/development/libraries/nettle/generic.nix b/pkgs/development/libraries/nettle/generic.nix index edaebc21352..348faf56b56 100644 --- a/pkgs/development/libraries/nettle/generic.nix +++ b/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; it's default since 3.7 + configureFlags = + # runtime selection of HW-accelerated code; it's default since 3.7 + [ "--enable-fat" ] + # Make sure the right is found, and not the incompatible + # /usr/include/mp.h from OpenSolaris. See + # + # 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 is found, and not the incompatible - # /usr/include/mp.h from OpenSolaris. See - # - # for details. - configureFlags = [ "--with-include-path=${gmp.dev}/include" ]; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1eac6ab3244..5c453d2fba6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16306,7 +16306,7 @@ in openssl = openssl_1_0_2; }; - nettle = callPackage ../development/libraries/nettle { }; + nettle = import ../development/libraries/nettle { inherit callPackage fetchurl; }; newman = callPackage ../development/web/newman {};