Merge commit 750fef2 into haskell-updates

2025-07-14 14:10:33 +03:00 · 2025-03-20 21:19:58 +01:00 · 2025-03-20 21:19:58 +01:00 · 95c5cb0bc0
commit 95c5cb0bc0
parent 25681e04d3 750fef2a63
182 changed files with 2906 additions and 6763 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`

 - The `testTarget` argument of `haskellPackages.mkDerivation` has been deprecated in favour of `testTargets`.
  `testTarget` took a space separated string of targets, whereas the new `testTargets` argument takes a list of targets.
--- 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/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@ -230,6 +230,8 @@

 - `pkgs.nextcloud28` has been removed since it's out of support upstream.

+- `services.cloudflare-dyndns.apiTokenFile` now must be just your Cloudflare api token. Previously it was supposed to be a file of the form `CLOUDFLARE_API_TOKEN=...`.
+
 - `buildGoModule` now passes environment variables via the `env` attribute. `CGO_ENABLED` should now be specified with `env.CGO_ENABLED` when passing to buildGoModule. Direct specification of `CGO_ENABLED` is now redirected by a compatibility layer with a warning, but will become an error in future releases.

  Go-related environment variables previously shadowed by `buildGoModule` now results in errors when specified directly. Such variables include `GOOS` and `GOARCH`.
--- a/nixos/modules/config/fonts/fontconfig.nix
+++ b/nixos/modules/config/fonts/fontconfig.nix
@ -58,7 +58,7 @@ let
      <fontconfig>
        <!-- Font directories -->
        ${lib.concatStringsSep "\n" (map (font: "<dir>${font}</dir>") config.fonts.packages)}
-        ${lib.optionalString (pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) ''
+        ${lib.optionalString (pkgs.stdenv.hostPlatform.emulatorAvailable pkgs.buildPackages) ''
          <!-- Pre-generated font caches -->
          <cachedir>${cache}</cachedir>
          ${lib.optionalString (pkgs.stdenv.hostPlatform.isx86_64 && cfg.cache32Bit) ''
--- a/nixos/modules/programs/yabar.nix
+++ b/nixos/modules/programs/yabar.nix
@ -79,8 +79,7 @@ in
      description = ''
        The package which contains the `yabar` binary.

-        Nixpkgs provides the `yabar` and `yabar-unstable`,
-        so it's possible to choose.
+        Nixpkgs offers both a stable (`yabar`) and unstable (`yabar-unstable`) version of Yabar.
      '';
    };

--- a/nixos/modules/services/networking/cloudflare-dyndns.nix
+++ b/nixos/modules/services/networking/cloudflare-dyndns.nix
@ -15,12 +15,13 @@ in
      package = lib.mkPackageOption pkgs "cloudflare-dyndns" { };

      apiTokenFile = lib.mkOption {
-        type = lib.types.nullOr lib.types.str;
-        default = null;
+        type = lib.types.pathWith {
+          absolute = true;
+          inStore = false;
+        };
+
        description = ''
          The path to a file containing the CloudFlare API token.
-
-          The file must have the form `CLOUDFLARE_API_TOKEN=...`
        '';
      };

@ -91,19 +92,35 @@ in
          Type = "simple";
          DynamicUser = true;
          StateDirectory = "cloudflare-dyndns";
-          EnvironmentFile = cfg.apiTokenFile;
          Environment = [ "XDG_CACHE_HOME=%S/cloudflare-dyndns/.cache" ];
-          ExecStart =
-            let
-              args =
-                [ "--cache-file /var/lib/cloudflare-dyndns/ip.cache" ]
-                ++ (if cfg.ipv4 then [ "-4" ] else [ "-no-4" ])
-                ++ (if cfg.ipv6 then [ "-6" ] else [ "-no-6" ])
-                ++ lib.optional cfg.deleteMissing "--delete-missing"
-                ++ lib.optional cfg.proxied "--proxied";
-            in
-            "${lib.getExe cfg.package} ${toString args}";
+          LoadCredential = [
+            "apiToken:${cfg.apiTokenFile}"
+          ];
        };
+
+        script =
+          let
+            args =
+              [ "--cache-file /var/lib/cloudflare-dyndns/ip.cache" ]
+              ++ (if cfg.ipv4 then [ "-4" ] else [ "-no-4" ])
+              ++ (if cfg.ipv6 then [ "-6" ] else [ "-no-6" ])
+              ++ lib.optional cfg.deleteMissing "--delete-missing"
+              ++ lib.optional cfg.proxied "--proxied";
+          in
+          ''
+            export CLOUDFLARE_API_TOKEN=$(< "''${CREDENTIALS_DIRECTORY}/apiToken")
+
+            # Added 2025-03-10: `cfg.apiTokenFile` used to be passed as an
+            # `EnvironmentFile` to the service, which required it to be of
+            # the form "CLOUDFLARE_API_TOKEN=" rather than just the secret.
+            # If we detect this legacy usage, error out.
+            if [[ $CLOUDFLARE_API_TOKEN == CLOUDFLARE_API_TOKEN* ]]; then
+              echo "Error: your api token starts with 'CLOUDFLARE_API_TOKEN='. Remove that, and instead specify just the token." >&2
+              exit 1
+            fi
+
+            exec ${lib.getExe cfg.package} ${toString args}
+          '';
      }
      // lib.optionalAttrs (cfg.frequency != null) {
        startAt = cfg.frequency;
--- 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
@ -1281,6 +1281,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/emacs/make-emacs.nix
+++ b/pkgs/applications/editors/emacs/make-emacs.nix
@ -460,10 +460,13 @@ mkDerivation (finalAttrs: {
      NATIVE_FULL_AOT = "1";
      LIBRARY_PATH = lib.concatStringsSep ":" libGccJitLibraryPaths;
    }
-    // lib.optionalAttrs (variant == "macport") {
-      # Fixes intermittent segfaults when compiled with LLVM >= 7.0.
-      # See https://github.com/NixOS/nixpkgs/issues/127902
-      NIX_CFLAGS_COMPILE = "-include ${./macport_noescape_noop.h}";
+    // {
+      NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [
+        # Fixes intermittent segfaults when compiled with LLVM >= 7.0.
+        # See https://github.com/NixOS/nixpkgs/issues/127902
+        (lib.optionalString (variant == "macport") "-include ${./macport_noescape_noop.h}")
+        (lib.optionalString stdenv.hostPlatform.isDarwin "-DFD_SETSIZE=10000 -DDARWIN_UNLIMITED_SELECT")
+      ];
    };

  enableParallelBuilding = true;
--- 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/emulators/dolphin-emu/default.nix
+++ b/pkgs/applications/emulators/dolphin-emu/default.nix
@ -1,177 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, pkg-config
-, wrapQtAppsHook
-, alsa-lib
-, bluez
-, bzip2
-, cubeb
-, curl
-, enet
-, ffmpeg
-, fmt_10
-, gtest
-, hidapi
-, libevdev
-, libGL
-, libiconv
-, libpulseaudio
-, libspng
-, libusb1
-, libXdmcp
-, libXext
-, libXrandr
-, lz4
-, lzo
-, mbedtls_2
-, miniupnpc
-, minizip-ng
-, openal
-, pugixml
-, qtbase
-, qtsvg
-, SDL2
-, sfml
-, udev
-, vulkan-loader
-, xxHash
-, xz
-
-  # Used in passthru
-, testers
-
-  # Darwin-only dependencies
-, CoreBluetooth
-, ForceFeedback
-, IOBluetooth
-, IOKit
-, moltenvk
-, OpenGL
-, VideoToolbox
-, xcbuild
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "dolphin-emu";
-  version = "2503";
-
-  src = fetchFromGitHub {
-    owner = "dolphin-emu";
-    repo = "dolphin";
-    tag = finalAttrs.version;
-    hash = "sha256-oqJKXFcsFgoYjUqdk3Z/CIFhOa8w0drcF4JwtHRI1Hs=";
-    fetchSubmodules = true;
-  };
-
-  strictDeps = true;
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    wrapQtAppsHook
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    xcbuild # for plutil
-  ];
-
-  buildInputs = [
-    bzip2
-    cubeb
-    curl
-    enet
-    ffmpeg
-    fmt_10
-    gtest
-    hidapi
-    libiconv
-    libpulseaudio
-    libspng
-    libusb1
-    libXdmcp
-    lz4
-    lzo
-    mbedtls_2
-    miniupnpc
-    minizip-ng
-    openal
-    pugixml
-    qtbase
-    qtsvg
-    SDL2
-    sfml
-    xxHash
-    xz
-    # Causes linker errors with minizip-ng, prefer vendored. Possible reason why: https://github.com/dolphin-emu/dolphin/pull/12070#issuecomment-1677311838
-    #zlib-ng
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [
-    alsa-lib
-    bluez
-    libevdev
-    libGL
-    libXext
-    libXrandr
-    # FIXME: Vendored version is newer than mgba's stable release, remove the comment on next mgba's version
-    #mgba # Derivation doesn't support Darwin
-    udev
-    vulkan-loader
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    CoreBluetooth
-    ForceFeedback
-    IOBluetooth
-    IOKit
-    moltenvk
-    OpenGL
-    VideoToolbox
-  ];
-
-  cmakeFlags = [
-    "-DDISTRIBUTOR=NixOS"
-    "-DDOLPHIN_WC_REVISION=${finalAttrs.src.rev}"
-    "-DDOLPHIN_WC_DESCRIBE=${finalAttrs.version}"
-    "-DDOLPHIN_WC_BRANCH=master"
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    "-DOSX_USE_DEFAULT_SEARCH_PATH=True"
-    "-DUSE_BUNDLED_MOLTENVK=OFF"
-    "-DMACOS_CODE_SIGNING=OFF"
-    # Bundles the application folder into a standalone executable, so we cannot devendor libraries
-    "-DSKIP_POSTPROCESS_BUNDLE=ON"
-    # Needs xcode so compilation fails with it enabled. We would want the version to be fixed anyways.
-    # Note: The updater isn't available on linux, so we don't need to disable it there.
-    "-DENABLE_AUTOUPDATE=OFF"
-  ];
-
-  qtWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [
-    "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}"
-    # https://bugs.dolphin-emu.org/issues/11807
-    # The .desktop file should already set this, but Dolphin may be launched in other ways
-    "--set QT_QPA_PLATFORM xcb"
-  ];
-
-  postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
-    install -D $src/Data/51-usb-device.rules $out/etc/udev/rules.d/51-usb-device.rules
-  '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    # Only gets installed automatically if the standalone executable is used
-    mkdir -p $out/Applications
-    cp -r ./Binaries/Dolphin.app $out/Applications
-    ln -s $out/Applications/Dolphin.app/Contents/MacOS/Dolphin $out/bin
-  '';
-
-  passthru = {
-    tests.version = testers.testVersion {
-      package = finalAttrs.finalPackage;
-      command = "dolphin-emu-nogui --version";
-      inherit (finalAttrs) version;
-    };
-  };
-
-  meta = with lib; {
-    homepage = "https://dolphin-emu.org";
-    description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8";
-    mainProgram = if stdenv.hostPlatform.isDarwin then "Dolphin" else "dolphin-emu";
-    branch = "master";
-    license = licenses.gpl2Plus;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ pbsds ];
-  };
-})
--- a/pkgs/applications/emulators/libretro/cores/parallel-n64.nix
+++ b/pkgs/applications/emulators/libretro/cores/parallel-n64.nix
@ -38,5 +38,11 @@ mkLibretroCore {
    description = "Parallel Mupen64plus rewrite for libretro";
    homepage = "https://github.com/libretro/parallel-n64";
    license = lib.licenses.gpl3Only;
+    badPlatforms = [
+      # ./mupen64plus-core/src/r4300/new_dynarec/arm64/linkage_aarch64.o: in function `.E12':
+      # (.text+0x5b4): relocation truncated to fit: R_AARCH64_CONDBR19 against symbol `invalidate_block' defined in .text section in ./mupen64plus-core/src/r4300/new_dynarec/new_dynarec_64.o
+      # collect2: error: ld returned 1 exit status
+      "aarch64-linux"
+    ];
  };
 }
