Merge staging-next into staging

2026-09-29 19:30:11 +00:00 · 2025-03-20 18:05:48 +00:00
parent a99aed50a5 18471e1002
commit 1cf5157bf0
58 changed files with 867 additions and 502 deletions
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -399,6 +399,10 @@ pkgs/by-name/fo/forgejo/                @adamcstephens @bendlas @emilylange
 /pkgs/development/compilers/ocaml   @ulrikstrid
 /pkgs/development/ocaml-modules     @ulrikstrid

+# ZFS
+/nixos/tests/zfs.nix        @adamcstephens @amarshall
+/pkgs/os-specific/linux/zfs @adamcstephens @amarshall
+
 # Zig
 /pkgs/development/compilers/zig @figsoda @RossComputerGuy
 /doc/hooks/zig.section.md       @figsoda @RossComputerGuy
--- a/doc/release-notes/rl-2505.section.md
+++ b/doc/release-notes/rl-2505.section.md
@@ -75,6 +75,11 @@
  - `functor.wrapped` is now deprecated for some types and using it will give a warning with migration instructions. It is deprecated for these types:
    - `lib.types.attrsWith`
    - `lib.types.listOf`
+    - `lib.types.unique` and `lib.types.uniq`
+    - `lib.types.nullOr`
+    - `lib.types.functionTo`
+    - `lib.types.coercedTo`
+    - `lib.types.either`

 - Plasma 5 and Qt 5 based versions of associated software are deprecated in NixOS 25.05, and will be removed in NixOS 25.11. Users are encouraged to upgrade to Plasma 6.

--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -415,6 +415,38 @@ NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribu

 NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.listOf.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix
 NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedListOf.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix
+# unique / uniq
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.unique.type.functor.wrapped ./deprecated-wrapped.nix
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedUnique.type.functor.wrapped ./deprecated-wrapped.nix
+
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.unique.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedUnique.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix
+# nullOr
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.nullOr.type.functor.wrapped ./deprecated-wrapped.nix
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedNullOr.type.functor.wrapped ./deprecated-wrapped.nix
+
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.nullOr.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedNullOr.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix
+# functionTo
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.functionTo.type.functor.wrapped ./deprecated-wrapped.nix
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedFunctionTo.type.functor.wrapped ./deprecated-wrapped.nix
+
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.functionTo.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedFunctionTo.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix
+
+# coercedTo
+# Note: test 'nestedTypes.finalType' and 'nestedTypes.coercedType'
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.coercedTo.type.functor.wrapped ./deprecated-wrapped.nix
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.coercedTo.type.nestedTypes.finalType.functor.wrapped ./deprecated-wrapped.nix
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.coercedTo.type.nestedTypes.coercedType.functor.wrapped ./deprecated-wrapped.nix
+# either
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.either.type.functor.wrapped ./deprecated-wrapped.nix
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedEither.type.functor.wrapped ./deprecated-wrapped.nix
+
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.either.type.nestedTypes.left.functor.wrapped ./deprecated-wrapped.nix
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.either.type.nestedTypes.right.functor.wrapped ./deprecated-wrapped.nix
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedEither.type.nestedTypes.left.functor.wrapped ./deprecated-wrapped.nix
+NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedEither.type.nestedTypes.right.functor.wrapped ./deprecated-wrapped.nix

 # Even with multiple assignments, a type error should be thrown if any of them aren't valid
 checkConfigError 'A definition for option .* is not of type .*' \
--- a/lib/tests/modules/deprecated-wrapped.nix
+++ b/lib/tests/modules/deprecated-wrapped.nix
@@ -6,6 +6,11 @@ let
    # attrsOf uses attrsWith internally
    attrsOf
    listOf
+    unique
+    nullOr
+    functionTo
+    coercedTo
+    either
    ;
 in
 {
@@ -26,6 +31,38 @@ in
        options.mergedListOf = mkOption {
          type = listOf (listOf types.str);
        };
+        # unique
+        options.unique = mkOption {
+          type = unique { message = ""; } (listOf types.str);
+        };
+        options.mergedUnique = mkOption {
+          type = unique { message = ""; } (listOf types.str);
+        };
+        # nullOr
+        options.nullOr = mkOption {
+          type = nullOr (listOf types.str);
+        };
+        options.mergedNullOr = mkOption {
+          type = nullOr (listOf types.str);
+        };
+        # functionTo
+        options.functionTo = mkOption {
+          type = functionTo (listOf types.str);
+        };
+        options.mergedFunctionTo = mkOption {
+          type = functionTo (listOf types.str);
+        };
+        # coercedTo
+        # Note: coercedTo is a non-mergeable option-type
+        options.coercedTo = mkOption {
+          type = coercedTo (listOf types.str) lib.id (listOf types.str);
+        };
+        options.either = mkOption {
+          type = either (listOf types.str) (listOf types.str);
+        };
+        options.mergedEither = mkOption {
+          type = either (listOf types.str) (listOf types.str);
+        };
      }
    )
    # Module B
@@ -38,6 +75,18 @@ in
        options.mergedListOf = mkOption {
          type = listOf (listOf types.str);
        };
+        options.mergedUnique = mkOption {
+          type = unique { message = ""; } (listOf types.str);
+        };
+        options.mergedNullOr = mkOption {
+          type = nullOr (listOf types.str);
+        };
+        options.mergedFunctionTo = mkOption {
+          type = functionTo (listOf types.str);
+        };
+        options.mergedEither = mkOption {
+          type = either (listOf types.str) (listOf types.str);
+        };
      }
    )
  ];
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -75,6 +75,7 @@ let
  # Note that individual attributes can be overriden if needed.
  elemTypeFunctor = name: { elemType, ... }@payload: {
    inherit name payload;
+    wrappedDeprecationMessage = makeWrappedDeprecationMessage payload;
    type    = outer_types.types.${name};
    binOp   = a: b:
      let
@@ -85,10 +86,10 @@ let
          null
        else
          { elemType = merged; };
-    wrappedDeprecationMessage = { loc }: lib.warn ''
-      The deprecated `${lib.optionalString (loc != null) "type."}functor.wrapped` attribute ${lib.optionalString (loc != null) "of the option `${showOption loc}` "}is accessed, use `${lib.optionalString (loc != null) "type."}nestedTypes.elemType` instead.
-    '' payload.elemType;
  };
+  makeWrappedDeprecationMessage = payload: { loc }: lib.warn ''
+    The deprecated `${lib.optionalString (loc != null) "type."}functor.wrapped` attribute ${lib.optionalString (loc != null) "of the option `${showOption loc}` "}is accessed, use `${lib.optionalString (loc != null) "type."}nestedTypes.elemType` instead.
+  '' payload.elemType;


  outer_types =
@@ -853,7 +854,9 @@ rec {
      getSubOptions = type.getSubOptions;
      getSubModules = type.getSubModules;
      substSubModules = m: uniq (type.substSubModules m);
-      functor = (defaultFunctor name) // { wrapped = type; };
+      functor = elemTypeFunctor name { elemType = type; } // {
+        type = payload: types.unique { inherit message; } payload.elemType;
+      };
      nestedTypes.elemType = type;
    };

@@ -873,7 +876,9 @@ rec {
      getSubOptions = elemType.getSubOptions;
      getSubModules = elemType.getSubModules;
      substSubModules = m: nullOr (elemType.substSubModules m);
-      functor = (defaultFunctor name) // { wrapped = elemType; };
+      functor = (elemTypeFunctor name { inherit elemType; }) // {
+        type = payload: types.nullOr payload.elemType;
+      };
      nestedTypes.elemType = elemType;
    };

@@ -892,7 +897,9 @@ rec {
      getSubOptions = prefix: elemType.getSubOptions (prefix ++ [ "<function body>" ]);
      getSubModules = elemType.getSubModules;
      substSubModules = m: functionTo (elemType.substSubModules m);
-      functor = (defaultFunctor "functionTo") // { wrapped = elemType; };
+      functor = (elemTypeFunctor "functionTo" { inherit elemType; }) // {
+        type = payload: types.functionTo payload.elemType;
+      };
      nestedTypes.elemType = elemType;
    };

