staging-nixos merge for 2026-07-31 (#547573)

Author: Ma27

nixos/lib/test-driver/src/test_driver/machine/__init__.py

@@ -660,25 +660,22 @@ def cleanup_statedir(self) -> None:
     def copy_from_machine(self, source: str, target_dir: str = "") -> None:
         """Copy a file from the machine (specified by an in-machine source path) to a path
         relative to `$out`. The file is copied via the `shared_dir` shared among
-        all the machines (using a temporary directory).
+        all the machines.
         """
         # Compute the source, target, and intermediate shared file names
         vm_src = Path(source)
-        with tempfile.TemporaryDirectory(dir=self.shared_dir) as shared_td:
-            shared_temp = Path(shared_td)
-            vm_shared_temp = Path("/tmp/shared") / shared_temp.name
-            vm_intermediate = vm_shared_temp / vm_src.name
-            intermediate = shared_temp / vm_src.name
-            # Copy the file to the shared directory inside machines
-            self.succeed(make_command(["mkdir", "-p", vm_shared_temp]))
-            self.succeed(make_command(["cp", "-r", vm_src, vm_intermediate]))
-            abs_target = self.out_dir / target_dir / vm_src.name
-            abs_target.parent.mkdir(exist_ok=True, parents=True)
-            # Copy the file from the shared directory outside machines
-            if intermediate.is_dir():
-                shutil.copytree(intermediate, abs_target)
-            else:
-                shutil.copy(intermediate, abs_target)
+        vm_intermediate = Path("/tmp/shared") / target_dir / vm_src.name
+        intermediate = self.shared_dir / target_dir / vm_src.name
+        # Copy the file to the shared directory inside machines
+        self.succeed(make_command(["mkdir", "-p", vm_intermediate.parent]))
+        self.succeed(make_command(["cp", "-r", vm_src, vm_intermediate]))
+        abs_target = self.out_dir / target_dir / vm_src.name
+        abs_target.parent.mkdir(exist_ok=True, parents=True)
+        # Copy the file from the shared directory outside machines
+        if intermediate.is_dir():
+            shutil.copytree(intermediate, abs_target)
+        else:
+            shutil.copy(intermediate, abs_target)
 
     @warnings.deprecated("Use copy_from_machine() instead")
     def copy_from_vm(self, source: str, target_dir: str = "") -> None:

nixos/modules/misc/version.nix

@@ -14,7 +14,6 @@ let
     concatStringsSep
     mapAttrsToList
     toLower
-    optionalString
     literalExpression
     match
     mkRenamedOptionModule
@@ -34,11 +33,12 @@ let
   osReleaseContents =
     let
       isNixos = cfg.distroId == "nixos";
+      optionalAttr = cond: attr: if cond then attr else null;
     in
     {
       NAME = "${cfg.distroName}";
       ID = "${cfg.distroId}";
-      ID_LIKE = optionalString (!isNixos) "nixos";
+      ${optionalAttr (!isNixos) "ID_LIKE"} = "nixos";
       VENDOR_NAME = cfg.vendorName;
       VERSION = "${cfg.release} (${cfg.codeName})";
       VERSION_CODENAME = toLower cfg.codeName;
@@ -47,17 +47,16 @@ let
       PRETTY_NAME = "${cfg.distroName} ${cfg.release} (${cfg.codeName})";
       CPE_NAME = "cpe:/o:${cfg.vendorId}:${cfg.distroId}:${cfg.release}";
       LOGO = "nix-snowflake";
-      HOME_URL = optionalString isNixos "https://nixos.org/";
-      VENDOR_URL = optionalString isNixos "https://nixos.org/";
-      DOCUMENTATION_URL = optionalString isNixos "https://nixos.org/learn.html";
-      SUPPORT_URL = optionalString isNixos "https://nixos.org/community.html";
-      BUG_REPORT_URL = optionalString isNixos "https://github.com/NixOS/nixpkgs/issues";
-      ANSI_COLOR = optionalString isNixos "0;38;2;126;186;228";
-      IMAGE_ID = optionalString (config.system.image.id != null) config.system.image.id;
-      ${if config.system.image.version != null then "IMAGE_VERSION" else null} =
-        config.system.image.version;
-      VARIANT = optionalString (cfg.variantName != null) cfg.variantName;
-      VARIANT_ID = optionalString (cfg.variant_id != null) cfg.variant_id;
+      ${optionalAttr isNixos "HOME_URL"} = "https://nixos.org/";
+      ${optionalAttr isNixos "VENDOR_URL"} = "https://nixos.org/";
+      ${optionalAttr isNixos "DOCUMENTATION_URL"} = "https://nixos.org/learn.html";
+      ${optionalAttr isNixos "SUPPORT_URL"} = "https://nixos.org/community.html";
+      ${optionalAttr isNixos "BUG_REPORT_URL"} = "https://github.com/NixOS/nixpkgs/issues";
+      ${optionalAttr isNixos "ANSI_COLOR"} = "0;38;2;126;186;228";
+      ${optionalAttr (config.system.image.id != null) "IMAGE_ID"} = config.system.image.id;
+      ${optionalAttr (config.system.image.version != null) "IMAGE_VERSION"} = config.system.image.version;
+      ${optionalAttr (cfg.variantName != null) "VARIANT"} = cfg.variantName;
+      ${optionalAttr (cfg.variant_id != null) "VARIANT_ID"} = cfg.variant_id;
       DEFAULT_HOSTNAME = config.system.nixos.distroId;
     }
     // cfg.extraOSReleaseArgs;

nixos/modules/virtualisation/nspawn-container/run-nspawn/src/run_nspawn/__init__.py

@@ -158,7 +158,7 @@ def mk_veth(
 def run(
     container_name: str,
     root_dir_str: str,
-    shared_dir_str: typing.Optional[str],
+    shared_dir_str: str | None,
     interfaces: dict,
     nspawn_options: list[str],
     init: str,
@@ -193,13 +193,6 @@ def run(
                 )
             )
 
-        def print_pid() -> None:
-            print(
-                f"systemd-nspawn's PID is {os.getpid()}",
-                # Need to flush stdout before systemd-nspawn gets exec-ed.
-                flush=True,
-            )
-
         shared_dir = Path(shared_dir_str) if shared_dir_str else None
 
         cp = subprocess.Popen(
@@ -216,7 +209,9 @@ def print_pid() -> None:
                 init,
                 *cmdline,
             ],
-            preexec_fn=print_pid,
+        )
+        print(
+            f"systemd-nspawn's PID is {cp.pid}",
         )
 
         try:

pkgs/by-name/bc/bcachefs-tools/package.nix

@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   pkg-config,
   libuuid,
   libsodium,
@@ -45,6 +46,15 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-F1+FeAlYSqOxeWJI8vHShpXrOZqYXjNGvty/s6f6u8w=";
   };
 
