Merge master into staging-next

doc/languages-frameworks/ruby.section.md

@@ -8,7 +8,7 @@ In the Nixpkgs tree, Ruby packages can be found throughout, depending on what th
 
 There are two main approaches for using Ruby with gems. One is to use a specifically locked `Gemfile` for an application that has very strict dependencies. The other is to depend on the common gems, which we'll explain further down, and rely on them being updated regularly.
 
-The interpreters have common attributes, namely `gems`, and `withPackages`. So you can refer to `ruby.gems.nokogiri`, or `ruby_3_2.gems.nokogiri` to get the Nokogiri gem already compiled and ready to use.
+The interpreters have common attributes, namely `gems`, and `withPackages`. So you can refer to `ruby.gems.nokogiri`, or `ruby_3_4.gems.nokogiri` to get the Nokogiri gem already compiled and ready to use.
 
 Since not all gems have executables like `nokogiri`, it's usually more convenient to use the `withPackages` function like this: `ruby.withPackages (p: with p; [ nokogiri ])`. This will also make sure that the Ruby in your environment will be able to find the gem and it can be used in your Ruby code (for example via `ruby` or `irb` executables) via `require "nokogiri"` as usual.
 

doc/release-notes/rl-2511.section.md

@@ -146,6 +146,8 @@
     and backwards incompatible database migrations. Ensure backups are valid and run a Full Scan after
     starting the new version.
 
+- `deabbeef` no longer support `gtk2`.
+
 - `tooling-language-server` has been renamed to `deputy` (both the package and binary), following the rename of the upstream project.
 
 - `fetchFromBitBucket` has gained a `fetchgit` backend when passing in git-related arguments similar to `fetchFromGitHub`.

nixos/modules/services/misc/redmine.nix

@@ -80,7 +80,7 @@ in
       enable = lib.mkEnableOption "Redmine, a project management web application";
 
       package = lib.mkPackageOption pkgs "redmine" {
-        example = "redmine.override { ruby = pkgs.ruby_3_2; }";
+        example = "redmine.override { ruby = pkgs.ruby_3_4; }";
       };
 
       user = lib.mkOption {

nixos/tests/switch-test.nix

@@ -91,6 +91,14 @@ in
             virtualisation.fileSystems."/".device = lib.mkForce "auto";
           };
 
+          automount.configuration = {
+            virtualisation.fileSystems."/testauto" = {
+              device = "tmpfs";
+              fsType = "tmpfs";
+              options = [ "x-systemd.automount" ];
+            };
+          };
+
           swap.configuration.swapDevices = lib.mkVMOverride [
             {
               device = "/swapfile";
@@ -627,6 +635,17 @@ in
                 (pkgs.writeText "dbus-reload-dummy" "dbus reload dummy")
               ];
             };
+
+          generators.configuration =
+            { lib, pkgs, ... }:
+            {
+              systemd.generators.simple-generator = pkgs.writeShellScript "simple-generator" ''
+                ${lib.getExe' pkgs.coreutils "cat"} >$1/simple-generated.service <<EOF
+                [Service]
+                ExecStart=${lib.getExe' pkgs.coreutils "sleep"} infinity
+                EOF
+              '';
+            };
         };
       };
 
@@ -826,9 +845,21 @@ in
           assert_lacks(out, "\nrestarting the following units:")
           assert_lacks(out, "\nstarting the following units:")
           assert_lacks(out, "the following new units were started:")
+          # add an automount
+          out = switch_to_specialisation("${machine}", "automount")
+          assert_lacks(out, "stopping the following units:")
+          assert_lacks(out, "\nrestarting the following units:")
+          assert_lacks(out, "\nstarting the following units:")
+          assert_contains(out, "the following new units were started: testauto.automount\n")
+          # remove the automount
+          out = switch_to_specialisation("${machine}", "")
+          assert_contains(out, "stopping the following units: testauto.automount\n")
+          assert_lacks(out, "reloading the following units:")
+          assert_lacks(out, "\nrestarting the following units:")
+          assert_lacks(out, "\nstarting the following units:")
+          assert_lacks(out, "the following new units were started:")
 
       with subtest("swaps"):
-          switch_to_specialisation("${machine}", "")
           # add a swap
           out = switch_to_specialisation("${machine}", "swap")
           assert_lacks(out, "stopping the following units:")
@@ -1520,5 +1551,13 @@ in
           assert_lacks(out, "\nrestarting the following units:")
           assert_lacks(out, "\nstarting the following units:")
           assert_lacks(out, "the following new units were started:")
+
+      with subtest("generators"):
+          out = switch_to_specialisation("${machine}", "generators")
+          # The service is not started by anything, so we start it manually
+          machine.succeed("systemctl start simple-generated.service && systemctl is-active simple-generated.service")
+          out = switch_to_specialisation("${machine}", "")
+          # Assert switching to a different generation doesn't touch units created by generators
+          machine.succeed("systemctl is-active simple-generated.service")
     '';
 }

pkgs/applications/audio/deadbeef/default.nix

@@ -3,17 +3,12 @@
   config,
   clangStdenv,
   fetchFromGitHub,
-  autoconf,
-  automake,
+  autoreconfHook,
   libtool,
   intltool,
   pkg-config,
   jansson,
   swift-corelibs-libdispatch,
-  # deadbeef can use either gtk2 or gtk3
-  gtk2Support ? false,
-  gtk2,
-  gtk3Support ? true,
   gtk3,
   gsettings-desktop-schemas,
   wrapGAppsHook3,
@@ -65,8 +60,6 @@
   curl,
 }:
 
-assert gtk2Support || gtk3Support;
-
 let
   inherit (lib) optionals;
 
@@ -87,11 +80,6 @@ clangStdenv.mkDerivation {
   buildInputs = [
     jansson
     swift-corelibs-libdispatch
-  ]
-  ++ optionals gtk2Support [
-    gtk2
-  ]
-  ++ optionals gtk3Support [
     gtk3
     gsettings-desktop-schemas
   ]
@@ -158,29 +146,15 @@ clangStdenv.mkDerivation {
   ];
 
   nativeBuildInputs = [
-    autoconf
-    automake
+    autoreconfHook
     intltool
     libtool
     pkg-config
-  ]
-  ++ optionals gtk3Support [
     wrapGAppsHook3
   ];
 
   enableParallelBuilding = true;
 
-  preConfigure = ''
-    ./autogen.sh
-  '';
-
-  postPatch = ''
-    # Fix the build on c++17 compiler:
-    #   https://github.com/DeaDBeeF-Player/deadbeef/issues/3012
-    # TODO: remove after 1.9.5 release.
-    substituteInPlace plugins/adplug/Makefile.am --replace 'adplug_la_CXXFLAGS = ' 'adplug_la_CXXFLAGS = -std=c++11 '
-  '';
-
   meta = with lib; {
     description = "Ultimate Music Player for GNU/Linux";
     mainProgram = "deadbeef";

pkgs/applications/editors/vim/macvim.nix

@@ -7,9 +7,9 @@
   gettext,
   pkg-config,
   cscope,
-  ruby_3_2,
+  ruby,
   tcl,
-  perl540,
+  perl,
   luajit,
   darwin,
   libiconv,
@@ -18,9 +18,9 @@
 
 # Try to match MacVim's documented script interface compatibility
 let
-  perl = perl540;
-  # Ruby 3.2
-  ruby = ruby_3_2;
+  #perl = perl540;
+  # Ruby 3.3
+  #ruby = ruby_3_3;
 
   # Building requires a few system tools to be in PATH.
   # Some of these we could patch into the relevant source files (such as xcodebuild and
@@ -215,5 +215,33 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = [ ];
     platforms = platforms.darwin;
     hydraPlatforms = [ ]; # hydra can't build this as long as we rely on Xcode and sandboxProfile
+    # Needs updating to a newer MacVim for Python and Ruby version support
+    broken = true;
+    knownVulnerabilities = [
+      "CVE-2023-46246"
+      "CVE-2023-48231"
+      "CVE-2023-48232"
+      "CVE-2023-48233"
+      "CVE-2023-48234"
+      "CVE-2023-48235"
+      "CVE-2023-48236"
+      "CVE-2023-48237"
+      "CVE-2023-48706"
+      "CVE-2023-5344"
+      "CVE-2023-5441"
+      "CVE-2023-5535"
+      "CVE-2024-22667"
+      "CVE-2024-41957"
+      "CVE-2024-41965"
+      "CVE-2024-43374"
+      "CVE-2024-47814"
+      "CVE-2025-1215"
+      "CVE-2025-22134"
+      "CVE-2025-24014"
+      "CVE-2025-26603"
+      "CVE-2025-29768"
+      "CVE-2025-53905"
+      "CVE-2025-53906"
+    ];
   };
 })

pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix

@@ -21,12 +21,12 @@
 {
   ada = buildGrammar {
     language = "ada";
-    version = "0.0.0+rev=364d3f4";
+    version = "0.0.0+rev=b23672d";
     src = fetchFromGitHub {
       owner = "briot";
       repo = "tree-sitter-ada";
-      rev = "364d3f4aa8b382113bdd5d3ca6d82dc9c74ac738";
-      hash = "sha256-/ba8hQULLHGxg7kqkSMmtqsnslUC1mHebKAG6vYIQzw=";
+      rev = "b23672d313b4c994ab96fd54f1b7ff15eac68a55";
+      hash = "sha256-XkJmrMppr1+1uPQwqAHcf1XBccwGexL0euXZBUX7xlM=";
     };
     meta.homepage = "https://github.com/briot/tree-sitter-ada";
   };
@@ -253,12 +253,12 @@
   };
   c_sharp = buildGrammar {
     language = "c_sharp";
-    version = "0.0.0+rev=3431444";
+    version = "0.0.0+rev=6563c3a";
     src = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-c-sharp";
-      rev = "3431444351c871dffb32654f1299a00019280f2f";
-      hash = "sha256-uPksTd5PLwdni7zY5lFLVFF1WaAM3ctrUomDve9Y+VA=";
+      rev = "6563c3af3f03ec948d08f9325e4bbd072e4c6b99";
+      hash = "sha256-JIyBPr4BHHZ2ENQhZPrHpE/FFvyAT/20fJTkPLn1l18=";
     };
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp";
   };