@@ -1127,13 +1134,13 @@ rec {
               then t2.merge loc defs
          else mergeOneOption loc defs;
      typeMerge = f':
-        let mt1 = t1.typeMerge (elemAt f'.wrapped 0).functor;
-            mt2 = t2.typeMerge (elemAt f'.wrapped 1).functor;
+        let mt1 = t1.typeMerge (elemAt f'.payload.elemType 0).functor;
+            mt2 = t2.typeMerge (elemAt f'.payload.elemType 1).functor;
        in
           if (name == f'.name) && (mt1 != null) && (mt2 != null)
           then functor.type mt1 mt2
           else null;
-      functor = (defaultFunctor name) // { wrapped = [ t1 t2 ]; };
+      functor = elemTypeFunctor name { elemType = [ t1 t2 ]; };
      nestedTypes.left = t1;
      nestedTypes.right = t2;
    };
@@ -1166,7 +1173,9 @@ rec {
        getSubModules = finalType.getSubModules;
        substSubModules = m: coercedTo coercedType coerceFunc (finalType.substSubModules m);
        typeMerge = t: null;
-        functor = (defaultFunctor name) // { wrapped = finalType; };
+        functor = (defaultFunctor name) // {
+          wrappedDeprecationMessage = makeWrappedDeprecationMessage { elemType = finalType; };
+        };
        nestedTypes.coercedType = coercedType;
        nestedTypes.finalType = finalType;
      };
--- a/nixos/modules/services/networking/radicale.nix
+++ b/nixos/modules/services/networking/radicale.nix
@@ -119,6 +119,14 @@ in
          are mutually exclusive.
        '';
      }
+      {
+        assertion = cfg.config != "" || (cfg.settings ? auth && cfg.settings.auth ? type);
+        message = ''
+          Radicale 3.5.0 changed the default value for `auth.type` from `none` to `denyall`.
+          You probably don't want `denyall`, so please set this explicitly.
+          https://github.com/Kozea/Radicale/blob/v3.5.0/CHANGELOG.md
+        '';
+      }
    ];

    warnings =
--- a/nixos/modules/services/web-apps/mobilizon.nix
+++ b/nixos/modules/services/web-apps/mobilizon.nix
@@ -398,6 +398,7 @@ in
    };

    systemd.tmpfiles.rules = [
+      "d /var/lib/mobilizon/sitemap 700 mobilizon mobilizon - -"
      "d /var/lib/mobilizon/uploads/exports/csv 700 mobilizon mobilizon - -"
      "Z /var/lib/mobilizon 700 mobilizon mobilizon - -"
    ];
--- a/nixos/modules/services/web-apps/wakapi.nix
+++ b/nixos/modules/services/web-apps/wakapi.nix
@@ -159,18 +159,25 @@ in
        Group = config.users.users.wakapi.group;

        DynamicUser = true;
+        PrivateTmp = true;
+        PrivateUsers = true;
+        PrivateDevices = true;
        ProtectHome = true;
        ProtectHostname = true;
+        ProtectClock = true;
        ProtectKernelLogs = true;
        ProtectKernelModules = true;
        ProtectKernelTunables = true;
+        ProtectControlGroups = true;
+        NoNewPrivileges = true;
        ProtectProc = "invisible";
-        ProtectSystem = "strict";
+        ProtectSystem = "full";
        RestrictAddressFamilies = [
          "AF_INET"
          "AF_INET6"
          "AF_UNIX"
        ];
+        CapabilityBoundingSet = "CAP_NET_BIND_SERVICE";
        RestrictNamespaces = true;
        RestrictRealtime = true;
        RestrictSUIDSGID = true;
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1282,6 +1282,7 @@ in {
  victoriametrics = handleTest ./victoriametrics {};
  vikunja = handleTest ./vikunja.nix {};
  virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {};
+  vm-variant = handleTest ./vm-variant.nix {};
  vscode-remote-ssh = handleTestOn ["x86_64-linux"] ./vscode-remote-ssh.nix {};
  vscodium = discoverTests (import ./vscodium.nix);
  vsftpd = handleTest ./vsftpd.nix {};
--- a/nixos/tests/vm-variant.nix
+++ b/nixos/tests/vm-variant.nix
@@ -0,0 +1,31 @@
+{
+  pkgs,
+  ...
+}:
+let
+  evalConfig = import ../lib/eval-config.nix;
+
+  nixos = evalConfig {
+    modules = [
+      {
+        system.stateVersion = "25.05";
+        fileSystems."/".device = "/dev/null";
+        boot.loader.grub.device = "nodev";
+        nixpkgs.hostPlatform = pkgs.system;
+        virtualisation.vmVariant.networking.hostName = "vm";
+        virtualisation.vmVariantWithBootLoader.networking.hostName = "vm-w-bl";
+      }
+    ];
+  };
+in
+assert nixos.config.virtualisation.vmVariant.networking.hostName == "vm";
+assert nixos.config.virtualisation.vmVariantWithBootLoader.networking.hostName == "vm-w-bl";
+assert nixos.config.networking.hostName == "nixos";
+pkgs.symlinkJoin {
+  name = "nixos-test-vm-variant-drvs";
+  paths = with nixos.config.system.build; [
+    toplevel
+    vm
+    vmWithBootLoader
+  ];
+}
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@@ -303,12 +303,12 @@
  };
  commonlisp = buildGrammar {
    language = "commonlisp";
-    version = "0.0.0+rev=bf2a65b";
+    version = "0.0.0+rev=3232350";
    src = fetchFromGitHub {
      owner = "theHamsta";
      repo = "tree-sitter-commonlisp";
-      rev = "bf2a65b1c119898a1a17389e07f2a399c05cdc0c";
-      hash = "sha256-dCrHrNfJoHfOt3sS2fUqbrw4snHMu+MoPumLYTGfoho=";
+      rev = "32323509b3d9fe96607d151c2da2c9009eb13a2f";
+      hash = "sha256-cNGxZXoxhnXGo4yhMHDSjF/j43JNXg1ClpqN2xJgLQU=";
    };
    meta.homepage = "https://github.com/theHamsta/tree-sitter-commonlisp";
  };
@@ -381,12 +381,12 @@
  };
  cuda = buildGrammar {
    language = "cuda";
-    version = "0.0.0+rev=757e0a6";
+    version = "0.0.0+rev=014628a";
    src = fetchFromGitHub {
      owner = "theHamsta";
      repo = "tree-sitter-cuda";
-      rev = "757e0a61f9d38b3d9eaa299e8d866e8283ffc284";
-      hash = "sha256-66tJ1GVAWKqXBCzBXUGdzG/Rl2vw/eJ6mQnWnnnpBcU=";
+      rev = "014628ae8d2df391b88ddb9fa0260fd97f770829";
+      hash = "sha256-zlG7/ERVZFLRBqu7q/wjcYG+iBlDY7s/SwKyqzIA0OM=";
    };
    meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda";
  };
@@ -535,12 +535,12 @@
  };
  dtd = buildGrammar {
    language = "dtd";
-    version = "0.0.0+rev=2128a0b";
+    version = "0.0.0+rev=0d9a809";
    src = fetchFromGitHub {
      owner = "tree-sitter-grammars";
      repo = "tree-sitter-xml";
-      rev = "2128a0b249263e238d88cb894dad00c3168fea37";
-      hash = "sha256-qGMRslGqMEZpTMHmmB0sOWNHzpOBJgVhX+oPnphLxUc=";
+      rev = "0d9a8099c963ed53e183425c1b47fa2622c8eaf7";
+      hash = "sha256-0kqCDLCxsvrqu5pKrDZDJt9lSlxU6fzM/CxrWb/oodw=";
    };
    location = "dtd";
    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml";
@@ -768,12 +768,12 @@
  };
  fortran = buildGrammar {
    language = "fortran";
-    version = "0.0.0+rev=21b7408";
+    version = "0.0.0+rev=64e1100";
    src = fetchFromGitHub {
      owner = "stadelmanma";
      repo = "tree-sitter-fortran";
-      rev = "21b740801794b6570a0380f8aef22bb67214ea65";
-      hash = "sha256-/PEl7Cl/SIbwEo88gFppPCBjBU/dfovN5J7PXNu7CBw=";
+      rev = "64e11001d7ef3e8ac18e55a3a2d811fe36430923";
+      hash = "sha256-6l+cfLVbs8geKIYhnfuZDac8uzmNHOZf2rFANdl4tDs=";
    };
    meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran";
  };
@@ -945,34 +945,34 @@
  };
  glimmer_javascript = buildGrammar {
    language = "glimmer_javascript";
-    version = "0.0.0+rev=7e8ea8c";
+    version = "0.0.0+rev=4801ac4";
    src = fetchFromGitHub {
      owner = "NullVoxPopuli";
      repo = "tree-sitter-glimmer-javascript";
-      rev = "7e8ea8cf39fc360cb97bd253442cd48e4f7a9ce3";
-      hash = "sha256-gqadIB5tB7aIOl3g6pxDeOsuENAwzb5RLVFn4d0G9MY=";
+      rev = "4801ac4d0a611502001035f45d1cba5cb57d272f";
+      hash = "sha256-wK8buxg2Yil6eS4u+m/iursdx9GHcj6CTCRz1nhdCNs=";
    };
    meta.homepage = "https://github.com/NullVoxPopuli/tree-sitter-glimmer-javascript";
  };
  glimmer_typescript = buildGrammar {
    language = "glimmer_typescript";
-    version = "0.0.0+rev=4006128";
+    version = "0.0.0+rev=c011b05";
    src = fetchFromGitHub {
      owner = "NullVoxPopuli";
      repo = "tree-sitter-glimmer-typescript";
-      rev = "4006128790efb58ca82a4492d8ef0983b260fc6a";
-      hash = "sha256-oOF36q09hcOCdFWrFQlhDX79tS9xBNVgcp1vmxjRdGM=";
+      rev = "c011b053626f27a0fe5cc99eeae4185399a572f9";
+      hash = "sha256-vRxR86NmIVv5iO1C5xb/n8k3qaILaUnnWne5Hnszgyk=";
    };
    meta.homepage = "https://github.com/NullVoxPopuli/tree-sitter-glimmer-typescript";
  };
  glsl = buildGrammar {
    language = "glsl";
-    version = "0.0.0+rev=66aec57";
+    version = "0.0.0+rev=24a6c8e";
    src = fetchFromGitHub {
      owner = "theHamsta";
      repo = "tree-sitter-glsl";
-      rev = "66aec57f7119c7e8e40665b723cd7af5594f15ee";
-      hash = "sha256-EO8p3BhoyemCXlWq4BI5Y1KqU04F9KpEwbn8HoZd4z4=";
+      rev = "24a6c8ef698e4480fecf8340d771fbcb5de8fbb4";
+      hash = "sha256-TjF79WH3bX4nueYr8CbPptkNb2lNkHQNB0VZoMB35Nk=";
    };
    meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl";
  };
@@ -1809,12 +1809,12 @@
  };
  meson = buildGrammar {
    language = "meson";
-    version = "0.0.0+rev=03fd221";
+    version = "0.0.0+rev=9c74e8e";
    src = fetchFromGitHub {
      owner = "Decodetalkers";
      repo = "tree-sitter-meson";
-      rev = "03fd2216bc52976c9b92ca64b5ec2e1f06408f7e";
-      hash = "sha256-EhpqSS0R8aCqUnmDHtmfwzyMZMsqkGC/6U3zJpjuVAc=";
+      rev = "9c74e8e8917b83d90e38ac040949079437ec0043";
+      hash = "sha256-uxJfDIsqTROc5YSZkVwr2zZEcpqt3IEdGVkzwp59gnI=";
    };
    meta.homepage = "https://github.com/Decodetalkers/tree-sitter-meson";
  };
