Permalink
Browse files

Merge branch 'staging'

  • Loading branch information...
2 parents 7158ef7 + 85ac790 commit 59ce8fd90efeb473b186d069b202341973b850a7 @fpletz fpletz committed Jan 11, 2017
@@ -1,10 +1,10 @@
{ callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // rec {
- version = "3.3.25";
+ version = "3.3.26";
src = fetchurl {
url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/gnutls-${version}.tar.xz";
- sha256 = "0bhzkzpzwg3lhbhpas7m4rcj4mrnyq76zmic9z42wpa68d76r78q";
+ sha256 = "1n90qyz54hhnmf4fmap6zdyv7nihz6mrbqgxhd46h7aqdcmqhzba";
};
})
@@ -1,10 +1,10 @@
-{ callPackage, fetchurl, autoreconfHook, ... } @ args:
+{ callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // rec {
- version = "3.4.16";
+ version = "3.4.17";
src = fetchurl {
url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-${version}.tar.xz";
- sha256 = "09rrjaflgp5p0hi5gqljklz1xpalnvj8bawvjj6baw8768dvp6nr";
+ sha256 = "0bhp8cqrmw15yins65cn0zwbcpj1vmymr4wnbm151sfmf2kfhl4v";
};
})
@@ -1,10 +1,12 @@
-{ callPackage, fetchurl, autoreconfHook, ... } @ args:
+{ callPackage, fetchurl, libunistring, ... } @ args:
callPackage ./generic.nix (args // rec {
- version = "3.5.5";
+ version = "3.5.8";
src = fetchurl {
url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz";
- sha256 = "0ag5q3dfxzv0dmqy7q0a8y74yc3m5yzvjrp324l6vqafh3klz6c6";
+ sha256 = "1zyl2z63s68hx1dpxqx0lykmlf3rwrzlrf44sq3h7dvjmr1z55qf";
};
+
+ buildInputs = [ libunistring ];
})
@@ -4,6 +4,7 @@
# Version dependent args
, version, src, patches ? [], postPatch ? "", nativeBuildInputs ? []
+, buildInputs ? []
, ...}:
assert guileBindings -> guile != null;
@@ -41,7 +42,8 @@ stdenv.mkDerivation {
++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv
++ lib.optional (tpmSupport && stdenv.isLinux) trousers
++ [ unbound ]
- ++ lib.optional guileBindings guile;
+ ++ lib.optional guileBindings guile
+ ++ buildInputs;
nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs;
@@ -75,7 +77,7 @@ stdenv.mkDerivation {
homepage = http://www.gnu.org/software/gnutls/;
license = licenses.lgpl21Plus;
- maintainers = with maintainers; [ eelco wkennington ];
+ maintainers = with maintainers; [ eelco wkennington fpletz ];
platforms = platforms.all;
};
}
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, perl, texinfo }:
stdenv.mkDerivation rec {
- name = "libtasn1-4.8";
+ name = "libtasn1-4.9";
src = fetchurl {
url = "mirror://gnu/libtasn1/${name}.tar.gz";
- sha256 = "04y5m29pqmvkfdbppmsdifyx89v8xclxzklpfc7a1fkr9p4jz07s";
+ sha256 = "0869cp6jx7cajgv6cnddsh3vc7bimmdkdjn80y1jpb4iss7plvsg";
};
outputs = [ "out" "dev" "devdoc" ];
@@ -19,10 +19,13 @@ stdenv.mkDerivation rec {
[ "--enable-overlays"
"--disable-dependency-tracking" # speeds up one-time build
"--enable-modules"
+ "--sysconfdir=/etc"
] ++ stdenv.lib.optional (openssl == null) "--without-tls"
++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl"
++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic";
+ installFlags = [ "sysconfdir=$(out)/etc" ];
+
# 1. Fixup broken libtool
# 2. Libraries left in the build location confuse `patchelf --shrink-rpath`
# Delete these to let patchelf discover the right path instead.

0 comments on commit 59ce8fd

Please sign in to comment.