@@ -341,12 +341,12 @@
   };
   comment = buildGrammar {
     language = "comment";
-    version = "0.0.0+rev=689be73";
+    version = "0.0.0+rev=db922d7";
     src = fetchFromGitHub {
       owner = "stsewd";
       repo = "tree-sitter-comment";
-      rev = "689be73775bd2dd57b938b8e12bf50fec35a6ca3";
-      hash = "sha256-O9BBcsMfIfDDzvm2eWuOhgLclUNdgZ/GsQd0kuFFFPQ=";
+      rev = "db922d7809637900089709e07e31b88c42354ec2";
+      hash = "sha256-gpxR7x/RMXk/XObKp8CX9HmJs0VPMRKTGLFxZtaoc0A=";
     };
     meta.homepage = "https://github.com/stsewd/tree-sitter-comment";
   };
@@ -407,12 +407,12 @@
   };
   css = buildGrammar {
     language = "css";
-    version = "0.0.0+rev=6e327db";
+    version = "0.0.0+rev=dda5cfc";
     src = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-css";
-      rev = "6e327db434fec0ee90f006697782e43ec855adf5";
-      hash = "sha256-en379DlqzzvQNvKgE8CtiA00j7phUyipttqbnETGHKc=";
+      rev = "dda5cfc5722c429eaba1c910ca32c2c0c5bb1a3f";
+      hash = "sha256-jFsnEyS+FThk7L48FzAdSp5fNPSLvM8hTL/VC5FMlOE=";
     };
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-css";
   };
@@ -474,12 +474,12 @@
   };
   dart = buildGrammar {
     language = "dart";
-    version = "0.0.0+rev=80e23c0";
+    version = "0.0.0+rev=d4d8f3e";
     src = fetchFromGitHub {
       owner = "UserNobody14";
       repo = "tree-sitter-dart";
-      rev = "80e23c07b64494f7e21090bb3450223ef0b192f4";
-      hash = "sha256-bMFBSVAHTGstvalL5vZGahA5gL95IZQmJfBOE+trnwM=";
+      rev = "d4d8f3e337d8be23be27ffc35a0aef972343cd54";
+      hash = "sha256-1ftYqCor1A0PsQ0AJLVqtxVRZxaXqE/NZ5yy7SizZCY=";
     };
     meta.homepage = "https://github.com/UserNobody14/tree-sitter-dart";
   };
@@ -619,12 +619,12 @@
   };
   editorconfig = buildGrammar {
     language = "editorconfig";
-    version = "0.0.0+rev=947228f";
+    version = "0.0.0+rev=911d701";
     src = fetchFromGitHub {
       owner = "ValdezFOmar";
       repo = "tree-sitter-editorconfig";
-      rev = "947228fb880f838c6d71e8f11dbc0bfb82cd4c78";
-      hash = "sha256-HXIJB+Cxm9Cy6H+9zGsypotXdxOujeBiFKVMyd5p+co=";
+      rev = "911d7017566116b15c4b2c339e1dbe11fcf03f63";
+      hash = "sha256-c/rg3qgUO7RfmFhFSIPyl6npNieztaVv58u10p9JH3o=";
     };
     meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-editorconfig";
   };
@@ -707,23 +707,23 @@
   };
   enforce = buildGrammar {
     language = "enforce";
-    version = "0.0.0+rev=a194046";
+    version = "0.0.0+rev=eb27968";
     src = fetchFromGitHub {
       owner = "simonvic";
       repo = "tree-sitter-enforce";
-      rev = "a194046e64bdec2c9e2e1a7caa35326387f78b95";
-      hash = "sha256-5G60pe/nf+7LZeiyyqc+LA955l7sW/Du/piwABxzSFk=";
+      rev = "eb2796871d966264cdb041b797416ef1757c8b4f";
+      hash = "sha256-50yK0MIMFFjUlcE99MEESKdcLnyIurAl16uGXGQyjkI=";
     };
     meta.homepage = "https://github.com/simonvic/tree-sitter-enforce";
   };
   erlang = buildGrammar {
     language = "erlang";
-    version = "0.0.0+rev=df268da";
+    version = "0.0.0+rev=a260cb6";
     src = fetchFromGitHub {
       owner = "WhatsApp";
       repo = "tree-sitter-erlang";
-      rev = "df268da05d8ed4837dd2a8e2af1906619c2f0aa0";
-      hash = "sha256-fkYhGw0IYa7UMfiCflK0cbUsBcDAGqtHUzANJtEK/TM=";
+      rev = "a260cb65eaa6e055289a34434f98c3aae6137ed5";
+      hash = "sha256-EatEvMEI83yax2LCCrtJMFWDOuTzp4/rUPdARiRze6E=";
     };
     meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang";
   };
@@ -972,12 +972,12 @@
   };
   gleam = buildGrammar {
     language = "gleam";
-    version = "0.0.0+rev=dae1551";
+    version = "0.0.0+rev=ec3c27c";
     src = fetchFromGitHub {
       owner = "gleam-lang";
       repo = "tree-sitter-gleam";
-      rev = "dae1551a9911b24f41d876c23f2ab05ece0a9d4c";
-      hash = "sha256-GIikbo8N2bmUa8wddpAgTHeejCInoEY8HxGDbuYq/zQ=";
+      rev = "ec3c27c5eef20f48b17ee28152f521697df10312";
+      hash = "sha256-RB3kC9RJywSk+cD8cT/2TpnwduYhPNXpyIsklNfY+L4=";
     };
     meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam";
   };
@@ -1203,12 +1203,12 @@
   };
   hare = buildGrammar {
     language = "hare";
-    version = "0.0.0+rev=4af5d82";
+    version = "0.0.0+rev=eed7ddf";
     src = fetchFromGitHub {
       owner = "tree-sitter-grammars";
       repo = "tree-sitter-hare";
-      rev = "4af5d82cf9ec39f67cb1db5b7a9269d337406592";
-      hash = "sha256-QEnE5IQJ60PXb6QjgEE5L4p7Fjy0p+N+dyDTMh3YsRg=";
+      rev = "eed7ddf6a66b596906aa8ca3d40521b8278adc6f";
+      hash = "sha256-qXLRb+5SgfBrOXta10P04ErV5z8eSM/J0Od5pk06OCc=";
     };
     meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-hare";
   };
@@ -1457,12 +1457,12 @@
   };
   javadoc = buildGrammar {
     language = "javadoc";
-    version = "0.0.0+rev=c39005f";
+    version = "0.0.0+rev=92f9d71";
     src = fetchFromGitHub {
       owner = "rmuir";
       repo = "tree-sitter-javadoc";
-      rev = "c39005f7da0218cc3ac2734bef049a8fa9ee0e72";
-      hash = "sha256-QNp/yzcjV8QdTa4C2UD9w6LvFaOBqHKAP9T0zCvHSyE=";
+      rev = "92f9d7115598c1b012f5931a84ee5d50d46c0eb7";
+      hash = "sha256-A8aMgDKAPZ18qy7GMihBpNrmL52Zf/wAjsPQoMCL3oE=";
     };
     meta.homepage = "https://github.com/rmuir/tree-sitter-javadoc";
   };
@@ -1624,12 +1624,12 @@
   };
   kitty = buildGrammar {
     language = "kitty";
-    version = "0.0.0+rev=49f877c";
+    version = "0.0.0+rev=064d1b4";
     src = fetchFromGitHub {
       owner = "OXY2DEV";
       repo = "tree-sitter-kitty";
-      rev = "49f877cff80ab613808b34bde170ea477ec182fe";
-      hash = "sha256-BCUxQ630wGVEasUqd2/7ZUeGtJwrPbJYYXRPfeMHkrI=";
+      rev = "064d1b4d8ae1b93244de0ff6bc9f0ee0cffee3b5";
+      hash = "sha256-DN6SWXZM1HedUtV7mDEEgictaI2V/pQHh5cg906qfO0=";
     };
     meta.homepage = "https://github.com/OXY2DEV/tree-sitter-kitty";
   };
@@ -1891,12 +1891,12 @@
   };
   mlir = buildGrammar {
     language = "mlir";
-    version = "0.0.0+rev=14152c1";
+    version = "0.0.0+rev=7eadef0";
     src = fetchFromGitHub {
       owner = "artagnon";
       repo = "tree-sitter-mlir";
-      rev = "14152c1e580043865131bca80bcd8e8cb9132df7";
-      hash = "sha256-5ghARBgsQOb7zJ4kvQ5cCQ+44DDlB8I0pkItHt+Iwwc=";
+      rev = "7eadef0de98de1170cdffb68c0931e375fc1b046";
+      hash = "sha256-/zOS9fvfnFotySPw2+DY9ob8s+PYJrRgb1ymx2l5JAc=";
     };
     generate = true;
     meta.homepage = "https://github.com/artagnon/tree-sitter-mlir";
@@ -2249,12 +2249,12 @@
   };
   prisma = buildGrammar {
     language = "prisma";
-    version = "0.0.0+rev=73f39a6";
+    version = "0.0.0+rev=3556b2c";
     src = fetchFromGitHub {
       owner = "victorhqc";
       repo = "tree-sitter-prisma";
-      rev = "73f39a6d5401cfdcd143951e499336cf5ab2ffaa";
-      hash = "sha256-0wHh+Gf2wer/35NdEWOCQFNdRH/wVWnRx9HnlX7vZho=";
+      rev = "3556b2c1f20ec9ac91e92d32c43d9d2a0ca3cc49";
+      hash = "sha256-VE9HUG0z6oPVlA8no011vwYI2HxufJEuXXnCGbCgI4Q=";
     };
     meta.homepage = "https://github.com/victorhqc/tree-sitter-prisma";
   };
