From c7e1a25765d403bb352b07cc44c2110d25b654c5 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 11 Apr 2017 12:50:19 +0300 Subject: [PATCH 1/8] gawk: 4.1.3 -> 4.1.4 --- pkgs/tools/text/gawk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index 271a89b784d9..1a1590b82d4f 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -5,11 +5,11 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { - name = "gawk-4.1.3"; + name = "gawk-4.1.4"; src = fetchurl { url = "mirror://gnu/gawk/${name}.tar.xz"; - sha256 = "09d6pmx6h3i2glafm0jd1v1iyrs03vcyv2rkz12jisii3vlmbkz3"; + sha256 = "0rn2mmjxm767zliqzd67j7h2ncjn4j0321c60y9fy3grs3i89qak"; }; # When we do build separate interactive version, it makes sense to always include man. From 5de624e437ae7207f29429cad3920748040b53d1 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 11 Apr 2017 12:53:37 +0300 Subject: [PATCH 2/8] gmp: 6.1.1 -> 6.1.2 --- pkgs/development/libraries/gmp/6.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index bb4e40dd3a7e..e30c15e629ef 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -3,11 +3,11 @@ let inherit (stdenv.lib) optional optionalString; in let self = stdenv.mkDerivation rec { - name = "gmp-6.1.1"; + name = "gmp-6.1.2"; src = fetchurl { # we need to use bz2, others aren't in bootstrapping stdenv urls = [ "mirror://gnu/gmp/${name}.tar.bz2" "ftp://ftp.gmplib.org/pub/${name}/${name}.tar.bz2" ]; - sha256 = "1mpzprdzkgfpdc1v2lf4dxlxps4x8bvmzvd8n1ri6gw9y9jrh458"; + sha256 = "1clg7pbpk6qwxj5b2mw0pghzawp2qlm3jf9gdd8i6fl6yh2bnxaj"; }; #outputs TODO: split $cxx due to libstdc++ dependency From 72b2cbe3b7c2ecc97203d04eedade5722359817d Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 11 Apr 2017 12:53:49 +0300 Subject: [PATCH 3/8] libsigsegv: 2.10 -> 2.11 --- pkgs/development/libraries/libsigsegv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix index 3353fbf9e8d9..1cbd5bb52f55 100644 --- a/pkgs/development/libraries/libsigsegv/default.nix +++ b/pkgs/development/libraries/libsigsegv/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "libsigsegv-2.10"; + name = "libsigsegv-2.11"; src = fetchurl { url = "mirror://gnu/libsigsegv/${name}.tar.gz"; - sha256 = "16hrs8k3nmc7a8jam5j1fpspd6sdpkamskvsdpcw6m29vnis8q44"; + sha256 = "063swdvq7mbmc1clv0rnh20grwln1zfc2qnm0sa1hivcxyr2wz6x"; }; # Based on https://github.com/davidgfnet/buildroot-Os/blob/69fe6065b9dd1cb4dcc0a4b554e42cc2e5bd0d60/package/libsigsegv/libsigsegv-0002-fix-aarch64-build.patch From 6b84ee9f965a7787cdbe4e2e82aa3f305c478098 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 11 Apr 2017 12:54:06 +0300 Subject: [PATCH 4/8] lzma: 5.2.2 -> 5.2.3 --- pkgs/tools/compression/xz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index 3092bd840c4f..55ab89993c7c 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "xz-5.2.2"; + name = "xz-5.2.3"; src = fetchurl { url = "http://tukaani.org/xz/${name}.tar.bz2"; - sha256 = "1da071wyx921pyx3zkxlnbpp14p6km98pnp66mg1arwi9dxgbxbg"; + sha256 = "1ha08wxcldgcl81021x5nhknr47s1p95ljfkka4sqah5w5ns377x"; }; outputs = [ "bin" "dev" "out" "man" "doc" ]; From 8eb25e12451f0efd68ab7edab2d0bb3a9f2d8735 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 11 Apr 2017 12:54:18 +0300 Subject: [PATCH 5/8] lzo: 2.09 -> 2.10 --- pkgs/development/libraries/lzo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/lzo/default.nix b/pkgs/development/libraries/lzo/default.nix index 23168de43ed5..8739c9d25d59 100644 --- a/pkgs/development/libraries/lzo/default.nix +++ b/pkgs/development/libraries/lzo/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "lzo-2.09"; + name = "lzo-2.10"; src = fetchurl { url = "${meta.homepage}/download/${name}.tar.gz"; - sha256 = "0k5kpj3jnsjfxqqkblpfpx0mqcy86zs5fhjhgh2kq1hksg7ag57j"; + sha256 = "0wm04519pd3g8hqpjqhfr72q8qmbiwqaxcs3cndny9h86aa95y60"; }; configureFlags = [ "--enable-shared" ]; From d550c9071206013cb90ee9317080db82e286f69b Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 11 Apr 2017 12:54:30 +0300 Subject: [PATCH 6/8] patchutils: 0.3.3 -> 0.3.4 --- pkgs/tools/text/patchutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/patchutils/default.nix b/pkgs/tools/text/patchutils/default.nix index 75922a6c830c..28b3b6ed5b73 100644 --- a/pkgs/tools/text/patchutils/default.nix +++ b/pkgs/tools/text/patchutils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "patchutils-0.3.3"; + name = "patchutils-0.3.4"; src = fetchurl { url = "http://cyberelk.net/tim/data/patchutils/stable/${name}.tar.xz"; - sha256 = "0g5df00cj4nczrmr4k791l7la0sq2wnf8rn981fsrz1f3d2yix4i"; + sha256 = "0xp8mcfyi5nmb5a2zi5ibmyshxkb1zv1dgmnyn413m7ahgdx8mfg"; }; patches = [ ./drop-comments.patch ]; # we would get into a cycle when using fetchpatch on this one From 1ccd871fde18054e7abed0d76f197cbc196fef9b Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 11 Apr 2017 12:55:36 +0300 Subject: [PATCH 7/8] procps: 3.3.11 -> 3.3.12 --- pkgs/os-specific/linux/procps-ng/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index afe1a4388600..c52dfbe461ae 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl, ncurses }: -stdenv.mkDerivation { - name = "procps-3.3.11"; +stdenv.mkDerivation rec { + name = "procps-${version}"; + version = "3.3.12"; src = fetchurl { - url = mirror://sourceforge/procps-ng/procps-ng-3.3.11.tar.xz; - sha256 = "1va4n0mpsq327ca9dqp4hnrpgs6821rp0f2m0jyc1bfjl9lk2jg9"; + url = "mirror://sourceforge/procps-ng/procps-ng-${version}.tar.xz"; + sha256 = "1m57w6jmry84njd5sgk5afycbglql0al80grx027kwqqcfw5mmkf"; }; buildInputs = [ ncurses ]; From e4b48c71864400a0e2ba79258668ff9b4762cd82 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 11 Apr 2017 14:00:49 +0300 Subject: [PATCH 8/8] libsigsegv: Remove aarch64 patch, enable tests The aarch64 patch has been applied upstream. Let's hope that the new release fixes the tests as well. --- pkgs/development/libraries/libsigsegv/aarch64.patch | 12 ------------ pkgs/development/libraries/libsigsegv/default.nix | 9 +-------- 2 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 pkgs/development/libraries/libsigsegv/aarch64.patch diff --git a/pkgs/development/libraries/libsigsegv/aarch64.patch b/pkgs/development/libraries/libsigsegv/aarch64.patch deleted file mode 100644 index 7bb48a230cee..000000000000 --- a/pkgs/development/libraries/libsigsegv/aarch64.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/configure b/configure -index 6c4e868..0298e19 100755 ---- a/configure -+++ b/configure -@@ -14501,6 +14501,7 @@ else - - case "$host_cpu" in - a29k | \ -+ aarch64* | \ - alpha* | \ - arc | \ - arm* | strongarm* | xscale* | \ diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix index 1cbd5bb52f55..0e644686af02 100644 --- a/pkgs/development/libraries/libsigsegv/default.nix +++ b/pkgs/development/libraries/libsigsegv/default.nix @@ -8,14 +8,7 @@ stdenv.mkDerivation rec { sha256 = "063swdvq7mbmc1clv0rnh20grwln1zfc2qnm0sa1hivcxyr2wz6x"; }; - # Based on https://github.com/davidgfnet/buildroot-Os/blob/69fe6065b9dd1cb4dcc0a4b554e42cc2e5bd0d60/package/libsigsegv/libsigsegv-0002-fix-aarch64-build.patch - # but applied directly to configure since we can't use autoreconf while bootstrapping. - patches = if stdenv.isAarch64 || stdenv.cross.arch or "" == "aarch64" - then [ ./aarch64.patch ] - else null; # TODO: change to lib.optional on next mass rebuild - - # https://github.com/NixOS/nixpkgs/issues/6028 - doCheck = false; + doCheck = true; meta = { homepage = http://www.gnu.org/software/libsigsegv/;