From 93e78204491f38b6a94eb1b4bbed01c2b4cd5bf0 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 1 Nov 2021 23:53:02 -0700 Subject: [PATCH 1/5] nix_2_4: 2.4pre-rc1 -> 2.4 --- pkgs/tools/package-management/nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index db9b2c9465fa..bf308cf27c5e 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -233,13 +233,13 @@ in rec { nix_2_4 = callPackage common (rec { pname = "nix"; - version = "2.4pre-rc1"; + version = "2.4"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; rev = version; - sha256 = "sha256-KOb8etMm5LksvT2l+CkvqzMO1bgmo9tJmyaNh0LvaR8="; + sha256 = "sha256-op48CCDgLHK0qV1Batz4Ln5FqBiRjlE6qHTiZgt3b6k="; }; boehmgc = boehmgc_nixUnstable; From 971f4a097caf6be19b1b894f30b4cc7f9abdeec2 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 1 Nov 2021 23:54:06 -0700 Subject: [PATCH 2/5] nix_2_3: init @ 2.3.16 --- pkgs/tools/package-management/nix/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index bf308cf27c5e..121187c7769c 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -218,7 +218,9 @@ in rec { nix = nixStable; - nixStable = callPackage common (rec { + nixStable = nix_2_3; + + nix_2_3 = callPackage common (rec { pname = "nix"; version = "2.3.16"; src = fetchurl { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e7fbbf80de40..56c15d52b3d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32252,6 +32252,7 @@ with pkgs; }) nix nixStable + nix_2_3 nix_2_4 nixUnstable; From c37c7299aba0269ce25757e9b433dfe42c1a452e Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 2 Nov 2021 00:01:21 -0700 Subject: [PATCH 3/5] nixFlakes: nixUnstable -> nix_2_4 --- pkgs/top-level/aliases.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 388da7860a17..a320f6a29a29 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -590,7 +590,7 @@ mapAliases ({ nginxUnstable = nginxMainline; # added 2018-04-25 nilfs_utils = nilfs-utils; # added 2018-04-25 nix-review = nixpkgs-review; # added 2019-12-22 - nixFlakes = nixUnstable; # added 2021-05-21 + nixFlakes = nix_2_4; # added 2021-05-21 nmap_graphical = nmap-graphical; # added 2017-01-19 nmap-unfree = nmap; # added 2021-04-06 nologin = shadow; # added 2018-04-25 From 0d6fec737acbac2bc17205938459f5360c2de95f Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Wed, 3 Nov 2021 14:39:53 -0700 Subject: [PATCH 4/5] nix_2_4: fix NIX_LDFLAGS --- pkgs/tools/package-management/nix/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 121187c7769c..af8b69b25ad1 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -77,17 +77,12 @@ common = propagatedBuildInputs = [ boehmgc ]; - # Seems to be required when using std::atomic with 64-bit types - NIX_LDFLAGS = - # need to list libraries individually until + NIX_LDFLAGS = lib.optionals (!is24) [ # https://github.com/NixOS/nix/commit/3e85c57a6cbf46d5f0fe8a89b368a43abd26daba - # is in a release - lib.optionalString enableStatic "-lssl -lbrotlicommon -lssh2 -lz -lnghttp2 -lcrypto" - - # need to detect it here until + (lib.optionalString enableStatic "-lssl -lbrotlicommon -lssh2 -lz -lnghttp2 -lcrypto") # https://github.com/NixOS/nix/commits/74b4737d8f0e1922ef5314a158271acf81cd79f8 - # is in a release - + lib.optionalString (stdenv.hostPlatform.system == "armv5tel-linux" || stdenv.hostPlatform.system == "armv6l-linux") "-latomic"; + (lib.optionalString (stdenv.hostPlatform.system == "armv5tel-linux" || stdenv.hostPlatform.system == "armv6l-linux") "-latomic") + ]; preConfigure = # Copy libboost_context so we don't get all of Boost in our closure. From 372a7456a8d0e7cbceb9ef8ba9a889be7baa895c Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Wed, 3 Nov 2021 14:58:55 -0700 Subject: [PATCH 5/5] nix: disable separateDebugInfo for nix_2_4 static --- pkgs/tools/package-management/nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index af8b69b25ad1..7df444177c5e 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -147,7 +147,7 @@ common = export TMPDIR=$NIX_BUILD_TOP ''; - separateDebugInfo = stdenv.isLinux; + separateDebugInfo = stdenv.isLinux && (is24 -> !enableStatic); enableParallelBuilding = true;