diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-08-13 11:55:02 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-08-13 11:55:02 -0700 |
| commit | 952def0e3c9fdb8edbfcaa187609911f350c8e02 (patch) | |
| tree | 60226de48423053363db722f85ac42ff8e5f8992 /pkgs/development/libraries/gnutls | |
| parent | 257db17ee950d2865529603d1388cf7fbb8a0a89 (diff) | |
| parent | bc9bd5c02c38d6c5ae5b2e62fd0fe21c767413c7 (diff) | |
| download | nixpkgs-952def0e3c9fdb8edbfcaa187609911f350c8e02.tar nixpkgs-952def0e3c9fdb8edbfcaa187609911f350c8e02.tar.gz nixpkgs-952def0e3c9fdb8edbfcaa187609911f350c8e02.tar.bz2 nixpkgs-952def0e3c9fdb8edbfcaa187609911f350c8e02.tar.lz nixpkgs-952def0e3c9fdb8edbfcaa187609911f350c8e02.tar.xz nixpkgs-952def0e3c9fdb8edbfcaa187609911f350c8e02.tar.zst nixpkgs-952def0e3c9fdb8edbfcaa187609911f350c8e02.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/development/libraries/gnutls')
| -rw-r--r-- | pkgs/development/libraries/gnutls/3.3.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/gnutls/3.4.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/gnutls/generic.nix | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/libraries/gnutls/3.3.nix b/pkgs/development/libraries/gnutls/3.3.nix index bd95ce07254..1359980e19d 100644 --- a/pkgs/development/libraries/gnutls/3.3.nix +++ b/pkgs/development/libraries/gnutls/3.3.nix @@ -1,10 +1,10 @@ { callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { - version = "3.3.16"; + version = "3.3.17"; src = fetchurl { url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/gnutls-${version}.tar.lz"; - sha256 = "1jl5n02mh83ygrrk7rq8vwylv5gdr3wccqs1ynvzr749fd2wq637"; + sha256 = "00zrwqvy054fymb6j04xfr583javfjxsid2rbmyk63qrbqzm61v7"; }; }) diff --git a/pkgs/development/libraries/gnutls/3.4.nix b/pkgs/development/libraries/gnutls/3.4.nix index 0558e4127c4..d5f74802fa5 100644 --- a/pkgs/development/libraries/gnutls/3.4.nix +++ b/pkgs/development/libraries/gnutls/3.4.nix @@ -1,10 +1,10 @@ { callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { - version = "3.4.3"; + version = "3.4.4"; src = fetchurl { url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-${version}.tar.lz"; - sha256 = "1q4adb1xi9pl00iy3cqs4r1qmwllv1g1r44p6xsg6n65dpyf53q2"; + sha256 = "17xazr0fdhlkr13bwiy52xq6z6mssml7q1ydyj8s1hwh68703c75"; }; }) diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index 95768c3ab48..21fb721a079 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -1,5 +1,5 @@ -{ lib, fetchurl, stdenv, autoreconfHook, zlib, lzo, libtasn1, nettle, pkgconfig, lzip -, guileBindings, guile, perl, gmp, libidn, p11_kit, unbound +{ lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip +, guileBindings, guile, perl, gmp, autogen, libidn, p11_kit, unbound , tpmSupport ? false, trousers # Version dependent args @@ -29,12 +29,12 @@ stdenv.mkDerivation rec { # for the actual fix. enableParallelBuilding = !guileBindings; - buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp ] + buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp autogen ] ++ lib.optional (tpmSupport && stdenv.isLinux) trousers ++ [ unbound ] ++ lib.optional guileBindings guile; - nativeBuildInputs = [ perl pkgconfig autoreconfHook ]; + nativeBuildInputs = [ perl pkgconfig ]; # XXX: Gnulib's `test-select' fails on FreeBSD: # http://hydra.nixos.org/build/2962084/nixlog/1/raw . |