Merge staging-next into staging

2026-07-06 17:13:24 -05:00 · 2026-06-17 00:51:16 +00:00 · 2026-06-17 00:51:16 +00:00 · 87a9b3959a
commit 87a9b3959a
parent 3e6be33af9 3584ff0445
145 changed files with 2435 additions and 1581 deletions
--- a/ci/OWNERS
+++ b/ci/OWNERS
@ -74,8 +74,6 @@
 /pkgs/build-support/bintools-wrapper             @Ericson2314
 /pkgs/build-support/setup-hooks                  @Ericson2314
 /pkgs/build-support/setup-hooks/arrayUtilities   @ConnorBaker
-/pkgs/build-support/setup-hooks/auto-patchelf.sh @layus
-/pkgs/by-name/au/auto-patchelf                   @layus

 ## Format generators/serializers
 /pkgs/pkgs-lib                                   @Stunkymonkey @h7x4
--- a/doc/languages-frameworks/lua.section.md
+++ b/doc/languages-frameworks/lua.section.md
@ -162,6 +162,14 @@ the package `luarocks-packages-updater`:
 nix-shell -p luarocks-packages-updater --run luarocks-packages-updater
 ```

+To add a new package without updating all packages, run
+
+```sh
+
+nix-shell -p luarocks-packages-updater
+luarocks-packages-updater add <package-name>
+```
+
 [luarocks2nix](https://github.com/nix-community/luarocks) is a tool capable of generating nix derivations from both rockspec and src.rock (and favors the src.rock).
 The automation only goes so far though and some packages need to be customized.
 These customizations go in [pkgs/development/lua-modules/overrides.nix](https://github.com/NixOS/nixpkgs/tree/master/pkgs/development/lua-modules/overrides.nix).
--- a/doc/languages-frameworks/neovim.section.md
+++ b/doc/languages-frameworks/neovim.section.md
@ -151,6 +151,8 @@ For instance:
 ```
 To update these packages, you should use the lua updater rather than vim's.

+To add a lua package to the `vimPlugins` set, add it to the `luarocksPackageNames` list in [luaPackagePlugins.nix](https://github.com/nixos/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix).
+
 ## Treesitter {#neovim-plugin-treesitter}

 [Treesitter](https://tree-sitter.github.io/) provides syntax parsing for Neovim, enabling features like:
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -27438,6 +27438,13 @@
    github = "thattemperature";
    githubId = 125476238;
  };
+  thbemme = {
+    name = "Thomas Bemme";
+    email = "thomas.bemme@gmail.com";
+    matrix = "@riza:chaos.jetzt";
+    github = "thbemme";
+    githubId = 14074615;
+  };
  thblt = {
    name = "Thibault Polge";
    email = "thibault@thb.lt";
@ -28780,6 +28787,12 @@
    githubId = 17836748;
    name = "Mason Mackaman";
  };
+  username-generic = {
+    name = "username-generic";
+    email = "username-generic@tuta.io";
+    github = "username-generic";
+    githubId = 202454830;
+  };
  usertam = {
    name = "Samuel Tam";
    email = "code@usertam.dev";
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@ -35,6 +35,7 @@ haskell-tools.nvim,,,,,5.1,mrcjkb
 http,,,,0.4-0,,vcunat
 inspect,,,,,,
 jsregexp,,,,0.0.7-2,,
+kulala.nvim,,,,,,
 ldbus,,,https://luarocks.org/dev,,,
 ldoc,,,,,,
 lgi,,,,,,
--- a/nixos/doc/manual/development/settings-options.section.md
+++ b/nixos/doc/manual/development/settings-options.section.md
@ -322,6 +322,14 @@ have a predefined type and string generator already declared under

    The attribute `lib.type.atom` contains the used INI atom.

+`pkgs.formats.configobj` { }
+
+:   A function taking an attribute set with values
+
+    It returns a set with [ConfigObj](https://pypi.org/project/configobj/)-specific attributes `type` and `generate` as specified [below](#pkgs-formats-result).
+    The type of the input is an attribute mapping supporting both atoms and nested attribute sets (sections/subsections), as supported by ConfigObj.
+    The renderer is based on Python's `configobj` module.
+
 `pkgs.formats.iniWithGlobalSection` { *`listsAsDuplicateKeys`* ? false, *`listToValue`* ? null, \.\.\. }

 :   A function taking an attribute set with values
--- a/nixos/modules/programs/clash-verge.nix
+++ b/nixos/modules/programs/clash-verge.nix
@ -21,7 +21,15 @@
      defaultText = lib.literalExpression "pkgs.clash-verge-rev";
    };
    serviceMode = lib.mkEnableOption "Service Mode";
-    tunMode = lib.mkEnableOption "Setcap for TUN Mode. DNS settings won't work on this way";
+    tunMode = lib.mkEnableOption "" // {
+      description = ''
+        Whether to set the capabilities required for TUN mode.
+
+        Without these capabilities, Clash Verge's DNS settings will not work in TUN mode.
+
+        When enabled, reverse path filtering will be set to loose instead of strict.
+      '';
+    };
    autoStart = lib.mkEnableOption "Clash Verge auto launch";
    group = lib.mkOption {
      type = lib.types.str;
@ -59,6 +67,22 @@
        source = "${lib.getExe cfg.package}";
      };

+      assertions = [
+        {
+          assertion =
+            cfg.tunMode
+            ->
+              config.networking.firewall.checkReversePath != true
+              && config.networking.firewall.checkReversePath != "strict";
+          message = ''
+            {option}`programs.clash-verge.tunMode` requires {option}`networking.firewall.checkReversePath`
+            to be set to `false` or `"loose"`.
+          '';
+        }
+      ];
+
+      networking.firewall.checkReversePath = lib.mkIf cfg.tunMode (lib.mkDefault "loose");
+
      systemd.services.clash-verge = lib.mkIf cfg.serviceMode {
        enable = true;
        description = "Clash Verge Service Mode";
--- a/nixos/modules/services/web-apps/rustical.nix
+++ b/nixos/modules/services/web-apps/rustical.nix
@ -149,6 +149,8 @@ in
        EnvironmentFile = cfg.environmentFiles;
        Restart = "on-failure";
        StateDirectory = "rustical";
+        RuntimeDirectory = "rustical";
+        RuntimeDirectoryMode = "0750";

        CapabilityBoundingSet = "";
        DevicePolicy = "closed";
@ -172,6 +174,7 @@ in
        RestrictAddressFamilies = [
          "AF_INET"
          "AF_INET6"
+          "AF_UNIX"
        ];
        RestrictNamespaces = true;
        RestrictRealtime = true;
@ -181,7 +184,7 @@ in
          "~@privileged @resources"
        ];
        SystemCallErrorNumber = "EPERM";
-        UMask = "0077";
+        UMask = "0007";
      };
    };
  };
--- a/nixos/modules/services/web-apps/strichliste.nix
+++ b/nixos/modules/services/web-apps/strichliste.nix
@ -128,21 +128,23 @@ in
          };

          account = {
-            lower = mkOption {
-              type = types.int;
-              default = -200000;
-              example = 0;
-              description = ''
-                The credit limit for user accounts.
-              '';
-            };
+            boundary = {
+              lower = mkOption {
+                type = types.int;
+                default = -200000;
+                example = 0;
+                description = ''
+                  The credit limit for user accounts.
+                '';
+              };

-            upper = mkOption {
-              type = types.ints.positive;
-              default = 200000;
-              description = ''
-                The maximum balance on a user account.
-              '';
+              upper = mkOption {
+                type = types.ints.positive;
+                default = 200000;
+                description = ''
+                  The maximum balance on a user account.
+                '';
+              };
            };
          };

@ -256,7 +258,7 @@ in
              };
            };

