From 12e0c5c76c4b6bcd6295096416f906bef3755f2c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 7 Jul 2021 13:20:37 -0700 Subject: [PATCH 1/7] nixUnstable: 2.4pre20210601_5985b8b -> 2.4pre20210707_02dd6bb (cherry picked from commit 2d1568561b80205b89a5b47e892e636441c26720) --- pkgs/tools/package-management/nix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 2658d4f44a8..8fb6692c490 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -211,13 +211,13 @@ in rec { nixUnstable = lib.lowPrio (callPackage common rec { pname = "nix"; version = "2.4${suffix}"; - suffix = "pre20210601_5985b8b"; + suffix = "pre20210707_02dd6bb"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "5985b8b5275605ddd5e92e2f0a7a9f494ac6e35d"; - sha256 = "sha256-2So7ZsD8QJlOXCYqdoj8naNgBw6O4Vw1MM2ORsaqlXc="; + rev = "02dd6bb610e55a009cd7a4c83639698d3a7acaa2"; + sha256 = "sha256-ARRiLrDOK+JQtvVXsYegspENYimQzilvdTfO7eiBuaA="; }; inherit storeDir stateDir confDir boehmgc; From 60370d7133072e1e9140bd444c464cc4bbb45a69 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 7 Jul 2021 22:49:18 +0200 Subject: [PATCH 2/7] nixUnstable: patch boehmgc (nix#4944) As has been done in https://github.com/NixOS/nix/pull/4944 This introduces the boehmgc_nix and boehmgc_nixUnstable attributes which are useful for external packages that link with Nix and its boehmgc. (cherry picked from commit 596ac242af767b38e48af9076887b206dc72e472) --- pkgs/tools/package-management/nix/default.nix | 11 ++++++++--- pkgs/top-level/all-packages.nix | 13 ++++++++++++- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 8fb6692c490..49da6f40dce 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -2,7 +2,8 @@ , storeDir ? "/nix/store" , stateDir ? "/nix/var" , confDir ? "/etc" -, boehmgc +, boehmgc_nix +, boehmgc_nixUnstable , Security }: @@ -205,7 +206,9 @@ in rec { sha256 = "sha256-cToMnZU3+UpjeiiXnG3clz9zn8Xk+TbB7UbqmLMrlFk="; }; - inherit storeDir stateDir confDir boehmgc; + boehmgc = boehmgc_nix; + + inherit storeDir stateDir confDir; }); nixUnstable = lib.lowPrio (callPackage common rec { @@ -220,7 +223,9 @@ in rec { sha256 = "sha256-ARRiLrDOK+JQtvVXsYegspENYimQzilvdTfO7eiBuaA="; }; - inherit storeDir stateDir confDir boehmgc; + boehmgc = boehmgc_nixUnstable; + + inherit storeDir stateDir confDir; }); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91a0792812b..ace98e80db3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14274,6 +14274,18 @@ in boehmgc = callPackage ../development/libraries/boehm-gc { }; boehmgc_766 = callPackage ../development/libraries/boehm-gc/7.6.6.nix { }; + boehmgc_nix = pkgs.boehmgc.override { + enableLargeConfig = true; + }; + boehmgc_nixUnstable = pkgs.boehmgc_nix.overrideAttrs (drv: { + patches = (drv.patches or []) ++ [ + # Part of the GC solution in https://github.com/NixOS/nix/pull/4944 + (pkgs.fetchpatch { + url = https://github.com/hercules-ci/nix/raw/5c58d84a76d96f269e3ff1e72c9c9ba5f68576af/boehmgc-coroutine-sp-fallback.diff; + sha256 = "sha256-JvnWVTlkltmQUs/0qApv/LPZ690UX1/2hEP+LYRwKbI="; + }) + ]; + }); boolstuff = callPackage ../development/libraries/boolstuff { }; @@ -30440,7 +30452,6 @@ in inherit (callPackage ../tools/package-management/nix { storeDir = config.nix.storeDir or "/nix/store"; stateDir = config.nix.stateDir or "/nix/var"; - boehmgc = boehmgc.override { enableLargeConfig = true; }; inherit (darwin.apple_sdk.frameworks) Security; }) nix From 648f26faa4d2079e2edacf1bdc771b45b53d42b1 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 18 Jul 2021 00:00:00 +0200 Subject: [PATCH 3/7] boehmgc_{nix,nixUnstable}: Move into {nix,nixUnstable}.passthru Do not pollute top-level, but do provide allow the derivations to be accessed for debugging and reuse if necessary. (cherry picked from commit 2c2e1db91db465d7a83593d9322aa204c0fa4b43) --- pkgs/tools/package-management/nix/default.nix | 18 ++++++++++++++++-- pkgs/top-level/all-packages.nix | 12 ------------ 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 49da6f40dce..2b369527b1f 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -2,8 +2,7 @@ , storeDir ? "/nix/store" , stateDir ? "/nix/var" , confDir ? "/etc" -, boehmgc_nix -, boehmgc_nixUnstable +, boehmgc , Security }: @@ -190,10 +189,25 @@ common = preBuild = "unset NIX_INDENT_MAKE"; }); + inherit boehmgc; }; }; in nix; + boehmgc_nix = boehmgc.override { + enableLargeConfig = true; + }; + + boehmgc_nixUnstable = boehmgc_nix.overrideAttrs (drv: { + patches = (drv.patches or []) ++ [ + # Part of the GC solution in https://github.com/NixOS/nix/pull/4944 + (fetchpatch { + url = https://github.com/hercules-ci/nix/raw/5c58d84a76d96f269e3ff1e72c9c9ba5f68576af/boehmgc-coroutine-sp-fallback.diff; + sha256 = "sha256-JvnWVTlkltmQUs/0qApv/LPZ690UX1/2hEP+LYRwKbI="; + }) + ]; + }); + in rec { nix = nixStable; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ace98e80db3..e30789efd85 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14274,18 +14274,6 @@ in boehmgc = callPackage ../development/libraries/boehm-gc { }; boehmgc_766 = callPackage ../development/libraries/boehm-gc/7.6.6.nix { }; - boehmgc_nix = pkgs.boehmgc.override { - enableLargeConfig = true; - }; - boehmgc_nixUnstable = pkgs.boehmgc_nix.overrideAttrs (drv: { - patches = (drv.patches or []) ++ [ - # Part of the GC solution in https://github.com/NixOS/nix/pull/4944 - (pkgs.fetchpatch { - url = https://github.com/hercules-ci/nix/raw/5c58d84a76d96f269e3ff1e72c9c9ba5f68576af/boehmgc-coroutine-sp-fallback.diff; - sha256 = "sha256-JvnWVTlkltmQUs/0qApv/LPZ690UX1/2hEP+LYRwKbI="; - }) - ]; - }); boolstuff = callPackage ../development/libraries/boolstuff { }; From e1a569f3417c667c14a9522b16ad94c82647e99c Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Mon, 28 Jun 2021 16:24:52 -0500 Subject: [PATCH 4/7] openjdk: 11.0.10+11 -> 11.0.11+9 fixes #128407 --- pkgs/development/compilers/openjdk/11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index 15238e63ecb..c4b6c707f2b 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -11,7 +11,7 @@ let major = "11"; minor = "0"; - update = "10"; + update = "11"; build = "9"; openjdk = stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ let owner = "openjdk"; repo = "jdk${major}u"; rev = "jdk-${version}"; - sha256 = "06pm3hpz4ggiqwvkgzxr39y9kga7vk4flakfznz5979bvgb926vw"; + sha256 = "0jncsj424340xjfwv6sx5hy9sas80qa3ymkx0ng3by3z01y5rgfx"; }; nativeBuildInputs = [ pkg-config autoconf unzip ]; From cd0a0d23e3c76ac5d71785a55bc1fc387b8853bc Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Wed, 21 Jul 2021 14:45:26 -0600 Subject: [PATCH 5/7] openjdk: 11.0.11+9 -> 11.0.12+7 --- pkgs/development/compilers/openjdk/11.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index c4b6c707f2b..2518fc07684 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -11,8 +11,8 @@ let major = "11"; minor = "0"; - update = "11"; - build = "9"; + update = "12"; + build = "7"; openjdk = stdenv.mkDerivation rec { pname = "openjdk" + lib.optionalString headless "-headless"; @@ -22,7 +22,7 @@ let owner = "openjdk"; repo = "jdk${major}u"; rev = "jdk-${version}"; - sha256 = "0jncsj424340xjfwv6sx5hy9sas80qa3ymkx0ng3by3z01y5rgfx"; + sha256 = "0s8g6gj5vhm7hbp05cqaxasjrkwr41fm634qim8q6slklm4pkkli"; }; nativeBuildInputs = [ pkg-config autoconf unzip ]; From 43c41565f78c9ff93e08fc825df20078597d8c20 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 21 Jul 2021 04:20:00 +0000 Subject: [PATCH 6/7] redis: 6.2.4 -> 6.2.5 https://github.com/redis/redis/releases/tag/6.2.5 (cherry picked from commit b155b06e1dc296b471f0e43e02400c8d9c5af70d) --- pkgs/servers/nosql/redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index a1b2b0570c3..d9c17bcca9b 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "redis"; - version = "6.2.4"; + version = "6.2.5"; src = fetchurl { url = "https://download.redis.io/releases/${pname}-${version}.tar.gz"; - sha256 = "0vp1d9mlfsppry3nsj9f7bmh9wjgsy3jggp24sac1hhgl43c8cms"; + sha256 = "1bjismh8lrvsjkm1wf5ak0igak5rr9cc39i0brwb6x0vk9q7b6jb"; }; # Cross-compiling fixes From bdf036229a45816190439bcb477db623874d0dc5 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 22 Jul 2021 11:55:20 +0200 Subject: [PATCH 7/7] signal-desktop: 5.9.0 -> 5.10.0 (cherry picked from commit 8c1f8ac915ec379872a88b2613718723dc7f6c35) --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index f0580e845e1..b01736642ea 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -25,7 +25,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.9.0"; # Please backport all updates to the stable channel. + version = "5.10.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1pmyi9b0b5h6mi6dwml41x4igy8rfpsv6j67izh78m5gla8wp34h"; + sha256 = "049i4nypqr6lx8f3w32pia6cfb3pmqmvasxjb5zhp6mxb3vn7wz3"; }; nativeBuildInputs = [