diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-06-23 12:20:32 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-06-23 12:20:32 +0200 |
commit | 38bf360124c4031c0cc7c4ed9374b8f15f38b834 (patch) | |
tree | a52990bbc531df4f0fa97221a5ff001bfb8d78fe /pkgs | |
parent | d3e599c9e1a9a2dde26054be5a484a786527cbc9 (diff) | |
parent | 2cf31a1840888b224cc63522ffbf09ca4773ba76 (diff) | |
download | nixpkgs-38bf360124c4031c0cc7c4ed9374b8f15f38b834.tar nixpkgs-38bf360124c4031c0cc7c4ed9374b8f15f38b834.tar.gz nixpkgs-38bf360124c4031c0cc7c4ed9374b8f15f38b834.tar.bz2 nixpkgs-38bf360124c4031c0cc7c4ed9374b8f15f38b834.tar.lz nixpkgs-38bf360124c4031c0cc7c4ed9374b8f15f38b834.tar.xz nixpkgs-38bf360124c4031c0cc7c4ed9374b8f15f38b834.tar.zst nixpkgs-38bf360124c4031c0cc7c4ed9374b8f15f38b834.zip |
Merge #16360: gnutls: 3.4.11 -> 3.4.13 + 3.5.1
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/gnutls/3.4.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/gnutls/3.5.nix | 17 | ||||
-rw-r--r-- | pkgs/development/libraries/gnutls/generic.nix | 8 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
4 files changed, 29 insertions, 4 deletions
diff --git a/pkgs/development/libraries/gnutls/3.4.nix b/pkgs/development/libraries/gnutls/3.4.nix index 71c3010467c..4882e5dda04 100644 --- a/pkgs/development/libraries/gnutls/3.4.nix +++ b/pkgs/development/libraries/gnutls/3.4.nix @@ -1,11 +1,11 @@ { callPackage, fetchurl, autoreconfHook, ... } @ args: callPackage ./generic.nix (args // rec { - version = "3.4.11"; + version = "3.4.13"; src = fetchurl { url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-${version}.tar.xz"; - sha256 = "1f4sbb38xab46h67a3pm6kybgrahjx3vbrn66qq3cbc2jngrrvvh"; + sha256 = "0naqs9g5b577j1j7q55ma1vcn78jl2d98h3zrl5rh997wzl8cczx"; }; # This fixes some broken parallel dependencies diff --git a/pkgs/development/libraries/gnutls/3.5.nix b/pkgs/development/libraries/gnutls/3.5.nix new file mode 100644 index 00000000000..82bd437d721 --- /dev/null +++ b/pkgs/development/libraries/gnutls/3.5.nix @@ -0,0 +1,17 @@ +{ callPackage, fetchurl, autoreconfHook, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "3.5.1"; + + src = fetchurl { + url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz"; + sha256 = "1gdxr1p1sigigwvangqf3v31i8fda07d6ngawykarhr7ls00yjmw"; + }; + + # This fixes some broken parallel dependencies + postPatch = '' + sed -i 's,^BUILT_SOURCES =,\0 systemkey-args.h,g' src/Makefile.am + ''; + + nativeBuildInputs = [ autoreconfHook ]; +}) diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index b54ea52b880..3af07f4c6f9 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -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 +, tpmSupport ? false, trousers, nettools, bash # Version dependent args , version, src, patches ? [], postPatch ? "", nativeBuildInputs ? [] @@ -29,7 +29,7 @@ stdenv.mkDerivation { # for the actual fix. enableParallelBuilding = !guileBindings; - buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp autogen ] + buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp autogen nettools bash ] ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv ++ lib.optional (tpmSupport && stdenv.isLinux) trousers ++ [ unbound ] @@ -37,6 +37,10 @@ stdenv.mkDerivation { nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs; + patchPhase = '' + patchShebangs . + ''; + # XXX: Gnulib's `test-select' fails on FreeBSD: # http://hydra.nixos.org/build/2962084/nixlog/1/raw . doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 066c9d2c39e..1713294f6fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7291,6 +7291,10 @@ in guileBindings = config.gnutls.guile or false; }; + gnutls35 = callPackage ../development/libraries/gnutls/3.5.nix { + guileBindings = config.gnutls.guile or false; + }; + gpac = callPackage ../applications/video/gpac { }; gpgme = callPackage ../development/libraries/gpgme { |