ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-15 03:15:56 +03:00
Code Issues Projects Releases Wiki Activity

gnutls: 3.4.11 -> 3.4.13

Browse Source
This commit is contained in:
Michiel Leenaars 2016-06-20 13:38:33 +02:00
parent 5fc64c4baa
commit 325dafe82b
2 changed files with 8 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 ./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

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

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