From 9b1ef47ae371a393771eb4c457ef406d0dfb42e2 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 27 Feb 2021 12:23:37 -0500 Subject: [PATCH 01/23] spidermonkey_78: fix build on armv7l Adds a patch from Debian to fix a build failure on armv7l. (cherry picked from commit 1b1e681d77dc0452c4b557aa6e10f2e02e0650ca) --- pkgs/development/interpreters/spidermonkey/78.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/interpreters/spidermonkey/78.nix b/pkgs/development/interpreters/spidermonkey/78.nix index c1cc53ea6c6..9b81dcc55e7 100644 --- a/pkgs/development/interpreters/spidermonkey/78.nix +++ b/pkgs/development/interpreters/spidermonkey/78.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchurl +, fetchpatch , autoconf213 , pkg-config , perl @@ -27,6 +28,15 @@ stdenv.mkDerivation rec { sha256 = "0zjpzkxx3wc2840d7q4b9lnkj1kwk1qps29s9c83jf5y6xclnf9q"; }; + patches = [ + # Fix build failure on armv7l using Debian patch + # Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1526653 + (fetchpatch { + url = "https://salsa.debian.org/mozilla-team/firefox/commit/fd6847c9416f9eebde636e21d794d25d1be8791d.patch"; + sha256 = "02b7zwm6vxmk61aj79a6m32s1k5sr0hwm3q1j4v6np9jfyd10g1j"; + }) + ]; + outputs = [ "out" "dev" ]; setOutputFlags = false; # Configure script only understands --includedir From 0d44dce5307d6bf40e2860d5d0c8f03cc0473bfd Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Wed, 2 Jun 2021 02:02:18 +0200 Subject: [PATCH 02/23] tk-8_6: fix hash after tcl-8_6 update tcl-8_6 was updated in 4fb92ae60d68344254b2bb753c03fd72f3ffb35c from 8.6.9 -> 8.6.11 but tk's hash wasn't updated at the same time, which means the current hash was still from tk 8.6.9 rather than 8.6.11. (cherry picked from commit d9bf02324af69a6543a3c5131f4a0f58cea6567a) --- pkgs/development/interpreters/tcl/8.5.nix | 2 ++ pkgs/development/interpreters/tcl/8.6.nix | 2 ++ pkgs/development/libraries/tk/8.6.nix | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/tcl/8.5.nix b/pkgs/development/interpreters/tcl/8.5.nix index 193ff4f9376..9daf67fe2bd 100644 --- a/pkgs/development/interpreters/tcl/8.5.nix +++ b/pkgs/development/interpreters/tcl/8.5.nix @@ -4,6 +4,8 @@ callPackage ./generic.nix (args // rec { release = "8.5"; version = "${release}.18"; + # Note: when updating, the hash in pkgs/development/libraries/tk/8.5.nix must also be updated! + src = fetchurl { url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz"; sha256 = "1jfkqp2fr0xh6xvaqx134hkfa5kh7agaqbxm6lhjbpvvc1xfaaq3"; diff --git a/pkgs/development/interpreters/tcl/8.6.nix b/pkgs/development/interpreters/tcl/8.6.nix index 37a7fee8a85..03fcb831779 100644 --- a/pkgs/development/interpreters/tcl/8.6.nix +++ b/pkgs/development/interpreters/tcl/8.6.nix @@ -4,6 +4,8 @@ callPackage ./generic.nix (args // rec { release = "8.6"; version = "${release}.11"; + # Note: when updating, the hash in pkgs/development/libraries/tk/8.6.nix must also be updated! + src = fetchurl { url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz"; sha256 = "0n4211j80mxr6ql0xx52rig8r885rcbminfpjdb2qrw6hmk8c14c"; diff --git a/pkgs/development/libraries/tk/8.6.nix b/pkgs/development/libraries/tk/8.6.nix index fdffbeba2c9..33e3f8e4167 100644 --- a/pkgs/development/libraries/tk/8.6.nix +++ b/pkgs/development/libraries/tk/8.6.nix @@ -4,7 +4,7 @@ callPackage ./generic.nix (args // { src = fetchurl { url = "mirror://sourceforge/tcl/tk${tcl.version}.1-src.tar.gz"; # TODO: remove '.1' for v8.6.10 or v8.7.x - sha256 = "1d7bfkxpacy33w5nahf73lkwxqpff44w1jplg7i2gmwgiaawvjwg"; + sha256 = "1gh9k7l76qg9l0sb78ijw9xz4xl1af47aqbdifb6mjpf3cbsnv00"; }; patches = [ ./different-prefix-with-tcl.patch ] ++ lib.optionals stdenv.isDarwin [ ./Fix-bad-install_name-for-libtk8.6.dylib.patch ]; From d294ef4aa917bd3ee704fc5f9e5a5fb890acafd9 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 23 Aug 2021 21:05:28 -0400 Subject: [PATCH 03/23] blas: fix library id on darwin dyld: lazy symbol binding failed: Symbol not found: _dsyevd_ Referenced from: /nix/store/lr8grz1knmh6vc7j830gni0ka68qf1lk-xfitter-2.0.1/bin/xfitter Expected in: /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBLAS.dylib (cherry picked from commit de4c61a51501de52937b5299dbd598cbe0b97aac) --- pkgs/build-support/alternatives/blas/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/alternatives/blas/default.nix b/pkgs/build-support/alternatives/blas/default.nix index cf880677fdd..b771e182fe5 100644 --- a/pkgs/build-support/alternatives/blas/default.nix +++ b/pkgs/build-support/alternatives/blas/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation { patchelf --set-rpath "$(patchelf --print-rpath $out/lib/libblas${canonicalExtension}):${lib.getLib blasProvider}/lib" $out/lib/libblas${canonicalExtension} '' else if stdenv.hostPlatform.isDarwin then '' install_name_tool \ - -id libblas${canonicalExtension} \ + -id $out/lib/libblas${canonicalExtension} \ -add_rpath ${lib.getLib blasProvider}/lib \ $out/lib/libblas${canonicalExtension} '' else "") + '' From 297d8d1547bd558731d9349eb0061d16746fc7b4 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 1 Sep 2021 04:20:00 +0000 Subject: [PATCH 04/23] postgresql_9_6: 9.6.22 -> 9.6.23 https://www.postgresql.org/docs/release/9.6.23/ (cherry picked from commit 957a9bd035a9d1a032a2c881b75b42626e16a0f6) --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 6ab4ecbec4b..d3c494681a3 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -196,9 +196,9 @@ let in self: { postgresql_9_6 = self.callPackage generic { - version = "9.6.22"; + version = "9.6.23"; psqlSchema = "9.6"; - sha256 = "0c19kzrj5ib5ygmavf5d6qvxdwrxzzz6jz1r2dl5b815208cscix"; + sha256 = "1fa735lrmv2vrfiixg73nh024gxlagcbrssklvgwdf0s82cgfjd8"; this = self.postgresql_9_6; thisAttr = "postgresql_9_6"; inherit self; From 44a33d44a663539243ce3a7ea1915b3f7513ab5d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 1 Sep 2021 04:20:00 +0000 Subject: [PATCH 05/23] postgresql_10: 10.17 -> 10.18 https://www.postgresql.org/docs/release/10.18/ (cherry picked from commit 4c5bf33b5d01bf3524cd96ddcbe6d40787f66de7) --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index d3c494681a3..e8cae03d3ff 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -205,9 +205,9 @@ in self: { }; postgresql_10 = self.callPackage generic { - version = "10.17"; + version = "10.18"; psqlSchema = "10.0"; # should be 10, but changing it is invasive - sha256 = "0v5jahkqm6gkq67s4bac3h7297bscn2ab6y128idi73cc1qq1wjs"; + sha256 = "009qpb02bq0rx0aaw5ck70gk07xwparhfxvlfimgihw2vhp7qisp"; this = self.postgresql_10; thisAttr = "postgresql_10"; inherit self; From 1f3805f7bb1ae940dab14e1b9cb824e2ee7d4e0d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 1 Sep 2021 04:20:00 +0000 Subject: [PATCH 06/23] postgresql_11: 11.12 -> 11.13 https://www.postgresql.org/docs/release/11.13/ (cherry picked from commit 34418e4c2a23a2a461b0b3666a6088040b5962e8) --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index e8cae03d3ff..2fd940efe09 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -215,9 +215,9 @@ in self: { }; postgresql_11 = self.callPackage generic { - version = "11.12"; + version = "11.13"; psqlSchema = "11.1"; # should be 11, but changing it is invasive - sha256 = "016bacpmqxc676ipzc1l8zv1jj44mjz7dv7jhqazg3ibdfqxiyc7"; + sha256 = "0j5wnscnxa3sx8d39s55654df8aikmvkihfb0a02hrgmyygnihx0"; this = self.postgresql_11; thisAttr = "postgresql_11"; inherit self; From d04c1e30be941b5aa7adfda7d2495f5c8a1c72c7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 1 Sep 2021 04:20:00 +0000 Subject: [PATCH 07/23] postgresql_12: 12.7 -> 12.8 https://www.postgresql.org/docs/release/12.8/ (cherry picked from commit 677b27c24ee49f548c5593c7938917824bf1f806) --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 2fd940efe09..03d1dab4dda 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -224,9 +224,9 @@ in self: { }; postgresql_12 = self.callPackage generic { - version = "12.7"; + version = "12.8"; psqlSchema = "12"; - sha256 = "15frsmsl1n2i4p76ji0wng4lvnlzw6f01br4cs5xr3n88wgp9444"; + sha256 = "0an6v5bsp26d276wbdx76lsq6cq86hgi2fmkzwawnk63j3h02r72"; this = self.postgresql_12; thisAttr = "postgresql_12"; inherit self; From 1b7893c31a3ebc4541bd70741c239a06b3abed06 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 1 Sep 2021 04:20:00 +0000 Subject: [PATCH 08/23] postgresql_13: 13.3 -> 13.4 https://www.postgresql.org/docs/release/13.4/ (cherry picked from commit 3290dd08a210653cb505de997d244d498ce71178) --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 03d1dab4dda..b926ff0bc15 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -233,9 +233,9 @@ in self: { }; postgresql_13 = self.callPackage generic { - version = "13.3"; + version = "13.4"; psqlSchema = "13"; - sha256 = "18dliq7h2l8irffhyyhdmfwx3si515q6gds3cxdjb9n7m17lbn9w"; + sha256 = "1kf0gcsrl5n25rjlvkh87aywmn28kbwvakm5c7j1qpr4j01y34za"; this = self.postgresql_13; thisAttr = "postgresql_13"; inherit self; From bebbeb191813899db2c2daf72d02503c67fe7b03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Fri, 14 May 2021 18:36:36 +0200 Subject: [PATCH 09/23] bluez: Disable kernel dependent test-mesh-crypto I'm having trouble building bluez on a CentOS 7.9 builder. Turns out that the test-mesh-crypto test depends on the following Linux kernel configuration items: CONFIG_CRYPTO_[USER|USER_API|USER_API_AEAD|USER_API_HASH|AES|CCM|AEAD|CMAC] and will fail if run wih an incompatible kernel with the following error message: ... IVindex = 12345678 NetworkNonce = 00800000011201000012345678 00800000011201000012345678 => PASS PrivacyRandom = 000000000012345678b5e5bfdacbaf6c 000000000012345678fffd034b50057e => FAIL FAIL unit/test-mesh-crypto (exit status: 1) I found the same bug reported on Gentoo https://bugs.gentoo.org/704190. Their fix is to only run the test if the kernel options are available, which we don't want to do for build reproducibility. Instead we just want to skip the test unconditionally. As it's simpler to completely override the test instead of patching the build system, we opt for doing just that. (cherry picked from commit 05c517698dcf6a989e364863cf5e7f6f548dd50a) --- pkgs/os-specific/linux/bluez/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index 2e342fbc039..96b9e5937b3 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -48,6 +48,11 @@ in stdenv.mkDerivation rec { substituteInPlace tools/hid2hci.rules \ --replace /sbin/udevadm ${systemd}/bin/udevadm \ --replace "hid2hci " "$out/lib/udev/hid2hci " + # Disable some tests: + # - test-mesh-crypto depends on the following kernel settings: + # CONFIG_CRYPTO_[USER|USER_API|USER_API_AEAD|USER_API_HASH|AES|CCM|AEAD|CMAC] + if [[ ! -f unit/test-mesh-crypto.c ]]; then echo "unit/test-mesh-crypto.c no longer exists"; false; fi + echo 'int main() { return 77; }' > unit/test-mesh-crypto.c ''; configureFlags = [ From 047ab4430172bebf96afcc4d6c1e6272cd970e87 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 17 Jun 2021 12:48:52 +0000 Subject: [PATCH 10/23] glib: 2.68.2 -> 2.68.3 (cherry picked from commit 57bbd4e524ef7f3ac5e21a1d045b6556948142e0) --- pkgs/development/libraries/glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index e15f5975786..3c8fe4d569f 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "glib"; - version = "2.68.2"; + version = "2.68.3"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-7Md5ipzANOq9/X8kbm3UYc2/EXX8wumGfMfae3MJ4Ps="; + sha256 = "0f1iprj7v0b5wn9njj39dkl25g6filfs7i4ybk20jq821k1a7qg7"; }; patches = optionals stdenv.isDarwin [ From 8477cb78b58af1d2c59dc8ba7149669edde6a7e7 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Mon, 30 Aug 2021 20:26:52 +0200 Subject: [PATCH 11/23] glib: 2.68.3 -> 2.68.4 - https://gitlab.gnome.org/GNOME/glib/-/releases/2.68.4 (cherry picked from commit 0074a8fb8f54b1ae43ee5309b29d07af16b75e76) --- pkgs/development/libraries/glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 3c8fe4d569f..edb37d2ddd3 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "glib"; - version = "2.68.3"; + version = "2.68.4"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0f1iprj7v0b5wn9njj39dkl25g6filfs7i4ybk20jq821k1a7qg7"; + sha256 = "sha256-Yv0GHQinVJJhfmJac+LAXiWfgxrLuOH4ucgfI/eZOjs="; }; patches = optionals stdenv.isDarwin [ From 8e236ada200dc3638cb1eeef95f164e74ada5c16 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Aug 2021 08:14:52 +0000 Subject: [PATCH 12/23] libarchive: 3.5.1 -> 3.5.2 (cherry picked from commit b8bfe4d74c1a76897cde37d591698653d722a462) --- pkgs/development/libraries/libarchive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index f53d1b1a12f..2a1d53e6ee0 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -12,13 +12,13 @@ assert xarSupport -> libxml2 != null; stdenv.mkDerivation rec { pname = "libarchive"; - version = "3.5.1"; + version = "3.5.2"; src = fetchFromGitHub { owner = "libarchive"; repo = "libarchive"; rev = "v${version}"; - sha256 = "sha256-RFPhe4PCq8OLwa6c7ir+5u9jBsUxS5M/fcZYAG9W6R0="; + sha256 = "sha256-H00UJ+ON1kBc19BgWBBKmO8f23oAg2mk7o9hhDhn50Q="; }; outputs = [ "out" "lib" "dev" ]; From 1bfd789f3ff67eb3f72b0e2948b63bfc87d90e65 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Fri, 3 Sep 2021 22:46:55 +0100 Subject: [PATCH 13/23] python3Packages.pillow: 8.3.1 -> 8.3.2 disable test test_pyroma (cherry picked from commit 9683168300c78f6e0001a6098251d3252048df0c) --- pkgs/development/python-modules/pillow/default.nix | 4 ++-- pkgs/development/python-modules/pillow/generic.nix | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index af6c3d80dea..c6bb944c232 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -5,13 +5,13 @@ import ./generic.nix (rec { pname = "Pillow"; - version = "8.3.1"; + version = "8.3.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "2cac53839bfc5cece8fdbe7f084d5e3ee61e1303cccc86511d351adcb9e2c792"; + sha256 = "1361y215ydmdh4il1vay5831aqivmpwgzjqrphqjdiq0ipnz7qyx"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/pillow/generic.nix b/pkgs/development/python-modules/pillow/generic.nix index 3e33f1a8aa0..142aa1e9cf0 100644 --- a/pkgs/development/python-modules/pillow/generic.nix +++ b/pkgs/development/python-modules/pillow/generic.nix @@ -18,7 +18,11 @@ buildPythonPackage rec { ''; # Disable darwin tests which require executables: `iconutil` and `screencapture` - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = [ + # pyroma version in 21.05 complains about python 3.10 reference in + # classifier tags + "test_pyroma" + ] ++ lib.optionals stdenv.isDarwin [ "test_grab" "test_grabclipboard" "test_save" From 0f6e8f74d25f8bd3aba9ab2212d0baabad359e90 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 7 Sep 2021 20:55:37 +0100 Subject: [PATCH 14/23] libgcrypt: 1.9.3 -> 1.9.4 (cherry picked from commit e75b181a6a732e942f7ce66901e1fb806dde0204) --- pkgs/development/libraries/libgcrypt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 506b1a5b25f..6b0f4aad444 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -4,11 +4,11 @@ assert enableCapabilities -> stdenv.isLinux; stdenv.mkDerivation rec { pname = "libgcrypt"; - version = "1.9.3"; + version = "1.9.4"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${pname}-${version}.tar.bz2"; - sha256 = "sha256-l+vk+U4vfjW3UhlM4VoPPGYyTg/2ryZlm7+1/y7DKP0="; + sha256 = "1xxabjv45zlxyryiwhmbfblsx41kl267wsb78bny6m14ly1rr17a"; }; outputs = [ "out" "dev" "info" ]; From c05d4e82d3e6e7b47fc7f86440b148de192705a6 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 10 Sep 2021 09:35:53 +1000 Subject: [PATCH 15/23] go_1_16: 1.16.7 -> 1.16.8 (cherry picked from commit a9dd9983de642b0d4522f2dc3cafa2be65562f7c) --- pkgs/development/compilers/go/1.16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.16.nix b/pkgs/development/compilers/go/1.16.nix index 0586b40e1e6..1bc523c0c21 100644 --- a/pkgs/development/compilers/go/1.16.nix +++ b/pkgs/development/compilers/go/1.16.nix @@ -50,11 +50,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.16.7"; + version = "1.16.8"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-Gp8olNPYeHKfcEUHLzC+zr4kNSTPL85OCnskix4GVKw="; + sha256 = "sha256-jyqMJLeTN1syQ9+C/bDIOHSG3MioksocmRqpms4Ia5g="; }; # perl is used for testing go vet From bf76456a65728feb7fec48a734f35c3c09d20522 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 12 Sep 2021 13:13:19 +0100 Subject: [PATCH 16/23] ghostscript: add passthru.tests.test-corpus-render this simply attempts rendering every ps/eps/pdf file in the ghostscript test corpus (cherry picked from commit 57692f6d3e48766a7c50fa00f6157ece953595ca) --- pkgs/misc/ghostscript/default.nix | 4 ++- pkgs/misc/ghostscript/test-corpus-render.nix | 38 ++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 pkgs/misc/ghostscript/test-corpus-render.nix diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 760ec2bc053..512b0cf9ede 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -1,6 +1,6 @@ { config, stdenv, lib, fetchurl, pkg-config, zlib, expat, openssl, autoconf , libjpeg, libpng, libtiff, freetype, fontconfig, libpaper, jbig2dec -, libiconv, ijs, lcms2, fetchpatch +, libiconv, ijs, lcms2, fetchpatch, callPackage , cupsSupport ? config.ghostscript.cups or (!stdenv.isDarwin), cups ? null , x11Support ? cupsSupport, xlibsWrapper ? null # with CUPS, X11 only adds very little }: @@ -119,6 +119,8 @@ stdenv.mkDerivation rec { runHook postInstallCheck ''; + passthru.tests.test-corpus-render = callPackage ./test-corpus-render.nix {}; + meta = { homepage = "https://www.ghostscript.com/"; description = "PostScript interpreter (mainline version)"; diff --git a/pkgs/misc/ghostscript/test-corpus-render.nix b/pkgs/misc/ghostscript/test-corpus-render.nix new file mode 100644 index 00000000000..544392090ff --- /dev/null +++ b/pkgs/misc/ghostscript/test-corpus-render.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, fetchgit +, ghostscript +}: + +stdenv.mkDerivation { + pname = "ghostscript-test-corpus-render"; + version = "unstable-2020-02-19"; + + src = fetchgit { + url = "git://git.ghostscript.com/tests.git"; + rev = "efdd224340d9a407ed3ec22afa1cb127c8fee73c"; + sha256 = "1v1iqz897zzrwa8ng22zcf3y61ab5798jdwidgv10w1r9mjrl7ax"; + }; + + dontConfigure = true; + dontBuild = true; + + doCheck = true; + checkPhase = '' + find . -iregex '.*\.\(ps\|eps\|pdf\)' | while read f; do + echo "Rendering $f" + ${ghostscript}/bin/gs \ + -dNOPAUSE \ + -dBATCH \ + -sDEVICE=bitcmyk \ + -sOutputFile=/dev/null \ + -r600 \ + -dBufferSpace=100000 \ + $f + done + ''; + + installPhase = '' + touch $out + ''; +} From 551b0b44c98b6b64f788426371075c97a1007158 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 12 Sep 2021 12:37:36 +0000 Subject: [PATCH 17/23] linux: 5.10.63 -> 5.10.64 (cherry picked from commit 71348196a0aa2ca74487c7f8e24a02aad5ae42ab) --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index fb79da3e8c1..9fd437c8c39 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.63"; + version = "5.10.64"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0bnbkd4vbf43m37wab4zwvcv3wy3ixh4x1zrwlfhi845i21mx88r"; + sha256 = "02p36mf41nsa4bamw18vhgbca094q2blbqqljdsb9qid9b94pf1y"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ]; From e8a16eaa0dc7d14eacd6441cc94f9a192ed554d5 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 12 Sep 2021 12:37:47 +0000 Subject: [PATCH 18/23] linux: 5.13.15 -> 5.13.16 (cherry picked from commit f0878c65eb8824957a2eabb863cefac5b09df3b3) --- pkgs/os-specific/linux/kernel/linux-5.13.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.13.nix b/pkgs/os-specific/linux/kernel/linux-5.13.nix index 12900c6dec4..8c7d21886cb 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.13.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.13.15"; + version = "5.13.16"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "06v2jgzq2l56bjbymcrnaybqvvr1q44c0k534v77b3l5bwwlq2rk"; + sha256 = "1ljigvcg4q6ckr8kna3q5iyjsy7x5mrf1ycqfy0ibbhn9hbqjna9"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ]; From 316e87440680a25bd89fa88f2efdbfeb3a0dd5e0 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 12 Sep 2021 12:37:55 +0000 Subject: [PATCH 19/23] linux: 5.14.2 -> 5.14.3 (cherry picked from commit b81ac24356c60e63c7daccedf278c500f1ca5179) --- pkgs/os-specific/linux/kernel/linux-5.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.14.nix b/pkgs/os-specific/linux/kernel/linux-5.14.nix index 95f232e68f0..2a07ac2a0a9 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.14.2"; + version = "5.14.3"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "05yw3i2c21dabdn5khyk60ds4h8krg5iyxk4zq1msv0igdfqf6gl"; + sha256 = "1n5808v3vb2c27pv4f8r4avqzqp20dylclbc83cj2872d6z41hy6"; }; } // (args.argsOverride or { })) From 6541cd74b4849f3d3f78ab95fac9b28e6c3d090e Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 12 Sep 2021 12:38:02 +0000 Subject: [PATCH 20/23] linux: 5.4.144 -> 5.4.145 (cherry picked from commit be590b86e26f9144e7c2719650c57772bb797ed9) --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 6188ff2a382..f3a7cb85948 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.144"; + version = "5.4.145"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "11aqp12xwbg7ysac3f9iaxwkhvasdg9bw4r43jj8af5bf61bjhxw"; + sha256 = "1yb8vk5sbnyswylkpqw5i4n9cmnmlrfmbrnmy3nif579q8p7ixsw"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ]; From 34570a89c068a02bb2971b049b674f7b4a2eea1c Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 12 Sep 2021 12:38:42 +0000 Subject: [PATCH 21/23] linux-rt_5_4: 5.4.143-rt63 -> 5.4.143-rt64 (cherry picked from commit 5698fc0dfc669166371b07a12ed6908696b2776c) --- pkgs/os-specific/linux/kernel/linux-rt-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix index 7a1a4203cd8..ec065e6833e 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.4.143-rt63"; # updated by ./update-rt.sh + version = "5.4.143-rt64"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -21,7 +21,7 @@ in buildLinux (args // { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "13d9sx6vw3hlh0cpccfsfqkjj6yfjmbh4wp4x6ry84i39lrfbwg3"; + sha256 = "0prfrvk2ds20sclikizzgg5qf4mfcyaymp9r272d5nj35293622n"; }; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; From 91fd4cf610f5c4998f8703a7ec70843c6d657fab Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Sun, 5 Sep 2021 13:53:57 +0200 Subject: [PATCH 22/23] imagemagick: 7.1.0-5 -> 7.1.0-6 (cherry picked from commit 3e0e70d1d3f2d642534a21dfaa6a0b3bd3a78f2f) --- pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index ce1dbc8e3e8..f9cc4ce0cb6 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -18,13 +18,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-5"; + version = "7.1.0-6"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - sha256 = "sha256-iXE3kVpJHMuZ+H6aaZ1GuOUHnP0lO/Q1F5yK8sPPS3M="; + sha256 = "sha256-rwaMAkbSBTdrJ+OVZfAOBIp1tmC7/TC34w5gBIe+J94="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big From f569e48576830cd9a0107805bfe96fdc436982b6 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Sun, 12 Sep 2021 21:40:11 +0200 Subject: [PATCH 23/23] libexif: 0.6.22 -> 0.6.23 (cherry picked from commit 139cfd80d052b85d9dd364c1858bbcd5b9c6fe17) --- .../development/libraries/libexif/default.nix | 20 +++---------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/development/libraries/libexif/default.nix index 20e69c4ad66..1c650ad60de 100644 --- a/pkgs/development/libraries/libexif/default.nix +++ b/pkgs/development/libraries/libexif/default.nix @@ -1,30 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, gettext }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, gettext }: stdenv.mkDerivation rec { pname = "libexif"; - version = "0.6.22"; + version = "0.6.23"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "${pname}-${builtins.replaceStrings ["."] ["_"] version}-release"; - sha256 = "0mzndakdi816zcs13z7yzp7hj031p2dcyfq2p391r63d9z21jmy1"; + sha256 = "sha256-Os0yI/IPoe9MuhXgNdDaIg6uohclA2bjeu9t3tbUoNA="; }; - patches = [ - (fetchpatch { - name = "CVE-2020-0198.patch"; - url = "https://github.com/libexif/libexif/commit/ce03ad7ef4e8aeefce79192bf5b6f69fae396f0c.patch"; - sha256 = "1040278g5dbq3vvlyk8cmzb7flpi9bfsp99268hw69i6ilwbdf2k"; - }) - (fetchpatch { - name = "CVE-2020-0452.patch"; - url = "https://github.com/libexif/libexif/commit/9266d14b5ca4e29b970fa03272318e5f99386e06.patch"; - excludes = [ "NEWS" ]; - sha256 = "0k4z1gbbkli6wwyy9qm2qvn0h00qda6wqym61nmmbys7yc2zryj6"; - }) - ]; - nativeBuildInputs = [ autoreconfHook gettext ]; meta = with lib; {