@@ -2450,12 +2450,12 @@
   };
   racket = buildGrammar {
     language = "racket";
-    version = "0.0.0+rev=6d63a20";
+    version = "0.0.0+rev=130e765";
     src = fetchFromGitHub {
       owner = "6cdh";
       repo = "tree-sitter-racket";
-      rev = "6d63a202602eb350e726b5e7814127ba22ed25fc";
-      hash = "sha256-S7LRg3c0zDpT8GlIbsyU/QgXO5aKoKzZ6ajNQwoLwXA=";
+      rev = "130e76536bd3a45df7b7fd71cfa3d0df25fcfe8e";
+      hash = "sha256-PbBNNIGUapdZH8rWNzfN+LZDJAMUn4n5ZsuyF9PVCnE=";
     };
     meta.homepage = "https://github.com/6cdh/tree-sitter-racket";
   };
@@ -2670,12 +2670,12 @@
   };
   rust = buildGrammar {
     language = "rust";
-    version = "0.0.0+rev=00d7cbc";
+    version = "0.0.0+rev=261b202";
     src = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-rust";
-      rev = "00d7cbc95f0b8ea2703129550fbd1853a13e0e29";
-      hash = "sha256-dxfM+9itniZZr/4yzlibJW1zCbb0oh5/1t2EhrZAqxw=";
+      rev = "261b20226c04ef601adbdf185a800512a5f66291";
+      hash = "sha256-i6OrbcHNkrsAW5cpYOI7r0F6xn94KZWB9ZJMUH+k2ds=";
     };
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust";
   };
@@ -2704,12 +2704,12 @@
   };
   scheme = buildGrammar {
     language = "scheme";
-    version = "0.0.0+rev=67b5c8d";
+    version = "0.0.0+rev=591893b";
     src = fetchFromGitHub {
       owner = "6cdh";
       repo = "tree-sitter-scheme";
-      rev = "67b5c8d6ce19fd5265f13204fec0a3efa9e095d9";
-      hash = "sha256-njPs+AAQYIGzztARtlpl2pmTrA0ozcXmbpuJxFp+44s=";
+      rev = "591893b9a8b9ec85f5cef86e0cc1028012ad9f0e";
+      hash = "sha256-kmrLTryeUzs4nePGR13DQjRmQTmHHglsugYlvLZP/4k=";
     };
     meta.homepage = "https://github.com/6cdh/tree-sitter-scheme";
   };
@@ -2883,12 +2883,12 @@
   };
   sql = buildGrammar {
     language = "sql";
-    version = "0.0.0+rev=0a997b0";
+    version = "0.0.0+rev=4afe285";
     src = fetchFromGitHub {
       owner = "derekstride";
       repo = "tree-sitter-sql";
-      rev = "0a997b07c777b6504792d04357a0f655897f15a8";
-      hash = "sha256-9kiNESyelA3suGV+QM8YmFrAPJPCZT+hXx+xdJ2RWmg=";
+      rev = "4afe285bb142542cee0aa7b689fec00a71df4741";
+      hash = "sha256-Qzrun7sIjX+jyz0oh4MotfTSXAcEYSM/2+CAWJkXgVo=";
     };
     meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
   };
@@ -2960,12 +2960,12 @@
   };
   superhtml = buildGrammar {
     language = "superhtml";
-    version = "0.0.0+rev=4b60dd9";
+    version = "0.0.0+rev=aeaa0c7";
     src = fetchFromGitHub {
       owner = "kristoff-it";
       repo = "superhtml";
-      rev = "4b60dd98f5d3e158967c9feb839ae71321a625b9";
-      hash = "sha256-czPoY8Ttgq4DJh+6+HQO5eumTfWuCNxSOc/+oeOXZwc=";
+      rev = "aeaa0c7d9ef983453952a2ee4983476fef0168f3";
+      hash = "sha256-3mCdFn2ZsRFn/UI+frWD0MTx8qdiZldveYffpZ7nd98=";
     };
     location = "tree-sitter-superhtml";
     meta.homepage = "https://github.com/kristoff-it/superhtml";
@@ -3039,23 +3039,23 @@
   };
   systemverilog = buildGrammar {
     language = "systemverilog";
-    version = "0.0.0+rev=9e06a0d";
+    version = "0.0.0+rev=e88937e";
     src = fetchFromGitHub {
       owner = "gmlarumbe";
       repo = "tree-sitter-systemverilog";
-      rev = "9e06a0dddbef4e80a2091fd0a772cc93a55019f7";
-      hash = "sha256-5zvDPiAVUpfzJ37vjMsyn3c/vDcWe6uEUCHCYpjfDTs=";
+      rev = "e88937e66adc3ee7be0bfe40b7e937eafe4212bb";
+      hash = "sha256-wzsjHDn6ZdGfOlufARurxCTwT8HqMvyfsnIIpXzRUYs=";
     };
     meta.homepage = "https://github.com/gmlarumbe/tree-sitter-systemverilog";
   };
   t32 = buildGrammar {
     language = "t32";
-    version = "0.0.0+rev=5f20682";
+    version = "0.0.0+rev=d4e26ab";
     src = fetchFromGitLab {
       owner = "xasc";
       repo = "tree-sitter-t32";
-      rev = "5f20682355725d840611b07b2ce9681034cff3a6";
-      hash = "sha256-61IoYDsTOIe2RhqfQKdogqgSWlSShXxSgvMHJ4++jYc=";
+      rev = "d4e26ab7a730cfbe0cf84dba6ea3647989064839";
+      hash = "sha256-awbgOZaIqpdjsskSr6by2AyojVRU+gkLgS70abhPryE=";
     };
     meta.homepage = "https://gitlab.com/xasc/tree-sitter-t32";
   };
@@ -3542,23 +3542,23 @@
   };
   xresources = buildGrammar {
     language = "xresources";
-    version = "0.0.0+rev=c6f240a";
+    version = "0.0.0+rev=fd546d4";
     src = fetchFromGitHub {
       owner = "ValdezFOmar";
       repo = "tree-sitter-xresources";
-      rev = "c6f240ab53c75edc0b122bc26c994ceb410d5b27";
-      hash = "sha256-9OH31NL9LBhV0TywFAjZXDsMbdJZBZc5XtLm6eFxe9g=";
+      rev = "fd546d43fe0a179b59dfdfb296082c584870e11b";
+      hash = "sha256-KbXPadsIADNqINBwjewDzkHHVoVhE6X0ltgWIPDGlrg=";
     };
     meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-xresources";
   };
   yaml = buildGrammar {
     language = "yaml";
-    version = "0.0.0+rev=3431ec2";
+    version = "0.0.0+rev=7708026";
     src = fetchFromGitHub {
       owner = "tree-sitter-grammars";
       repo = "tree-sitter-yaml";
-      rev = "3431ec21da1dde751bab55520963cf3a4f1121f3";
-      hash = "sha256-4XYAgMXq9AmEuejbM+y1x9oHrStxgrXlm3zg33iEvNQ=";
+      rev = "7708026449bed86239b1cd5bce6e3c34dbca6415";
+      hash = "sha256-BX6TOfAZLW+0h2TNsgsLC9K2lfirraCWlBN2vCKiXQ4=";
     };
     meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-yaml";
   };

pkgs/applications/editors/vim/plugins/overrides.nix

@@ -819,7 +819,10 @@ assertNoAdditions {
     dependencies = [ self.plenary-nvim ];
     nvimSkipModules = [
       # Test mismatch of directory because of nix generated path
+      "conjure-spec.client.common-lisp.swank_spec"
       "conjure-spec.client.fennel.nfnl_spec"
+      "conjure-spec.client.guile.socket_spec"
+      "conjure-spec.client.scheme.stdio_spec"
       # No parser for fennel
       "conjure.client.fennel.def-str-util"
     ];
@@ -895,7 +898,15 @@ assertNoAdditions {
     '';
   };
 
-  cpsm = super.cpsm.overrideAttrs {
+  cpsm = super.cpsm.overrideAttrs (old: {
+    # CMake 4 dropped support of versions lower than 3.5, and versions
+    # lower than 3.10 are deprecated.
+    postPatch = (old.postPatch or "") + ''
+      substituteInPlace CMakeLists.txt \
+        --replace-fail \
+          "cmake_minimum_required(VERSION 2.8.12)" \
+          "cmake_minimum_required(VERSION 3.10)"
+    '';
     nativeBuildInputs = [ cmake ];
     buildInputs = [
       python3
@@ -904,11 +915,15 @@ assertNoAdditions {
       ncurses
     ];
     buildPhase = ''
+      runHook preBuild
+
       patchShebangs .
       export PY3=ON
       ./install.sh
+
+      runHook postBuild
     '';
-  };
+  });
 
   crates-nvim = super.crates-nvim.overrideAttrs {
     checkInputs = [
@@ -3685,6 +3700,14 @@ assertNoAdditions {
     };
   });
 
+  vimtex = super.vimtex.overrideAttrs {
+    checkInputs = with self; [
+      # Optional integrations
+      fzf-lua
+      snacks-nvim
+    ];
+  };
+
   vimproc-vim = super.vimproc-vim.overrideAttrs {
     buildInputs = [ which ];
 

pkgs/applications/editors/vim/plugins/vim-plugin-names

@@ -573,7 +573,7 @@ https://github.com/lmburns/lf.nvim/,HEAD,
 https://github.com/ptzz/lf.vim/,,
 https://github.com/LucHermitte/lh-brackets/,,
 https://github.com/LucHermitte/lh-vim-lib/,,
-https://github.com/maximbaz/lightline-ale/,,
+https://github.com/max-baz/lightline-ale/,,
 https://github.com/mengelbrecht/lightline-bufferline/,,
 https://github.com/shinchu/lightline-gruvbox.vim/,,
 https://github.com/spywhere/lightline-lsp/,,
@@ -1237,7 +1237,7 @@ https://github.com/vim-scripts/utl.vim/,,
 https://github.com/benomahony/uv.nvim/,HEAD,
 https://github.com/KabbAmine/vCoolor.vim/,,
 https://github.com/junegunn/vader.vim/,,
-https://github.com/vague2k/vague.nvim/,HEAD,
+https://github.com/vague-theme/vague.nvim/,HEAD,
 https://github.com/jbyuki/venn.nvim/,,
 https://github.com/vhda/verilog_systemverilog.vim/,,
 https://github.com/vifm/vifm.vim/,,

pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix

@@ -11,8 +11,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "terraform";
     publisher = "hashicorp";
-    version = "2.37.2";
-    hash = "sha256-TT2n0C8MzERemz/4Hwzf45HoICYe0u3/mMJDhrI5UC8=";
+    version = "2.37.5";
+    hash = "sha256-FmeO7RKzQb/wKO34Bues9IlYxd9O3/oCNmByIrv4+J0=";
   };
 
   postInstall = ''

pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix

@@ -16,6 +16,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
     downloadPage = "https://github.com/cline/cline";
     homepage = "https://github.com/cline/cline";
     license = lib.licenses.asl20;
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.matteopacini ];
   };
 }

