mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 23:03:40 +01:00
gnutls: bugfix+security 3.5.9 -> 3.5.10
http://gnutls.org/security.html#GNUTLS-SA-2017-3
This commit is contained in:
parent
45115b1937
commit
b264486cf1
2 changed files with 5 additions and 5 deletions
|
@ -1,10 +1,10 @@
|
|||
{ callPackage, fetchurl, libunistring, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "3.5.9";
|
||||
version = "3.5.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz";
|
||||
sha256 = "0l9971841jsfdcvcyhas17sk5rsby6x5vvwcmmj4x3zi9q60zcc2";
|
||||
sha256 = "17apwvdkkazh5w8z8mbanpj2yj8s2002qwy46wz4v3akpa33wi5g";
|
||||
};
|
||||
})
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
|
||||
, guileBindings, guile, perl, gmp, autogen, libidn, p11_kit, unbound, libiconv
|
||||
, tpmSupport ? false, trousers, nettools, libunistring
|
||||
, tpmSupport ? false, trousers, which, nettools, libunistring
|
||||
|
||||
# Version dependent args
|
||||
, version, src, patches ? [], postPatch ? "", nativeBuildInputs ? []
|
||||
|
@ -38,14 +38,14 @@ stdenv.mkDerivation {
|
|||
enableParallelBuilding = true;
|
||||
|
||||
buildInputs = [ lzo lzip libtasn1 libidn p11_kit zlib gmp autogen libunistring ]
|
||||
++ lib.optional doCheck nettools
|
||||
++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv
|
||||
++ lib.optional (tpmSupport && stdenv.isLinux) trousers
|
||||
++ [ unbound ]
|
||||
++ lib.optional guileBindings guile
|
||||
++ buildInputs;
|
||||
|
||||
nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs;
|
||||
nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs
|
||||
++ lib.optionals doCheck [ which nettools ];
|
||||
|
||||
propagatedBuildInputs = [ nettle ];
|
||||
|
||||
|
|
Loading…
Reference in a new issue