@@ -1999,12 +1999,12 @@
  };
  ocamllex = buildGrammar {
    language = "ocamllex";
-    version = "0.0.0+rev=5da5bb7";
+    version = "0.0.0+rev=c5cf996";
    src = fetchFromGitHub {
      owner = "atom-ocaml";
      repo = "tree-sitter-ocamllex";
-      rev = "5da5bb7508ac9fd3317561670ef18c126a0fe2aa";
-      hash = "sha256-qfmIfcZ3zktYzuNNYP7Z6u6c7XoKsKD86MRMxe/qkpY=";
+      rev = "c5cf996c23e38a1537069fbe2d4bb83a75fc7b2f";
+      hash = "sha256-eDJRTLYKHcL7yAgFL8vZQh9zp5fBxcZRsWChp8y3Am0=";
    };
    generate = true;
    meta.homepage = "https://github.com/atom-ocaml/tree-sitter-ocamllex";
@@ -2156,12 +2156,12 @@
  };
  powershell = buildGrammar {
    language = "powershell";
-    version = "0.0.0+rev=e904962";
+    version = "0.0.0+rev=66d5e61";
    src = fetchFromGitHub {
      owner = "airbus-cert";
      repo = "tree-sitter-powershell";
-      rev = "e904962e25858b7e8e19c653e737ad3b7d1c55bd";
-      hash = "sha256-RlzGW09DE6gLM1G+y57gkEDPzMHc5Vi1jTHROUxMOt8=";
+      rev = "66d5e61126989c0aca57ff77d19b2064919b51e1";
+      hash = "sha256-M2vOS2UleHpZC8PbUf+PHxjWz4BMBhyVxcuUsuMx34Q=";
    };
    meta.homepage = "https://github.com/airbus-cert/tree-sitter-powershell";
  };
@@ -2357,12 +2357,12 @@
  };
  query = buildGrammar {
    language = "query";
-    version = "0.0.0+rev=0555ac0";
+    version = "0.0.0+rev=930202c";
    src = fetchFromGitHub {
      owner = "nvim-treesitter";
      repo = "tree-sitter-query";
-      rev = "0555ac0da902abff06076e40501102cee3ba68bd";
-      hash = "sha256-2JxX4KntUP/DvoCik0NYzfrU/qzs43uDwy21JkU8Hjc=";
+      rev = "930202c2a80965a7a9ca018b5b2a08b25dfa7f12";
+      hash = "sha256-uXApakOZy9Gd/fl9C9qFZgptlT6rUlOmT6KW8sWP5Ag=";
    };
    meta.homepage = "https://github.com/nvim-treesitter/tree-sitter-query";
  };
@@ -2599,12 +2599,12 @@
  };
  scala = buildGrammar {
    language = "scala";
-    version = "0.0.0+rev=ed939ed";
+    version = "0.0.0+rev=041dea1";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-scala";
-      rev = "ed939ed550ebff7d4ad8aafb4d5aad44de69965d";
-      hash = "sha256-OR0GIC7bDOkUZZvbvd1XdyOdYnjUAXhbYnOhNddH8wU=";
+      rev = "041dea1ca8b25f20fa564854922ac6a99c050ec6";
+      hash = "sha256-hK4/FeB11H2x1c2rbYH2IoejgDSyrvlnObgeN3TVASU=";
    };
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala";
  };
@@ -2856,12 +2856,12 @@
  };
  superhtml = buildGrammar {
    language = "superhtml";
-    version = "0.0.0+rev=91d9284";
+    version = "0.0.0+rev=fc7c594";
    src = fetchFromGitHub {
      owner = "kristoff-it";
      repo = "superhtml";
-      rev = "91d92846e8baaafc8854d2b9d0ac436bc16234db";
-      hash = "sha256-vBquZJOfE4HBsUKIG3o/Wo9s6wMSJ8U77u7e8n2Gc0M=";
+      rev = "fc7c594f52528e4a4a08671137850143d55a5bf2";
+      hash = "sha256-SEaefbbQFd+Viks55eijUT3YHaEZJMvmZcXm3V6R05I=";
    };
    location = "tree-sitter-superhtml";
    meta.homepage = "https://github.com/kristoff-it/superhtml";
@@ -2901,12 +2901,12 @@
  };
  swift = buildGrammar {
    language = "swift";
-    version = "0.0.0+rev=02db52e";
+    version = "0.0.0+rev=6b1ebb8";
    src = fetchFromGitHub {
      owner = "alex-pinkus";
      repo = "tree-sitter-swift";
-      rev = "02db52e14bc303322d22019fff7823d72904dfe5";
-      hash = "sha256-Uh1YVc871KdYXeAhF/lRDv58NW/XdHqasfZw0jDUSBE=";
+      rev = "6b1ebb86c97fca00835e7fce4a95c5069172145e";
+      hash = "sha256-VR6GmMWueFa/4PXRtnTNWeI0N19vD1qd5XBM+e9HalM=";
    };
    generate = true;
    meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift";
@@ -3327,12 +3327,12 @@
  };
  vimdoc = buildGrammar {
    language = "vimdoc";
-    version = "0.0.0+rev=d2e4b5c";
+    version = "0.0.0+rev=2694c3d";
    src = fetchFromGitHub {
      owner = "neovim";
      repo = "tree-sitter-vimdoc";
-      rev = "d2e4b5c172a109966c2ce0378f73df6cede39400";
-      hash = "sha256-Vrl4/cZL+TWlUMEeWZoHCAWhvlefcl3ajGcwyTNKOhI=";
+      rev = "2694c3d27e2ca98a0ccde72f33887394300d524e";
+      hash = "sha256-DAHOhNqd9DQ9KNkJdjbUmSV6qhTOmPrIaC/7rBNCqzY=";
    };
    meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc";
  };
@@ -3415,12 +3415,12 @@
  };
  xml = buildGrammar {
    language = "xml";
-    version = "0.0.0+rev=2128a0b";
+    version = "0.0.0+rev=0d9a809";
    src = fetchFromGitHub {
      owner = "tree-sitter-grammars";
      repo = "tree-sitter-xml";
-      rev = "2128a0b249263e238d88cb894dad00c3168fea37";
-      hash = "sha256-qGMRslGqMEZpTMHmmB0sOWNHzpOBJgVhX+oPnphLxUc=";
+      rev = "0d9a8099c963ed53e183425c1b47fa2622c8eaf7";
+      hash = "sha256-0kqCDLCxsvrqu5pKrDZDJt9lSlxU6fzM/CxrWb/oodw=";
    };
    location = "xml";
    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml";
@@ -3493,24 +3493,24 @@
  };
  ziggy = buildGrammar {
    language = "ziggy";
-    version = "0.0.0+rev=00958fa";
+    version = "0.0.0+rev=8a29017";
    src = fetchFromGitHub {
      owner = "kristoff-it";
      repo = "ziggy";
-      rev = "00958faeaeb97d9b7beb76f128a5401441182204";
-      hash = "sha256-G1Wo3Az5qQdSQU5OXE5GaahgXFjuj43o3UfmUXjjSF4=";
+      rev = "8a29017169f43dc2c3526817e98142eb9a335087";
+      hash = "sha256-w4qq/SBlRQw3r9iIZ2RY3infa/ysopOQX5QDS7+8kt8=";
    };
    location = "tree-sitter-ziggy";
    meta.homepage = "https://github.com/kristoff-it/ziggy";
  };
  ziggy_schema = buildGrammar {
    language = "ziggy_schema";
-    version = "0.0.0+rev=00958fa";
+    version = "0.0.0+rev=8a29017";
    src = fetchFromGitHub {
      owner = "kristoff-it";
      repo = "ziggy";
-      rev = "00958faeaeb97d9b7beb76f128a5401441182204";
-      hash = "sha256-G1Wo3Az5qQdSQU5OXE5GaahgXFjuj43o3UfmUXjjSF4=";
+      rev = "8a29017169f43dc2c3526817e98142eb9a335087";
+      hash = "sha256-w4qq/SBlRQw3r9iIZ2RY3infa/ysopOQX5QDS7+8kt8=";
    };
    location = "tree-sitter-ziggy-schema";
    meta.homepage = "https://github.com/kristoff-it/ziggy";
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -1161,9 +1161,9 @@ in
  };

  flutter-tools-nvim = super.flutter-tools-nvim.overrideAttrs {
+    # Optional dap integration
+    checkInputs = [ self.nvim-dap ];
    dependencies = [ self.plenary-nvim ];
-    # Optional nvim-dap module
-    nvimSkipModule = "flutter-tools.dap";
  };

  follow-md-links-nvim = super.follow-md-links-nvim.overrideAttrs {
@@ -2382,6 +2382,11 @@ in
    dependencies = [ self.nvim-treesitter ];
  };

