Merge branch 'staging'

It includes a security update of libidn.
This commit is contained in:
Vladimír Čunát
2016-07-28 20:36:17 +02:00
8 changed files with 12 additions and 171 deletions

View File

@@ -1,11 +1,11 @@
{ fetchurl, stdenv, pth, libgpgerror }:
stdenv.mkDerivation rec {
name = "libassuan-2.4.2";
name = "libassuan-2.4.3";
src = fetchurl {
url = "mirror://gnupg/libassuan/${name}.tar.bz2";
sha256 = "086bbcdnvs48qq5g4iac7dpk76j0q3jrp16mchdvyx0b720xq1mv";
sha256 = "0w9bmasln4z8mn16s1is55a06w3nv8jbyal496z5jvr5vcxkm112";
};
outputs = [ "dev" "out" "info" ];

View File

@@ -4,11 +4,11 @@ assert enableCapabilities -> stdenv.isLinux;
stdenv.mkDerivation rec {
name = "libgcrypt-${version}";
version = "1.7.1";
version = "1.7.2";
src = fetchurl {
url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
sha256 = "15bsdpihb8xvr2a6sh0ikzw9wdw3gdi4pl1vpr6wc48npzy9q3a5";
sha256 = "17v8nvvxagcwxz46apzz575l8682kfd78pf00i2kbavfdn8dyd9x";
};
outputs = [ "dev" "out" "info" ];

View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "libgpg-error-${version}";
version = "1.23";
version = "1.24";
src = fetchurl {
url = "mirror://gnupg/libgpg-error/${name}.tar.bz2";
sha256 = "1alyjd6671drj92m0qi9943rfmf1sjjbzvmz97v4hh4cp5jpy33z";
sha256 = "0h75sf1ngr750c3fjfn4583q7wz40qm63jhg8vjfdrbx936f2s4j";
};
postPatch = "sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure";

View File

@@ -1,11 +1,11 @@
{ fetchurl, stdenv, libiconv }:
stdenv.mkDerivation rec {
name = "libidn-1.32";
name = "libidn-1.33";
src = fetchurl {
url = "mirror://gnu/libidn/${name}.tar.gz";
sha256 = "1xf4hphhahcjm2xwx147lfpsavjwv9l4c2gf6hx71zxywbz5lpds";
sha256 = "068fjg2arlppjqqpzd714n1lf6gxkpac9v5yyvp1qwmv6nvam9s4";
};
outputs = [ "dev" "out" "bin" "info" "docdev" ];