--- a/pkgs/applications/emulators/libretro/cores/ppsspp.nix
+++ b/pkgs/applications/emulators/libretro/cores/ppsspp.nix
@ -51,5 +51,9 @@ mkLibretroCore {
    description = "PPSSPP libretro port";
    homepage = "https://github.com/hrydgard/ppsspp";
    license = lib.licenses.gpl2Plus;
+    badPlatforms = [
+      # error: cannot convert 'uint32x4_t' to 'int' in initialization
+      "aarch64-linux"
+    ];
  };
 }
--- a/pkgs/applications/misc/ausweisapp/default.nix
+++ b/pkgs/applications/misc/ausweisapp/default.nix
@ -16,13 +16,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "ausweisapp";
-  version = "2.3.0";
+  version = "2.3.1";

  src = fetchFromGitHub {
    owner = "Governikus";
    repo = "AusweisApp2";
    rev = finalAttrs.version;
-    hash = "sha256-/X+S91EA7jrjSYb/jafmRhbbZJUQyg1DoTkzd4ZRjWY=";
+    hash = "sha256-1G9H+1YBoIgSE8GO8UuUaG9gbVtY+gCp0oPNSNw0oO8=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/misc/zettlr/default.nix
+++ b/pkgs/applications/misc/zettlr/default.nix
@ -2,7 +2,7 @@

 builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) {
  zettlr = {
-    version = "3.2.0";
-    hash = "sha256-gttDGWFJ/VmOyqgOSKnCqqPtNTKJd1fmDpa0ZAX3xc8=";
+    version = "3.4.3";
+    hash = "sha256-Xb9zszbkHWAaIcu74EGQH0PVbuXIZXH/dja1F1Hkx1c=";
  };
 }
--- 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/networking/cluster/rke2/1_29/versions.nix
+++ b/pkgs/applications/networking/cluster/rke2/1_29/versions.nix
@ -1,11 +1,11 @@
 {
-  rke2Version = "1.29.13+rke2r1";
-  rke2Commit = "00803ef95072be9d13b6e52a56fa9b6d9e7b0a51";
-  rke2TarballHash = "sha256-1OphaTrEU2MvV0kdEyxomRGgbl/YSVikcYtLuL3QnBI=";
-  rke2VendorHash = "sha256-6XczvyQMqYqHHu+cSsmXsi7zMG128ZwiAHr482qQqpI=";
-  k8sImageTag = "v1.29.13-rke2r1-build20250117";
-  etcdVersion = "v3.5.16-k3s1-build20241106";
+  rke2Version = "1.29.14+rke2r1";
+  rke2Commit = "700728b7c1efe5db28004c747819b635254e9a91";
+  rke2TarballHash = "sha256-K1Yn85NBl4t0OwaETfqgeZVIgAzbLevY0lyOHs5YwfM=";
+  rke2VendorHash = "sha256-WG++RPbIhDNnd9BRbEop4qtDcaKJTUz+YzeygZfDxLI=";
+  k8sImageTag = "v1.29.14-rke2r1-build20250213";
+  etcdVersion = "v3.5.18-k3s1-build20250210";
  pauseVersion = "3.6";
  ccmVersion = "v1.29.10-0.20241016053521-9510ac25fefb-build20241016";
-  dockerizedVersion = "v1.29.13-rke2r1";
+  dockerizedVersion = "v1.29.14-rke2r1";
 }
--- a/pkgs/applications/networking/cluster/rke2/1_30/versions.nix
+++ b/pkgs/applications/networking/cluster/rke2/1_30/versions.nix
@ -1,11 +1,11 @@
 {
-  rke2Version = "1.30.9+rke2r1";
-  rke2Commit = "bfd23524f32a4d9fa6f19ab58a2d47572e56f813";
-  rke2TarballHash = "sha256-/WVKmK9ZackY9ULST0zFi/RRwA4ZR3u1DXULWTc6G3o=";
-  rke2VendorHash = "sha256-kghiYswm3s7bILGp8t452jx84MY73EF9OTaWdncFr34=";
-  k8sImageTag = "v1.30.9-rke2r1-build20250116";
-  etcdVersion = "v3.5.16-k3s1-build20241106";
+  rke2Version = "1.30.10+rke2r1";
+  rke2Commit = "b83bb8e150236c43aa3d52d31523feb879d09911";
+  rke2TarballHash = "sha256-YpF2SBIH3GwWOtSIbIZb88Nd1GNUvOmbgeyNDKAo+qU=";
+  rke2VendorHash = "sha256-aExBaQuqW2ZNCniHjur5OcvBogC4zofn5UNQS8gHSrA=";
+  k8sImageTag = "v1.30.10-rke2r1-build20250213";
+  etcdVersion = "v3.5.18-k3s1-build20250210";
  pauseVersion = "3.6";
  ccmVersion = "v1.30.6-0.20241016053533-5ec454f50e7a-build20241016";
-  dockerizedVersion = "v1.30.9-rke2r1";
+  dockerizedVersion = "v1.30.10-rke2r1";
 }
--- a/pkgs/applications/networking/cluster/rke2/1_32/versions.nix
+++ b/pkgs/applications/networking/cluster/rke2/1_32/versions.nix
@ -1,11 +1,11 @@
 {
-  rke2Version = "1.32.1+rke2r1";
-  rke2Commit = "c0f7be4407cf2c437cacfe735e5c943e827f2ff8";
-  rke2TarballHash = "sha256-clZpTnMnj2PRDDYz7+r11RlyX2ExwsE1Tmdt3/kUmtE=";
-  rke2VendorHash = "sha256-aIB2fRkccx5fXMnFxZ+tirXp5gg8o/h/a6Lgc+EG4L4=";
-  k8sImageTag = "v1.32.1-rke2r1-build20250115";
-  etcdVersion = "v3.5.16-k3s1-build20241106";
+  rke2Version = "1.32.2+rke2r1";
+  rke2Commit = "8a5c3a23c25cc9b423a303be5f4f1c0e8b885726";
+  rke2TarballHash = "sha256-9sNlOkzPCTqHSqaphuSUsfRpS39QYcTDHgjMuYdircc=";
+  rke2VendorHash = "sha256-fECmrfLayXRhACH7YkuIAUVFqSyPpy/JZb2ZPvITfqQ=";
+  k8sImageTag = "v1.32.2-rke2r1-build20250213";
+  etcdVersion = "v3.5.18-k3s1-build20250210";
  pauseVersion = "3.6";
  ccmVersion = "v1.32.0-rc3.0.20241220224140-68fbd1a6b543-build20250101";
-  dockerizedVersion = "v1.32.1-rke2r1";
+  dockerizedVersion = "v1.32.2-rke2r1";
 }
--- a/pkgs/applications/networking/cluster/terraform-landscape/Gemfile
+++ b/pkgs/applications/networking/cluster/terraform-landscape/Gemfile
@ -1,2 +1,3 @@
 source 'https://rubygems.org'
 gem 'terraform_landscape'
+gem 'abbrev'
--- a/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock
+++ b/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock
@ -1,25 +1,27 @@
 GEM
  remote: https://rubygems.org/
  specs:
+    abbrev (0.1.2)
    colorize (0.8.1)
-    commander (4.4.6)
-      highline (~> 1.7.2)
-    diffy (3.2.1)
-    highline (1.7.10)
+    commander (4.6.0)
+      highline (~> 2.0.0)
+    diffy (3.4.3)
+    highline (2.0.3)
    polyglot (0.3.5)
-    terraform_landscape (0.2.1)
+    terraform_landscape (0.3.4)
      colorize (~> 0.7)
      commander (~> 4.4)
      diffy (~> 3.0)
      treetop (~> 1.6)
-    treetop (1.6.10)
+    treetop (1.6.14)
      polyglot (~> 0.3)

 PLATFORMS
  ruby

 DEPENDENCIES
+  abbrev
  terraform_landscape

 BUNDLED WITH
-   2.1.4
+   2.6.2
--- a/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix
+++ b/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix
@ -1,5 +1,7 @@
 {
  colorize = {
+    groups = [ "default" ];
+    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
      sha256 = "133rqj85n400qk6g3dhf2bmfws34mak1wqihvh3bgy9jhajw580b";
@ -9,30 +11,38 @@
  };
  commander = {
    dependencies = [ "highline" ];
+    groups = [ "default" ];
+    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "11sd2sb0id2dbxkv4pvymdiia1xxhms45kh4nr8mryqybad0fwwf";
+      sha256 = "1n8k547hqq9hvbyqbx2qi08g0bky20bbjca1df8cqq5frhzxq7bx";
      type = "gem";
    };
-    version = "4.4.6";
+    version = "4.6.0";
  };
  diffy = {
+    groups = [ "default" ];
+    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "119imrkn01agwhx5raxhknsi331y5i4yda7r0ws0an6905ximzjg";
+      sha256 = "19xaz5qmw0kg1rdsjh13vk7674bpcmjy6cnddx1cvl80vgkvjr22";
      type = "gem";
    };
-    version = "3.2.1";
+    version = "3.4.3";
  };
  highline = {
+    groups = [ "default" ];
+    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "01ib7jp85xjc4gh4jg0wyzllm46hwv8p0w1m4c75pbgi41fps50y";
+      sha256 = "0yclf57n2j3cw8144ania99h1zinf8q3f5zrhqa754j6gl95rp9d";
      type = "gem";
    };
-    version = "1.7.10";
+    version = "2.0.3";
  };
  polyglot = {
+    groups = [ "default" ];
+    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
      sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr";
@ -47,20 +57,24 @@
      "diffy"
      "treetop"
    ];
+    groups = [ "default" ];
+    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1i93pih7r6zcqpjhsmvkpfkgbh0l66c60i6fkiymq7vy2xd6wnns";
+      sha256 = "1lcsqasn8k2i6kxy9sv76mvf8s60qkdg3a3sb5shj6lvh2dk8n8s";
      type = "gem";
    };
-    version = "0.2.1";
+    version = "0.3.4";
  };
  treetop = {
    dependencies = [ "polyglot" ];
+    groups = [ "default" ];
+    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0g31pijhnv7z960sd09lckmw9h8rs3wmc8g4ihmppszxqm99zpv7";
+      sha256 = "1m5fqy7vq6y7bgxmw7jmk7y6pla83m16p7lb41lbqgg53j8x2cds";
      type = "gem";
    };
