Merge remote-tracking branch 'origin/master' into staging-next

2026-07-06 17:13:24 -05:00 · 2025-09-30 21:47:55 +03:00 · 2025-09-30 21:47:55 +03:00 · 4999ae577c
commit 4999ae577c
parent 5c92060a39 ff1c3b9536
213 changed files with 2396 additions and 1162 deletions
--- a/doc/build-helpers/fetchers.chapter.md
+++ b/doc/build-helpers/fetchers.chapter.md
@ -3,7 +3,7 @@
 Building software with Nix often requires downloading source code and other files from the internet.
 To this end, we use functions that we call _fetchers_, which obtain remote sources via various protocols and services.

-Nix provides built-in fetchers such as [`builtins.fetchTarball`](https://nixos.org/manual/nix/stable/language/builtins.html#builtins-fetchTarball).
+Nix provides built-in fetchers such as [`fetchTarball`](https://nixos.org/manual/nix/stable/language/builtins.html#builtins-fetchTarball).
 Nixpkgs provides its own fetchers, which work differently:

 - A built-in fetcher will download and cache files at evaluation time and produce a [store path](https://nixos.org/manual/nix/stable/glossary#gloss-store-path).
--- a/doc/build-helpers/trivial-build-helpers.chapter.md
+++ b/doc/build-helpers/trivial-build-helpers.chapter.md
@ -163,7 +163,7 @@ Nixpkgs provides the following functions for producing derivations which write t
 They are useful for creating files from Nix expression, and are all implemented as convenience wrappers around `writeTextFile`.

 Each of these functions will cause a derivation to be produced.
-When you coerce the result of each of these functions to a string with [string interpolation](https://nixos.org/manual/nix/stable/language/string-interpolation) or [`builtins.toString`](https://nixos.org/manual/nix/stable/language/builtins#builtins-toString), it will evaluate to the [store path](https://nixos.org/manual/nix/stable/store/store-path) of this derivation.
+When you coerce the result of each of these functions to a string with [string interpolation](https://nixos.org/manual/nix/stable/language/string-interpolation) or [`toString`](https://nixos.org/manual/nix/stable/language/builtins#builtins-toString), it will evaluate to the [store path](https://nixos.org/manual/nix/stable/store/store-path) of this derivation.

 :::: {.note}
 Some of these functions will put the resulting files within a directory inside the [derivation output](https://nixos.org/manual/nix/stable/language/derivations#attr-outputs).
@ -344,7 +344,7 @@ Write a text file to the Nix store.
 `allowSubstitutes` (Bool, _optional_)

 : Whether to allow substituting from a binary cache.
-  Passed through to [`allowSubstitutes`](https://nixos.org/manual/nix/stable/language/advanced-attributes#adv-attr-allowSubstitutes) of the underlying call to `builtins.derivation`.
+  Passed through to [`allowSubstitutes`](https://nixos.org/manual/nix/stable/language/advanced-attributes#adv-attr-allowSubstitutes) of the underlying call to `derivation`.

  It defaults to `false`, as running the derivation's simple `builder` executable locally is assumed to be faster than network operations.
  Set it to true if the `checkPhase` step is expensive.
@ -355,7 +355,7 @@ Write a text file to the Nix store.

 : Whether to prefer building locally, even if faster [remote build machines](https://nixos.org/manual/nix/stable/command-ref/conf-file#conf-substituters) are available.

-  Passed through to [`preferLocalBuild`](https://nixos.org/manual/nix/stable/language/advanced-attributes#adv-attr-preferLocalBuild) of the underlying call to `builtins.derivation`.
+  Passed through to [`preferLocalBuild`](https://nixos.org/manual/nix/stable/language/advanced-attributes#adv-attr-preferLocalBuild) of the underlying call to `derivation`.

  It defaults to `true` for the same reason `allowSubstitutes` defaults to `false`.

--- a/doc/doc-support/lib-function-locations.nix
+++ b/doc/doc-support/lib-function-locations.nix
@ -24,19 +24,19 @@ let

  libset =
    toplib:
-    builtins.map (subsetname: {
+    map (subsetname: {
      subsetname = subsetname;
      functions = libDefPos [ ] toplib.${subsetname};
-    }) (builtins.map (x: x.name) libsets);
+    }) (map (x: x.name) libsets);

  flattenedLibSubset =
    { subsetname, functions }:
-    builtins.map (fn: {
+    map (fn: {
      name = "lib.${subsetname}.${fn.name}";
      value = fn.location;
    }) functions;

-  locatedlibsets = libs: builtins.map flattenedLibSubset (libset libs);
+  locatedlibsets = libs: map flattenedLibSubset (libset libs);
  removeFilenamePrefix =
    prefix: filename:
    let
@ -46,7 +46,7 @@ let
    in
    substr;

-  removeNixpkgs = removeFilenamePrefix (builtins.toString nixpkgsPath);
+  removeNixpkgs = removeFilenamePrefix (toString nixpkgsPath);

  liblocations = builtins.filter (elem: elem.value != null) (lib.lists.flatten (locatedlibsets lib));

@ -59,19 +59,19 @@ let
      };
    };

-  relativeLocs = (builtins.map fnLocationRelative liblocations);
+  relativeLocs = (map fnLocationRelative liblocations);
  sanitizeId = builtins.replaceStrings [ "'" ] [ "-prime" ];

  urlPrefix = "https://github.com/NixOS/nixpkgs/blob/${revision}";
  jsonLocs = builtins.listToAttrs (
-    builtins.map (
+    map (
      { name, value }:
      {
        name = sanitizeId name;
        value =
          let
-            text = "${value.file}:${builtins.toString value.line}";
-            target = "${urlPrefix}/${value.file}#L${builtins.toString value.line}";
+            text = "${value.file}:${toString value.line}";
+            target = "${urlPrefix}/${value.file}#L${toString value.line}";
          in
          "[${text}](${target}) in `<nixpkgs>`";
      }
--- a/doc/languages-frameworks/dhall.section.md
+++ b/doc/languages-frameworks/dhall.section.md
@ -89,7 +89,7 @@ buildDhallPackage {
 # ./example.nix

 let
-  nixpkgs = builtins.fetchTarball {
+  nixpkgs = fetchTarball {
    url = "https://github.com/NixOS/nixpkgs/archive/94b2848559b12a8ed1fe433084686b2a81123c99.tar.gz";
    hash = "sha256-B4Q3c6IvTLg3Q92qYa8y+i4uTaphtFdjp+Ir3QQjdN0=";
  };
--- a/doc/languages-frameworks/javascript.section.md
+++ b/doc/languages-frameworks/javascript.section.md
@ -316,7 +316,7 @@ buildNpmPackage {
 `importNpmLock` uses the following fetchers:

 - `pkgs.fetchurl` for `http(s)` dependencies
- `builtins.fetchGit` for `git` dependencies
+- `fetchGit` for `git` dependencies

 It is possible to provide additional arguments to individual fetchers as needed:

--- a/doc/languages-frameworks/maven.section.md
+++ b/doc/languages-frameworks/maven.section.md
@ -374,7 +374,7 @@ stdenv.mkDerivation (finalAttrs: {
  pname = "maven-demo";
  version = "1.0";

-  src = builtins.fetchTarball "https://github.com/fzakaria/nixos-maven-example/archive/main.tar.gz";
+  src = fetchTarball "https://github.com/fzakaria/nixos-maven-example/archive/main.tar.gz";
  buildInputs = [ maven ];

  buildPhase = ''
@ -445,7 +445,7 @@ stdenv.mkDerivation (finalAttrs: {
  pname = "maven-demo";
  version = "1.0";

-  src = builtins.fetchTarball "https://github.com/fzakaria/nixos-maven-example/archive/main.tar.gz";
+  src = fetchTarball "https://github.com/fzakaria/nixos-maven-example/archive/main.tar.gz";
  nativeBuildInputs = [ makeWrapper ];
  buildInputs = [ maven ];

@ -538,7 +538,7 @@ stdenv.mkDerivation (finalAttrs: {
  pname = "maven-demo";
  version = "1.0";

-  src = builtins.fetchTarball "https://github.com/fzakaria/nixos-maven-example/archive/main.tar.gz";
+  src = fetchTarball "https://github.com/fzakaria/nixos-maven-example/archive/main.tar.gz";
  nativeBuildInputs = [ makeWrapper ];
  buildInputs = [ maven ];

--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@ -55,6 +55,8 @@
 - `uw-ttyp0` has been updated to version 2.1. The filenames of the OTB and PSF fonts have been changed to match the upstream naming convention.
  If you were loading a font by path, for example in the `console.font` NixOS option, remember to update the filename accordingly.

+- `adminneo` has been updated to version 5.1.1. Version 5 breaks compatibility with `adminer` and changes how plugins and configuration work. See the [Upgrade Guide](https://www.adminneo.org/upgrade#v5.0.0) for details. Those changes also led to changes in the arguments of the package.
+
 - `base16-builder` node package has been removed due to lack of upstream maintenance.

 - `python3Packages.bjoern` has been removed, as the upstream is unmaintained and it depends on a 14-year-old version of http-parser with numerous vulnerabilities.
--- a/lib/asserts.nix
+++ b/lib/asserts.nix
@ -47,7 +47,7 @@ rec {
    :::
  */
  # TODO(Profpatsch): add tests that check stderr
-  assertMsg = pred: msg: pred || builtins.throw msg;
+  assertMsg = pred: msg: pred || throw msg;

  /**
    Specialized `assertMsg` for checking if `val` is one of the elements
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@ -2149,7 +2149,7 @@ rec {
    chooseDevOutputs :: [Derivation] -> [Derivation]
    ```
  */
-  chooseDevOutputs = builtins.map getDev;
+  chooseDevOutputs = map getDev;

  /**
    Make various Nix tools consider the contents of the resulting
@ -2230,7 +2230,7 @@ rec {
      intersection = builtins.intersectAttrs x y;
      collisions = lib.concatStringsSep " " (builtins.attrNames intersection);
      mask = builtins.mapAttrs (
-        name: value: builtins.throw "unionOfDisjoint: collision on ${name}; complete list: ${collisions}"
+        name: value: throw "unionOfDisjoint: collision on ${name}; complete list: ${collisions}"
      ) intersection;
    in
    (x // y) // mask;
--- a/lib/deprecated/misc.nix
+++ b/lib/deprecated/misc.nix
@ -250,9 +250,9 @@ let
  # See https://github.com/NixOS/nixpkgs/pull/194391 for details.
  closePropagationFast =
    list:
-    builtins.map (x: x.val) (
+    map (x: x.val) (
      builtins.genericClosure {
-        startSet = builtins.map (x: {
+        startSet = map (x: {
          key = x.outPath;
          val = x;
        }) (builtins.filter (x: x != null) list);
--- a/lib/fileset/tests.sh
+++ b/lib/fileset/tests.sh
@ -1406,10 +1406,10 @@ echo '{ fs }: fs.toSource { root = ./.; fileset = fs.gitTracked ./.; }' > defaul
 git add .

 ## We can evaluate it locally just fine, `fetchGit` is used underneath to filter git-tracked files
-expectEqual '(import ./. { fs = lib.fileset; }).outPath' '(builtins.fetchGit ./.).outPath'
+expectEqual '(import ./. { fs = lib.fileset; }).outPath' '(fetchGit ./.).outPath'

 ## We can also evaluate when importing from fetched store paths
-storePath=$(expectStorePath 'builtins.fetchGit ./.')
+storePath=$(expectStorePath 'fetchGit ./.')
 expectEqual '(import '"$storePath"' { fs = lib.fileset; }).outPath' \""$storePath"\"

 ## But it fails if the path is imported with a fetcher that doesn't remove .git (like just using "${./.}")
@ -1429,13 +1429,13 @@ echo '{ fs }: fs.toSource { root = ./.; fileset = fs.gitTracked ./.; }' > sub/de
 git -C sub add .

 ## We can evaluate it locally just fine, `fetchGit` is used underneath to filter git-tracked files
-expectEqual '(import ./. { fs = lib.fileset; }).outPath' '(builtins.fetchGit { url = ./.; submodules = true; }).outPath'
-expectEqual '(import ./sub { fs = lib.fileset; }).outPath' '(builtins.fetchGit ./sub).outPath'
+expectEqual '(import ./. { fs = lib.fileset; }).outPath' '(fetchGit { url = ./.; submodules = true; }).outPath'
+expectEqual '(import ./sub { fs = lib.fileset; }).outPath' '(fetchGit ./sub).outPath'

 ## We can also evaluate when importing from fetched store paths
-storePathWithSub=$(expectStorePath 'builtins.fetchGit { url = ./.; submodules = true; }')
+storePathWithSub=$(expectStorePath 'fetchGit { url = ./.; submodules = true; }')
 expectEqual '(import '"$storePathWithSub"' { fs = lib.fileset; }).outPath' \""$storePathWithSub"\"
-storePathSub=$(expectStorePath 'builtins.fetchGit ./sub')
+storePathSub=$(expectStorePath 'fetchGit ./sub')
 expectEqual '(import '"$storePathSub"' { fs = lib.fileset; }).outPath' \""$storePathSub"\"

 ## But it fails if the path is imported with a fetcher that doesn't remove .git (like just using "${./.}")
--- a/lib/gvariant.nix
+++ b/lib/gvariant.nix
@ -150,7 +150,7 @@ rec {
        ) intConstructors;
      in
      throw ''
-        The GVariant type for number “${builtins.toString v}” is unclear.
+        The GVariant type for number “${toString v}” is unclear.
        Please wrap the value with one of the following, depending on the value type in GSettings schema:

        ${lib.concatMapStringsSep "\n" (
--- a/lib/meta.nix
+++ b/lib/meta.nix
@ -399,7 +399,7 @@ rec {
    => true
    lib.getLicenseFromSpdxIdOr "MY LICENSE" null
    => null
-    lib.getLicenseFromSpdxIdOr "MY LICENSE" (builtins.throw "No SPDX ID matches MY LICENSE")
+    lib.getLicenseFromSpdxIdOr "MY LICENSE" (throw "No SPDX ID matches MY LICENSE")
    => error: No SPDX ID matches MY LICENSE
    ```
    :::
--- a/lib/strings.nix
+++ b/lib/strings.nix
@ -1135,7 +1135,7 @@ rec {
        "."
        "~"
      ];
-      toEscape = builtins.removeAttrs asciiTable unreserved;
+      toEscape = removeAttrs asciiTable unreserved;
    in
    replaceStrings (builtins.attrNames toEscape) (
      lib.mapAttrsToList (_: c: "%${fixedWidthString 2 "0" (lib.toHexString c)}") toEscape
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@ -75,7 +75,7 @@ let

      # Those two will always be derived from "config", if given, so they should NOT
      # be overridden further down with "// args".
-      args = builtins.removeAttrs allArgs [
+      args = removeAttrs allArgs [
        "parsed"
        "system"
      ];
@ -124,6 +124,8 @@ let
            "ucrt"
          else if final.isMinGW then
            "msvcrt"
+          else if final.isCygwin then
+            "cygwin"
          else if final.isWasi then
            "wasilibc"
          else if final.isWasm && !final.isWasi then
@ -183,7 +185,7 @@ let
            sharedLibrary =
              if final.isDarwin then
                ".dylib"
-              else if final.isWindows then
+              else if (final.isWindows || final.isCygwin) then
                ".dll"
              else
                ".so";
@ -191,7 +193,7 @@ let
          // {
            staticLibrary = if final.isWindows then ".lib" else ".a";
            library = if final.isStatic then final.extensions.staticLibrary else final.extensions.sharedLibrary;
-            executable = if final.isWindows then ".exe" else "";
+            executable = if (final.isWindows || final.isCygwin) then ".exe" else "";
          };
        # Misc boolean options
        useAndroidPrebuilt = false;
@ -204,6 +206,7 @@ let
            {
              linux = "Linux";
              windows = "Windows";
+              cygwin = "CYGWIN_NT";
              darwin = "Darwin";
              netbsd = "NetBSD";
              freebsd = "FreeBSD";
@ -603,7 +606,7 @@ let
              "openbsd"
            else if final.isSunOS then
              "sunos"
-            else if final.isWindows then
+            else if (final.isWindows || final.isCygwin) then
              "win32"
            else
              null;
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@ -388,6 +388,10 @@ rec {
    useLLVM = true;
  };

+  x86_64-cygwin = {
+    config = "x86_64-pc-cygwin";
+  };
+
  # BSDs

  aarch64-freebsd = {
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@ -337,8 +337,7 @@ rec {
      kernel = kernels.windows;
    };
    isCygwin = {
-      kernel = kernels.windows;
-      abi = abis.cygnus;
+      kernel = kernels.cygwin;
    };
    isMinGW = {
      kernel = kernels.windows;
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@ -42,6 +42,7 @@ let
    isLinux
    isPower64
    isWindows
+    isCygwin
    ;

  inherit (lib.types)
@ -617,6 +618,10 @@ rec {
        execFormat = pe;
        families = { };
      };
+      cygwin = {
+        execFormat = pe;
+        families = { };
+      };
      ghcjs = {
        execFormat = unknown;
        families = { };
@ -650,7 +655,6 @@ rec {
  types.abi = enum (attrValues abis);

  abis = setTypes types.openAbi {
-    cygnus = { };
    msvc = { };

    # Note: eabi is specific to ARM and PowerPC.
@ -783,11 +787,11 @@ rec {
          throw "system string '${lib.concatStringsSep "-" l}' with 1 component is ambiguous";
      "2" = # We only do 2-part hacks for things Nix already supports
        if elemAt l 1 == "cygwin" then
-          {
-            cpu = elemAt l 0;
-            kernel = "windows";
-            abi = "cygnus";
-          }
+          mkSkeletonFromList [
+            (elemAt l 0)
+            "pc"
+            "cygwin"
+          ]
        # MSVC ought to be the default ABI so this case isn't needed. But then it
        # becomes difficult to handle the gnu* variants for Aarch32 correctly for
        # minGW. So it's easier to make gnu* the default for the MinGW, but
@ -851,6 +855,13 @@ rec {
              else
                elemAt l 2;
          }
+        # lots of tools expect a triplet for Cygwin, even though the vendor is just "pc"
+        else if elemAt l 2 == "cygwin" then
+          {
+            cpu = elemAt l 0;
+            vendor = elemAt l 1;
+            kernel = "cygwin";
+          }
        else
          throw "system string '${lib.concatStringsSep "-" l}' with 3 components is ambiguous";
      "4" = {
@ -891,7 +902,7 @@ rec {
            getVendor args.vendor
          else if isDarwin parsed then
            vendors.apple
-          else if isWindows parsed then
+          else if (isWindows parsed || isCygwin parsed) then
            vendors.pc
          else
            vendors.unknown;
@ -933,12 +944,7 @@ rec {
      abi,
      ...
    }:
-    if abi == abis.cygnus then
-      "${cpu.name}-cygwin"
-    else if kernel.families ? darwin then
-      "${cpu.name}-darwin"
-    else
-      "${cpu.name}-${kernelName kernel}";
+    if kernel.families ? darwin then "${cpu.name}-darwin" else "${cpu.name}-${kernelName kernel}";

  tripleFromSystem =
    {
--- a/lib/tests/checkAndMergeCompat.nix
+++ b/lib/tests/checkAndMergeCompat.nix
@ -326,7 +326,7 @@ in
  coerce_str_to_int_coercer_ouput = getMatrix {
    outerTypeName = "coercedTo";
    innerTypeName = "int->str";
-    getType = a: b: a.coercedTo b.int builtins.toString a.str;
+    getType = a: b: a.coercedTo b.int toString a.str;
    value = [ ];
    testAttrs = {
      expectedError = {
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@ -4488,7 +4488,7 @@ runTests {
    expr = packagesFromDirectoryRecursive {
      callPackage = path: overrides: import path overrides;
      # Do NOT remove the `builtins.toString` call here!!!
-      directory = builtins.toString ./packages-from-directory/plain;
+      directory = toString ./packages-from-directory/plain;
    };
    expected = {
      a = "a";
--- a/lib/tests/modules/declare-coerced-value-no-default.nix
+++ b/lib/tests/modules/declare-coerced-value-no-default.nix
@ -3,7 +3,7 @@
 {
  options = {
    value = lib.mkOption {
-      type = lib.types.coercedTo lib.types.int builtins.toString lib.types.str;
+      type = lib.types.coercedTo lib.types.int toString lib.types.str;
    };
  };
 }
--- a/lib/tests/modules/declare-coerced-value.nix
+++ b/lib/tests/modules/declare-coerced-value.nix
@ -4,7 +4,7 @@
  options = {
    value = lib.mkOption {
      default = 42;
-      type = lib.types.coercedTo lib.types.int builtins.toString lib.types.str;
+      type = lib.types.coercedTo lib.types.int toString lib.types.str;
    };
  };
 }
--- a/lib/tests/modules/define-freeform-keywords-shorthand.nix
+++ b/lib/tests/modules/define-freeform-keywords-shorthand.nix
@ -9,7 +9,7 @@

  _module.args.result =
    let
-      r = builtins.removeAttrs config [ "_module" ];
+      r = removeAttrs config [ "_module" ];
    in
    builtins.trace (builtins.deepSeq r r) (
      r == {
--- a/lib/tests/systems.nix
+++ b/lib/tests/systems.nix
@ -49,6 +49,7 @@ lib.runTests (
      ++ illumos
      ++ wasi
      ++ windows
+      ++ cygwin
      ++ embedded
      ++ mmix
      ++ js
@ -202,8 +203,6 @@ lib.runTests (
      "x86_64-openbsd"
    ];
    testwindows = mseteq windows [
-      "i686-cygwin"
-      "x86_64-cygwin"
      "aarch64-windows"
      "i686-windows"
      "x86_64-windows"
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@ -769,7 +769,7 @@ in
    importTOML :: path -> any
    ```
  */
-  importTOML = path: builtins.fromTOML (builtins.readFile path);
+  importTOML = path: fromTOML (builtins.readFile path);

  /**
    `warn` *`message`* *`value`*
@ -975,7 +975,7 @@ in
      unexpected = lib.subtractLists valid given;
    in
    lib.throwIfNot (unexpected == [ ])
-      "${msg}: ${builtins.concatStringsSep ", " (builtins.map builtins.toString unexpected)} unexpected; valid ones: ${builtins.concatStringsSep ", " (builtins.map builtins.toString valid)}";
+      "${msg}: ${builtins.concatStringsSep ", " (map toString unexpected)} unexpected; valid ones: ${builtins.concatStringsSep ", " (map toString valid)}";

  info = msg: builtins.trace "INFO: ${msg}";

@ -1144,7 +1144,7 @@ in
      match = builtins.match "(0x)?([0-7]?[0-9A-Fa-f]{1,15})" str;
    in
    if match != null then
-      (builtins.fromTOML "v=0x${builtins.elemAt match 1}").v
+      (fromTOML "v=0x${builtins.elemAt match 1}").v
    else
      # TODO: Turn this into a `throw` in 26.05.
      assert lib.warn "fromHexString: ${
@ -1153,7 +1153,7 @@ in
      let
        noPrefix = lib.strings.removePrefix "0x" (lib.strings.toLower str);
      in
-      (builtins.fromTOML "v=0x${noPrefix}").v;
+      (fromTOML "v=0x${noPrefix}").v;

  /**
    Convert the given positive integer to a string of its hexadecimal
--- a/lib/types.nix
+++ b/lib/types.nix
@ -1373,7 +1373,7 @@ let
            if builtins.isString v then
              ''"${v}"''
            else if builtins.isInt v then
-              builtins.toString v
+              toString v
            else if builtins.isBool v then
              boolToString v
            else
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -18050,6 +18050,12 @@
    matrix = "@n3t:matrix.org";
    name = "Adrian Sadłocha";
  };
+  Necoro = {
+    email = "nix@necoro.dev";
+    github = "Necoro";
+    githubId = 68708;
+    name = "René Neumann";
+  };
  necrophcodr = {
    email = "nc@scalehost.eu";
    github = "necrophcodr";
@ -24473,14 +24479,6 @@
    githubId = 18124752;
    email = "m@rvinvogt.com";
  };
-  srxl = {
-    name = "Ruby Iris Juric";
-    email = "ruby@srxl.me";
-    matrix = "@ruby:isincredibly.gay";
-    github = "Sorixelle";
-    githubId = 38685302;
-    keys = [ { fingerprint = "2D76 76C7 A28E 16FC 75C7  268D 1B55 6ED8 4B0E 303A"; } ];
-  };
  Srylax = {
    name = "Srylax";
    email = "srylax+nixpkgs@srylax.dev";
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@ -174,7 +174,7 @@
 - The zookeeper project changed their logging tool to logback, therefore `services.zookeeper.logging` option has been updated to expect a logback compatible string.
 - The `dovecot` systemd service was renamed from `dovecot2` to `dovecot`. The former is now just an alias. Update any overrides on the systemd unit to the new name.

- Configurations with `boot.initrd.systend.enable && !boot.initrd.enable` will have their `init` script at `$toplevel/init` instead of `$toplevel/prepare-root`. This is because it does not make sense for systemd stage 1 to affect the `init` script when stage 1 is entirely disabled (e.g. containers).
+- Configurations with `boot.initrd.systemd.enable && !boot.initrd.enable` will have their `init` script at `$toplevel/init` instead of `$toplevel/prepare-root`. This is because it does not make sense for systemd stage 1 to affect the `init` script when stage 1 is entirely disabled (e.g. containers).

 - `programs.goldwarden` has been removed, due to the software not working with newer versions of the Bitwarden and Vaultwarden servers, as well as it being abandoned upstream.

--- a/nixos/modules/services/hardware/hddfancontrol.nix
+++ b/nixos/modules/services/hardware/hddfancontrol.nix
@ -42,6 +42,7 @@ in

  options = {
    services.hddfancontrol.enable = lib.mkEnableOption "hddfancontrol daemon";
+    services.hddfancontrol.package = lib.mkPackageOption pkgs "hddfancontrol" { };

    services.hddfancontrol.settings = lib.mkOption {
      type = lib.types.attrsWith {
@ -164,7 +165,7 @@ in
          let
            argString = lib.strings.concatStringsSep " " (args cnf);
          in
-          "${lib.getExe pkgs.hddfancontrol} -v ${cnf.logVerbosity} daemon ${argString}";
+          "${lib.getExe cfg.package} -v ${cnf.logVerbosity} daemon ${argString}";
        serviceConfig = {
          CPUSchedulingPolicy = "rr";
          CPUSchedulingPriority = 49;
@ -189,7 +190,7 @@ in
      ];
    in
    {
-      systemd.packages = [ pkgs.hddfancontrol ];
+      systemd.packages = [ cfg.package ];

      hardware.sensor.hddtemp = {
        enable = true;
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@ -1250,7 +1250,7 @@ in
      [ "services" "postfix" "settings" "main" "mynetworks" ]
    )
    (lib.mkRenamedOptionModule
-      [ "services" "postfix" "networkStyle" ]
+      [ "services" "postfix" "networksStyle" ]
      [ "services" "postfix" "settings" "main" "mynetworks_style" ]
    )
    (lib.mkRenamedOptionModule
--- a/nixos/modules/services/networking/pangolin.nix
+++ b/nixos/modules/services/networking/pangolin.nix
@ -515,34 +515,38 @@ in
              tls.certResolver = "letsencrypt";
            };
            # Integration API router
-            int-api-router-redirect = lib.mkIf (finalSettings.flags.enable_integration_api) {
+            int-api-router-redirect = {
              rule = "Host(`api.${cfg.baseDomain}`)";
              service = "int-api-service";
              entryPoints = [ "web" ];
              middlewares = [ "redirect-to-https" ];
            };
-            int-api-router = lib.mkIf (finalSettings.flags.enable_integration_api) {
+            int-api-router = {
              rule = "Host(`api.${cfg.baseDomain}`)";
              service = "int-api-service";
              entryPoints = [ "websecure" ];
              tls.certResolver = "letsencrypt";
            };
          };
-          # could be map
-          services = {
-            # Next.js server
-            next-service.loadBalancer.servers = [
-              { url = "http://localhost:${toString finalSettings.server.next_port}"; }
-            ];
-            # API/WebSocket server
-            api-service.loadBalancer.servers = [
-              { url = "http://localhost:${toString finalSettings.server.external_port}"; }
-            ];
-            # Integration API server
-            int-api-service.loadBalancer.servers = lib.mkIf (finalSettings.flags.enable_integration_api) [
-              { url = "http://localhost:${toString finalSettings.server.integration_port}"; }
-            ];
-          };
+          # needs to be a mkMerge otherwise will give error about standalone element
+          services = lib.mkMerge [
+            {
+              # Next.js server
+              next-service.loadBalancer.servers = [
+                { url = "http://localhost:${toString finalSettings.server.next_port}"; }
+              ];
+              # API/WebSocket server
+              api-service.loadBalancer.servers = [
+                { url = "http://localhost:${toString finalSettings.server.external_port}"; }
+              ];
+            }
+            (lib.mkIf (finalSettings.flags.enable_integration_api) {
+              # Integration API server
+              int-api-service.loadBalancer.servers = [
+                { url = "http://localhost:${toString finalSettings.server.integration_port}"; }
+              ];
+            })
+          ];
        };
      };
    };
--- a/nixos/modules/services/search/meilisearch.nix
+++ b/nixos/modules/services/search/meilisearch.nix
@ -223,6 +223,9 @@ in
      );

      serviceConfig = {
+        Type = "simple";
+        DynamicUser = true;
+        Restart = "always";
        LoadCredential = lib.mkMerge (
          [
            (lib.mkIf (cfg.masterKeyFile != null) [ "master_key:${cfg.masterKeyFile}" ])
@ -232,11 +235,15 @@ in
          ) secrets-with-path
        );
        ExecStart = "${lib.getExe cfg.package} --config-file-path \${RUNTIME_DIRECTORY}/config.toml";
-        DynamicUser = true;
        StateDirectory = "meilisearch";
        WorkingDirectory = "%S/meilisearch";
        RuntimeDirectory = "meilisearch";
        RuntimeDirectoryMode = "0700";
+        ReadWritePaths = [
+          cfg.settings.db_path
+          cfg.settings.dump_dir
+          cfg.settings.snapshot_dir
+        ];

        ProtectSystem = "strict";
        ProtectHome = true;
@ -255,6 +262,7 @@ in
        RestrictSUIDSGID = true;
        LockPersonality = true;
        MemoryDenyWriteExecute = true;
+        RemoveIPC = true;

        # Meilisearch needs to determine cgroup memory limits to set its own memory limits.
        # This means this can't be set to "pid"
--- a/nixos/modules/services/web-apps/sharkey.nix
+++ b/nixos/modules/services/web-apps/sharkey.nix
@ -297,7 +297,6 @@ in
    ]);

  meta.maintainers = with lib.maintainers; [
-    srxl
    tmarkus
  ];
 }
--- a/nixos/tests/k3s/etcd.nix
+++ b/nixos/tests/k3s/etcd.nix
@ -50,6 +50,7 @@ import ../make-test-python.nix (
          services.k3s = {
            enable = true;
            role = "server";
+            package = k3s;
            extraFlags = [
              "--datastore-endpoint=\"http://192.168.1.1:2379\""
              "--disable coredns"
--- a/nixos/tests/radicle.nix
+++ b/nixos/tests/radicle.nix
@ -203,7 +203,7 @@ in
      with subtest("alice can receive the patch"):
        alice.wait_until_succeeds("test 1 = \"$(rad stats | jq .local.patches)\"")
        alice.succeed(
-          f"cd /tmp/repo && rad patch show {bob_repo_patch1_pid} | grep 'opened by bob'",
+          f"cd /tmp/repo && rad patch show {bob_repo_patch1_pid} | grep -E '{bob_repo_patch1_pid[:7]} @ .+ by bob'",
          f"cd /tmp/repo && rad patch checkout {bob_repo_patch1_pid}"
        )
        assert alice.succeed("cat /tmp/repo/testfile") == "hello alice\n"
--- a/nixos/tests/web-apps/sharkey.nix
+++ b/nixos/tests/web-apps/sharkey.nix
@ -50,7 +50,6 @@ in
    '';

  meta.maintainers = with lib.maintainers; [
-    srxl
    tmarkus
  ];
 }
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@ -5208,6 +5208,22 @@ let
        };
      };

+      vytautassurvila.csharp-ls = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "csharp-ls";
+          publisher = "vytautassurvila";
+          version = "0.0.27";
+          hash = "sha256-kl6W1UQ36cNQNj3cOsMyZbxD6glaRm3W0Z1W+xuEcjs=";
+        };
+        meta = {
+          changelog = "https://github.com/vytautassurvila/vscode-csharp-ls/blob/master/CHANGELOG.md";
+          description = "Visual Studio Code Extension - C# LSP client for csharp-language-server";
+          downloadPage = "https://marketplace.visualstudio.com/items?itemName=vytautassurvila.csharp-ls";
+          homepage = "https://github.com/vytautassurvila/vscode-csharp-ls";
+          license = lib.licenses.mit;
+        };
+      };
+
      waderyan.gitblame = buildVscodeMarketplaceExtension {
        mktplcRef = {
          name = "gitblame";
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix
@ -5,13 +5,13 @@
 }:
 buildGoModule rec {
  pname = "helm-dt";
-  version = "0.4.8";
+  version = "0.4.9";

  src = fetchFromGitHub {
    owner = "vmware-labs";
    repo = "distribution-tooling-for-helm";
    rev = "refs/tags/v${version}";
-    hash = "sha256-G2gJNsrw3NIQaZf+htSLHHCPeKWtbXQw5B7d+yI53uE=";
+    hash = "sha256-3zEu4fnvjM1SvyOyj6NzQteyfEh5X7ro/G0gkzt7ghY=";
  };

  vendorHash = "sha256-CIVgNS74V75etC9WBzoxu6aoMHlUYxWd22h2NG1uNn0=";
--- a/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json
+++ b/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json
@ -1,26 +1,26 @@
 {
  "airgap-images-amd64-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.12%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
-    "sha256": "a6899f064a179d0681b5e18f5b82fa10120badf8e74c79a4eedebe000a9eaa56"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.13%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
+    "sha256": "22972425bc5554ce4d9958a3b7b5b3c1d4d80d9e6dd9494e9853fc659b944724"
  },
  "airgap-images-amd64-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.12%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "d253cfce051c549a3ed0826d60e5c7bec7bbd9f8a64f98a9d5ec8238e9914cc3"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.13%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "2b89cf256067bb292cc24e0a93688c2e4704387910a37cda38ef83727121c780"
  },
  "airgap-images-arm-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.12%2Bk3s1/k3s-airgap-images-arm.tar.gz",
-    "sha256": "74e897222e53a2750b3ee8249964e0e47fa5c5caae9d611a18499be6b51cdee3"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.13%2Bk3s1/k3s-airgap-images-arm.tar.gz",
+    "sha256": "2437c19cfe19a8d62097430e8f51cab2ed740b42b18ee060bc7a18a7421f8ac9"
  },
  "airgap-images-arm-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.12%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "162a158c191591ec4ca3b7f446fdf9e23eb8366407091b992087abdc6349325f"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.13%2Bk3s1/k3s-airgap-images-arm.tar.zst",
+    "sha256": "e7ba4d17e439863f71f303d871f6c700fdafc3b96fb69323cb59f2319ab844d4"
  },
  "airgap-images-arm64-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.12%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
-    "sha256": "313e268ab348dd8d4708928e7bc0fb45b7f518aeb7dfaa9631d3d7d61ba1f8be"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.13%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
+    "sha256": "90abbf66bae88eec6016c2a5053523dcbcdf94d215775b4bd773d322b236fc84"
  },
  "airgap-images-arm64-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.12%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "60f19d4935f5b4b2b776c634eb9701268b94ccd100fc9c2968c096ba1fb5154f"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.13%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "fd166a50cbe9be3e3a41d5e3292357168578622a5d1211642206b9afd6cf1ddc"
  }
 }
--- a/pkgs/applications/networking/cluster/k3s/1_31/versions.nix
+++ b/pkgs/applications/networking/cluster/k3s/1_31/versions.nix
@ -1,15 +1,15 @@
 {
-  k3sVersion = "1.31.12+k3s1";
-  k3sCommit = "2b53c7e4c81742fbb2b0e7e90e3bb907d1fe0e24";
-  k3sRepoSha256 = "07pi1vjpm01q2riq0dic6p27nqj4wzwwzllxgmr7gfim1xx643gd";
-  k3sVendorHash = "sha256-osqhQJq+Qst3LpYdhXkAY6Pxay381PmoxD5Ji/ZV86Q=";
+  k3sVersion = "1.31.13+k3s1";
+  k3sCommit = "a4ca1794628ec6d699b5768ef9fc1b99e1694efc";
+  k3sRepoSha256 = "0zlvbkidan1jpdbcqqvpr46701rcnch4q7iczbpadbx7ixq7qmwj";
+  k3sVendorHash = "sha256-wR4GNGd9QK/6IVdoXmcPDQwj0dvA/ofwVBgWXDmHz1U=";
  chartVersions = import ./chart-versions.nix;
  imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
-  k3sRootVersion = "0.14.1";
-  k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7";
+  k3sRootVersion = "0.15.0";
+  k3sRootSha256 = "008n8xx7x36y9y4r24hx39xagf1dxbp3pqq2j53s9zkaiqc62hd0";
  k3sCNIVersion = "1.7.1-k3s1";
  k3sCNISha256 = "0k1qfmsi5bqgwd5ap8ndimw09hsxn0cqf4m5ad5a4mgl6akw6dqz";
-  containerdVersion = "2.0.5-k3s2.32";
-  containerdSha256 = "1q285ijgxhf4w9xgqqg7yi29mb4jqpifk6bqkjih456qxxkiyk2z";
+  containerdVersion = "2.1.4-k3s1.32";
+  containerdSha256 = "05dcyv5kxic99ghi8wb1b544kmq0ccc06yiln2yfh49h11hngw50";
  criCtlVersion = "1.31.0-k3s2";
 }
--- a/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json
+++ b/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json
@ -1,26 +1,26 @@
 {
  "airgap-images-amd64-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.8%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
-    "sha256": "b2b652c75ad0e2138ed3925e43c12bd9b79be8a42a577dde9dcb518933e5501b"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.9%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
+    "sha256": "50ba2c60c4541a2f09436e7fd91b8b782b2055f91b60ee668d70b29b9f6f1783"
  },
  "airgap-images-amd64-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.8%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "3f690edd5e28c28ea3a52beb3ec009726f6e72f4a67096f2ce2b1a4fa3b01e3d"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.9%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "079ef47f09b80397402a818c748aeebd6ba41a405f04c81c80ef05fbffc11dee"
  },
  "airgap-images-arm-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.8%2Bk3s1/k3s-airgap-images-arm.tar.gz",
-    "sha256": "343fa41d0c67b1b1bb4cd962b0f8d5f9cf175ef1b3bca4348cdbf91670a1d782"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.9%2Bk3s1/k3s-airgap-images-arm.tar.gz",
+    "sha256": "7718b0be16c4cd336ca79df2bb1a0688fe1d76fdb83c584adb47a44ce70a630e"
  },
  "airgap-images-arm-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.8%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "efc96a222a2fd0b13104e6fd87dd6bbda9a96abeb20a1a1cc203044ce0a38749"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.9%2Bk3s1/k3s-airgap-images-arm.tar.zst",
+    "sha256": "2dcb0dcbb9d50ceef87be1125b6d6ca7a7f7ac233c3715d67db0680153486ed6"
  },
  "airgap-images-arm64-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.8%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
-    "sha256": "04ac1b2f03bceb238ad600ef70ca7a78672d741e8ce430749b8eedbb1dd0ac47"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.9%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
+    "sha256": "dfe042271ed97ef15a418cb219d31952914b4e78027d8dd871382e5e6bdbc7d1"
  },
  "airgap-images-arm64-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.8%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "d76ec4a39d66da2a98e7c55dc6811350b4333a2eeae9c0bd4fc401203d92d9e8"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.9%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "b92d129d8e182fd8079be5fa1442116e47cb8e298f9a3ced0e401b2d02929675"
  }
 }
--- a/pkgs/applications/networking/cluster/k3s/1_32/versions.nix
+++ b/pkgs/applications/networking/cluster/k3s/1_32/versions.nix
@ -1,15 +1,15 @@
 {
-  k3sVersion = "1.32.8+k3s1";
-  k3sCommit = "fe896f7e7cf8be1cfffe7151c6860deb08e2a005";
-  k3sRepoSha256 = "1knj7jzxb70zvqjn7pbjz78cm06w0402id5frib94y0i4rsmqd6g";
-  k3sVendorHash = "sha256-MbXTUvdnoLFVGYKEGBYWNkuL2Es0Io4q2E5qaUptwRQ=";
+  k3sVersion = "1.32.9+k3s1";
+  k3sCommit = "062b953493abc18cbf3a85d76a71d70a9ea4b5cd";
+  k3sRepoSha256 = "0hsdkrdqb9dbi60k8fczxg23n72mp191qmpd0kqa0x1s6hq2pjw2";
+  k3sVendorHash = "sha256-ou169BNhsrY66iLVPufvOp1lYdiqR5e7mzNGDLOlW2I=";
  chartVersions = import ./chart-versions.nix;
  imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
-  k3sRootVersion = "0.14.1";
-  k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7";
+  k3sRootVersion = "0.15.0";
+  k3sRootSha256 = "008n8xx7x36y9y4r24hx39xagf1dxbp3pqq2j53s9zkaiqc62hd0";
  k3sCNIVersion = "1.7.1-k3s1";
  k3sCNISha256 = "0k1qfmsi5bqgwd5ap8ndimw09hsxn0cqf4m5ad5a4mgl6akw6dqz";
-  containerdVersion = "2.0.5-k3s2.32";
-  containerdSha256 = "1q285ijgxhf4w9xgqqg7yi29mb4jqpifk6bqkjih456qxxkiyk2z";
+  containerdVersion = "2.1.4-k3s1.32";
+  containerdSha256 = "05dcyv5kxic99ghi8wb1b544kmq0ccc06yiln2yfh49h11hngw50";
  criCtlVersion = "1.31.0-k3s2";
 }
--- a/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json
+++ b/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json
@ -1,26 +1,26 @@
 {
  "airgap-images-amd64-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.4%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
-    "sha256": "13832518d409f950121a9c681b878f868120c73d42d3823f55cea49f61b69497"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.5%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
+    "sha256": "580c09a6f8c088de023ff8ce256371e807edb45d60db9e53505db263e8987110"
  },
  "airgap-images-amd64-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.4%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "1a3738a77c4a3fef4a85c16d7f2eadcd337605f9279fcddbc3eb4f982fbd2238"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.5%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "c1d71ab864b6b7de087d0827a1810c5fd271134e317af8730ec9211eaf34b097"
  },
  "airgap-images-arm-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.4%2Bk3s1/k3s-airgap-images-arm.tar.gz",
-    "sha256": "94b084b7f9756e986855301658af957042e3ebb7c71848860f823b35844e98fa"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.5%2Bk3s1/k3s-airgap-images-arm.tar.gz",
+    "sha256": "940581b495178e35865db8bc7791052bfc3f62bc01fc960e7de27807b50473bd"
  },
  "airgap-images-arm-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.4%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "1be4d940daea065ad97bc254882b12fb30af2f13ed2b26a7cd16aeacec29f048"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.5%2Bk3s1/k3s-airgap-images-arm.tar.zst",
+    "sha256": "7a31e2d1d3bb220fe9073bf58051046745dfb871ca51230e56ec5789cb97d875"
  },
  "airgap-images-arm64-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.4%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
-    "sha256": "a89d7916b65ed066e761fe07831aa157b91b30bc1369ea9be3d1e5f0fe1dc74c"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.5%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
+    "sha256": "2ea460f5c783cec0479e6cf8d82e11ed6b6fee6c8e7622243fadd5f8b7476beb"
  },
  "airgap-images-arm64-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.4%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "6d898c35a9dc96d427f4258605ce61daf7587f26ea2822b711896224b746b38f"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.5%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "b0408ae107ce0ddbd47b62242d8e2e97532b1cfeeef1a38cad0cc54dfd289edc"
  }
 }
--- a/pkgs/applications/networking/cluster/k3s/1_33/versions.nix
+++ b/pkgs/applications/networking/cluster/k3s/1_33/versions.nix
@ -1,15 +1,15 @@
 {
-  k3sVersion = "1.33.4+k3s1";
-  k3sCommit = "148243c49519922720fe1b340008dbce8fb02516";
-  k3sRepoSha256 = "1870l3mq5nsh8i82wvwsz7nqiv1xzyqypm66rfmp999s2qlssyaa";
-  k3sVendorHash = "sha256-JbnoV8huyOS7Q91QjqTKvPEtkYQxjR10o0d5z25Ycsg=";
+  k3sVersion = "1.33.5+k3s1";
+  k3sCommit = "fab4a5c3de46748494cf7ad5dccc89b213965b08";
+  k3sRepoSha256 = "0c0phxnx09gainay4cgbcc2j1ddci73a9i0q92zf32whkbp06112";
+  k3sVendorHash = "sha256-v+tfVL9sDyiDRB3/IDDfyDekFAdjdUtTTChu6l5Qvg0=";
  chartVersions = import ./chart-versions.nix;
  imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
-  k3sRootVersion = "0.14.1";
-  k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7";
+  k3sRootVersion = "0.15.0";
+  k3sRootSha256 = "008n8xx7x36y9y4r24hx39xagf1dxbp3pqq2j53s9zkaiqc62hd0";
  k3sCNIVersion = "1.7.1-k3s1";
  k3sCNISha256 = "0k1qfmsi5bqgwd5ap8ndimw09hsxn0cqf4m5ad5a4mgl6akw6dqz";
-  containerdVersion = "2.0.5-k3s2";
-  containerdSha256 = "0011p1905jsswz1zqzkylzjfvi50mc60ifgjnjxwnjrk2rnwbmbz";
-  criCtlVersion = "1.31.0-k3s2";
+  containerdVersion = "2.1.4-k3s1";
+  containerdSha256 = "0fg9py52hac5bdmrabvkcpc1aawxl5xc0ij9zx964qkkc7fa19ca";
+  criCtlVersion = "1.33.0-k3s2";
 }
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@ -346,6 +346,9 @@ stdenvNoCC.mkDerivation {
          }
        fi
      ''
+      + optionalString (libc.w32api or null != null) ''
+        echo '-L${lib.getLib libc.w32api}${libc.libdir or "/lib/w32api"}' >> $out/nix-support/libc-ldflags
+      ''
    )

    ##
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@ -126,6 +126,7 @@ let
  libc_dev = optionalString (libc != null) (getDev libc);
  libc_lib = optionalString (libc != null) (getLib libc);
  cc_solib = getLib cc + optionalString (targetPlatform != hostPlatform) "/${targetPlatform.config}";
+  cc_bin = getBin cc + optionalString (targetPlatform != hostPlatform) "/${targetPlatform.config}";

  # The wrapper scripts use 'cat' and 'grep', so we may need coreutils.
  coreutils_bin = optionalString (!nativeTools) (getBin coreutils);
@ -590,15 +591,21 @@ stdenvNoCC.mkDerivation {
  ]
  ++ optional (cc.langC or true) ./setup-hook.sh
  ++ optional (cc.langFortran or false) ./fortran-hook.sh
-  ++ optional (targetPlatform.isWindows) (
+  ++ optional (targetPlatform.isWindows || targetPlatform.isCygwin) (
    stdenvNoCC.mkDerivation {
      name = "win-dll-hook.sh";
      dontUnpack = true;
-      installPhase = ''
-        echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_solib}/lib" > $out
-        echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_solib}/lib64" >> $out
-        echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_solib}/lib32" >> $out
-      '';
+      installPhase =
+        if targetPlatform.isCygwin then
+          ''
+            echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_bin}/lib" >> $out
+          ''
+        else
+          ''
+            echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_solib}/lib" > $out
+            echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_solib}/lib64" >> $out
+            echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_solib}/lib32" >> $out
+          '';
    }
  );

@ -705,6 +712,11 @@ stdenvNoCC.mkDerivation {
          include '-idirafter' ''${dir} >> $out/nix-support/libc-cflags
        done
      ''
+      + optionalString (libc.w32api or null != null) ''
+        echo '-idirafter ${lib.getDev libc.w32api}${
+          libc.incdir or "/include/w32api"
+        }' >> $out/nix-support/libc-cflags
+      ''
      + ''

        echo "${libc_lib}" > $out/nix-support/orig-libc
--- a/pkgs/build-support/setup-hooks/cygwin-dll-link.sh
+++ b/pkgs/build-support/setup-hooks/cygwin-dll-link.sh
@ -0,0 +1,73 @@
+addLinkDLLPaths() {
+    addToSearchPath "LINK_DLL_FOLDERS" "$1/lib"
+    addToSearchPath "LINK_DLL_FOLDERS" "$1/bin"
+}
+
+addEnvHooks "$targetOffset" addLinkDLLPaths
+
+addOutputDLLPaths() {
+  for output in $(getAllOutputNames); do
+    addToSearchPath "LINK_DLL_FOLDERS" "${!output}/lib"
+    addToSearchPath "LINK_DLL_FOLDERS" "${!output}/bin"
+  done
+}
+
+postInstallHooks+=(addOutputDLLPaths)
+
+_dllDeps() {
+    "$OBJDUMP" -p "$1" \
+        | sed -n 's/.*DLL Name: \(.*\)/\1/p' \
+        | sort -u
+}
+
+_linkDeps() {
+    local target="$1" dir="$2" check="$3"
+    echo 'target:' "$target"
+    local dll
+    _dllDeps "$target" | while read dll; do
+        echo '  dll:' "$dll"
+        if [[ -e "$dir/$dll" ]]; then continue; fi
+        # Locate the DLL - it should be an *executable* file on $LINK_DLL_FOLDERS.
+        local dllPath="$(PATH="$(dirname "$target"):$LINK_DLL_FOLDERS" type -P "$dll")"
+        if [[ -z "$dllPath" ]]; then
+          if [[ -z "$check" || -n "${allowedImpureDLLsMap[$dll]}" ]]; then
+             continue
+          fi
+          echo unable to find $dll in $LINK_DLL_FOLDERS >&2
+          exit 1
+        fi
+        echo '    linking to:' "$dllPath"
+        CYGWIN+=\ winsymlinks:nativestrict ln -sr "$dllPath" "$dir"
+        # That DLL might have its own (transitive) dependencies,
+        # so add also all DLLs from its directory to be sure.
+        _linkDeps "$dllPath" "$dir" ""
+    done
+}
+
+linkDLLs() {
+  if [ ! -d "$prefix" ]; then return; fi
+  (
+    set -e
+    shopt -s globstar nullglob
+
+    local -a allowedImpureDLLsArray
+    concatTo allowedImpureDLLsArray allowedImpureDLLs
+
+    local -A allowedImpureDLLsMap;
+
+    for dll in "${allowedImpureDLLsArray[@]}"; do
+      allowedImpureDLLsMap[$dll]=1
+    done
+
+    cd "$prefix"
+
+    # Iterate over any DLL that we depend on.
+    local target
+    for target in {bin,libexec}/**/*.{exe,dll}; do
+      [[ ! -f "$target" || ! -x "$target" ]] ||
+        _linkDeps "$target" "$(dirname "$target")" "1"
+    done
+  )
+}
+
+fixupOutputHooks+=(linkDLLs)
--- a/pkgs/by-name/_1/_1password-gui/sources.json
+++ b/pkgs/by-name/_1/_1password-gui/sources.json
@ -1,28 +1,28 @@
 {
  "stable": {
    "linux": {
-      "version": "8.11.10",
+      "version": "8.11.12",
      "sources": {
        "x86_64": {
-          "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.11.10.x64.tar.gz",
-          "hash": "sha256-AKqr1jMTFXPYYYJu8wD9P+xXwxobSbpjXwmBQhWYVhg="
+          "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.11.12.x64.tar.gz",
+          "hash": "sha256-znzmaEYOLVw6nUBk20oMdSngkO8iiSTHvM1y/t3Z55Y="
        },
        "aarch64": {
-          "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.11.10.arm64.tar.gz",
-          "hash": "sha256-Xz66LYXgX64P9TTmI8D8Wtrz7qKTBrZx+rP26yJqcTw="
+          "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.11.12.arm64.tar.gz",
+          "hash": "sha256-ENuvB8GExhHWjJ97JV0qc2cIn9HqXb202dzIxu1fz2A="
        }
      }
    },
    "darwin": {
-      "version": "8.11.10",
+      "version": "8.11.12",
      "sources": {
        "x86_64": {
-          "url": "https://downloads.1password.com/mac/1Password-8.11.10-x86_64.zip",
-          "hash": "sha256-sQK+qHdGvpIi+h2az8PYq6kROmiaGKBbNGFGXJSe1eg="
+          "url": "https://downloads.1password.com/mac/1Password-8.11.12-x86_64.zip",
+          "hash": "sha256-mr7DsYIEh21pHQX0cq9JlTZ4lHhkyYHCmwMaxEiK+5g="
        },
        "aarch64": {
-          "url": "https://downloads.1password.com/mac/1Password-8.11.10-aarch64.zip",
-          "hash": "sha256-Hb+DEGM7ymDuf71uKTy8L/9bUWZ2+QD+w7h2tNvp0Pk="
+          "url": "https://downloads.1password.com/mac/1Password-8.11.12-aarch64.zip",
+          "hash": "sha256-34ylS5Xq9By6nuUkEmLoi0wR5hAQx1vBhrYFq4mjSDs="
        }
      }
    }
--- a/pkgs/by-name/_3/_3proxy/package.nix
+++ b/pkgs/by-name/_3/_3proxy/package.nix
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "3proxy";
    repo = "3proxy";
-    rev = version;
+    tag = version;
    sha256 = "sha256-uy6flZ1a7o02pr5O0pgl9zCjh8mE9W5JxotJeBMB16A=";
  };

--- a/pkgs/by-name/_6/_6tunnel/package.nix
+++ b/pkgs/by-name/_6/_6tunnel/package.nix
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "wojtekka";
    repo = "6tunnel";
-    rev = version;
+    tag = version;
    sha256 = "sha256-ftTAFjHlXRrXH6co8bX0RY092lAmv15svZn4BKGVuq0=";
  };

--- a/pkgs/by-name/_9/_9pfs/package.nix
+++ b/pkgs/by-name/_9/_9pfs/package.nix
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "ftrvxmtrx";
    repo = "9pfs";
-    rev = version;
+    tag = version;
    sha256 = "sha256-nlJ4Zh13T78r0Dn3Ky/XLhipeMbMFbn0qGCJnUCBd3Y=";
  };

--- a/pkgs/by-name/aa/aarch64-esr-decoder/package.nix
+++ b/pkgs/by-name/aa/aarch64-esr-decoder/package.nix
@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
  src = fetchFromGitHub {
    owner = "google";
    repo = "aarch64-esr-decoder";
-    rev = version;
+    tag = version;
    hash = "sha256-ZpSrz7iwwzNrK+bFTMn5MPx4Zjceao9NKhjAyjuPLWY=";
  };

@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
  meta = {
    description = "Utility for decoding aarch64 ESR register values";
    homepage = "https://github.com/google/aarch64-esr-decoder";
-    changelog = "https://github.com/google/aarch64-esr-decoder/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/google/aarch64-esr-decoder/blob/${version}/CHANGELOG.md";
    license = lib.licenses.asl20;
    maintainers = with lib.maintainers; [ jmbaur ];
    mainProgram = "aarch64-esr-decoder";
--- a/pkgs/by-name/ab/aba/package.nix
+++ b/pkgs/by-name/ab/aba/package.nix
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage {
  src = fetchFromSourcehut {
    owner = "~onemoresuza";
    repo = "aba";
-    rev = version;
+    tag = version;
    hash = "sha256-2zVQNchL4DFh2v2/kwupJTBSmXiKqlxzUMrP9TbfCMs=";
  };

--- a/pkgs/by-name/ab/abi-compliance-checker/package.nix
+++ b/pkgs/by-name/ab/abi-compliance-checker/package.nix
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "lvc";
    repo = "abi-compliance-checker";
-    rev = version;
+    tag = version;
    sha256 = "1f1f9j2nf9j83sfl2ljadch99v6ha8rq8xm7ax5akc05hjpyckij";
  };

--- a/pkgs/by-name/ab/abi-dumper/package.nix
+++ b/pkgs/by-name/ab/abi-dumper/package.nix
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "lvc";
    repo = "abi-dumper";
-    rev = version;
+    tag = version;
    sha256 = "sha256-BefDMeKHx4MNU6SyX5UpQnwdI+zqap7zunsgdWG/2xc=";
  };

--- a/pkgs/by-name/ad/adapta-backgrounds/package.nix
+++ b/pkgs/by-name/ad/adapta-backgrounds/package.nix
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "adapta-project";
    repo = "adapta-backgrounds";
-    rev = version;
+    tag = version;
    sha256 = "04hmbmzf97rsii8gpwy3wkljy5xhxmlsl34d63s6hfy05knclydj";
  };

--- a/pkgs/by-name/ad/adapta-gtk-theme/package.nix
+++ b/pkgs/by-name/ad/adapta-gtk-theme/package.nix
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "adapta-project";
    repo = "adapta-gtk-theme";
-    rev = version;
+    tag = version;
    sha256 = "19skrhp10xx07hbd0lr3d619vj2im35d8p9rmb4v4zacci804q04";
  };

--- a/pkgs/by-name/ad/adapta-kde-theme/package.nix
+++ b/pkgs/by-name/ad/adapta-kde-theme/package.nix
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "PapirusDevelopmentTeam";
    repo = "adapta-kde";
-    rev = version;
+    tag = version;
    sha256 = "1q85678sff8is2kwvgd703ckcns42gdga2c1rqlp61gb6bqf09j8";
  };

--- a/pkgs/by-name/ad/adementary-theme/package.nix
+++ b/pkgs/by-name/ad/adementary-theme/package.nix
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "hrdwrrsk";
    repo = "adementary-theme";
-    rev = version;
+    tag = version;
    sha256 = "14y5s18g9r2c1ciw1skfksn09gvqgy8vjvwbr0z8gacf0jc2apqk";
  };

--- a/pkgs/by-name/ad/adguardian/package.nix
+++ b/pkgs/by-name/ad/adguardian/package.nix
@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
  src = fetchFromGitHub {
    owner = "Lissy93";
    repo = "AdGuardian-Term";
-    rev = version;
+    tag = version;
    hash = "sha256-WxrSmCwLnXXs5g/hN3xWE66P5n0RD/L9MJpf5N2iNtY=";
  };

--- a/pkgs/by-name/ad/adminneo/index.php
+++ b/pkgs/by-name/ad/adminneo/index.php
@ -1,45 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace nixos {
-    use AdminerPlugin;
-
-    use function sprintf;
-
-    function adminer_object(): object
-    {
-        require_once __DIR__ . '/plugins/plugin.php';
-
-        if (!file_exists(__DIR__ . '/plugins.json')) {
-            return new AdminerPlugin();
-        }
-
-        $plugins = array_map(
-            static function (string $name): ?object {
-                $plugin = sprintf('%s/plugins/%s.php', __DIR__, $name);
-
-                if (!is_readable($plugin)) {
-                    return null;
-                }
-
-                require $plugin;
-
-                preg_match_all('/(\w+)/', $name, $matches);
-
-                return new sprintf('Adminer%s', implode('', array_map('ucfirst', $matches[1])));
-            },
-            json_decode(file_get_contents(sprintf('%s/plugins.json', __DIR__), true))
-        );
-
-        return new AdminerPlugin(array_filter($plugins));
-    }
-}
-
-namespace {
-	function adminer_object() {
-		return \nixos\adminer_object();
-	}
-
-	require(__DIR__ . '/adminer.php');
-}
--- a/pkgs/by-name/ad/adminneo/package.nix
+++ b/pkgs/by-name/ad/adminneo/package.nix
@ -3,30 +3,31 @@
  stdenvNoCC,
  fetchFromGitHub,
  php,
-  writeText,
  nix-update-script,
-  theme ? null,
-  plugins ? [ ],
+  installPlugins ? true,
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "adminneo";
-  version = "4.17.2";
+  version = "5.1.1";

  src = fetchFromGitHub {
    owner = "adminneo-org";
    repo = "adminneo";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-erz/kkaywkuT4k3wg8a48p2pTEqzsr3pHDrtNDtrq2I=";
+    hash = "sha256-ckz0LvKLY6xm3thPmY/ry8G5kkt29rmDsG/D6NNeRoY=";
  };

  nativeBuildInputs = [
    php
  ];

+  # Package provides a Makefile, which is currently broken
+  # https://github.com/adminneo-org/adminneo/issues/161
+  # As soon, as this is fixed, the buildPhase can be removed
  buildPhase = ''
    runHook preBuild

-    php compile.php
+    ${php}/bin/php bin/compile.php

    runHook postBuild
  '';
@ -35,41 +36,28 @@ stdenvNoCC.mkDerivation (finalAttrs: {
    runHook preInstall

    mkdir $out
-    cp export/adminer-${finalAttrs.version}.php $out/adminer.php
-    cp ${./index.php} $out/index.php
-
-    ${lib.optionalString (theme != null) ''
-      cp designs/${theme}/adminer.css $out/adminer.css
-    ''}
-
-    # Copy base plugin
-    mkdir -p $out/plugins
-    cp plugins/plugin.php $out/plugins/plugin.php
-
-    ${lib.optionalString (plugins != [ ]) ''
-      cp plugins/*.php $out/plugins/
-      cp ${writeText "$out/plugins.json" ''
-        ${toString (builtins.toJSON plugins)}
-      ''} $out/plugins.json
-    ''}
-
+    cp compiled/adminneo-${finalAttrs.version}.php $out/adminneo.php
+    # for compatibility
+    ln -s adminneo.php $out/index.php
+  ''
+  + (lib.optionalString installPlugins ''
+    cp -r compiled/adminneo-plugins $out/
+  '')
+  + ''
    runHook postInstall
  '';

-  passthru = {
-    updateScript = nix-update-script { };
-    indexPHP = ./index.php;
-  };
+  passthru.updateScript = nix-update-script { };

  meta = {
    description = "Database management in a single PHP file (fork of Adminer)";
-    homepage = "https://github.com/adminneo-org/adminneo";
+    homepage = "https://www.adminneo.org/";
    license = with lib.licenses; [
      asl20
      gpl2Only
    ];
    maintainers = with lib.maintainers; [
-      johnrtitor
+      Necoro
    ];
    platforms = lib.platforms.all;
  };
--- a/pkgs/by-name/ae/aeron-cpp/package.nix
+++ b/pkgs/by-name/ae/aeron-cpp/package.nix
@ -35,7 +35,7 @@ stdenv.mkDerivation {
  src = fetchFromGitHub {
    owner = "real-logic";
    repo = "aeron";
-    rev = version;
+    tag = version;
    hash = "sha256-sROEZVOfScrlqMLbfrPtw3LQCQ5TfMcrLiP6j/Z9rSM=";
  };

--- a/pkgs/by-name/ah/aha/package.nix
+++ b/pkgs/by-name/ah/aha/package.nix
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {

  src = fetchFromGitHub {
    sha256 = "1gywad0rvvz3c5balz8cxsnx0562hj2ngzqyr8zsy2mb4pn0lpgv";
-    rev = version;
+    tag = version;
    repo = "aha";
    owner = "theZiz";
  };
--- a/pkgs/by-name/ah/ahoviewer/package.nix
+++ b/pkgs/by-name/ah/ahoviewer/package.nix
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "ahodesuka";
    repo = "ahoviewer";
-    rev = version;
+    tag = version;
    sha256 = "1avdl4qcpznvf3s2id5qi1vnzy4wgh6vxpnrz777a1s4iydxpcd8";
  };

--- a/pkgs/by-name/ai/aircrack-ng/package.nix
+++ b/pkgs/by-name/ai/aircrack-ng/package.nix
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "aircrack-ng";
    repo = "aircrack-ng";
-    rev = version;
+    tag = version;
    hash = "sha256-niQDwiqi5GtBW5HIn0endnqPb/MqllcjsjXw4pTyFKY=";
  };

--- a/pkgs/by-name/ai/airspyhf/package.nix
+++ b/pkgs/by-name/ai/airspyhf/package.nix
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "airspy";
    repo = "airspyhf";
-    rev = version;
+    tag = version;
    hash = "sha256-RKTMEDPeKcerJZtXTn8eAShxDcZUMgeQg/+7pEpMyVg=";
  };

--- a/pkgs/by-name/al/alacarte/package.nix
+++ b/pkgs/by-name/al/alacarte/package.nix
@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec {
    domain = "gitlab.gnome.org";
    owner = "GNOME";
    repo = "alacarte";
-    rev = version;
+    tag = version;
    hash = "sha256-sH/2ULI1QEqmgFIFFnOwsx2/+TMt+bPu0l0LUcnBgWg=";
  };

--- a/pkgs/by-name/al/alarm-clock-applet/package.nix
+++ b/pkgs/by-name/al/alarm-clock-applet/package.nix
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = pname;
    repo = "alarm-clock";
-    rev = version;
+    tag = version;
    hash = "sha256-10hkWWEsAUJnGeu35bR5d0RFKd9CKDZI7WGMzmEM3rI=";
  };

--- a/pkgs/by-name/al/alejandra/package.nix
+++ b/pkgs/by-name/al/alejandra/package.nix
@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
  src = fetchFromGitHub {
    owner = "kamadorueda";
    repo = "alejandra";
-    rev = version;
+    tag = version;
    hash = "sha256-Oi1n2ncF4/AWeY6X55o2FddIRICokbciqFYK64XorYk=";
  };

--- a/pkgs/by-name/al/alembic/package.nix
+++ b/pkgs/by-name/al/alembic/package.nix
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "alembic";
    repo = "alembic";
-    rev = version;
+    tag = version;
    hash = "sha256-R69UYyvLnMwv1JzEQ6S6elvR83Rmvc8acBJwSV/+hCk=";
  };

--- a/pkgs/by-name/al/alice-lg/package.nix
+++ b/pkgs/by-name/al/alice-lg/package.nix
@ -18,7 +18,7 @@ buildGoModule rec {
  src = fetchFromGitHub {
    owner = "alice-lg";
    repo = "alice-lg";
-    rev = version;
+    tag = version;
    hash = "sha256-DlmUurpu/bs/91fLsSQ3xJ8I8NWJweynMgV6Svkf0Uo=";
  };

--- a/pkgs/by-name/al/alpnpass/package.nix
+++ b/pkgs/by-name/al/alpnpass/package.nix
@ -11,7 +11,7 @@ buildGoModule rec {
  src = fetchFromGitHub {
    owner = "VerSprite";
    repo = "alpnpass";
-    rev = version;
+    tag = version;
    hash = "sha256-hNZqGTV17rFSKLhZzNqH2E4SSb6Jhk7YQ4TN0HnE+9g=";
  };

--- a/pkgs/by-name/am/amd-libflame/package.nix
+++ b/pkgs/by-name/am/amd-libflame/package.nix
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "amd";
    repo = "libflame";
-    rev = version;
+    tag = version;
    hash = "sha256-9Z0e6RCJfqQlq3oT4fBu8rwPH1OWEKQ52rVDa0Y0rJU=";
  };

--- a/pkgs/by-name/am/amp-cli/package-lock.json
+++ b/pkgs/by-name/am/amp-cli/package-lock.json
@ -5,7 +5,7 @@
  "packages": {
    "": {
      "dependencies": {
-        "@sourcegraph/amp": "^0.0.1758297686-ge5ccb5"
+        "@sourcegraph/amp": "^0.0.1759233723-gf92434"
      }
    },
    "node_modules/@napi-rs/keyring": {
@ -228,9 +228,9 @@
      }
    },
    "node_modules/@sourcegraph/amp": {
-      "version": "0.0.1758297686-ge5ccb5",
-      "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1758297686-ge5ccb5.tgz",
-      "integrity": "sha512-fU/Lw/yYfeUwF0+1MUuCdDcqZVEygeLwjMPoIFl9kg8R3u2jgZGVqtbfaS8q6MI8CGCVPQTs/rDgP4nVE0jmyg==",
+      "version": "0.0.1759233723-gf92434",
+      "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1759233723-gf92434.tgz",
+      "integrity": "sha512-ts+dHxSHfT7sXNAvlRHyp/jwjGvKs08lf+KHaZ/2pMcqnBf94d9g+8u/AoPzUfeFq0WDAbeMl2rV4TDaJAM3aQ==",
      "dependencies": {
        "@napi-rs/keyring": "1.1.9"
      },
--- a/pkgs/by-name/am/amp-cli/package.nix
+++ b/pkgs/by-name/am/amp-cli/package.nix
@ -9,11 +9,11 @@

 buildNpmPackage (finalAttrs: {
  pname = "amp-cli";
-  version = "0.0.1758297686-ge5ccb5";
+  version = "0.0.1759233723-gf92434";

  src = fetchzip {
    url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz";
-    hash = "sha256-D2jElEhvrcuuDIzfB+XAI4VCyYAOC6pu/xNMxkn16o4=";
+    hash = "sha256-r48Odw2PA9ei3WrCm+Q8eGXCY1TVzyrqJa9FLzW84vs=";
  };

  postPatch = ''
@ -45,7 +45,7 @@ buildNpmPackage (finalAttrs: {
    chmod +x bin/amp-wrapper.js
  '';

-  npmDepsHash = "sha256-dePLix9roMYlnYMqBq1nwRQEHdyXdtSEgvsoo7yD3QQ=";
+  npmDepsHash = "sha256-Al8JZ2g68ZvMTxDbZM9grKz7C217YJxnjWnO8o8ySnI=";

  propagatedBuildInputs = [
    ripgrep
--- a/pkgs/by-name/an/analog/package.nix
+++ b/pkgs/by-name/an/analog/package.nix
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "c-amie";
    repo = "analog-ce";
-    rev = version;
+    tag = version;
    sha256 = "sha256-NCturEibnpl6+paUZezksHzP33WtAzfIolvBLeEHXjY=";
  };

--- a/pkgs/by-name/an/anders/package.nix
+++ b/pkgs/by-name/an/anders/package.nix
@ -13,7 +13,7 @@ ocamlPackages.buildDunePackage rec {
  src = fetchFromGitHub {
    owner = "groupoid";
    repo = "anders";
-    rev = version;
+    tag = version;
    sha256 = "sha256-JUiZoo2rNLfgs94TlJqUNzul/7ODisCjSFAzhgSp1z4=";
  };

--- a/pkgs/by-name/an/anewer/package.nix
+++ b/pkgs/by-name/an/anewer/package.nix
@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
  src = fetchFromGitHub {
    owner = "ysf";
    repo = "anewer";
-    rev = version;
+    tag = version;
    sha256 = "181mi674354bddnq894yyq587w7skjh35vn61i41vfi6lqz5dy3d";
  };

--- a/pkgs/by-name/an/angsd/package.nix
+++ b/pkgs/by-name/an/angsd/package.nix
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
    owner = "ANGSD";
    repo = "angsd";
    sha256 = "sha256-Ppxgy54pAnqJUzNX5c12NHjKTQyEEcPSpCEEVOyZ/LA=";
-    rev = version;
+    tag = version;
  };

  patches = [
--- a/pkgs/by-name/an/anime-downloader/package.nix
+++ b/pkgs/by-name/an/anime-downloader/package.nix
@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec {
  src = fetchFromGitHub {
    owner = "anime-dl";
    repo = "anime-downloader";
-    rev = version;
+    tag = version;
    sha256 = "sha256-Uk2mtsSrb8fCD9JCFzvLBzMEB7ViVDrKPSOKy9ALJ6o=";
  };

--- a/pkgs/by-name/an/ansible-cmdb/package.nix
+++ b/pkgs/by-name/an/ansible-cmdb/package.nix
@ -26,7 +26,7 @@ buildPythonApplication {
  src = fetchFromGitHub {
    owner = "fboender";
    repo = "ansible-cmdb";
-    rev = version;
+    tag = version;
    hash = "sha256-HOFLX8fiid+xJOVYNyVbz5FunrhteAUPlvS3ctclVHo=";
  };

--- a/pkgs/by-name/ao/aoc-cli/package.nix
+++ b/pkgs/by-name/ao/aoc-cli/package.nix
@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
  src = fetchFromGitHub {
    owner = "scarvalhojr";
    repo = "aoc-cli";
-    rev = version;
+    tag = version;
    hash = "sha256-UdeCKhEWr1BjQ6OMLP19OLWPlvvP7FGAO+mi+bQUPQA=";
  };

--- a/pkgs/by-name/ao/aocl-utils/package.nix
+++ b/pkgs/by-name/ao/aocl-utils/package.nix
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "amd";
    repo = "aocl-utils";
-    rev = version;
+    tag = version;
    hash = "sha256-1g5gERVxXKAeCyNR9/HheUfj+MPxJso3NzqDonvuyMo=";
  };

--- a/pkgs/by-name/ap/apfel/package.nix
+++ b/pkgs/by-name/ap/apfel/package.nix
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "scarrazza";
    repo = "apfel";
-    rev = version;
+    tag = version;
    hash = "sha256-0Ix7KwEZUG/NmGJ380DVJbUA0PcoEJDlcGSc09l5Tbc=";
  };

--- a/pkgs/by-name/ap/appeditor/package.nix
+++ b/pkgs/by-name/ap/appeditor/package.nix
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "donadigo";
    repo = "appeditor";
-    rev = version;
+    tag = version;
    sha256 = "sha256-A0YasHw5osGrgUPiUPuRBnv1MR/Pth6jVHGEx/klOGY=";
  };

--- a/pkgs/by-name/ap/appindicator-sharp/package.nix
+++ b/pkgs/by-name/ap/appindicator-sharp/package.nix
@ -11,12 +11,12 @@

 stdenv.mkDerivation rec {
  pname = "appindicator-sharp";
-  version = "5a79cde93da6d68a4b1373f1ce5796c3c5fe1b37";
+  version = "0-unstable-2016-01-18";

  src = fetchFromGitHub {
    owner = "stsundermann";
    repo = "appindicator-sharp";
-    rev = version;
+    rev = "5a79cde93da6d68a4b1373f1ce5796c3c5fe1b37";
    sha256 = "sha256:1i0vqbp05l29f5v9ygp7flm4s05pcnn5ivl578mxmhb51s7ncw6l";
  };

--- a/pkgs/by-name/ar/arc-icon-theme/package.nix
+++ b/pkgs/by-name/ar/arc-icon-theme/package.nix
@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "horst3180";
    repo = "arc-icon-theme";
-    rev = version;
+    tag = version;
    hash = "sha256-TfYtzwo69AC5hHbzEqB4r5Muqvn/eghCGSlmjMCFA7I=";
  };

--- a/pkgs/by-name/ar/arc-kde-theme/package.nix
+++ b/pkgs/by-name/ar/arc-kde-theme/package.nix
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "PapirusDevelopmentTeam";
    repo = "arc-kde";
-    rev = version;
+    tag = version;
    sha256 = "sha256-dxk8YpJB4XaZHD/O+WvQUFKJD2TE38VZyC5orn4N7BA=";
  };

--- a/pkgs/by-name/ar/arc-theme/package.nix
+++ b/pkgs/by-name/ar/arc-theme/package.nix
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "jnsh";
    repo = "arc-theme";
-    rev = version;
+    tag = version;
    sha256 = "sha256-7VmqsUCeG5GwmrVdt9BJj0eZ/1v+no/05KwGFb7E9ns=";
  };

--- a/pkgs/by-name/ar/arduino-mk/package.nix
+++ b/pkgs/by-name/ar/arduino-mk/package.nix
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "sudar";
    repo = "Arduino-Makefile";
-    rev = version;
+    tag = version;
    sha256 = "0flpl97d2231gp51n3y4qvf3y1l8xzafi1sgpwc305vwc2h4dl2x";
  };

--- a/pkgs/by-name/ar/arduinoOTA/package.nix
+++ b/pkgs/by-name/ar/arduinoOTA/package.nix
@ -11,7 +11,7 @@ buildGoModule rec {
  src = fetchFromGitHub {
    owner = "arduino";
    repo = "arduinoOTA";
-    rev = version;
+    tag = version;
    hash = "sha256-HaNMkeV/PDEotYp8+rUKFaBxGbZO8qA99Yp2sa6glz8=";
  };

--- a/pkgs/by-name/ar/argp-standalone/package.nix
+++ b/pkgs/by-name/ar/argp-standalone/package.nix
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "argp-standalone";
    repo = "argp-standalone";
-    rev = version;
+    tag = version;
    sha256 = "jWnoWVnUVDQlsC9ru7oB9PdtZuyCCNqGnMqF/f2m0ZY=";
  };

--- a/pkgs/by-name/ar/ariang/package.nix
+++ b/pkgs/by-name/ar/ariang/package.nix
@ -16,7 +16,7 @@ buildNpmPackage rec {
  src = fetchFromGitHub {
    owner = "mayswind";
    repo = "AriaNg";
-    rev = version;
+    tag = version;
    hash = "sha256-TisgE5VFOe/1LbDq43AHASMVhC85BglETYFcvsQpwMw=";
  };

--- a/pkgs/by-name/ar/aribb25/package.nix
+++ b/pkgs/by-name/ar/aribb25/package.nix
@ -17,7 +17,7 @@ stdenv.mkDerivation {
    domain = "code.videolan.org";
    owner = "videolan";
    repo = "aribb25";
-    # rev = version; FIXME: uncomment in next release
+    # tag = version; FIXME: uncomment in next release
    rev = "c14938692b313b5ba953543fd94fd1cad0eeef18"; # 0.2.7 with build fixes
    sha256 = "1kb9crfqib0npiyjk4zb63zqlzbhqm35nz8nafsvdjd71qbd2amp";
  };
--- a/pkgs/by-name/ar/arkade/package.nix
+++ b/pkgs/by-name/ar/arkade/package.nix
@ -13,7 +13,7 @@ buildGoModule rec {
  src = fetchFromGitHub {
    owner = "alexellis";
    repo = "arkade";
-    rev = version;
+    tag = version;
    hash = "sha256-aWIMnqpf7HehGingl0z7lpUnr7P3k5tiD7+PVjF0Uso=";
  };

--- a/pkgs/by-name/ar/arp-scan/package.nix
+++ b/pkgs/by-name/ar/arp-scan/package.nix
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "royhills";
    repo = "arp-scan";
-    rev = version;
+    tag = version;
    sha256 = "sha256-BS+ItZd6cSMX92M6XGYrIeAiCB2iBdvbMvKdLfwawLQ=";
  };

--- a/pkgs/by-name/as/asusctl/package.nix
+++ b/pkgs/by-name/as/asusctl/package.nix
@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
  src = fetchFromGitLab {
    owner = "asus-linux";
    repo = "asusctl";
-    rev = version;
+    tag = version;
    hash = "sha256-E/tDd7wQKDgC91x1rGa8Ltn4GMPk3DJDvmMQNafVLyM=";
  };

--- a/pkgs/by-name/at/atomic-operator/package.nix
+++ b/pkgs/by-name/at/atomic-operator/package.nix
@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
  src = fetchFromGitHub {
    owner = "swimlane";
    repo = "atomic-operator";
-    rev = version;
+    tag = version;
    hash = "sha256-DyNqu3vndyLkmfybCfTbgxk3t/ALg7IAkAMg4kBkH7Q=";
  };

--- a/pkgs/by-name/at/atomicparsley/package.nix
+++ b/pkgs/by-name/at/atomicparsley/package.nix
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "wez";
    repo = "atomicparsley";
-    rev = version;
+    tag = version;
    sha256 = "sha256-VhrOMpGNMkNNYjcfCqlHI8gdApWr1ThtcxDwQ6gyV/g=";
  };

--- a/Show more
+++ b/Show more