Merge 4a65905b70 into haskell-updates

2026-07-20 15:41:16 +00:00 · 2026-02-05 00:28:31 +00:00
parent db59fdfd56 4a65905b70
commit 9132d7ac3d
319 changed files with 5278 additions and 8716 deletions
--- a/doc/hooks/index.md
+++ b/doc/hooks/index.md
@@ -22,6 +22,7 @@ haredo.section.md
 installShellFiles.section.md
 julec.section.md
 just.section.md
+libglycin.section.md
 libiconv.section.md
 libxml2.section.md
 meson.section.md
--- a/doc/hooks/libglycin.section.md
+++ b/doc/hooks/libglycin.section.md
@@ -0,0 +1,47 @@
+# libglycin {#libglycin-hooks}
+
+[Glycin](https://gitlab.gnome.org/GNOME/glycin) is a library for sandboxed and extendable image loading.
+
+[]{#libglycin-setup-hook} For most applications using it, individual image formats are loaded through binaries provided by `glycin-loaders`. The paths of these loaders must be injected into the environment, e.g. using [`wrapGAppsHook`](#ssec-gnome-hooks). `libglycin.setupHook` will do that.
+
+[]{#libglycin-patch-vendor-hook} Additionally, for Rust projects `glycin` Rust crate itself requires a patch to become self-contained. `libglycin.patchVendorHook` will do that. This is not needed for projects using the ELF library from `libglycin` package.
+
+## Example code snippet {#libglycin-hooks-example-code-snippet}
+
+```nix
+{
+  lib,
+  rustPlatform,
+  libglycin,
+  glycin-loaders,
+  wrapGAppsHook4,
+}:
+
+rustPlatform.buildRustPackage {
+  # ...
+
+  cargoHash = "...";
+
+  nativeBuildInputs = [
+    wrapGAppsHook4
+    libglycin.patchVendorHook
+  ];
+
+  buildInputs = [
+    libglycin.setupHook
+    glycin-loaders
+  ];
+
+  # ...
+}
+```
+
+## Variables controlling glycin-loaders {#libglycin-hook-variables-controlling}
+
+### `glycinCargoDepsPath` {#glycin-cargo-deps-path}
+
+Path to a directory containing the `glycin` crate to patch. Defaults to the crate directory created by `cargoSetupHook`, or `./vendor/`.
+
+### `dontWrapGlycinLoaders` {#glycin-dont-wrap}
+
+Disable adding the Glycin loaders path `XDG_DATA_DIRS` with `wrapGAppsHook`.
--- a/doc/languages-frameworks/gnome.section.md
+++ b/doc/languages-frameworks/gnome.section.md
@@ -129,6 +129,8 @@ The hooks do the following:

 - []{#ssec-gnome-hooks-gst-grl-plugins} Setup hooks of `gst_all_1.gstreamer` and `grilo` will populate the `GST_PLUGIN_SYSTEM_PATH_1_0` and `GRL_PLUGIN_PATH` variables, respectively, which will then be added to the wrapper by `wrapGApps*` hook.

+- []{#ssec-gnome-hooks-libglycin} `libglycin`'s [setup hook](#libglycin-setup-hook) will populate `XDG_DATA_DIRS` with the path to the loaders.
+
 You can also pass additional arguments to `makeWrapper` using `gappsWrapperArgs` in `preFixup` hook:

 ```nix
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -2473,6 +2473,27 @@
  "setup-hook-gdk-pixbuf": [
    "index.html#setup-hook-gdk-pixbuf"
  ],
+  "libglycin-hooks": [
+    "index.html#libglycin-hooks"
+  ],
+  "libglycin-setup-hook": [
+    "index.html#libglycin-setup-hook"
+  ],
+  "libglycin-patch-vendor-hook": [
+    "index.html#libglycin-patch-vendor-hook"
+  ],
+  "libglycin-hooks-example-code-snippet": [
+    "index.html#libglycin-hooks-example-code-snippet"
+  ],
+  "libglycin-hook-variables-controlling": [
+    "index.html#libglycin-hook-variables-controlling"
+  ],
+  "glycin-cargo-deps-path": [
+    "index.html#glycin-cargo-deps-path"
+  ],
+  "glycin-dont-wrap": [
+    "index.html#glycin-dont-wrap"
+  ],
  "ghc": [
    "index.html#ghc"
  ],
@@ -3173,6 +3194,9 @@
  "ssec-gnome-hooks-gst-grl-plugins": [
    "index.html#ssec-gnome-hooks-gst-grl-plugins"
  ],
+  "ssec-gnome-hooks-libglycin": [
+    "index.html#ssec-gnome-hooks-libglycin"
+  ],
  "ssec-gnome-updating": [
    "index.html#ssec-gnome-updating"
  ],
--- a/doc/release-notes/rl-2605.section.md
+++ b/doc/release-notes/rl-2605.section.md
@@ -86,7 +86,7 @@

 - `iroh` has been removed and split up into `iroh-dns-server` and `iroh-relay`.

- the `xorg` package set has been deprecated and will be removed, packages have moved to the top level.
+- the `xorg` package set has been deprecated, packages have moved to the top level.

 - `python3Packages.pygame` has been been renamed to `python3Packages.pygame-original`, the attribute `python3Packages.pygame` will from python 3.14 default to the more actively maintained `python3Packages.pygame-ce`

--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -12,6 +12,7 @@ let
    concatMap
    concatStringsSep
    elem
+    elemAt
    filter
    foldl'
    functionArgs
@@ -20,12 +21,14 @@ let
    head
    id
    imap1
+    init
    isAttrs
    isBool
    isFunction
    oldestSupportedReleaseIsAtLeast
    isList
    isString
+    last
    length
    mapAttrs
    mapAttrsToList
@@ -34,12 +37,16 @@ let
    optional
    optionalAttrs
    optionalString
+    pipe
    recursiveUpdate
+    remove
    reverseList
    sort
+    sortOn
    seq
    setAttrByPath
    substring
+    take
    throwIfNot
    trace
    typeOf
@@ -60,6 +67,8 @@ let
    ;
  inherit (lib.strings)
    isConvertibleWithToString
+    levenshtein
+    levenshteinAtMost
    ;

  showDeclPrefix =
@@ -304,8 +313,41 @@ let
                  addErrorContext
                    "while evaluating the error message for definitions for `${optText}', which is an option that does not exist"
                    (addErrorContext "while evaluating a definition from `${firstDef.file}'" (showDefs [ firstDef ]));
+
+                # absInvalidOptionParent is absolute; other variables are relative to the submodule prefix
+                absInvalidOptionParent = init (prefix ++ firstDef.prefix);
+                invalidOptionParent = init firstDef.prefix;
+                siblingOptionNames = attrNames (attrByPath invalidOptionParent { } options);
+                candidateNames =
+                  if invalidOptionParent == [ ] then remove "_module" siblingOptionNames else siblingOptionNames;
+                invalidOptionName = last firstDef.prefix;
+                # For small option sets, check all; for large sets, only check distance ≤ 2
+                suggestions =
+                  if length candidateNames < 100 then
+                    pipe candidateNames [
+                      (sortOn (levenshtein invalidOptionName))
+                      (take 3)
+                    ]
+                  else
+                    pipe candidateNames [
+                      # levenshteinAtMost is only fast for distance ≤ 2
+                      (filter (levenshteinAtMost 2 invalidOptionName))
+                      (sortOn (levenshtein invalidOptionName))
+                      (take 3)
+                    ];
+                suggestion =
+                  if suggestions == [ ] then
+                    ""
+                  else if length suggestions == 1 then
+                    "\n\nDid you mean `${showOption (absInvalidOptionParent ++ [ (head suggestions) ])}'?"
+                  else
+                    "\n\nDid you mean ${
+                      concatStringsSep ", " (
+                        map (s: "`${showOption (absInvalidOptionParent ++ [ s ])}'") (init suggestions)
+                      )
+                    } or `${showOption (absInvalidOptionParent ++ [ (last suggestions) ])}'?";
              in
-              "The option `${optText}' does not exist. Definition values:${defText}";
+              "The option `${optText}' does not exist. Definition values:${defText}${suggestion}";
          in
          if
            attrNames options == [ "_module" ]
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -22,6 +22,10 @@ rec {
    linux-kernel.autoModules = false;
  };

+  ##
+  ## POWER
+  ##
+
  powernv = {
    linux-kernel = {
      name = "PowerNV";
@@ -29,16 +33,16 @@ rec {
      baseConfig = "powernv_defconfig";
      target = "vmlinux";
      autoModules = true;
-      # avoid driver/FS trouble arising from unusual page size
-      extraConfig = ''
-        PPC_64K_PAGES n
-        PPC_4K_PAGES y
-        IPV6 y
+    };
+  };

-        ATA_BMDMA y
-        ATA_SFF y
-        VIRTIO_MENU y
-      '';
+  ppc64 = {
+    linux-kernel = {
+      name = "powerpc64";
+
+      baseConfig = "ppc64_defconfig";
+      target = "vmlinux";
+      autoModules = true;
    };
  };

@@ -625,8 +629,8 @@ rec {
    else if platform.parsed.cpu == lib.systems.parse.cpuTypes.mipsel then
      (import ./examples.nix { inherit lib; }).mipsel-linux-gnu

-    else if platform.parsed.cpu == lib.systems.parse.cpuTypes.powerpc64le then
-      powernv
+    else if platform.isPower64 then
+      if platform.isLittleEndian then powernv else ppc64

    else if platform.isLoongArch64 then
      loongarch64-multiplatform
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -870,6 +870,14 @@ checkConfigError 'A definition for option .* is not of type .*' config.addCheckF
 checkConfigOutput '^true$' config.result ./v2-check-coherence.nix


+# Option name suggestions
+checkConfigError 'Did you mean .set\.enable.\?' config.set ./error-typo-nested.nix
+checkConfigError 'Did you mean .set.\?' config ./error-typo-outside-with-nested.nix
+checkConfigError 'Did you mean .bar., .baz. or .foo.\?' config ./error-typo-multiple-suggestions.nix
+checkConfigError 'Did you mean .enable., .ebe. or .enabled.\?' config ./error-typo-large-attrset.nix
+checkConfigError 'Did you mean .services\.myservice\.port. or .services\.myservice\.enable.\?' config.services.myservice ./error-typo-submodule.nix
+checkConfigError 'Did you mean .services\.nginx\.virtualHosts\."example\.com"\.ssl\.certificate. or .services\.nginx\.virtualHosts\."example\.com"\.ssl\.certificateKey.\?' config.services.nginx.virtualHosts.\"example.com\" ./error-typo-deeply-nested.nix
+
 cat <<EOF
 ====== module tests ======
 $pass Pass
--- a/lib/tests/modules/error-typo-deeply-nested.nix
+++ b/lib/tests/modules/error-typo-deeply-nested.nix
@@ -0,0 +1,42 @@
+{ lib, ... }:
+
+{
+  options.services = {
+    nginx = {
+      enable = lib.mkOption {
+        default = false;
+        type = lib.types.bool;
+      };
+      virtualHosts = lib.mkOption {
+        type = lib.types.attrsOf (
+          lib.types.submodule {
+            options = {
+              enableSSL = lib.mkOption {
+                default = false;
+                type = lib.types.bool;
+              };
+              ssl = {
+                certificate = lib.mkOption {
+                  default = "";
+                  type = lib.types.str;
+                };
+                certificateKey = lib.mkOption {
+                  default = "";
+                  type = lib.types.str;
+                };
+              };
+            };
+          }
+        );
+        default = { };
+      };
+    };
+  };
+
+  config = {
+    services.nginx.virtualHosts."example.com" = {
+      # Typo: "certficate" instead of "certificate" (nested within submodule)
+      ssl.certficate = "/path/to/cert";
+    };
+  };
+}
--- a/lib/tests/modules/error-typo-large-attrset.nix
+++ b/lib/tests/modules/error-typo-large-attrset.nix
@@ -0,0 +1,56 @@
+{ lib, ... }:
+
+let
+  inherit (lib) mkOption concatMapAttrs;
+
+  ten = {
+    a = null;
+    b = null;
+    c = null;
+    d = null;
+    e = null;
+    f = null;
+    g = null;
+    h = null;
+    i = null;
+    j = null;
+  };
+
+  # Generate 1000 options (10 * 10 * 10)
+  generatedOptions = concatMapAttrs (
+    k1: _:
+    concatMapAttrs (
+      k2: _:
+      concatMapAttrs (k3: _: {
+        "${k1}${k2}${k3}" = mkOption {
+          type = lib.types.bool;
+          default = false;
+        };
+      }) ten
+    ) ten
+  ) ten;
+
+  # Add some sensible options that are close to our typo
+  sensibleOptions = {
+    enable = mkOption {
+      type = lib.types.bool;
+      default = false;
+    };
+    enabled = mkOption {
+      type = lib.types.bool;
+      default = false;
+    };
+    disable = mkOption {
+      type = lib.types.bool;
+      default = false;
+    };
+  };
+in
+{
+  options = generatedOptions // sensibleOptions;
+
+  config = {
+    # Typo: "enble" is distance 1 from "enable"
+    enble = true;
+  };
+}
--- a/lib/tests/modules/error-typo-multiple-suggestions.nix
+++ b/lib/tests/modules/error-typo-multiple-suggestions.nix
@@ -0,0 +1,22 @@
+{ lib, ... }:
+
+{
+  options.foo = lib.mkOption {
+    default = false;
+    type = lib.types.bool;
+  };
+
+  options.bar = lib.mkOption {
+    default = false;
+    type = lib.types.bool;
+  };
+
+  options.baz = lib.mkOption {
+    default = false;
+    type = lib.types.bool;
+  };
+
+  config = {
+    far = true;
+  };
+}
--- a/lib/tests/modules/error-typo-nested.nix
+++ b/lib/tests/modules/error-typo-nested.nix
@@ -0,0 +1,18 @@
+{ lib, ... }:
+
+{
+  options.set = {
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+      type = lib.types.bool;
+      description = ''
+        Some descriptive text
+      '';
+    };
+  };
+
+  config = {
+    set.ena = true;
+  };
+}
--- a/lib/tests/modules/error-typo-outside-with-nested.nix
+++ b/lib/tests/modules/error-typo-outside-with-nested.nix
@@ -0,0 +1,18 @@
+{ lib, ... }:
+
+{
+  options.set = {
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+      type = lib.types.bool;
+      description = ''
+        Some descriptive text
+      '';
+    };
+  };
+
+  config = {
+    sea.enable = true;
+  };
+}
--- a/lib/tests/modules/error-typo-submodule.nix
+++ b/lib/tests/modules/error-typo-submodule.nix
@@ -0,0 +1,28 @@
+{ lib, ... }:
+
+{
+  options.services = lib.mkOption {
+    type = lib.types.attrsOf (
+      lib.types.submodule {
+        options = {
+          enable = lib.mkOption {
+            default = false;
+            type = lib.types.bool;
+          };
+          port = lib.mkOption {
+            default = 8080;
+            type = lib.types.int;
+          };
+        };
+      }
+    );
+    default = { };
+  };
+
+  config = {
+    services.myservice = {
+      # Typo: "prot" instead of "port"
+      prot = 9000;
+    };
+  };
+}
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2267,11 +2267,6 @@
    name = "Artemis Tosini";
    keys = [ { fingerprint = "3D2B B230 F9FA F0C5 1832  46DD 4FDC 96F1 61E7 BA8A"; } ];
  };
-  arthsmn = {
-    name = "Arthur Cerqueira";
-    github = "arthsmn";
-    githubId = 150680976;
-  };
  arthur = {
    email = "me@arthur.li";
    github = "arthurl";
@@ -6250,6 +6245,13 @@
    githubId = 32403873;
    keys = [ { fingerprint = "3EDD 9C88 B0F2 58F8 C25F  5D2C CCBC 8AA1 AF06 2142"; } ];
  };
+  debtquity = {
+    name = "Darren Rambaud";
+    email = "d.nixpkgs@ryz.dev";
+    github = "debtquity";
+    githubId = 225436867;
+    matrix = "@debtquity:matrix.org";
+  };
  declan = {
    name = "Declan Rixon";
    email = "declan.fraser.rixon@gmail.com";
@@ -18084,6 +18086,12 @@
    githubId = 220262;
    name = "Ion Mudreac";
  };
+  mulatta = {
+    email = "seungwon@mulatta.io";
+    github = "mulatta";
+    githubId = 67085791;
+    name = "Seungwon Lee";
+  };
  MulliganSecurity = {
    email = "mulligansecurity@riseup.net";
    github = "MulliganSecurity";
@@ -19259,6 +19267,12 @@
    githubId = 2946283;
    name = "Brian Cohen";
  };
+  nouritsu = {
+    name = "Aneesh Bhave";
+    email = "aneesh1701@gmail.com";
+    github = "nouritsu";
+    githubId = 113834791;
+  };
  nova-madeline = {
    matrix = "@nova:tchncs.de";
    github = "nova-r";
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -574,7 +574,6 @@ with lib.maintainers;
    members = [
      eljamm
      ethancedwards8
-      fricklerhandwerk
      OPNA2608
      phanirithvij
      prince213
--- a/nixos/modules/services/misc/soft-serve.nix
+++ b/nixos/modules/services/misc/soft-serve.nix
@@ -45,11 +45,6 @@ in

  config = lib.mkIf cfg.enable {

-    systemd.tmpfiles.rules = [
-      # The config file has to be inside the state dir
-      "L+ ${stateDir}/config.yaml - - - - ${configFile}"
-    ];
-
    systemd.services.soft-serve = {
      description = "Soft Serve git server";
      documentation = [ docUrl ];
@@ -58,8 +53,7 @@ in
      wantedBy = [ "multi-user.target" ];

      environment.SOFT_SERVE_DATA_PATH = stateDir;
-
-      restartTriggers = [ configFile ];
+      environment.SOFT_SERVE_CONFIG_LOCATION = configFile;

      serviceConfig = {
        Type = "simple";
--- a/nixos/modules/services/web-apps/pretalx.nix
+++ b/nixos/modules/services/web-apps/pretalx.nix
@@ -53,6 +53,17 @@ in
      '';
    };

+    environmentFiles = lib.mkOption {
+      description = ''
+        Environment files that allow passing secret configuration values.
+
+        Each line must follow the `PRETALX_SECTION_KEY=value` pattern.
+      '';
+      type = lib.types.listOf lib.types.path;
+      default = [ ];
+      example = [ "/run/secrets/pretalx/env" ];
+    };
+
    group = lib.mkOption {
      type = lib.types.str;
      default = "pretalx";
@@ -320,6 +331,9 @@ in
        if [[ "$USER" != ${cfg.user} ]]; then
          sudo='exec /run/wrappers/bin/sudo -u ${cfg.user} --preserve-env=PRETALX_CONFIG_FILE'
        fi
+        set -a
+        ${lib.concatMapStringsSep "\n" (file: ". ${lib.escapeShellArg file}") cfg.environmentFiles}
+        set +a
        export PRETALX_CONFIG_FILE=${configFile}
        $sudo ${lib.getExe' pythonEnv "pretalx-manage"} "$@"
      '')
@@ -393,6 +407,7 @@ in
          serviceConfig = {
            User = "pretalx";
            Group = "pretalx";
+            EnvironmentFile = cfg.environmentFiles;
            StateDirectory = [
              "pretalx"
              "pretalx/media"
--- a/nixos/modules/services/web-apps/sillytavern.nix
+++ b/nixos/modules/services/web-apps/sillytavern.nix
@@ -99,7 +99,7 @@ in
      after = [ "network.target" ];
      wantedBy = [ "multi-user.target" ];
      # required by sillytavern's extension manager
-      path = [ pkgs.git ];
+      path = [ pkgs.gitMinimal ];
      environment.XDG_DATA_HOME = "%S";
      serviceConfig = {
        Type = "simple";
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -164,9 +164,10 @@ let
    "systemd-creds@.service"
    "systemd-creds.socket"
  ]
-  ++ lib.optional cfg.package.withTpm2Units [
+  ++ lib.optionals cfg.package.withTpm2Units [
    "systemd-pcrlock@.service"
    "systemd-pcrlock.socket"
+    "systemd-tpm2-clear.service"
  ]
  ++ [

@@ -218,7 +219,6 @@ let
    "factory-reset.target"
    "systemd-factory-reset-request.service"
    "systemd-factory-reset-reboot.service"
-    "systemd-tpm2-clear.service"
  ]
  ++ cfg.additionalUpstreamSystemUnits;

--- a/pkgs/README.md
+++ b/pkgs/README.md
@@ -305,10 +305,6 @@ For example, the `libxml2` package builds both a library and some tools; but it

  - `servers/http` (e.g. `apache-httpd`)

- **If it’s an implementation of the X Windowing System:**
-
-  - `servers/x11` (e.g. `xorg` — this includes the client libraries and programs)
-
 - **Else:**

  - `servers/misc`
--- a/pkgs/applications/editors/jetbrains/builder/darwin.nix
+++ b/pkgs/applications/editors/jetbrains/builder/darwin.nix
@@ -1,57 +1,58 @@
 # Darwin-specific base builder.
-# TODO:
-#   This actually just ignores a lot of options passed to it... (e.g. buildInputs)
-#   - not entirely sure how this hasn't caused big problems yet.

 {
  lib,
  stdenvNoCC,
  undmg,
+
+  excludeDrvArgNames,
  ...
 }:

-{
-  meta,
-  pname,
-  product,
-  productShort,
-  src,
-  version,
-  passthru,
+lib.extendMkDerivation {
+  inherit excludeDrvArgNames;

-  plugins ? [ ],
-  ...
-}:
+  constructDrv = stdenvNoCC.mkDerivation;

-let
-  loname = lib.toLower productShort;
-in
-stdenvNoCC.mkDerivation {
-  inherit
-    pname
-    src
-    version
-    plugins
-    passthru
-    ;
-  meta = meta // {
-    mainProgram = loname;
-  };
-  desktopName = product;
-  dontFixup = true;
-  installPhase = ''
-    runHook preInstall
-    APP_DIR="$out/Applications/${product}.app"
-    mkdir -p "$APP_DIR"
-    cp -Tr *.app "$APP_DIR"
-    mkdir -p "$out/bin"
-    cat << EOF > "$out/bin/${loname}"
-    #!${stdenvNoCC.shell}
-    open -na '$APP_DIR' --args "\$@"
-    EOF
-    chmod +x "$out/bin/${loname}"
-    runHook postInstall
-  '';
-  nativeBuildInputs = [ undmg ];
-  sourceRoot = ".";
+  extendDrvArgs =
+    finalAttrs:
+    {
+      product,
+      productShort ? product,
+
+      nativeBuildInputs ? [ ],
+      meta ? { },
+      ...
+    }:
+
+    let
+      loname = lib.toLower productShort;
+    in
+    {
+      desktopName = product;
+
+      dontFixup = true;
+
+      installPhase = ''
+        runHook preInstall
+        APP_DIR="$out/Applications/${product}.app"
+        mkdir -p "$APP_DIR"
+        cp -Tr *.app "$APP_DIR"
+        mkdir -p "$out/bin"
+        cat << EOF > "$out/bin/${loname}"
+        #!${stdenvNoCC.shell}
+        open -na '$APP_DIR' --args "\$@"
+        EOF
+        chmod +x "$out/bin/${loname}"
+        runHook postInstall
+      '';
+
+      nativeBuildInputs = nativeBuildInputs ++ [ undmg ];
+
+      sourceRoot = ".";
+
+      meta = meta // {
+        mainProgram = loname;
+      };
+    };
 }
--- a/pkgs/applications/editors/jetbrains/builder/default.nix
+++ b/pkgs/applications/editors/jetbrains/builder/default.nix
@@ -6,82 +6,64 @@
  callPackage,

  jdk,
-  fontconfig,
-  libGL,
-  libX11,

  vmopts ? null,
  forceWayland ? false,
 }:
 let
  baseBuilder = if stdenv.hostPlatform.isDarwin then ./darwin.nix else ./linux.nix;
-  mkJetBrainsProductCore = callPackage baseBuilder { inherit vmopts; };
 in
 # Makes a JetBrains IDE
-{
-  pname,
-  src,
-  version,
-  buildNumber,
-  wmClass,
-  product,
-  productShort ? product,
-  meta,
-
-  libdbm,
-  fsnotifier,
-
-  extraWrapperArgs ? [ ],
-  extraLdPath ? [ ],
-  buildInputs ? [ ],
-  passthru ? { },
-}:
-mkJetBrainsProductCore {
-  inherit
-    pname
-    extraLdPath
-    jdk
-    src
-    version
-    buildNumber
-    wmClass
-    product
-    productShort
-    libdbm
-    fsnotifier
-    ;
-
-  buildInputs =
-    buildInputs
-    ++ [ stdenv.cc.cc ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      fontconfig
-      libGL
-      libX11
+lib.extendMkDerivation {
+  constructDrv = callPackage baseBuilder {
+    inherit vmopts jdk forceWayland;
+    # Args to not pass to mkDerivation in the base builders. Since both get the same args
+    # passed in, both have the same list of args to ignore, even if they don't both use
+    # all of them.
+    excludeDrvArgNames = [
+      "product"
+      "productShort"
+      "buildNumber"
+      "wmClass"
+      "libdbm"
+      "fsnotifier"
+      "extraLdPath"
+      "extraWrapperArgs"
    ];
+  };

-  extraWrapperArgs =
-    extraWrapperArgs
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && forceWayland) [
-      ''--add-flags "\''${WAYLAND_DISPLAY:+-Dawt.toolkit.name=WLToolkit}"''
-    ];
+  extendDrvArgs =
+    # NOTE: See linux.nix and darwin.nix for additional specific arguments
+    finalAttrs:
+    {
+      buildNumber,
+      product,

-  passthru = lib.recursiveUpdate passthru {
-    inherit
-      buildNumber
-      product
-      libdbm
-      fsnotifier
-      ;
+      libdbm,
+      fsnotifier,

-    updateScript = ../updater/main.py;
+      meta ? { },
+      passthru ? { },
+      ...
+    }:
+    {
+      passthru = passthru // {
+        inherit
+          buildNumber
+          product
+          libdbm
+          fsnotifier
+          ;

-    tests = {
-      plugins = callPackage ../plugins/tests.nix { ideName = pname; };
+        updateScript = ../updater/main.py;
+
+        tests = {
+          plugins = callPackage ../plugins/tests.nix { ide = finalAttrs.finalPackage; };
+        };
+      };
+
+      meta = meta // {
+        teams = [ lib.teams.jetbrains ];
+      };
    };
-  };
-
-  meta = meta // {
-    teams = [ lib.teams.jetbrains ];
-  };
 }
--- a/pkgs/applications/editors/jetbrains/builder/linux.nix
+++ b/pkgs/applications/editors/jetbrains/builder/linux.nix
@@ -18,163 +18,179 @@
  e2fsprogs,
  python3,
  autoPatchelfHook,
-  vmopts ? null,
  glibcLocales,
+  fontconfig,
+  libGL,
+  libX11,
+
+  jdk,
+  vmopts ? null,
+  forceWayland ? null,
+  excludeDrvArgNames,
 }:

-{
-  pname,
-  product,
-  productShort,
-  version,
-  src,
-  wmClass,
-  jdk,
-  meta,
-  passthru,
+lib.extendMkDerivation {
+  inherit excludeDrvArgNames;

-  libdbm,
-  fsnotifier,
+  constructDrv = stdenv.mkDerivation;

-  extraLdPath ? [ ],
-  extraWrapperArgs ? [ ],
-  buildInputs ? [ ],
-  ...
-}@args:
+  extendDrvArgs =
+    finalAttrs:
+    {
+      pname,
+      product,
+      productShort ? product,
+      wmClass,

-let
-  loName = lib.toLower productShort;
-  hiName = lib.toUpper productShort;
-  vmoptsName = loName + lib.optionalString stdenv.hostPlatform.is64bit "64" + ".vmoptions";
-in
+      libdbm,
+      fsnotifier,

-with stdenv;
-lib.makeOverridable mkDerivation (
-  rec {
-    inherit
-      pname
-      version
-      src
-      buildInputs
-      passthru
-      ;
-    meta = args.meta // {
-      mainProgram = pname;
-    };
+      extraLdPath ? [ ],
+      extraWrapperArgs ? [ ],
+      buildInputs ? [ ],
+      nativeBuildInputs ? [ ],
+      meta ? { },
+      postPatch ? "",
+      ...
+    }:

-    desktopItem = makeDesktopItem {
-      name = pname;
-      exec = pname;
-      comment = lib.trim (lib.replaceString "\n" " " meta.longDescription);
-      desktopName = product;
-      genericName = meta.description;
-      categories = [ "Development" ];
-      icon = pname;
-      startupWMClass = wmClass;
-    };
+    let
+      loName = lib.toLower productShort;
+      hiName = lib.toUpper productShort;
+      vmoptsName = loName + lib.optionalString stdenv.hostPlatform.is64bit "64" + ".vmoptions";
+      finalExtraWrapperArgs =
+        extraWrapperArgs
+        ++ lib.optionals forceWayland [
+          ''--add-flags "\''${WAYLAND_DISPLAY:+-Dawt.toolkit.name=WLToolkit}"''
+        ];

-    vmoptsIDE = if hiName == "WEBSTORM" then "WEBIDE" else hiName;
-    vmoptsFile = lib.optionalString (vmopts != null) (writeText vmoptsName vmopts);
+      desktopItem = makeDesktopItem {
+        name = finalAttrs.pname;
+        exec = finalAttrs.meta.mainProgram;
+        comment = lib.trim (lib.replaceString "\n" " " finalAttrs.meta.longDescription);
+        desktopName = product;
+        genericName = finalAttrs.meta.description;
+        categories = [ "Development" ];
+        icon = pname;
+        startupWMClass = wmClass;
+      };

-    nativeBuildInputs = [
-      makeWrapper
-      patchelf
-      unzip
-      autoPatchelfHook
-    ];
+      vmoptsIDE = if hiName == "WEBSTORM" then "WEBIDE" else hiName;
+      vmoptsFile = lib.optionalString (vmopts != null) (writeText vmoptsName vmopts);
+    in
+    {
+      inherit desktopItem vmoptsIDE vmoptsFile;

-    postPatch = ''
-      rm -rf jbr
-      # When using the IDE as a remote backend using gateway, it expects the jbr directory to contain the jdk
-      ln -s ${jdk.home} jbr
+      buildInputs = buildInputs ++ [
+        stdenv.cc.cc
+        fontconfig
+        libGL
+        libX11
+      ];

-      if [ -d "plugins/remote-dev-server" ]; then
-        patch -F3 -p1 < ${../patches/jetbrains-remote-dev.patch}
-      fi
+      nativeBuildInputs = nativeBuildInputs ++ [
+        makeWrapper
+        patchelf
+        unzip
+        autoPatchelfHook
+      ];

-      vmopts_file=bin/linux/${vmoptsName}
-      if [[ ! -f $vmopts_file ]]; then
-        vmopts_file=bin/${vmoptsName}
-        if [[ ! -f $vmopts_file ]]; then
-          echo "ERROR: $vmopts_file not found"
-          exit 1
+      postPatch = ''
+        rm -rf jbr
+        # When using the IDE as a remote backend using gateway, it expects the jbr directory to contain the jdk
+        ln -s ${jdk.home} jbr
+
+        if [ -d "plugins/remote-dev-server" ]; then
+          patch -F3 -p1 < ${../patches/jetbrains-remote-dev.patch}
        fi
-      fi
-      echo -Djna.library.path=${
-        lib.makeLibraryPath [
-          libsecret
-          e2fsprogs
-          libnotify
-          # Required for Help -> Collect Logs
-          # in at least rider and goland
-          udev
-        ]
-      } >> $vmopts_file
-    '';

-    installPhase = ''
-      runHook preInstall
+        vmopts_file=bin/linux/${vmoptsName}
+        if [[ ! -f $vmopts_file ]]; then
+          vmopts_file=bin/${vmoptsName}
+          if [[ ! -f $vmopts_file ]]; then
+            echo "ERROR: $vmopts_file not found"
+            exit 1
+          fi
+        fi
+        echo -Djna.library.path=${
+          lib.makeLibraryPath [
+            libsecret
+            e2fsprogs
+            libnotify
+            # Required for Help -> Collect Logs
+            # in at least rider and goland
+            udev
+          ]
+        } >> $vmopts_file
+      ''
+      + postPatch;

-      mkdir -p $out/{bin,$pname,share/pixmaps,share/icons/hicolor/scalable/apps}
-      cp -a . $out/$pname
-      [[ -f $out/$pname/bin/${loName}.png ]] && ln -s $out/$pname/bin/${loName}.png $out/share/pixmaps/${pname}.png
-      [[ -f $out/$pname/bin/${loName}.svg ]] && ln -s $out/$pname/bin/${loName}.svg $out/share/pixmaps/${pname}.svg \
-        && ln -s $out/$pname/bin/${loName}.svg $out/share/icons/hicolor/scalable/apps/${pname}.svg
-      cp ${libdbm}/lib/libdbm.so $out/$pname/bin/libdbm.so
-      cp ${fsnotifier}/bin/fsnotifier $out/$pname/bin/fsnotifier
+      installPhase = ''
+        runHook preInstall

-      jdk=${jdk.home}
-      item=${desktopItem}
+        mkdir -p $out/{bin,$pname,share/pixmaps,share/icons/hicolor/scalable/apps}
+        cp -a . $out/$pname
+        [[ -f $out/$pname/bin/${loName}.png ]] && ln -s $out/$pname/bin/${loName}.png $out/share/pixmaps/${pname}.png
+        [[ -f $out/$pname/bin/${loName}.svg ]] && ln -s $out/$pname/bin/${loName}.svg $out/share/pixmaps/${pname}.svg \
+          && ln -s $out/$pname/bin/${loName}.svg $out/share/icons/hicolor/scalable/apps/${pname}.svg
+        cp ${libdbm}/lib/libdbm.so $out/$pname/bin/libdbm.so
+        cp ${fsnotifier}/bin/fsnotifier $out/$pname/bin/fsnotifier

-      needsWrapping=()
+        jdk=${jdk.home}
+        item=${desktopItem}

-      if [ -f "$out/$pname/bin/${loName}" ]; then
-        needsWrapping+=("$out/$pname/bin/${loName}")
-      fi
-      if [ -f "$out/$pname/bin/${loName}.sh" ]; then
-        needsWrapping+=("$out/$pname/bin/${loName}.sh")
-      fi
+        needsWrapping=()

-      for launcher in "''${needsWrapping[@]}"
-      do
-        wrapProgram  "$launcher" \
-          --prefix PATH : "${
-            lib.makeBinPath [
-              jdk
-              coreutils
-              gnugrep
-              which
-              git
-            ]
-          }" \
-          --suffix PATH : "${lib.makeBinPath [ python3 ]}" \
-          --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath extraLdPath}" \
-          ${lib.concatStringsSep " " extraWrapperArgs} \
-          --set-default JDK_HOME "$jdk" \
-          --set-default ANDROID_JAVA_HOME "$jdk" \
-          --set-default JAVA_HOME "$jdk" \
-          --set-default JETBRAINS_CLIENT_JDK "$jdk" \
-          --set-default ${hiName}_JDK "$jdk" \
-          --set-default LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" \
-          --set-default ${vmoptsIDE}_VM_OPTIONS ${vmoptsFile}
-      done
+        if [ -f "$out/$pname/bin/${loName}" ]; then
+          needsWrapping+=("$out/$pname/bin/${loName}")
+        fi
+        if [ -f "$out/$pname/bin/${loName}.sh" ]; then
+          needsWrapping+=("$out/$pname/bin/${loName}.sh")
+        fi

-      launcher="$out/$pname/bin/${loName}"
-      if [ ! -e "$launcher" ]; then
-        launcher+=.sh
-      fi
+        for launcher in "''${needsWrapping[@]}"
+        do
+          wrapProgram  "$launcher" \
+            --prefix PATH : "${
+              lib.makeBinPath [
+                jdk
+                coreutils
+                gnugrep
+                which
+                git
+              ]
+            }" \
+            --suffix PATH : "${lib.makeBinPath [ python3 ]}" \
+            --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath extraLdPath}" \
+            ${lib.concatStringsSep " " finalExtraWrapperArgs} \
+            --set-default JDK_HOME "$jdk" \
+            --set-default ANDROID_JAVA_HOME "$jdk" \
+            --set-default JAVA_HOME "$jdk" \
+            --set-default JETBRAINS_CLIENT_JDK "$jdk" \
+            --set-default ${hiName}_JDK "$jdk" \
+            --set-default LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" \
+            --set-default ${vmoptsIDE}_VM_OPTIONS ${vmoptsFile}
+        done

-      ln -s "$launcher" $out/bin/$pname
-      rm -rf $out/$pname/plugins/remote-dev-server/selfcontained/
-      echo -e '#!/usr/bin/env bash\n'"$out/$pname/bin/remote-dev-server.sh"' "$@"' > $out/$pname/bin/remote-dev-server-wrapped.sh
-      chmod +x $out/$pname/bin/remote-dev-server-wrapped.sh
-      ln -s "$out/$pname/bin/remote-dev-server-wrapped.sh" $out/bin/$pname-remote-dev-server
-      ln -s "$item/share/applications" $out/share
+        launcher="$out/$pname/bin/${loName}"
+        if [ ! -e "$launcher" ]; then
+          launcher+=.sh
+        fi

-      runHook postInstall
-    '';
-  }
-  // lib.optionalAttrs (!(meta.license.free or true)) {
-    preferLocalBuild = true;
-  }
-)
+        ln -s "$launcher" $out/bin/$pname
+        rm -rf $out/$pname/plugins/remote-dev-server/selfcontained/
+        echo -e '#!/usr/bin/env bash\n'"$out/$pname/bin/remote-dev-server.sh"' "$@"' > $out/$pname/bin/remote-dev-server-wrapped.sh
+        chmod +x $out/$pname/bin/remote-dev-server-wrapped.sh
+        ln -s "$out/$pname/bin/remote-dev-server-wrapped.sh" $out/bin/$pname-remote-dev-server
+        ln -s "$item/share/applications" $out/share
+
+        runHook postInstall
+      '';
+
+      preferLocalBuild = !(finalAttrs.meta.license.free or true);
+
+      meta = meta // {
+        mainProgram = pname;
+      };
+    };
+}
--- a/pkgs/applications/editors/jetbrains/ides/dataspell.nix
+++ b/pkgs/applications/editors/jetbrains/ides/dataspell.nix
@@ -47,7 +47,9 @@ mkJetBrainsProduct {

  src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));

-  buildInputs = [
+  # NOTE: This `lib.optionals` is only here because the old Darwin builder ignored `buildInputs`.
+  #       DataSpell may need these, even on Darwin!
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
    libgcc
    (runCommand "libR" { } ''
      mkdir -p $out/lib
--- a/pkgs/applications/editors/jetbrains/plugins/tests.nix
+++ b/pkgs/applications/editors/jetbrains/plugins/tests.nix
@@ -6,12 +6,12 @@
  fetchzip,
  fetchurl,
  # If not set, all IDEs are tested.
-  ideName ? null,
+  ide ? null,
 }:

 let
  ides =
-    if ideName == null then
+    if ide == null then
      with jetbrains;
      [
        clion
@@ -31,7 +31,7 @@ let
        webstorm
      ]
    else
-      [ (jetbrains.${ideName}) ];
+      [ ide ];
 in
 {
  # Check to see if the process for adding plugins is breaking anything, instead of the plugins themselves
--- a/pkgs/applications/editors/jetbrains/readme.md
+++ b/pkgs/applications/editors/jetbrains/readme.md
@@ -56,9 +56,6 @@ Any comments or other manual changes between these markers will be removed when
 - Add it to `default.nix`

 ### TODO:
- - Switch `mkJetbrainsProduct` to use `lib.extendMkDerivation`, see also:
-   - https://github.com/NixOS/nixpkgs/pull/475183#discussion_r2655305961
-   - https://github.com/NixOS/nixpkgs/pull/475183#discussion_r2655348886
 - move PyCharm overrides to a common place outside of `default.nix`
 - package `patchSharedLibs` from `default.nix` as a hook
 - cleanup this TODO list, especially the following points, which have been here since 2023
--- a/pkgs/applications/editors/vim/plugins/aliases.nix
+++ b/pkgs/applications/editors/vim/plugins/aliases.nix
@@ -47,6 +47,7 @@ mapAliases (
    caw = caw-vim;
    chad = chadtree;
    coc-rls = throw "coc-rls has been removed, as rls has been archived since 2022. You should use coc-rust-analyzer instead, as rust-analyzer is maintained."; # added 2025-10-01
+    coc-sumneko-lua = throw "coc-sumneko-lua was removed, as it is unmaintained and broken. You should switch to lua_ls"; # added 2026-02-04
    coc-vetur = throw "coc-vetur was removed, as vetur is unmaintained by Vue. You should switch to Volar, which supports Vue 3"; # added 2025-10-01
    coffee-script = vim-coffee-script;
    coffeeScript = vim-coffee-script; # backwards compat, added 2014-10-18
--- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
@@ -39,7 +39,6 @@ let
    "coc-spell-checker"
    "coc-sqlfluff"
    "coc-stylelint"
-    "coc-sumneko-lua"
    "coc-tabnine"
    "coc-texlab"
    "coc-toml"
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -7337,6 +7337,19 @@ final: prev: {
    meta.hydraPlatforms = [ ];
  };

+  koda-nvim = buildVimPlugin {
+    pname = "koda.nvim";
+    version = "2.6.0-unstable-2026-02-04";
+    src = fetchFromGitHub {
+      owner = "oskarnurm";
+      repo = "koda.nvim";
+      rev = "9c69db5df7f1a82851d87fdac5b37a469213ac16";
+      hash = "sha256-Zcp7TKuAa7CvlDUv/9iFiuR3X68mPoug5EgsUhmtkkA=";
+    };
+    meta.homepage = "https://github.com/oskarnurm/koda.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
  kommentary = buildVimPlugin {
    pname = "kommentary";
    version = "1.0-unstable-2023-11-29";
--- a/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/0001-pin-frizbee-0.6.0.patch
+++ b/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/0001-pin-frizbee-0.6.0.patch
@@ -0,0 +1,29 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index 35bb10e..71c79eb 100644
+--- a/Cargo.lock
+++ b/Cargo.lock
+@@ -144,9 +144,9 @@ checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+
+ [[package]]
+ name = "frizbee"
+-version = "0.7.0"
+version = "0.6.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "4d024031f1a5bc5f19917baa0b618f1067610e35ba23e9f105653fcb27e74f5c"
+checksum = "c3365720de81dac18e889afa72f5907aa061c975548da68e2400c056ebc94aec"
+ dependencies = [
+  "multiversion",
+  "rayon",
+diff --git a/Cargo.toml b/Cargo.toml
+index 392d1bb..c776c7d 100644
+--- a/Cargo.toml
+++ b/Cargo.toml
+@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
+
+ [dependencies]
+ regex = "1.11.2"
+-frizbee = "0.7.0"
+frizbee = "0.6.0"
+ mlua = { version = "0.11.3", features = ["module", "luajit"] }
+ thiserror = "2.0.16"
+ blake3 = "1.8.2"
--- a/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix
@@ -8,12 +8,12 @@
  gitMinimal,
 }:
 let
-  version = "1.8.0";
+  version = "1.9.0";
  src = fetchFromGitHub {
    owner = "Saghen";
    repo = "blink.cmp";
    tag = "v${version}";
-    hash = "sha256-JjlcPj7v9J+v1SDBYIub6jFEslLhZGHmsipV1atUAFo=";
+    hash = "sha256-fT3huB7R17/wdKjhpNHXYV/ngUX5X+wkHiGkC5HoY20=";
  };
  blink-fuzzy-lib = rustPlatform.buildRustPackage {
    inherit version src;
@@ -21,6 +21,12 @@ let

    cargoHash = "sha256-Qdt8O7IGj2HySb1jxsv3m33ZxJg96Ckw26oTEEyQjfs=";

+    # NOTE: The only change in frizbee 0.7.0 was nixpkgs incompatible rust semantic changes
+    # Patch just reverts https://github.com/saghen/blink.cmp/commit/cc824ec85b789a54d05241389993c6ab8c040810
+    cargoPatches = [
+      ./0001-pin-frizbee-0.6.0.patch
+    ];
+
    nativeBuildInputs = [ gitMinimal ];

    env = {
--- a/pkgs/applications/editors/vim/plugins/non-generated/nvim-treesitter-legacy-parsers/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/nvim-treesitter-legacy-parsers/default.nix
@@ -1,5 +0,0 @@
-{
-  lib,
-  vimPlugins,
-}:
-lib.recurseIntoAttrs vimPlugins.nvim-treesitter-legacy.grammarPlugins
--- a/pkgs/applications/editors/vim/plugins/non-generated/zig-vim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/zig-vim/default.nix
@@ -6,13 +6,13 @@
 }:
 vimUtils.buildVimPlugin {
  pname = "zig.vim";
-  version = "0-unstable-2026-01-16";
+  version = "0-unstable-2026-01-24";

  src = fetchFromCodeberg {
    owner = "ziglang";
    repo = "zig.vim";
-    rev = "fc01f73ce0636723a03b784b63a7a89f2f9a84ae";
-    hash = "sha256-bWvwb6k9jyoAqtp07UfYkyUsGo2N8Yvv7H6zq1eiwP8=";
+    rev = "2f53c35bee0d64a1d417d47c894a3cbb6663dff4";
+    hash = "sha256-vrtcUAp/YWpZtf6lyg2l0GR62YdHprAb8sAHzZ89F48=";
  };

  passthru.updateScript = nix-update-script {
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter-legacy/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter-legacy/generated.nix
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter-legacy/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter-legacy/overrides.nix
@@ -1,67 +1,18 @@
-{
-  lib,
-  callPackage,
-  tree-sitter,
-  neovim,
-  neovimUtils,
-  runCommand,
-  vimPlugins,
-  tree-sitter-grammars,
-  writableTmpDirAsHomeHook,
-}:
-
+{ lib }:
 self: super:
-
 let
-  inherit (neovimUtils) grammarToPlugin;
+  inherit (self) nvim-treesitter;

-  overrides = prev: {
-  };
-
-  generatedGrammars =
-    let
-      generated = callPackage ./generated.nix {
-        inherit (tree-sitter) buildGrammar;
-      };
-    in
-    lib.overrideExisting generated (overrides generated);
-
-  generatedDerivations = lib.filterAttrs (_: lib.isDerivation) generatedGrammars;
-
-  # add aliases so grammars from `tree-sitter` are overwritten in `withPlugins`
-  # for example, for ocaml_interface, the following aliases will be added
-  #   ocaml-interface
-  #   tree-sitter-ocaml-interface
-  #   tree-sitter-ocaml_interface
-  builtGrammars =
-    generatedGrammars
-    // lib.concatMapAttrs (
-      k: v:
-      let
-        replaced = lib.replaceStrings [ "_" ] [ "-" ] k;
-      in
-      {
-        "tree-sitter-${k}" = v;
-      }
-      // lib.optionalAttrs (k != replaced) {
-        ${replaced} = v;
-        "tree-sitter-${replaced}" = v;
-      }
-    ) generatedDerivations;
-
-  allGrammars = lib.attrValues generatedDerivations;
-
-  # Usage:
-  # pkgs.vimPlugins.nvim-treesitter-legacy.withPlugins (p: [ p.c p.java ... ])
-  # or for all grammars:
-  # pkgs.vimPlugins.nvim-treesitter-legacy.withAllGrammars
  withPlugins =
    f:
+    let
+      from-main = self.nvim-treesitter.withPlugins f;
+    in
    self.nvim-treesitter-legacy.overrideAttrs {
-      passthru.dependencies = map grammarToPlugin (f (tree-sitter.builtGrammars // builtGrammars));
+      passthru = { inherit (from-main) dependencies; };
    };

-  withAllGrammars = withPlugins (_: allGrammars);
+  withAllGrammars = withPlugins (_: nvim-treesitter.allGrammars);
 in

 {
@@ -70,22 +21,21 @@ in
  '';

  passthru = (super.nvim-treesitter-legacy.passthru or { }) // {
-    inherit
+    inherit (nvim-treesitter)
      builtGrammars
      allGrammars
      grammarToPlugin
+      grammarPlugins
+      parsers
+      ;
+    inherit
      withPlugins
      withAllGrammars
      ;
-
-    grammarPlugins = lib.mapAttrs (_: grammarToPlugin) generatedDerivations;
-    parsers = lib.recurseIntoAttrs vimPlugins.nvim-treesitter.grammarPlugins;
  };

-  meta =
-
-    (super.nvim-treesitter-legacy.meta or { }) // {
-      license = lib.licenses.asl20;
-      maintainers = [ ];
-    };
+  meta = super.nvim-treesitter-legacy.meta or { } // {
+    license = lib.licenses.asl20;
+    maintainers = [ ];
+  };
 }
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -2750,15 +2750,15 @@ assertNoAdditions {
    checkInputs = [ self.toggleterm-nvim ];
    dependencies = with self; [
      nvim-treesitter-legacy
-      nvim-treesitter-legacy-parsers.c_sharp
-      nvim-treesitter-legacy-parsers.go
-      nvim-treesitter-legacy-parsers.haskell
-      nvim-treesitter-legacy-parsers.javascript
-      nvim-treesitter-legacy-parsers.python
-      nvim-treesitter-legacy-parsers.ruby
-      nvim-treesitter-legacy-parsers.rust
-      nvim-treesitter-legacy-parsers.typescript
-      nvim-treesitter-legacy-parsers.zig
+      nvim-treesitter-parsers.c_sharp
+      nvim-treesitter-parsers.go
+      nvim-treesitter-parsers.haskell
+      nvim-treesitter-parsers.javascript
+      nvim-treesitter-parsers.python
+      nvim-treesitter-parsers.ruby
+      nvim-treesitter-parsers.rust
+      nvim-treesitter-parsers.typescript
+      nvim-treesitter-parsers.zig
    ];
    nvimSkipModules = [
      # Broken runners
--- a/pkgs/applications/editors/vim/plugins/utils/updater.nix
+++ b/pkgs/applications/editors/vim/plugins/utils/updater.nix
@@ -6,8 +6,6 @@
  nix-prefetch-git,
  nurl,
  python3Packages,
-  vimPluginsUpdater,
-  writeShellScript,

  # optional
  neovim-unwrapped,
@@ -51,10 +49,5 @@ buildPythonApplication {
    export PYTHONPATH=pkgs/applications/editors/vim/plugins:$PYTHONPATH
  '';

-  passthru.updateScript = writeShellScript "updateScript" ''
-    # don't saturate the update bot connection
-    ${lib.getExe vimPluginsUpdater} --proc 2 update
-  '';
-
  meta.mainProgram = "vim-plugins-updater";
 }
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -563,6 +563,7 @@ https://github.com/mikesmithgh/kitty-scrollback.nvim/,HEAD,
 https://github.com/serenevoid/kiwi.nvim/,HEAD,
 https://github.com/kmonad/kmonad-vim/,,
 https://github.com/frabjous/knap/,HEAD,
+https://github.com/oskarnurm/koda.nvim/,HEAD,
 https://github.com/b3nj5m1n/kommentary/,,
 https://github.com/udalov/kotlin-vim/,,
 https://github.com/mistweaverco/kulala.nvim/,HEAD,
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1328,8 +1328,8 @@ let
        mktplcRef = {
          publisher = "discloud";
          name = "discloud";
-          version = "2.27.9";
-          hash = "sha256-6+sAbjpwWTLGZ7uH6rl7LZcNmOnAftiYGithbBlvIak=";
+          version = "2.27.12";
+          hash = "sha256-Id7TpEqF/pFVbZBVRFrlXdN3kBL0BC/nX3Vg2PYgVJU=";
        };
        meta = {
          changelog = "https://marketplace.visualstudio.com/items/discloud.discloud/changelog";
@@ -4336,8 +4336,8 @@ let
        mktplcRef = {
          publisher = "sonarsource";
          name = "sonarlint-vscode";
-          version = "4.40.0";
-          hash = "sha256-Jzb+ywEGINN4eRVRMUnBloXWT2wubrU91NEBoySx0NQ=";
+          version = "4.42.0";
+          hash = "sha256-jWw5vbORdi/qW8L4D1qbue8tdeiyof01FzJtcZUKs3Y=";
        };
        meta.license = lib.licenses.lgpl3Only;
      };
--- a/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-containers/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-containers/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
  mktplcRef = {
    publisher = "ms-azuretools";
    name = "vscode-containers";
-    version = "2.4.0";
-    hash = "sha256-mGS1fppmcELhztvtnWQfW7MbtagQlVkbPtSaBHExzGA=";
+    version = "2.4.1";
+    hash = "sha256-OwxJJVW15MivWVeSlbFQNQbrxjDgpXePrPf+r3qb+As=";
  };

  meta = {
--- a/pkgs/applications/emulators/libretro/cores/atari800.nix
+++ b/pkgs/applications/emulators/libretro/cores/atari800.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore rec {
  core = "atari800";
-  version = "0-unstable-2025-12-04";
+  version = "0-unstable-2026-01-30";

  src = fetchFromGitHub {
    owner = "libretro";
    repo = "libretro-atari800";
-    rev = "630f2346a1dabefdcf534880a48e3e200e2cc551";
-    hash = "sha256-mCno2DHQXCJO2gStyp1te2XEUlrbX2iW3xIUOvZdoB0=";
+    rev = "d1d0d425458e6b5a2e51ad5f1507bdf97e857c95";
+    hash = "sha256-gu1S4pNVq0MCK/77oGI6ekP1Nten72R6Y1n64oK/IFc=";
  };

  makefile = "Makefile";
--- a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix
+++ b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
  core = "dosbox-pure";
-  version = "0-unstable-2026-01-25";
+  version = "0-unstable-2026-02-01";

  src = fetchFromGitHub {
    owner = "schellingb";
    repo = "dosbox-pure";
-    rev = "38c84798aac5239a06d75e85469225a2ad9c4707";
-    hash = "sha256-3N2/v9yv44GdSEoPjC2yne43f4WqLTlWr8dYRrb+GxY=";
+    rev = "77f067eed8e0ea2ad9e86fbc690922f1f1671fc4";
+    hash = "sha256-mIeTBcx3XK4V2+t4MGc8klhDODuDDACFlI/758zDLPc=";
  };

  hardeningDisable = [ "format" ];
--- a/pkgs/applications/emulators/mame/default.nix
+++ b/pkgs/applications/emulators/mame/default.nix
@@ -37,14 +37,14 @@

 stdenv.mkDerivation rec {
  pname = "mame";
-  version = "0.284";
+  version = "0.285";
  srcVersion = builtins.replaceStrings [ "." ] [ "" ] version;

  src = fetchFromGitHub {
    owner = "mamedev";
    repo = "mame";
    rev = "mame${srcVersion}";
-    hash = "sha256-e/Ztoy+X9glMmV6Og5eAMiXB+EQLKlsHa/8KyahHmDw=";
+    hash = "sha256-vuGQ1VOjIAEopV4X+qP1k+bgH7lJJLZ9RtYevUxgIQg=";
  };

  outputs = [
--- a/pkgs/applications/graphics/gimp/wrapper.nix
+++ b/pkgs/applications/graphics/gimp/wrapper.nix
@@ -24,7 +24,9 @@ let

 in
 symlinkJoin {
-  name = "gimp-with-plugins-${gimp.version}";
+  pname = "gimp-with-plugins";
+  inherit (gimp) version;
+
  outputs = [
    "out"
    "man"
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -19,8 +19,9 @@
  gspell,
  gtk-mac-integration,
  gtkmm3,
+  gtksourceview4,
  gdk-pixbuf,
-  imagemagick,
+  graphicsmagick,
  lcms,
  lib2geom,
  libcdr,
@@ -34,6 +35,7 @@
  libXft,
  libxml2,
  libxslt,
+  readline,
  ninja,
  perlPackages,
  pkg-config,
@@ -146,7 +148,8 @@ stdenv.mkDerivation (finalAttrs: {
    glibmm
    gsl
    gtkmm3
-    imagemagick
+    gtksourceview4
+    graphicsmagick
    lcms
    lib2geom
    libcdr
@@ -160,6 +163,7 @@ stdenv.mkDerivation (finalAttrs: {
    libXft
    libxml2
    libxslt
+    readline
    perlPackages.perl
    poppler
    popt
--- a/pkgs/applications/misc/syncthingtray/default.nix
+++ b/pkgs/applications/misc/syncthingtray/default.nix
@@ -38,14 +38,14 @@
 }:

 stdenv.mkDerivation (finalAttrs: {
-  version = "2.0.6";
+  version = "2.0.7";
  pname = "syncthingtray";

  src = fetchFromGitHub {
    owner = "Martchus";
    repo = "syncthingtray";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-ie4NCeOsVEXzg0qM06D5dZhtwx3UT9BghH4fP0B9oIY=";
+    hash = "sha256-aY2uKYmTC/eDv/ioenI5JrS6/kaod5ntxgGHvoszNFU=";
  };

  buildInputs = [
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -557,6 +557,21 @@ let
      # Patch rustc_nightly_capability to eval to false instead of true.
      # https://chromium-review.googlesource.com/c/chromium/src/+/7022369
      ./patches/chromium-144-rustc_nightly_capability.patch
+    ]
+    ++ lib.optionals (chromiumVersionAtLeast "144.0.7559.132") [
+      # Rollup was swapped with esbuild because of compile failures on Windows,
+      # which is not compatible with our build yet. So let's revert it for now.
+      # https://issues.chromium.org/issues/461602362
+      (fetchpatch {
+        name = "revert-devtools-frontend-esbuild-instead-of-rollup.patch";
+        # https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/7526345
+        url = "https://chromium.googlesource.com/devtools/devtools-frontend/+/f130475580017f9f87502343dbcfc0c76dccefe8^!?format=TEXT";
+        decode = "base64 -d";
+        stripLen = 1;
+        extraPrefix = "third_party/devtools-frontend/src/";
+        revert = true;
+        hash = "sha256-k+xCfhDuHxtuGhY7LVE8HvbDJt8SEFkslBcJe7t5CAg=";
+      })
    ];

    postPatch =
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,10 +1,10 @@
 {
  "chromium": {
-    "version": "144.0.7559.109",
+    "version": "144.0.7559.132",
    "chromedriver": {
-      "version": "144.0.7559.110",
-      "hash_darwin": "sha256-HM7Hl6eizQfmCwNKqDc01gTaFE/xFikBVlNAx22RkSM=",
-      "hash_darwin_aarch64": "sha256-q374o4efYbK1uFpytIyxGZ4TjFqVmlcojzCllH/P9Og="
+      "version": "144.0.7559.133",
+      "hash_darwin": "sha256-X0wSolstr5yxG7FDvJxAaMnIcEtsUrVRObMcFc3m/l4=",
+      "hash_darwin_aarch64": "sha256-fz0cYDl3fTAKO5cnhkJKldRAH1PeFXB6kp4gEEN7R+M="
    },
    "deps": {
      "depot_tools": {
@@ -21,8 +21,8 @@
    "DEPS": {
      "src": {
        "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "6a8d5e49388fcc8a7d56d2a275e4ef424eb10960",
-        "hash": "sha256-3Wwc7Vb8dM2VGqQs6GOPehsTVBgcZ9in+kC1vN9S1FI=",
+        "rev": "8990ccf77859863f68a0d18957786bd7cb29ff76",
+        "hash": "sha256-USPpPF6BcxrUiRwwGKRo+bGN2NPuLLqBYSN3q1D2f0A=",
        "recompress": true
      },
      "src/third_party/clang-format/script": {
@@ -257,8 +257,8 @@
      },
      "src/third_party/devtools-frontend/src": {
        "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "a3064782146fc247c488d44c1ad3496b29d55ec4",
-        "hash": "sha256-vLkWH/EiDHxl/dz4soKybQF1hgud/7MlnDhVPicYJGY="
+        "rev": "f130475580017f9f87502343dbcfc0c76dccefe8",
+        "hash": "sha256-6osYh+ijcH7LEg1v7xGEf0zC36HZGMfqXP9Eq6g5WdU="
      },
      "src/third_party/dom_distiller_js/dist": {
        "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -532,8 +532,8 @@
      },
      "src/third_party/libvpx/source/libvpx": {
        "url": "https://chromium.googlesource.com/webm/libvpx.git",
-        "rev": "9a7674e1a83d1261a49776c8794b87c9bccc85d7",
-        "hash": "sha256-PdRZyXurQkw3UWOH1MkkuzggJkt9Uxq472L4LkxaYtw="
+        "rev": "14cd170a941f88e6fb145ebb873a3c8f87645834",
+        "hash": "sha256-5+TQo0qRaH1QnAgdQkJcGkKWYGPJO3hVIqqGEtHpwqk="
      },
      "src/third_party/libwebm/source": {
        "url": "https://chromium.googlesource.com/webm/libwebm.git",
@@ -807,8 +807,8 @@
      },
      "src/v8": {
        "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "d75d178c137447df1a3e8830eae86b0bd72b9ac6",
-        "hash": "sha256-5oQP3+kpnKfUInGBYcTvL/uLK9UlcWCz1mDFGeXBnmM="
+        "rev": "0f9ccaeb4a88dbff7a7c86e998ceea7d6f947950",
+        "hash": "sha256-7jQ1WrY2+8s0tDjl4qzaZz/xdWrePiVvuJDI00YLd9k="
      }
    }
  },
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
@@ -10,13 +10,13 @@
 buildMozillaMach rec {
  pname = "firefox-devedition";
  binaryName = "firefox-devedition";
-  version = "148.0b8";
+  version = "148.0b10";
  applicationName = "Firefox Developer Edition";
  requireSigning = false;
  branding = "browser/branding/aurora";
  src = fetchurl {
    url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "28c0efc1d7d287f6ed77b6e3d4c8e4a3d65b9dc6dc4ef48f9a6da9a889c24e1d03ef2bd1d484e67f260e08ababbe1c32a81cfb81e36934b54beb4e26dc11f726";
+    sha512 = "ae20edec5b4fbeb8a55e3054c219734845fbd8eaee14e4e867df1979da508d3b8a1bc0bc22d8de677419e94ccdc06885c661494233c62615cc002874cc4adf0f";
  };

  # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
@@ -9,10 +9,10 @@

 buildMozillaMach rec {
  pname = "firefox";
-  version = "147.0.2";
+  version = "147.0.3";
  src = fetchurl {
    url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "60f8c96dddb337f46746c22d3c282be5e58ce7dc7cd2ae65097eb6405a533a2baa2c7f48e178acfc7d7e2bee1b06bd07a1ae801dae9c9d7609c2fcec8e99e2e6";
+    sha512 = "37e39c47d694eccdcabb7d8a0a4cfe1b02860a97f604653f364c60f4e98796ffc7f1c6ab51226b2e5034a4b4805ccc6ec3983f0d830c9f36692df2ec261273d9";
  };

  meta = {
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -580,11 +580,11 @@
    "vendorHash": "sha256-u85rqTYpYFeTLGElOVojpsqUMZsopjpmsKwijsyLlz8="
  },
  "hashicorp_google-beta": {
-    "hash": "sha256-orMcxMY6btX5qejY+X21JSuoLp9M0JjUiDjrQ2LQjDA=",
+    "hash": "sha256-NRTnx5nqdCtjz0mGZjuA96jEzW1rKR+M0AY2//TAYk4=",
    "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
    "owner": "hashicorp",
    "repo": "terraform-provider-google-beta",
-    "rev": "v7.17.0",
+    "rev": "v7.18.0",
    "spdx": "MPL-2.0",
    "vendorHash": "sha256-/wClcz8fwl9Of2JSKcfETs7VR6c5KrYnnF+yW5iUoSU="
  },
@@ -670,13 +670,13 @@
    "vendorHash": "sha256-4XCCzB5Va1jtTn5vgIVKjQq4g8sKe0SIw3ynZExz/Vg="
  },
  "hashicorp_tls": {
-    "hash": "sha256-t/nUt0deyckP8opNiPZc5rbC1SleZwkrFXuQFw47sqA=",
+    "hash": "sha256-r7nthgw7MycME+edQ4jHQQ33mmpNv3t/LDbD5IkXDYA=",
    "homepage": "https://registry.terraform.io/providers/hashicorp/tls",
    "owner": "hashicorp",
    "repo": "terraform-provider-tls",
-    "rev": "v4.1.0",
+    "rev": "v4.2.1",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-tYvQURTrFtr+rgSMGq2zi/5p5jJVGIse7+hj95gz68U="
+    "vendorHash": "sha256-OvotUEh+P2b3ngaD/8lVbemnM3lrtwqduPXPjF/bqVA="
  },
  "hashicorp_vault": {
    "hash": "sha256-7vcggk2Sh4z/6CCyeL8XAzk82K5jaFjiDGBEG+5ftEg=",
@@ -1247,11 +1247,11 @@
    "vendorHash": "sha256-/zsslNR7GDLFrtL4T0GLYhKTBof51ODavb/+PHdziS4="
  },
  "spotinst_spotinst": {
-    "hash": "sha256-aPOqAzK/FdDDTbl2WMKxA99a5w6ZM0xK/BLjzPnvuws=",
+    "hash": "sha256-yDwEtptwNXu/IpoKUK98UkpivTgJaY1FfsshsVpaaOk=",
    "homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
    "owner": "spotinst",
    "repo": "terraform-provider-spotinst",
-    "rev": "v1.232.3",
+    "rev": "v1.232.4",
    "spdx": "MPL-2.0",
    "vendorHash": "sha256-Cj7RVITkFxIjAZAqHFhnoTa4lTZFXG22ny801g0Y+NE="
  },
@@ -1265,11 +1265,11 @@
    "vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs="
  },
  "sumologic_sumologic": {
-    "hash": "sha256-UEJNCb1b2BXgBM6FuTHzw5O7FopY3Iv99Hv01KDjY8k=",
+    "hash": "sha256-jL64y4/v11ZPm7RuW9c5iumm490pRCHp4VHJjkIqGKE=",
    "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic",
    "owner": "SumoLogic",
    "repo": "terraform-provider-sumologic",
-    "rev": "v3.2.2",
+    "rev": "v3.2.3",
    "spdx": "MPL-2.0",
    "vendorHash": "sha256-IR6KjFW5GbsOIm3EEFyx3ctwhbifZlcNaZeGhbeK/Wo="
  },
@@ -1490,11 +1490,11 @@
    "vendorHash": "sha256-8vYTNSjEwalDsS77UUVw7u2K3bbK4HM3yiUR3Ppi79I="
  },
  "wgebis_mailgun": {
-    "hash": "sha256-W+cvYNwsa5T6ZIPeEVbO9ogdZurwDPOKUwJfPXNKSqg=",
+    "hash": "sha256-Li4eyqZ6huO5Q+XTcQ+HQCg8IOjhxGU9Z4Uw3TbMdAc=",
    "homepage": "https://registry.terraform.io/providers/wgebis/mailgun",
    "owner": "wgebis",
    "repo": "terraform-provider-mailgun",
-    "rev": "v0.8.1",
+    "rev": "v0.9.0",
    "spdx": "MPL-2.0",
    "vendorHash": "sha256-Z4DfoG4ApXbPNXZs9YvBWQj1bH7moLNI6P+nKDHt/Jc="
  },
--- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
+++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
@@ -47,9 +47,9 @@
  xz,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "evolution";
-  version = "3.58.2";
+  version = "3.58.3";

  outputs = [
    "out"
@@ -57,8 +57,8 @@ stdenv.mkDerivation rec {
  ];

  src = fetchurl {
-    url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-uhvDtXKKMbjJ6qDaHuiulG7dzFRO6CQtzMIJ2W3KozA=";
+    url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor finalAttrs.version}/evolution-${finalAttrs.version}.tar.xz";
+    hash = "sha256-XQG3mlvr3y06mHG2E1CTnPJQH26gPCQVQ/dEqShtTXk=";
  };

  nativeBuildInputs = [
@@ -157,4 +157,4 @@ stdenv.mkDerivation rec {
    license = lib.licenses.lgpl2Plus;
    platforms = lib.platforms.linux;
  };
-}
+})
--- a/pkgs/build-support/dart/pub2nix/package-graph.py
+++ b/pkgs/build-support/dart/pub2nix/package-graph.py
@@ -25,7 +25,7 @@ def get_package(pubspec_path: Path, dev_dependencies: bool = False):


 def main() -> None:
-    package_config_file_path = Path(os.environ["packageConfig"])  # noqa: SIM112
+    package_config_file_path = Path(".dart_tool/package_config.json")
    with package_config_file_path.open("r", encoding="utf-8") as f:
        package_config = json.load(f)
    package_graph = []
--- a/pkgs/build-support/node/fetch-yarn-deps/default.nix
+++ b/pkgs/build-support/node/fetch-yarn-deps/default.nix
@@ -30,7 +30,8 @@ let
 in
 {
  prefetch-yarn-deps = stdenv.mkDerivation {
-    name = "prefetch-yarn-deps";
+    pname = "prefetch-yarn-deps";
+    inherit (lib.trivial) version;

    dontUnpack = true;
    dontBuild = true;
@@ -66,7 +67,8 @@ in
  };

  fixup-yarn-lock = stdenv.mkDerivation {
-    name = "fixup-yarn-lock";
+    pname = "fixup-yarn-lock";
+    inherit (lib.trivial) version;

    dontUnpack = true;
    dontBuild = true;
--- a/pkgs/by-name/ai/airwave/package.nix
+++ b/pkgs/by-name/ai/airwave/package.nix
@@ -2,7 +2,7 @@
  lib,
  multiStdenv,
  fetchFromGitHub,
-  wine,
+  wineWowPackages,
  cmake,
  makeWrapper,
  file,
@@ -12,33 +12,19 @@
 }:

 let
+  wine-wow64 = wineWowPackages.stableFull;
+in
+multiStdenv.mkDerivation (finalAttrs: {
+  pname = "airwave";
  version = "1.3.3";

-  airwave-src = fetchFromGitHub {
+  src = fetchFromGitHub {
    owner = "phantom-code";
    repo = "airwave";
-    rev = version;
-    sha256 = "1ban59skw422mak3cp57lj27hgq5d3a4f6y79ysjnamf8rpz9x4s";
+    tag = finalAttrs.version;
+    hash = "sha256-mvT0b0auKiu1T8cbR9RoBT94hKSnXDamqkIQPnUqVq0=";
  };

-  wine-wow64 = wine.override {
-    wineRelease = "stable";
-    wineBuild = "wineWow";
-  };
-
-  wine-xembed = wine-wow64.overrideDerivation (oldAttrs: {
-    patchFlags = [ "-p2" ];
-    patches = [ "${airwave-src}/fix-xembed-wine-windows.patch" ];
-  });
-
-in
-
-multiStdenv.mkDerivation {
-  pname = "airwave";
-  inherit version;
-
-  src = airwave-src;
-
  nativeBuildInputs = [
    cmake
    makeWrapper
@@ -49,17 +35,20 @@ multiStdenv.mkDerivation {
    file
    libX11
    qt5.qtbase
-    wine-xembed
+    wine-wow64
  ];

  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.11)" "cmake_minimum_required(VERSION 3.10)"
+
    # Binaries not used directly should land in libexec/.
    substituteInPlace src/common/storage.cpp --replace '"/bin"' '"/libexec"'

    # For airwave-host-32.exe.so, point wineg++ to 32-bit versions of
    # these libraries, as $NIX_LDFLAGS contains only 64-bit ones.
    substituteInPlace src/host/CMakeLists.txt --replace '-m32' \
-      '-m32 -L${wine-xembed}/lib -L${wine-xembed}/lib/wine -L${multiStdenv.cc.libc.out}/lib/32'
+      '-m32 -L${lib.getLib wine-wow64}/lib -L${lib.getLib wine-wow64}/lib/wine -L${lib.getLib multiStdenv.cc.libc}/lib/32'
  '';

  # libstdc++.so link gets lost in 64-bit executables during
@@ -75,8 +64,8 @@ multiStdenv.mkDerivation {
    mv $out/bin $out/libexec
    mkdir $out/bin
    mv $out/libexec/airwave-manager $out/bin
-    wrapProgram $out/libexec/airwave-host-32.exe --set WINELOADER ${wine-xembed}/bin/wine
-    wrapProgram $out/libexec/airwave-host-64.exe --set WINELOADER ${wine-xembed}/bin/wine64
+    wrapProgram $out/libexec/airwave-host-32.exe --set WINELOADER ${lib.getExe' wine-wow64 "wine"}
+    wrapProgram $out/libexec/airwave-host-64.exe --set WINELOADER ${lib.getExe' wine-wow64 "wine64"}
  '';

  meta = {
@@ -95,4 +84,4 @@ multiStdenv.mkDerivation {
    maintainers = with lib.maintainers; [ michalrus ];
    hydraPlatforms = [ ];
  };
-}
+})
--- a/pkgs/by-name/ap/apt-mirror/package.nix
+++ b/pkgs/by-name/ap/apt-mirror/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
    homepage = "https://github.com/apt-mirror/apt-mirror";
    changelog = "https://github.com/apt-mirror/apt-mirror/blob/${finalAttrs.src.rev}/CHANGELOG";
    license = lib.licenses.gpl2Only;
-    maintainers = with lib.maintainers; [ arthsmn ];
+    maintainers = [ ];
    mainProgram = "apt-mirror";
    platforms = lib.platforms.all;
  };
--- a/pkgs/by-name/ar/arp-scan-rs/package.nix
+++ b/pkgs/by-name/ar/arp-scan-rs/package.nix
@@ -9,16 +9,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "arp-scan-rs";
-  version = "0.14.0";
+  version = "0.15.1";

  src = fetchFromGitHub {
    owner = "kongbytes";
    repo = "arp-scan-rs";
    tag = "v${version}";
-    hash = "sha256-CLxeT2olrxRCJ12IZ1PvLW7ZuX0HPsoNuFyxmGBhB8w=";
+    hash = "sha256-cTV1mJjHXT3LHFpzOC867VNnhaBo7zuinT8qqd4joY0=";
  };

-  cargoHash = "sha256-lPE/mx4LzSOG1YjGol1f77oox4voZzp9RqrKYZAMoX0=";
+  cargoHash = "sha256-qTVgFUgDctfHavejoHeW0wRi3BNsr8NV+rL/2kykBGY=";

  nativeInstallCheckInputs = [ versionCheckHook ];

--- a/pkgs/by-name/as/asymptote/package.nix
+++ b/pkgs/by-name/as/asymptote/package.nix
@@ -33,7 +33,7 @@
 }:

 stdenv.mkDerivation (finalAttrs: {
-  version = "3.05";
+  version = "3.06";
  pname = "asymptote";

  outputs = [
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {

  src = fetchurl {
    url = "mirror://sourceforge/asymptote/${finalAttrs.version}/asymptote-${finalAttrs.version}.src.tgz";
-    hash = "sha256-NcFtCjvdhppW5O//Rjj4HDqIsva2ZNGWRxAV2/TGmoc=";
+    hash = "sha256-XMhhlo/oEC/FVktgddsoN91WmGcmiLO/txQGwNoPjO8=";
  };

  # override with TeX Live containers to avoid building sty, docs from source
--- a/pkgs/by-name/at/athens/package.nix
+++ b/pkgs/by-name/at/athens/package.nix
@@ -8,13 +8,13 @@

 buildGoModule (finalAttrs: {
  pname = "athens";
-  version = "0.16.1";
+  version = "0.16.2";

  src = fetchFromGitHub {
    owner = "gomods";
    repo = "athens";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-qF5sSpWtw1qTxfaZkQse882JjE5idP2Wk0RVsPmzIlY=";
+    hash = "sha256-Mv0fJ5EiU/Nxakr1sLx2rcJnQ9SEjFMn+2Gf4qsnN3w=";
  };

  vendorHash = "sha256-bn3He7ImXxrl+Or2pqzVpM8VxbfqDDupwtZbdSMd4HI=";
--- a/pkgs/by-name/at/atproto-goat/package.nix
+++ b/pkgs/by-name/at/atproto-goat/package.nix
@@ -7,13 +7,13 @@

 buildGoModule (finalAttrs: {
  pname = "atproto-goat";
-  version = "0.2.1";
+  version = "0.2.2";

  src = fetchFromGitHub {
    owner = "bluesky-social";
    repo = "goat";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-ECkazbwg25L8W8w7B6hlKD1rEAjGBRKaZ76rKSfR0vI=";
+    hash = "sha256-jSwlKKMrUsb0stcPvC9i7dgH4DrlnUTwp+HYTwendB0=";
  };

  postPatch = ''
@@ -22,7 +22,7 @@ buildGoModule (finalAttrs: {
      --replace-fail '"github.com/earthboundkid/versioninfo/v2"' ""
  '';

-  vendorHash = "sha256-t35Y+llIr2vpBr/LA6WurqxUH7fVTgT9Y8OHX8v8xP4=";
+  vendorHash = "sha256-rqnCFBSmHaZWWc1MrK8udQLkK5MP4Yv2TTlozQqW0fc=";

  passthru.updateScript = nix-update-script { };

--- a/pkgs/by-name/au/authenticator/package.nix
+++ b/pkgs/by-name/au/authenticator/package.nix
@@ -21,7 +21,6 @@
  sqlite,
  wayland,
  zbar,
-  glycin-loaders,
  nix-update-script,
 }:

@@ -78,8 +77,6 @@ stdenv.mkDerivation (finalAttrs: {
    gappsWrapperArgs+=(
      # vp8enc preset
      --prefix GST_PRESET_PATH : "${gst_all_1.gst-plugins-good}/share/gstreamer-1.0/presets"
-      # See https://gitlab.gnome.org/sophie-h/glycin/-/blob/0.1.beta.2/glycin/src/config.rs#L44
-      --prefix XDG_DATA_DIRS : "${glycin-loaders}/share"
    )
  '';

--- a/pkgs/by-name/av/avbroot/package.nix
+++ b/pkgs/by-name/av/avbroot/package.nix
@@ -10,16 +10,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "avbroot";
-  version = "3.24.0";
+  version = "3.24.1";

  src = fetchFromGitHub {
    owner = "chenxiaolong";
    repo = "avbroot";
    tag = "v${version}";
-    hash = "sha256-SmoYlBG5GcTqPdAm9snZsPhFX3MEZdC59whqVnmAwes=";
+    hash = "sha256-VLu6tOXcpSTrwjv44bw+/8onDB/GlNmgpcx+s+FYKUE=";
  };

-  cargoHash = "sha256-UZwJLiOPVBgZztRhp65Qs66OfnL4RTcRlTrpW1a6Ae8=";
+  cargoHash = "sha256-oJeO0Vtfesx6quTjv6hdA1PgJVAuzPGsRnp88fz/oSA=";

  nativeBuildInputs = [
    pkg-config
--- a/pkgs/by-name/aw/aws-lc/package.nix
+++ b/pkgs/by-name/aw/aws-lc/package.nix
@@ -11,13 +11,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "aws-lc";
-  version = "1.66.0";
+  version = "1.67.0";

  src = fetchFromGitHub {
    owner = "aws";
    repo = "aws-lc";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-OO9TWwaV/GlyrLl4C6oCFxIAeYfWjzvY7o//7OuoRDc=";
+    hash = "sha256-p58Re3HvBY/nzyCFvM5Ntx7Mb5OgcNQoZNloAJitDTY=";
  };

  outputs = [
--- a/pkgs/by-name/az/azahar/package.nix
+++ b/pkgs/by-name/az/azahar/package.nix
@@ -158,10 +158,7 @@ stdenv.mkDerivation (finalAttrs: {
    description = "Open-source 3DS emulator project based on Citra";
    homepage = "https://github.com/azahar-emu/azahar";
    license = lib.licenses.gpl2Only;
-    maintainers = with lib.maintainers; [
-      arthsmn
-      marcin-serwin
-    ];
+    maintainers = with lib.maintainers; [ marcin-serwin ];
    mainProgram = "azahar";
    platforms = with lib.platforms; linux ++ darwin;
  };
--- a/pkgs/by-name/ba/bazaar/package.nix
+++ b/pkgs/by-name/ba/bazaar/package.nix
@@ -9,7 +9,6 @@
  pkg-config,
  wrapGAppsHook4,
  appstream,
-  bubblewrap,
  flatpak,
  glib-networking,
  glycin-loaders,
@@ -18,6 +17,7 @@
  libadwaita,
  libdex,
  libglycin,
+  libglycin-gtk4,
  libsoup_3,
  libxmlb,
  libyaml,
@@ -56,6 +56,8 @@ stdenv.mkDerivation (finalAttrs: {
    libadwaita
    libdex
    libglycin
+    libglycin-gtk4
+    glycin-loaders
    libsoup_3
    libxmlb
    libyaml
@@ -64,15 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
    libsecret
  ];

-  preFixup = ''
-    gappsWrapperArgs+=(
-      --prefix PATH : "$out/bin:${lib.makeBinPath [ bubblewrap ]}"
-      --prefix XDG_DATA_DIRS : "${glycin-loaders}/share"
-    )
-  '';
-
  passthru = {
-    inherit (libglycin) glycinPathsPatch;
    updateScript = nix-update-script { };
  };

--- a/pkgs/by-name/bl/blast/package.nix
+++ b/pkgs/by-name/bl/blast/package.nix
@@ -9,15 +9,16 @@
  cpio,
  gawk,
  coreutils,
+  curl,
+  sqlite,
 }:
-
 stdenv.mkDerivation (finalAttrs: {
  pname = "blast";
-  version = "2.14.1";
+  version = "2.17.0";

  src = fetchurl {
    url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${finalAttrs.version}/ncbi-blast-${finalAttrs.version}+-src.tar.gz";
-    sha256 = "sha256-cSwtvfD7E8wcLU9O9d0c5LBsO1fpbf6o8j5umfWxZQ4=";
+    sha256 = "sha256-UCBXqI6ZkONOYnWL4h6kdMwK1o1qY6LjeyNyrx5eoUc=";
  };

  sourceRoot = "ncbi-blast-${finalAttrs.version}+-src/c++";
@@ -28,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
    "--with-flat-makefile"
    "--without-makefile-auto-update"
    "--with-dll" # build dynamic libraries (static are default)
+    "--with-sqlite3=${sqlite.dev}"
  ];

  makeFlags = [ "all_projects=app/" ];
@@ -100,6 +102,7 @@ stdenv.mkDerivation (finalAttrs: {
    gawk
    zlib
    bzip2
+    sqlite
  ];

  strictDeps = true;
@@ -109,6 +112,9 @@ stdenv.mkDerivation (finalAttrs: {
  postInstall = ''
    substituteInPlace $out/bin/get_species_taxids.sh \
        --replace-fail "/bin/rm" "${coreutils}/bin/rm"
+
+    substituteInPlace $out/bin/update_blastdb.pl \
+        --replace-fail 'qw(/usr/local/bin /usr/bin)' 'qw(${lib.getBin curl}/bin)'
  '';
  patches = [ ./no_slash_bin.patch ];

@@ -125,6 +131,9 @@ stdenv.mkDerivation (finalAttrs: {
    # Version 2.10.0 fails on Darwin
    # See https://github.com/NixOS/nixpkgs/pull/61430
    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ luispedro ];
+    maintainers = with lib.maintainers; [
+      luispedro
+      mulatta
+    ];
  };
 })
--- a/pkgs/by-name/bl/bloop/package.nix
+++ b/pkgs/by-name/bl/bloop/package.nix
@@ -11,7 +11,7 @@

 stdenv.mkDerivation rec {
  pname = "bloop";
-  version = "2.0.18";
+  version = "2.0.19";

  platform =
    if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then
@@ -42,11 +42,11 @@ stdenv.mkDerivation rec {
    url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}";
    sha256 =
      if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then
-        "sha256-18cI2w2HXq1BechxLi1GzljWRYAp2IDO5SAaZHnJy6c="
+        "sha256-HyjsBpSoek56no+19rZtjih+/Deu1NO9bwjMBz44B2U="
      else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then
-        "sha256-pVGxaEAatqRTIwTHpTEt7XwzLqgFf67ztgjTtIEnBa8="
+        "sha256-mYPqqyO3wXKUVYSueHYteJd3z/nNCfP0LxvEQdg+oT8="
      else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then
-        "sha256-AjI1YKarVSGJHuRJ/86BaeD4XkGcbI7XzjAg5swgNM0="
+        "sha256-Yf/oECDSR9FN/rxz2hkBlvMCK0BtLFRBR0VagLaqivc="
      else
        throw "unsupported platform";
  };
--- a/pkgs/by-name/c3/c3-lsp/package.nix
+++ b/pkgs/by-name/c3/c3-lsp/package.nix
@@ -28,7 +28,7 @@ buildGoModule rec {
    homepage = "https://github.com/pherrymason/c3-lsp";
    changelog = "https://github.com/pherrymason/c3-lsp/blob/${src.rev}/changelog.md";
    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ arthsmn ];
+    maintainers = [ ];
    mainProgram = "c3-lsp";
    platforms = lib.platforms.all;
  };
--- a/pkgs/by-name/ca/calibre/package.nix
+++ b/pkgs/by-name/ca/calibre/package.nix
@@ -38,11 +38,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "calibre";
-  version = "8.15.0";
+  version = "8.16.2";

  src = fetchurl {
    url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz";
-    hash = "sha256-Wnv+S/4ajebu87+R+pft9Ka//sD12SsH6+1nXVx/XrQ=";
+    hash = "sha256-AYfQQ1T1PMB0EUHaAml37jCnfvoMN7GDm94FiCIsHGw=";
  };

  patches =
@@ -135,6 +135,8 @@ stdenv.mkDerivation (finalAttrs: {
        regex
        sip
        setuptools
+        tzdata
+        tzlocal
        zeroconf
        jeepney
        pycryptodome
@@ -212,6 +214,7 @@ stdenv.mkDerivation (finalAttrs: {
        wrapProgram $program \
          ''${qtWrapperArgs[@]} \
          ''${gappsWrapperArgs[@]} \
+          --set QTWEBENGINE_CHROMIUM_FLAGS "--disable-gpu" \
          --prefix PATH : ${
            lib.makeBinPath [
              libjpeg
--- a/pkgs/by-name/ca/cameradar/package.nix
+++ b/pkgs/by-name/ca/cameradar/package.nix
@@ -8,13 +8,13 @@

 buildGoModule (finalAttrs: {
  pname = "cameradar";
-  version = "6.0.0";
+  version = "6.0.2";

  src = fetchFromGitHub {
    owner = "Ullaakut";
    repo = "cameradar";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-cWxclfu0ywmqKnBxsaWWz2sMFExC5Dcrf+rceAhIW2U=";
+    hash = "sha256-XmCpd7ptPU26EMn+WDH2Y9hKRsYV0GdbU4T26TUsp6U=";
  };

  vendorHash = "sha256-A8SJRky4dQHJoYpOaUBae89kHXwbdA+gnF/p7oRxcYo=";
--- a/pkgs/by-name/ca/cargo-mutants/package.nix
+++ b/pkgs/by-name/ca/cargo-mutants/package.nix
@@ -7,16 +7,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cargo-mutants";
-  version = "26.0.0";
+  version = "26.2.0";

  src = fetchFromGitHub {
    owner = "sourcefrog";
    repo = "cargo-mutants";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-TtB+g5WgEqKP9sYJY3P/WDbpT9lD23RDi0/A7khwDIw=";
+    hash = "sha256-tBCLjZWtz3R7ak1npc9gQxjX0axl2Tlz1PMbkYUDjfk=";
  };

-  cargoHash = "sha256-FVwRS9OcQ0CjH8h10BzP7rTNHFIvefagIHMxVrfMaHo=";
+  cargoHash = "sha256-MljPZCzfnXj5s6tEINkDhvmGNAfgbNTWR7nmd+ft2Wg=";

  # too many tests require internet access
  doCheck = false;
--- a/pkgs/by-name/ca/cargo-xwin/package.nix
+++ b/pkgs/by-name/ca/cargo-xwin/package.nix
@@ -6,16 +6,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "cargo-xwin";
-  version = "0.21.3";
+  version = "0.21.4";

  src = fetchFromGitHub {
    owner = "rust-cross";
    repo = "cargo-xwin";
    rev = "v${version}";
-    hash = "sha256-WsB+vAWcenZ5px5YdI7JqDXCoOTsk42T0EyqYQMLttQ=";
+    hash = "sha256-mgFMjNxjB4S9/nou6S8NN8ZpXX7K49lLArt/cXcSPIE=";
  };

-  cargoHash = "sha256-nbbIj0x5tVavzLR9Z0v+lFQEFrQvyNdAQVtmDGtoMYY=";
+  cargoHash = "sha256-Md2pk8kYqUDPzRQedbne4Crg5UbGHHE5OTRz4LXLs3E=";

  meta = {
    description = "Cross compile Cargo project to Windows MSVC target with ease";
--- a/pkgs/by-name/ca/cargo-zigbuild/package.nix
+++ b/pkgs/by-name/ca/cargo-zigbuild/package.nix
@@ -10,16 +10,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cargo-zigbuild";
-  version = "0.21.4";
+  version = "0.21.6";

  src = fetchFromGitHub {
    owner = "messense";
    repo = "cargo-zigbuild";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-ayg5sj0Exjk986syGNyrmc+WWCCpnxUNBB2YMQ+AVwI=";
+    hash = "sha256-ZoZM43439Pph4slCyLe8D0KcZzO9F3Mb3wAT3xK9jBg=";
  };

-  cargoHash = "sha256-DjvLuOotTL1V+BjtIzZjDuUOvdIcDaufyuCQDKmzpeM=";
+  cargoHash = "sha256-X7cOyn0ZZHUtRqaGOZqLh4Y61Q3u9PLA31GkN3zu/VM=";

  nativeBuildInputs = [ makeWrapper ];

--- a/pkgs/by-name/ce/centrifugo/package.nix
+++ b/pkgs/by-name/ce/centrifugo/package.nix
@@ -16,16 +16,16 @@ let
 in
 buildGoModule rec {
  pname = "centrifugo";
-  version = "6.5.1";
+  version = "6.6.0";

  src = fetchFromGitHub {
    owner = "centrifugal";
    repo = "centrifugo";
    rev = "v${version}";
-    hash = "sha256-CuH8P28WMKBMHHXFZ1zyFX483zNlcomDGVP2CWtF4TM=";
+    hash = "sha256-v6uMnycHncQZUB3d7eMdSBH4ISNZM5OcipAz5ohHZTE=";
  };

-  vendorHash = "sha256-ug6P0xYN3bhmbDWu9MOL2OtDkm2IWjBZDrCOKjPXX3A=";
+  vendorHash = "sha256-I0VvHbPDIwuEONcZnxqh/lg4OP9quPZyT8f3Zev9TRc=";

  ldflags = [
    "-s"
--- a/pkgs/by-name/ch/chirpstack-udp-forwarder/package.nix
+++ b/pkgs/by-name/ch/chirpstack-udp-forwarder/package.nix
@@ -9,16 +9,16 @@
 }:
 rustPlatform.buildRustPackage rec {
  pname = "chirpstack-udp-forwarder";
-  version = "4.2.1";
+  version = "4.3.0";

  src = fetchFromGitHub {
    owner = "chirpstack";
    repo = "chirpstack-udp-forwarder";
    rev = "v${version}";
-    hash = "sha256-BCflOG9v+tW5o0b/hZqlcg1BA+V/lpNzr3fJ9eg6qeY=";
+    hash = "sha256-hGqkeDH/LHqBhpZQsss0jzMIQxhkryKucaLuWJtmseI=";
  };

-  cargoHash = "sha256-2XTb9Wv61as7XhNMjJeryVq8nY835AxiONJjapdgCAw=";
+  cargoHash = "sha256-WkFQXOY6JVjpw8UsrKgRgR6UzRBNOIg56zBqdcM9LuE=";

  nativeBuildInputs = [ protobuf ];

--- a/pkgs/by-name/ci/cirrus-cli/package.nix
+++ b/pkgs/by-name/ci/cirrus-cli/package.nix
@@ -8,16 +8,16 @@

 buildGoModule rec {
  pname = "cirrus-cli";
-  version = "0.161.5";
+  version = "0.162.0";

  src = fetchFromGitHub {
    owner = "cirruslabs";
    repo = "cirrus-cli";
    rev = "v${version}";
-    hash = "sha256-9mv6bGJDEv4ji4N7YFJYVjvYfRnqR9gsMP/JJ0NhobI=";
+    hash = "sha256-2YIStmYuJK4k7TUyMTHx8IozoqxQlcp/QvzYq2dOrBw=";
  };

-  vendorHash = "sha256-X7nziUeOJTMUhEQuF48ghVTuffOmsRtQrE3H4sqrObw=";
+  vendorHash = "sha256-YIDWRKbnXOWrQdjXz/GYzTIduSGQBaeCo21gp469VHc=";

  ldflags = [
    "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}"
--- a/pkgs/by-name/cl/cliflux/package.nix
+++ b/pkgs/by-name/cl/cliflux/package.nix
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
    homepage = "https://github.com/spencerwi/cliflux";
    changelog = "https://github.com/spencerwi/cliflux/blob/v${finalAttrs.version}/CHANGELOG.md";
    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ arthsmn ];
+    maintainers = [ ];
    mainProgram = "cliflux";
  };
 })
--- a/pkgs/by-name/co/coc-sumneko-lua/package-lock-fix.patch
+++ b/pkgs/by-name/co/coc-sumneko-lua/package-lock-fix.patch
--- a/pkgs/by-name/co/coc-sumneko-lua/package.nix
+++ b/pkgs/by-name/co/coc-sumneko-lua/package.nix
@@ -1,60 +0,0 @@
-{
-  lib,
-  buildNpmPackage,
-  fetchFromGitHub,
-  esbuild,
-  buildGoModule,
-}:
-let
-  esbuild' =
-    let
-      version = "0.20.2";
-    in
-    esbuild.override {
-      buildGoModule =
-        args:
-        buildGoModule (
-          args
-          // {
-            inherit version;
-            src = fetchFromGitHub {
-              owner = "evanw";
-              repo = "esbuild";
-              rev = "v${version}";
-              hash = "sha256-h/Vqwax4B4nehRP9TaYbdixAZdb1hx373dNxNHvDrtY=";
-            };
-            vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
-          }
-        );
-    };
-in
-buildNpmPackage (finalAttrs: {
-  pname = "coc-sumneko-lua";
-  version = "0.0.42";
-
-  src = fetchFromGitHub {
-    owner = "xiyaowong";
-    repo = "coc-sumneko-lua";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-B5XvhhBbVeBQI6nWVskaopx2pJYFBiFCfbPwwwloFig=";
-  };
-
-  patches = [
-    ./package-lock-fix.patch
-  ];
-
-  npmDepsHash = "sha256-NEUDQm4hzhGJyEdiBBrSWa8fMw3DcnnPJJo0m+HgZ5U=";
-
-  nativeBuildInputs = [ esbuild' ];
-
-  env.ESBUILD_BINARY_PATH = lib.getExe esbuild';
-
-  passthru.updateScript = ./update.sh;
-
-  meta = {
-    description = "Lua extension using sumneko lua-language-server for coc.nvim";
-    homepage = "https://github.com/xiyaowong/coc-sumneko-lua";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ pyrox0 ];
-  };
-})
--- a/pkgs/by-name/co/coc-sumneko-lua/update.sh
+++ b/pkgs/by-name/co/coc-sumneko-lua/update.sh
@@ -1,31 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p bash nodejs nix-update git curl jq
-
-WORKDIR=$(mktemp -d)
-PACKAGE_DIR="$(realpath "$(dirname "$0")")"
-
-# Get latest tag
-NEW_VERSION=$(curl "https://api.github.com/repos/xiyaowong/coc-sumneko-lua/tags" | jq -r '.[] | .name' | sort --version-sort | tail -1)
-# Trim leading "v" for version comparisons
-NEW_VERSION=${NEW_VERSION:1}
-
-# exit early if no change
-if [[ "$UPDATE_NIX_OLD_VERSION" == "$NEW_VERSION" ]]; then
-  echo "package is up-to-date: $UPDATE_NIX_OLD_VERSION"
-  exit 0
-fi
-
-# Clone source
-git clone "https://github.com/xiyaowong/coc-sumneko-lua" -b "v$NEW_VERSION" "$WORKDIR/src"
-pushd "$WORKDIR/src"
-npx --yes npm-package-lock-add-resolved
-
-# Update package-lock patch
-git diff >"$PACKAGE_DIR/package-lock-fix.patch"
-popd
-
-# Run nix-update
-nix-update "$UPDATE_NIX_PNAME"
-
-# Cleanup
-rm -rf "$WORKDIR"
--- a/pkgs/by-name/co/cocoon/package.nix
+++ b/pkgs/by-name/co/cocoon/package.nix
@@ -6,13 +6,13 @@
 }:
 buildGoModule (finalAttrs: {
  pname = "cocoon";
-  version = "0.8.2";
+  version = "0.8.3";

  src = fetchFromGitHub {
    owner = "haileyok";
    repo = "cocoon";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-pQHltHAU5UAOtG7AvxQMI9tFeXApY4+C7+ipk4vG8zs=";
+    hash = "sha256-lyRTLnh+kxuvGfKML1g92+K3pR6okbVVnkCJMkBypRU=";
  };

  ldflags = [
--- a/pkgs/by-name/co/codex-acp/package.nix
+++ b/pkgs/by-name/co/codex-acp/package.nix
@@ -7,16 +7,16 @@
 }:
 rustPlatform.buildRustPackage rec {
  pname = "codex-acp";
-  version = "0.9.0";
+  version = "0.9.1";

  src = fetchFromGitHub {
    owner = "zed-industries";
    repo = "codex-acp";
    tag = "v${version}";
-    hash = "sha256-Ejqu8NU6lRUMbke/jrilIUkrVF5gAk5y19Jj1ftTVd8=";
+    hash = "sha256-QQye6H5XCHDsqypXK5ROQ27PYk/W0Cip61sjECZDQo4=";
  };

-  cargoHash = "sha256-S3S9bpGrAAV0+vQ+N/jx5bkG2X5eFsQ8It5eiOjyi/o=";
+  cargoHash = "sha256-pHJhzPSLX9lKa9FXuauF0brwgFSQgPIHOVo6l+PqnnI=";

  nativeBuildInputs = [
    pkg-config
--- a/pkgs/by-name/co/colord/package.nix
+++ b/pkgs/by-name/co/colord/package.nix
@@ -36,7 +36,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "colord";
-  version = "1.4.6";
+  version = "1.4.8";

  outputs = [
    "out"
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {

  src = fetchurl {
    url = "https://www.freedesktop.org/software/colord/releases/colord-${finalAttrs.version}.tar.xz";
-    sha256 = "dAdjGie/5dG2cueuQndwAcEF2GC3tzkig8jGMA3ojm8=";
+    hash = "sha256-IVAL1ol1MSp/DzzmAZ2fdfQqrKp1ynEV7HILVEVAaJY=";
  };

  patches = [
@@ -126,6 +126,7 @@ stdenv.mkDerivation (finalAttrs: {
    PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system";
    PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";
    PKG_CONFIG_SYSTEMD_TMPFILESDIR = "${placeholder "out"}/lib/tmpfiles.d";
+    PKG_CONFIG_SYSTEMD_SYSUSERSDIR = "${placeholder "out"}/lib/sysusers.d";
    PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR = "${placeholder "out"}/share/bash-completion/completions";
    PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev";
  };
--- a/pkgs/by-name/co/constrict/package.nix
+++ b/pkgs/by-name/co/constrict/package.nix
@@ -11,6 +11,7 @@
  desktop-file-utils,
  libadwaita,
  libglycin,
+  libglycin-gtk4,
  libva-utils,
  ffmpeg,
  gst-thumbnailers,
@@ -42,6 +43,8 @@ python3Packages.buildPythonApplication (finalAttrs: {
  buildInputs = [
    libadwaita
    libglycin
+    libglycin-gtk4
+    glycin-loaders
  ];

  dependencies = [
@@ -60,7 +63,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
  preFixup = ''
    makeWrapperArgs+=(
      ''${gappsWrapperArgs[@]}
-      --prefix XDG_DATA_DIRS : "${glycin-loaders}/share"
      --prefix PATH : ${lib.makeBinPath finalAttrs.runtimeDeps}
    )
  '';
--- a/pkgs/by-name/co/coroot-node-agent/package.nix
+++ b/pkgs/by-name/co/coroot-node-agent/package.nix
@@ -7,13 +7,13 @@

 buildGoModule rec {
  pname = "coroot-node-agent";
-  version = "1.27.4";
+  version = "1.28.1";

  src = fetchFromGitHub {
    owner = "coroot";
    repo = "coroot-node-agent";
    rev = "v${version}";
-    hash = "sha256-G1WFU7A0ibGsAZfpmIRQN4GR5LBKliMDDLnNnYqo4d8=";
+    hash = "sha256-g2qvfK+H1+pK6vBlC0nOwenfYF3/KFHZPiO3OZkOUyg=";
  };

  vendorHash = "sha256-sjdUjnBMzEfGCVOwuL9Zw/5Lup3yUf5LoBajLOCNteA=";
--- a/pkgs/by-name/ct/ctranslate2/package.nix
+++ b/pkgs/by-name/ct/ctranslate2/package.nix
@@ -28,14 +28,14 @@ let
 in
 stdenv'.mkDerivation (finalAttrs: {
  pname = "ctranslate2";
-  version = "4.7.0";
+  version = "4.7.1";

  src = fetchFromGitHub {
    owner = "OpenNMT";
    repo = "CTranslate2";
    tag = "v${finalAttrs.version}";
    fetchSubmodules = true;
-    hash = "sha256-aH2sm7GkHbjy0/KwgyCIpAFNHDmJURd4xyn+51MCr+Y=";
+    hash = "sha256-Dc67hYgZ0aAauZLrVp10jmP52AwdLIZw0iWR9YKHTtU=";
  };

  # Fix CMake 4 compatibility
--- a/pkgs/by-name/cu/curl-impersonate/deps.nix
+++ b/pkgs/by-name/cu/curl-impersonate/deps.nix
@@ -7,9 +7,9 @@
    hash = "sha256-KTfK3eAHqjpSoXwhrJFT6gVHAPN5JtHZZgK/B+iIyEc=";
  };

-  "brotli-1.1.0.tar.gz" = fetchurl {
-    url = "https://github.com/google/brotli/archive/refs/tags/v1.1.0.tar.gz";
-    hash = "sha256-5yCmyilCi4A/StFlNxdx9TmPq6OX7fZ3iDehhZnqE/8=";
+  "brotli-1.2.0.tar.gz" = fetchurl {
+    url = "https://github.com/google/brotli/archive/refs/tags/v1.2.0.tar.gz";
+    hash = "sha256-gWyW6Ojxk7QBUdrX6P83sSIdAZ28ucNc0/rb/mR33+w=";
  };

  "boringssl-673e61fc215b178a90c0e67858bbf162c8158993.zip" = fetchurl {
@@ -31,4 +31,24 @@
    url = "https://github.com/ngtcp2/nghttp3/releases/download/v1.9.0/nghttp3-1.9.0.tar.bz2";
    hash = "sha256-TTCmjxfnKhOStghdr6qfxzLaHX0m7sVUuyFnCDMvzxo=";
  };
+
+  "zlib-1.3.1.tar.gz" = fetchurl {
+    url = "https://github.com/madler/zlib/releases/download/v1.3.1/zlib-1.3.1.tar.gz";
+    hash = "sha256-mpOyt9/ax3zrpaVYpYDnRmfdb+3kWFuR7vtg8Dty3yM=";
+  };
+
+  "zstd-1.5.6.tar.gz" = fetchurl {
+    url = "https://github.com/facebook/zstd/releases/download/v1.5.6/zstd-1.5.6.tar.gz";
+    hash = "sha256-jCngbPQqrMHq/EB3ri7Gxvy5amJhV+BZPV6Co0/UA8E=";
+  };
+
+  "libunistring-1.1.tar.gz" = fetchurl {
+    url = "https://ftp.gnu.org/gnu/libunistring/libunistring-1.1.tar.gz";
+    hash = "sha256-oiUr7uyDCsREufaNazitiD2xmRnbNbUiIs+CfDhb22o=";
+  };
+
+  "libidn2-2.3.7.tar.gz" = fetchurl {
+    url = "https://ftp.gnu.org/gnu/libidn/libidn2-2.3.7.tar.gz";
+    hash = "sha256-TCGnkbYQuVGbnQ4SuAl78vNZsS+N2SZHYRqSnmv9fWQ=";
+  };
 }
--- a/pkgs/by-name/cu/curl-impersonate/package.nix
+++ b/pkgs/by-name/cu/curl-impersonate/package.nix
@@ -26,7 +26,7 @@
 }:
 stdenv.mkDerivation rec {
  pname = "curl-impersonate";
-  version = "1.2.0";
+  version = "1.4.2";

  outputs = [
    "out"
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
    owner = "lexiforest";
    repo = "curl-impersonate";
    tag = "v${version}";
-    hash = "sha256-tAQdTRGAOD2rpLZvoLQ2YL0wrohXEcmChMZBvYjsMhE=";
+    hash = "sha256-c24KaYc0cH6b+92kg02mMtTp7ZVu36LeDpW5xjxuzk4=";
  };

  # Disable blanket -Werror to fix build on `gcc-13` related to minor
@@ -157,6 +157,7 @@ stdenv.mkDerivation rec {
    let
      libext = stdenv.hostPlatform.extensions.sharedLibrary;
    in
+    # sh
    ''
      # If libnssckbi.so is needed, link libnssckbi.so without needing nss in closure
      if grep -F nssckbi $out/lib/libcurl-impersonate${libext} &>/dev/null; then
@@ -165,6 +166,9 @@ stdenv.mkDerivation rec {
          patchelf --add-needed libnssckbi${libext} $out/lib/libcurl-impersonate${libext}
        ''}
      fi
+
+      # installPhase already installs curl headers in $dev, better to override those
+      rm -rf "$dev/include/curl"
    '';

  disallowedReferences = [ go ];
@@ -197,7 +201,7 @@ stdenv.mkDerivation rec {

  meta = {
    changelog = "https://github.com/lexiforest/curl-impersonate/releases/tag/${src.tag}";
-    description = "Special build of curl that can impersonate Chrome & Firefox";
+    description = "Special build of curl that can impersonate Chrome, Edge, Safari and Firefox";
    homepage = "https://github.com/lexiforest/curl-impersonate";
    license = with lib.licenses; [
      curl
--- a/pkgs/by-name/cu/curl-impersonate/update.sh
+++ b/pkgs/by-name/cu/curl-impersonate/update.sh
@@ -99,6 +99,26 @@ cat >"$(dirname "$pkgpath")"/deps.nix <<EOF
    url = "$(evalvar NGHTTP3_URL "$vars")";
    hash = "$(narhash "$(evalvar NGHTTP3_URL "$vars")")";
  };
+
+  "zlib-$(getvar ZLIB_VERSION "$vars").tar.gz" = fetchurl {
+    url = "$(evalvar ZLIB_URL "$vars")";
+    hash = "$(narhash "$(evalvar ZLIB_URL "$vars")")";
+  };
+
+  "zstd-$(getvar ZSTD_VERSION "$vars").tar.gz" = fetchurl {
+    url = "$(evalvar ZSTD_URL "$vars")";
+    hash = "$(narhash "$(evalvar ZSTD_URL "$vars")")";
+  };
+
+  "libunistring-$(getvar LIBUNISTRING_VERSION "$vars").tar.gz" = fetchurl {
+    url = "$(evalvar LIBUNISTRING_URL "$vars")";
+    hash = "$(narhash "$(evalvar LIBUNISTRING_URL "$vars")")";
+  };
+
+  "libidn2-$(getvar LIBIDN2_VERSION "$vars").tar.gz" = fetchurl {
+    url = "$(evalvar LIBIDN2_URL "$vars")";
+    hash = "$(narhash "$(evalvar LIBIDN2_URL "$vars")")";
+  };
 }
 EOF

--- a/pkgs/by-name/da/daikhan/package.nix
+++ b/pkgs/by-name/da/daikhan/package.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
    homepage = "https://gitlab.com/daikhan/daikhan";
    changelog = "https://gitlab.com/daikhan/daikhan/-/blob/${finalAttrs.version}/NEWS";
    license = lib.licenses.agpl3Only;
-    maintainers = with lib.maintainers; [ arthsmn ];
+    maintainers = [ ];
    mainProgram = "daikhan";
    platforms = lib.platforms.linux;
  };
--- a/pkgs/by-name/db/dbip-asn-lite/package.nix
+++ b/pkgs/by-name/db/dbip-asn-lite/package.nix
@@ -5,11 +5,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "dbip-asn-lite";
-  version = "2026-01";
+  version = "2026-02";

  src = fetchurl {
    url = "https://download.db-ip.com/free/dbip-asn-lite-${finalAttrs.version}.mmdb.gz";
-    hash = "sha256-wMjtsicRq4KSGHe5mJwsNXZwRXxROw5jWiD4Y6uW6X0=";
+    hash = "sha256-TQZoH5bC3bQUyod8pXCHTnObvdl8q/FE/03FPFiScGw=";
  };

  dontUnpack = true;
--- a/pkgs/by-name/db/dbip-city-lite/package.nix
+++ b/pkgs/by-name/db/dbip-city-lite/package.nix
@@ -5,11 +5,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "dbip-city-lite";
-  version = "2026-01";
+  version = "2026-02";

  src = fetchurl {
    url = "https://download.db-ip.com/free/dbip-city-lite-${finalAttrs.version}.mmdb.gz";
-    hash = "sha256-2KgQbVSuZVyl1FCR8bGWIbglL/Gp4654z1dfNLP/VCU=";
+    hash = "sha256-dqbyP7ZjcJ2RXVPpAZzDUsZyEyT/7SoZof91LmQMyxA=";
  };

  dontUnpack = true;
--- a/pkgs/by-name/db/dbip-country-lite/package.nix
+++ b/pkgs/by-name/db/dbip-country-lite/package.nix
@@ -5,11 +5,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "dbip-country-lite";
-  version = "2026-01";
+  version = "2026-02";

  src = fetchurl {
    url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz";
-    hash = "sha256-S6Ae3c4Ft2U58yfc/blaJCM/H5uSi73sOEyudxyOdbE=";
+    hash = "sha256-xmQZEJZ5WzE9uQww1Sdb8248l+liYw46tjbfJeu945Q=";
  };

  dontUnpack = true;
--- a/pkgs/by-name/df/dfl-applications/package.nix
+++ b/pkgs/by-name/df/dfl-applications/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
    homepage = "https://gitlab.com/desktop-frameworks/applications";
    changelog = "https://gitlab.com/desktop-frameworks/applications/-/blob/${finalAttrs.src.rev}/ChangeLog";
    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ arthsmn ];
+    maintainers = [ ];
    platforms = lib.platforms.linux;
  };
 })
--- a/pkgs/by-name/df/dfl-ipc/package.nix
+++ b/pkgs/by-name/df/dfl-ipc/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
    homepage = "https://gitlab.com/desktop-frameworks/ipc";
    changelog = "https://gitlab.com/desktop-frameworks/ipc/-/blob/${finalAttrs.src.rev}/ChangeLog";
    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ arthsmn ];
+    maintainers = [ ];
    platforms = lib.platforms.linux;
  };
 })
--- a/pkgs/by-name/df/dfl-login1/package.nix
+++ b/pkgs/by-name/df/dfl-login1/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
    homepage = "https://gitlab.com/desktop-frameworks/login1";
    changelog = "https://gitlab.com/desktop-frameworks/login1/-/blob/${finalAttrs.src.rev}/ChangeLog";
    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ arthsmn ];
+    maintainers = [ ];
    platforms = lib.platforms.linux;
  };
 })
--- a/pkgs/by-name/df/dfl-utils/package.nix
+++ b/pkgs/by-name/df/dfl-utils/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
    homepage = "https://gitlab.com/desktop-frameworks/utils";
    changelog = "https://gitlab.com/desktop-frameworks/utils/-/blob/${finalAttrs.src.rev}/ChangeLog";
    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ arthsmn ];
+    maintainers = [ ];
    platforms = lib.platforms.linux;
  };
 })
--- a/pkgs/by-name/dn/dnscontrol/package.nix
+++ b/pkgs/by-name/dn/dnscontrol/package.nix
@@ -9,16 +9,16 @@

 buildGoModule (finalAttrs: {
  pname = "dnscontrol";
-  version = "4.32.0";
+  version = "4.33.1";

  src = fetchFromGitHub {
    owner = "StackExchange";
    repo = "dnscontrol";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-eltk1+h2RN1+rNTX8ZbP9WNBE5MK18JGeY26lsVHeAY=";
+    hash = "sha256-FshKD5ERC0DyPcgF65usYhNbobarwVFkk0oUh6MsxdQ=";
  };

-  vendorHash = "sha256-vpomJTbgQnPDESRjpdvWvKwJduCrB4crabF3UdkxDTk=";
+  vendorHash = "sha256-G8TEJwzPJ1WAEXmAdMhq2jSY5FADYMqhhUj7KUYc/gA=";

  nativeBuildInputs = [ installShellFiles ];

--- a/Show More
+++ b/Show More