pkgs/by-name/ae/aerospike/package.nix

@@ -37,7 +37,11 @@ stdenv.mkDerivation rec {
 
   preBuild = ''
     patchShebangs build/gen_version
-    substituteInPlace build/gen_version --replace 'git describe' 'echo ${version}'
+    substituteInPlace build/gen_version \
+      --replace-fail 'VERSION="$(git describe --abbrev=7)"' 'VERSION="${version}"' \
+      --replace-fail 'CE_SHA="$(git rev-parse HEAD)"' 'CE_SHA="${version}"' \
+      --replace-fail '$(date)' '$(date -u -d "@$SOURCE_DATE_EPOCH" 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH")'
+    patchShebangs build/os_version
   '';
 
   installPhase = ''

pkgs/by-name/ai/airspyhf/package.nix

@@ -7,15 +7,15 @@
   libusb1,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "airspyhf";
-  version = "1.6.8";
+  version = "1.6.8-unstable-2025-07-12";
 
   src = fetchFromGitHub {
     owner = "airspy";
     repo = "airspyhf";
-    tag = version;
-    hash = "sha256-RKTMEDPeKcerJZtXTn8eAShxDcZUMgeQg/+7pEpMyVg=";
+    rev = "87cf12a30f3a0f10f313aab8e54999ca69b753af";
+    hash = "sha256-7bXBv4YTOaWRFI6Svb9/lSBEAssUgJMqxKM5zHk1swM=";
   };
 
   nativeBuildInputs = [
@@ -29,7 +29,10 @@ stdenv.mkDerivation rec {
     description = "User mode driver for Airspy HF+";
     homepage = "https://github.com/airspy/airspyhf";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ sikmir ];
+    maintainers = with maintainers; [
+      aciceri
+      sikmir
+    ];
     platforms = platforms.unix;
   };
 }

pkgs/by-name/ap/aptdec/package.nix

@@ -24,17 +24,23 @@ stdenv.mkDerivation rec {
     cmake
     pkg-config
   ];
+
   buildInputs = [
     libpng
     libsndfile
   ];
 
+  cmakeFlags = [ (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10") ];
+
   meta = with lib; {
     description = "NOAA APT satellite imagery decoding library";
     mainProgram = "aptdec";
     homepage = "https://github.com/Xerbo/aptdec";
     license = licenses.gpl2;
-    maintainers = with maintainers; [ alexwinter ];
+    maintainers = with maintainers; [
+      aciceri
+      alexwinter
+    ];
     platforms = platforms.unix;
   };
 }

pkgs/by-name/ar/armagetronad-dedicated/package.nix

@@ -0,0 +1,7 @@
+{
+  armagetronad,
+}:
+
+armagetronad.override {
+  dedicatedServer = true;
+}

pkgs/by-name/ar/armagetronad/package.nix

@@ -248,13 +248,13 @@ let
             tests.armagetronad = nixosTests.armagetronad;
           };
 
-      meta = with lib; {
+      meta = {
         inherit mainProgram;
         homepage = "https://www.armagetronad.org";
         description = "Multiplayer networked arcade racing game in 3D similar to Tron";
-        maintainers = with maintainers; [ numinit ];
-        license = licenses.gpl2Plus;
-        platforms = platforms.linux;
+        maintainers = with lib.maintainers; [ numinit ];
+        license = lib.licenses.gpl2Plus;
+        platforms = lib.platforms.linux;
       };
     };
 in

pkgs/by-name/ca/caido/package.nix

@@ -5,10 +5,11 @@
   appimageTools,
   makeWrapper,
   autoPatchelfHook,
+  _7zz,
+  unzip,
   libgcc,
   appVariants ? [ ],
 }:
-
 let
   pname = "caido";
   appVariantList = [
@@ -16,52 +17,161 @@ let
     "desktop"
   ];
   version = "0.52.0";
+
+  system = stdenv.hostPlatform.system;
+  isLinux = stdenv.isLinux;
+  isDarwin = stdenv.isDarwin;
+
+  # CLI sources
+  cliSources = {
+    x86_64-linux = {
+      url = "https://caido.download/releases/v${version}/caido-cli-v${version}-linux-x86_64.tar.gz";
+      hash = "sha256-gxB5GeJXTrPDGRXxKV3kdYQ0VgmmIeO8rggRPQlTDqw=";
+    };
+    aarch64-linux = {
+      url = "https://caido.download/releases/v${version}/caido-cli-v${version}-linux-aarch64.tar.gz";
+      hash = "sha256-VaYy3OkAeuxZ0+UFENOvFYowa9jExQd3WO7VFJ6kPMg=";
+    };
+    x86_64-darwin = {
+      url = "https://caido.download/releases/v${version}/caido-cli-v${version}-mac-x86_64.zip";
+      hash = "sha256-GhPKxkCJjhwafmXOgaCePCn3g1Mls+ZFu4xWBzVXaQo=";
+    };
+    aarch64-darwin = {
+      url = "https://caido.download/releases/v${version}/caido-cli-v${version}-mac-aarch64.zip";
+      hash = "sha256-R394RFaYHm8zi4gKuaP0Ljhybq/80MGYlTlld3tACdQ=";
+    };
+  };
+
+  # Desktop sources
+  desktopSources = {
+    x86_64-linux = {
+      url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-linux-x86_64.AppImage";
+      hash = "sha256-ANCMHJTeH0UyJvCpslbxc0I3BbfPfR7kr4UISWeo2ec=";
+    };
+    aarch64-linux = {
+      url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-linux-aarch64.AppImage";
+      hash = "sha256-tlNcxc+eh/Y0HrkMXWJ2SP+Lr5xfXJUAhZAgk7s/WRE=";
+    };
+    x86_64-darwin = {
+      url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-mac-x86_64.dmg";
+      hash = "sha256-c2Hc6KCwgebAa3rHAvV9FgVeiexSuwqYbe85PwNxV08=";
+    };
+    aarch64-darwin = {
+      url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-mac-aarch64.dmg";
+      hash = "sha256-fbhQ4Q0TyRySd3k9h7CutnreVJj29+XvX/RM1cDTRSg=";
+    };
+  };
+
+  cliSource = cliSources.${system} or (throw "Unsupported system for caido-cli: ${system}");
+  desktopSource =
+    desktopSources.${system} or (throw "Unsupported system for caido-desktop: ${system}");
+
   cli = fetchurl {
-    url = "https://caido.download/releases/v${version}/caido-cli-v${version}-linux-x86_64.tar.gz";
-    hash = "sha256-gxB5GeJXTrPDGRXxKV3kdYQ0VgmmIeO8rggRPQlTDqw=";
+    url = cliSource.url;
+    hash = cliSource.hash;
   };
+
   desktop = fetchurl {
-    url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-linux-x86_64.AppImage";
-    hash = "sha256-ANCMHJTeH0UyJvCpslbxc0I3BbfPfR7kr4UISWeo2ec=";
+    url = desktopSource.url;
+    hash = desktopSource.hash;
   };
+
   appimageContents = appimageTools.extractType2 {
     inherit pname version;
     src = desktop;
   };
 