-    version = "1.6.10";
+    version = "1.6.14";
  };
 }
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
--- 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/al/alist/package.nix
+++ b/pkgs/by-name/al/alist/package.nix
@ -11,14 +11,14 @@
 }:
 buildGoModule rec {
  pname = "alist";
-  version = "3.42.0";
-  webVersion = "3.42.0";
+  version = "3.43.0";
+  webVersion = "3.43.0";

  src = fetchFromGitHub {
    owner = "AlistGo";
    repo = "alist";
    tag = "v${version}";
-    hash = "sha256-qUW9bA2TeAVve77i43+ITxClLaO3aqm5959itf+iFqs=";
+    hash = "sha256-0+gt5S/eklSp8K4z1bXUVHaG7L3zKhi6TdVaxX/Y83w=";
    # populate values that require us to use git. By doing this in postFetch we
    # can delete .git afterwards and maintain better reproducibility of the src.
    leaveDotGit = true;
@ -32,11 +32,11 @@ buildGoModule rec {
  };
  web = fetchzip {
    url = "https://github.com/AlistGo/alist-web/releases/download/${webVersion}/dist.tar.gz";
-    hash = "sha256-g2+qdLrxuyuqxlyVk32BKJCbMfXNs29KLEPxAkTQHjU=";
+    hash = "sha256-uFa9V8DSHk0ET0BCdfT37qUNP2kLNjmt2S6fEk1muME=";
  };

  proxyVendor = true;
-  vendorHash = "sha256-uid+uT4eOtDsCNsKqGqPc4vMDnKUatG4V2n0Z7r6ccY=";
+  vendorHash = "sha256-40YuarjrOvwHyXmHZoiqGMueN7dzu8zQ6hgInmsWVJg=";

  buildInputs = [ fuse ];

--- 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/bl/bluespec/package.nix
+++ b/pkgs/by-name/bl/bluespec/package.nix
@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
      src/comp/wrapper.sh

    substituteInPlace src/comp/Makefile \
-      --replace-fail 'install-bsc install-bluetcl' 'install-bsc install-bluetcl $(UTILEXES) install-utils'
+      --replace-fail 'install-bsc install-bluetcl' 'install-bsc install-bluetcl $(UTILEXES) $(SHOWRULESEXES) install-utils install-showrules'

    # For darwin
    # ld: library not found for -ltcl8.5
@ -172,12 +172,10 @@ stdenv.mkDerivation rec {
    homepage = "https://github.com/B-Lang-org/bsc";
    license = lib.licenses.bsd3;
    platforms = [
+      "aarch64-linux"
      "x86_64-linux"
-      "aarch64-darwin"
-    ];
+    ] ++ lib.platforms.darwin;
    mainProgram = "bsc";
-    # darwin fails at https://github.com/B-Lang-org/bsc/pull/35#issuecomment-583731562
-    # aarch64 fails, as GHC fails with "ghc: could not execute: opt"
    maintainers = with lib.maintainers; [
      jcumming
      thoughtpolice
--- a/pkgs/by-name/co/codefresh/package.nix
+++ b/pkgs/by-name/co/codefresh/package.nix
@ -11,18 +11,18 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "codefresh";
-  version = "0.87.3";
+  version = "0.88.5";

  src = fetchFromGitHub {
    owner = "codefresh-io";
    repo = "cli";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-SUwt0oWls823EeLxT4CW+LDdsjAtSxxxKkllhMJXCtM=";
+    hash = "sha256-u0K3I65JDu6v4mE0EU6Rv6uJOmC6VuZbIVyreHPH9QE=";
  };

  offlineCache = fetchYarnDeps {
    yarnLock = "${finalAttrs.src}/yarn.lock";
-    hash = "sha256-tzsHbvoQ59MwE4TYdPweLaAv9r4V8oyTQyvdeyPCsHY=";
+    hash = "sha256-cMCJ/ANpHsEuO0SNtvf7zlS0HXp328oBP5aXnHSbpDI=";
  };
  nativeBuildInputs = [
    yarnConfigHook
--- 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/da/dash-mpd-cli/package.nix
+++ b/pkgs/by-name/da/dash-mpd-cli/package.nix
@ -22,15 +22,15 @@ let
    '';
  };
 in
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
  pname = "dash-mpd-cli";
-  version = "0.2.24";
+  version = "0.2.25";

  src = fetchFromGitHub {
    owner = "emarsden";
    repo = "dash-mpd-cli";
-    tag = "v${version}";
-    hash = "sha256-Q4zzKdp8GROL8vHi8XETErqufSqgZH/zf/mqEH2lIzE=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-xC/U48QyVn9K8Do1909XS7j9aY+ia0gd5cMdfipIds4=";
  };

  patches = [
@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
  ];

  useFetchCargoVendor = true;
-  cargoHash = "sha256-yXLA/JVD/4jbeVWOhs74Rdlc/drFFjQ52x5IMwUg4jY=";
+  cargoHash = "sha256-QHfon0795XNtG3jCVv56EIA1pPToWUiopKWI3cA7Vg0=";

  nativeBuildInputs = [
    makeWrapper
@ -52,8 +52,8 @@ rustPlatform.buildRustPackage rec {
    wrapProgram $out/bin/dash-mpd-cli \
      --prefix PATH : ${
        lib.makeBinPath [
-          ffmpeg.bin
-          libxslt.bin
+          (lib.getBin ffmpeg)
+          (lib.getBin libxslt)
          shaka-packager-wrapped
        ]
      }
@ -73,4 +73,4 @@ rustPlatform.buildRustPackage rec {
    maintainers = with lib.maintainers; [ al3xtjames ];
    mainProgram = "dash-mpd-cli";
  };
-}
+})
--- a/pkgs/by-name/dm/dmd/generic.nix
+++ b/pkgs/by-name/dm/dmd/generic.nix
@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
        hash = "sha256-N21mAPfaTo+zGCip4njejasraV5IsWVqlGR5eOdFZZE=";
      })
    ]
