From 1fa38d55adfc9a481d2b227088e28505ece9a60b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 12 Jun 2026 22:15:55 +0100 Subject: [PATCH 01/13] mutt: 2.3.2 -> 2.3.3 Changes: http://www.mutt.org/ (cherry picked from commit 9e6ec866bf147eb0a7e3bc3d6cbf4afd998b6421) --- pkgs/by-name/mu/mutt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mu/mutt/package.nix b/pkgs/by-name/mu/mutt/package.nix index 29ef1c0cd5ad..861fb72d8c03 100644 --- a/pkgs/by-name/mu/mutt/package.nix +++ b/pkgs/by-name/mu/mutt/package.nix @@ -31,7 +31,7 @@ assert gpgmeSupport -> sslSupport; stdenv.mkDerivation rec { pname = "mutt"; - version = "2.3.2"; + version = "2.3.3"; outputs = [ "out" "doc" @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - hash = "sha256-m096RC5BwFd3S6fDb6Qaui7dLnoSqGAx5uuxE7qyx54="; + hash = "sha256-vOdTOZsowO/PqKRGEV8NMNnCflUatRsOU3md0MNz3MQ="; }; patches = [ From 9e42a03abeb4db4b4c26ae5d2e272151d8a344ef Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 14 Jun 2026 13:08:05 +0300 Subject: [PATCH 02/13] linux/generate-config: disallow conflicting answers on choice questions These are order dependent and also wrong and bad and no. (cherry picked from commit 09476e6bdd0d7327d7b41e683a3ee7520ce05346) --- pkgs/os-specific/linux/kernel/generate-config.pl | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/generate-config.pl b/pkgs/os-specific/linux/kernel/generate-config.pl index 57d3ab739cb6..18d1f2150562 100644 --- a/pkgs/os-specific/linux/kernel/generate-config.pl +++ b/pkgs/os-specific/linux/kernel/generate-config.pl @@ -100,7 +100,13 @@ sub runConfig { elsif ($line =~ /choice\[(.*)\]: ###$/) { my $answer = ""; foreach my $name (keys %choices) { - $answer = $choices{$name} if ($answers{$name} || "") eq "y"; + if (($answers{$name} || "") eq "y") { + if ($answer eq "") { + $answer = $choices{$name}; + } else { + die "conflicting answers!" + } + } } print STDERR "CHOICE: $1, ANSWER: $answer\n" if $debug; print OUT "$answer\n" if $1 =~ /-/; From 683366ba0dda64a35c7d290aa1306da6892ae759 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 14 Jun 2026 13:53:35 +0300 Subject: [PATCH 03/13] linux/common-config: adjust preempt settings to avoid conflicts The only difference on all vanilla kernels across {aarch64,x86_64}-linux is that aarch64-linux 6.18 gets PREEMPT_LAZY consistently. (cherry picked from commit 143dd2e587f0ff3ec29c467f9f5f9891d1067062) --- pkgs/os-specific/linux/kernel/common-config.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 840e8ab5861b..84cf7322c046 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -1403,13 +1403,10 @@ let DRM_AMDGPU_USERPTR = yes; # We want to prefer PREEMPT_LAZY when available, and fall back on PREEMPT_VOLUNTARY. - # It just so happens that kconfig asks for PREEMPT_LAZY first, so doing it like this - # does what we want. - # FIXME: This is stupid and bad. - # See: https://github.com/torvalds/linux/commit/7dadeaa6e851e7d67733f3e24fc53ee107781d0f + # The version cutoff is arbitrary, the real cutoff is somewhere around 6.13 depending on target. PREEMPT = no; - PREEMPT_LAZY = option yes; - PREEMPT_VOLUNTARY = option yes; + PREEMPT_LAZY = whenAtLeast "6.18" yes; + PREEMPT_VOLUNTARY = whenOlder "6.18" yes; X86_AMD_PLATFORM_DEVICE = lib.mkIf stdenv.hostPlatform.isx86 yes; X86_PLATFORM_DRIVERS_DELL = lib.mkIf stdenv.hostPlatform.isx86 (whenAtLeast "5.12" yes); From a84c165bc8aa1eebfb636b0ead80504f3eb77846 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 14 Jun 2026 21:03:13 +0300 Subject: [PATCH 04/13] linux_7_1: init at 7.1 (cherry picked from commit fe36669082caaefa96b0d9b67b7f4e22097bcb42) --- pkgs/os-specific/linux/kernel/kernels-org.json | 5 +++++ pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/linux-kernels.nix | 11 ++++++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index a44bc74bacac..43db58a4181e 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -38,5 +38,10 @@ "version": "7.0.12", "hash": "sha256:1nk5lans9qg1avmmcwyadfps43d3hyjz9a5gjyvsc77w3sjckvap", "lts": false + }, + "7.1": { + "version": "7.1", + "hash": "sha256:18344l5fv3hgsqjrjr3dgg96lll7f294qq11lg40sydygxwl87v9", + "lts": false } } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 72a0265f2dc3..cabc64941662 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1243,6 +1243,7 @@ mapAliases { linux_6_18 = linuxKernel.kernels.linux_6_18; linux_6_19 = linuxKernel.kernels.linux_6_19; linux_7_0 = linuxKernel.kernels.linux_7_0; + linux_7_1 = linuxKernel.kernels.linux_7_1; linux_ham = throw "linux_ham has been removed in favour of the standard kernel packages"; # Added 2025-06-24 linux_hardened = throw "linux_hardened has been removed due to lack of maintenance"; # Added 2026-03-18 linux_latest-libre = throw "linux_latest_libre has been removed due to lack of maintenance"; # Added 2025-10-01 @@ -1278,6 +1279,7 @@ mapAliases { linuxPackages_6_18 = linuxKernel.packages.linux_6_18; linuxPackages_6_19 = linuxKernel.packages.linux_6_19; linuxPackages_7_0 = linuxKernel.packages.linux_7_0; + linuxPackages_7_1 = linuxKernel.packages.linux_7_1; linuxPackages_ham = throw "linux_ham has been removed in favour of the standard kernel packages"; # Added 2025-06-24 linuxPackages_hardened = throw "linuxPackages_hardened has been removed due to lack of maintenance"; # Added 2026-03-18 linuxPackages_latest-libre = throw "linux_latest_libre has been removed due to lack of maintenance"; # Added 2025-10-01 diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 20c211fad60a..5f56485094a9 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -100,6 +100,14 @@ in ]; }; + linux_7_1 = callPackage ../os-specific/linux/kernel/mainline.nix { + branch = "7.1"; + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + linux_testing = let testing = callPackage ../os-specific/linux/kernel/mainline.nix { @@ -667,6 +675,7 @@ in linux_6_12 = recurseIntoAttrs (packagesFor kernels.linux_6_12); linux_6_18 = recurseIntoAttrs (packagesFor kernels.linux_6_18); linux_7_0 = recurseIntoAttrs (packagesFor kernels.linux_7_0); + linux_7_1 = recurseIntoAttrs (packagesFor kernels.linux_7_1); } // lib.optionalAttrs config.allowAliases { linux_4_19 = throw "linux 4.19 was removed because it will reach its end of life within 24.11"; # Added 2024-09-21 @@ -735,7 +744,7 @@ in packageAliases = { linux_default = packages.linux_6_18; # Update this when adding the newest kernel major version! - linux_latest = packages.linux_7_0; + linux_latest = packages.linux_7_1; } // lib.optionalAttrs config.allowAliases { linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake"; From c6151786112f2c1539cc4ceaf685ccfb859e74bb Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 19 Jun 2026 12:17:48 +0000 Subject: [PATCH 05/13] linux_7_1: 7.1 -> 7.1.1 (cherry picked from commit 5e942459511ea53d65e98291e3ac135e6b08339e) --- 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 43db58a4181e..c0d8bb819a44 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -40,8 +40,8 @@ "lts": false }, "7.1": { - "version": "7.1", - "hash": "sha256:18344l5fv3hgsqjrjr3dgg96lll7f294qq11lg40sydygxwl87v9", + "version": "7.1.1", + "hash": "sha256:0z8x6wafxzc5vkim9jh8wpycdkk9y5bpxgsirmdpyznw84szl5aj", "lts": false } } From efdb9a75dc787dbabf391a843bca3afbab6aa350 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 19 Jun 2026 12:17:51 +0000 Subject: [PATCH 06/13] linux_7_0: 7.0.12 -> 7.0.13 (cherry picked from commit c72e58ac6aa49f22c5e3197f0a324de4fb2d4907) --- 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 c0d8bb819a44..3df6608d0865 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.0": { - "version": "7.0.12", - "hash": "sha256:1nk5lans9qg1avmmcwyadfps43d3hyjz9a5gjyvsc77w3sjckvap", + "version": "7.0.13", + "hash": "sha256:04wrz38ldls7pv1yxa1m7p2hqn1731l93xnz93fs7b0nyz8fv09w", "lts": false }, "7.1": { From 95ab4c5c4d3b5bdd535b1de5a11f572d546b3668 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 19 Jun 2026 12:17:53 +0000 Subject: [PATCH 07/13] linux_6_18: 6.18.35 -> 6.18.36 (cherry picked from commit 41efd6153a575a352b4b05c7cfadbf8de3ec0fbd) --- 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 3df6608d0865..17f9082cc4f1 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.35", - "hash": "sha256:0dpjprjzc4w44kw49jcgx1ffrm6gxn2gsnsz3hhmw4hr4a9h51pp", + "version": "6.18.36", + "hash": "sha256:0kn4r43lnd5nb5c298b30030qyaxv05s7k40n9si1j3iyk4qdazv", "lts": true }, "7.0": { From da32da43eed7a1c5711f8bddd0b572b767b1da6c Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 19 Jun 2026 12:17:55 +0000 Subject: [PATCH 08/13] linux_6_12: 6.12.93 -> 6.12.94 (cherry picked from commit d2adc61ca588372307bc5838b09a9fa0b4fe778a) --- 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 17f9082cc4f1..ca0533cfc0de 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.93", - "hash": "sha256:18sg154hqw8l98pfim2hjm1y604h5dwn9gj3gyncas8bgjl4h9j9", + "version": "6.12.94", + "hash": "sha256:1ln83ljmc7wr1nrjjq1hp1m1vx54j7i6i15m3hqb73a1p4ra5679", "lts": true }, "6.18": { From be12004c9feade01942d5cc15e15214bf3839768 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 19 Jun 2026 12:17:57 +0000 Subject: [PATCH 09/13] linux_6_6: 6.6.142 -> 6.6.143 (cherry picked from commit 4a7bb41c664c5a7635833144edfa40ed225035ca) --- 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 ca0533cfc0de..478ef98d582b 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.142", - "hash": "sha256:0w1bdzp9x1sqcr9xlk7dvylhs7kycghjabfgd3iv49ydfmx61xmj", + "version": "6.6.143", + "hash": "sha256:0ci9b6kjp7r2xwqifs2963l9ihk2rllk4zpl2kgzbny0r66izkns", "lts": true }, "6.12": { From ff0b527b878db5b4fead356e3eea43d6f0c8e92c Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 19 Jun 2026 12:17:59 +0000 Subject: [PATCH 10/13] linux_6_1: 6.1.175 -> 6.1.176 (cherry picked from commit 783e466ec0dcbef6f3d49af8b4fd7d799ba820b2) --- 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 478ef98d582b..86c40ac4fb5f 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.175", - "hash": "sha256:11fapr04y96p9ja6mfzm7bcd3zb4dzyw6qrh7c11bss9wjlq9s9p", + "version": "6.1.176", + "hash": "sha256:1xj4ms4gd8ghd0l0dzsyi762dgpdrmqhc3f0arrp7sa0p8npf6da", "lts": true }, "5.15": { From 21a8a81d2400597b88c4d69c95cac250497bd485 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 19 Jun 2026 12:18:01 +0000 Subject: [PATCH 11/13] linux_5_15: 5.15.209 -> 5.15.210 (cherry picked from commit f280904416c02cd2ef64adae28e8aa1528a58663) --- 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 86c40ac4fb5f..0ade9c5d8fa6 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.209", - "hash": "sha256:1d0yhbpqlkr1znahky15dfavr6dzb3wb8c15k9qqvkf2xb3pfv9l", + "version": "5.15.210", + "hash": "sha256:008a55av0x9fa3fspcz43sycik143gqxg2agcalrax2yw5ma82wi", "lts": true }, "5.10": { From 141117a3d0d56b6cf47986f6daf3a241e9ade5ba Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 19 Jun 2026 12:18:02 +0000 Subject: [PATCH 12/13] linux_5_10: 5.10.258 -> 5.10.259 (cherry picked from commit 46b89aa95826b4b8756a6d806112f35ed1c29fde) --- 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 0ade9c5d8fa6..54ff5434cfe3 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.258", - "hash": "sha256:1rdldzb3g33v6zvcmxafqpkjgqpp4n5qlxwb77wfd5jpzhgcnz4y", + "version": "5.10.259", + "hash": "sha256:02dn8rf9p0afkl8kbdv28ijq974zfnv8zdsqcqbmapjm19c8wpma", "lts": true }, "6.6": { From dca378dd6bfdf1d50a93172ba85f724c93018db5 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 15 Jun 2026 23:25:18 +0200 Subject: [PATCH 13/13] strace: 7.0 -> 7.1 ChangeLog: https://github.com/strace/strace/releases/tag/v7.1 (cherry picked from commit 33986e15ea67894604ea5ff677844bdddda70dcc) --- pkgs/by-name/st/strace/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/strace/package.nix b/pkgs/by-name/st/strace/package.nix index 86f8b0fa4c42..77345bd6a3ae 100644 --- a/pkgs/by-name/st/strace/package.nix +++ b/pkgs/by-name/st/strace/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "strace"; - version = "7.0"; + version = "7.1"; src = fetchurl { url = "https://strace.io/files/${finalAttrs.version}/strace-${finalAttrs.version}.tar.xz"; - hash = "sha256-bJJBm+Py7FYLMXKKRlIhfFmGTIZCunsbN3GxsBOtB0s="; + hash = "sha256-gXQ+zypbRBhrL1A4r9yL7aflxwrtFbT7+8xuns4kSQ8="; }; separateDebugInfo = true;