-  wrappedDesktop = appimageTools.wrapType2 {
-    src = desktop;
-    inherit pname version;
+  wrappedDesktop =
+    if isLinux then
+      appimageTools.wrapType2 {
+        src = desktop;
+        inherit pname version;
 
-    nativeBuildInputs = [ makeWrapper ];
+        nativeBuildInputs = [ makeWrapper ];
 
-    extraPkgs = pkgs: [ pkgs.libthai ];
+        extraPkgs = pkgs: [ pkgs.libthai ];
 
-    extraInstallCommands = ''
-      install -m 444 -D ${appimageContents}/caido.desktop -t $out/share/applications
-      install -m 444 -D ${appimageContents}/caido.png \
-        $out/share/icons/hicolor/512x512/apps/caido.png
-      wrapProgram $out/bin/caido \
-        --set WEBKIT_DISABLE_COMPOSITING_MODE 1 \
-        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
-    '';
-  };
+        extraInstallCommands = ''
+          install -m 444 -D ${appimageContents}/caido.desktop -t $out/share/applications
+          install -m 444 -D ${appimageContents}/caido.png \
+            $out/share/icons/hicolor/512x512/apps/caido.png
+          wrapProgram $out/bin/caido \
+            --set WEBKIT_DISABLE_COMPOSITING_MODE 1 \
+            --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
+        '';
+      }
+    else if isDarwin then
+      stdenv.mkDerivation {
+        src = desktop;
+        inherit pname version;
 
-  wrappedCli = stdenv.mkDerivation {
-    src = cli;
-    inherit pname version;
+        nativeBuildInputs = [ _7zz ];
+        sourceRoot = ".";
 
-    nativeBuildInputs = [ autoPatchelfHook ];
+        unpackPhase = ''
+          runHook preUnpack
+          ${_7zz}/bin/7zz x $src
+          runHook postUnpack
+        '';
 
-    buildInputs = [ libgcc ];
+        installPhase = ''
+          runHook preInstall
+          mkdir -p $out/Applications
+          cp -r Caido.app $out/Applications/
+          mkdir -p $out/bin
+          ln -s $out/Applications/Caido.app/Contents/MacOS/Caido $out/bin/caido
+          runHook postInstall
+        '';
 
-    sourceRoot = ".";
+        meta = {
+          platforms = [
+            "x86_64-darwin"
+            "aarch64-darwin"
+          ];
+        };
+      }
+    else
+      throw "Desktop variant is not supported on ${stdenv.hostPlatform.system}";
 
-    installPhase = ''
-      runHook preInstall
-      install -m755 -D caido-cli $out/bin/caido-cli
-    '';
-  };
+  wrappedCli =
+    if isLinux then
+      stdenv.mkDerivation {
+        src = cli;
+        inherit pname version;
+
+        nativeBuildInputs = [ autoPatchelfHook ];
+        buildInputs = [ libgcc ];
+        sourceRoot = ".";
+
+        installPhase = ''
+          runHook preInstall
+          install -m755 -D caido-cli $out/bin/caido-cli
+          runHook postInstall
+        '';
+      }
+    else if isDarwin then
+      stdenv.mkDerivation {
+        src = cli;
+        inherit pname version;
+
+        nativeBuildInputs = [ unzip ];
+        sourceRoot = ".";
+
+        installPhase = ''
+          runHook preInstall
+          install -m755 -D caido-cli $out/bin/caido-cli
+          runHook postInstall
+        '';
+
+        meta = {
+          platforms = [
+            "x86_64-darwin"
+            "aarch64-darwin"
+          ];
+        };
+      }
+    else
+      throw "CLI variant is not supported on ${stdenv.hostPlatform.system}";
 
   meta = {
     description = "Lightweight web security auditing toolkit";
@@ -73,9 +183,13 @@ let
       d3vil0p3r
       blackzeshi
     ];
-    platforms = [ "x86_64-linux" ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+      "x86_64-darwin"
+      "aarch64-darwin"
+    ];
   };