-    ++ lib.optionals (lib.versionOlder version "2.110.0") [
+    ++ [
      (fetchpatch {
        url = "https://github.com/dlang/dmd/commit/fdd25893e0ac04893d6eba8652903d499b7b0dfc.patch";
        stripLen = 1;
--- a/pkgs/by-name/dm/dmd/package.nix
+++ b/pkgs/by-name/dm/dmd/package.nix
@ -1,5 +1,5 @@
 import ./generic.nix {
-  version = "2.109.1";
-  dmdHash = "sha256-3nCDPZnb4eQZmhYYxcH6qOmsP8or0KYuzAa5g/C9xdU=";
-  phobosHash = "sha256-73I0k7tCBwe5tl4K6uMs3/nT2JTZ2SppFYzmokS4W5Y=";
+  version = "2.110.0";
+  dmdHash = "sha256-icXp9xWF2AI2gp7z/lQFAChmXfQePe9b5pbpQ9Mn19Y=";
+  phobosHash = "sha256-CmJpcHM+sIsaYBlpALCFoQFG+93s8gUyWmM0tYqjXkk=";
 }
--- a/pkgs/applications/emulators/dolphin-emu/primehack.nix
+++ b/pkgs/applications/emulators/dolphin-emu/primehack.nix
@ -2,123 +2,125 @@
  lib,
  stdenv,
  fetchFromGitHub,
+
+  # nativeBuildInputs
  pkg-config,
  cmake,
-  wrapQtAppsHook,
-  qtbase,
-  qtsvg,
-  bluez,
+  qt6,
+
+  # buildInputs
+  curl,
+  enet,
  ffmpeg,
-  libao,
-  libGLU,
-  libGL,
-  pcre,
+  fmt,
  gettext,
-  libXrandr,
-  libusb1,
-  libpthreadstubs,
-  libXext,
-  libXxf86vm,
-  libXinerama,
+  libGL,
+  libGLU,
  libSM,
  libXdmcp,
-  readline,
-  openal,
-  udev,
-  libevdev,
-  portaudio,
-  curl,
-  alsa-lib,
-  miniupnpc,
-  enet,
-  mbedtls_2,
-  soundtouch,
-  sfml,
-  fmt,
-  xz,
-  vulkan-loader,
+  libXext,
+  libXinerama,
+  libXrandr,
+  libXxf86vm,
+  libao,
+  libpthreadstubs,
  libpulseaudio,
-
-  # - Inputs used for Darwin
-  CoreBluetooth,
-  ForceFeedback,
-  IOKit,
-  OpenGL,
-  libpng,
+  libusb1,
+  mbedtls_2,
+  miniupnpc,
+  openal,
+  pcre,
+  portaudio,
+  readline,
+  sfml,
+  soundtouch,
+  xz,
+  # linux-only
+  alsa-lib,
+  bluez,
+  libevdev,
+  udev,
+  vulkan-loader,
+  # darwin-only
  hidapi,
+  libpng,
+
+  # passthru
+  testers,
+  nix-update-script,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "dolphin-emu-primehack";
  version = "1.0.7a";

  src = fetchFromGitHub {
    owner = "shiiion";
    repo = "dolphin";
-    rev = version;
-    hash = "sha256-vuTSXQHnR4HxAGGiPg5tUzfiXROU3+E9kyjH+T6zVmc=";
+    tag = finalAttrs.version;
    fetchSubmodules = true;
+    hash = "sha256-vuTSXQHnR4HxAGGiPg5tUzfiXROU3+E9kyjH+T6zVmc=";
  };

-  nativeBuildInputs = [
-    pkg-config
-    cmake
-  ] ++ lib.optional stdenv.hostPlatform.isLinux wrapQtAppsHook;
+  nativeBuildInputs =
+    [
+      pkg-config
+      cmake
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      qt6.wrapQtAppsHook
+    ];

  buildInputs =
    [
      curl
+      enet
      ffmpeg
-      libao
-      libGLU
-      libGL
-      pcre
+      fmt
      gettext
+      libGL
+      libGLU
+      libSM
+      libXdmcp
+      libXext
+      libXinerama
+      libXrandr
+      libXxf86vm
+      libao
      libpthreadstubs
      libpulseaudio
-      libXrandr
-      libXext
-      libXxf86vm
-      libXinerama
-      libSM
-      readline
-      openal
-      libXdmcp
-      portaudio
      libusb1
-      libpng
-      hidapi
-      miniupnpc
-      enet
      mbedtls_2
-      soundtouch
+      miniupnpc
+      openal
+      pcre
+      portaudio
+      qt6.qtbase
+      qt6.qtsvg
+      readline
      sfml
-      fmt
+      soundtouch
      xz
-      qtbase
-      qtsvg
    ]
    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      bluez
-      udev
-      libevdev
      alsa-lib
+      bluez
+      libevdev
+      udev
      vulkan-loader
    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      CoreBluetooth
-      OpenGL
-      ForceFeedback
-      IOKit
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      hidapi
+      libpng
    ];

  cmakeFlags =
    [
-      "-DUSE_SHARED_ENET=ON"
-      "-DENABLE_LTO=ON"
+      (lib.cmakeBool "USE_SHARED_ENET" true)
+      (lib.cmakeBool "ENABLE_LTO" true)
    ]
    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "-DOSX_USE_DEFAULT_SEARCH_PATH=True"
+      (lib.cmakeBool "OSX_USE_DEFAULT_SEARCH_PATH" true)
    ];

  qtWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [
@ -131,11 +133,13 @@ stdenv.mkDerivation rec {
  # - Allow Dolphin to use nix-provided libraries instead of building them
  postPatch =
    ''
-      substituteInPlace CMakeLists.txt --replace 'DISTRIBUTOR "None"' 'DISTRIBUTOR "NixOS"'
+      substituteInPlace CMakeLists.txt \
+        --replace-fail 'DISTRIBUTOR "None"' 'DISTRIBUTOR "NixOS"'
    ''
    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace CMakeLists.txt --replace 'if(NOT APPLE)' 'if(true)'
-      substituteInPlace CMakeLists.txt --replace 'if(LIBUSB_FOUND AND NOT APPLE)' 'if(LIBUSB_FOUND)'
+      substituteInPlace CMakeLists.txt \
+        --replace-fail 'if(NOT APPLE)' 'if(true)' \
+        --replace-fail 'if(LIBUSB_FOUND AND NOT APPLE)' 'if(LIBUSB_FOUND)'
    '';

  postInstall =
@ -144,19 +148,31 @@ stdenv.mkDerivation rec {
      mv $out/bin/dolphin-emu-nogui $out/bin/dolphin-emu-primehack-nogui
      mv $out/share/applications/dolphin-emu.desktop $out/share/applications/dolphin-emu-primehack.desktop
      mv $out/share/icons/hicolor/256x256/apps/dolphin-emu.png $out/share/icons/hicolor/256x256/apps/dolphin-emu-primehack.png
-      substituteInPlace $out/share/applications/dolphin-emu-primehack.desktop --replace 'dolphin-emu' 'dolphin-emu-primehack'
-      substituteInPlace $out/share/applications/dolphin-emu-primehack.desktop --replace 'Dolphin Emulator' 'PrimeHack'
+      substituteInPlace $out/share/applications/dolphin-emu-primehack.desktop \
+        --replace-fail 'dolphin-emu' 'dolphin-emu-primehack' \
+        --replace-fail 'Dolphin Emulator' 'PrimeHack'
    ''
    + lib.optionalString stdenv.hostPlatform.isLinux ''
      install -D $src/Data/51-usb-device.rules $out/etc/udev/rules.d/51-usb-device.rules
    '';

-  meta = with lib; {
+  passthru = {
+    tests = {
+      version = testers.testVersion {
+        package = finalAttrs.finalPackage;
+        command = "dolphin-emu-primehack-nogui --version";
+        version = "v${finalAttrs.version}";
+      };
+    };
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
    homepage = "https://github.com/shiiion/dolphin";
    description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ Madouura ];
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ Madouura ];
    broken = stdenv.hostPlatform.isDarwin;
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
  };
-}
+})
--- a/pkgs/by-name/do/dolphin-emu/package.nix
+++ b/pkgs/by-name/do/dolphin-emu/package.nix
@ -0,0 +1,185 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+
+  # nativeBuildInputs
+  cmake,
+  pkg-config,
+  qt6,
+  # darwin-only
+  xcbuild,
+
+  # buildInputs
+  bzip2,
+  cubeb,
+  curl,
+  enet,
+  ffmpeg,
+  fmt_10,
+  gtest,
+  hidapi,
+  libXdmcp,
+  libpulseaudio,
+  libspng,
+  libusb1,
+  lz4,
+  lzo,
+  mbedtls_2,
+  miniupnpc,
+  minizip-ng,
+  openal,
+  pugixml,
+  SDL2,
+  sfml,
+  xxHash,
+  xz,
+  # linux-only
+  alsa-lib,
+  bluez,
+  libGL,
+  libXext,
+  libXrandr,
+  libevdev,
+  udev,
+  vulkan-loader,
+  # darwin-only
+  moltenvk,
+
+  # passthru
+  testers,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "dolphin-emu";
+  version = "2503";
+
+  src = fetchFromGitHub {
+    owner = "dolphin-emu";
+    repo = "dolphin";
+    tag = finalAttrs.version;
+    fetchSubmodules = true;
+    hash = "sha256-oqJKXFcsFgoYjUqdk3Z/CIFhOa8w0drcF4JwtHRI1Hs=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs =
+    [
+      cmake
+      pkg-config
+      qt6.wrapQtAppsHook
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      xcbuild # for plutil
+    ];
+
+  buildInputs =
+    [
+      bzip2
+      cubeb
+      curl
+      enet
+      ffmpeg
+      fmt_10
+      gtest
+      hidapi
+      libXdmcp
+      libpulseaudio
+      libspng
+      libusb1
+      lz4
+      lzo
+      mbedtls_2
+      miniupnpc
+      minizip-ng
+      openal
+      pugixml
+      qt6.qtbase
+      qt6.qtsvg
+      SDL2
+      sfml
+      xxHash
+      xz
+      # Causes linker errors with minizip-ng, prefer vendored. Possible reason why: https://github.com/dolphin-emu/dolphin/pull/12070#issuecomment-1677311838
+      #zlib-ng
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      alsa-lib
+      bluez
+      libGL
+      libXext
+      libXrandr
+      libevdev
+      # FIXME: Vendored version is newer than mgba's stable release, remove the comment on next mgba's version
+      #mgba # Derivation doesn't support Darwin
+      udev
+      vulkan-loader
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      moltenvk
+    ];
+
+  cmakeFlags =
+    [
+      (lib.cmakeFeature "DISTRIBUTOR" "NixOS")
+      (lib.cmakeFeature "DOLPHIN_WC_REVISION" finalAttrs.src.rev)
+      (lib.cmakeFeature "DOLPHIN_WC_DESCRIBE" finalAttrs.version)
+      (lib.cmakeFeature "DOLPHIN_WC_BRANCH" "master")
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      (lib.cmakeBool "OSX_USE_DEFAULT_SEARCH_PATH" true)
+      (lib.cmakeBool "USE_BUNDLED_MOLTENVK" false)
+      (lib.cmakeBool "MACOS_CODE_SIGNING" false)
+      # Bundles the application folder into a standalone executable, so we cannot devendor libraries
+      (lib.cmakeBool "SKIP_POSTPROCESS_BUNDLE" true)
+      # Needs xcode so compilation fails with it enabled. We would want the version to be fixed anyways.
+      # Note: The updater isn't available on linux, so we don't need to disable it there.
+      (lib.cmakeBool "ENABLE_AUTOUPDATE" false)
+    ];
+
+  qtWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [
+    "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}"
+    # https://bugs.dolphin-emu.org/issues/11807
+    # The .desktop file should already set this, but Dolphin may be launched in other ways
+    "--set QT_QPA_PLATFORM xcb"
+  ];
+
+  postInstall =
+    lib.optionalString stdenv.hostPlatform.isLinux ''
+      install -D $src/Data/51-usb-device.rules $out/etc/udev/rules.d/51-usb-device.rules
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      # Only gets installed automatically if the standalone executable is used
+      mkdir -p $out/Applications
+      cp -r ./Binaries/Dolphin.app $out/Applications
+      ln -s $out/Applications/Dolphin.app/Contents/MacOS/Dolphin $out/bin
+    '';
+
+  passthru = {
+    tests = {
+      version = testers.testVersion {
+        package = finalAttrs.finalPackage;
+        command = "dolphin-emu-nogui --version";
+        inherit (finalAttrs) version;
+      };
+    };
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version-regex"
+        "([0-9]+)"
+      ];
+    };
+  };
+
+  meta = {
+    homepage = "https://dolphin-emu.org";
+    description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8";
+    mainProgram = if stdenv.hostPlatform.isDarwin then "Dolphin" else "dolphin-emu";
+    branch = "master";
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ pbsds ];
+  };
+})
--- a/pkgs/by-name/do/dosage-tracker/package.nix
+++ b/pkgs/by-name/do/dosage-tracker/package.nix
@ -17,13 +17,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "dosage";
-  version = "1.9.3";
+  version = "1.9.4";

  src = fetchFromGitHub {
    owner = "diegopvlk";
    repo = "Dosage";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-euGyTaufL8Ifsy1RT4jcqlz8XZfCN7GfvFFvo85f/3c=";
+    hash = "sha256-EFcfkj0NOmQrWgLJpWHdIX7iitqfZwgTmkMvueJPS/c=";
  };

  # https://github.com/NixOS/nixpkgs/issues/318830
--- 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/fl/fluxcd/package.nix
+++ b/pkgs/by-name/fl/fluxcd/package.nix
@ -8,10 +8,10 @@
 }:

 let
