JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnutls, gnutls-kdh: move defaults to package file

Browse Source
This commit is contained in:
Jan Malakhovski 2019-02-03 15:33:26 +00:00
parent 73b2c285fe
commit 0df915c75c
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/gnutls-kdh/generic.nix
View File

@ -1,5 +1,6 @@
{ lib, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip { config, lib, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
, guileBindings, guile, perl, gmp, autogen, libidn, p11-kit, unbound, libiconv , perl, gmp, autogen, libidn, p11-kit, unbound, libiconv
, guileBindings ? config.gnutls.guile or false, guile
, tpmSupport ? true, trousers, nettools, gperftools, gperf, gettext, automake , tpmSupport ? true, trousers, nettools, gperftools, gperf, gettext, automake
, yacc, texinfo , yacc, texinfo

5
pkgs/development/libraries/gnutls/generic.nix
View File

@ -1,5 +1,6 @@
{ lib, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip { config, lib, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
, guileBindings, guile, perl, gmp, autogen, libidn, p11-kit, libiconv , perl, gmp, autogen, libidn, p11-kit, libiconv
, guileBindings ? config.gnutls.guile or false, guile
, tpmSupport ? false, trousers, which, nettools, libunistring , tpmSupport ? false, trousers, which, nettools, libunistring
, unbound, dns-root-data, gettext , unbound, dns-root-data, gettext

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

@ -10113,12 +10113,9 @@ in
# https://github.com/NixOS/nixpkgs/commit/d6454e6a1 # https://github.com/NixOS/nixpkgs/commit/d6454e6a1
then ../development/libraries/gnutls/3.5.10.nix then ../development/libraries/gnutls/3.5.10.nix
else ../development/libraries/gnutls/3.6.nix) else ../development/libraries/gnutls/3.6.nix)
{ { };
guileBindings = config.gnutls.guile or false;
};
gnutls-kdh = callPackage ../development/libraries/gnutls-kdh/3.5.nix { gnutls-kdh = callPackage ../development/libraries/gnutls-kdh/3.5.nix {
guileBindings = config.gnutls.guile or false;
gperf = gperf_3_0; gperf = gperf_3_0;
}; };