-
 in
 lib.checkListOfEnum "${pname}: appVariants" appVariantList appVariants (
   if appVariants == [ "desktop" ] then

pkgs/by-name/cl/clipper/package.nix

@@ -17,6 +17,11 @@ stdenv.mkDerivation rec {
 
   sourceRoot = "cpp";
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)" "CMAKE_MINIMUM_REQUIRED(VERSION 3.10.0)"
+  '';
+
   nativeBuildInputs = [
     cmake
     ninja

pkgs/by-name/cm/cm256cc/package.nix

@@ -2,32 +2,21 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   boost,
 }:
 
 stdenv.mkDerivation rec {
   pname = "cm256cc";
-  version = "1.1.0";
+  version = "1.1.2";
 
   src = fetchFromGitHub {
     owner = "f4exb";
     repo = "cm256cc";
     rev = "v${version}";
-    sha256 = "sha256-T7ZUVVYGdzAialse//MoqWCVNBpbZvzWMAKc0cw7O9k=";
+    hash = "sha256-sAbc8yieGolV8lowiwFBVsd1HNYl1oxJwIw1kc3iI3U=";
   };
 
-  patches = [
-    # Pull fix pending upstream inclusion for gcc-13 support:
-    #   https://github.com/f4exb/cm256cc/pull/18
-    (fetchpatch {
-      name = "gcc-13.patch";
-      url = "https://github.com/f4exb/cm256cc/commit/a7f142bcdae8be1c646d67176ba0ba0f7e8dcd68.patch";
-      hash = "sha256-J7bm44sqnGsdPhJxQrE8LDxZ6tkTzLslHQnnKmtgrtM=";
-    })
-  ];
-
   nativeBuildInputs = [ cmake ];
   buildInputs = [ boost ];
 
@@ -41,7 +30,10 @@ stdenv.mkDerivation rec {
     description = "Fast GF(256) Cauchy MDS Block Erasure Codec in C++";
     homepage = "https://github.com/f4exb/cm256cc";
     platforms = platforms.unix;
-    maintainers = with maintainers; [ alkeryn ];
+    maintainers = with maintainers; [
+      aciceri
+      alkeryn
+    ];
     license = licenses.gpl3;
   };
 }

pkgs/by-name/da/dab_lib/package.nix

@@ -22,6 +22,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   sourceRoot = "${finalAttrs.src.name}/library";
 
+  cmakeFlags = [ (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10") ];
+
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -36,7 +38,10 @@ stdenv.mkDerivation (finalAttrs: {
     description = "DAB/DAB+ decoding library";
     homepage = "https://github.com/JvanKatwijk/dab-cmdline";
     license = licenses.gpl2;
-    maintainers = with maintainers; [ alexwinter ];
+    maintainers = with maintainers; [
+      aciceri
+      alexwinter
+    ];
     platforms = platforms.unix;
   };
 })

pkgs/by-name/fl/fleet/package.nix

@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "fleet";
-  version = "4.73.2";
+  version = "4.73.5";
 
   src = fetchFromGitHub {
     owner = "fleetdm";
     repo = "fleet";
     tag = "fleet-v${finalAttrs.version}";
-    hash = "sha256-Td0ud/7BVDAN7Y74GQFyPnkLmaGS578zRu/8KmjQk5c=";
+    hash = "sha256-66ABReCDIxL+uwwK3IWnKR+UPJd5DBSE+bNUk+2LbQA=";
   };
   vendorHash = "sha256-T4UrUUHAWqInLRH7ZxQlfV1W1rvmhUFsfEeXQdNmRD4=";
 

pkgs/by-name/fz/fzf/package.nix

@@ -12,16 +12,16 @@
 
 buildGoModule rec {
   pname = "fzf";
-  version = "0.65.2";
+  version = "0.66.0";
 
   src = fetchFromGitHub {
     owner = "junegunn";
     repo = "fzf";
     rev = "v${version}";
-    hash = "sha256-vIAkbZ3jx5B5+zdjT+4jMxhGPmiYUBIz5UjSP5HhQ9k=";
+    hash = "sha256-4cspznuGPhTFSUM9yYvPoytX27CKenp/oAMqWpT5JrE=";
   };
 
-  vendorHash = "sha256-1wxi+wfTSSgJQLNbCdoFTz9G4XLgEX7PpzqpuVjEYL8=";
+  vendorHash = "sha256-uFXHoseFOxGIGPiWxWfDl339vUv855VHYgSs9rnDyuI=";
 
   env.CGO_ENABLED = 0;
 

pkgs/by-name/gp/gpu-viewer/package.nix

@@ -29,14 +29,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "gpu-viewer";
-  version = "3.15";
+  version = "3.20";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "arunsivaramanneo";
     repo = "gpu-viewer";
     tag = "v${version}";
-    hash = "sha256-fZsieETJqLbqq3UWtxRtOk5DpxHaTZfYeOLsBTlUtuo=";
+    hash = "sha256-d7gAf3ZXCVZ0O63QV1khq6kaRuPxdAVnRO2+C8B4SUA=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/is/isd/package.nix

@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "isd";
-  version = "0.6.0";
+  version = "0.6.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kainctl";
     repo = "isd";
     tag = "v${version}";
-    hash = "sha256-0RBalvqa2EM7FsgR4CamqkbKrD5QCrz9stk4ijqZi1Q=";
+    hash = "sha256-MEfjE0zRxSuBwBkjAz9cKhodS+I4CjjtuvbO+WwL9SM=";
   };
 
   build-system = with python3Packages; [

pkgs/by-name/ki/kine/package.nix

@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "kine";
-  version = "0.14.3";
+  version = "0.14.5";
 
   src = fetchFromGitHub {
     owner = "k3s-io";
     repo = "kine";
     rev = "v${version}";
-    hash = "sha256-Mmtqyc5LTGQ/Ldp/g7nLXi4dX7bWKiVpeWRzYoTsmm0=";
+    hash = "sha256-2I/igT7AjiPhLpK1pM5V2FvOF4Oc897HbsBMiwCnx/o=";
   };
 
-  vendorHash = "sha256-NG4hzMXsZmzde/EjQARKE00D13UuIQxm+cpIbHPEpB0=";
+  vendorHash = "sha256-Qx4yId072JhuXjF0Xd1/DnsnbsMlfuiwFqDKKw4rDLM=";
 
   ldflags = [
     "-s"

pkgs/by-name/mb/mbelib/package.nix

@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
+  cmakeFlags = [ (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10") ];
+
   doCheck = true;
 
   meta = with lib; {
@@ -25,6 +27,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/szechyjs/mbelib";
     license = licenses.isc;
     platforms = platforms.unix;
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.aciceri ];
   };
 }

pkgs/by-name/me/mediawiki/package.nix

@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "mediawiki";
-  version = "1.44.1";
+  version = "1.44.2";
 
   src = fetchurl {
     url = "https://releases.wikimedia.org/mediawiki/${lib.versions.majorMinor version}/mediawiki-${version}.tar.gz";
-    hash = "sha256-cMsjrJtGDsGZH6M4J6TbWPoIDmc36kIdQoHEkGWy3VA=";
+    hash = "sha256-59cCZpeWcfr9A3BeF6IfGFvRsoP/hD7XL+KQ6G+sQzE=";
   };
 
   postPatch = ''

pkgs/by-name/op/opencode/package.nix

@@ -22,12 +22,12 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "0.14.7";
+  version = "0.15.0";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7Sf74H2ptZoKkOyqy3JU71B2r2DBdosChiWA0dNpiV0=";
+    hash = "sha256-WTWLh50atZ0P+S0BIgInRoaQV94wIO7NJXrpnsiXTAU=";
   };
 
   tui = buildGoModule {
@@ -75,18 +75,24 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     buildPhase = ''
       runHook preBuild
 
-       export BUN_INSTALL_CACHE_DIR=$(mktemp -d)
+      export BUN_INSTALL_CACHE_DIR=$(mktemp -d)
 
-       # Disable post-install scripts to avoid shebang issues
-       bun install \
-         --filter=opencode \
-         --force \
-         --ignore-scripts \
-         --no-progress
-         # Remove `--frozen-lockfile` and `--production` — they erroneously report the lockfile needs updating even though `bun install` does not change it.
-         # Related to  https://github.com/oven-sh/bun/issues/19088
-         # --frozen-lockfile \
-         # --production
+      # NOTE: Disabling post-install scripts with `--ignore-scripts` to avoid
+      # shebang issues
+      # NOTE: `--linker=hoisted` temporarily disables Bun's isolated installs,
+      # which became the default in Bun 1.3.0.
+      # See: https://bun.com/blog/bun-v1.3#isolated-installs-are-now-the-default-for-workspaces
+      # This workaround is required because the 'yargs' dependency is currently
+      # missing when building opencode. Remove this flag once upstream is
+      # compatible with Bun 1.3.0.
+      bun install \
+        --filter=opencode \
+        --force \
+        --frozen-lockfile \
+        --ignore-scripts \
+        --linker=hoisted \
+        --no-progress \
+        --production
 
       runHook postBuild
     '';
@@ -105,10 +111,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
     outputHash =
       {
-        x86_64-linux = "sha256-j6p52NXqKsOiySJO83r3qUvxLs1yt8dPG8q5ClOPLA8=";
-        aarch64-linux = "sha256-gxAwc34PIN1ErVchyoX7Fv/VhPHzxVOC/F6P8hSeO/w=";
-        x86_64-darwin = "sha256-0I6nTjc7gChk2Djv4hFfKMp0wM3ZX57/pCsPVHSDPqk=";
-        aarch64-darwin = "sha256-a/WWhsOP4pZfj5+Vlsyt/adaTTgMt2SlH3UOA+sXNgA=";
+        x86_64-linux = "sha256-kXsLJ/Ck9epH9md6goCj3IYpWog/pOkfxJDYAxI14Fg=";
+        aarch64-linux = "sha256-DHzDyk7BWYgBNhYDlK3dLZglUN7bMiB3acdoU7djbxU=";
+        x86_64-darwin = "sha256-OTEK9SV9IxBHrJlf+F4lI7gF0Gtvik3c7d1mp+4a3Zk=";
+        aarch64-darwin = "sha256-qlLfus/cyrI0HtwVLTjPTdL7OeIYjmH9yoNKa6YNBkg=";
       }
       .${stdenv.hostPlatform.system};
     outputHashAlgo = "sha256";

pkgs/by-name/sd/sdrangel/package.nix

@@ -122,6 +122,7 @@ stdenv.mkDerivation (finalAttrs: {
       SDRangel is an Open Source Qt6 / OpenGL 3.0+ SDR and signal analyzer frontend to various hardware.
     '';
     maintainers = with lib.maintainers; [
+      aciceri
       alkeryn
       Tungsten842
     ];

pkgs/by-name/so/sonic-pi/package.nix

@@ -8,12 +8,13 @@
   cmake,
   pkg-config,
   catch2_3,
+  ncurses,
   kdePackages,
   kissfftFloat,
   crossguid,
   reproc,
   platform-folders,
-  ruby_3_2,
+  ruby,
   beamPackages,
   alsa-lib,
   rtmidi,
@@ -31,11 +32,15 @@
   gl3w,
   SDL2,
   fmt,
-}:
+}@args:
 
-# Sonic Pi fails to build with Ruby 3.3.
 let
-  ruby = ruby_3_2;
+  ruby = args.ruby.withPackages (ps: [
+    ps.prime
+    ps.racc
+    ps.rake
+    ps.rexml
+  ]);
 in
 
 stdenv.mkDerivation (finalAttrs: {
@@ -72,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
+    ncurses
     kdePackages.qtbase
     kdePackages.qtsvg
     kdePackages.qttools

pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs

@@ -197,17 +197,17 @@ fn required_env(var: &str) -> anyhow::Result<String> {
     std::env::var(var).with_context(|| format!("missing required environment variable ${var}"))
 }
 
-#[derive(Debug)]
-struct UnitState {
+struct UnitState<'a, 'b> {
     state: String,
     substate: String,
+    proxy: Proxy<'a, &'b LocalConnection>,
 }
 
 // Asks the currently running systemd instance via dbus which units are active. Returns a hash
 // where the key is the name of each unit and the value a hash of load, state, substate.
-fn get_active_units(
-    systemd_manager: &Proxy<'_, &LocalConnection>,
-) -> Result<HashMap<String, UnitState>> {
+fn get_active_units<'a, 'b>(
+    systemd_manager: &Proxy<'a, &'b LocalConnection>,
+) -> Result<HashMap<String, UnitState<'a, 'b>>> {
     let units = systemd_manager
         .list_units_by_patterns(Vec::new(), Vec::new())
         .context("Failed to list systemd units")?;
@@ -219,29 +219,36 @@ fn get_active_units(
                 id,
                 _description,
                 _load_state,
-                active_state,
-                sub_state,
+                state,
+                substate,
                 following,
-                _unit_path,
+                unit_path,
                 _job_id,
                 _job_type,
                 _job_path,
             )| {
-                if following.is_empty() && active_state != "inactive" {
-                    Some((id, active_state, sub_state))
+                let proxy = systemd_manager.connection.with_proxy(
+                    "org.freedesktop.systemd1",
+                    unit_path,
+                    Duration::from_millis(5000),
+                );
+
+                if following.is_empty() && state != "inactive" {
+                    Some((
+                        id,
+                        UnitState {
+                            state,
+                            substate,
+                            proxy,
+                        },
+                    ))
                 } else {
                     None
                 }
             },
         )
-        .fold(HashMap::new(), |mut acc, (id, active_state, sub_state)| {
-            acc.insert(
-                id,
-                UnitState {
-                    state: active_state,
-                    substate: sub_state,
-                },
-            );
+        .fold(HashMap::new(), |mut acc, (id, unit_state)| {
+            acc.insert(id, unit_state);
 
             acc
         }))
@@ -811,9 +818,12 @@ fn parse_fstab(fstab: impl BufRead) -> (HashMap<String, Filesystem>, HashMap<Str
 
 // Converts a path to the name of a systemd mount unit that would be responsible for mounting this
 // path.
-fn path_to_unit_name(bin_path: &Path, path: &str) -> String {
+fn path_to_unit_name(bin_path: &Path, path: &str, is_automount: bool) -> String {
     let Ok(output) = std::process::Command::new(bin_path.join("systemd-escape"))
-        .arg("--suffix=mount")
+        .arg(format!(
+            "--suffix={}",
+            if is_automount { "automount" } else { "mount" }
+        ))
         .arg("-p")
         .arg(path)
         .output()
@@ -823,7 +833,7 @@ fn path_to_unit_name(bin_path: &Path, path: &str) -> String {
     };
 
     let Ok(unit) = String::from_utf8(output.stdout) else {
-        eprintln!("Unable to convert systemd-espape output to valid UTF-8");
+        eprintln!("Unable to convert systemd-escape output to valid UTF-8");
         die();
     };
 
@@ -1189,6 +1199,17 @@ won't take effect until you reboot the system.
         .context("Invalid regex for matching systemd unit names")?;
 
     for (unit, unit_state) in &current_active_units {
+        // Don't touch units not explicitly written by NixOS (e.g. units created by generators in
+        // /run/systemd/generator*)
+        if !unit_state
+            .proxy
+            .get("org.freedesktop.systemd1.Unit", "FragmentPath")
+            .map(|fragment_path: String| fragment_path.starts_with("/etc/systemd/system"))
+            .unwrap_or_default()
+        {
+            continue;
+        }
+
         let current_unit_file = Path::new("/etc/systemd/system").join(unit);
         let new_unit_file = toplevel.join("etc/systemd/system").join(unit);
 
@@ -1319,8 +1340,10 @@ won't take effect until you reboot the system.
         .unwrap_or_default();
 
     for (mountpoint, current_filesystem) in current_filesystems {
+        let is_automount = current_filesystem.options.contains("x-systemd.automount");
+
         // Use current version of systemctl binary before daemon is reexeced.
-        let unit = path_to_unit_name(&current_system_bin, &mountpoint);
+        let unit = path_to_unit_name(&current_system_bin, &mountpoint, is_automount);
         if let Some(new_filesystem) = new_filesystems.get(&mountpoint) {
             if current_filesystem.fs_type != new_filesystem.fs_type
                 || current_filesystem.device != new_filesystem.device

pkgs/by-name/tr/tree-from-tags/Gemfile.lock

@@ -1,13 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    taglib-ruby (0.7.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  taglib-ruby
-
-BUNDLED WITH
-   2.1.4

pkgs/by-name/tr/tree-from-tags/gemset.nix

@@ -1,10 +1,12 @@
 {
   taglib-ruby = {
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0r8g7zdncc6243d000jn0grc1n70rn9mx16vggy3q7c4wgsa37xi";
+      sha256 = "1bmirkz9lfhbykj3x48z1gv0jl1bfz60yscpl0hmjxrdmcihzfai";
       type = "gem";
     };
-    version = "0.7.1";
+    version = "2.0.0";
   };
 }

pkgs/by-name/tt/tt-burnin/package.nix

@@ -0,0 +1,49 @@
+{
+  lib,
+  fetchFromGitHub,
+  python3Packages,
+  versionCheckHook,
+}:
+python3Packages.buildPythonApplication rec {
+  pname = "tt-burnin";
+  version = "0.2.4";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "tenstorrent";
+    repo = "tt-burnin";
+    tag = "v${version}";
+    hash = "sha256-/tnCLhA6zeUkVYhDtdohrZODwHxNTZbnsWgY2Gt16DQ=";
+  };
+
+  # Remove when https://github.com/NixOS/nixpkgs/pull/444714 is merged
+  pythonRelaxDeps = [
+    "pyluwen"
+  ];
+
+  build-system = with python3Packages; [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = with python3Packages; [
+    pyluwen
+    tt-tools-common
+    jsons
+  ];
+
+  nativeCheckInputs = [
+    versionCheckHook
+  ];
+
+  versionCheckProgramArg = "--version";
+
+  meta = {
+    mainProgram = "tt-burnin";
+    description = "Command line utility to run a high power consumption workload on TT devices";
+    homepage = "https://github.com/tenstorrent/tt-burnin";
+    changelog = "https://github.com/tenstorrent/tt-burnin/blob/${src.tag}/CHANGELOG.md";
+    maintainers = with lib.maintainers; [ RossComputerGuy ];
+    license = with lib.licenses; [ asl20 ];
+  };
+}

pkgs/by-name/tt/tt-topology/package.nix

@@ -0,0 +1,67 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+  fetchpatch,
+  versionCheckHook,
+}:
+python3Packages.buildPythonApplication rec {
+  pname = "tt-topology";
+  version = "1.2.13";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "tenstorrent";
+    repo = "tt-topology";
+    tag = "v${version}";
+    hash = "sha256-hjUQMBTShdbl/tRlFF55P3kQDHi5gsGQVcGZSDgA0as=";
+  };
+
+  build-system = with python3Packages; [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = with python3Packages; [
+    elasticsearch
+    pydantic
+    pyluwen
+    tt-tools-common
+    networkx
+    matplotlib
+
+    # Needed for "pkg_resources"
+    setuptools
+  ];
+
+  nativeCheckInputs = [
+    versionCheckHook
+  ];
+
+  pythonRemoveDeps = [
+    "black"
+    "pre-commit"
+  ];
+
+  # Remove when https://github.com/tenstorrent/tt-topology/pull/51 is merged
+  pythonRelaxDeps = [
+    "elasticsearch"
+    "networkx"
+    "matplotlib"
+    "setuptools"
+  ];
+
+  # Tests are broken
+  dontUsePytestCheck = true;
+
+  versionCheckProgramArg = "--version";
+
+  meta = {
+    mainProgram = "tt-topology";
+    description = "Command line utility used to flash multiple NB cards on a system to use specific eth routing configurations";
+    homepage = "https://github.com/tenstorrent/tt-topology";
+    changelog = "https://github.com/tenstorrent/tt-topology/blob/${src.tag}/CHANGELOG.md";
+    maintainers = with lib.maintainers; [ RossComputerGuy ];
+    license = with lib.licenses; [ asl20 ];
+  };
+}

pkgs/by-name/un/unit/package.nix

@@ -12,10 +12,6 @@
   php82,
   withPerl ? true,
   perl,
-  withRuby_3_1 ? true,
-  ruby_3_1,
-  withRuby_3_2 ? false,
-  ruby_3_2,
   withSSL ? true,
   openssl ? null,
   withIPv6 ? true,
@@ -58,8 +54,6 @@ stdenv.mkDerivation rec {
   ]
   ++ optional withPHP82 php82-unit
   ++ optional withPerl perl
-  ++ optional withRuby_3_1 ruby_3_1
-  ++ optional withRuby_3_2 ruby_3_2
   ++ optional withSSL openssl;
 
   configureFlags = [
@@ -79,8 +73,6 @@ stdenv.mkDerivation rec {
     ${optionalString withPython3 "./configure python --module=python3  --config=python3-config  --lib-path=${python3}/lib"}
     ${optionalString withPHP82 "./configure php    --module=php82    --config=${php82-unit.unwrapped.dev}/bin/php-config --lib-path=${php82-unit}/lib"}
     ${optionalString withPerl "./configure perl   --module=perl     --perl=${perl}/bin/perl"}
-    ${optionalString withRuby_3_1 "./configure ruby   --module=ruby31   --ruby=${ruby_3_1}/bin/ruby"}
-    ${optionalString withRuby_3_2 "./configure ruby   --module=ruby32   --ruby=${ruby_3_2}/bin/ruby"}
   '';
 
   passthru.tests = {

pkgs/by-name/ze/zed-editor/0001-linux-linker.patch

@@ -1,19 +0,0 @@
-diff --git a/.cargo/config.toml b/.cargo/config.toml
-index 717c5e1..0bb7b6c 100644
---- a/.cargo/config.toml
-+++ b/.cargo/config.toml
-@@ -5,14 +5,6 @@ rustflags = ["-C", "symbol-mangling-version=v0", "--cfg", "tokio_unstable"]
- [alias]
- xtask = "run --package xtask --"
- 
--[target.x86_64-unknown-linux-gnu]
--linker = "clang"
--rustflags = ["-C", "link-arg=-fuse-ld=mold"]
--
--[target.aarch64-unknown-linux-gnu]
--linker = "clang"
--rustflags = ["-C", "link-arg=-fuse-ld=mold"]
--
- [target.'cfg(target_os = "windows")']
- rustflags = [
-     "--cfg",

pkgs/by-name/ze/zed-editor/package.nix

@@ -99,7 +99,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zed-editor";
-  version = "0.204.5";
+  version = "0.207.4";
 
   outputs = [
     "out"
@@ -112,38 +112,36 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "zed-industries";
     repo = "zed";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-P3mD4jaoQA4zWHjWtrvRBG25lgmudbkuFLP+Cy6xaDg=";
+    hash = "sha256-IKACHMKHIyq8UuqWlA6U/cdCi+wrevZwl2CINSWmmRc=";
   };
 
-  patches = [
-    # Upstream delegates linking on Linux to clang to make use of mold,
-    # but builds fine with our standard linker.
-    # This patch removes their linker override from the cargo config.
-    ./0001-linux-linker.patch
-  ];
-
   cargoPatches = [
-    ./0002-fix-duplicate-reqwest.patch
+    ./0001-fix-duplicate-reqwest.patch
   ];
 
-  postPatch =
+  postPatch = ''
     # Dynamically link WebRTC instead of static
-    ''
-      substituteInPlace $cargoDepsCopy/webrtc-sys-*/build.rs \
-        --replace-fail "cargo:rustc-link-lib=static=webrtc" "cargo:rustc-link-lib=dylib=webrtc"
+    substituteInPlace $cargoDepsCopy/webrtc-sys-*/build.rs \
+      --replace-fail "cargo:rustc-link-lib=static=webrtc" "cargo:rustc-link-lib=dylib=webrtc"
 
-      # Zed team renamed the function but forgot to update its usage in this file
-      # We rename it ourselves for now, until upstream fixes the issue
-      substituteInPlace $cargoDepsCopy/reqwest-0.12*/src/blocking/client.rs \
-        --replace-fail "inner.redirect(policy)" "inner.redirect_policy(policy)"
+    # Zed team renamed the function but forgot to update its usage in this file
+    # We rename it ourselves for now, until upstream fixes the issue
+    substituteInPlace $cargoDepsCopy/reqwest-0.12*/src/blocking/client.rs \
+      --replace-fail "inner.redirect(policy)" "inner.redirect_policy(policy)"
 
-      # The generate-licenses script wants a specific version of cargo-about eventhough
-      # newer versions work just as well.
-      substituteInPlace script/generate-licenses \
-        --replace-fail '$CARGO_ABOUT_VERSION' '${cargo-about.version}'
-    '';
+    # The generate-licenses script wants a specific version of cargo-about eventhough
+    # newer versions work just as well.
+    substituteInPlace script/generate-licenses \
+      --replace-fail '$CARGO_ABOUT_VERSION' '${cargo-about.version}'
+  '';
 
-  cargoHash = "sha256-Mlcpcp9/+ZoUdQUYpYX33uxNoAE4gAFh0twGFxi4tNw=";
+  # remove package that has a broken Cargo.toml
+  # see: https://github.com/NixOS/nixpkgs/pull/445924#issuecomment-3334648753
+  depsExtraArgs.postBuild = ''
+    rm -r $out/git/*/candle-book/
+  '';
+
+  cargoHash = "sha256-jv8ytsttXFG5VlFWI885zLJsZn8rFkiFdPhUvNKOwpY=";
 
   nativeBuildInputs = [
     cmake

pkgs/development/interpreters/ruby/default.nix

@@ -57,14 +57,9 @@ let
     }:
     let
       ver = version;
-      atLeast31 = lib.versionAtLeast ver.majMin "3.1";
-      atLeast32 = lib.versionAtLeast ver.majMin "3.2";
       # https://github.com/ruby/ruby/blob/v3_2_2/yjit.h#L21
       yjitSupported =
-        atLeast32
-        && (
-          stdenv.hostPlatform.isx86_64 || (!stdenv.hostPlatform.isWindows && stdenv.hostPlatform.isAarch64)
-        );
+        stdenv.hostPlatform.isx86_64 || (!stdenv.hostPlatform.isWindows && stdenv.hostPlatform.isAarch64);
       rubyDrv = lib.makeOverridable (
         {
           stdenv,
@@ -188,25 +183,13 @@ let
           # make: *** [uncommon.mk:373: do-install-all] Error 1
           enableParallelInstalling = false;
 
-          patches =
-            op (lib.versionOlder ver.majMin "3.1") ./do-not-regenerate-revision.h.patch
-            ++ op useBaseRuby (
-              if atLeast32 then ./do-not-update-gems-baseruby-3.2.patch else ./do-not-update-gems-baseruby.patch
-            )
-            ++ ops (ver.majMin == "3.0") [
-              # Ruby 3.0 adds `-fdeclspec` to $CC instead of $CFLAGS. Fixed in later versions.
-              (fetchpatch {
-                url = "https://github.com/ruby/ruby/commit/0acc05caf7518cd0d63ab02bfa036455add02346.patch";
-                hash = "sha256-43hI9L6bXfeujgmgKFVmiWhg7OXvshPCCtQ4TxqK1zk=";
-              })
-            ]
-            ++ ops atLeast31 [
-              # When using a baseruby, ruby always sets "libdir" to the build
-              # directory, which nix rejects due to a reference in to /build/ in
-              # the final product. Removing this reference doesn't seem to break
-              # anything and fixes cross compilation.
-              ./dont-refer-to-build-dir.patch
-            ];
+          patches = op useBaseRuby ./do-not-update-gems-baseruby-3.2.patch ++ [
+            # When using a baseruby, ruby always sets "libdir" to the build
+            # directory, which nix rejects due to a reference in to /build/ in
+            # the final product. Removing this reference doesn't seem to break
+            # anything and fixes cross compilation.
+            ./dont-refer-to-build-dir.patch
+          ];
 
           cargoRoot = opString yjitSupport "yjit";
 
@@ -410,17 +393,6 @@ in
   mkRubyVersion = rubyVersion;
   mkRuby = generic;
 
-  ruby_3_1 = generic {
-    version = rubyVersion "3" "1" "7" "";
-    hash = "sha256-BVas1p8UHdrOA/pd2NdufqDY9SMu3wEkKVebzaqzDns=";
-  };
-
-  ruby_3_2 = generic {
-    version = rubyVersion "3" "2" "9" "";
-    hash = "sha256-q7rZjbmusVJ3Ow01ho5QADuMRn89BhUld8Tf7Z2I7So=";
-    cargoHash = "sha256-CMVx5/+ugDNEuLAvyPN0nGHwQw6RXyfRsMO9I+kyZpk=";
-  };
-
   ruby_3_3 = generic {
     version = rubyVersion "3" "3" "9" "";
     hash = "sha256-0ZkWkKThcjPsazx4RMHhJFwK3OPgDXE1UdBFhGe3J7E=";

pkgs/development/interpreters/ruby/do-not-regenerate-revision.h.patch

@@ -1,23 +0,0 @@
-Do not regenerate revision.h
-
-Ruby's makefile compares the shipped version with the git revision to regenerate
-revision.h [1], but since we don't include git in buildInputs, this comparison
-fails and it can't find $(REVISION_H).
-
-[1] https://github.com/ruby/ruby/commit/97a5af62a318fcd93a4e5e4428d576c0280ddbae
-
-diff -Naur ruby.old/defs/gmake.mk ruby.new/defs/gmake.mk
---- ruby.old/defs/gmake.mk
-+++ ruby.new/defs/gmake.mk
-@@ -325,11 +325,9 @@
- 
- REVISION_IN_HEADER := $(shell sed -n 's/^\#define RUBY_FULL_REVISION "\(.*\)"/\1/p' $(srcdir)/revision.h 2>/dev/null)
- REVISION_LATEST := $(shell $(CHDIR) $(srcdir) && git log -1 --format=%H 2>/dev/null)
--ifneq ($(REVISION_IN_HEADER),$(REVISION_LATEST))
- # GNU make treat the target as unmodified when its dependents get
- # updated but it is not updated, while others may not.
- $(srcdir)/revision.h: $(REVISION_H)
--endif
- 
- # Query on the generated rdoc
- #

pkgs/development/interpreters/ruby/do-not-update-gems-baseruby.patch

@@ -1,14 +0,0 @@
-Do not update gems when building with base ruby
-
-diff -Naur ruby.old/defs/gmake.mk ruby.new/defs/gmake.mk
---- ruby.old/common.mk
-+++ ruby.new/common.mk
-@@ -1298,7 +1298,7 @@ update-config_files: PHONY
- 	    config.guess config.sub
- 
- refresh-gems: update-bundled_gems prepare-gems
--prepare-gems: $(HAVE_BASERUBY:yes=update-gems) $(HAVE_BASERUBY:yes=extract-gems)
-+prepare-gems:
- 
- update-gems$(gnumake:yes=-nongnumake): PHONY
- 	$(ECHO) Downloading bundled gem files...

pkgs/development/python-modules/discordpy/default.nix

@@ -14,7 +14,7 @@
 
 let
   pname = "discord.py";
-  version = "2.6.3";
+  version = "2.6.4";
 in
 buildPythonPackage {
   inherit pname version;
@@ -24,7 +24,7 @@ buildPythonPackage {
     owner = "Rapptz";
     repo = "discord.py";
     tag = "v${version}";
-    hash = "sha256-OEU09pdV2H/RxhvxWNIrg8mPh7yiv6ItKNwvhMKKhco=";
+    hash = "sha256-glFXgTNdOQ3cG/jlvi/1ASon2HpcoKli45IhLhjpIvA=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/gftools/default.nix

@@ -62,14 +62,14 @@ let
 in
 buildPythonPackage rec {
   pname = "gftools";
-  version = "0.9.91";
+  version = "0.9.92";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googlefonts";
     repo = "gftools";
     tag = "v${version}";
-    hash = "sha256-tIvOHBA7MiNYrl9ZmfieSF+QwhM30pwle1mHVZamDo0=";
+    hash = "sha256-Fm2+OidrGeuWVMg3rn2zBa6hHFBQcxVqXw+cM/tU/QQ=";
   };
 
   postPatch = ''

pkgs/development/python-modules/llm-gemini/default.nix

@@ -15,14 +15,14 @@
 }:
 buildPythonPackage rec {
   pname = "llm-gemini";
-  version = "0.26";
+  version = "0.26.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "simonw";
     repo = "llm-gemini";
     tag = version;
-    hash = "sha256-Blkes0d7pVpltP2Vj8ngFRpNYnb9Z/m6O6UByAjrdfw=";
+    hash = "sha256-HZUbO1R8qVc4iuRNs9ezR9dnjjAy+s8g0TTlfOCyeVc=";
   };
 
   build-system = [ setuptools ];

pkgs/development/ruby-modules/with-packages/test.nix

@@ -5,8 +5,10 @@ let
   lib = pkgs.lib;
   stdenv = pkgs.stdenv;
 
-  rubyVersions = with pkgs; [
-    ruby_3_2
+  rubyVersions = [
+    # TODO FIXME: All versions listed here were dropped from Nixpkgs.
+    # Add current versions here or remove this file if it’s no longer
+    # being used.
   ];
 
   gemTests = (lib.mapAttrs (name: gem: [ name ]) pkgs.ruby.gems) // (import ./require_exceptions.nix);

pkgs/tools/misc/coreboot-utils/default.nix

@@ -16,7 +16,7 @@
 }:
 
 let
-  version = "25.06";
+  version = "25.09";
 
   commonMeta = {
     description = "Various coreboot-related tools";
@@ -46,7 +46,7 @@ let
         src = fetchgit {
           url = "https://review.coreboot.org/coreboot";
           rev = finalAttrs.version;
-          hash = "sha256-D7W8LtL6eeaKiRYoxVkcjeZ2aMIEXCvNakVtexe0mG8=";
+          hash = "sha256-ItQVCDC/MiF5rgecmxeR000lqTQy1VCSSILl1z4bJmM=";
         };
 
         enableParallelBuilding = true;

pkgs/top-level/aliases.nix

@@ -2354,6 +2354,10 @@ mapAliases {
   rquickshare-legacy = throw "The legacy version depends on insecure package libsoup2, please use the main version"; # Added 2025-10-09
   rr-unstable = rr; # Added 2022-09-17
   rtx = mise; # Added 2024-01-05
+  ruby_3_1 = throw "ruby_3_1 has been removed, as it is has reached end‐of‐life upstream"; # Added 2025-10-12
+  ruby_3_2 = throw "ruby_3_2 has been removed, as it will reach end‐of‐life upstream during Nixpkgs 25.11’s support cycle"; # Added 2025-10-12
+  rubyPackages_3_1 = throw "rubyPackages_3_1 has been removed, as it is has reached end‐of‐life upstream"; # Added 2025-10-12
+  rubyPackages_3_2 = throw "rubyPackages_3_2 has been removed, as it will reach end‐of‐life upstream during Nixpkgs 25.11’s support cycle"; # Added 2025-10-12
   ruby-zoom = throw "'ruby-zoom' has been removed due to lack of maintaince and had not been updated since 2020"; # Added 2025-08-24
   runCommandNoCC = runCommand; # Added 2021-08-15
   runCommandNoCCLocal = runCommandLocal; # Added 2021-08-15

pkgs/top-level/all-packages.nix

@@ -6038,8 +6038,6 @@ with pkgs;
     })
     mkRubyVersion
     mkRuby
-    ruby_3_1
-    ruby_3_2
     ruby_3_3
     ruby_3_4
     ruby_3_5
@@ -6048,8 +6046,6 @@ with pkgs;
   ruby = ruby_3_3;
   rubyPackages = rubyPackages_3_3;
 
-  rubyPackages_3_1 = recurseIntoAttrs ruby_3_1.gems;
-  rubyPackages_3_2 = recurseIntoAttrs ruby_3_2.gems;
   rubyPackages_3_3 = recurseIntoAttrs ruby_3_3.gems;
   rubyPackages_3_4 = recurseIntoAttrs ruby_3_4.gems;
   rubyPackages_3_5 = recurseIntoAttrs ruby_3_5.gems;
@@ -13285,10 +13281,6 @@ with pkgs;
   anki-bin = callPackage ../games/anki/bin.nix { };
   anki-sync-server = callPackage ../games/anki/sync-server.nix { };
 
-  armagetronad = callPackage ../games/armagetronad { };
-
-  armagetronad-dedicated = callPackage ../games/armagetronad { dedicatedServer = true; };
-
   art = callPackage ../by-name/ar/art/package.nix {
     fftw = fftwSinglePrec;
   };
@@ -14890,10 +14882,6 @@ with pkgs;
     libcpr = libcpr_1_10_5;
   };
 
-  tree-from-tags = callPackage ../by-name/tr/tree-from-tags/package.nix {
-    ruby = ruby_3_1;
-  };
-
   biblioteca = callPackage ../by-name/bi/biblioteca/package.nix {
     webkitgtk = webkitgtk_6_0;
   };

pkgs/top-level/pkg-config/pkg-config-data.json

@@ -746,11 +746,6 @@
         "python3"
       ]
     },
-    "ruby-3.1": {
-      "attrPath": [
-        "ruby_3_1"
-      ]
-    },
     "sdl2": {
       "attrPath": [
         "SDL2"