-  version = "2.5.0";
-  srcHash = "sha256-PhApozD/oWmT4PjzDRKBitE23V3KC40o17AwbmzzPdI=";
-  vendorHash = "sha256-J8tgcNRc2m+6wcBM/iRizyOTO7OvKinl4Ojc8InQoKk=";
-  manifestsHash = "sha256-mU0rnbb63ATjf2Q7TzbsQJcbRBUb2QCeC8WKaKmpxOo=";
+  version = "2.5.1";
+  srcHash = "sha256-BuFylOWR30aK7d1eN+9getR5amtAtkkhHNAPfdfASHs=";
+  vendorHash = "sha256-2fThvz/5A1/EyS6VTUQQa5Unx1BzYfsVRE18xOHtLHE=";
+  manifestsHash = "sha256-bIIK8igtx0gUcn3hlBohE0MG9PMhyThz4a71pkonBpE=";

  manifests = fetchzip {
    url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";
--- a/pkgs/by-name/fo/follow/package.nix
+++ b/pkgs/by-name/fo/follow/package.nix
@ -12,13 +12,13 @@
 stdenv.mkDerivation rec {
  pname = "follow";

-  version = "0.2.0-beta.2";
+  version = "0.3.7";

  src = fetchFromGitHub {
    owner = "RSSNext";
    repo = "Follow";
    rev = "v${version}";
-    hash = "sha256-7KSPZj9QG6zksji/eY8jczBDHr/9tStlw26LKVqXTAw=";
+    hash = "sha256-TPzrQo6214fXQmF45p5agQ1zqLYzpmMpYb89ASPsWio=";
  };

  nativeBuildInputs = [
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {

  pnpmDeps = pnpm_9.fetchDeps {
    inherit pname version src;
-    hash = "sha256-FzMjN0rIjYxexf6tix4qi3mnuPkadjKihhN0Pj5y2nU=";
+    hash = "sha256-xNGLYzEz1G5sZSqmji+ItJ9D1vvZcwkkygnDeuypcIM=";
  };

  env = {
@ -38,11 +38,10 @@ stdenv.mkDerivation rec {

    # This environment variables inject the production Vite config at build time.
    # Copy from:
-    # 1. https://github.com/RSSNext/Follow/blob/v0.2.0-beta.2/.github/workflows/build.yml#L18
+    # 1. https://github.com/RSSNext/Follow/blob/v0.3.7/.github/workflows/build.yml#L18
    # 2. And logs in the corresponding GitHub Actions: https://github.com/RSSNext/Follow/actions/workflows/build.yml
    VITE_WEB_URL = "https://app.follow.is";
    VITE_API_URL = "https://api.follow.is";
-    VITE_IMGPROXY_URL = "https://thumbor.follow.is";
    VITE_SENTRY_DSN = "https://e5bccf7428aa4e881ed5cb713fdff181@o4507542488023040.ingest.us.sentry.io/4507570439979008";
    VITE_OPENPANEL_CLIENT_ID = "0e477ab4-d92d-4d6e-b889-b09d86ab908e";
    VITE_OPENPANEL_API_URL = "https://openpanel.follow.is/api";
@ -57,6 +56,8 @@ stdenv.mkDerivation rec {
    };
  };

+  dontCheckForBrokenSymlinks = true;
+
  desktopItem = makeDesktopItem {
    name = "follow";
    desktopName = "Follow";
--- 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/go/gocryptfs/package.nix
+++ b/pkgs/by-name/go/gocryptfs/package.nix
@ -12,16 +12,16 @@

 buildGoModule rec {
  pname = "gocryptfs";
-  version = "2.5.1";
+  version = "2.5.2";

  src = fetchFromGitHub {
    owner = "rfjakob";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-yTZD4Q/krl6pW6EdtU+sdCWOOo9LHJqHCuNubAoEIyo=";
+    sha256 = "sha256-H3J+1a4Y6/BqgU7D9j/PNtP6Ci3EjrtO/ADx3GpJMgI=";
  };

-  vendorHash = "sha256-bzhwYiTqI3MV0KxDT5j9TVnWJxM0BuLgEC8/r+2aQjI=";
+  vendorHash = "sha256-WfTJ8TuFupEa391XQMDl3hKTjrmRHJqvYb1haAGHW/U=";

  nativeBuildInputs = [
    makeWrapper
--- a/pkgs/by-name/go/gopeed/package.nix
+++ b/pkgs/by-name/go/gopeed/package.nix
@ -8,13 +8,13 @@
 }:

 let
-  version = "1.6.10";
+  version = "1.6.11";

  src = fetchFromGitHub {
    owner = "GopeedLab";
    repo = "gopeed";
    tag = "v${version}";
-    hash = "sha256-sTKPSgy1jDavEd/IM8F6dxojp8oOQTo3/w/YV21JR/Q=";
+    hash = "sha256-ayPqLRWYSa0rSHqGFS4xp3wUVAl4tfsSPs/SQcUQD60=";
  };

  metaCommon = {
@ -45,14 +45,17 @@ let
  };
 in
 flutter324.buildFlutterApplication {
-  inherit version src libgopeed;
+  inherit version src;
  pname = "gopeed";

  sourceRoot = "${src.name}/ui/flutter";

  pubspecLock = lib.importJSON ./pubspec.lock.json;

-  gitHashes.permission_handler_windows = "sha256-MRTmuH0MfhGaMEb9bRotimAPRlFyl3ovtJUJ2WK7+DA=";
+  gitHashes = {
+    install_plugin = "sha256-3FM08D2pbtWmitf8R4pAylVqum7IfbWh6pOIEhJdySk=";
+    permission_handler_windows = "sha256-MRTmuH0MfhGaMEb9bRotimAPRlFyl3ovtJUJ2WK7+DA=";
+  };

  nativeBuildInputs = [ autoPatchelfHook ];

@ -61,7 +64,7 @@ flutter324.buildFlutterApplication {
  preBuild = ''
    mkdir -p linux/bundle/lib
    cp ${libgopeed}/lib/libgopeed.so linux/bundle/lib/libgopeed.so
-    cp ${libgopeed}/bin/host assets/host/host
+    cp ${libgopeed}/bin/host assets/exec/host
  '';

  postInstall = ''
@ -75,7 +78,10 @@ flutter324.buildFlutterApplication {
      --add-rpath $out/app/gopeed/lib $out/app/gopeed/gopeed
  '';

-  passthru.updateScript = ./update.sh;
+  passthru = {
+    inherit libgopeed;
+    updateScript = ./update.sh;
+  };

  meta = metaCommon // {
    mainProgram = "gopeed";
--- a/pkgs/by-name/go/gopeed/pubspec.lock.json
+++ b/pkgs/by-name/go/gopeed/pubspec.lock.json
@ -337,7 +337,7 @@
      "version": "0.3.4+2"
    },
    "crypto": {
-      "dependency": "transitive",
+      "dependency": "direct main",
      "description": {
        "name": "crypto",
        "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855",
@ -680,6 +680,17 @@
      "source": "hosted",
      "version": "4.3.0"
    },
+    "install_plugin": {
+      "dependency": "direct main",
+      "description": {
+        "path": ".",
+        "ref": "cf08af829f4a4145634f8a047108f505fdbe5eaa",
+        "resolved-ref": "cf08af829f4a4145634f8a047108f505fdbe5eaa",
+        "url": "https://github.com/hui-z/flutter_install_plugin.git"
+      },
+      "source": "git",
+      "version": "2.1.0"
+    },
    "intl": {
      "dependency": "transitive",
      "description": {
--- a/pkgs/by-name/ha/habitat/Cargo.lock
+++ b/pkgs/by-name/ha/habitat/Cargo.lock
--- a/pkgs/by-name/ha/habitat/package.nix
+++ b/pkgs/by-name/ha/habitat/package.nix
@ -13,26 +13,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "habitat";
-  version = "1.6.848";
+  version = "1.6.1243";

  src = fetchFromGitHub {
    owner = "habitat-sh";
    repo = "habitat";
    rev = version;
-    hash = "sha256-oK9ZzENwpEq6W1qnhSgkr7Rhy7Fxt/BS4U5nxecyPu8=";
+    hash = "sha256-+5If4veDOGTTIhYxhAiq1cC4Sy6vAmjX5hrmUmpGlFU=";
  };

-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "clap-2.33.1" = "sha256-ixyNr91VNB2ce2cIr0CdPmvKYRlckhKLeaSbqxouIAY=";
-      "configopt-0.1.0" = "sha256-76MeSoRD796ZzBqX3CoDJnunekVo2XfctpxrpspxmAU=";
-      "rants-0.6.0" = "sha256-B8uDoiqddCki3j7aC8kilEcmJjvB4ICjZjjTun2UEkY=";
-      "retry-1.0.0" = "sha256-ZaHnzOCelV4V0+MTIbH3DXxdz8QZVgcMq2YeV0S6X6o=";
-      "structopt-0.3.15" = "sha256-0vIX7J7VktKytT3ZnOm45qPRMHDkdJg20eU6pZBIH+Q=";
-      "zmq-0.9.2" = "sha256-bsDCPYLb9hUr6htPQ7rSoasKAqoWBx5FiEY1gOOtdJQ=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-AI7Ij9F/K/chjxQUC0SnBsQQPLlVS6esa5LJAGRS9YI=";

  nativeBuildInputs = [
    pkg-config
--- a/pkgs/by-name/hu/hubstaff/package.nix
+++ b/pkgs/by-name/hu/hubstaff/package.nix
@ -1,17 +1,17 @@
 { lib, stdenv, fetchurl, unzip, makeWrapper, libX11, zlib, libSM, libICE
-, libXext , freetype, libXrender, fontconfig, libXft, libXinerama
+, libXext , freetype, libXrender, fontconfig, libXft, libXinerama, libXcursor, cairo
 , libXfixes, libXScrnSaver, libnotify, glib , gtk3, libappindicator-gtk3
 , curl, writeShellScript, common-updater-scripts, xmlstarlet }:

 let
-  url = "https://app.hubstaff.com/download/8792-standard-linux-1-6-29-release/sh";
-  version = "1.6.29-7f771670";
-  sha256 = "sha256:09vdpsmaj26bmnbsyxp76g3677lzi8p86gz66qbdvxly6a4x1hq9";
+  url = "https://app.hubstaff.com/download/9353-standard-linux-1-6-31-release/sh";
+  version = "1.6.31-a6da06ad";
+  sha256 = "sha256:07x8di08ln15mv3x7vp01wgs8zcd1rrzvmzygrl9anhx9zhgsr3b";

  rpath = lib.makeLibraryPath
    [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft
      libXinerama stdenv.cc.cc libnotify glib gtk3 libappindicator-gtk3
-      curl libXfixes libXScrnSaver ];
+      curl libXfixes libXScrnSaver libXcursor cairo ];

 in

--- a/pkgs/by-name/hy/hydralauncher/package.nix
+++ b/pkgs/by-name/hy/hydralauncher/package.nix
@ -6,10 +6,10 @@
 }:
 let
  pname = "hydralauncher";
-  version = "3.2.3";
+  version = "3.3.0";
  src = fetchurl {
    url = "https://github.com/hydralauncher/hydra/releases/download/v${version}/hydralauncher-${version}.AppImage";
-    hash = "sha256-iQL/xEyVgNfAeiz41sos8nbrGRxzQWR618EikPLS/Ig=";
+    hash = "sha256-5F/RcsRKMAMfXaPOmEkqTrJ4Zgp0+sQ36kPj0p5VUa0=";
  };

  appimageContents = appimageTools.extractType2 { inherit pname src version; };
--- a/pkgs/by-name/io/iozone/package.nix
+++ b/pkgs/by-name/io/iozone/package.nix
@ -21,11 +21,11 @@ in

 stdenv.mkDerivation rec {
  pname = "iozone";
-  version = "3.506";
+  version = "3.507";

  src = fetchurl {
    url = "http://www.iozone.org/src/current/iozone${lib.replaceStrings [ "." ] [ "_" ] version}.tar";
-    hash = "sha256-EUzlwHGHO5ose6bnPQXV735mVkOSrL/NwLMmHbEPy+c=";
+    hash = "sha256-HoCHraBW9dgBjuC8dmhtQW/CJR7QMDgFXb0K940eXOM=";
  };

  license = fetchurl {
@ -38,7 +38,10 @@ stdenv.mkDerivation rec {

  buildFlags = target;

-  enableParallelBuilding = true;
+  # The makefile doesn't define a rule for e.g. libbif.o
+  # Make will try to evaluate implicit built-in rules for these outputs if building in parallel
+  # Build in serial so that the main rule builds everything before the implicit ones are attempted
+  enableParallelBuilding = false;

  installPhase = ''
    mkdir -p $out/{bin,share/doc,libexec,share/man/man1}
--- a/pkgs/by-name/ir/irpf/package.nix
+++ b/pkgs/by-name/ir/irpf/package.nix
@ -13,7 +13,7 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "irpf";
-  version = "2024-1.6";
+  version = "2025-1.0";

  # https://www.gov.br/receitafederal/pt-br/centrais-de-conteudo/download/pgd/dirpf
  # Para outros sistemas operacionais -> Multi
@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
    in
    fetchzip {
      url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${finalAttrs.version}.zip";
-      hash = "sha256-wYSfU6tkYuSns+RnSy2c3yRR05t/8iXLhRMqPQR+oO0=";
+      hash = "sha256-gDGDOthUbRmj68CHmHhaYlGs4tiQTNVlEmuyLZ5e0zY=";
    };

  passthru.updateScript = writeScript "update-irpf" ''
--- a/pkgs/by-name/ki/kitty/package.nix
+++ b/pkgs/by-name/ki/kitty/package.nix
@ -56,21 +56,21 @@
 with python3Packages;
 buildPythonApplication rec {
  pname = "kitty";
-  version = "0.40.0";
+  version = "0.40.1";
  format = "other";

  src = fetchFromGitHub {
    owner = "kovidgoyal";
    repo = "kitty";
    tag = "v${version}";
-    hash = "sha256-c+u+lMuokDR8kWM0an3jFPC/qoK2RZTKqHZtfEnqtnM=";
+    hash = "sha256-ta9MTbSkIkowkd5zBUbtauFNGVRDgxof1SSQXuEgFTQ=";
  };

  goModules =
    (buildGo123Module {
      pname = "kitty-go-modules";
      inherit src version;
-      vendorHash = "sha256-gBEzW2k1HDDmg1P1t6u90Lf1lLe1IKGpF2T9iCA31qs=";
+      vendorHash = "sha256-wr5R2X+lV8vVVWsDYLLSaz7HRNOB7Zzk/a7knsdDlXs=";
    }).goModules;

  buildInputs =
@ -159,18 +159,6 @@ buildPythonApplication rec {
    # Skip `test_ssh_bootstrap_with_different_launchers` when launcher is `zsh` since it causes:
    # OSError: master_fd is in error condition
    ./disable-test_ssh_bootstrap_with_different_launchers.patch
-
-    # Remove after 0.40.1
-    (fetchpatch {
-      url = "https://github.com/kovidgoyal/kitty/commit/6171ca6.patch";
-      hash = "sha256-OBB0YcgEYgw3Jcg+Dgus6rwQ4gGL6GMr6pd7m9CGq9k=";
-    })
-
-    (fetchpatch {
-      url = "https://github.com/kovidgoyal/kitty/commit/8cbdd003e2.patch";
-      hash = "sha256-pKIJIqIdPfB4kQ6FtpYDumpgjJkMxoLT8fKzfgWYJnw=";
-    })
-
  ];

  hardeningDisable = [
--- a/pkgs/by-name/kn/knot-dns/package.nix
+++ b/pkgs/by-name/kn/knot-dns/package.nix
@ -33,11 +33,11 @@

 stdenv.mkDerivation rec {
  pname = "knot-dns";
-  version = "3.4.4";
+  version = "3.4.5";

  src = fetchurl {
    url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
-    sha256 = "sha256-59nW3pfyG/M+kHvZhqQDgCXzlIea8KX9GXhyA6w7ITE=";
+    sha256 = "sha256-NZr3Cvr6fMqhhDmnwes1Jw/57s6B0HVq5MpxaxQzy0s=";
  };

  outputs = [
--- 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/le/ledger-live-desktop/package.nix
+++ b/pkgs/by-name/le/ledger-live-desktop/package.nix
@ -8,11 +8,11 @@

 let
  pname = "ledger-live-desktop";
-  version = "2.102.0";
+  version = "2.104.0";

  src = fetchurl {
    url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
-    hash = "sha256-mi4YOY8TYorLiUbRCmknY3NBzTXId7/vfdvzUJSrdrI=";
+    hash = "sha256-RZweB6zE4POJRyvUXMC2nPyyIsZrTc2KkrxuZtmdZYY=";
  };

  appimageContents = appimageTools.extractType2 {
--- 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/li/lintspec/package.nix
+++ b/pkgs/by-name/li/lintspec/package.nix
@ -6,17 +6,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "lintspec";
-  version = "0.4.0";
+  version = "0.4.1";

  src = fetchFromGitHub {
    owner = "beeb";
    repo = "lintspec";
    tag = "v${version}";
-    hash = "sha256-QLD2eGuMiNh4qlzGPJOS2VbwpNCQ8+l3qKj2hDNe1oA=";
+    hash = "sha256-3+E0y3WxyjvIeIaAVhjXoBnS4+THv6L4Dj4LvpRYkog=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-EECQpihj+N8TmbSLtheyRo/ZtuTvyLT32D0mVPRR2FI=";
+  cargoHash = "sha256-TIGNToVqzRUV3/5RpbYpuMrefntft9qasCjOxmpE3lc=";

  meta = {
    description = "Blazingly fast linter for NatSpec comments in Solidity code";
--- 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/lu/lug-helper/package.nix
+++ b/pkgs/by-name/lu/lug-helper/package.nix
@ -62,7 +62,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
          unzip
          libnotify
        ]
-      }
+      } \
+      --prefix XDG_DATA_DIRS : "$out"

  '';
  passthru.updateScript = nix-update-script { };
--- a/pkgs/by-name/ma/mago/package.nix
+++ b/pkgs/by-name/ma/mago/package.nix
@ -10,17 +10,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "mago";
-  version = "0.10.0";
+  version = "0.20.2";

  src = fetchFromGitHub {
    owner = "carthage-software";
    repo = "mago";
    tag = version;
-    hash = "sha256-NYAlLJsKI+twrlryVumjsOnY3xvEeLTO/rAFTZtE+KU=";
+    hash = "sha256-XRPP57ylTLodOCzRTLO1IXLq9Yuk/vkDovSlMcushy0=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-0AnJIrA15WC3LPiokwuX9w9riaaL5s2vqwhj4XRa6LM=";
+  cargoHash = "sha256-Mlxs0ApYOOHNYEt2AWuOixLqBJrJ/++Gy+EFGsb9wKM=";

  env = {
    # Get openssl-sys to use pkg-config
@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
    tests.version = testers.testVersion {
      package = mago;
      command = "mago --version";
-      version = "mago-cli ${version}";
+      version = "mago ${version}";
    };
  };

--- a/pkgs/by-name/ma/mautrix-gmessages/package.nix
+++ b/pkgs/by-name/ma/mautrix-gmessages/package.nix
@ -10,16 +10,16 @@

 buildGoModule rec {
  pname = "mautrix-gmessages";
-  version = "0.6.0";
+  version = "0.6.1";

  src = fetchFromGitHub {
    owner = "mautrix";
    repo = "gmessages";
    tag = "v${version}";
-    hash = "sha256-FNjFGO/4j3kLo79oU5fsYA2/yhc9cAsAGIAQ5OJ2VPE=";
+    hash = "sha256-qpqFWQ4ZhgzG7SG6phW6LnS52Ve1S+Ky6YtjzfBkBmE=";
  };

-  vendorHash = "sha256-QZ16R5i0I7uvQCDpa9/0Fh3jP6TEiheenRnRUXHvYIQ=";
+  vendorHash = "sha256-Ps9I8WtTtrc3gSMxt4XZ/IUipZL2+kbgNfbY2PYFoa8=";

  ldflags = [
    "-s"
--- a/pkgs/by-name/ma/mautrix-slack/package.nix
+++ b/pkgs/by-name/ma/mautrix-slack/package.nix
@ -13,7 +13,7 @@
  withGoolm ? false,
 }:
 let
-  version = "0.1.4";
+  version = "0.2.0";
 in
 buildGoModule {
  pname = "mautrix-slack";
@ -23,10 +23,10 @@ buildGoModule {
    owner = "mautrix";
    repo = "slack";
    tag = "v${version}";
-    hash = "sha256-MDbWvbEY8+CrUL1SnjdJ4SqyOH/5gPsEQkLnTHyJdOo=";
+    hash = "sha256-y6DsojQQAQkAB4puhk3DLheVvjn0puoYvzoX1H7gBEM=";
  };

-  vendorHash = "sha256-8U6ifMLRF7PJyG3hWKgBtj/noO/eCXXD60aeB4p2W54=";
+  vendorHash = "sha256-1aYg6wDG2hzUshtHs9KiJDAFb4OM1oupUJAh3LR4KxY=";

  buildInputs = lib.optional (!withGoolm) olm;
  tags = lib.optional withGoolm "goolm";
--- a/pkgs/by-name/md/mdbook/package.nix
+++ b/pkgs/by-name/md/mdbook/package.nix
@ -9,7 +9,7 @@
  installShellFiles,
 }:
 let
-  version = "0.4.45";
+  version = "0.4.47";
 in
 rustPlatform.buildRustPackage rec {
  inherit version;
@ -19,13 +19,13 @@ rustPlatform.buildRustPackage rec {
    owner = "rust-lang";
    repo = "mdBook";
    tag = "v${version}";
-    hash = "sha256-LgjJUz1apE1MejVjl4/5O6ISpnGkBXY33g6xfoukZxA=";
+    hash = "sha256-XTvC2pGRVat0kOybNb9TziG32wDVexnFx2ahmpUFmaA=";
  };

  cargoDeps = rustPlatform.fetchCargoVendor {
    inherit pname version src;
    allowGitDependencies = false;
-    hash = "sha256-+7fC6cq6NQIUPtmNc5S5y4lRIS47v0tg1ru/AAYA6TM=";
+    hash = "sha256-ASPRBAB+elJuyXpPQBm3WI97wD3mjoO1hw0fNHc+KAw=";
  };

  nativeBuildInputs = [ installShellFiles ];
--- 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/me/meowlnir/package.nix
+++ b/pkgs/by-name/me/meowlnir/package.nix
@ -9,18 +9,18 @@

 buildGoModule rec {
  pname = "meowlnir";
-  version = "0.2.0";
+  version = "0.3.0";

  src = fetchFromGitHub {
    owner = "maunium";
    repo = "meowlnir";
    tag = "v${version}";
-    hash = "sha256-Fzi9KI6bPrmKMku176rAnLpfVcAjYlKUQ8MiSQB9hpU=";
+    hash = "sha256-ig803e4onU3E4Nj5aJo2+QfwZt12iKIJ7fS/BjXsojc=";
  };

  buildInputs = [ olm ];

-  vendorHash = "sha256-G1+KDssamPRFlGs/moBk0qJDT/IctiKgnM+mVfCDMwg=";
+  vendorHash = "sha256-+P7tlpGTo9N+uSn22uAlzyB36hu3re+KfOe3a/uzLZE=";

  doCheck = true;
  doInstallCheck = true;
--- 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/mi/milu/package.nix
+++ b/pkgs/by-name/mi/milu/package.nix
@ -5,6 +5,7 @@
  unzip,
  pkg-config,
  glib,
+  llvm,
  llvmPackages,
 }:

@ -13,32 +14,44 @@ stdenv.mkDerivation {
  version = "2016-05-09";

  src = fetchFromGitHub {
-    sha256 = "14cglw04cliwlpvw7qrs6rfm5sv6qa558d7iby5ng3wdjcwx43nk";
-    rev = "b5f2521859c0319d321ad3c1ad793b826ab5f6e1";
-    repo = "Milu";
    owner = "yuejia";
+    repo = "Milu";
+    rev = "b5f2521859c0319d321ad3c1ad793b826ab5f6e1";
+    hash = "sha256-0w7SOZONj2eLX/E0VIrCZutSXTY648P3pTxSRgCnj5E=";
  };

  hardeningDisable = [ "format" ];

  preConfigure = ''
-    sed -i 's#/usr/bin/##g' Makefile
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp bin/milu $out/bin
+    substituteInPlace Makefile \
+      --replace-fail /usr/bin/ "" \
+      --replace-fail bin/milu $out/bin/milu
  '';

  nativeBuildInputs = [
    pkg-config
    unzip
  ];
+
  buildInputs = [
    glib
+    llvm.dev
    llvmPackages.libclang
  ];

+  preBuild = ''
+    mkdir -p $out/bin
+  '';
+
+  env.NIX_CFLAGS_COMPILE = toString [
+    "-Wno-incompatible-pointer-types"
+    "-Wno-implicit-function-declaration"
+    "-Wno-error=int-conversion"
+  ];
+
+  # `make all` already installs the binaries
+  dontInstall = true;
+
  meta = {
    description = "Higher Order Mutation Testing Tool for C and C++ programs";
    homepage = "https://github.com/yuejia/Milu";
--- a/pkgs/by-name/mq/mqttx/package.nix
+++ b/pkgs/by-name/mq/mqttx/package.nix
@ -8,7 +8,7 @@

 let
  pname = "mqttx";
-  version = "1.10.1";
+  version = "1.11.1";

  suffixedUrl =
    suffix:
@ -16,11 +16,11 @@ let
  sources = {
    "aarch64-linux" = fetchurl {
      url = suffixedUrl "-arm64";
-      hash = "sha256-QumOqOOFXOXf0oqXWVaz0+69kHDk3HQKvNcQl8X7Fp8=";
+      hash = "sha256-gRR0gFHqIPXOrSytqERAi7msfrrYXm2xP84Jy+UhrKg=";
    };
    "x86_64-linux" = fetchurl {
      url = suffixedUrl "";
-      hash = "sha256-+TyZnx3/qraoA3rcpIDKedGyTzFvdaAE/v4pzXrB0zU=";
+      hash = "sha256-rqzh4whp8NaeQb98mKTu+hL3RXQBEOKgvJKwLhzu+hg=";
    };
  };

@ -35,6 +35,8 @@ in
 appimageTools.wrapType2 {
  inherit pname version src;

+  extraPkgs = pkgs: [ pkgs.xorg.libxshmfence ];
+
  extraInstallCommands = ''
    install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop
    install -m 444 -D ${appimageContents}/${pname}.png $out/share/icons/hicolor/1024x1024/apps/${pname}.png
@ -43,7 +45,7 @@ appimageTools.wrapType2 {
    install -m 444 -D ${pname}_512.png $out/share/icons/hicolor/512x512/apps/${pname}.png

    substituteInPlace $out/share/applications/${pname}.desktop \
-      --replace 'Exec=AppRun' 'Exec=${pname}'
+      --replace-fail 'Exec=AppRun' 'Exec=${pname}'
  '';

  meta = with lib; {
--- a/pkgs/by-name/ne/nestopia-ue/package.nix
+++ b/pkgs/by-name/ne/nestopia-ue/package.nix
@ -13,6 +13,7 @@
  libepoxy,
  makeWrapper,
  pkg-config,
+  libsamplerate,
  stdenv,
  unzip,
  wrapGAppsHook3,
@ -21,13 +22,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "nestopia";
-  version = "1.52.1";
+  version = "1.53.0";

  src = fetchFromGitHub {
    owner = "0ldsk00l";
    repo = "nestopia";
    rev = finalAttrs.version;
-    hash = "sha256-r8Z0Ejf5vWcdvxkUkUKJtipQIRoiwoRj0Bx06Gnxd08=";
+    hash = "sha256-C2uiC8zlleXQlThrRETJa9vu++mJy1ySJKAkgu5zuxc=";
  };

  buildInputs = [
@ -41,6 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
    libarchive
    libao
    xdg-utils
+    libsamplerate
  ];

  nativeBuildInputs = [
--- 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/ni/ninjavis/package.nix
+++ b/pkgs/by-name/ni/ninjavis/package.nix
@ -0,0 +1,44 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "ninjavis";
+  version = "0.2.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "chagui";
+    repo = "ninjavis";
+    tag = "v${version}";
+    hash = "sha256-4MXU43noG0mKwiXWrLu1tW9YGkU1YjP/UoUKZzVer14=";
+  };
+
+  build-system = [
+    python3Packages.poetry-core
+  ];
+
+  pythonImportsCheck = [
+    "ninjavis"
+  ];
+
+  doInstallCheck = true;
+  installCheckPhase = ''
+    runHook preInstallCheck
+
+    env --ignore-environment $out/bin/ninjavis --help
+
+    runHook postInstallCheck
+  '';
+
+  meta = {
+    description = "Generate visualization from Ninja build logs";
+    homepage = "https://github.com/chagui/ninjavis";
+    changelog = "https://github.com/chagui/ninjavis/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pbsds ];
+    mainProgram = "ninjavis";
+  };
+}
--- a/pkgs/by-name/op/opengamepadui/package.nix
+++ b/pkgs/by-name/op/opengamepadui/package.nix
@ -5,7 +5,7 @@
  dbus,
  fetchFromGitHub,
  gamescope,
-  godot_4_3,
+  godot_4_4,
  hwdata,
  lib,
  libGL,
@ -24,7 +24,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "opengamepadui";
-  version = "0.35.8";
+  version = "0.37.0";

  buildType = if withDebug then "debug" else "release";

@ -32,21 +32,21 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "ShadowBlip";
    repo = "OpenGamepadUI";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-vMb08Wqjt5j6IgMnXuZr6MGNk1CprVn2GTNDdOxnFG0=";
+    hash = "sha256-kzGFyzOu4Pkj+a7kExFwxFu35qfoLoWz3uqd8COUTNA=";
  };

  cargoDeps = rustPlatform.fetchCargoVendor {
    inherit (finalAttrs) src;
    sourceRoot = "source/${finalAttrs.cargoRoot}";
-    hash = "sha256-sTzMewIfKHbmVhSPZgUIzFFz1ahK+PMoQ5oB4GEt8nY=";
+    hash = "sha256-T79G2bShJuFRfaCqG3IDHqW0s68yAdGyv58kdDYg6kg=";
  };
  cargoRoot = "extensions";

  nativeBuildInputs = [
    autoPatchelfHook
    cargo
-    godot_4_3
-    godot_4_3.export-templates-bin
+    godot_4_4
+    godot_4_4.export-templates-bin
    pkg-config
    rustPlatform.cargoSetupHook
  ];
@ -75,13 +75,13 @@ stdenv.mkDerivation (finalAttrs: {

  env =
    let
-      versionAndRelease = lib.splitString "-" godot_4_3.version;
+      versionAndRelease = lib.splitString "-" godot_4_4.version;
    in
    {
-      GODOT = lib.getExe godot_4_3;
+      GODOT = lib.getExe godot_4_4;
      GODOT_VERSION = lib.elemAt versionAndRelease 0;
      GODOT_RELEASE = lib.elemAt versionAndRelease 1;
-      EXPORT_TEMPLATE = "${godot_4_3.export-templates-bin}";
+      EXPORT_TEMPLATE = "${godot_4_4.export-templates-bin}";
      BUILD_TYPE = "${finalAttrs.buildType}";
    };

@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
    # Godot looks for export templates in HOME
    export HOME=$(mktemp -d)
    mkdir -p $HOME/.local/share/godot/export_templates
-    ln -s "${godot_4_3.export-templates-bin}" "$HOME/.local/share/godot/export_templates/$GODOT_VERSION.$GODOT_RELEASE"
+    ln -s "${godot_4_4.export-templates-bin}" "$HOME/.local/share/godot/export_templates/$GODOT_VERSION.$GODOT_RELEASE"
  '';

  postInstall = ''
--- a/pkgs/by-name/pa/paretosecurity/package.nix
+++ b/pkgs/by-name/pa/paretosecurity/package.nix
@ -9,18 +9,15 @@

 buildGoModule rec {
  pname = "paretosecurity";
-  version = "0.0.87";
+  version = "0.0.88";

  src = fetchFromGitHub {
    owner = "ParetoSecurity";
    repo = "agent";
    rev = version;
-    hash = "sha256-SgMALLuGq4HGj5eo7JdvtcWOEGuUoLyC3pgamB1WBzI=";
+    hash = "sha256-UVnZhkajrc9q6AZvIU7oi931ugxkiVSPk1NugAERnek=";
  };

-  # tests do network access, fix pending
-  doCheck = false;
-
  vendorHash = "sha256-HReQu23sHLaxc5N8h2vYv64ruJPmY4HM9whAEKV+3Eo=";
  proxyVendor = true;

--- a/pkgs/by-name/pi/pik/package.nix
+++ b/pkgs/by-name/pi/pik/package.nix
@ -8,17 +8,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "pik";
-  version = "0.16.0";
+  version = "0.18.1";

  src = fetchFromGitHub {
    owner = "jacek-kurlit";
    repo = "pik";
    rev = version;
-    hash = "sha256-L5r8ds5Avh6WqiYYg/0hVDjdp/TBGgCZgKnJoDzs7Rw=";
+    hash = "sha256-8+Q5j9PWiITVgZkJnX+oWbC6QnNDhFxX4jLiMDWnw/g=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-d2I4RDo/U+69WwXjxHRsRNUxY2ymxzHqObR6X68xXRo=";
+  cargoHash = "sha256-6U0QkLgGEONGRDfrDVkxeHSJy9QnfQqn2YiZEswunTk=";

  passthru.tests.version = testers.testVersion { package = pik; };

--- a/pkgs/by-name/pi/pilipalax/package.nix
+++ b/pkgs/by-name/pi/pilipalax/package.nix
@ -11,13 +11,13 @@

 flutter324.buildFlutterApplication rec {
  pname = "pilipalax";
-  version = "1.1.0-beta.5";
+  version = "1.1.2-beta";

  src = fetchFromGitHub {
    owner = "orz12";
    repo = "PiliPalaX";
-    tag = "${version}+180";
-    hash = "sha256-bKs0EZjJCJvtVOZYl3GqXPE2MxX7DRjMwtmFUcNgrOQ=";
+    tag = "${version}+187";
+    hash = "sha256-8GQtPYgeYM7yTw3i5H9REWfM5j3G0aQz3oHxz8i9p2Y=";
  };

  pubspecLock = lib.importJSON ./pubspec.lock.json;
--- a/pkgs/by-name/pi/pilipalax/pubspec.lock.json
+++ b/pkgs/by-name/pi/pilipalax/pubspec.lock.json
@ -1718,61 +1718,61 @@
      "dependency": "direct overridden",
      "description": {
        "name": "screen_brightness",
-        "sha256": "a9a98666045ad4ea0d82bca09fe5f007b8440e315075dc948c1507a9b72ee41f",
+        "sha256": "99b898dae860ebe55fc872d8e300c6eafff3ee4ccb09301b90adb3f241f29874",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.0.1"
+      "version": "2.1.1"
    },
    "screen_brightness_android": {
      "dependency": "transitive",
      "description": {
        "name": "screen_brightness_android",
-        "sha256": "74455f9901ab8a1a45c9097b83855dbbb7498110cc2bc249cb5a86570dd1cf7c",
+        "sha256": "ff9141bed547db02233e7dd88f990ab01973a0c8a8c04ddb855c7b072f33409a",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.0.0"
+      "version": "2.1.0"
    },
    "screen_brightness_ios": {
      "dependency": "transitive",
      "description": {
        "name": "screen_brightness_ios",
-        "sha256": "caee02b34e0089b138a7aee35c461bd2d7c78446dd417f07613def192598ca08",
+        "sha256": "bfd9bfd0ac852e7aa170e7e356cc27195b2a75037b72c8c6336cf6fb2115cffb",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.0.0"
+      "version": "2.1.1"
    },
    "screen_brightness_macos": {
      "dependency": "transitive",
      "description": {
        "name": "screen_brightness_macos",
-        "sha256": "84fc8ffcbcf19c03d76b7673b0f2c2a2663c09aa2bc37c76ea83ab049294a97a",
+        "sha256": "4edf330ad21078686d8bfaf89413325fbaf571dcebe1e89254d675a3f288b5b9",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.0.0"
+      "version": "2.1.1"
    },
    "screen_brightness_platform_interface": {
      "dependency": "transitive",
      "description": {
        "name": "screen_brightness_platform_interface",
-        "sha256": "321e9455b0057e3647fd37700931e063739d94a8aa1b094f98133c01cb56c27b",
+        "sha256": "737bd47b57746bc4291cab1b8a5843ee881af499514881b0247ec77447ee769c",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.0.0"
+      "version": "2.1.0"
    },
    "screen_brightness_windows": {
      "dependency": "transitive",
      "description": {
        "name": "screen_brightness_windows",
-        "sha256": "5edbfb1dcaedf960f6858efac8ca45d6c18faae17df86e2c03137d3a563ea155",
+        "sha256": "d3518bf0f5d7a884cee2c14449ae0b36803802866de09f7ef74077874b6b2448",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.0.1"
+      "version": "2.1.0"
    },
    "scrollable_positioned_list": {
      "dependency": "direct main",
--- 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/protonplus/package.nix
+++ b/pkgs/by-name/pr/protonplus/package.nix
@ -20,13 +20,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "protonplus";
-  version = "0.4.25";
+  version = "0.4.27";

  src = fetchFromGitHub {
    owner = "Vysp3r";
    repo = "protonplus";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-IDEJ1/53fVq8FA58e3Fk/SPD8+xtXWLQr5IgNiim1jk=";
+    hash = "sha256-y6fqn02Ui5RbBy5oMeX5HPRHQDUYD2MphoubZxIwQI8=";
  };

  nativeBuildInputs = [
--- 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/pw/pwvucontrol/package.nix
+++ b/pkgs/by-name/pw/pwvucontrol/package.nix
@ -43,18 +43,18 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "pwvucontrol";
-  version = "0.4.8";
+  version = "0.4.9";

  src = fetchFromGitHub {
    owner = "saivert";
    repo = "pwvucontrol";
    tag = finalAttrs.version;
-    hash = "sha256-E3UfZO0R6WGeUffgGQ2ceHiG4hwIuFntTdCpojaWL8E=";
+    hash = "sha256-fmEXVUz3SerVgWijT/CAoelSUzq861AkBVjP5qwS0ao=";
  };

  cargoDeps = rustPlatform.fetchCargoVendor {
    inherit (finalAttrs) pname version src;
-    hash = "sha256-uaRpaiVjxc0j4oDbmmwt8SPS7O7hWzoYO62jLYzHl1c=";
+    hash = "sha256-oQSH4P9WxvkXZ53KM5ZoRAZyQFt60Zz7guBbgT1iiBk=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/qu/quicktemplate/package.nix
+++ b/pkgs/by-name/qu/quicktemplate/package.nix
@ -3,16 +3,15 @@
  buildGoModule,
  fetchFromGitHub,
 }:
-
 buildGoModule rec {
  pname = "quicktemplate";
-  version = "1.7.0";
+  version = "1.8.0";

  src = fetchFromGitHub {
    owner = "valyala";
    repo = "quicktemplate";
    rev = "v${version}";
-    sha256 = "0xzsvhpllmzmyfg8sj1dpp02826j1plmyrdvqbwryzhf2ci33nqr";
+    sha256 = "cra3LZ3Yq0KNQErQ2q0bVSy7rOLKdSkIryIgQsNRBHw=";
  };

  vendorHash = null;
--- a/pkgs/by-name/ra/rainfrog/package.nix
+++ b/pkgs/by-name/ra/rainfrog/package.nix
@ -9,7 +9,7 @@
  rainfrog,
 }:
 let
-  version = "0.2.14";
+  version = "0.2.15";
 in
 rustPlatform.buildRustPackage {
  inherit version;
@ -19,11 +19,11 @@ rustPlatform.buildRustPackage {
    owner = "achristmascarl";
    repo = "rainfrog";
    tag = "v${version}";
-    hash = "sha256-mN7xZs95bi+/wjmOZnOC6LRF7frF0xGJvTMseK2Uorc=";
+    hash = "sha256-r+tual/ko8SjToMR9ek/Gf5GJieu2wPsMMkjKXw+cLk=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-a5uMHiuxVyfRNdGBf7LW00qfQNqAyRnxMq/rMYz3dBg=";
+  cargoHash = "sha256-JkH771cXGz8YcRy+zO/mB4hkFrA6l0Yg86cLCgsjbrE=";

  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
    with darwin.apple_sdk.frameworks;
--- a/pkgs/by-name/re/readest/package.nix
+++ b/pkgs/by-name/re/readest/package.nix
@ -19,13 +19,13 @@

 rustPlatform.buildRustPackage rec {
  pname = "readest";
-  version = "0.9.19";
+  version = "0.9.23";

  src = fetchFromGitHub {
    owner = "readest";
    repo = "readest";
    tag = "v${version}";
-    hash = "sha256-Z84vH6vEtUMly++I+2AWBGl+3NXEAyjSIVJ57DnUS54=";
+    hash = "sha256-MveWZ+9SSd6mPw580U8d8aP7c4rl4861VzCKHpOKiXU=";
    fetchSubmodules = true;
  };

@ -38,14 +38,14 @@ rustPlatform.buildRustPackage rec {

  pnpmDeps = pnpm_9.fetchDeps {
    inherit pname version src;
-    hash = "sha256-gHYZpUQOznFIwH0w0tyWyQYyOwNwL8aRcDthx902h+4=";
+    hash = "sha256-faLytJLMlWs80HZpN0TnCCEWPe9SPP9QH0bx3HLDO5o=";
  };

  pnpmRoot = "../..";

  useFetchCargoVendor = true;

-  cargoHash = "sha256-uAVYvyNKK0megsl3QEfN3vbuO1gJfwbOm9K0SohuGfg=";
+  cargoHash = "sha256-5E+3Hpa6hiOORtZ5ykrXVOPucbppwO5KVVS1mb9mVXY=";

  cargoRoot = "../..";

--- a/pkgs/by-name/re/refine/package.nix
+++ b/pkgs/by-name/re/refine/package.nix
@ -34,7 +34,7 @@ in

 python3Packages.buildPythonApplication rec {
  pname = "refine";
-  version = "0.5.2";
+  version = "0.5.5";
  pyproject = false; # uses meson

  src = fetchFromGitLab {
@ -42,7 +42,7 @@ python3Packages.buildPythonApplication rec {
    owner = "TheEvilSkeleton";
    repo = "Refine";
    tag = version;
-    hash = "sha256-G1G9uuch7kdqWvSfCSOgb9o67da7spNKnnka47k4/rY=";
+    hash = "sha256-b2dNhd5UJqH/l5BOEgcOUZrhCZa8ErdBzNw5g4VjtM8=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/re/renovate/package.nix
+++ b/pkgs/by-name/re/renovate/package.nix
@ -15,13 +15,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "renovate";
-  version = "39.191.0";
+  version = "39.208.1";

  src = fetchFromGitHub {
    owner = "renovatebot";
    repo = "renovate";
    tag = finalAttrs.version;
-    hash = "sha256-HJvtYqEUmIr+P8g6cCr+NSgmZkzF7TZaVifyhI84oSY=";
+    hash = "sha256-Y4EJCbIK3XZAilbf/zMEfjEDYHNrUrAGRfsNmY0h/Bw=";
  };

  postPatch = ''
@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {

  pnpmDeps = pnpm_10.fetchDeps {
    inherit (finalAttrs) pname version src;
-    hash = "sha256-w0BaiLwP2AC2KsP2+GTgagMcfFbP/FBaUurbL9y+pXw=";
+    hash = "sha256-5KGTt6lx44LNpHG/RelCQ1ZlQOMOL6bJi66M2nCiirg=";
  };

  env.COREPACK_ENABLE_STRICT = 0;
--- 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/rp/rpiboot/package.nix
+++ b/pkgs/by-name/rp/rpiboot/package.nix
@ -22,15 +22,10 @@ stdenv.mkDerivation rec {
  buildInputs = [ libusb1 ];
  nativeBuildInputs = [ pkg-config ];

-  patchPhase = ''
-    sed -i "s@/usr/@$out/@g" main.c
-  '';
+  makeFlags = [ "INSTALL_PREFIX=$(out)" ];

-  installPhase = ''
+  preInstall = ''
    mkdir -p $out/bin
-    mkdir -p $out/share/rpiboot
-    cp rpiboot $out/bin
-    cp -r msd firmware eeprom-erase mass-storage-gadget* recovery* secure-boot* rpi-eeprom rpi-imager-embedded $out/share/rpiboot
  '';

  passthru.updateScript = gitUpdater { };
--- 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/sh/showtime/package.nix
+++ b/pkgs/by-name/sh/showtime/package.nix
@ -19,7 +19,7 @@

 python3Packages.buildPythonApplication rec {
  pname = "showtime";
-  version = "47.0";
+  version = "48.0";
  pyproject = false;

  src = fetchFromGitLab {
@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec {
    owner = "Incubator";
    repo = "showtime";
    rev = "refs/tags/${version}";
-    hash = "sha256-Bnz+LFyvwSjkrbePmoVZZqy2pNLqiyJTsZsSuUyDy+E=";
+    hash = "sha256-w6ERJNBw+YgPHfm24KKYFS6T4EKEguHOeron0ofLxIg=";
  };

  strictDeps = true;
--- a/pkgs/by-name/si/siyuan/package.nix
+++ b/pkgs/by-name/si/siyuan/package.nix
@ -35,20 +35,20 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "siyuan";
-  version = "3.1.24";
+  version = "3.1.25";

  src = fetchFromGitHub {
    owner = "siyuan-note";
    repo = "siyuan";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-BrFyMaxACkdjQy151vIYiJ9WotogEbEKWnFXNhyqKw4=";
+    hash = "sha256-ZLhLuRj5gdqca9Sbty7BEUBB/+8SgPYhnhoSOR5j4YE=";
  };

  kernel = buildGo123Module {
    name = "${finalAttrs.pname}-${finalAttrs.version}-kernel";
    inherit (finalAttrs) src;
    sourceRoot = "${finalAttrs.src.name}/kernel";
-    vendorHash = "sha256-2ryd+GciVGmvqLNgdvoHC1tjjnFZgWO2uObj8uNwu0E=";
+    vendorHash = "sha256-pW52K3nvIdhpeBj2CtJwwsihcV10+FEf2mgAX61s5nM=";

    patches = [
      (replaceVars ./set-pandoc-path.patch {
@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
      src
      sourceRoot
      ;
-    hash = "sha256-yfcgSCL78hGcq/QDvqx9jMLivW06oRVzI8iqQ7gCrlQ=";
+    hash = "sha256-01UyupFLr82w0LmainA/7u6195Li/QoTzz/tVxXSVQE=";
  };

  sourceRoot = "${finalAttrs.src.name}/app";
--- a/pkgs/by-name/st/stackit-cli/package.nix
+++ b/pkgs/by-name/st/stackit-cli/package.nix
@ -12,16 +12,16 @@

 buildGoModule rec {
  pname = "stackit-cli";
-  version = "0.24.0";
+  version = "0.26.0";

  src = fetchFromGitHub {
    owner = "stackitcloud";
    repo = "stackit-cli";
    rev = "v${version}";
-    hash = "sha256-n1F/DjGvNzU5aF05y3K6/vDuFa/ed2XZLfpafi5+NWg=";
+    hash = "sha256-7XI5YkfLY/Jo1lVEQ2waN7/g8xN8LUTXIva8OzRdRSo=";
  };

-  vendorHash = "sha256-EaHRYdP7w1PQFYNxAWiTYcCpfipuqvbtbBUYNXNM6nc=";
+  vendorHash = "sha256-ZVDe28D2vw/p5i6MoBZ1KS9pjncOzul3/bLB4cGoY80=";

  subPackages = [ "." ];

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