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

Merge #16360: gnutls: 3.4.11 -> 3.4.13 + 3.5.1

Browse Source
This commit is contained in:
Vladimír Čunát 2016-06-23 12:20:32 +02:00
commit 38bf360124
4 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/gnutls/3.4.nix
View File

@ -1,11 +1,11 @@
{ callPackage, fetchurl, autoreconfHook, ... } @ args: { callPackage, fetchurl, autoreconfHook, ... } @ args:
callPackage ./generic.nix (args // rec { callPackage ./generic.nix (args // rec {
version = "3.4.11"; version = "3.4.13";
src = fetchurl { src = fetchurl {
url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-${version}.tar.xz"; url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-${version}.tar.xz";
sha256 = "1f4sbb38xab46h67a3pm6kybgrahjx3vbrn66qq3cbc2jngrrvvh"; sha256 = "0naqs9g5b577j1j7q55ma1vcn78jl2d98h3zrl5rh997wzl8cczx";
}; };
# This fixes some broken parallel dependencies # This fixes some broken parallel dependencies

17
pkgs/development/libraries/gnutls/3.5.nix Normal file
View File

@ -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 ];
})

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

@ -1,6 +1,6 @@
{ lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip { lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
, guileBindings, guile, perl, gmp, autogen, libidn, p11_kit, unbound, libiconv , guileBindings, guile, perl, gmp, autogen, libidn, p11_kit, unbound, libiconv
, tpmSupport ? false, trousers , tpmSupport ? false, trousers, nettools, bash
# Version dependent args # Version dependent args
, version, src, patches ? [], postPatch ? "", nativeBuildInputs ? [] , version, src, patches ? [], postPatch ? "", nativeBuildInputs ? []
@ -29,7 +29,7 @@ stdenv.mkDerivation {
# for the actual fix. # for the actual fix.
enableParallelBuilding = !guileBindings; 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 (stdenv.isFreeBSD || stdenv.isDarwin) libiconv
++ lib.optional (tpmSupport && stdenv.isLinux) trousers ++ lib.optional (tpmSupport && stdenv.isLinux) trousers
++ [ unbound ] ++ [ unbound ]
@ -37,6 +37,10 @@ stdenv.mkDerivation {
nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs; nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs;
patchPhase = ''
patchShebangs .
'';
# XXX: Gnulib's `test-select' fails on FreeBSD: # XXX: Gnulib's `test-select' fails on FreeBSD:
# http://hydra.nixos.org/build/2962084/nixlog/1/raw . # http://hydra.nixos.org/build/2962084/nixlog/1/raw .
doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin); doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin);

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

@ -7291,6 +7291,10 @@ in
guileBindings = config.gnutls.guile or false; 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 { }; gpac = callPackage ../applications/video/gpac { };
gpgme = callPackage ../development/libraries/gpgme { gpgme = callPackage ../development/libraries/gpgme {