-            transaction = {
+            transactions = {
              enabled = mkOption {
                type = types.bool;
                default = true;
@ -476,20 +478,15 @@ in
        inherit (cfg) environment;
        serviceConfig = {
          Type = "oneshot";
+          RemainAfterExit = true;
          User = "strichliste";
          Group = "strichliste";
          EnvironmentFile = cfg.environmentFiles;
-          ExecStart = map toString [
-            [
-              (lib.getExe cfg.packages.backend)
-              "cache:clear"
-            ]
-            [
-              (lib.getExe cfg.packages.backend)
-              "doctrine:migrations:migrate"
-              "--allow-no-migration"
-              "--no-interaction"
-            ]
+          ExecStart = toString [
+            (lib.getExe cfg.packages.backend)
+            "doctrine:migrations:migrate"
+            "--allow-no-migration"
+            "--no-interaction"
          ];
        };
      };
@ -497,6 +494,11 @@ in
      systemd.services.phpfpm-strichliste = {
        inherit (cfg) environment;
        serviceConfig.EnvironmentFile = cfg.environmentFiles;
+        restartTriggers = [ settingsFile ];
+        preStart = toString [
+          (lib.getExe cfg.packages.backend)
+          "cache:clear"
+        ];
      };

      services.phpfpm.pools.strichliste = {
--- a/nixos/tests/web-apps/rustical.nix
+++ b/nixos/tests/web-apps/rustical.nix
@ -4,10 +4,6 @@
  ...
 }:

-let
-  port = "4000";
-in
-
 {
  name = "rustical";

@ -15,14 +11,21 @@ in

  containers.machine =
    {
+      config,
      pkgs,
      ...
    }:
    {
-      services.rustical = {
+      services.rustical.enable = true;
+      services.nginx = {
        enable = true;
-        settings.http.bind = "[::]:${port}";
+        virtualHosts."localhost" = {
+          locations."/" = {
+            proxyPass = "http://${config.services.rustical.settings.http.bind}";
+          };
+        };
      };
+      systemd.services.nginx.serviceConfig.SupplementaryGroups = [ "rustical" ];
      environment.systemPackages = with pkgs; [ calendar-cli ];
    };

@ -32,8 +35,6 @@ in
      ...
    }:
    let
-      url = "http://localhost:${toString port}";
-
      createPrincipalScript = pkgs.writeScript "rustical-create-principal" ''
        #!${lib.getExe pkgs.expect}
        spawn rustical principals create alice --password
@ -45,30 +46,31 @@ in
      calendarCliConfig = (pkgs.formats.json { }).generate "rustical-test-calendar-cli.json" {
        default = {
          caldav_user = "alice";
-          caldav_url = "${url}/caldav/";
-          calendar_url = "${url}/caldav/principal/alice";
+          caldav_url = "http://localhost/caldav/";
+          calendar_url = "http://localhost/caldav/principal/alice";
        };
        testcal = {
          inherits = "default";
-          calendar_url = "${url}/caldav/principal/alice/testcal";
+          calendar_url = "http://localhost/caldav/principal/alice/testcal";
        };
      };
    in
    # python
    ''
      machine.wait_for_unit("rustical.service")
-      machine.wait_for_open_port(${port})
+      machine.wait_for_file("${lib.removePrefix "unix:" containers.machine.services.rustical.settings.http.bind}")
+      machine.wait_for_open_port(80)

      with subtest("Smoketest"):
-        machine.succeed("curl --fail ${url}")
+        machine.succeed("curl --fail http://localhost")

      with subtest("Create principal"):
        machine.succeed("${createPrincipalScript}")
        machine.succeed("rustical principals list | grep alice")

      with subtest("Generate token for principal"):
-        machine.succeed("curl -f -c cookies.txt -d 'username=alice&password=foobar' ${url}/frontend/login")
-        machine.succeed("curl -f -b cookies.txt -d 'name=mytoken' ${url}/frontend/user/alice/app_token > token.txt")
+        machine.succeed("curl -f -c cookies.txt -d 'username=alice&password=foobar' http://localhost/frontend/login")
+        machine.succeed("curl -f -b cookies.txt -d 'name=mytoken' http://localhost/frontend/user/alice/app_token > token.txt")

      with subtest("Interact with caldav"):
        machine.succeed('calendar-cli --config-file ${calendarCliConfig} --caldav-pass "$(cat token.txt)" calendar create testcal')
--- a/pkgs/applications/editors/cudatext/deps.json
+++ b/pkgs/applications/editors/cudatext/deps.json
@ -1,57 +0,0 @@
-{
-  "EncConv": {
-    "owner": "Alexey-T",
-    "rev": "2023.04.16",
-    "hash": "sha256-6KaYv4OO6Ctk+vgow67LKGkbEEd1+lFJ9B1wSk4m3pc="
-  },
-  "ATBinHex-Lazarus": {
-    "owner": "Alexey-T",
-    "rev": "2023.08.12",
-    "hash": "sha256-dEwz052aYcJtKpRcP8t7gE2RHuHPQ4T0zHFMv6zVZ6g="
-  },
-  "ATFlatControls": {
-    "owner": "Alexey-T",
-    "rev": "2023.10.30",
-    "hash": "sha256-fuTQnnuWjIsABx457y+n6luLxQf+b9TiZGLXYjNsUrw="
-  },
-  "ATSynEdit": {
-    "owner": "Alexey-T",
-    "rev": "2023.11.23",
-    "hash": "sha256-LGYGCxEPdZL4BU3TGiFxydu7AN8g5kqOdW+dcbiCf7E="
-  },
-  "ATSynEdit_Cmp": {
-    "owner": "Alexey-T",
-    "rev": "2023.05.31",
-    "hash": "sha256-QXu/p3o0RSwMyntFYrjIQBtOBGvL9rAsINaglG3fZvo="
-  },
-  "EControl": {
-    "owner": "Alexey-T",
-    "rev": "2023.11.16",
-    "hash": "sha256-FxUV+K9JRsdr0xqQzvg1UI4bBHyhqxiVoPN58h2+WVg="
-  },
-  "ATSynEdit_Ex": {
-    "owner": "Alexey-T",
-    "rev": "2023.11.23",
-    "hash": "sha256-RNXP8O3UF+hwA3TNzLorZqlt04Idnc4Z9LA87JJSsZE="
-  },
-  "Python-for-Lazarus": {
-    "owner": "Alexey-T",
-    "rev": "2023.06.30",
-    "hash": "sha256-mO8/RNJjy9KtFuDUmV2Y8Ff+Jjm9yRd7GSrI6mOONUc="
-  },
-  "Emmet-Pascal": {
-    "owner": "Alexey-T",
-    "rev": "2023.08.12",
-    "hash": "sha256-s9ZKrL+XIWIwejnLz+uuyDbbDuOZLJhiuiMChKB4Reg="
-  },
-  "CudaText-lexers": {
-    "owner": "Alexey-T",
-    "rev": "2021.07.09",
-    "hash": "sha256-OyC85mTMi9m5kbtx8TAK2V4voL1i+J+TFoLVwxlHiD4="
-  },
-  "bgrabitmap": {
-    "owner": "bgrabitmap",
-    "rev": "v11.5.6",
-    "hash": "sha256-7TuHCCaH8/RxiVQmDILPW4T6op/XW6djwA5iSh/Yb5w="
-  }
-}
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@ -8458,20 +8458,6 @@ final: prev: {
    meta.hydraPlatforms = [ ];
  };

-  kulala-nvim = buildVimPlugin {
-    pname = "kulala.nvim";
-    version = "6.11.1";
-    src = fetchFromGitHub {
-      owner = "mistweaverco";
-      repo = "kulala.nvim";
-      tag = "v6.11.1";
-      hash = "sha256-w3psD4EYntFeX7otMPXN3altJf3UPjcaS2XLlqSnH4k=";
-    };
-    meta.homepage = "https://github.com/mistweaverco/kulala.nvim/";
-    meta.license = getLicenseFromSpdxId "MIT";
-    meta.hydraPlatforms = [ ];
-  };
-
  lackluster-nvim = buildVimPlugin {
    pname = "lackluster.nvim";
    version = "0-unstable-2025-10-06";
--- a/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix
@ -15,6 +15,7 @@ let
    "grug-far-nvim"
    "haskell-tools-nvim"
    "image-nvim"
+    "kulala-nvim"
    "lsp-progress-nvim"
    "lualine-nvim"
    "luasnip"
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@ -2020,10 +2020,6 @@ assertNoAdditions {
      );
    in
    {
-      patches = (old.patches or [ ]) ++ [
-        ./patches/kulala-nvim/use-packaged-tree-sitter-parser.patch
-      ];
-
      dependencies = [ kulala-http-grammar ];

      postPatch = ''
--- a/pkgs/applications/editors/vim/plugins/patches/kulala-nvim/do-not-install-grammar.patch
+++ b/pkgs/applications/editors/vim/plugins/patches/kulala-nvim/do-not-install-grammar.patch
@ -1,15 +0,0 @@
-diff --git a/lua/kulala/config/init.lua b/lua/kulala/config/init.lua
-index 7298f95..d781a12 100644
--- a/lua/kulala/config/init.lua
-+++ b/lua/kulala/config/init.lua
-@@ -122,6 +122,10 @@ local function setup_treesitter_master()
- end
- 
- local function set_kulala_parser()
-+  assert(vim.treesitter.language.add("kulala_http"))
-+  vim.treesitter.language.register("kulala_http", { "http", "rest" })
-+  do return end
-+
-   local parsers = vim.F.npcall(require, "nvim-treesitter.parsers")
- 
-   if not parsers then
--- a/pkgs/applications/editors/vim/plugins/patches/kulala-nvim/use-packaged-tree-sitter-parser.patch
+++ b/pkgs/applications/editors/vim/plugins/patches/kulala-nvim/use-packaged-tree-sitter-parser.patch
@ -1,29 +0,0 @@
-diff --git a/lua/kulala/config/parser.lua b/lua/kulala/config/parser.lua
-index 5f37046..c60c474 100644
--- a/lua/kulala/config/parser.lua
-+++ b/lua/kulala/config/parser.lua
-@@ -37,7 +37,6 @@ local function sync_queries()
- end
- 
- local function load_parser()
-  if not Fs.file_exists(parser_target_path) then return false end
-   return vim.treesitter.language.add(parser_name) == true
- end
- 
-@@ -48,7 +47,3 @@ M.register_parser = function()
-  -- kulala_http/*.scm live under tree-sitter-kulala-http/queries/
-  vim.opt.rtp:prepend(parser_source_path)
-  ensure_site_rtp()
-  sync_queries()
-   vim.treesitter.language.register(parser_name, filetypes)
-   vim.treesitter.language.register("markdown", "kulala_ui")
-   local backend = require("kulala.backend")
-@@ -94,7 +92,7 @@ local function has_kulala_parser()
- end
- 
- M.is_up_to_date = function()
-  return has_kulala_parser() and is_parser_ver_current()
-+  return load_parser()
- end
- 
- M.setup = function()
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@ -602,7 +602,6 @@ https://github.com/frabjous/knap/,,
 https://github.com/oskarnurm/koda.nvim/,,
 https://github.com/b3nj5m1n/kommentary/,,
 https://github.com/udalov/kotlin-vim/,,
-https://github.com/mistweaverco/kulala.nvim/,,
 https://github.com/slugbyte/lackluster.nvim/,,
 https://github.com/qnighy/lalrpop.vim/,,
 https://github.com/Wansmer/langmapper.nvim/,,
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@ -5156,8 +5156,8 @@ let
        mktplcRef = {
          name = "vscode-java-pack";
          publisher = "vscjava";
-          version = "0.31.0";
-          hash = "sha256-E0GJoITZIh2XemVpyPh3gAEtlvM2PZHgNzZDctSpwIA=";
+          version = "0.31.1";
+          hash = "sha256-SfrsL27uQyrtsNyqZe0q5Fv5sHMwRvBZ+iS6/JIpFVo=";
        };
        meta = {
          description = "Popular extensions for Java development that provides Java IntelliSense, debugging, testing, Maven/Gradle support, project management and more";
--- a/pkgs/applications/emulators/libretro/cores/gambatte.nix
+++ b/pkgs/applications/emulators/libretro/cores/gambatte.nix
@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
  core = "gambatte";
-  version = "0-unstable-2026-06-05";
+  version = "0-unstable-2026-06-14";

  src = fetchFromGitHub {
    owner = "libretro";
    repo = "gambatte-libretro";
-    rev = "6716e6ee39c2abd3ea325f66fb26e7f866f4c5dc";
-    hash = "sha256-sn8UWO1YR3qLpsR0dwpyy42L+QWrYpwO2lL4NqgUmWM=";
+    rev = "e99e1bd9b91de67ac12c77c3679c85447c26e8c8";
+    hash = "sha256-i5Bx5MstvwwKfH/Lmlj3jheQsbHP2BU8Ecpp3m5D8HA=";
  };

  meta = {
--- a/pkgs/applications/emulators/libretro/cores/swanstation.nix
+++ b/pkgs/applications/emulators/libretro/cores/swanstation.nix
@ -6,13 +6,13 @@
 }:
 mkLibretroCore {
  core = "swanstation";
-  version = "0-unstable-2026-05-20";
+  version = "0-unstable-2026-06-14";

  src = fetchFromGitHub {
    owner = "libretro";
    repo = "swanstation";
-    rev = "62697276b95848bd35b9c7b81daab899a98e0789";
-    hash = "sha256-jisW5Mk5PF3rxj9mF5FJXtktAKEAq2a6DUvCXBgri3E=";
+    rev = "93b213d805591c4f1488339c4a16f0b4cb68d44a";
+    hash = "sha256-l4HhejwOKE/bk9HFf2mDTDqc223m6UofTIF+BgMIDEw=";
  };

  extraNativeBuildInputs = [ cmake ];
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@ -661,13 +661,13 @@
    "vendorHash": "sha256-CwTlb0QTq0lpZK90IL6mBLoarFYFLsjiLYauGEaR1Rk="
  },
  "hashicorp_tfe": {
-    "hash": "sha256-GRrtwrShJj+d2h6CpxjP+QmRKQLTWoNt5889ek9rfyE=",
+    "hash": "sha256-otBeETd3wrGdpDU4MbY+qyad7ZVaoljlphBNytB36BY=",
    "homepage": "https://registry.terraform.io/providers/hashicorp/tfe",
    "owner": "hashicorp",
    "repo": "terraform-provider-tfe",
-    "rev": "v0.77.0",
+    "rev": "v0.78.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-DutNev1ABazfV6QOWMFsFc0QSkffARhaJ7RXTWG2Jyo="
+    "vendorHash": "sha256-PKAFhHCaeCtV1frMyCidCcJgWTA8/7Cbdq6h3RTeqAQ="
  },
  "hashicorp_time": {
    "hash": "sha256-5+iPq2It3oFHPBHWshfIuNo1xkOPcuSYyljt6j+j7lg=",
--- a/pkgs/build-support/rust/default-crate-overrides.nix
+++ b/pkgs/build-support/rust/default-crate-overrides.nix
@ -15,6 +15,7 @@
  fontconfig,
  foundationdb,
  freetype,
+  fuse3,
  gdk-pixbuf,
  glib,
  gmp,
@ -43,6 +44,7 @@
  udev,
  webkitgtk_4_1,
  zlib,
+  zstd,
  buildPackages,
  ...
 }:
@ -146,6 +148,11 @@
    buildInputs = [ freetype ];
  };

+  fuser = attrs: {
+    nativeBuildInputs = [ pkg-config ];
+    buildInputs = [ fuse3 ];
+  };
+
  glib-sys = attrs: {
    nativeBuildInputs = [ pkg-config ];
    buildInputs = [ glib ];
@ -392,6 +399,12 @@
    buildInputs = [ python3 ];
  };

+  zstd-sys = attrs: {
+    ZSTD_SYS_USE_PKG_CONFIG = true;
+    nativeBuildInputs = [ pkg-config ];
+    buildInputs = [ zstd ];
+  };
+
  atk-sys = attrs: {
    nativeBuildInputs = [ pkg-config ];
    buildInputs = [ atk ];
--- a/pkgs/by-name/ad/addBinToPathHook/add-bin-to-path.sh
+++ b/pkgs/by-name/ad/addBinToPathHook/add-bin-to-path.sh
--- a/pkgs/by-name/ad/addBinToPathHook/package.nix
+++ b/pkgs/by-name/ad/addBinToPathHook/package.nix
@ -0,0 +1,9 @@
+{
+  lib,
+  makeSetupHook,
+}:
+
+makeSetupHook {
+  name = "add-bin-to-path-hook";
+  meta.license = lib.licenses.mit;
+} ./add-bin-to-path.sh
--- a/pkgs/by-name/an/anilibria-winmaclinux/0001-disable-version-check.patch
+++ b/pkgs/by-name/an/anilibria-winmaclinux/0001-disable-version-check.patch
--- a/pkgs/by-name/an/anilibria-winmaclinux/0001-fix-installation-paths.patch
+++ b/pkgs/by-name/an/anilibria-winmaclinux/0001-fix-installation-paths.patch
@ -1,24 +0,0 @@
-diff --git a/AniLibria.pro b/AniLibria.pro
-index 3eb7213..ea571ff 100644
--- a/AniLibria.pro
-+++ b/AniLibria.pro
-@@ -271,17 +271,8 @@ QML_IMPORT_PATH =
- # Additional import path used to resolve QML modules just for Qt Quick Designer
- QML_DESIGNER_IMPORT_PATH =
- 
-# Default rules for deployment.
-!flatpak{
-    qnx: target.path = /tmp/$${TARGET}/bin
-    else: unix:!android: target.path = /opt/$${TARGET}/bin
-}else{
-    target.path = $$PREFIX/bin
-}
-!isEmpty(target.path) {
-    unix: INSTALLS += target desktop $${UNIX_ICONS}
-    else:macx: INSTALLS += target
-}
-+target.path = $$PREFIX/bin
-+INSTALLS += target $${UNIX_ICONS}
- 
- flatpak {
-     metadata.path = $$PREFIX/share/metainfo
--- a/pkgs/by-name/an/anilibria-winmaclinux/package.nix
+++ b/pkgs/by-name/an/anilibria-winmaclinux/package.nix
@ -2,47 +2,40 @@
  lib,
  stdenv,
  fetchFromGitHub,
-  libsForQt5,
+  fetchpatch,
+  cmake,
+  qt6Packages,
+  ninja,
  pkg-config,
  gst_all_1,
  makeDesktopItem,
  copyDesktopItems,
-
-  withVLC ? true,
-  libvlc,
-  withMPV ? true,
  mpv-unwrapped,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "anilibria-winmaclinux";
-  version = "2.2.35";
+  version = "2.2.36";

  src = fetchFromGitHub {
    owner = "anilibria";
    repo = "anilibria-winmaclinux";
    tag = finalAttrs.version;
-    hash = "sha256-3tiCfL6j2yhhL16mG1LYD41G6nbomwmqZOwgm4bEHTs=";
+    hash = "sha256-2fwpLHEH1jlxl7r7QiVTHZniBO5k0GWaloNBynZJlTw=";
  };

  sourceRoot = "${finalAttrs.src.name}/src";

-  qmakeFlags = [
-    "PREFIX=${placeholder "out"}"
-  ]
-  ++ lib.optionals withVLC [ "CONFIG+=unixvlc" ]
-  ++ lib.optionals withMPV [ "CONFIG+=unixmpv" ];
-
  patches = [
-    ./0001-fix-installation-paths.patch
-    ./0002-disable-version-check.patch
+    ./0001-disable-version-check.patch
+    (fetchpatch {
+      name = "0002-fixed-qt6-folder-modal.patch";
+      url = "https://github.com/anilibria/anilibria-winmaclinux/commit/adb4f7e5447d733fc3042f4bff25224ed726f3e6.patch";
+      hash = "sha256-6/oXAObmXS+GKjjLNneMIj2gtKNvz6zHshWDYPv4agY=";
+      stripLen = 1;
+    })
  ];

-  preConfigure = ''
-    substituteInPlace AniLibria.pro \
-      --replace "\$\$PREFIX" '${placeholder "out"}'
-  '';
-
  qtWrapperArgs = [
    "--prefix GST_PLUGIN_PATH : ${
      (
@ -59,17 +52,18 @@ stdenv.mkDerivation (finalAttrs: {
  ];

  nativeBuildInputs = [
-    libsForQt5.qmake
+    cmake
    pkg-config
-    libsForQt5.wrapQtAppsHook
+    ninja
+    qt6Packages.wrapQtAppsHook
    copyDesktopItems
  ];

  buildInputs = [
-    libsForQt5.qtbase
-    libsForQt5.qtquickcontrols2
-    libsForQt5.qtwebsockets
-    libsForQt5.qtmultimedia
+    qt6Packages.qtbase
+    qt6Packages.qtwebsockets
+    qt6Packages.qtmultimedia
+    mpv-unwrapped.dev
  ]
  ++ (with gst_all_1; [
    gst-plugins-bad
@ -77,34 +71,34 @@ stdenv.mkDerivation (finalAttrs: {
    gst-plugins-base
    gst-libav
    gstreamer
-  ])
-  ++ lib.optionals withVLC [ libvlc ]
-  ++ lib.optionals withMPV [ mpv-unwrapped.dev ];
+  ]);

  desktopItems = [
    (makeDesktopItem {
-      name = "AniLibria";
-      desktopName = "AniLibria";
-      icon = "anilibria";
+      name = "AniLiberty";
+      desktopName = "AniLiberty";
+      icon = "aniliberty";
      comment = finalAttrs.meta.description;
-      genericName = "AniLibria desktop client";
+      genericName = "AniLiberty (ex AniLibria) desktop client";
      categories = [
        "Qt"
+        "Audio"
+        "Video"
        "AudioVideo"
        "Player"
      ];
      keywords = [ "anime" ];
-      exec = "AniLibria";
+      exec = finalAttrs.meta.mainProgram;
      terminal = false;
    })
  ];

  meta = {
    homepage = "https://github.com/anilibria/anilibria-winmaclinux";
-    description = "AniLibria cross platform desktop client";
+    description = "AniLiberty (ex AniLibria) cross platform desktop client, an anime theater for any computer you own";
    license = lib.licenses.gpl3;
    maintainers = with lib.maintainers; [ _3JlOy-PYCCKUi ];
-    inherit (libsForQt5.qtbase.meta) platforms;
-    mainProgram = "AniLibria";
+    inherit (qt6Packages.qtbase.meta) platforms;
+    mainProgram = "AniLiberty";
  };
 })
--- a/pkgs/by-name/ap/appium-inspector/package.nix
+++ b/pkgs/by-name/ap/appium-inspector/package.nix
@ -2,19 +2,23 @@
  lib,
  buildNpmPackage,
  copyDesktopItems,
-  electron_40,
+  electron_41,
  fetchFromGitHub,
  makeDesktopItem,
  makeWrapper,
  nix-update-script,
+  _experimental-update-script-combinators,
+  writeShellApplication,
+  nix,
+  jq,
 }:

 let
-  electron = electron_40;
-  version = "2026.2.1";
+  electron = electron_41;
+  version = "2026.5.1";
 in

-buildNpmPackage {
+buildNpmPackage (finalAttrs: {
  pname = "appium-inspector";
  inherit version;

@ -22,10 +26,10 @@ buildNpmPackage {
    owner = "appium";
    repo = "appium-inspector";
    tag = "v${version}";
-    hash = "sha256-89u8MifBPh5AwaMFp+aGSzsiwp75Skca/t6OyDSzrGo=";
+    hash = "sha256-SJlTTVTZ/zGIK7Nf35cZ62tdhevXC95MsbiQJCLiVtk=";
  };

-  npmDepsHash = "sha256-mwNn7TllWCtr4sif9Wc3FDtK2Icu72/iI+IllhBswHQ=";
+  npmDepsHash = "sha256-2rjgKS1mIrjOg+YXuMaqKyEQt0utLA4DGxOs0oI4BaQ=";
  npmFlags = [ "--ignore-scripts" ];

  nativeBuildInputs = [
@ -75,7 +79,25 @@ buildNpmPackage {
    })
  ];

-  passthru.updateScript = nix-update-script { };
+  passthru.updateScript = _experimental-update-script-combinators.sequence [
+    (nix-update-script { })
+    (lib.getExe (writeShellApplication {
+      name = "${finalAttrs.pname}-electron-updater";
+      runtimeInputs = [
+        nix
+        jq
+      ];
+      runtimeEnv = {
+        PNAME = finalAttrs.pname;
+        PKG_FILE = toString ./package.nix;
+      };
+      text = ''
+        new_src="$(nix-build --attr "pkgs.$PNAME.src" --no-out-link)"
+        new_electron_major="$(jq -r '.devDependencies.electron | split(".")[0] | tonumber' "$new_src/package.json")"
+        sed -i -E "s/electron_[0-9]+/electron_$new_electron_major/g" "$PKG_FILE"
+      '';
+    }))
+  ];

  meta = {
    description = "GUI inspector for the appium UI automation tool";
@ -86,4 +108,4 @@ buildNpmPackage {
    maintainers = with lib.maintainers; [ marie ];
    platforms = lib.platforms.linux;
  };
-}
+})
--- a/pkgs/by-name/as/asciimol/package.nix
+++ b/pkgs/by-name/as/asciimol/package.nix
@ -0,0 +1,38 @@
+{
+  fetchPypi,
+  lib,
+  nix-update-script,
+  python3Packages,
+}:
+
+python3Packages.buildPythonApplication (finalAttrs: {
+  pname = "asciimol";
+  version = "1.2.5";
+  pyproject = true;
+
+  __structuredAttrs = true;
+
+  src = fetchPypi {
+    inherit (finalAttrs) pname version;
+    hash = "sha256-sB8hHtjfCv5jFHXEoUG7zNn3d3QKihPLbgnR+Jyz4GQ=";
+  };
+
+  build-system = with python3Packages; [ setuptools ];
+
+  dependencies = with python3Packages; [
+    numpy
+    ase
+    rdkit
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Curses based ASCII molecule viewer for terminals";
+    license = lib.licenses.bsd2;
+    homepage = "https://github.com/dewberryants/asciimol";
+    downloadPage = "https://pypi.org/project/asciimol/";
+    maintainers = with lib.maintainers; [ tomasrivera ];
+    mainProgram = "asciimol";
+  };
+})
--- a/pkgs/by-name/au/aubio/package.nix
+++ b/pkgs/by-name/au/aubio/package.nix
@ -27,11 +27,13 @@ stdenv.mkDerivation (finalAttrs: {
    wafHook
  ];
  buildInputs = [
-    alsa-lib
    fftw
    libjack2
    libsamplerate
    libsndfile
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
  ];

  strictDeps = true;
@ -51,6 +53,6 @@ stdenv.mkDerivation (finalAttrs: {
    maintainers = with lib.maintainers; [
      fpletz
    ];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
  };
 })
--- a/pkgs/by-name/au/auto-patchelf/package.nix
+++ b/pkgs/by-name/au/auto-patchelf/package.nix
@ -38,6 +38,9 @@ stdenv.mkDerivation {
    mainProgram = "auto-patchelf";
    license = lib.licenses.mit;
    platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ Scrumplex ];
+    maintainers = with lib.maintainers; [
+      Scrumplex
+      layus
+    ];
  };
 }
--- a/pkgs/by-name/au/autoPatchelfHook/auto-patchelf.sh
+++ b/pkgs/by-name/au/autoPatchelfHook/auto-patchelf.sh
--- a/pkgs/by-name/au/autoPatchelfHook/package.nix
+++ b/pkgs/by-name/au/autoPatchelfHook/package.nix
@ -0,0 +1,21 @@
+{
+  lib,
+  makeSetupHook,
+  auto-patchelf,
+  bintools,
+  stdenv,
+}:
+
+makeSetupHook {
+  name = "auto-patchelf-hook";
+  propagatedBuildInputs = [
+    auto-patchelf
+    bintools
+  ];
+  substitutions = {
+    hostPlatform = stdenv.hostPlatform.config;
+  };
+  meta = {
+    maintainers = with lib.maintainers; [ layus ];
+  };
+} ./auto-patchelf.sh
--- a/pkgs/by-name/au/autoreconfHook/autoreconf.sh
+++ b/pkgs/by-name/au/autoreconfHook/autoreconf.sh
--- a/pkgs/by-name/au/autoreconfHook/package.nix
+++ b/pkgs/by-name/au/autoreconfHook/package.nix
@ -0,0 +1,18 @@
+{
+  lib,
+  makeSetupHook,
+  autoconf,
+  automake,
+  gettext,
+  libtool,
+}:
+makeSetupHook {
+  name = "autoreconf-hook";
+  propagatedBuildInputs = [
+    autoconf
+    automake
+    gettext
+    libtool
+  ];
+  meta.license = lib.licenses.mit;
+} ./autoreconf.sh
--- a/pkgs/by-name/ba/badger/package.nix
+++ b/pkgs/by-name/ba/badger/package.nix
@ -6,26 +6,29 @@

 buildGoModule (finalAttrs: {
  pname = "badger";
-  version = "4.9.1";
+  version = "4.9.2";

  src = fetchFromGitHub {
    owner = "dgraph-io";
    repo = "badger";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-BsKFi4oMNJE09PBjFmqNhbMcQcHk5uR5QssbwN2ZNCk=";
+    hash = "sha256-L6qGeOZlIl6I87t9Ohk57bA+WXT7NwMOJkiA3WaMFhM=";
  };

-  vendorHash = "sha256-+rXXCVH2xuULPzdM0KVPwYht+tu0qyxPjLLaBMWVIuI=";
+  vendorHash = "sha256-KDIwEH83nPMJPJGTN3UgO00pjYwR17XqGdPXioP1YcY=";

  subPackages = [ "badger" ];

  doCheck = false;

+  __structuredAttrs = true;
+
  meta = {
+    changelog = "https://github.com/dgraph-io/badger/releases/tag/${finalAttrs.src.tag}";
    description = "Fast key-value DB in Go";
-    homepage = "https://github.com/dgraph-io/badger";
+    homepage = "https://dgraph-io.github.io/badger";
    license = lib.licenses.asl20;
    mainProgram = "badger";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ hythera ];
  };
 })
--- a/pkgs/by-name/bu/burn-central-cli/package.nix
+++ b/pkgs/by-name/bu/burn-central-cli/package.nix
@ -10,13 +10,13 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "burn-central-cli";
-  version = "0.4.1";
+  version = "0.4.2";

  src = fetchFromGitHub {
    owner = "tracel-ai";
    repo = "burn-central-cli";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-wXLfmCV6aElnYnhOCScr/3+4I6oOfNPrZ8+0t4TPDOA=";
+    hash = "sha256-1QXlN1cq5MKZAPgGx5mnf8Jy7o4CnKJDKi0sSith6n0=";
  };

  strictDeps = true;
@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {

  buildAndTestSubdir = "crates/burn-central-cli";

-  cargoHash = "sha256-MeDIYFXkyJdxierq9iVIAvEIc8JU13szrbSTfKyUkJk=";
+  cargoHash = "sha256-c0DfH5wtm/aiK8Mcf7xqVqnFzByMKkbspF1reeGZNJw=";

  nativeBuildInputs = [
    pkg-config
--- a/pkgs/by-name/ca/cargo-xwin/package.nix
+++ b/pkgs/by-name/ca/cargo-xwin/package.nix
@ -6,16 +6,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cargo-xwin";
-  version = "0.22.0";
+  version = "0.23.0";

  src = fetchFromGitHub {
    owner = "rust-cross";
    repo = "cargo-xwin";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-lJu/TyzKDj0yHCP83ouc6e52E48taOTQ9WpWAiqUxl4=";
+    hash = "sha256-pWaJKk4XgBeY4llRTHvuMg0mAfEV4GFpeWGaM8eYsN4=";
  };

-  cargoHash = "sha256-k3PuEjiew012+m4RRVKNOdxKvFPWIxKHgG/SrBjM2WM=";
+  cargoHash = "sha256-iO0uAYdi8Vy9gi7lHsGRmhDsVNQCqo4E/nbTfI32jDs=";

  meta = {
    description = "Cross compile Cargo project to Windows MSVC target with ease";
--- a/pkgs/by-name/cl/clipqr/package.nix
+++ b/pkgs/by-name/cl/clipqr/package.nix
@ -4,31 +4,37 @@
  fetchFromGitLab,
  lib,
  libGL,
+  libdecor,
+  libgbm,
  libx11,
  libxcursor,
  libxext,
  libxi,
  libxinerama,
+  libxkbcommon,
  libxrandr,
  libxxf86vm,
  makeDesktopItem,
-  libgbm,
+  makeWrapper,
  pkg-config,
-  stdenv,
+  wayland,
+  wl-clipboard,
 }:

 buildGoModule (finalAttrs: {
  pname = "clipqr";
-  version = "1.3.0";
+  version = "1.4.0";

  src = fetchFromGitLab {
    owner = "imatt-foss";
    repo = "clipqr";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-iuA6RqclMm1CWaiM1kpOpgfYvKaYGOIwFQkLr/nCL5M=";
+    hash = "sha256-DC6zc1Qe/z7ihuvdawb8bj5MefYGgt7HAV5dWTjeHZc=";
  };

-  vendorHash = null;
+  vendorHash = "sha256-MrXMbavff6CEKVbL+Mx8hICYB9sZQcvAhnu2X4sVvVw=";
+
+  tags = [ "wayland" ];

  ldflags = [
    "-s"
@ -37,23 +43,30 @@ buildGoModule (finalAttrs: {

  buildInputs = [
    libGL
+    libgbm
    libx11
    libxcursor
    libxext
    libxi
    libxinerama
+    libxkbcommon
    libxrandr
    libxxf86vm
-    libgbm
+    wayland
  ];

  nativeBuildInputs = [
    copyDesktopItems
+    makeWrapper
    pkg-config
  ];

  postInstall = ''
    install -Dm644 icon.svg $out/share/icons/hicolor/scalable/apps/clipqr.svg
+
+    wrapProgram $out/bin/clipqr \
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libdecor ]} \
+      --prefix PATH : ${lib.makeBinPath [ wl-clipboard ]}
  '';

  desktopItems = [
@ -73,7 +86,7 @@ buildGoModule (finalAttrs: {
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ MatthieuBarthel ];
    homepage = "https://gitlab.com/imatt-foss/clipqr";
-    broken = stdenv.hostPlatform.isDarwin;
+    platforms = lib.platforms.linux;
    mainProgram = "clipqr";
  };
 })
--- a/pkgs/by-name/cu/cudatext-gtk/package.nix
+++ b/pkgs/by-name/cu/cudatext-gtk/package.nix
@ -0,0 +1,3 @@
+{ cudatext }:
+
+cudatext.override { widgetset = "gtk3"; }
--- a/pkgs/by-name/cu/cudatext-qt/package.nix
+++ b/pkgs/by-name/cu/cudatext-qt/package.nix
@ -0,0 +1,3 @@
+{ cudatext }:
+
+cudatext.override { widgetset = "qt5"; }
--- a/pkgs/by-name/cu/cudatext/deps.json
+++ b/pkgs/by-name/cu/cudatext/deps.json
@ -0,0 +1,57 @@
+{
+  "EncConv": {
+    "owner": "Alexey-T",
+    "rev": "2024.12.15",
+    "hash": "sha256-d57cOh4ucStPxOBYDt8+w1ITpCMbJW69T8mCfgJky3A="
+  },
+  "ATBinHex-Lazarus": {
+    "owner": "Alexey-T",
+    "rev": "2025.09.10",
+    "hash": "sha256-opt0gy2e+cptPWhPaSjWBikVRiAVTxwtIatdvzpc7eY="
+  },
+  "ATFlatControls": {
+    "owner": "Alexey-T",
+    "rev": "2026.05.06",
+    "hash": "sha256-qqFYaY9Bm6yMSlMlO/Uwot2Ix0TsxEb21d7X/zCvTyQ="
+  },
+  "ATSynEdit": {
+    "owner": "Alexey-T",
+    "rev": "2026.05.20",
+    "hash": "sha256-r3DARtsBEXxkC9wBGuIuY6qU9GQcXPeakQsK2P8zXI0="
+  },
+  "ATSynEdit_Cmp": {
+    "owner": "Alexey-T",
+    "rev": "2025.02.15",
+    "hash": "sha256-mCb2112u5cQOsGpJdgJKZnDsAQs5p5+rSINTs4BaQeQ="
+  },
+  "EControl": {
+    "owner": "Alexey-T",
+    "rev": "2026.05.06",
+    "hash": "sha256-G2OSGA5MVaZC/6H0agio6cbUg1iXYEz7YszBoRwcPwI="
+  },
+  "ATSynEdit_Ex": {
+    "owner": "Alexey-T",
+    "rev": "2026.01.19",
+    "hash": "sha256-gfx+2HbssaB1frc8QQh3ua+Z4lEM2JnQtSPNZVusaTM="
+  },
+  "Python-for-Lazarus": {
+    "owner": "Alexey-T",
+    "rev": "2024.10.15",
+    "hash": "sha256-HKo4GRZ91VDRc6AKs+lJYsFvgd+5VQlFY6pkg3gXz/s="
+  },
+  "Emmet-Pascal": {
+    "owner": "Alexey-T",
+    "rev": "2023.12.02",
+    "hash": "sha256-NDYhjmVGiw9UKfOQhXLdJiTaGZeTs8kr2hBujI2s+3E="
+  },
+  "CudaText-lexers": {
+    "owner": "CudaText-addons",
+    "rev": "2026.04.05",
+    "hash": "sha256-LtyfXEaIDjbivuL05E00U8Myy1mQFCzl9LQjiEr4U/E="
+  },
+  "bgrabitmap": {
+    "owner": "bgrabitmap",
+    "rev": "v11.6.6",
+    "hash": "sha256-bA8tvo7Srm5kIZTVWEA2+gjqHab7LByyL/zqdQxeFlA="
+  }
+}
--- a/pkgs/applications/editors/cudatext/default.nix
+++ b/pkgs/applications/editors/cudatext/default.nix
@ -7,15 +7,16 @@
  fpc,
  libx11,

-  # GTK2/3
+  # GTK3
+  harfbuzz,
  pango,
  cairo,
  glib,
  atk,
-  gtk2,
  gtk3,
  gdk-pixbuf,
  python3,
+  wrapGAppsHook3,

  # Qt5
  libsForQt5,
@ -26,7 +27,6 @@
 }:

 assert builtins.elem widgetset [
-  "gtk2"
  "gtk3"
  "qt5"
 ];
@ -42,13 +42,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "cudatext";
-  version = "1.202.1";
+  version = "1.234.4.0";

  src = fetchFromGitHub {
    owner = "Alexey-T";
    repo = "CudaText";
    tag = finalAttrs.version;
-    hash = "sha256-ZFMO986D4RtrTnLFdcL0a2BNjcsB+9pIolylblku7j4=";
+    hash = "sha256-eVdV02R1YZ3mdoucEoyp7iKhA30+QJNAqdbnOz2Xjy4=";
  };

  patches = [ ./proc_globdata.patch ];
@ -65,20 +65,21 @@ stdenv.mkDerivation (finalAttrs: {
    lazarus
    fpc
  ]
+  ++ lib.optional (widgetset == "gtk3") wrapGAppsHook3 # required for FileChooser
  ++ lib.optional (widgetset == "qt5") libsForQt5.wrapQtAppsHook;

  buildInputs = [
    libx11
  ]
-  ++ lib.optionals (lib.hasPrefix "gtk" widgetset) [
+  ++ lib.optionals (widgetset == "gtk3") [
+    harfbuzz
    pango
    cairo
    glib
    atk
    gdk-pixbuf
+    gtk3
  ]
-  ++ lib.optional (widgetset == "gtk2") gtk2
-  ++ lib.optional (widgetset == "gtk3") gtk3
  ++ lib.optional (widgetset == "qt5") libsForQt5.libqtpas;

  env.NIX_LDFLAGS = toString [
@ -94,10 +95,6 @@ stdenv.mkDerivation (finalAttrs: {
      '') deps
    )
    + ''
-      # See https://wiki.freepascal.org/CudaText#How_to_compile_CudaText
-      substituteInPlace ATSynEdit/atsynedit/atsynedit_package.lpk \
-        --replace GTK2_IME_CODE _GTK2_IME_CODE
-
      lazbuild --lazarusdir=${lazarus}/share/lazarus --pcp=./lazarus --ws=${widgetset} \
        bgrabitmap/bgrabitmap/bgrabitmappack.lpk \
        EncConv/encconv/encconv_package.lpk \
--- a/pkgs/applications/editors/cudatext/proc_globdata.patch
+++ b/pkgs/applications/editors/cudatext/proc_globdata.patch
--- a/pkgs/applications/editors/cudatext/update.sh
+++ b/pkgs/applications/editors/cudatext/update.sh
@ -19,8 +19,8 @@ url="https://github.com/Alexey-T/CudaText/archive/refs/tags/${version}.tar.gz"
 hash=$(nix-prefetch-url --quiet --unpack --type sha256 $url)
 sriHash=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $hash)

-sed -i "s#version = \".*\"#version = \"$version\"#" default.nix
-sed -i "s#hash = \".*\"#hash = \"$sriHash\"#" default.nix
+sed -i "s#version = \".*\"#version = \"$version\"#" package.nix
+sed -i "s#hash = \".*\"#hash = \"$sriHash\"#" package.nix

 while IFS=$'\t' read repo owner rev; do
  latest=$(curl -s https://api.github.com/repos/${owner}/${repo}/releases/latest | jq -r '.tag_name')
--- a/pkgs/build-support/setup-hooks/die.sh
+++ b/pkgs/build-support/setup-hooks/die.sh
--- a/pkgs/by-name/di/dieHook/package.nix
+++ b/pkgs/by-name/di/dieHook/package.nix
@ -0,0 +1,9 @@
+{
+  lib,
+  makeSetupHook,
+}:
+
+makeSetupHook {
+  name = "die-hook";
+  meta.license = lib.licenses.mit;
+} ./die.sh
--- a/pkgs/by-name/di/diffoscope/package.nix
+++ b/pkgs/by-name/di/diffoscope/package.nix
@ -108,12 +108,12 @@ in
 # Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
 python.pkgs.buildPythonApplication rec {
  pname = "diffoscope";
-  version = "318";
+  version = "319";
  pyproject = true;

  src = fetchurl {
    url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
-    hash = "sha256-rvZxd0mFDzmMFg2QYihkfizYGwiK1QQB9flyYn1uESM=";
+    hash = "sha256-oIEC3ssdp0p2cE0VunTv6oo5CFuMQyftr4e5kqWmfP4=";
  };

  outputs = [
--- a/pkgs/by-name/fa/faas-cli/package.nix
+++ b/pkgs/by-name/fa/faas-cli/package.nix
@ -24,13 +24,13 @@ let
 in
 buildGoModule (finalAttrs: {
  pname = "faas-cli";
-  version = "0.18.8";
+  version = "0.18.9";

  src = fetchFromGitHub {
    owner = "openfaas";
    repo = "faas-cli";
    rev = finalAttrs.version;
-    sha256 = "sha256-JiIKCrNH6aWiCqw1ji5RwNrHwLHuSbw/iwqzrumfQQQ=";
+    sha256 = "sha256-QiRO7oJk/zjUOWr1giW29/QJY/YiKkLzROB6OxN8kIc=";
  };

  vendorHash = null;
--- a/pkgs/by-name/fa/far2l/package.nix
+++ b/pkgs/by-name/fa/far2l/package.nix
@ -44,13 +44,13 @@

 stdenv.mkDerivation rec {
  pname = "far2l";
-  version = "2.7.0";
+  version = "2.8.0";

  src = fetchFromGitHub {
    owner = "elfmz";
    repo = "far2l";
    tag = "v_${version}";
-    hash = "sha256-pqyAZtVeE3awejx1/glJgAQN6fjAe4YHJX/fLHlF1+Y=";
+    hash = "sha256-LP+agJrYxjH6vLAg6cJTU4/9jYGF9iaZzxA7hozDKNY=";
  };

  nativeBuildInputs = [
@ -130,7 +130,10 @@ stdenv.mkDerivation rec {
    description = "Linux port of FAR Manager v2, a program for managing files and archives in Windows operating systems";
    homepage = "https://github.com/elfmz/far2l";
    license = lib.licenses.gpl2Only;
-    maintainers = with lib.maintainers; [ hypersw ];
+    maintainers = with lib.maintainers; [
+      hypersw
+      smakarov
+    ];
    platforms = lib.platforms.unix;
  };
 }
--- a/pkgs/by-name/fi/fixDarwinDylibNames/fix-darwin-dylib-names.sh
+++ b/pkgs/by-name/fi/fixDarwinDylibNames/fix-darwin-dylib-names.sh
--- a/pkgs/by-name/fi/fixDarwinDylibNames/package.nix
+++ b/pkgs/by-name/fi/fixDarwinDylibNames/package.nix
@ -0,0 +1,14 @@
+{
+  lib,
+  targetPackages,
+  makeSetupHook,
+}:
+
+makeSetupHook {
+  name = "fix-darwin-dylib-names-hook";
+  substitutions = { inherit (targetPackages.stdenv.cc) targetPrefix; };
+  meta = {
+    platforms = lib.platforms.darwin;
+    license = lib.licenses.mit;
+  };
+} ./fix-darwin-dylib-names.sh
--- a/pkgs/by-name/fl/flightcore/override-tauri.conf.json
+++ b/pkgs/by-name/fl/flightcore/override-tauri.conf.json
@ -0,0 +1,8 @@
+{
+  "build": {
+    "beforeBuildCommand": ""
+  },
+  "bundle":{
+    "createUpdaterArtifacts": false
+  }
+}
--- a/pkgs/by-name/fl/flightcore/package.nix
+++ b/pkgs/by-name/fl/flightcore/package.nix
@ -0,0 +1,120 @@
+{
+  buildNpmPackage,
+  cargo-tauri,
+  copyDesktopItems,
+  fetchFromGitHub,
+  fetchNpmDeps,
+  glib-networking,
+  lib,
+  makeDesktopItem,
+  nodejs,
+  openssl,
+  pkg-config,
+  rustPlatform,
+  stdenv,
+  webkitgtk_4_1,
+  wrapGAppsHook4,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  __structuredAttrs = true;
+  pname = "flightcore";
+  version = "3.2.2";
+
+  src = fetchFromGitHub {
+    owner = "R2NorthstarTools";
+    repo = "FlightCore";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-eTRtd616hWHgj3wg+jtrt/tFkaxUeKSN0d+XO1CghsE=";
+  };
+
+  npmDeps = fetchNpmDeps {
+    inherit (finalAttrs) pname version src;
+
+    # Hash of dependencies fetched from upstream's `package-lock.json` file.
+    hash = "sha256-+xrNKFcCatqbl79j/tSLFNTYjxXANFb3/vgWXYY2PGo=";
+  };
+
+  frontend = buildNpmPackage {
+    pname = "${finalAttrs.pname}-frontend";
+    inherit (finalAttrs) version src;
+    sourceRoot = "source/src-vue";
+
+    # Hash of dependencies fetched from upstream's `src-vue/package-lock.json`
+    # file.
+    npmDepsHash = "sha256-2PiMB9X/tp1QtTfUgVnH6caE+m2QSKTMYxPUHAUPWhQ=";
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p "$out"
+      cp -a dist "$out"
+
+      runHook postInstall
+    '';
+  };
+
+  cargoHash = "sha256-weidVeEIo3IIV+Xwe1htV46fRymOo5aRzHAEKQwKbvU=";
+
+  cargoRoot = "src-tauri";
+  buildAndTestSubdir = finalAttrs.cargoRoot;
+
+  # This override does the following:
+  #
+  # * Disables creating updater artifacts - the default behavior causes issues
+  #   with building the package, but since it is going to be distributed via a
+  #   software repository, it won't need to auto-update itself anyways.
+  #
+  # * Empties `beforeBuildCommand` - the upstream Tauri configuration includes
+  #   commands that automatically build the software's front-end, before
+  #   building its back-end. However, since Nixpkgs requires NPM dependencies
+  #   to be hashed, we need to build the front-end in a separate step.
+  #
+  #   This way, we end up fetching the NPM dependencies from both
+  #   `source/package.json`, and `source/src-vue/package.json`.
+  tauriBuildFlags = "-c ${./override-tauri.conf.json}";
+
+  # Copy [frontend] to where it can be picked up by Tauri.
+  preBuild = ''
+    ln -s "${finalAttrs.frontend}"/dist src-vue
+  '';
+
+  nativeBuildInputs = [
+    cargo-tauri.hook
+    copyDesktopItems
+    nodejs
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    wrapGAppsHook4
+  ];
+
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+    glib-networking
+    openssl
+    webkitgtk_4_1
+  ];
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "FlightCore";
+      desktopName = "FlightCore";
+      exec = "flightcore";
+      icon = "flightcore";
+      comment = finalAttrs.meta.description;
+      categories = [
+        "Game"
+        "PackageManager"
+      ];
+      terminal = false;
+    })
+  ];
+
+  meta = {
+    description = "Updater and mod manager for Northstar";
+    homepage = "https://github.com/R2NorthstarTools/FlightCore";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ username-generic ];
+    mainProgram = "flightcore";
+    platforms = lib.platforms.all;
+  };
+})
--- a/pkgs/by-name/fl/fluux-messenger/package.nix
+++ b/pkgs/by-name/fl/fluux-messenger/package.nix
@ -18,7 +18,7 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "fluux-messenger";
-  version = "0.16.0";
+  version = "0.16.1";
  __structuredAttrs = true;
  strictDeps = true;

@ -26,16 +26,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
    owner = "processone";
    repo = "fluux-messenger";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-P4bRyge5EGdlZBdX+gIWh48itkCLQ+EjKLHt4xv6qnY=";
+    hash = "sha256-os6zEB1E3D4WSRfru/UCDY0mgZxy0Zu/YcjhMbXt47g=";
  };

  cargoRoot = "apps/fluux/src-tauri";
-  cargoHash = "sha256-YIX/F9LMuHFGJ89NIsFLUjjrR7XBoJF78OsyXiSjEqU=";
+  cargoHash = "sha256-V6iDPPBpdJQV5PA/isRy+Gz6NdwUUEj3mf9PM/nX10s=";

  npmDeps = fetchNpmDeps {
    name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
    inherit (finalAttrs) src;
-    hash = "sha256-rzkFrvLb/0c+pg2SIUnhyTHK2MGL2ugRI9XuHtdm8XE=";
+    hash = "sha256-iMkb7QZZrKjzmTzvWGbw8reF1nX4Avd1XKzyybz3q00=";
  };

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

 stdenv.mkDerivation (finalAttrs: {
  pname = "giada";
-  version = "1.4.2";
+  version = "1.5.0";

  src = fetchFromGitHub {
    owner = "monocasual";
    repo = "giada";
    tag = finalAttrs.version;
-    hash = "sha256-GVK/VyqRatxptuQGINaev5RVmafZNxogdKUzC5b4ns4=";
+    hash = "sha256-AceH2FO75WF/Cmk3wd6u495M277iuZp/21nBl3K4jHU=";
    fetchSubmodules = true;
  };

--- a/pkgs/by-name/gl/glaze/package.nix
+++ b/pkgs/by-name/gl/glaze/package.nix
@ -28,6 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
    (lib.cmakeBool "glaze_DISABLE_SIMD_WHEN_SUPPORTED" (!enableSIMD))
    (lib.cmakeBool "glaze_ENABLE_SSL" enableSSL)
    (lib.cmakeBool "glaze_BUILD_INTEROP" enableInterop)
+    (lib.cmakeBool "glaze_ENABLE_FUZZING" (!stdenv.hostPlatform.isMusl))
  ];

  meta = {
--- a/pkgs/build-support/setup-hooks/gog-unpack.sh
+++ b/pkgs/build-support/setup-hooks/gog-unpack.sh
--- a/pkgs/by-name/go/gogUnpackHook/package.nix
+++ b/pkgs/by-name/go/gogUnpackHook/package.nix
@ -0,0 +1,15 @@
+{
+  lib,
+  makeSetupHook,
+  innoextract,
+  file-rename,
+}:
+
+makeSetupHook {
+  name = "gog-unpack-hook";
+  propagatedBuildInputs = [
+    innoextract
+    file-rename
+  ];
+  meta.license = lib.licenses.mit;
+} ./gog-unpack.sh
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@ -179,11 +179,11 @@ let

  linux = stdenvNoCC.mkDerivation (finalAttrs: {
    inherit pname meta passthru;
-    version = "149.0.7827.114";
+    version = "149.0.7827.155";

    src = fetchurl {
      url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-GVvehY+e5thM3nHYMQd/uI8HTnjvL/w8UeRpUWouzlA=";
+      hash = "sha256-g0PHfyCIpOQ2bw3+Tmiu+jt+eTJs0so71+tjxhHwZVY=";
    };

    # With strictDeps on, some shebangs were not being patched correctly
@ -289,11 +289,11 @@ let

  darwin = stdenvNoCC.mkDerivation (finalAttrs: {
    inherit pname meta passthru;
-    version = "149.0.7827.115";
+    version = "149.0.7827.156";

    src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/ny2unjynyv52nhojnzjueghuma_149.0.7827.115/GoogleChrome-149.0.7827.115.dmg";
-      hash = "sha256-q1jMxveB5FFA+wA5a5mnSPWoQFkNHQ20x51R8A/yUsk=";
+      url = "http://dl.google.com/release2/chrome/acfqxa67egsofsrqnco2a4sd4pta_149.0.7827.156/GoogleChrome-149.0.7827.156.dmg";
+      hash = "sha256-fd7IqNxvaMO28Yhlc4gk8M+P7Sq+ZrplRXbnrxPDcvw=";
    };

    dontPatch = true;
--- a/pkgs/by-name/go/goperf/package.nix
+++ b/pkgs/by-name/go/goperf/package.nix
@ -9,15 +9,15 @@

 buildGoModule (finalAttrs: {
  pname = "goperf";
-  version = "0-unstable-2026-05-12";
+  version = "0-unstable-2026-06-15";

  src = fetchgit {
    url = "https://go.googlesource.com/perf";
-    rev = "3cf34090a3db6bb64df2259e30021db7ff5d9595";
-    hash = "sha256-2dz8GCzmyS8LkN1zzyCO8cn/NBKmPhIqFRfILc9/lVo=";
+    rev = "9e4b9ddef5b6a4371594ec978cb4b8088bec845d";
+    hash = "sha256-q03UUW5fJPLd6UicH+q2KEC9sx3Ph64ebzi4sxW4+rg=";
  };

-  vendorHash = "sha256-H9aP7PGzq5gmFvlYrkrOFfqCSdlpoQkIkTwKMgwr2hs=";
+  vendorHash = "sha256-qGQpf0T1qBcu+25VF2xnbvImj+Fs81Ru9tho/0RJwzo=";

  passthru.updateScript = writeShellScript "update-goperf" ''
    export UPDATE_NIX_ATTR_PATH=goperf
--- a/pkgs/by-name/gz/gzrt/package.nix
+++ b/pkgs/by-name/gz/gzrt/package.nix
@ -1,17 +1,19 @@
 {
  lib,
  stdenv,
-  fetchurl,
+  fetchFromGitHub,
  zlib,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "gzrt";
-  version = "0.8";
+  version = "0.9.1";

-  src = fetchurl {
-    url = "https://www.urbanophile.com/arenn/coding/gzrt/gzrt-${finalAttrs.version}.tar.gz";
-    sha256 = "1vhzazj47xfpbfhzkwalz27cc0n5gazddmj3kynhk0yxv99xrdxh";
+  src = fetchFromGitHub {
+    owner = "arenn";
+    repo = "gzrt";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-2RzQ/xrtADplVqUeB6suU3fKhJePYM7EkuIV59JSR3Q=";
  };

  buildInputs = [ zlib ];
@ -22,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
  '';

  meta = {
-    homepage = "https://www.urbanophile.com/arenn/hacking/gzrt/";
+    homepage = "https://github.com/arenn/gzrt";
    description = "Gzip Recovery Toolkit";
    maintainers = [ ];
    mainProgram = "gzrecover";
--- a/pkgs/by-name/ha/hackernews-tui/package.nix
+++ b/pkgs/by-name/ha/hackernews-tui/package.nix
@ -0,0 +1,29 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "hackernews-tui";
+  version = "0.13.5";
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "aome510";
+    repo = "hackernews-TUI";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-p2MhVM+dbNiWlhvlSKdwXE37dKEaE2JCmT1Ari3b0WI=";
+  };
+
+  cargoHash = "sha256-KuqAyuU/LOFwvvfplHqq56Df4Dkr5PkUK1Fgeaq1REs=";
+
+  meta = {
+    description = "A Terminal UI to browse Hacker News";
+    homepage = "https://github.com/aome510/hackernews-TUI";
+    changelog = "https://github.com/aome510/hackernews-TUI/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ paepcke ];
+    mainProgram = "hackernews-tui";
+  };
+})
--- a/pkgs/by-name/ii/iio-niri/package.nix
+++ b/pkgs/by-name/ii/iio-niri/package.nix
@ -9,13 +9,13 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "iio-niri";
-  version = "2.1.0";
+  version = "2.2.0";

  src = fetchFromGitHub {
    owner = "Zhaith-Izaliel";
    repo = "iio-niri";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-EwilbkL1cMH8l63Cm5eikVKc+YndsYsaYJxhCNJgz6M=";
+    hash = "sha256-2DWNq6qZmC4hNjgu1W6LBHkcDOSwRT0/8MnbJjyPHQM=";
  };

  cargoHash = "sha256-f/pFWlLxQebzawDdHj3UtpT5Kq9a6fm+tAssqg8ibdo=";
--- a/pkgs/by-name/je/jetbrains-toolbox/package.nix
+++ b/pkgs/by-name/je/jetbrains-toolbox/package.nix
@ -97,7 +97,7 @@ selectKernel {

      extraInstallCommands = ''
        install -Dm0644 ${src}/bin/jetbrains-toolbox.desktop -t $out/share/applications
-        install -Dm0644 ${src}/bin/toolbox-tray-color.png $out/share/pixmaps/jetbrains-toolbox.png
+        install -Dm0644 ${src}/bin/toolbox-tray-color.png $out/share/icons/hicolor/32x32/apps/jetbrains-toolbox.png
      '';
    };

--- a/pkgs/by-name/li/librewolf-unwrapped/package.nix
+++ b/pkgs/by-name/li/librewolf-unwrapped/package.nix
@ -32,6 +32,7 @@ in
      dwrege
      fpletz
      hythera
+      thbemme
    ];
    platforms = lib.platforms.unix;
    broken = stdenv.buildPlatform.is32bit;
--- a/pkgs/by-name/li/libwebsockets/package.nix
+++ b/pkgs/by-name/li/libwebsockets/package.nix
@ -65,7 +65,15 @@ stdenv.mkDerivation (finalAttrs: {
    substituteInPlace "cmake/libwebsockets-config.cmake.in" --replace-fail \
      "set(LIBWEBSOCKETS_LIBRARIES websockets websockets_shared)" \
      "set(LIBWEBSOCKETS_LIBRARIES websockets)"
-  '';
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # Fix doubled store path in macOS install_name
+    substituteInPlace CMakeLists.txt \
+      --replace-fail \
+        'SET(CMAKE_INSTALL_NAME_DIR "''${CMAKE_INSTALL_PREFIX}/''${LWS_INSTALL_LIB_DIR}")' \
+        'SET(CMAKE_INSTALL_NAME_DIR "''${LWS_INSTALL_LIB_DIR}")'
+  ''
+  + lib.optionalString stdenv.hostPlatform.isStatic "";

  postInstall = ''
    # Fix path that will be incorrect on move to "dev" output.
--- a/pkgs/by-name/li/lilypond-unstable/package.nix
+++ b/pkgs/by-name/li/lilypond-unstable/package.nix
@ -7,11 +7,11 @@

 lilypond.overrideAttrs (
  finalAttrs: prevAttrs: {
-    version = "2.27.0";
+    version = "2.27.1";

    src = fetchzip {
      url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor finalAttrs.version}/lilypond-${finalAttrs.version}.tar.gz";
-      hash = "sha256-uZKpHmuYFkmj1kI+D09rPNLov83EO1QdXyUSSscBRPE=";
+      hash = "sha256-SqnBem2dj7w6oRfxk+h5Ahq+NEPDdX7I/NRKZQnK1kU=";
    };

    patches = [ ];
--- a/pkgs/by-name/li/linja-sike/package.nix
+++ b/pkgs/by-name/li/linja-sike/package.nix
@ -18,8 +18,6 @@ stdenvNoCC.mkDerivation {

  __structuredAttrs = true;

-  stripDeps = true;
-
  postPatch = "cp $src linja-sike-5.otf";

  nativeBuildInputs = [ installFonts ];
--- a/pkgs/by-name/lo/lowfi/package.nix
+++ b/pkgs/by-name/lo/lowfi/package.nix
@ -10,16 +10,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "lowfi";
-  version = "2.0.2";
+  version = "2.0.6";

  src = fetchFromGitHub {
    owner = "talwat";
    repo = "lowfi";
    tag = finalAttrs.version;
-    hash = "sha256-RSdfZ0GrNhPcqDWutJW0VlplbpBNBCpSvw91fpl0d4E=";
+    hash = "sha256-t61R68cuAEAjyY5cR2rpTa+pSE3DDDct9G4p/aeTgsQ=";
  };

-  cargoHash = "sha256-OAg3ZpBmuINkc6KZJGKvYFnpv9hVbwlnOEP5ICtYh28=";
+  cargoHash = "sha256-ogoQWcS6htU515xjJW7jQYqpfHAQ48a8QaaBPvkGrXg=";

  buildFeatures = [ "scrape" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "mpris" ];

--- a/pkgs/by-name/lu/luau/package.nix
+++ b/pkgs/by-name/lu/luau/package.nix
@ -9,13 +9,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "luau";
-  version = "0.720";
+  version = "0.725";

  src = fetchFromGitHub {
    owner = "luau-lang";
    repo = "luau";
    tag = finalAttrs.version;
-    hash = "sha256-OF0Zsy1O+9rCcOlWRiBmoets7dAZES4Yy6X4QJ3ZdvQ=";
+    hash = "sha256-zRoB1psMrZRt8mLoaReyc0hvhRBPAotC1LmDNTYGLjA=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/by-name/ma/matrix-tuwunel/package.nix
+++ b/pkgs/by-name/ma/matrix-tuwunel/package.nix
@ -11,7 +11,6 @@
  nix-update-script,
  testers,
  matrix-tuwunel,
-  enableBlurhashing ? true,
  # upstream tuwunel enables jemalloc by default, so we follow suit
  enableJemalloc ? true,
  rust-jemalloc-sys,
@ -89,16 +88,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "matrix-tuwunel";
-  version = "1.7.0";
+  version = "1.7.1";

  src = fetchFromGitHub {
    owner = "matrix-construct";
    repo = "tuwunel";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-bB42SEa/gkFlkjb4L12Uh7xI4+3NmJgfbUPU01NXaEQ=";
+    hash = "sha256-KbcijWL4PwEUycE9pxdJjnBP0pxK6ywuf7wpuy2eA60=";
  };

-  cargoHash = "sha256-czCKzV/DCMJK0sN/jP5Jo98Zdii9DIAGAVnFnK0YtmY=";
+  cargoHash = "sha256-RsZWk+cm9JJ6+8xsWXNyN2QcHSMFOD3CikNm84DhXWU=";

  nativeBuildInputs = [
    pkg-config
@ -127,7 +126,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
  buildNoDefaultFeatures = true;
  # See https://github.com/matrix-construct/tuwunel/blob/main/src/main/Cargo.toml
  # for available features.
-  # We enable all default features except jemalloc, blurhashing, and io_uring, which
+  # We enable all default features except jemalloc and io_uring, which
  # we guard behind our own (default-enabled) flags.
  buildFeatures = [
    "brotli_compression"
@ -140,7 +139,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
    "url_preview"
    "zstd_compression"
  ]
-  ++ lib.optional enableBlurhashing "blurhashing"
  ++ lib.optional enableJemalloc [
    "jemalloc"
    "jemalloc_conf"
--- a/pkgs/by-name/mi/mistral-rs/package.nix
+++ b/pkgs/by-name/mi/mistral-rs/package.nix
@ -73,14 +73,14 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "mistral-rs";
-  version = "0.8.3";
+  version = "0.8.4";
  __structuredAttrs = true;

  src = fetchFromGitHub {
    owner = "EricLBuehler";
    repo = "mistral.rs";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-Ohkr45VXuXB7Ms8igZxQ7shrJa3+WBVT1fNYlc6JvZQ=";
+    hash = "sha256-BSP8fi4grbEzGOfR4tGCJVjIom/1d2mnFrK8O6BRWL4=";
  };

  patches = [
@ -94,9 +94,22 @@ rustPlatform.buildRustPackage (finalAttrs: {
        --replace-fail \
          "lto = true" \
          "lto = false"
+    ''
+    # Prevent build scripts from attempting to clone cutlass (which would fail in the sandbox anyway).
+    # Instead, we provide cutlass in buildInputs.
+    + lib.optionalString cudaSupport ''
+      substituteInPlace mistralrs-flash-attn/build.rs \
+        --replace-fail \
+          ".with_cutlass(Some(CUTLASS_COMMIT))" \
+          ""
+
+      substituteInPlace mistralrs-quant/build.rs \
+        --replace-fail \
+          'builder = builder.with_cutlass(Some("7d49e6c7e2f8896c47f586706e67e1fb215529dc"));' \
+          ""
    '';

-  cargoHash = "sha256-ZwUCzbRpDgT7KwsT9kPGsGp4iU/0I+lrMFqM3UCwkYw=";
+  cargoHash = "sha256-T4TPm31fihx9ZvQ6jme67yrc0osl4c9CiAm4+rISgFs=";

  nativeBuildInputs = [
    pkg-config
@ -121,6 +134,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
    cudaPackages.cuda_nvrtc
    cudaPackages.libcublas
    cudaPackages.libcurand
+
+    # For compiling kernels
+    cudaPackages.cutlass
  ]
  ++ lib.optionals mklSupport [ mkl ];

--- a/pkgs/by-name/mt/mtail/package.nix
+++ b/pkgs/by-name/mt/mtail/package.nix
@ -8,17 +8,17 @@

 buildGoModule (finalAttrs: {
  pname = "mtail";
-  version = "3.3.0";
+  version = "3.3.2";

  src = fetchFromGitHub {
    owner = "jaqx0r";
    repo = "mtail";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-zJ30T9+Jy1RqUERlkHbY3w2Beuefwd/otwPXnS4oFrU=";
+    hash = "sha256-Cn6Ssj5ik0G/MORbx+YwY7ekheXim64zUx7oKH5JXD0=";
  };

  proxyVendor = true;
-  vendorHash = "sha256-AXMqLwFcRoFRKrGH8srsH1GjeI25XgjgqrcOpQY3ZbY=";
+  vendorHash = "sha256-v00wX7uz3z/ldwppQd9aJLN/bnhoN/wweY3nbO/fu2I=";

  nativeBuildInputs = [
    gotools # goyacc
--- a/pkgs/by-name/ni/nile/package.nix
+++ b/pkgs/by-name/ni/nile/package.nix
@ -7,14 +7,14 @@

 python3Packages.buildPythonApplication (finalAttrs: {
  pname = "nile";
-  version = "1.1.2";
+  version = "1.2.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "imLinguin";
    repo = "nile";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-/C4b8wPKWHGgiheuAN7AvU+KcD5aj5i6KzgFSdTIkNI=";
+    hash = "sha256-tzf3sqD7P32AXzZu/WDauOSsEe/xhCh6x4KGQ1YnJqw=";
  };

  build-system = with python3Packages; [ setuptools ];
@ -50,6 +50,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
    changelog = "https://github.com/imLinguin/nile/releases/tag/${finalAttrs.src.tag}";
    license = lib.licenses.gpl3Only;
    mainProgram = "nile";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ theobori ];
  };
 })
--- a/pkgs/by-name/os/osmium/package.nix
+++ b/pkgs/by-name/os/osmium/package.nix
@ -25,18 +25,15 @@
  libnotify,
  libpulseaudio,
  writeShellApplication,
-  curl,
-  yq,
-  common-updater-scripts,
 }:

 stdenv.mkDerivation rec {
  pname = "osmium";
-  version = "0.0.26-alpha";
+  version = "0.0.29-alpha";

  src = fetchurl {
    url = "https://updater.osmium.chat/Osmium-${version}-x64.tar.gz";
-    hash = "sha256-6hsXZ9ykM7x4RNqixolK3/C9K0OBjMuUNIWYjjj8uCs=";
+    hash = "sha256-UbYnT/9bkMCii4rkAlkUBQcHc6DyAkOa8rQl+9e3NZU=";
  };

  nativeBuildInputs = [
@ -108,18 +105,7 @@ stdenv.mkDerivation rec {
  };

  passthru = {
-    updateScript = lib.getExe (writeShellApplication {
-      name = "update-osmium";
-      runtimeInputs = [
-        curl
-        yq
-        common-updater-scripts
-      ];
-      text = ''
-        version="$(curl -s https://updater.osmium.chat/alpha-linux.yml | yq .version)"
-        update-source-version osmium "$version"
-      '';
-    });
+    updateScript = ./update.sh;
  };

  meta = {
--- a/pkgs/by-name/os/osmium/update.sh
+++ b/pkgs/by-name/os/osmium/update.sh
@ -0,0 +1,5 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl yq common-updater-scripts
+
+version="$(curl -s https://updater.osmium.chat/alpha-linux.yml | yq -r .version)"
+update-source-version osmium "$version"
--- a/pkgs/by-name/os/ostui/package.nix
+++ b/pkgs/by-name/os/ostui/package.nix
@ -8,13 +8,13 @@
 }:
 buildGoModule (finalAttrs: {
  pname = "ostui";
-  version = "1.3.2";
+  version = "1.3.3";

  src = fetchFromSourcehut {
    owner = "~ser";
    repo = "ostui";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-kg0sMLH7rZ+RmOi8lnjIya4l9W/HIU9bP2Eyj1+vWSQ=";
+    hash = "sha256-Zm7j4s+GLILLnH+CjF8JsJB4APYeWV7TyCUkKLW2SGQ=";
  };

  vendorHash = "sha256-yhoTwouYlv2VkCWmvwvvpbQmrFwzwpraf0EV2Tegq94=";
--- a/pkgs/by-name/pa/palemoon-bin/package.nix
+++ b/pkgs/by-name/pa/palemoon-bin/package.nix
@ -22,7 +22,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "palemoon-bin";
-  version = "34.3.0";
+  version = "34.3.0.1";

  src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}";

@ -171,11 +171,11 @@ stdenv.mkDerivation (finalAttrs: {
      {
        gtk3 = fetchzip {
          urls = urlRegionVariants "gtk3";
-          hash = "sha256-yoZqZJLxgDIxIeyrn6VW6c6iKpU84ZDsJbCz3yf4gdU=";
+          hash = "sha256-U9OwgiQMVOayt5Krlina2s33wS55HuLN255tkVyQxoY=";
        };
        gtk2 = fetchzip {
          urls = urlRegionVariants "gtk2";
-          hash = "sha256-QhrW1ZD1ouPvWJLvnIEMHgTViGNBshFlT6Ax0l0xGv8=";
+          hash = "sha256-Yzr2ovHKFFNIem1PXTaajlxVKXB5frZQ/kfOL+jsmtE=";
        };
      };

--- a/pkgs/by-name/pb/pb/package.nix
+++ b/pkgs/by-name/pb/pb/package.nix
@ -6,16 +6,16 @@

 buildGoModule (finalAttrs: {
  pname = "pb";
-  version = "0.6.0";
+  version = "0.7.0";

  src = fetchFromGitHub {
    owner = "parseablehq";
    repo = "pb";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-OXxLHi7v/xJZVvxHZvJ0eH4MYrlLFxDAMT9CVG2mWTM=";
+    hash = "sha256-q389FVNVxIoDr65imIg5gjn8/CnKl437a04ojm9uyrA=";
  };

-  vendorHash = "sha256-N6m0qvj65Ls3yQmVGw0AklsO1zs1KHdi/Y6FZRghnCs=";
+  vendorHash = "sha256-hEVoz8EgC2hAkiC0LNZ+h/Hy7toVxWvv2gchymfpMK8=";

  ldflags = [
    "-s"
--- a/pkgs/by-name/pe/peacock/missing-hashes.json
+++ b/pkgs/by-name/pe/peacock/missing-hashes.json
@ -30,23 +30,49 @@
  "@msgpackr-extract/msgpackr-extract-linux-arm@npm:3.0.2": "a65e847f6a53a74d5b91d10f8a575c43724a6b6530918ca8f71784ba763e1e0e2e2ce5f02a8709273d033a5a8b1361026adce08f69c0fcf778c3f1aae1aa9099",
  "@msgpackr-extract/msgpackr-extract-linux-x64@npm:3.0.2": "d5af7600096b93294d5e2c8a75661979996e7d0a7eaddfa3fd45a1b41c54f2c4a21765f0852ce6ef28506309c1f19761310e345613edb2d74d5582a205e1514e",
  "@msgpackr-extract/msgpackr-extract-win32-x64@npm:3.0.2": "10ab009b2032b638ad9c00c87b91af09e96d85991806bc73ae3bf5c956fe8172057515df4265b0d13e8b46bd5b74fff0682b5b513e3c2cf52bfac42268f6ab94",
-  "@rollup/rollup-android-arm-eabi@npm:4.35.0": "6608c59811f515fd3817c7b891d34ad042e9a3f4c0edd94fb8af839f17b1748eb5c27b7b12e2431406acd9d174abb60e8e520310d1a8add31046852651b96431",
-  "@rollup/rollup-android-arm64@npm:4.35.0": "51e6a45d4bd1048c7a6be7b4a091a9af063388f5731d455100a6e090ec6c84d44d927aa0bf8ea508a19f2f8343eaae319db06df0acfdb51eeb708d1a314ae611",
-  "@rollup/rollup-darwin-arm64@npm:4.35.0": "844a8ae0b0ab412fcc98979f0a91965a93fb60c5cce6edc7971792acf08d592fe42413eab0692ae1880dc118b669897a28c2896bfe0a9c272f1b481db662d71c",
-  "@rollup/rollup-darwin-x64@npm:4.35.0": "cbcd6d74096e9732db56444d79f4cc739ade75f4a4768e14b259829b2b2905b7e2e5c5811f6294632ae035e813b36a7ee9edf57f529449ae128ce7b4f83f6e80",
-  "@rollup/rollup-freebsd-arm64@npm:4.35.0": "0a29880358b751650db7ab294131572c3952288169d88919510ad7f1e7534cf2f46ea561c600fba27d89fff0cdabe5efb8c19cf6572d08bc0c126832d52d95d8",
-  "@rollup/rollup-freebsd-x64@npm:4.35.0": "fed915fc432c395645bbcbc9f2a88bae25c8e5ba4fb7f813e7d11c007954767ae8b78fcfc445d1c1f4f95d637745e27dcfe3acc710022d7c999c80da32f70fae",
-  "@rollup/rollup-linux-arm-gnueabihf@npm:4.35.0": "47336911b4c51a55c21a9197593acb8e7b578c9e30b4a4e446e6d4ea3aeedc4afca8d2dfa46002d076d4c456a43065eea89dcf863b80daa0b840f95717579a2f",
-  "@rollup/rollup-linux-arm-musleabihf@npm:4.35.0": "66cb126a20e735224c1caf23531f6d8a6e0f377e5be2ea4943c3043b8d0345eafecfa7d02a763b09c057ca682d4e43fdad8d79c62b3f366d1c4dbadad9758bfd",
-  "@rollup/rollup-linux-arm64-gnu@npm:4.35.0": "ad2cb0b631f3163709706d77d9ef111bc2bd2cefe9484b89ab00069a150df7d84ddfb3d0bec0e488363f8dcb0dacc1333533e5223ddf818af3d5da84201a1952",
-  "@rollup/rollup-linux-arm64-musl@npm:4.35.0": "c757a761365e717b2cc48b136d7ba1d0bb298ab475639dbe9393328354afde574248ee278ed66fd7715e72bd56b82f5a84e280dd5358d98736e6f6eaabad6509",
-  "@rollup/rollup-linux-loongarch64-gnu@npm:4.35.0": "44c1b076ebdea504f1bf64fe17770a1702e833fc84f1fb47a5263d03c965dbae3a18573c594fbacc1a618088dcba42f5dc004bd85c694e72317b84b8e76c0d26",
-  "@rollup/rollup-linux-powerpc64le-gnu@npm:4.35.0": "24cd93ccc079d4c5af42f06b3b7ce065056ec143720ccf54002e9539934863fda88771fdd62c6dc6388e6d35f15e5e562e372eda86a1a68232b33744e75b8917",
-  "@rollup/rollup-linux-riscv64-gnu@npm:4.35.0": "2ef06fd488795343cd8f91fb684679a08c5ecc2084e831335358e668d3ea02e121dca662cb8685f2ad16802b6c04eadb0891b1036e800eff1d4b3de258f7011c",
-  "@rollup/rollup-linux-s390x-gnu@npm:4.35.0": "37a11392d357debd1c9d3c03540028dc4d733e91e1f11525951fb76b572cadfadac821062436bf72100e4cea83e796d1d34c9331834d56cdae9b5fb1cf676ed7",
-  "@rollup/rollup-linux-x64-gnu@npm:4.35.0": "6406cd583d15a9b6862ed8baa70b90de271663127a9729456efec31b8647d882f3ed3ea5d630cfa46b7330e5795babfa090874feb5a832b9b0964eb01fba1e79",
-  "@rollup/rollup-linux-x64-musl@npm:4.35.0": "102d679f7347ec8986eb5ceb7eaed73f1948b53f8867ae90f2e60b0efa04acc462d6d7f32ee14c73194e965fca15edcb629bb323865f3ad7953695fcd2e7aaca",
-  "@rollup/rollup-win32-arm64-msvc@npm:4.35.0": "5344cd7bebdea17e5b8cd517e5ef590df7db23e1589d1bc1665839cb9fea82e331b69fd06859efad00544bf24a5b2af33e3f3f08e1c1a58322cddf52d5b3829a",
-  "@rollup/rollup-win32-ia32-msvc@npm:4.35.0": "30bd40356401961443c5e2a9c2e96d086d491e7cd956de34bd073a0cbcc8f3a4c87c4e29601b8b27ef1f7d3a13f89e4a59fd6458bd7ef43565b7ac72b2ff30b0",
-  "@rollup/rollup-win32-x64-msvc@npm:4.35.0": "c684bf21414814a3f7d451be07c1716fc85bf340bcc87eb37ed3f5ea0adbef869af533392971fdc44c932de8b43b9161237cd093a47e233caf66c7be76f54a9d"
+  "@oxfmt/binding-android-arm-eabi@npm:0.42.0": "cfed4cc07be186ab9f04956ec5faac8c7bdad7953afad8057b985c9b1703971067b61d606c9f231226d94cf61ad2f1d757c17e3f0f9a723a60960af889563950",
+  "@oxfmt/binding-android-arm64@npm:0.42.0": "442332e0c820fda900b67de5d6309f4050f7b9322ce94153477ce429f4a1bfaecf921a28c15665b643febcfefdebf3bca31eeeae52cd10cc8fd15fe67ee70bad",
+  "@oxfmt/binding-darwin-arm64@npm:0.42.0": "ee19cb362477eb9be51852ef1add3ba121defa0b25bbb4736b1927b49786c9c74241f630ac3e5f71180f2eea1bdbc510cffd654831f4d8d815a6e69b91ab5e24",
+  "@oxfmt/binding-darwin-x64@npm:0.42.0": "798a208adcbe43ef9a3ead702a63ae91d0da868e3a34c6d21fd9cdc2933e3cd584423b96c4fa9a80a91ba50cac61f198ecaab1c1970dd1460b62706894c004be",
+  "@oxfmt/binding-freebsd-x64@npm:0.42.0": "1375f7fe8875d15ad99110d30fcf2b62f271c149b8676b7203261edc7afcd425fc6e2c1f03c688eb7792a8b407db29cc80be99508636c3ae9c5e01f7511a9019",
+  "@oxfmt/binding-linux-arm-gnueabihf@npm:0.42.0": "ffc7b9c8368b3234fa6750cf7c97ecb48e6f7399120005cef0dc667138465a78d4542da3ef84b049496d7c7f2737a73da7bd655b25a6ac0cd581110b1c5ea97f",
+  "@oxfmt/binding-linux-arm-musleabihf@npm:0.42.0": "3536d4c804af4dcbdf97aeb01862a63401ab84f430af2652a8d49a6b3559b0cc13c48bb6b65a5d88bee109e8bc56eae09279b3db927506e0423b9a2c4a1a2faf",
+  "@oxfmt/binding-linux-arm64-gnu@npm:0.42.0": "ab50b3dcefa2646e070344ade3c96e1f1cf6de6b82fff0d15223d5315e530536284740a67544c16d9d030235dc0e25174314d894b2f6a9870824a02d8b3dc850",
+  "@oxfmt/binding-linux-arm64-musl@npm:0.42.0": "fc6cc62590f450829b4e95d64c72fde805138dea7050c520d45cecd01fd20f47f94db0c539ce69ff0cc067ac79f852a7560369a3e39d01471294358a295215e6",
+  "@oxfmt/binding-linux-ppc64-gnu@npm:0.42.0": "cfe429d5056af70cfc910603e8901ec9a45afd21221900d4fef3880ac8d591f61586c49f1e2fa92c738f7c1e0b3d2178bc7c14238b0b3465360e1d66d962a671",
+  "@oxfmt/binding-linux-riscv64-gnu@npm:0.42.0": "943f26bc82e8964f0b49159585590805f79d6af7bde611dedfe139fe63d862ad26165d01b27df80cd3b75ba485c7b361761d3f1f1e2a58ec3d99510af8782a75",
+  "@oxfmt/binding-linux-riscv64-musl@npm:0.42.0": "fc5a41699e6fba09e10628eb73c4baf71630f7a88736ec8339bdf396223d276577d1239e89c6395751680641d7c15400eacbbba175a7618cd113f656d58b65b4",
+  "@oxfmt/binding-linux-s390x-gnu@npm:0.42.0": "12fd4491796031630eaf950a8fe96d652a490e07240dfcafe25ce3e2f120bf01f5472d9e1ddb9cc2862debcbc4f5a14139edbd114b9a8ba11dfcb1e50af98a04",
+  "@oxfmt/binding-linux-x64-gnu@npm:0.42.0": "831e37318b98817cc7f590bd5c4f9c4a85dd8c661611834ea97f897625a902c950aadc51133506014e7823d2b6049d70aafbec1e998e12fc7a27399b227e0974",
+  "@oxfmt/binding-linux-x64-musl@npm:0.42.0": "6442ca0a5098ba5eff96aa846d675bed07e391caa3915cd709f489334caa807255a84abb26c2ffc9bc86f3b7be60ace90f3c8ba92ca3f22ddf31567af285cbc5",
+  "@oxfmt/binding-openharmony-arm64@npm:0.42.0": "3146f6b340e2ee236297bec9502527ea536e27d6241f836c127e9cfce2d393d6d827737486bdc2ac28efd1a85af610326b83e7c2d28cfe01c9adec89b113a3dc",
+  "@oxfmt/binding-win32-arm64-msvc@npm:0.42.0": "d8f205779c9b58cbb5a5ba8105ebce093647ab643486b6f879555908219f5343d680250a1adb84b609e4933d3fa10dfda120e62430b76c9c9e63983c546181b1",
+  "@oxfmt/binding-win32-ia32-msvc@npm:0.42.0": "b8761448bc3286a71e89419416507b15c7a6a935ab39e862ef5242c654c288155e540b9a9dddef1d55fb45ec485390bdd5ff5961f70d6fcd71154f336a2403bc",
+  "@oxfmt/binding-win32-x64-msvc@npm:0.42.0": "7bdbcfb041739a6c655b8eb9acdafdb29925276c26c393da2325f0041658fc5306a9f274fbe50c18763a87c2878219db264b1c9cbc8ff5e63e77350d595a4cc8",
+  "@rolldown/binding-android-arm64@npm:1.0.0-rc.10": "d4cc5896e0fb0fe10a0bb374b53824dc73ffe672693e4151a1acef3a16861f08aa10dc5c22132aaf7533028d85eb0610d90bbac73d2d7da1a7c8c9d51f58cdde",
+  "@rolldown/binding-darwin-arm64@npm:1.0.0-rc.10": "81bb998e37f7ee6ad779a192240ee8c55c06539a2c5afc4a9a52afc4aac85340943cfa4a47d0156dcefeb57ba42d5cdfab3bd51a9ce76baa5e4b2876eee95751",
+  "@rolldown/binding-darwin-x64@npm:1.0.0-rc.10": "73f6a9a9c793d873fe5bd7c6602c8d3330bc6f960974c28df9e6b621503d962507b7e72d83541f4abd4af0d752998eaffbac66f07ee7b7450d5ffe0d908e0fee",
+  "@rolldown/binding-freebsd-x64@npm:1.0.0-rc.10": "900d53dfc0f0738a261137581e155527a9e25e5a50e38f211d6155d84a16a253d5b7ba56b6692bf674d7677e33499aeb2a622e66faadb3b673151bb809b4d0f3",
+  "@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-rc.10": "9b5375d3f1140a1e69bc64e281ac31fd5f801d33cc82f9cc4ad3ae1380f974425af54b151bac92d7729f103ba72a4c3565e04f98fda4aca905e3273605a4dfe0",
+  "@rolldown/binding-linux-arm64-gnu@npm:1.0.0-rc.10": "eed78ec8240558ab0e68c343fc5d29a8965e41eac0dcbd63ec63645af7fd69767cb7b25fb03d27a8e3f8b51ea880294451379d3e3fd75d7a2a17545cfd2fee69",
+  "@rolldown/binding-linux-arm64-musl@npm:1.0.0-rc.10": "1abf65bf031874306b1e5f6efd90eaccdf961e2341eeb285789596bfc9b870c6aca9e9fae57b1de51c1d5f27832cbc07208297e13dd516dc1f93ed26d0ca7d53",
+  "@rolldown/binding-linux-ppc64-gnu@npm:1.0.0-rc.10": "cce773d4e27c07e28ad619cf6af148927a8e737b29070af838ab2583262a66bceae93af902db92556c9794da79b738624a0ecef79d3a07649f529742bd8360f7",
+  "@rolldown/binding-linux-s390x-gnu@npm:1.0.0-rc.10": "68f34d542ab61a8fb7b485a611f0eabca4f87a8c37b888d373ebe439bf1243c9571a4962ec447a285629fd49a6aca48b26832354c16cb192a2099f3e2f223015",
+  "@rolldown/binding-linux-x64-gnu@npm:1.0.0-rc.10": "e7c10be739aa7b5e93818672055ee2ec6af9545057a0d9ef88aa28c7bf852ed72652bdf96be0fb9d06e17f2c0250f1823b7ec1a5bcbfd82d6ab9911bd00b446f",
+  "@rolldown/binding-linux-x64-musl@npm:1.0.0-rc.10": "a8ba6e75f7a96b5df7b9dbed53f2eb8193b31950754617906c6079c74ba7c557edcb1a32b1122acb53bd954b7aac1d574ebe887916d63ee71d6404ea812ee800",
+  "@rolldown/binding-openharmony-arm64@npm:1.0.0-rc.10": "4018ac89bd56c0ffa5e42b1e91f1b94a2c021aa967b2332c4289ca2032ed688819080527ad8876eb820f547e8e6a6b2e2ab0032ca022f208e135d54c691db3dd",
+  "@rolldown/binding-wasm32-wasi@npm:1.0.0-rc.10": "659214e120a40d4fdd2e3400f05957c75605737005f60e63aa1e6b3975f76ff8616a28621458c1b5c627c5b625aa87e1b383fb6ef3e1ce47b3bc83af97f3dc41",
+  "@rolldown/binding-win32-arm64-msvc@npm:1.0.0-rc.10": "4be61ac40624cdfa0b065ad40e9678f326a2d33c075b1f753386d9d1060ccade471146e476af3ae484cf1a2e58d58d87c3ab657b65c1d2d202b15fa537375145",
+  "@rolldown/binding-win32-x64-msvc@npm:1.0.0-rc.10": "dca5229af78dd34b1c7fcb753c9d3b580d9ebc03ee06d41c215c0ca3ab800fcf0ecfbe6c505446eeeb81cd5897e26532d9374e60ce9ecb5c8bd8c1e5476f0801",
+  "lightningcss-android-arm64@npm:1.32.0": "119b578a5ce59674c45fe8dc269fdb2770d678571e7fd3f7eca763807d15542689d01f75f2836e1aa49b9ddd0caa7ab3a5301bb23b39418eaeba1efab3e85975",
+  "lightningcss-darwin-arm64@npm:1.32.0": "55010ae8ee7aac61da41fbc81992e11b1ca386087bb8493deb1014ea90c2deeef1b4126621722aa5b8a1aeee039ec7e3b1b9f7779d128963d6e436743f5d23aa",
+  "lightningcss-darwin-x64@npm:1.32.0": "dd74c964c85c93842576f8caaf6c31ea273545e2f39f931716fed7700668f30d7ca92516197913ded19d836f6ff1876a91cca008125f097e254c98177e67bf86",
+  "lightningcss-freebsd-x64@npm:1.32.0": "29b43c1a450171da1dece9ba2a13a6dc0866178e46fa51a8cf050fe9562eb81b45f8580a3aeaf2ac97fb2fd381d8cb88d950e701774c8d012e72a355df7ac264",
+  "lightningcss-linux-arm-gnueabihf@npm:1.32.0": "783e6f8bba55ffd585f17229e97056c370ed834e0123d0002884b51a7fb54d6807e97076726fd0bfd949396134983e21a0aace0d4f69b916994db679a0d8a360",
+  "lightningcss-linux-arm64-gnu@npm:1.32.0": "d694a6148f86d20e23b0806e8c6366de3bfc6927925ad17d226cd86c2ff4f025b1c88ae3d214dea06b45af2aa2d356cf504b1057b2a0a7027b44bfac11dc1f4d",
+  "lightningcss-linux-arm64-musl@npm:1.32.0": "ad946ead9c3ff13b43818d94426940b50cf1ff3dacd07835b8c50f0d412f64574be3c467410786dfb3524e93bc98fb789ebb73e6de845ceb1729fceb5296fe6f",
+  "lightningcss-linux-x64-gnu@npm:1.32.0": "183d5cda546283523761f606032596d70383d6fd153cfca56ab348d551ef06394ee009fae7818b0732de10d9d0ee27db483cbc7e0d0899305a37a118504d609e",
+  "lightningcss-linux-x64-musl@npm:1.32.0": "67079567d13d5464a2556630dcbcbb8ccd0e3188d56b0a732c651930a823a708b91faa067256a15be6f289f07f1b57ca433d38ad397a9a102fbb85d0b85b5ea0",
+  "lightningcss-win32-arm64-msvc@npm:1.32.0": "6117fdfb4ef1c2d8054fb469659e406ae32adae9dc712e2e5ed3f813bf25a52f0954911e92a5d397aeeba7151bafb3370dfc50504b94e719f4018de7d3cc3687",
+  "lightningcss-win32-x64-msvc@npm:1.32.0": "f4a917eebae4f3718eaa4d3a16e268a42f117180e6bda101b380939f6738d2754dbb69bd454ee412bbc6e6290e2d8446c5f6ee3a63b144c9bd6f40a93109b7ab"
 }
--- a/pkgs/by-name/pe/peacock/package.nix
+++ b/pkgs/by-name/pe/peacock/package.nix
@ -13,13 +13,13 @@ in

 stdenv.mkDerivation (finalAttrs: {
  pname = "peacock";
-  version = "8.7.0";
+  version = "8.8.1";

  src = fetchFromGitHub {
    owner = "thepeacockproject";
    repo = "Peacock";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-kDR2ObXzo8UudjfqU/lQl6dqblFhIEgnr20EKjiWKVw=";
+    hash = "sha256-OeROaz2Uvg3nsB0R9Ojo65a+zhnw/QmYaagcBrnIdIk=";
  };

  patches = [
@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
  missingHashes = ./missing-hashes.json;
  offlineCache = yarn-berry.fetchYarnBerryDeps {
    inherit (finalAttrs) src missingHashes patches;
-    hash = "sha256-DgkmBd9/voLLxIo1R7MNknFmH62RUYrG0MeV074ZX7U=";
+    hash = "sha256-9u/w/zy4f51uPFfkzf0fDZlsj8GFXAfw7RGR9owo5n8=";
  };

  meta = {
--- a/pkgs/by-name/pe/peacock/yarn-4.14-support.patch
+++ b/pkgs/by-name/pe/peacock/yarn-4.14-support.patch
@ -1,19 +1,8 @@
-diff --git a/.yarnrc.yml b/.yarnrc.yml
--- a/.yarnrc.yml
-+++ b/.yarnrc.yml
-@@ -14,4 +14,7 @@ plugins:
-   - path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs
-     spec: "https://mskelton.dev/yarn-outdated/v2"
- 
-yarnPath: .yarn/releases/yarn-4.7.0.cjs
-+approvedGitRepositories:
-+  - "**"
-+
-+enableScripts: true
 diff --git a/yarn.lock b/yarn.lock
+index 286ec90499..ee9a3a9fd3 100644
 --- a/yarn.lock
 +++ b/yarn.lock
-@@ -2,6 +2,6 @@
+@@ -2,7 +2,7 @@
 # Manual changes might be lost - proceed with caution!
 
 __metadata:
@ -21,3 +10,4 @@ diff --git a/yarn.lock b/yarn.lock
 +  version: 9
   cacheKey: 10
 
+ "@aashutoshrathi/word-wrap@npm:^1.2.3":
--- a/pkgs/by-name/ph/phrase-cli/package.nix
+++ b/pkgs/by-name/ph/phrase-cli/package.nix
@ -6,16 +6,16 @@

 buildGoModule (finalAttrs: {
  pname = "phrase-cli";
-  version = "2.64.0";
+  version = "2.65.0";

  src = fetchFromGitHub {
    owner = "phrase";
    repo = "phrase-cli";
    rev = finalAttrs.version;
-    sha256 = "sha256-UTfVHUExjTsswhTaoDPIckkqRbVyo95AwBUOXEFQE/M=";
+    sha256 = "sha256-9GFprrLcae/uiQCi2PolLAUP89nCa02DZ3tEXUyXvhw=";
  };

-  vendorHash = "sha256-HbgLFtKpmacjArmV3t1AkPKQ+nY9OLLyivZNlxbuoNY=";
+  vendorHash = "sha256-vlssNVS1zTjYdp63NrR2rWOan5ng6t2BYEXv4L9q8Gc=";

  ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${finalAttrs.version}" ];

--- a/pkgs/by-name/ra/rasm/package.nix
+++ b/pkgs/by-name/ra/rasm/package.nix
@ -7,7 +7,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "rasm";
-  version = "3.2.4bis";
+  version = "3.2.5";

  __structuredAttrs = true;
  strictDeps = true;
@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "EdouardBERGE";
    repo = "rasm";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-D9V9CqCCy0EYRIX0nr+kwxPH7W2KIIq67jabP7ZzETE=";
+    hash = "sha256-sLSODTaVxhybtkzRAjQw4bRSPhp9O69S5OzkEq/pK0M=";
  };

  nativeBuildInputs = [ installShellFiles ];
--- a/pkgs/by-name/re/re-isearch/package.nix
+++ b/pkgs/by-name/re/re-isearch/package.nix
@ -39,7 +39,7 @@ stdenv.mkDerivation {

  nativeBuildInputs = [ writableTmpDirAsHomeHook ];

-  buildinputs = [
+  buildInputs = [
    db
    file # libmagic
    libnsl
--- a/pkgs/by-name/ru/rustfinity/package.nix
+++ b/pkgs/by-name/ru/rustfinity/package.nix
@ -1,6 +1,5 @@
 {
  lib,
-  stdenv,
  rustPlatform,
  fetchCrate,
  pkg-config,
@ -8,32 +7,38 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "rustfinity";
-  version = "0.3.0";
+  version = "0.4.9";
+  __structuredAttrs = true;

  src = fetchCrate {
    inherit (finalAttrs) pname version;
-    hash = "sha256-5UhKL6lXli1mGorThv3SFclVKDATmxklZQ+S5hwqQgc=";
+    hash = "sha256-0xEVYHvVOugfE4mQxYt+U7AsejOxm/SnDV8HsmcZxBs=";
  };

-  cargoHash = "sha256-ZzVGr/Zj+WKKAUqJEbDZgEL7fHzRiI/aSF6e5sLZY+o=";
+  cargoHash = "sha256-Zc3m+hTotgCqBguUB/KM4BtGsdD4W5MR/ZBg2X/0nNk=";

-  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
-  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ];
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    openssl
+  ];

  env.OPENSSL_NO_VENDOR = 1;

-  # Requires network and fs access
-  checkFlags = [
-    "--skip=challenge::tests::test_challenge_exists"
-    "--skip=crates_io::tests::test_get_latest_version"
-    "--skip=dir::tests::test_get_current_dir"
-    "--skip=download::tests::download_file::test_downloads_file"
-    "--skip=download::tests::download_file::test_renames_starter"
+  # Fail to run in sandbox environment
+  checkFlags = map (t: "--skip=${t}") [
+    "challenge::tests::test_challenge_exists"
+    "crates_io::tests::test_get_latest_version"
+    "dir::tests::test_get_current_dir"
+    "download::tests::download_file::test_downloads_file"
+    "download::tests::download_file::test_renames_starter"
  ];

  meta = {
    description = "CLI for Rustfinity challenges solving";
-    homepage = "https://github.com/dcodesdev/rustfinity.com/tree/main/crates/cli";
+    homepage = "https://github.com/rustfinity/rustfinity/tree/main/crates/cli";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ nartsiss ];
    mainProgram = "rustfinity";
--- a/pkgs/by-name/sa/salt/package.nix
+++ b/pkgs/by-name/sa/salt/package.nix
@ -11,12 +11,12 @@

 python3.pkgs.buildPythonApplication (finalAttrs: {
  pname = "salt";
-  version = "3008.0";
+  version = "3008.1";
  format = "setuptools";

  src = fetchPypi {
    inherit (finalAttrs) pname version;
-    hash = "sha256-az5PJTHJnD2wZtgds1KDnHdn3oRsk94/+UZRoX054tE=";
+    hash = "sha256-abf3Phwx7IjP7CqbvVZsf84Ajdqrmiab4xfPeyb2j/w=";
  };

  patches = [
--- a/pkgs/by-name/sa/samim-fonts/package.nix
+++ b/pkgs/by-name/sa/samim-fonts/package.nix
@ -2,32 +2,32 @@
  lib,
  stdenvNoCC,
  fetchFromGitHub,
+  installFonts,
 }:

-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "samim-fonts";
  version = "4.0.5";

+  outputs = [
+    "out"
+    "webfont"
+  ];
+
  src = fetchFromGitHub {
    owner = "rastikerdar";
    repo = "samim-font";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
    hash = "sha256-DVBMsNOVAVwzlZ3cDus/3CSsC05bLZalQ2KeueEvwXs=";
  };

-  installPhase = ''
-    runHook preInstall
-
-    find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/samim-fonts {} \;
-
-    runHook postInstall
-  '';
+  nativeBuildInputs = [ installFonts ];

  meta = {
    homepage = "https://github.com/rastikerdar/samim-font";
    description = "Persian (Farsi) Font - فونت (قلم) فارسی صمیم";
    license = lib.licenses.ofl;
    platforms = lib.platforms.all;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ pancaek ];
  };
-}
+})
--- a/pkgs/by-name/sa/sampo/package.nix
+++ b/pkgs/by-name/sa/sampo/package.nix
@ -9,21 +9,22 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "sampo";
-  version = "0.17.4";
+  version = "0.18.0";
+  __structuredAttrs = true;

  src = fetchFromGitHub {
    owner = "bruits";
    repo = "sampo";
-    tag = "sampo-v${finalAttrs.version}";
-    hash = "sha256-P+CekuDM3u+iG2HmCNWxZoTCaKtAUMnrNre4zeGNPrQ=";
+    tag = "cargo-sampo-v${finalAttrs.version}";
+    hash = "sha256-LPgY/UA2AF871bid8wqxzIhTDnsHsQ7IhY/eNYE6Npk=";
  };

+  cargoHash = "sha256-U52xGXJlz7cM1fJWZMp51iNgYQRA8AKJ0OkbxlAB5C8=";
+
  nativeBuildInputs = [ pkg-config ];

  buildInputs = [ openssl ];

-  cargoHash = "sha256-udMpH0LWNqPTORSb1/c686stgvti5shx/O9rcH7YZNs=";
-
  cargoBuildFlags = [
    "-p"
    "sampo"
@ -35,12 +36,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
  nativeInstallCheckInputs = [ versionCheckHook ];
  doInstallCheck = true;

-  passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=sampo-v([0-9\\.]*)" ]; };
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version-regex=cargo-sampo-v([0-9\\.]*)" ];
+  };

  meta = {
    description = "Automate changelogs, versioning, and publishing—even for monorepos across multiple package registries";
    homepage = "https://github.com/bruits/sampo";
-    changelog = "https://github.com/bruits/sampo/blob/sampo-v${finalAttrs.version}/crates/sampo/CHANGELOG.md";
+    changelog = "https://github.com/bruits/sampo/blob/${finalAttrs.src.tag}/crates/sampo/CHANGELOG.md";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ nartsiss ];
    mainProgram = "sampo";
--- a/pkgs/by-name/se/setJavaClassPath/package.nix
+++ b/pkgs/by-name/se/setJavaClassPath/package.nix
@ -0,0 +1,9 @@
+{
+  lib,
+  makeSetupHook,
+}:
+
+makeSetupHook {
+  name = "set-java-classpath-hook";
+  meta.license = lib.licenses.mit;
+} ./set-java-classpath.sh
--- a/pkgs/by-name/se/setJavaClassPath/set-java-classpath.sh
+++ b/pkgs/by-name/se/setJavaClassPath/set-java-classpath.sh
--- a/pkgs/by-name/sh/shen-sbcl/package.nix
+++ b/pkgs/by-name/sh/shen-sbcl/package.nix
@ -4,16 +4,20 @@
  fetchzip,
  sbcl,
  installStandardLibrary ? true,
+  installConcurrency ? true,
+  installThorn ? true,
+  installLogicLab ? true,
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "shen-sbcl";
-  version = "41";
+  version = "41.1";

  src = fetchzip {
    url = "https://www.shenlanguage.org/Download/S${finalAttrs.version}.zip";
-    hash = "sha256-uWGMET1zjGbI/+yM1zeMfhVYBgrGawafAEBBGXANXGE=";
+    hash = "sha256-v/hlP23yfpkpFEDCTKYoxeMJbfR2qVF9LFUkqsFwo6g=";
  };

+  sourceRoot = "${finalAttrs.src.name}/S41";
  nativeBuildInputs = [ sbcl ];
  dontStrip = true; # necessary to prevent runtime errors with sbcl

@ -38,11 +42,18 @@ stdenvNoCC.mkDerivation (finalAttrs: {
    substituteInPlace Primitives/globals.lsp \
      --replace-fail '"2.0.0"' '(LISP-IMPLEMENTATION-VERSION)'

-    # remove interactive prompt during image creation
-    substituteInPlace install.lsp \
-      --replace-fail '(Y-OR-N-P "Load Shen Standard Library? ")' '${
-        if installStandardLibrary then "T" else "NIL"
-      }'
+    # remove interactive prompts during image creation
+    # shen/tk requires further configuration and isn't supported by default
+    substituteInPlace Lib/install.shen \
+      --replace-fail '(y-or-n? "install standard library?")' '${
+        if installStandardLibrary then "true" else "false"
+      }' \
+      --replace-fail '(y-or-n? "install concurrency? (required for Shen/tk)")' '${
+        if installConcurrency then "true" else "false"
+      }' \
+      --replace-fail '(y-or-n? "install Shen/tk + IDE?")' 'false' \
+      --replace-fail '(y-or-n? "install THORN?")' '${if installThorn then "true" else "false"}' \
+      --replace-fail '(y-or-n? "install Logic Lab?")' '${if installLogicLab then "true" else "false"}'
  '';

  meta = {
--- a/pkgs/by-name/sh/shortenPerlShebang/package.nix
+++ b/pkgs/by-name/sh/shortenPerlShebang/package.nix
@ -0,0 +1,11 @@
+{
+  lib,
+  makeSetupHook,
+  dieHook,
+}:
+
+makeSetupHook {
+  name = "shorten-perl-shebang-hook";
+  propagatedBuildInputs = [ dieHook ];
+  meta.license = lib.licenses.mit;
+} ./shorten-perl-shebang.sh
--- a/pkgs/by-name/sh/shortenPerlShebang/shorten-perl-shebang.sh
+++ b/pkgs/by-name/sh/shortenPerlShebang/shorten-perl-shebang.sh
--- a/pkgs/by-name/si/signal-desktop/chromium-147-llvm-22.patch
+++ b/pkgs/by-name/si/signal-desktop/chromium-147-llvm-22.patch
@ -0,0 +1,13 @@
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+index c092446fa0715351f72913fd449c8dddb855a10f..83670b496575a85ecb02a4671c0287fd0e052c5a 100644
+--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
+@@ -616,7 +616,7 @@ config("compiler") {
+     # The performance improvement does not seem worth the risk. See
+     # https://crbug.com/484082200 for background and https://crrev.com/c/7593035
+     # for discussion.
+-    if (!is_wasm) {
+    if (false) {
+       cflags += [ "-fno-lifetime-dse" ]
+     }
+ 
--- a/pkgs/by-name/si/signal-desktop/libsignal-node.nix
+++ b/pkgs/by-name/si/signal-desktop/libsignal-node.nix
@ -15,23 +15,23 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "libsignal-node";
-  version = "0.94.1";
+  version = "0.94.4";

  src = fetchFromGitHub {
    owner = "signalapp";
    repo = "libsignal";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-re9IAC0R2QOIjyOLUjdaJw/TgDA4JT1nhtOskE5A0FQ=";
+    hash = "sha256-Uh/j8cXUWgWgSo9UBfYOFuC8i+2YdMwGHcXf55PkGgU=";
  };

-  cargoHash = "sha256-EVwIRUJ8SmajjocZj3dAHkTiR7Q78m/lf+4qls/oZAM=";
+  cargoHash = "sha256-st6zTKvxSsyMce22E8nFsJMGjQkk9sEAzSCmyZP8x20=";

  npmRoot = "node";
  npmDeps = fetchNpmDeps {
    name = "${finalAttrs.pname}-npm-deps";
    inherit (finalAttrs) version src;
    sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}";
-    hash = "sha256-bEQb+36IB+kXSbIkAFDpeIXWeHoQoIIiHo9q5AbaTio=";
+    hash = "sha256-A/RTWBHnI9eBrguXezOb5qSkGzIyVl66ATAA/ZUtk3Y=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/si/signal-desktop/package.nix
+++ b/pkgs/by-name/si/signal-desktop/package.nix
@ -6,12 +6,12 @@
  node-gyp,
  fetchPnpmDeps,
  pnpmConfigHook,
-  electron_41,
+  pnpmBuildHook,
+  electron_42,
  python3,
  makeWrapper,
  callPackage,
  fetchFromGitHub,
-  fetchpatch,
  fetchurl,
  jq,
  makeDesktopItem,
@ -32,7 +32,7 @@ assert lib.warnIf (commandLineArgs != "")
 let
  nodejs = nodejs_24;
  pnpm = pnpm_10_29_2;
-  electron = electron_41;
+  electron = electron_42;

  libsignal-node = callPackage ./libsignal-node.nix { inherit nodejs; };
  signal-sqlcipher = callPackage ./signal-sqlcipher.nix { inherit pnpm nodejs; };
@ -40,13 +40,13 @@ let
  webrtc = callPackage ./webrtc.nix { };
  ringrtc = callPackage ./ringrtc.nix { inherit webrtc; };

-  version = "8.13.0";
+  version = "8.14.0";

  src = fetchFromGitHub {
    owner = "signalapp";
    repo = "Signal-Desktop";
    tag = "v${version}";
-    hash = "sha256-gOYnjNCjI1eNVzcb7sx0XDXbhrAdvlgsZQaRuyBXpwI=";
+    hash = "sha256-U5xJumoKWc1hGZ7OML05U7U3DFdrnRHUlfIU3qYph6w=";
    # Emoji font files will be added in `postFetch` if `withAppleEmojis` is enabled. They
    # are fetched separately below.
    postFetch = ''
@ -68,23 +68,18 @@ let
    pnpmDeps = fetchPnpmDeps {
      inherit (finalAttrs) pname src version;
      inherit pnpm;
-      fetcherVersion = 3;
-      hash = "sha256-CPZkybD/rCBMBK9qUSweBdLr9hXu0Ztn8fekqrRzUR4=";
+      fetcherVersion = 4;
+      hash = "sha256-WmDSa4PrASaqs8X68LYaPBeE+i+Jh3FfWF30SseN74Y=";
    };

    strictDeps = true;
    nativeBuildInputs = [
      nodejs
      pnpmConfigHook
+      pnpmBuildHook
      pnpm
    ];

-    buildPhase = ''
-      runHook preBuild
-      pnpm run build
-      runHook postBuild
-    '';
-
    installPhase = ''
      runHook preInstall
      cp -r dist $out
@ -101,6 +96,7 @@ stdenv.mkDerivation (finalAttrs: {
    node-gyp
    nodejs
    pnpmConfigHook
+    pnpmBuildHook
    pnpm
    makeWrapper
    python3
@ -173,14 +169,14 @@ stdenv.mkDerivation (finalAttrs: {
      patches
      ;
    inherit pnpm;
-    fetcherVersion = 3;
-    hash = "sha256-3EEeHmtOAdcm2Q3eNUEl2RbTFRB4YBKcZLFtEmwbVOk=";
+    fetcherVersion = 4;
+    hash = "sha256-YQY+ohfLcaR2jzB9bzWpNQImuLja2DQ9iwDKhoH8kiU=";
  };

  env = {
    ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
    SIGNAL_ENV = "production";
-    SOURCE_DATE_EPOCH = 1780508208;
+    SOURCE_DATE_EPOCH = 1781124627;
  };

  preBuild = ''
@ -234,17 +230,15 @@ stdenv.mkDerivation (finalAttrs: {
    node-gyp rebuild
    popd
    test -f node_modules/fs-xattr/build/Release/xattr.node
-  '';

-  buildPhase = ''
-    runHook preBuild
-
-    export npm_config_nodedir=${electron.headers}
    cp -r ${electron.dist} electron-dist
    chmod -R u+w electron-dist
    cp -r ${sticker-creator} sticker-creator/dist
+  '';

-    pnpm run generate
+  pnpmBuildScript = "generate";
+
+  postBuild = ''
    pnpm exec electron-builder \
      ${
        if stdenv.hostPlatform.isDarwin then "--mac" else "--linux"
@ -254,8 +248,6 @@ stdenv.mkDerivation (finalAttrs: {
      -c.electronVersion=${electron.version} \
      -c.npmRebuild=false \
      ${lib.optionalString stdenv.hostPlatform.isDarwin "-c.mac.identity=null"}
-
-    runHook postBuild
  '';

  installPhase = ''
--- a/pkgs/by-name/si/signal-desktop/ringrtc.nix
+++ b/pkgs/by-name/si/signal-desktop/ringrtc.nix
@ -19,16 +19,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "ringrtc";
-  version = "2.69.0";
+  version = "2.69.1";

  src = fetchFromGitHub {
    owner = "signalapp";
    repo = "ringrtc";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-KQ/zAyj9caArZvl8SwMFfRcye1IzPoChjnYA0A8GcWw=";
+    hash = "sha256-XKzZ9AUGunOTs4vchWNlBYDIln25kRfxyQ2RZCr29Bs=";
  };

-  cargoHash = "sha256-DlRAPFluKdfU1YutDNQbAEF95aydd+duc6T2hqYWwGQ=";
+  cargoHash = "sha256-U1Zf7fCNoJNBYyIN/IRI41Gj6sK+iiUwGbAfYEo+a/0=";

  preConfigure = ''
    # Check for matching webrtc version
--- a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix
+++ b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix
@ -5,6 +5,7 @@
  fetchFromGitHub,
  fetchPnpmDeps,
  pnpmConfigHook,
+  pnpmBuildHook,
  nodejs,
  rustPlatform,
  cargo,
@ -27,8 +28,8 @@ stdenv.mkDerivation (finalAttrs: {
  pnpmDeps = fetchPnpmDeps {
    inherit (finalAttrs) pname version src;
    inherit pnpm; # may be different than top-level pnpm
-    fetcherVersion = 3;
-    hash = "sha256-/EcPuqTXXGw1dEN6l1x84cUGyx890/rujjT+zJouIvM=";
+    fetcherVersion = 4;
+    hash = "sha256-HK3AetwGqFq/dhxX+aWgUww6eLCeQEkZIVsmmnYqdmM=";
  };

  cargoRoot = "deps/extension";
@ -42,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
  nativeBuildInputs = [
    nodejs
    pnpmConfigHook
+    pnpmBuildHook
    pnpm
    rustPlatform.cargoSetupHook
    cargo
@ -53,16 +55,14 @@ stdenv.mkDerivation (finalAttrs: {
    cctools.libtool
  ];

-  buildPhase = ''
-    runHook preBuild
-
+  preBuild = ''
    export npm_config_nodedir=${nodejs}
-    pnpm run prebuildify --strip false --arch "${stdenv.hostPlatform.node.arch}" --platform "${stdenv.hostPlatform.node.platform}"
-    pnpm run build

-    runHook postBuild
+    pnpm run prebuildify --strip false --arch "${stdenv.hostPlatform.node.arch}" --platform "${stdenv.hostPlatform.node.platform}"
  '';

+  pnpmBuildScript = "build";
+
  installPhase = ''
    runHook preInstall

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