From 12287d7ab504fd3a0bd9411888276e37bb3914a2 Mon Sep 17 00:00:00 2001 From: Grayson Tinker Date: Sun, 6 Sep 2026 23:11:01 -0600 Subject: [PATCH 01/12] nixos/installer/tools: use channel tarball by default instead of GitHub The project-hosted channel tarballs have several benefits, including better compression, non-reliance on GitHub, and an included command-not-found database helpful for new users. Switch to the better default. --- nixos/modules/installer/tools/tools.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index da2e3288936d..38feb4165cf4 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -84,7 +84,7 @@ let # If you prefer a stable release instead, you can change the word unstable to the latest number shown here: https://nixos.org/download # i.e. nixos-24.11 # Use `nix flake update` to update the flake to the latest revision of the chosen release channel. - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "https://channels.nixos.org/nixos-unstable/nixexprs.tar.zst"; }; outputs = inputs\@{ self, nixpkgs, ... }: { # NOTE: '${options.networking.hostName.default}' is the default hostname From db63efd5f80a25c1fb514cbadc036684dc1996aa Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Sat, 12 Sep 2026 00:54:23 +0200 Subject: [PATCH 02/12] ruff: 0.16.6 -> 0.16.7 Changelog: https://github.com/astral-sh/ruff/releases/tag/0.16.7 Diff: https://github.com/astral-sh/ruff/compare/0.16.6...0.16.7 --- pkgs/by-name/ru/ruff/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix index fccc7b4f1618..ac4d2d5c74c2 100644 --- a/pkgs/by-name/ru/ruff/package.nix +++ b/pkgs/by-name/ru/ruff/package.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ruff"; - version = "0.16.6"; + version = "0.16.7"; __structuredAttrs = true; @@ -24,12 +24,12 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "astral-sh"; repo = "ruff"; tag = finalAttrs.version; - hash = "sha256-D4/bCgMlaa+hBp9exisCuab6h2aJXxdj014qE1+60JM="; + hash = "sha256-djWM6RWAgMpvRnuRyyAAjb7OmfVB+whyB3q35C8z1u8="; }; cargoBuildFlags = [ "--package=ruff" ]; - cargoHash = "sha256-GCsUqGuWXfP9WiCzq20Xjl70mXv8a1RtvUg1+IK3TKo="; + cargoHash = "sha256-EknMZ4fuWJs0/iB+AkX4ZLMY9E6DAxk+k2tKtTbA1yo="; nativeBuildInputs = [ installShellFiles ]; From a11877ed8a7eabc7c26f8b05e7dce1f334f0c883 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Fri, 11 Sep 2026 21:25:35 -0400 Subject: [PATCH 03/12] nixos/qemu-vm: restore 9p support for darwin Keep virtiofs for linux, but use 9p otherwise. This restores darwin support - which is used both for `darwin.linux-builder` and `build-vm` nixpkgs VMs. This patch does not restore removed options: their utility is not immediately clear to me, and restoring the options would complicate the code for unclear gains. Hopefully, the reduced scope also makes it more palatable for maintainers to accept this functionality back in. --- nixos/modules/virtualisation/qemu-vm.nix | 91 ++++++++++++++++-------- 1 file changed, 62 insertions(+), 29 deletions(-) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 5681165a4e15..61366c3ea75f 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -24,6 +24,8 @@ let hostPkgs = cfg.host.pkgs; + useVirtiofs = hostPkgs.stdenv.hostPlatform.isLinux; + consoles = lib.concatMapStringsSep " " (c: "console=${c}") cfg.qemu.consoles; driveOptions = @@ -324,23 +326,25 @@ let '' )} - echo "Starting virtiofs daemons..." - NIX_VIRTIOFS_DIR=$(mktemp -d) - ${lib.concatLines ( - lib.mapAttrsToList (tag: share: '' - ${lib.getExe hostPkgs.virtiofsd} \ - --socket-path="$NIX_VIRTIOFS_DIR"/"${tag}" \ - --shared-dir="${share.source}" \ - ${if share.writable then "--writeback" else "--readonly"} \ - --sandbox=none \ - --seccomp=none \ - --cache=always \ - --no-announce-submounts \ - --translate-uid=host:65534:0:1 \ - --translate-gid=host:65534:0:1 \ - & - '') cfg.sharedDirectories - )} + ${lib.optionalString useVirtiofs '' + echo "Starting virtiofs daemons..." + NIX_VIRTIOFS_DIR=$(mktemp -d) + ${lib.concatLines ( + lib.mapAttrsToList (tag: share: '' + ${lib.getExe hostPkgs.virtiofsd} \ + --socket-path="$NIX_VIRTIOFS_DIR"/"${tag}" \ + --shared-dir="${share.source}" \ + ${if share.writable then "--writeback" else "--readonly"} \ + --sandbox=none \ + --seccomp=none \ + --cache=always \ + --no-announce-submounts \ + --translate-uid=host:65534:0:1 \ + --translate-gid=host:65534:0:1 \ + & + '') cfg.sharedDirectories + )} + ''} # Start QEMU. exec ${ @@ -437,11 +441,11 @@ in (mkRemovedOptionModule [ "virtualisation" "msize" - ] "9p was replaced with virtiofs and thus this option is obsolete.") + ] "The 9p msize is no longer configurable.") (mkRemovedOptionModule [ "virtualisation" "nixStore9pCache" - ] "9p was replaced with virtiofs and thus this option is obsolete.") + ] "The 9p cache mode for the Nix store is no longer configurable.") ]; options = { @@ -592,8 +596,9 @@ in }; description = '' An attributes set of directories that will be shared with the - virtual machine using VirtFS (9P filesystem over VirtIO). - The attribute name will be used as the 9P mount tag. + virtual machine using virtiofs on Linux hosts and VirtFS (9P filesystem + over VirtIO) on other hosts. The attribute name will be used as the + mount tag. ''; }; @@ -1278,10 +1283,20 @@ in "-machine memory-backend=mem0" ]) (lib.flatten ( - lib.mapAttrsToList (tag: share: [ - "-chardev socket,id=${tag},path=$NIX_VIRTIOFS_DIR/${tag}" - "-device vhost-user-fs-pci,chardev=${tag},tag=${tag}" - ]) cfg.sharedDirectories + lib.mapAttrsToList ( + tag: share: + if useVirtiofs then + [ + "-chardev socket,id=${tag},path=$NIX_VIRTIOFS_DIR/${tag}" + "-device vhost-user-fs-pci,chardev=${tag},tag=${tag}" + ] + else + [ + "-virtfs local,path=${share.source},security_model=none,mount_tag=${tag}${ + lib.optionalString (!share.writable) ",readonly=on" + }" + ] + ) cfg.sharedDirectories )) ( let @@ -1373,9 +1388,20 @@ in name = share.target; value = { device = tag; - fsType = "virtiofs"; + fsType = if useVirtiofs then "virtiofs" else "9p"; neededForBoot = true; - options = lib.mkIf (!share.writable) [ "ro" ]; + options = + if useVirtiofs then + lib.mkIf (!share.writable) [ "ro" ] + else + [ + "trans=virtio" + "version=9p2000.L" + "msize=16384" + "x-systemd.requires=modprobe@9pnet_virtio.service" + ] + ++ lib.optional (tag == "nix-store") "cache=loose" + ++ lib.optional (!share.writable) "ro"; }; }) cfg.sharedDirectories) { @@ -1488,8 +1514,6 @@ in (isEnabled "VIRTIO_PCI") (isEnabled "VIRTIO_NET") (isEnabled "EXT4_FS") - (isEnabled "NET_9P_VIRTIO") - (isEnabled "9P_FS") (isYes "BLK_DEV") (isYes "PCI") (isYes "NETDEVICES") @@ -1497,6 +1521,15 @@ in (isYes "INET") (isYes "NETWORK_FILESYSTEMS") ] + ++ ( + if useVirtiofs then + [ (isEnabled "VIRTIO_FS") ] + else + [ + (isEnabled "NET_9P_VIRTIO") + (isEnabled "9P_FS") + ] + ) ++ optionals (!cfg.graphics) [ (isYes "SERIAL_8250_CONSOLE") (isYes "SERIAL_8250") From 8d006d71b618d5f9af818e1b89752fd79864fa99 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Fri, 11 Sep 2026 21:25:43 -0400 Subject: [PATCH 04/12] Revert "release: drop darwin.linux-builder" This reverts commit 342b4358b47d17438dd554488c004c114b52e84d. Darwin support in qemu-vm.nix is restored and the qemu builder can, again, be evaluated. --- pkgs/top-level/release.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index d7112f3d536f..a6b22fba574e 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -138,6 +138,7 @@ let jobs.stdenv.aarch64-darwin jobs.vim.aarch64-darwin jobs.cachix.aarch64-darwin + jobs.darwin.linux-builder.aarch64-darwin # UI apps # jobs.firefox-unwrapped.aarch64-darwin @@ -220,6 +221,7 @@ let jobs.vim.aarch64-darwin jobs.inkscape.aarch64-darwin jobs.qt5.qtmultimedia.aarch64-darwin + jobs.darwin.linux-builder.aarch64-darwin /* jobs.tests.cc-wrapper.default.aarch64-darwin jobs.tests.cc-wrapper.llvmPackages.clang.aarch64-darwin From e298b1286eb2229299d24dc51064fda9ecb78f1f Mon Sep 17 00:00:00 2001 From: qubitnano <146656568+qubitnano@users.noreply.github.com> Date: Fri, 11 Sep 2026 21:20:37 -0400 Subject: [PATCH 05/12] bcachefs-tools: 1.39.5 -> 1.39.6 https://evilpiepirate.org/git/bcachefs-tools.git/tree/Changelog.mdwn --- pkgs/by-name/bc/bcachefs-tools/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix index 65b70865adee..343033d99541 100644 --- a/pkgs/by-name/bc/bcachefs-tools/package.nix +++ b/pkgs/by-name/bc/bcachefs-tools/package.nix @@ -32,18 +32,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "bcachefs-tools"; - version = "1.39.5"; + version = "1.39.6"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; tag = "v${finalAttrs.version}"; - hash = "sha256-k9JW6GMXFwphkYGcYMwA59uafNj0EV96wTnbzeuVM1w="; + hash = "sha256-cBYn/g6eLT5rTumo4Y24rWSHS2Sc7gFthPuCg1AQ22k="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-hbh4+vpZtVpda2yVZK+fkdPXWd5+GYLbWYPfJsYtPfM="; + hash = "sha256-djiIwZie9HjQ/+bCEGniMFkJA66oI0n+9y9Iax4GHOM="; }; postPatch = '' From 4af150a52ed39e0e94717cf7376d4b5ac94cea14 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 14 Sep 2026 12:14:30 +0000 Subject: [PATCH 06/12] linux_7_2: 7.2.5 -> 7.2.6 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 5e27f13231c7..16a1407ea2b8 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -35,8 +35,8 @@ "lts": true }, "7.2": { - "version": "7.2.5", - "hash": "sha256:0y1bcg3pg6zm59bjfrgh1bsy68kxjy9vvxygdzcxmn95hggz1pam", + "version": "7.2.6", + "hash": "sha256:01pnc344dx239hkfl84hpfdpm7gc08yzrz7llgnlm6dhya2fz6h3", "lts": false } } From 5167e4de65728982a45a23d12ba20b56c192ec7f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 14 Sep 2026 12:14:32 +0000 Subject: [PATCH 07/12] linux_6_18: 6.18.51 -> 6.18.52 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 16a1407ea2b8..d95d89f4b0a4 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -30,8 +30,8 @@ "lts": true }, "6.18": { - "version": "6.18.51", - "hash": "sha256:04znimsjfimxxaarzaksn4jvkj1xr5ba7yh1j691ykdzb3w60bxs", + "version": "6.18.52", + "hash": "sha256:1f11had1amrvhl5f606ikc9ykrlyf0rvln8rkf2hrsjggm7mcs9b", "lts": true }, "7.2": { From ba34954a9d05902e2fc222d5968919162e21a0ba Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 14 Sep 2026 12:14:34 +0000 Subject: [PATCH 08/12] linux_6_12: 6.12.109 -> 6.12.110 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index d95d89f4b0a4..6310937261cf 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -25,8 +25,8 @@ "lts": true }, "6.12": { - "version": "6.12.109", - "hash": "sha256:1yp370f2y5czvq24xqply8f6a14gnpjqkfmfyhcm1q9lld9fb12l", + "version": "6.12.110", + "hash": "sha256:0k2w1lr3h1d814707vfmj826gaz67a9n3msla96zzdlvhghikvlc", "lts": true }, "6.18": { From d1c2dbf5feddae976fdc600efcb8d62ed54a6146 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 14 Sep 2026 12:14:36 +0000 Subject: [PATCH 09/12] linux_6_6: 6.6.156 -> 6.6.157 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 6310937261cf..db75d8914259 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -20,8 +20,8 @@ "lts": true }, "6.6": { - "version": "6.6.156", - "hash": "sha256:07a1dyaxmcv289r0n4agna2li2rfsjdld8279cs18jmg9r52dqmf", + "version": "6.6.157", + "hash": "sha256:0c4c42qzr2vcbqglb9vq5q5vqv4mbqasq1n93j3vf288cg846jmp", "lts": true }, "6.12": { From 6359184b6d28e262f34f695637145f0710de0438 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 14 Sep 2026 12:14:39 +0000 Subject: [PATCH 10/12] linux_6_1: 6.1.187 -> 6.1.188 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index db75d8914259..b2df3fb78945 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -5,8 +5,8 @@ "lts": false }, "6.1": { - "version": "6.1.187", - "hash": "sha256:0av4fcw3hv4pfql85s2rirxj7hkdr2kdasj219kwl257xa57jvhv", + "version": "6.1.188", + "hash": "sha256:0fm3048h1c98gxhpwjprjc2jkrhhwaac1vw91hikbhh72g5hlkgd", "lts": true }, "5.15": { From f943edac563f29dbdaeb9f101a4d49d96259bac0 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 14 Sep 2026 12:14:41 +0000 Subject: [PATCH 11/12] linux_5_15: 5.15.220 -> 5.15.221 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index b2df3fb78945..323c9a51be8f 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -10,8 +10,8 @@ "lts": true }, "5.15": { - "version": "5.15.220", - "hash": "sha256:08v7mbwvfgy9vv60j2ssdks4ss218p27rkwwrmjch2hj0ljrkcmm", + "version": "5.15.221", + "hash": "sha256:130ll4gnj2779kpx8x4r6v28vnwjn4qdw9ksaq3f5vr8wphq4y60", "lts": true }, "5.10": { From 2c9bf0c7aab91dfbb4c922131f450db9ba938f3e Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 14 Sep 2026 12:14:43 +0000 Subject: [PATCH 12/12] linux_5_10: 5.10.269 -> 5.10.270 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 323c9a51be8f..66976d48fd8d 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -15,8 +15,8 @@ "lts": true }, "5.10": { - "version": "5.10.269", - "hash": "sha256:1sf6iikwr9rikdi097xplz7yw1jj4cx6ldng7gzp8rj0360icnlw", + "version": "5.10.270", + "hash": "sha256:1rzb9ms2v04gwwka7d8byaxrcfymlikslq36p1p1zsabn0ldawyy", "lts": true }, "6.6": {