From 5ce0a82d0c12408ee6f86feb388996f20d0efdfe Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Sun, 7 Sep 2025 02:36:11 -0700 Subject: [PATCH 1/4] nix-serve: update to componentized Nix Co-authored-by: Guillame Maudoux --- pkgs/by-name/ni/nix-serve/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nix-serve/package.nix b/pkgs/by-name/ni/nix-serve/package.nix index 943b3f76f863d..0f7d81484843b 100644 --- a/pkgs/by-name/ni/nix-serve/package.nix +++ b/pkgs/by-name/ni/nix-serve/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, bzip2, nix, + perl, makeWrapper, nixosTests, }: @@ -11,6 +12,7 @@ let rev = "a7e046db4b29d422fc9aac60ea6b82b31399951a"; sha256 = "sha256-6ZQ0OLijq6UtOtUqRdFC19+helhU0Av6MvGCZf6XmcQ="; + inherit (nix.libs) nix-perl-bindings; in stdenv.mkDerivation { @@ -31,11 +33,11 @@ stdenv.mkDerivation { install -Dm0755 nix-serve.psgi $out/libexec/nix-serve/nix-serve.psgi makeWrapper ${ - nix.perl-bindings.perl.withPackages (p: [ + perl.withPackages (p: [ p.DBDSQLite p.Plack p.Starman - nix.perl-bindings + nix-perl-bindings ]) }/bin/starman $out/bin/nix-serve \ --prefix PATH : "${ From 4b1a0a4aab4626187c91da164079b516da3005c8 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Sat, 6 Sep 2025 07:31:51 -0700 Subject: [PATCH 2/4] nixVersions.stable: nix_2_28 -> nix_2_31 --- nixos/modules/installer/tools/nix-fallback-paths.nix | 12 ++++++------ pkgs/tools/package-management/nix/default.nix | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index d4caef1a09abc..f6f99b6218d28 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,8 +1,8 @@ { - x86_64-linux = "/nix/store/0bvxg6fr61zrlhi93azhp8yfhb5rcrs9-nix-2.28.5"; - i686-linux = "/nix/store/m5na49mxl4xpcs3xh086s5v08jqjhbmb-nix-2.28.5"; - aarch64-linux = "/nix/store/95rhdhjfwbi7ilwy5j0knj1852p7x6c6-nix-2.28.5"; - riscv64-linux = "/nix/store/cqiiv36c773023p6lp9h4ff57fjlzisk-nix-riscv64-unknown-linux-gnu-2.28.5"; - x86_64-darwin = "/nix/store/xiw5636h616yi3balx96pmdk6b052rhk-nix-2.28.5"; - aarch64-darwin = "/nix/store/sax8chv80d9fy4s0y3ahsr9y4kc2f0ib-nix-2.28.5"; + x86_64-linux = "/nix/store/x30lnlgk1s16rynrfslbf8phr6h6rqf2-nix-2.31.2"; + i686-linux = "/nix/store/ix94q6rrdg6cr4893cjpzdbmibhlm0dv-nix-2.31.2"; + aarch64-linux = "/nix/store/xnybj9lk0kwvmr2va253avanq7m3cpyg-nix-2.31.2"; + riscv64-linux = "/nix/store/33as1vqp8mq36nr5bb5gr7ziw1nf4q1v-nix-riscv64-unknown-linux-gnu-2.31.2"; + x86_64-darwin = "/nix/store/b9dvary8rcljj7ajv1x64hwwch4cvyvp-nix-2.31.2"; + aarch64-darwin = "/nix/store/lvv1j8qbrvlnl3aagcjrhf42d458zgb5-nix-2.31.2"; } diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 0732ef3c404ec..72f93b261e616 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -196,7 +196,7 @@ lib.makeExtensible ( latest = self.nix_2_31; # Read ./README.md before bumping a major release - stable = addFallbackPathsCheck self.nix_2_28; + stable = addFallbackPathsCheck self.nix_2_31; } // lib.optionalAttrs config.allowAliases ( lib.listToAttrs ( From 9e95acea1b8c786bae07d1b46b98caa87093fe5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 22 Sep 2025 21:16:52 +0200 Subject: [PATCH 3/4] remove nixStatic from nix.passthru.tests --- pkgs/tools/package-management/nix/tests.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/tests.nix b/pkgs/tools/package-management/nix/tests.nix index c9c7ddf2f0c09..5a7e9c245c863 100644 --- a/pkgs/tools/package-management/nix/tests.nix +++ b/pkgs/tools/package-management/nix/tests.nix @@ -56,7 +56,8 @@ }; } // lib.optionalAttrs stdenv.hostPlatform.isLinux { - nixStatic = pkgsStatic.nixVersions.${self_attribute_name}; + # unfortunally nixpkgs pkgsStatic is too often broken including the dependency closure of nix + # nixStatic = pkgsStatic.nixVersions.${self_attribute_name}; # Basic smoke tests that needs to pass when upgrading nix. # Note that this test does only test the nixVersions.stable attribute. From c27c3257aecacc93b1698dd2765666180ca94f2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 22 Sep 2025 22:01:02 +0200 Subject: [PATCH 4/4] nix: remove deprecated fuse-ld=gold linker Binutils deprecated the gold linker, so do we. We already did this a while ago in the nix repository since we switched to mold for development. --- .../nix/modular/packaging/components.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pkgs/tools/package-management/nix/modular/packaging/components.nix b/pkgs/tools/package-management/nix/modular/packaging/components.nix index 67d96fa6e2538..bbca2d7e7d449 100644 --- a/pkgs/tools/package-management/nix/modular/packaging/components.nix +++ b/pkgs/tools/package-management/nix/modular/packaging/components.nix @@ -151,18 +151,6 @@ let ]; separateDebugInfo = !stdenv.hostPlatform.isStatic; hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie"; - env = - prevAttrs.env or { } - // lib.optionalAttrs ( - stdenv.isLinux - && !(stdenv.hostPlatform.isStatic && stdenv.system == "aarch64-linux") - && !( - stdenv.buildPlatform.config != stdenv.hostPlatform.config - && stdenv.hostPlatform.system == "powerpc64-linux" - ) - && !(stdenv.system == "loongarch64-linux") - && !(stdenv.hostPlatform.useLLVM or false) - ) { LDFLAGS = "-fuse-ld=gold"; }; }; mesonLibraryLayer = finalAttrs: prevAttrs: {