Merge pull request #13787 from NixOS/mergify/bp/2.29-maintenance/pr-13785

flake: nixpkgs: nixos-unstable -> nixos-25.05-small (backport #13785)

.git-blame-ignore-revs

@@ -1,2 +1,4 @@
 # bulk initial re-formatting with clang-format
 0e35cd6f3e27760976ead16fb45008ece0185aad # !autorebase ./maintainers/format.sh --until-stable
+# nixfmt 1.0.0
+d6aebd884790ae82c21ef2b58a010026ce757eaf # !autorebase ./maintainers/format.sh --until-stable

doc/manual/package.nix

@@ -46,8 +46,7 @@ mkMesonDerivation (finalAttrs: {
   ];
 
   # Hack for sake of the dev shell
-  passthru.externalNativeBuildInputs =
+  passthru.externalNativeBuildInputs = [
-    [
     meson
     ninja
     (lib.getBin lowdown-unsandboxed)

docker.nix

@@ -38,8 +38,7 @@ let
     ]
     ++ extraPkgs;
 
-  users =
+  users = {
-    {
 
     root = {
       uid = 0;
@@ -82,8 +81,7 @@ let
     }) (lib.lists.range 1 32)
   );
 
-  groups =
+  groups = {
-    {
     root.gid = 0;
     nixbld.gid = 30000;
     nobody.gid = 65534;

flake.lock

@@ -63,16 +63,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1747179050,
+        "lastModified": 1755442223,
-        "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=",
+        "narHash": "sha256-VtMQg02B3kt1oejwwrGn50U9Xbjgzfbb5TV5Wtx8dKI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e",
+        "rev": "cd32a774ac52caaa03bcfc9e7591ac8c18617ced",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "ref": "nixos-25.05-small",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -1,7 +1,7 @@
 {
   description = "The purely functional package manager";
 
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05-small";
 
   inputs.nixpkgs-regression.url = "github:NixOS/nixpkgs/215d4d0fd80ca5163643b03a33fde804a29cc1e2";
   inputs.nixpkgs-23-11.url = "github:NixOS/nixpkgs/a62e6edd6d5e1fa0329b8653c801147986f8d446";

packaging/components.nix

@@ -148,7 +148,8 @@ let
     nativeBuildInputs = [
       meson
       ninja
-    ] ++ prevAttrs.nativeBuildInputs or [ ];
+    ]
+    ++ prevAttrs.nativeBuildInputs or [ ];
     mesonCheckFlags = prevAttrs.mesonCheckFlags or [ ] ++ [
       "--print-errorlogs"
     ];

packaging/dev-shell.nix

@@ -71,8 +71,7 @@ pkgs.nixComponents2.nix-util.overrideAttrs (
     # We use this shell with the local checkout, not unpackPhase.
     src = null;
 
-    env =
+    env = {
-      {
       # For `make format`, to work without installing pre-commit
       _NIX_PRE_COMMIT_HOOKS_CONFIG = "${(pkgs.formats.yaml { }).generate "pre-commit-config.yaml"
         modular.pre-commit.settings.rawConfig

packaging/everything.nix

@@ -47,8 +47,7 @@
 }:
 
 let
-  libs =
+  libs = {
-    {
     inherit
       nix-util
       nix-util-c
@@ -65,7 +64,8 @@ let
       nix-cmd
       ;
   }
-    // lib.optionalAttrs
+  //
+    lib.optionalAttrs
       (!stdenv.hostPlatform.isStatic && stdenv.buildPlatform.canExecute stdenv.hostPlatform)
       {
         # Currently fails in static build
@@ -127,8 +127,7 @@ stdenv.mkDerivation (finalAttrs: {
   */
   dontFixup = true;
 
-  checkInputs =
+  checkInputs = [
-    [
     # Make sure the unit tests have passed
     nix-util-tests.tests.run
     nix-store-tests.tests.run
@@ -139,8 +138,8 @@ stdenv.mkDerivation (finalAttrs: {
     # Make sure the functional tests have passed
     nix-functional-tests
   ]
-    ++ lib.optionals
+  ++
-      (!stdenv.hostPlatform.isStatic && stdenv.buildPlatform.canExecute stdenv.hostPlatform)
+    lib.optionals (!stdenv.hostPlatform.isStatic && stdenv.buildPlatform.canExecute stdenv.hostPlatform)
       [
         # Perl currently fails in static build
         # TODO: Split out tests into a separate derivation?

src/libcmd/package.nix

@@ -53,7 +53,8 @@ mkMesonLibrary (finalAttrs: {
 
   buildInputs = [
     ({ inherit editline readline; }.${readlineFlavor})
-  ] ++ lib.optional enableMarkdown lowdown;
+  ]
+  ++ lib.optional enableMarkdown lowdown;
 
   propagatedBuildInputs = [
     nix-util

src/libexpr/package.nix

@@ -70,13 +70,15 @@ mkMesonLibrary (finalAttrs: {
     nix-util
     nix-store
     nix-fetchers
-  ] ++ finalAttrs.passthru.externalPropagatedBuildInputs;
+  ]
+  ++ finalAttrs.passthru.externalPropagatedBuildInputs;
 
   # Hack for sake of the dev shell
   passthru.externalPropagatedBuildInputs = [
     boost
     nlohmann_json
-  ] ++ lib.optional enableGC boehmgc;
+  ]
+  ++ lib.optional enableGC boehmgc;
 
   mesonFlags = [
     (lib.mesonEnable "gc" enableGC)

src/libstore/package.nix

@@ -58,8 +58,7 @@ mkMesonLibrary (finalAttrs: {
 
   nativeBuildInputs = lib.optional embeddedSandboxShell unixtools.hexdump;
 
-  buildInputs =
+  buildInputs = [
-    [
     boost
     curl
     sqlite
@@ -74,8 +73,7 @@ mkMesonLibrary (finalAttrs: {
     nlohmann_json
   ];
 
-  mesonFlags =
+  mesonFlags = [
-    [
     (lib.mesonEnable "seccomp-sandboxing" stdenv.hostPlatform.isLinux)
     (lib.mesonBool "embedded-sandbox-shell" embeddedSandboxShell)
   ]

src/libutil/package.nix

@@ -50,7 +50,8 @@ mkMesonLibrary (finalAttrs: {
     libblake3
     libsodium
     openssl
-  ] ++ lib.optional stdenv.hostPlatform.isx86_64 libcpuid;
+  ]
+  ++ lib.optional stdenv.hostPlatform.isx86_64 libcpuid;
 
   propagatedBuildInputs = [
     boost

src/perl/package.nix

@@ -45,7 +45,8 @@ perl.pkgs.toPerlModule (
 
     buildInputs = [
       nix-store
-    ] ++ finalAttrs.passthru.externalBuildInputs;
+    ]
+    ++ finalAttrs.passthru.externalBuildInputs;
 
     # Hack for sake of the dev shell
     passthru.externalBuildInputs = [

tests/functional/lang/eval-okay-attrnames.nix

@@ -2,8 +2,7 @@ with import ./lib.nix;
 
 let
 
-  attrs =
+  attrs = {
-    {
     y = "y";
     x = "x";
     foo = "foo";

tests/functional/lang/eval-okay-attrs.nix

@@ -1,6 +1,5 @@
 let {
-  as =
+  as = {
-    {
     x = 123;
     y = 456;
   }

tests/functional/lang/eval-okay-attrs2.nix

@@ -1,6 +1,5 @@
 let {
-  as =
+  as = {
-    {
     x = 123;
     y = 456;
   }

tests/functional/lang/eval-okay-import.nix

@@ -6,7 +6,8 @@ let
     scopedImport = attrs: fn: scopedImport (overrides // attrs) fn;
 
     builtins = builtins // overrides;
-  } // import ./lib.nix;
+  }
+  // import ./lib.nix;
 
 in
 scopedImport overrides ./imported.nix

tests/functional/nested-sandboxing/runner.nix

@@ -6,8 +6,7 @@ mkDerivation {
   name = "nested-sandboxing";
   busybox = builtins.getEnv "busybox";
   EXTRA_SANDBOX = builtins.getEnv "EXTRA_SANDBOX";
-  buildCommand =
+  buildCommand = ''
-    ''
     set -x
     set -eu -o pipefail
   ''

tests/functional/package.nix

@@ -47,8 +47,7 @@ mkMesonDerivation (
     ];
 
     # Hack for sake of the dev shell
-    passthru.externalNativeBuildInputs =
+    passthru.externalNativeBuildInputs = [
-      [
       meson
       ninja
       pkg-config

tests/nixos/default.nix

@@ -77,7 +77,15 @@ let
     { lib, pkgs, ... }:
     {
       imports = [ checkOverrideNixVersion ];
-      nix.package = lib.mkForce pkgs.nixVersions.nix_2_3;
+      nix.package = lib.mkForce (
+        pkgs.nixVersions.nix_2_3.overrideAttrs (o: {
+          meta = o.meta // {
+            # This version shouldn't be used by end-users, but we run tests against
+            # it to ensure we don't break protocol compatibility.
+            knownVulnerabilities = [ ];
+          };
+        })
+      );
     };
 
   otherNixes.nix_2_13.setNixPackage =
@@ -88,6 +96,8 @@ let
         nixpkgs-23-11.legacyPackages.${pkgs.stdenv.hostPlatform.system}.nixVersions.nix_2_13.overrideAttrs
           (o: {
             meta = o.meta // {
+              # This version shouldn't be used by end-users, but we run tests against
+              # it to ensure we don't break protocol compatibility.
               knownVulnerabilities = [ ];
             };
           })