+  nvim-highlight-colors = super.nvim-highlight-colors.overrideAttrs {
+    # Test module
+    nvimSkipModule = [ "nvim-highlight-colors.color.converters_spec" ];
+  };
+
  nvim-java = super.nvim-java.overrideAttrs {
    dependencies = with self; [
      lua-async
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -494,6 +494,7 @@ https://github.com/GCBallesteros/jupytext.nvim/,HEAD,
 https://github.com/rebelot/kanagawa.nvim/,,
 https://github.com/imsnif/kdl.vim/,HEAD,
 https://github.com/anuvyklack/keymap-layer.nvim/,HEAD,
+https://github.com/mikesmithgh/kitty-scrollback.nvim/,HEAD,
 https://github.com/kmonad/kmonad-vim/,,
 https://github.com/frabjous/knap/,HEAD,
 https://github.com/b3nj5m1n/kommentary/,,
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,9 +1,9 @@
 {
  "chromium": {
-    "version": "134.0.6998.88",
+    "version": "134.0.6998.117",
    "chromedriver": {
-      "hash_darwin": "sha256-UtXlvBUnMZpCXT/xI7l4nfv3EgJZgugP1/fVg4rKgk4=",
-      "hash_darwin_aarch64": "sha256-yWRVP5LaEEhHfKkV0UmC7cpEuSnU5sgL3C/Aa2Ri3sc="
+      "hash_darwin": "sha256-/o95v3X6mot2yReOEazoCNvfhuDm6xy/O1ksb0blWzU=",
+      "hash_darwin_aarch64": "sha256-9CFDVWt/UPg1mgP1lc7uVrzNV6Eiy8Ze/svoJNmT8Mw="
    },
    "deps": {
      "depot_tools": {
@@ -19,8 +19,8 @@
    "DEPS": {
      "src": {
        "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "7e3d5c978c6d3a6eda25692cfac7f893a2b20dd0",
-        "hash": "sha256-4RRB7uYI3I7c1dSypU2gzF9TCA2MJ7yStKEvm6vfSnE=",
+        "rev": "cbb247b860ca6b9b18dfa791157e274eab8cad6e",
+        "hash": "sha256-StWP7bsmD5Byn9uLZz6mo/OTChUsW1Y0RhxuofsPLbY=",
        "recompress": true
      },
      "src/third_party/clang-format/script": {
@@ -615,8 +615,8 @@
      },
      "src/third_party/skia": {
        "url": "https://skia.googlesource.com/skia.git",
-        "rev": "fb519f2fe5d4409bc0033a4ae00ab9a7095fe566",
-        "hash": "sha256-Y0KtUKn6DxpxVLRM+jPvUPhPzekTAma1HYs27xlJlkw="
+        "rev": "aefbd9403c1b3032ad4cd0281ef312ed262c7125",
+        "hash": "sha256-tP6DnMeOoVqfTSn6bYXMLiCb4wg5f9uB28KzYMAeBUw="
      },
      "src/third_party/smhasher/src": {
        "url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -780,8 +780,8 @@
      },
      "src/v8": {
        "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "a57459aad9ec3ed5f78d9ded700d52e31029efd2",
-        "hash": "sha256-IE1X6lfMyoXsN+7ebJ3RWXAgpR98AjituL3faQbNag0="
+        "rev": "4f282ae4acae85cdcc8c167cbc296a86d24c1cf6",
+        "hash": "sha256-wpz9W/ZurpCT/dGIHGpmdkI3dsXbP8TPNeee2w9zBU8="
      }
    }
  },
--- a/pkgs/applications/video/mpc-qt/default.nix
+++ b/pkgs/applications/video/mpc-qt/default.nix
@@ -13,13 +13,13 @@

 stdenv.mkDerivation rec {
  pname = "mpc-qt";
-  version = "24.06";
+  version = "24.12.1-flatpak";

  src = fetchFromGitHub {
    owner = "mpc-qt";
    repo = "mpc-qt";
    rev = "v${version}";
-    hash = "sha256-kEG7B99io3BGjN94nEX1pN10Bcjj21rb46Vcn2OtpN8=";
+    hash = "sha256-gn94kVs3Lbd+ggj4jTacHpmnVO2lH/QDhFk+hJC1N/c=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/am/amtterm/package.nix
+++ b/pkgs/by-name/am/amtterm/package.nix
@@ -3,10 +3,13 @@
  lib,
  stdenv,
  makeWrapper,
+  gtk3,
  openssl,
  perl,
  perlPackages,
  pkg-config,
+  vte,
+  withGamt ? false,
 }:

 stdenv.mkDerivation (finalAttrs: {
@@ -18,7 +21,12 @@ stdenv.mkDerivation (finalAttrs: {
      perl
      SOAPLite
    ])
-    ++ [ openssl ];
+    ++ [ openssl ]
+
+    ++ lib.optionals withGamt [
+      gtk3
+      vte
+    ];
  nativeBuildInputs = [
    makeWrapper
    pkg-config
--- a/pkgs/by-name/co/comet-gog/package.nix
+++ b/pkgs/by-name/co/comet-gog/package.nix
@@ -7,18 +7,18 @@

 rustPlatform.buildRustPackage rec {
  pname = "comet-gog";
-  version = "0.2.0";
+  version = "0.3.0";

  src = fetchFromGitHub {
    owner = "imLinguin";
    repo = "comet";
    tag = "v${version}";
-    hash = "sha256-LAEt2i/SRABrz+y2CTMudrugifLgHNxkMSdC8PXYF0E=";
+    hash = "sha256-oJSP/zqr4Jp09Rh15a3o1GWsTA0y22+Zu2mU0HXHLHY=";
    fetchSubmodules = true;
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-SvDE+QqaSK0+4XgB3bdmqOtwxBDTlf7yckTR8XjmMXc=";
+  cargoHash = "sha256-VY9+5QUJYYifLokf69laapCCBRYFo1BOd6kQpxO2wkc=";

  # error: linker `aarch64-linux-gnu-gcc` not found
  postPatch = ''
--- a/pkgs/by-name/do/dotnet-repl/package.nix
+++ b/pkgs/by-name/do/dotnet-repl/package.nix
@@ -6,12 +6,12 @@

 buildDotnetGlobalTool {
  pname = "dotnet-repl";
-  version = "0.3.230";
+  version = "0.3.239";

  dotnet-sdk = dotnetCorePackages.sdk_9_0;
  dotnet-runtime = dotnetCorePackages.runtime_9_0;

-  nugetHash = "sha256-FtITkDZ0Qbjo0XvQ8psRlIsbEZhMjIhk8mVrHmUxlIg=";
+  nugetHash = "sha256-wn4i0zC56gxnjsgjdiMxLinmUsSROhmimu0lmBZo1hA=";

  meta = {
    description = "A polyglot REPL built on .NET Interactive";
--- a/pkgs/by-name/fa/fastfetch/package.nix
+++ b/pkgs/by-name/fa/fastfetch/package.nix
@@ -45,13 +45,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "fastfetch";
-  version = "2.38.0";
+  version = "2.39.0";

  src = fetchFromGitHub {
    owner = "fastfetch-cli";
    repo = "fastfetch";
    tag = finalAttrs.version;
-    hash = "sha256-9ph6Zp1x/MP0apB39L+HFUCl7qQ9UfIU89/78+qy6Vc=";
+    hash = "sha256-2XuODYi3kC9d1rO1LFAdixS7SrrjTOgj+Tm3waMGa+M=";
  };

  outputs = [
--- a/pkgs/by-name/gd/gdmap/package.nix
+++ b/pkgs/by-name/gd/gdmap/package.nix
@@ -13,13 +13,13 @@

 stdenv.mkDerivation {
  pname = "gdmap";
-  version = "1.2.0";
+  version = "1.3.1";

  src = fetchFromGitLab {
    owner = "sjohannes";
    repo = "gdmap";
-    tag = "v1.2.0";
-    sha256 = "1p96pps4yflj6a42g61pcqpllx7vcjlh417kwjy0b4mqp16vmrzr";
+    tag = "v1.3.1";
+    sha256 = "sha256-dgZ+EDk7O+nuqrBsTPVW7BHufvkqLnWbXrIOOn7YlW4=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/gi/ginkgo/package.nix
+++ b/pkgs/by-name/gi/ginkgo/package.nix
@@ -8,13 +8,13 @@

 buildGoModule rec {
  pname = "ginkgo";
-  version = "2.23.0";
+  version = "2.23.1";

  src = fetchFromGitHub {
    owner = "onsi";
    repo = "ginkgo";
    rev = "v${version}";
-    sha256 = "sha256-ku3pB9LLlDjwEEzJEVgCK+ar+L+beyMrjDtASfBWqLM=";
+    sha256 = "sha256-yQnkKh5RXzUIff4gSKDo79GZuRvjkT1vK0IUbvKdVjk=";
  };
  vendorHash = "sha256-uqpib3k5PtQOsndic0GV1rYBeVlY5Tpg931yHfU6dWI=";

--- a/pkgs/by-name/la/latexminted/package.nix
+++ b/pkgs/by-name/la/latexminted/package.nix
@@ -8,12 +8,12 @@

 python3Packages.buildPythonApplication rec {
  pname = "latexminted";
-  version = "0.4.0";
+  version = "0.5.0";
  pyproject = true;

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-JI44VGAuSDDUBm7hH6huYdzXeMU2q1ZCixwJNTxBHHo=";
+    hash = "sha256-sQiIVAmqZBSyryBIvafsVTUVuXbfJJfpNwxD8slGJQA=";
  };

  build-system = with python3Packages; [
--- a/pkgs/by-name/li/libgedit-gtksourceview/package.nix
+++ b/pkgs/by-name/li/libgedit-gtksourceview/package.nix
@@ -16,7 +16,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "libgedit-gtksourceview";
-  version = "299.4.0";
+  version = "299.5.0";

  outputs = [ "out" "dev" "devdoc" ];

@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "gedit";
    repo = "libgedit-gtksourceview";
    rev = finalAttrs.version;
-    hash = "sha256-befm5UIXh2aCpKN2NH0aJhCYLf9j/ug0kVDAD5xNt4k=";
+    hash = "sha256-3HnlYLa1Zy1GRpX5fjEoXUzfB9X6nydpVjZTzJyhvIs=";
  };

  patches = [
--- a/pkgs/by-name/lo/lon/package.nix
+++ b/pkgs/by-name/lo/lon/package.nix
@@ -0,0 +1,30 @@
+{
+  rustPlatform,
+  lib,
+  fetchFromGitHub,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "lon";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "nikstur";
+    repo = "lon";
+    tag = version;
+    hash = "sha256-VGvK0ahBl440NMs03WqmP7T4a1DP13yfX47YI84rlGU=";
+  };
+
+  sourceRoot = "source/rust/lon";
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-YzQ6A1dH2D56/3inAmsE6G5rCnpWhDawxk6+FMWfhkc=";
+
+  meta = {
+    description = "Lock & update Nix dependencies";
+    homepage = "https://github.com/nikstur/lon";
+    maintainers = with lib.maintainers; [ ma27 ];
+    license = lib.licenses.mit;
+    mainProgram = "lon";
+  };
+}
--- a/pkgs/by-name/me/melonDS/package.nix
+++ b/pkgs/by-name/me/melonDS/package.nix
@@ -27,13 +27,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "melonDS";
-  version = "1.0rc-unstable-2025-02-21";
+  version = "1.0rc-unstable-2025-03-09";

  src = fetchFromGitHub {
    owner = "melonDS-emu";
    repo = "melonDS";
-    rev = "63b468927e1c744e21057ccb4c5677f52502b442";
-    hash = "sha256-LylUfcgYC3CZTycfq/qqEAZ4ajrj90bUSXAkA9SbMqE=";
+    rev = "0fcf1f6e3a443cb249f85d948ff6e58dc58501d6";
+    hash = "sha256-llRmW596UHs/q/DjqG8qQ1RqjvmGMsOO1IUkpjPW4h4=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/mi/mieru/package.nix
+++ b/pkgs/by-name/mi/mieru/package.nix
@@ -6,13 +6,13 @@

 buildGoModule rec {
  pname = "mieru";
-  version = "3.12.0";
+  version = "3.13.0";

  src = fetchFromGitHub {
    owner = "enfein";
    repo = "mieru";
    rev = "v${version}";
-    hash = "sha256-F7YawlcIH/V+qudXjfFKIrVNjds+fhw6BdlCe2VDdUc=";
+    hash = "sha256-Hy5Uy6lC3d8N2lsnGLrcN/D5/eiycp7X7h6V8vo3tPA=";
  };

  vendorHash = "sha256-pKcdvP38fZ2KFYNDx6I4TfmnnvWKzFDvz80xMkUojqM=";
--- a/pkgs/by-name/ng/ngn-k/package.nix
+++ b/pkgs/by-name/ng/ngn-k/package.nix
@@ -1,6 +1,5 @@
 { lib
 , stdenv
-, stdenvNoLibs
 , fetchFromGitea
 , runtimeShell
 }:
--- a/pkgs/by-name/pm/pmix/package.nix
+++ b/pkgs/by-name/pm/pmix/package.nix
@@ -21,13 +21,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "pmix";
-  version = "5.0.6";
+  version = "5.0.7";

  src = fetchFromGitHub {
    repo = "openpmix";
    owner = "openpmix";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-uzsUqf4ZmXmz3vTtD01RkILPxrtCiQ5RMyZ57KAKG1U=";
+    hash = "sha256-qj/exBi1siCHY1QqNY+ad6n3XI4JZuwnM93Vp+rj1AQ=";
    fetchSubmodules = true;
  };

--- a/pkgs/by-name/pr/prrte/package.nix
+++ b/pkgs/by-name/pr/prrte/package.nix
@@ -18,13 +18,13 @@

 stdenv.mkDerivation rec {
  pname = "prrte";
-  version = "3.0.8";
+  version = "3.0.9";

  src = fetchFromGitHub {
    owner = "openpmix";
    repo = "prrte";
    rev = "v${version}";
-    hash = "sha256-4Xc6We0mXpKCwfHlmqi+WbFjdQegWHGzWrEnMVqkqtU=";
+    hash = "sha256-wLM+txjngY5gh/+yiaSKrenG6oIzF2dPgMumIGyCsXU=";
    fetchSubmodules = true;
  };

--- a/pkgs/by-name/ri/river/build.zig.zon.nix
+++ b/pkgs/by-name/ri/river/build.zig.zon.nix
@@ -16,15 +16,11 @@ with lib;
 let
  unpackZigArtifact =
    { name, artifact }:
-    runCommandLocal name
-      {
-        nativeBuildInputs = [ zig ];
-      }
-      ''
-        hash="$(zig fetch --global-cache-dir "$TMPDIR" ${artifact})"
-        mv "$TMPDIR/p/$hash" "$out"
-        chmod 755 "$out"
-      '';
+    runCommandLocal name { nativeBuildInputs = [ zig ]; } ''
+      hash="$(zig fetch --global-cache-dir "$TMPDIR" ${artifact})"
+      mv "$TMPDIR/p/$hash" "$out"
+      chmod 755 "$out"
+    '';

  fetchZig =
    {
@@ -42,13 +38,12 @@ let
      name,
      url,
      hash,
+      rev ? throw "rev is required, remove and regenerate the zon2json-lock file",
    }:
    let
      parts = splitString "#" url;
      url_base = elemAt parts 0;
      url_without_query = elemAt (splitString "?" url_base) 0;
-      rev_base = elemAt parts 1;
-      rev = if match "^[a-fA-F0-9]{40}$" rev_base != null then rev_base else "refs/heads/${rev_base}";
    in
    fetchgit {
      inherit name rev hash;
@@ -61,20 +56,25 @@ let
      name,
      url,
      hash,
-    }:
+      ...
+    }@args:
    let
      parts = splitString "://" url;
      proto = elemAt parts 0;
      path = elemAt parts 1;
      fetcher = {
-        "git+http" = fetchGitZig {
-          inherit name hash;
-          url = "http://${path}";
-        };
-        "git+https" = fetchGitZig {
-          inherit name hash;
-          url = "https://${path}";
-        };
+        "git+http" = fetchGitZig (
+          args
+          // {
+            url = "http://${path}";
+          }
+        );
+        "git+https" = fetchGitZig (
+          args
+          // {
+            url = "https://${path}";
+          }
+        );
        http = fetchZig {
          inherit name hash;
          url = "http://${path}";
@@ -89,35 +89,35 @@ let
 in
 linkFarm name [
  {
-    name = "12209db20ce873af176138b76632931def33a10539387cba745db72933c43d274d56";
+    name = "pixman-0.3.0-LClMnz2VAAAs7QSCGwLimV5VUYx0JFnX5xWU6HwtMuDX";
    path = fetchZigArtifact {
-      name = "zig-pixman";
-      url = "https://codeberg.org/ifreund/zig-pixman/archive/v0.2.0.tar.gz";
-      hash = "sha256-CYgFIOR9H5q8UUpFglaixOocCMT6FGpcKQQBUVWpDKQ=";
+      name = "pixman";
+      url = "https://codeberg.org/ifreund/zig-pixman/archive/v0.3.0.tar.gz";
+      hash = "sha256-zX/jQV1NWGhalP3t0wjpmUo38BKCiUDPtgNGHefyxq0=";
    };
  }
  {
-    name = "1220687c8c47a48ba285d26a05600f8700d37fc637e223ced3aa8324f3650bf52242";
+    name = "wayland-0.3.0-lQa1kjPIAQDmhGYpY-zxiRzQJFHQ2VqhJkQLbKKdt5wl";
    path = fetchZigArtifact {
-      name = "zig-wayland";
-      url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.2.0.tar.gz";
-      hash = "sha256-gxzkHLCq2NqX3l4nEly92ARU5dqP1SqnjpGMDgx4TXA=";
+      name = "wayland";
+      url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.3.0.tar.gz";
+      hash = "sha256-xU8IrETSFOKKQQMgwVyRKLwGaek4USaKXg49S9oHSTQ=";
    };
  }
  {
-    name = "122083317b028705b5d27be12976feebf17066a4e51802b3b5e9f970bec580e433e1";
+    name = "wlroots-0.18.2-jmOlchnIAwBq45_cxU1V3OWErxxJjQZlc9PyJfR-l3uk";
    path = fetchZigArtifact {
-      name = "zig-wlroots";
-      url = "https://codeberg.org/ifreund/zig-wlroots/archive/v0.18.1.tar.gz";
-      hash = "sha256-S77/Own9/GjhLCCE/eI56pdpmhlvMVP41WZ27b+Sook=";
+      name = "wlroots";
+      url = "https://codeberg.org/ifreund/zig-wlroots/archive/v0.18.2.tar.gz";
+      hash = "sha256-4/MGFCCgMeN6+oCaj0Z5dsbVo3s88oYk1+q0mMXrj8I=";
    };
  }
  {
-    name = "1220c90b2228d65fd8427a837d31b0add83e9fade1dcfa539bb56fd06f1f8461605f";
+    name = "xkbcommon-0.3.0-VDqIe3K9AQB2fG5ZeRcMC9i7kfrp5m2rWgLrmdNn9azr";
    path = fetchZigArtifact {
-      name = "zig-xkbcommon";
-      url = "https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.2.0.tar.gz";
-      hash = "sha256-f5oEJU5i2qeVN3GBrnQcqzEJCiOT7l4ak7GQ6gw5cH0=";
+      name = "xkbcommon";
+      url = "https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.3.0.tar.gz";
+      hash = "sha256-HhhUI+ayPtlylhTmZ1GrdSLbRIffTg3MeisGN1qs2iM=";
    };
  }
 ]
--- a/pkgs/by-name/ri/river/package.nix
+++ b/pkgs/by-name/ri/river/package.nix
@@ -17,14 +17,14 @@
  wayland-scanner,
  wlroots_0_18,
  xwayland,
-  zig_0_13,
+  zig_0_14,
  withManpages ? true,
  xwaylandSupport ? true,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "river";
-  version = "0.3.7";
+  version = "0.3.9";

  outputs = [ "out" ] ++ lib.optionals withManpages [ "man" ];

@@ -34,18 +34,18 @@ stdenv.mkDerivation (finalAttrs: {
    repo = "river";
    rev = "refs/tags/v${finalAttrs.version}";
    fetchSubmodules = true;
-    hash = "sha256-4ac0LGQtLldHyXJ2GIRMHV+VZfUrRFdBYLiAHX5lWcw=";
+    hash = "sha256-g6qjSkvcA2Ud4W+/NVzYZjiWoWkAuKvuD20KlO/zGhE=";
  };

  deps = callPackage ./build.zig.zon.nix {
-    zig = zig_0_13;
+    zig = zig_0_14;
  };

  nativeBuildInputs = [
    pkg-config
    wayland-scanner
    xwayland
-    zig_0_13.hook
+    zig_0_14.hook
  ] ++ lib.optional withManpages scdoc;

  buildInputs = [
--- a/pkgs/by-name/ru/ruff/package.nix
+++ b/pkgs/by-name/ru/ruff/package.nix
@@ -17,17 +17,17 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "ruff";
-  version = "0.11.0";
+  version = "0.11.1";

  src = fetchFromGitHub {
    owner = "astral-sh";
    repo = "ruff";
    tag = finalAttrs.version;
-    hash = "sha256-/CVpNBOBpvQhz7X80nUHC2x7ZxxCJH8O0WAABJKEriA=";
+    hash = "sha256-uouy47Lzrrht3wBUiQePW7x6QJfpIce9ny/p6HNwCNY=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-t2VRNmuKdl1kgZ5g2BS79PFKhJsxDHwxxuMRDcjt//k=";
+  cargoHash = "sha256-EaMNkliJmeKwxrnlK+aCFGvzbvVIjS0qHc9h9z9m47I=";

  nativeBuildInputs = [ installShellFiles ];

--- a/pkgs/by-name/ti/tidal-hifi/package.nix
+++ b/pkgs/by-name/ti/tidal-hifi/package.nix
@@ -38,11 +38,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "tidal-hifi";
-  version = "5.17.0";
+  version = "5.18.0";

  src = fetchurl {
    url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${finalAttrs.version}/tidal-hifi_${finalAttrs.version}_amd64.deb";
-    sha256 = "sha256-oM0hXimXSrV33tntV+DeYdV0WyyRqioKSm+rL+Oce6Y=";
+    sha256 = "sha256-R5Xw9uIptVPYEZ73TtdWarQNtn8nhAUN+zA5tnzTaCU=";
  };

  nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper wrapGAppsHook3 ];
--- a/pkgs/by-name/tu/turn-rs/package.nix
+++ b/pkgs/by-name/tu/turn-rs/package.nix
@@ -9,17 +9,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "turn-rs";
-  version = "3.3.4";
+  version = "3.4.0";

  src = fetchFromGitHub {
    owner = "mycrl";
    repo = "turn-rs";
    tag = "v${version}";
-    hash = "sha256-GAmer7uSCgHdVVvTafMfAgdvMCp/FUT/quF88VLcWgo=";
+    hash = "sha256-BW5dNPkf/JGrf00BI41rEoZRmqftoz+RMGiP6ECVEec=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-vLx6bvhb/Xq5BzKPOEqfx1BzGeDHx+47okdcW5Pu5YM=";
+  cargoHash = "sha256-wnbovuxh3wc1TU8BYZEOG/8SO9bCUd0eWRC81MtAdqo=";

  # By default, no features are enabled
  # https://github.com/mycrl/turn-rs?tab=readme-ov-file#features-1
--- a/pkgs/by-name/ty/typstyle/package.nix
+++ b/pkgs/by-name/ty/typstyle/package.nix
@@ -6,19 +6,19 @@
  versionCheckHook,
 }:

-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
  pname = "typstyle";
-  version = "0.13.0";
+  version = "0.13.1";

  src = fetchFromGitHub {
    owner = "Enter-tainer";
    repo = "typstyle";
-    tag = "v${version}";
-    hash = "sha256-lrGqNc9SJ6TlTTqiwzVWrHndY/oxY8t3mOfGBMF7vac=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-dYhdrxyyndGhJID0WKwvW6KFQ3ubC917UG9rhDnrAfM=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-V79jKheEms0CBTzt9h7+9/+F+TXSTlp8NGXe5OeFCX4=";
+  cargoHash = "sha256-Eb+qN7hBECESlTElN0uQtOg4uyuaWQw3ikFb8po+ubQ=";

  # Disabling tests requiring network access
  checkFlags = [
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
  nativeInstallCheckInputs = [
    versionCheckHook
  ];
-  versionCheckProgramArg = [ "--version" ];
+  versionCheckProgramArg = "--version";
  doInstallCheck = true;

  passthru = {
@@ -36,11 +36,11 @@ rustPlatform.buildRustPackage rec {
  };

  meta = {
-    changelog = "https://github.com/Enter-tainer/typstyle/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/Enter-tainer/typstyle/blob/v${finalAttrs.version}/CHANGELOG.md";
    description = "Format your typst source code";
    homepage = "https://github.com/Enter-tainer/typstyle";
    license = lib.licenses.asl20;
    mainProgram = "typstyle";
    maintainers = with lib.maintainers; [ drupol ];
  };
-}
+})
--- a/pkgs/by-name/um/umu-launcher-unwrapped/package.nix
+++ b/pkgs/by-name/um/umu-launcher-unwrapped/package.nix
@@ -4,6 +4,7 @@
  fetchFromGitHub,
  hatch,
  lib,
+  nix-update-script,
  python3Packages,
  rustPlatform,
  scdoc,
@@ -13,18 +14,18 @@
 }:
 python3Packages.buildPythonPackage rec {
  pname = "umu-launcher-unwrapped";
-  version = "1.2.5";
+  version = "1.2.6";

  src = fetchFromGitHub {
    owner = "Open-Wine-Components";
    repo = "umu-launcher";
    tag = version;
-    hash = "sha256-bZ6Ywc524NrapkFrwFiWbqmVe1j0hunEH9YKrYQ8R2E=";
+    hash = "sha256-DkfB78XhK9CXgN/OpJZTjwHB7IcLC4h2HM/1JW42ZO0=";
  };

  cargoDeps = rustPlatform.fetchCargoVendor {
    inherit src;
-    hash = "sha256-nU4xZn9NPd7NgexiaNYLdo4BCbH98duZ07XYeUiceP0=";
+    hash = "sha256-JhNErFDJsM20BhgIgJSUBeNzAst8f+s1NzpLfl2m2es=";
  };

  nativeCheckInputs = [
@@ -83,6 +84,8 @@ python3Packages.buildPythonPackage rec {
    "test_parse_args_noopts"
  ];

+  passthru.updateScript = nix-update-script { };
+
  meta = {
    description = "Unified launcher for Windows games on Linux using the Steam Linux Runtime and Tools";
    changelog = "https://github.com/Open-Wine-Components/umu-launcher/releases/tag/${version}";
--- a/pkgs/by-name/va/vacuum-go/package.nix
+++ b/pkgs/by-name/va/vacuum-go/package.nix
@@ -8,14 +8,14 @@

 buildGoModule rec {
  pname = "vacuum-go";
-  version = "0.16.3";
+  version = "0.16.4";

  src = fetchFromGitHub {
    owner = "daveshanley";
    repo = "vacuum";
    # using refs/tags because simple version gives: 'the given path has multiple possibilities' error
    tag = "v${version}";
-    hash = "sha256-wlxEKAP8A8T+rBQ2HqoOdBlkqFBqrIxuuEidPAeUO3E=";
+    hash = "sha256-7nVDKR2H84SW6s97jgShylcc1degLzkjkeldlGBcQ/o=";
  };

  vendorHash = "sha256-1lr1VQU4JHg0PZbjAUmALFZJiYc+HTwrk0E/t/1qXqE=";
--- a/pkgs/by-name/vp/vpl-gpu-rt/package.nix
+++ b/pkgs/by-name/vp/vpl-gpu-rt/package.nix
@@ -9,7 +9,7 @@

 stdenv.mkDerivation rec {
  pname = "vpl-gpu-rt";
-  version = "25.1.3";
+  version = "25.1.4";

  outputs = [ "out" "dev" ];

@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
    owner = "intel";
    repo = "vpl-gpu-rt";
    rev = "intel-onevpl-${version}";
-    hash = "sha256-9ycPPdXEa1bSpVG3mIJc8bq3pNNf0Iie1LGBRpv/Lto=";
+    hash = "sha256-pu9iEAhQE7eHmrjzsyWtIecT79vcZyr5QfPq/Ce3Xxg=";
  };

  nativeBuildInputs = [ cmake pkg-config ];
--- a/pkgs/by-name/wa/wakapi/package.nix
+++ b/pkgs/by-name/wa/wakapi/package.nix
@@ -2,9 +2,11 @@
  lib,
  buildGoModule,
  fetchFromGitHub,
+  nixosTests,
+  nix-update-script,
 }:
 let
-  version = "2.12.3";
+  version = "2.13.1";
 in
 buildGoModule {
  pname = "wakapi";
@@ -14,10 +16,10 @@ buildGoModule {
    owner = "muety";
    repo = "wakapi";
    tag = version;
-    hash = "sha256-kgzxeU5hM9fSidyJEmdTr26/w5OaBk1VdjSztmOgMYs=";
+    hash = "sha256-zasMqEvSqylJWKjS5TKYKmGJnGfCUEOq2UvsVUeizBw=";
  };

-  vendorHash = "sha256-q5o88fwc1S14ZwGyDS9aFtJMfPZ4pmMjffmeXODhajg=";
+  vendorHash = "sha256-b2FOdCXmSgFzdXLnxt/V7+cuESWXVXVRmT53DgLwZYI=";

  # Not a go module required by the project, contains development utilities
  excludedPackages = [ "scripts" ];
@@ -30,6 +32,11 @@ buildGoModule {
    "-w"
  ];

+  passthru = {
+    nixos = nixosTests.wakapi;
+    updateScript = nix-update-script { };
+  };
+
  meta = {
    homepage = "https://wakapi.dev/";
    changelog = "https://github.com/muety/wakapi/releases/tag/${version}";
--- a/pkgs/development/libraries/mesa/common.nix
+++ b/pkgs/development/libraries/mesa/common.nix
@@ -5,14 +5,14 @@
 # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa
 rec {
  pname = "mesa";
-  version = "25.0.1";
+  version = "25.0.2";

  src = fetchFromGitLab {
    domain = "gitlab.freedesktop.org";
    owner = "mesa";
    repo = "mesa";
    rev = "mesa-${version}";
-    hash = "sha256-9D4d7EEdZysvXDRcmpbyt85Lo64sldNRomp6/HUVORo=";
+    hash = "sha256-NW2Xntdpt4Iec3z0E8j+omNRH/46IMYNuyD2MIFMs2M=";
  };

  meta = {
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -6,7 +6,6 @@
 , expat
 , fetchCrate
 , fetchFromGitLab
-, fetchpatch
 , file
 , flex
 , glslang
@@ -142,12 +141,6 @@ in stdenv.mkDerivation {
  patches = [
    ./opencl.patch
    ./system-gbm.patch
-    # Fix graphical corruption in FFXIV
-    # Remove when updating to 25.0.2
-    (fetchpatch {
-      url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/0ec174afd56fe48bcfa071d4b8ed704106f46f91.patch";
-      hash = "sha256-6A9AkCa+DeUO683hlsNTvSWGFJJ+zfqYA2BThaqCEoU=";
-    })
  ];

  postPatch = ''
--- a/pkgs/development/python-modules/equinox/default.nix
+++ b/pkgs/development/python-modules/equinox/default.nix
@@ -56,6 +56,14 @@ buildPythonPackage rec {
    pytestCheckHook
  ];

+  pytestFlagsArray = [
+    # Since jax 0.5.3:
+    # DeprecationWarning: shape requires ndarray or scalar arguments, got <class 'jax._src.api.ShapeDtypeStruct'> at position 0. In a future JAX release this will be an error.
+    # https://github.com/patrick-kidger/equinox/issues/979
+    "-W"
+    "ignore::DeprecationWarning"
+  ];
+
  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
    # SystemError: nanobind::detail::nb_func_error_except(): exception could not be translated!
    "test_filter"
--- a/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix
+++ b/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix
@@ -39,7 +39,7 @@ let
  srcs = {
    "x86_64-linux" = fetchurl {
      url = "https://storage.googleapis.com/jax-releases/cuda12_plugin/jax_cuda12_pjrt-${version}-py3-none-manylinux2014_x86_64.whl";
-      hash = "sha256-05Xe87NP1oSOEVlu8pdaiV0fUG31EuQbH8XS3lIMjlE=";
+      hash = "sha256-xTeDBlaLoMgbIwp3ndMZTJ3RAzmrY2CugJKBCNN+f3U=";
    };
    # "aarch64-linux" = fetchurl {
    #   url = "https://storage.googleapis.com/jax-releases/cuda12_plugin/jax_cuda12_pjrt-${version}-py3-none-manylinux2014_aarch64.whl";
--- a/pkgs/development/python-modules/jax-cuda12-plugin/default.nix
+++ b/pkgs/development/python-modules/jax-cuda12-plugin/default.nix
@@ -40,42 +40,42 @@ let
    "3.10-x86_64-linux" = getSrcFromPypi {
      platform = "manylinux2014_x86_64";
      dist = "cp310";
-      hash = "sha256-ymCGSgWlzqRK51dthHtHeeTeYYUKmhgjg0H8Q6dY1Vs=";
+      hash = "sha256-uiVVln+bbDgci075+wPQW8Vewl7P7lz+RcWs4099QVI=";
    };
    "3.10-aarch64-linux" = getSrcFromPypi {
      platform = "manylinux2014_aarch64";
      dist = "cp310";
-      hash = "sha256-488emSaNinBBPw+sM1krh2nBPckdch+RxYeEa+nYhAM=";
+      hash = "sha256-YXGu0vSzvdX8E3gt4QcsamNPzhNzG3XQywpquPTm5lA=";
    };
    "3.11-x86_64-linux" = getSrcFromPypi {
      platform = "manylinux2014_x86_64";
      dist = "cp311";
-      hash = "sha256-NGVbjq/H2b/sMbB3rBPULgjY7YZV0kFHxa38AVFSaU8=";
+      hash = "sha256-qqcEpe9UdZXQItscHkh4oGdxFkEqk2DBFdZ/9LZOFZY=";
    };
    "3.11-aarch64-linux" = getSrcFromPypi {
      platform = "manylinux2014_aarch64";
      dist = "cp311";
-      hash = "sha256-ik8Mje8QnXb1uqwbKuRpCURFzS1/vYxZf83WI+sC/1Q=";
+      hash = "sha256-KY0tdo8QKbdKCx0BJw5Uk0nSw33Adlh5ZULNqWfre9M=";
    };
    "3.12-x86_64-linux" = getSrcFromPypi {
      platform = "manylinux2014_x86_64";
      dist = "cp312";
-      hash = "sha256-Fp22Rbr+whOO2YOvjxTk0RqElyivpXIC55qRBNmJLxY=";
+      hash = "sha256-IDDPEgjOTqcO5WysYd3SOfl5hpX8Obt3OcUKJdbp2kQ=";
    };
    "3.12-aarch64-linux" = getSrcFromPypi {
      platform = "manylinux2014_aarch64";
      dist = "cp312";
-      hash = "sha256-wqhtVj3AR5rLTHmuz/vuwYn6vY6XAP4/cxvwOV4dbBE=";
+      hash = "sha256-wlF6fCGG+HCIlGluJs+W69YLeHnOyjmLLEarso0slsg=";
    };
    "3.13-x86_64-linux" = getSrcFromPypi {
      platform = "manylinux2014_x86_64";
      dist = "cp313";
-      hash = "sha256-J0kTjLGHMZBoa7FPMxBIskwXjwXkdIo9L/fSA2c1rT0=";
+      hash = "sha256-GGJZWyttgVZ50R4OiJ5SMYXuVKRtRuAiaJ9w/EVU3ZE=";
    };
    "3.13-aarch64-linux" = getSrcFromPypi {
      platform = "manylinux2014_aarch64";
      dist = "cp313";
-      hash = "sha256-C7aXl3+NbGOS9WLDQF6D68xvXLfCCBQFCE9tXPoJ4yo=";
+      hash = "sha256-If7BtWyYeD6gVpt0elZ1Hx+f8hh7SKzBHHANO/xeGjE=";
    };
  };
 in
--- a/pkgs/development/python-modules/jax/default.nix
+++ b/pkgs/development/python-modules/jax/default.nix
@@ -40,7 +40,7 @@ let
 in
 buildPythonPackage rec {
  pname = "jax";
-  version = "0.5.2";
+  version = "0.5.3";
  pyproject = true;

  src = fetchFromGitHub {
@@ -48,7 +48,7 @@ buildPythonPackage rec {
    repo = "jax";
    # google/jax contains tags for jax and jaxlib. Only use jax tags!
    tag = "jax-v${version}";
-    hash = "sha256-Z7yMV4P423Pr574QPk0bVupWj2//RelLi/eLUqN/BlE=";
+    hash = "sha256-t4LHwpCz08zrQGWBehyPs2JnxsOvtV3L14MCdTqMeEI=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/jaxlib/bin.nix
+++ b/pkgs/development/python-modules/jaxlib/bin.nix
@@ -18,7 +18,7 @@
 }:

 let
-  version = "0.5.1";
+  version = "0.5.3";
  inherit (python) pythonVersion;

  # As of 2023-06-06, google/jax upstream is no longer publishing CPU-only wheels to their GCS bucket. Instead the
@@ -49,65 +49,65 @@ let
      "3.10-x86_64-linux" = getSrcFromPypi {
        platform = "manylinux2014_x86_64";
        dist = "cp310";
-        hash = "sha256-ZbxJAKBJHfxvubamLoEA0SFCnVjHQplF7CtCTBqCvyc=";
+        hash = "sha256-Ur5sl3Wv9zimEXDYwEdQXHW7eZpFUY5mp6CQgSexF4U=";
      };
      "3.10-aarch64-linux" = getSrcFromPypi {
        platform = "manylinux2014_aarch64";
        dist = "cp310";
-        hash = "sha256-CQ/n1LyOGXaHcdvIMZ3pAkdGu1Z/XZujebUQLxdljEE=";
+        hash = "sha256-lyQA20r26FJw2B215uYg0xOV8EcuUQxQ381Ms/crciA=";
      };
      "3.10-aarch64-darwin" = getSrcFromPypi {
        platform = "macosx_11_0_arm64";
        dist = "cp310";
-        hash = "sha256-LavMsIZHaBj3N80OYi/YjcT1u08N9Melxow0s2bohH8=";
+        hash = "sha256-SP9cifuKD+BNR16d3AdLSHmpHXq2ilHOxc0eh/gebEc=";
      };

      "3.11-x86_64-linux" = getSrcFromPypi {
        platform = "manylinux2014_x86_64";
        dist = "cp311";
-        hash = "sha256-gMDtVEZkSzg8qj5hdUCAO7DvNuVgnNd1bU0pE6jeUS4=";
+        hash = "sha256-KeFTD8gYMyFvHii1eNDFlpdlT3LuMcekTtd1O69axGY=";
      };
      "3.11-aarch64-linux" = getSrcFromPypi {
        platform = "manylinux2014_aarch64";
        dist = "cp311";
-        hash = "sha256-afS54HrQdNRBuZIbeoOu5PT/09VCAz/exQvhRW0GEcY=";
+        hash = "sha256-pGZvgdcsBg7T5YHe0RapyqmwpwoUilTLEqHTr8o2JLU=";
      };
      "3.11-aarch64-darwin" = getSrcFromPypi {
        platform = "macosx_11_0_arm64";
        dist = "cp311";
-        hash = "sha256-M0xJrUEfOaUFXCPxOVUq4yvZr+aWq7scrfnETr72B/c=";
+        hash = "sha256-tivYsp5aT5v6pXyNr24EggssmU9Ejz3sYC1kJVVF6fI=";
      };

      "3.12-x86_64-linux" = getSrcFromPypi {
        platform = "manylinux2014_x86_64";
        dist = "cp312";
-        hash = "sha256-Uee1n8QLsnBEDFBJs8gvn3/a2uMZnxaBhiDP24C5Z68=";
+        hash = "sha256-Wl6IqxzW/feNaavjVE6PCcziAN0zm7hfvjwupn8qXmg=";
      };
      "3.12-aarch64-linux" = getSrcFromPypi {
        platform = "manylinux2014_aarch64";
        dist = "cp312";
-        hash = "sha256-W0ulqj9ZtfLjfVJc7dav4P7suIQW5fQ+uacJz97YslA=";
+        hash = "sha256-vd9jYDd6oceS5H/YfzB8NC4zHl/zWC+UCxvKAPa0vHM=";
      };
      "3.12-aarch64-darwin" = getSrcFromPypi {
        platform = "macosx_11_0_arm64";
        dist = "cp312";
-        hash = "sha256-rj3ii/m4Z4HDCjLIi3y9HTIiqMIpqpbL4hBV3NCeuIk=";
+        hash = "sha256-05Tb3koca9Z1Ac+ynTgZoQuQDLU0zA/GAzGfcJLyTPo=";
      };

      "3.13-x86_64-linux" = getSrcFromPypi {
        platform = "manylinux2014_x86_64";
        dist = "cp313";
-        hash = "sha256-3BCf+mhzZAImw2DaeTqKe+r4xIdRrD/bKfprM3kB4YY=";
+        hash = "sha256-u3WTy3//yxOWPyL6UintlguPtK5ew7CCAEjL1n8ejjE=";
      };
      "3.13-aarch64-linux" = getSrcFromPypi {
        platform = "manylinux2014_aarch64";
        dist = "cp313";
-        hash = "sha256-3zcE8TXP+H/Z1BkwJIkl8vFjvu1u/qqrzNl0AVgNz9g=";
+        hash = "sha256-6QS5Le37x+VFclqNdnaYcDCunAaQAdlHAbwQnG2rQQA=";
      };
      "3.13-aarch64-darwin" = getSrcFromPypi {
        platform = "macosx_11_0_arm64";
        dist = "cp313";
-        hash = "sha256-jFf7vnmqPOOsLsZXp/F4Z7mzwsrYhbLIOQVnzJc47ug=";
+        hash = "sha256-MTIcJSgqBqbfyUBQe8FNCgrIONjO1sB6oAp/rjTOez8=";
      };
    };
 in
--- a/pkgs/development/python-modules/lap/default.nix
+++ b/pkgs/development/python-modules/lap/default.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  buildPythonPackage,
+  cython,
+  fetchPypi,
+  numpy,
+  pytestCheckHook,
+  python-utils,
+  pythonOlder,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "lap";
+  version = "0.5.12";
+  pyproject = true;
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-VwtBTqeubAS9SdDsjNrB3FY0c3dVeE1E43+fZourRP0=";
+  };
+
+  build-system = [ setuptools ];
+
+  nativeBuildInputs = [ cython ];
+
+  dependencies = [
+    numpy
+    python-utils
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "lap" ];
+  # See https://github.com/NixOS/nixpkgs/issues/255262
+  preCheck = ''
+    cd "$out"
+  '';
+
+  meta = {
+    description = "Linear Assignment Problem solver (LAPJV/LAPMOD)";
+    homepage = "https://github.com/gatagat/lap";
+    changelog = "https://github.com/gatagat/lap/releases/tag/v${version}";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [
+      doronbehar
+      tebriel
+    ];
+  };
+}
--- a/pkgs/development/python-modules/optimistix/default.nix
+++ b/pkgs/development/python-modules/optimistix/default.nix
@@ -13,7 +13,7 @@
  lineax,
  typing-extensions,

-  # checks
+  # tests
  beartype,
  jaxlib,
  optax,
@@ -53,6 +53,13 @@ buildPythonPackage rec {
    pytest-xdist
  ];

+  pytestFlagsArray = [
+    # Since jax 0.5.3:
+    # DeprecationWarning: shape requires ndarray or scalar arguments, got <class 'jax._src.api.ShapeDtypeStruct'> at position 0. In a future JAX release this will be an error.
+    "-W"
+    "ignore::DeprecationWarning"
+  ];
+
  meta = {
    description = "Nonlinear optimisation (root-finding, least squares, ...) in JAX+Equinox";
    homepage = "https://github.com/patrick-kidger/optimistix";
--- a/pkgs/development/python-modules/pylette/default.nix
+++ b/pkgs/development/python-modules/pylette/default.nix
@@ -0,0 +1,68 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  poetry-core,
+  scikit-learn,
+  typer,
+  requests,
+  pillow,
+  numpy,
+  pytestCheckHook,
+  opencv-python,
+  requests-mock,
+}:
+buildPythonPackage rec {
+  pname = "pylette";
+  version = "4.0.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "qTipTip";
+    repo = "Pylette";
+    tag = version;
+    hash = "sha256-i8+QQpYoRfgoV9Nm/FvXSJV+TEvmaaPsPIeG+PU838Q=";
+  };
+
+  build-system = [
+    poetry-core
+  ];
+
+  dependencies = [
+    scikit-learn
+    pillow
+    requests
+    typer
+    numpy
+  ];
+
+  pythonImportsCheck = [
+    "Pylette"
+  ];
+
+  pythonRelaxDeps = [
+    "numpy"
+    "Pillow"
+    "typer"
+  ];
+
+  disabledTests = [
+    # hangs forever
+    "test_color_extraction_deterministic_kmeans"
+  ];
+
+  nativeCheckInputs = [
+    opencv-python
+    pytestCheckHook
+    requests-mock
+    typer
+  ];
+
+  meta = {
+    changelog = "https://github.com/qTipTip/Pylette/releases/tag/${version}";
+    description = "Python library for extracting color palettes from images";
+    homepage = "https://qtiptip.github.io/Pylette/";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ DataHearth ];
+  };
+}
--- a/pkgs/development/python-modules/typecode/default.nix
+++ b/pkgs/development/python-modules/typecode/default.nix
@@ -61,6 +61,11 @@ buildPythonPackage rec {
    # fails due to change in file (libmagic) 5.45
    "test_doc_postscript_eps"
    "test_package_debian"
+
+    # fails due to change in file (libmagic) 5.46
+    "test_media_image_img"
+    "test_compiled_elf_so"
+    "test_compiled_elf_so_2"
  ];

  pythonImportsCheck = [ "typecode" ];
--- a/pkgs/os-specific/linux/zfs/generic.nix
+++ b/pkgs/os-specific/linux/zfs/generic.nix
@@ -20,7 +20,6 @@ let
      openssl,
      libtirpc,
      nfs-utils,
-      samba,
      gawk,
      gnugrep,
      gnused,
@@ -112,7 +111,7 @@ let
              enablePython = old.enablePython or true && enablePython;
            })
          }/bin/exportfs"
-          substituteInPlace ./lib/libshare/smb.h        --replace-fail "/usr/bin/net"            "${samba}/bin/net"
+          substituteInPlace ./lib/libshare/smb.h        --replace-fail "/usr/bin/net"            "/run/current-system/sw/bin/net"
          # Disable dynamic loading of libcurl
          substituteInPlace ./config/user-libfetch.m4   --replace-fail "curl-config --built-shared" "true"
          substituteInPlace ./config/user-systemd.m4    --replace-fail "/usr/lib/modules-load.d" "$out/etc/modules-load.d"
--- a/pkgs/tools/X11/xdragon/default.nix
+++ b/pkgs/tools/X11/xdragon/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
  '';

  meta = with lib; {
-    description = "Simple drag-and-drop source/sink for X (called dragon in upstream)";
+    description = "Simple drag-and-drop source/sink for X or Wayland (called dragon in upstream)";
    homepage = "https://github.com/mwh/dragon";
    license = licenses.gpl3;
    maintainers = with maintainers; [ das_j ];
--- a/pkgs/tools/audio/beets/builtin-plugins.nix
+++ b/pkgs/tools/audio/beets/builtin-plugins.nix
@@ -7,6 +7,8 @@
  mp3gain,
  mp3val,
  python3Packages,
+  version,
+  lib,
  ...
 }:
 {
@@ -170,3 +172,9 @@
  ];
  zero = { };
 }
+# NOTE: There will be no need for this conditional once beets is updated.
+// lib.optionalAttrs (lib.versionAtLeast version "2.2.0-unstable-2025-03-12") {
+  _typing = {
+    testPaths = [ ];
+  };
+}
--- a/pkgs/tools/audio/beets/common.nix
+++ b/pkgs/tools/audio/beets/common.nix
@@ -82,17 +82,6 @@ python3Packages.buildPythonApplication {
  pyproject = true;

  patches = [
-    (fetchpatch {
-      # Already on master. TODO: remove when updating to the next release
-      # Issue: https://github.com/beetbox/beets/issues/5527
-      # PR: https://github.com/beetbox/beets/pull/5650
-      name = "fix-im-backend";
-      url = "https://github.com/beetbox/beets/commit/1f938674015ee71431fe9bd97c2214f58473efd2.patch";
-      hash = "sha256-koCYeiUhk1ifo6CptOSu3p7Nz0FFUeiuArTknM/tpVQ=";
-      excludes = [
-        "docs/changelog.rst"
-      ];
-    })
  ] ++ extraPatches;

  build-system = [
@@ -113,6 +102,9 @@ python3Packages.buildPythonApplication {
      unidecode
      typing-extensions
    ]
+    ++ lib.optionals (lib.versionAtLeast version "2.2.0-unstable-2025-03-12") [
+      lap
+    ]
    ++ (concatMap (p: p.propagatedBuildInputs) (attrValues enabledPlugins));

  nativeBuildInputs = [
@@ -160,6 +152,9 @@ python3Packages.buildPythonApplication {
      rarfile
      responses
    ]
+    ++ lib.optionals (lib.versionAtLeast version "2.2.0-unstable-2025-03-12") [
+      requests-mock
+    ]
    ++ [
      writableTmpDirAsHomeHook
    ]
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -20,6 +20,17 @@
 */
 let
  extraPatches = [
+    (fetchpatch {
+      # Already on master. TODO: remove when updating to the next release
+      # Issue: https://github.com/beetbox/beets/issues/5527
+      # PR: https://github.com/beetbox/beets/pull/5650
+      name = "fix-im-backend";
+      url = "https://github.com/beetbox/beets/commit/1f938674015ee71431fe9bd97c2214f58473efd2.patch";
+      hash = "sha256-koCYeiUhk1ifo6CptOSu3p7Nz0FFUeiuArTknM/tpVQ=";
+      excludes = [
+        "docs/changelog.rst"
+      ];
+    })
    # Bash completion fix for Nix
    ./patches/bash-completion-always-print.patch
    # Remove after next release.
@@ -46,13 +57,13 @@ lib.makeExtensible (self: {
  beets-minimal = self.beets.override { disableAllPlugins = true; };

  beets-unstable = callPackage ./common.nix {
-    inherit python3Packages extraPatches;
-    version = "2.2.0-unstable-2024-12-02";
+    inherit python3Packages;
+    version = "2.2.0-unstable-2025-03-12";
    src = fetchFromGitHub {
      owner = "beetbox";
      repo = "beets";
-      rev = "f92c0ec8b14fbd59e58374fd123563123aef197b";
-      hash = "sha256-jhwXRgUUQJgQ/PLwvY1UfHCJ9UC8DcdBpE/janao0RM=";
+      rev = "670a3bcd17a46883c71cf07dd313fcd0dff4be9d";
+      hash = "sha256-hSY7FhpPL4poOY1/gqk7oLNgQ7KA/MJqx50xOLIP0QA=";
    };
  };

--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8750,6 +8750,8 @@ with pkgs;
    protobuf = protobuf_21;
  };

+  gamt  = callPackage ../by-name/am/amtterm/package.nix { withGamt = true; };
+
  gcr = callPackage ../development/libraries/gcr { };

  gcr_4 = callPackage ../development/libraries/gcr/4.nix { };
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7331,6 +7331,8 @@ self: super: with self; {
    inherit (pkgs.__splicedPackages) laszip;
  };

+  lap = callPackage ../development/python-modules/lap { };
+
  latex2mathml = callPackage ../development/python-modules/latex2mathml { };

  latex2pydata = callPackage ../development/python-modules/latex2pydata { };
@@ -12347,6 +12349,8 @@ self: super: with self; {

  pyleri = callPackage ../development/python-modules/pyleri { };

+  pylette = callPackage ../development/python-modules/pylette { };
+
  pylev = callPackage ../development/python-modules/pylev { };

  pylgnetcast = callPackage ../development/python-modules/pylgnetcast { };