+  patches = [
+    # Fix compile-time assertion failure on big-endian
+    (fetchpatch {
+      name = "0001-bcachefs-tools-debug-copy-packed-bkey-fields-before-asserting.patch";
+      url = "https://evilpiepirate.org/git/bcachefs-tools.git/patch/?id=79f119c4cd6900ab9ea27b0aa671f68300d9d38e";
+      hash = "sha256-ACrpad93wrZOXhc73otnXBNQvyoDeZSfgtwze5nKaUE=";
+    })
+  ];
+
   postPatch = ''
     substituteInPlace Makefile \
       --replace-fail "target/release/bcachefs" "target/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/bcachefs"

pkgs/by-name/bi/bind/package.nix

@@ -30,11 +30,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bind";
-  version = "9.20.24";
+  version = "9.20.26";
 
   src = fetchurl {
     url = "https://downloads.isc.org/isc/bind9/${finalAttrs.version}/bind-${finalAttrs.version}.tar.xz";
-    hash = "sha256-mJ/vH8iOpZ0EzYb4VNylpGFqIKmWi83ePBo2aKs2vgg=";
+    hash = "sha256-VSSN7w+HDExGs95yl46pcmFRMVFmYxiKRWTcodIL81A=";
   };
 
   outputs = [
@@ -111,31 +111,17 @@ stdenv.mkDerivation (finalAttrs: {
 
   enableParallelBuilding = true;
   strictDeps = true;
+  __structuredAttrs = true;
 
-  doCheck = false;
-  # TODO: investigate failures; see this and linked discussions:
-  # https://github.com/NixOS/nixpkgs/pull/192962
-  /*
-    doCheck = with stdenv.hostPlatform; !isStatic && !(isAarch64 && isLinux)
-      # https://gitlab.isc.org/isc-projects/bind9/-/issues/4269
-      && !is32bit;
-  */
+  doCheck = with stdenv.hostPlatform; !isStatic && isLinux;
   checkTarget = "unit";
   checkInputs = [
     cmocka
-  ]
-  ++ lib.optionals (!stdenv.hostPlatform.isMusl) [
-    tzdata
   ];
-  preCheck =
-    lib.optionalString stdenv.hostPlatform.isMusl ''
-      # musl doesn't respect TZDIR, skip timezone-related tests
-      sed -i '/^ISC_TEST_ENTRY(isc_time_formatISO8601L/d' tests/isc/time_test.c
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # Test timeouts on Darwin
-      sed -i '/^ISC_TEST_ENTRY(tcpdns_recv_one/d' tests/isc/netmgr_test.c
-    '';
+  preCheck = ''
+    # skip timezone-related tests, they are flaky inside the nix sandbox
+    sed -i '/^ISC_TEST_ENTRY(isc_time_formatISO8601L/d' tests/isc/time_test.c
+  '';
 
   postFixup = ''
     remove-references-to -t "$out" "$dnsutils/bin/delv"
@@ -168,7 +154,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://downloads.isc.org/isc/bind9/cur/${lib.versions.majorMinor finalAttrs.version}/doc/arm/html/notes.html#notes-for-bind-${
       lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version
     }";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ bartoostveen ];
     platforms = lib.platforms.unix;
 
     outputsToInstall = [

pkgs/by-name/gr/grub2/package.nix

@@ -583,6 +583,13 @@ stdenv.mkDerivation rec {
       url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=ac1512b872af8567b408518a7efa01607a0219ae";
       hash = "sha256-deyp6Yatlgv86bYMt7WcWhKg8J6StDPUEy4UPHqJYIc=";
     })
+    # Required to build grub2_efi with GCC 16, or fails with "error: 'regparm'
+    # attribute ignored [-Werror=attributes]"
+    (fetchpatch {
+      name = "gcc16_make_regparm_attribute_more_conditional.patch";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=9922ed133c2c754ec9f37198da2b3e3e8a4fd5ff";
+      hash = "sha256-V2vffDxL/qQ14YN5scc3CFPBFBWvkh57dc5/hWd/6F4=";
+    })
   ];
 
   postPatch =

pkgs/by-name/li/libfaketime/package.nix

@@ -34,6 +34,15 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = [
     ./nix-store-date.patch
+
+    # GCC 16's unused variable analysis is more advanced than previous
+    # versions, and detects that these variables are unused.
+    # https://github.com/wolfcw/libfaketime/pull/528
+    (fetchpatch {
+      name = "libfaketime-silence-unused-variable-warning.patch";
+      url = "https://github.com/wolfcw/libfaketime/commit/712733e5f01e45372f3160cfdbcfd91520cb093d.patch";
+      hash = "sha256-Gu13gFhgvkncj8aowAnSRbHbUCctF5sakbX4uRwdy+A=";
+    })
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     (fetchpatch {

pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py

@@ -86,7 +86,7 @@ def get_parser() -> tuple[argparse.ArgumentParser, dict[str, argparse.ArgumentPa
 
     main_parser = argparse.ArgumentParser(
         prog="nixos-rebuild",
-        parents=list(sub_parsers.values()),
+        parents=sub_parsers.values(),
         description="Reconfigure a NixOS machine",
         add_help=False,
         allow_abbrev=False,
@@ -260,7 +260,6 @@ def parser_warn(msg: str) -> None:
     if args.v or args.debug:
         logger.setLevel(logging.DEBUG)
 
-    # https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh#L56
     if args.action == Action.DRY_RUN.value:
         args.action = Action.DRY_BUILD.value
 

pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py

@@ -166,6 +166,10 @@ class GenerationJson(TypedDict):
     current: bool
 
 
+class FlakeMetadataJson(TypedDict):
+    resolvedUrl: str
+
+
 @dataclass(frozen=True)
 class GroupedNixArgs:
     build_flags: Args

pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py

@@ -19,6 +19,7 @@
     Action,
     BuildAttr,
     Flake,
+    FlakeMetadataJson,
     Generation,
     GenerationJson,
     ImageVariants,
@@ -29,6 +30,8 @@
 from .process import run_wrapper, ssh_default_opts
 from .utils import Args, dict_to_flags
 
+local_tz: Final = datetime.now().astimezone().tzinfo
+
 FLAKE_FLAGS: Final = ["--extra-experimental-features", "nix-command flakes"]
 FLAKE_REPL_TEMPLATE: Final = "repl.nix.template"
 SWITCH_TO_CONFIGURATION_CMD_PREFIX: Final = [
@@ -432,9 +435,10 @@ def get_generations(profile: Profile) -> list[Generation]:
     def parse_path(path: Path, profile: Profile) -> Generation:
         entry_id = path.name.split("-")[1]
         current = path.name == profile.path.readlink().name
-        timestamp = datetime.fromtimestamp(path.stat().st_ctime).strftime(
-            "%Y-%m-%d %H:%M:%S"
-        )
+        timestamp = datetime.fromtimestamp(
+            timestamp=path.stat().st_ctime,
+            tz=local_tz,
+        ).strftime("%Y-%m-%d %H:%M:%S")
 
         return Generation(
             id=int(entry_id),
@@ -576,12 +580,32 @@ def repl(build_attr: BuildAttr, nix_flags: Args | None = None) -> None:
     run_wrapper([*run_args, *dict_to_flags(nix_flags)])
 
 
+def get_flake_metadata(
+    flake: Flake, flake_flags: Args | None = None
+) -> FlakeMetadataJson:
+    r = run_wrapper(
+        [
+            "nix",
+            *FLAKE_FLAGS,
+            "flake",
+            "metadata",
+            "--json",
+            flake.resolve_path_if_exists(),
+            *dict_to_flags(flake_flags),
+        ],
+        stdout=PIPE,
+    )
+    j: FlakeMetadataJson = json.loads(r.stdout.strip())
+    return j
+
+
 def repl_flake(flake: Flake, flake_flags: Args | None = None) -> None:
     expr = Template(
         files(__package__).joinpath(FLAKE_REPL_TEMPLATE).read_text()
     ).substitute(
         flake=flake,
-        flake_path=flake.resolve_path_if_exists(),
+        # Normalize flake url to respect VSC if present:
+        flake_path=get_flake_metadata(flake, flake_flags)["resolvedUrl"],
         flake_attr=flake.attr,
         bold="\033[1m",
         blue="\033[34;1m",