Merge master into staging-next

2024-11-25 00:12:56 +00:00 · 2024-10-21 00:14:52 +00:00 · 2024-10-21 00:14:52 +00:00 · 8164a7aa6d
commit 8164a7aa6d
parent b4ec4f2197 13bb3040ae
130 changed files with 30467 additions and 17227 deletions
--- a/ci/OWNERS
+++ b/ci/OWNERS
@ -351,6 +351,7 @@ pkgs/by-name/fo/forgejo/                @adamcstephens @bendlas @emilylange
 /pkgs/build-support/node/build-npm-package      @winterqt
 /pkgs/build-support/node/fetch-npm-deps         @winterqt
 /doc/languages-frameworks/javascript.section.md @winterqt
+/pkgs/development/tools/pnpm                    @Scrumplex @gepbird

 # OCaml
 /pkgs/build-support/ocaml           @ulrikstrid
--- a/doc/stdenv/cross-compilation.chapter.md
+++ b/doc/stdenv/cross-compilation.chapter.md
@ -181,6 +181,31 @@ Example of an error which this fixes.

 `[Errno 8] Exec format error: './gdk3-scan'`

+#### Using `-static` outside a `isStatic` platform. {#cross-static-on-non-static-platform}
+
+Add `stdenv.cc.libc.static` (static output of glibc) to `buildInputs` conditionally on if `hostPlatform` uses `glibc`.
+
+
+e.g.
+
+```nix
+{
+  buildInputs = lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
+}
+```
+
+Examples of errors which this fixes.
+
+`cannot find -lm: No such file or directory`
+
+`cannot find -lc: No such file or directory`
+
+::: {.note}
+At the time of writing it is assumed the issue only happens on `glibc` because it splits the static libraries in to a different output.
+
+::: {.note}
+You may want to look in to using `stdenvAdapters.makeStatic` or `pkgsStatic` or a `isStatic = true` platform.
+
 ## Cross-building packages {#sec-cross-usage}

 Nixpkgs can be instantiated with `localSystem` alone, in which case there is no cross-compiling and everything is built by and for that system, or also with `crossSystem`, in which case packages run on the latter, but all building happens on the former. Both parameters take the same schema as the 3 (build, host, and target) platforms defined in the previous section. As mentioned above, `lib.systems.examples` has some platforms which are used as arguments for these parameters in practice. You can use them programmatically, or on the command line:
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -12730,6 +12730,12 @@
    githubId = 26020062;
    name = "lumi";
  };
+  luna_1024 = {
+    email = "contact@luna.computer";
+    github = "luna-1024";
+    githubId = 7243615;
+    name = "Luna";
+  };
  lunarequest = {
    email = "nullarequest@vivlaid.net";
    github = "Lunarequest";
@ -13729,6 +13735,12 @@
    githubId = 1215331;
    name = "Matt Melling";
  };
+  melon = {
+    email = "melontime05@gmail.com";
+    github = "BlaiZephyr";
+    githubId = 101197249;
+    name = "Tim";
+  };
  melsigl = {
    email = "melanie.bianca.sigl@gmail.com";
    github = "melsigl";
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@ -406,9 +406,6 @@
    * from `/var/log/private/gns3` to `/var/log/gns3`
  and to change the ownership of these directories and their contents to `gns3` (including `/etc/gns3`).

- The `sshd` module now doesn't include `%h/.ssh/authorized_keys` as `AuthorizedKeysFile` unless
-  `services.openssh.authorizedKeysInHomedir` is set to `true` (the default is `false` for `stateVersion` 24.11 onwards).
-
 - Legacy package `stalwart-mail_0_6` was dropped, please note the
  [manual upgrade process](https://github.com/stalwartlabs/mail-server/blob/main/UPGRADING.md)
  before changing the package to `pkgs.stalwart-mail` in
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@ -1168,8 +1168,7 @@ in

          If set, users can authenticate with their Kerberos password.
          This requires a valid Kerberos configuration
-          (`config.security.krb5.enable` should be set to
-          `true`).
+          (`security.krb5.enable` should be set to `true`).

          Note that the Kerberos PAM modules are not necessary when using SSS
          to handle Kerberos authentication.
@ -1587,8 +1586,8 @@ in

    warnings = lib.optional
      (with config.security.pam.sshAgentAuth;
-        enable && lib.any (s: lib.hasPrefix "%h" s || lib.hasPrefix "~" s) authorizedKeysFiles)
-      ''config.security.pam.sshAgentAuth.authorizedKeysFiles contains files in the user's home directory.
+        enable && lib.any (s: lib.hasPrefix "%h" s || lib.hasPrefix "~" s) authorizedKeysFiles) ''
+        security.pam.sshAgentAuth.authorizedKeysFiles contains files in the user's home directory.

        Specifying user-writeable files there result in an insecure configuration:
        a malicious process can then edit such an authorized_keys file and bypass the ssh-agent-based authentication.
--- a/nixos/modules/services/misc/bazarr.nix
+++ b/nixos/modules/services/misc/bazarr.nix
@ -7,6 +7,8 @@ in
    services.bazarr = {
      enable = lib.mkEnableOption "bazarr, a subtitle manager for Sonarr and Radarr";

+      package = lib.mkPackageOption pkgs "bazarr" { };
+
      openFirewall = lib.mkOption {
        type = lib.types.bool;
        default = false;
@ -46,7 +48,7 @@ in
        StateDirectory = "bazarr";
        SyslogIdentifier = "bazarr";
        ExecStart = pkgs.writeShellScript "start-bazarr" ''
-          ${pkgs.bazarr}/bin/bazarr \
+          ${cfg.package}/bin/bazarr \
            --config '/var/lib/${StateDirectory}' \
            --port ${toString cfg.listenPort} \
            --no-update True
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@ -108,10 +108,6 @@ let

  };

-  usersWithKeys = lib.attrValues (lib.flip lib.filterAttrs config.users.users (n: u:
-    lib.length u.openssh.authorizedKeys.keys != 0 || lib.length u.openssh.authorizedKeys.keyFiles != 0
-  ));
-
  authKeysFiles = let
    mkAuthKeyFile = u: lib.nameValuePair "ssh/authorized_keys.d/${u.name}" {
      mode = "0444";
@ -120,6 +116,9 @@ let
        ${lib.concatMapStrings (f: lib.readFile f + "\n") u.openssh.authorizedKeys.keyFiles}
      '';
    };
+    usersWithKeys = lib.attrValues (lib.flip lib.filterAttrs config.users.users (n: u:
+      lib.length u.openssh.authorizedKeys.keys != 0 || lib.length u.openssh.authorizedKeys.keyFiles != 0
+    ));
  in lib.listToAttrs (map mkAuthKeyFile usersWithKeys);

  authPrincipalsFiles = let
@ -303,8 +302,7 @@ in

      authorizedKeysInHomedir = lib.mkOption {
        type = lib.types.bool;
-        default = lib.versionOlder config.system.stateVersion "24.11";
-        defaultText = lib.literalMD "`false` unless [](#opt-system.stateVersion) is 24.05 or older";
+        default = true;
        description = ''
          Enables the use of the `~/.ssh/authorized_keys` file.

@ -546,17 +544,6 @@ in

  config = lib.mkIf cfg.enable {

-    warnings = lib.optional (with cfg; lib.all lib.id [
-      # ~/.ssh/authorized_keys is ignored and no custom file locations were set
-      (authorizedKeysFiles == [ "/etc/ssh/authorized_keys.d/%u" ])
-      # no command provides authorized keys
-      (authorizedKeysCommand == "none")
-      # no users have keys in declarative configuration
-      (usersWithKeys == [])
-      # no authentication methods other than public keys are configured
-      ((settings.PasswordAuthentication == false && !package.withKerberos) || settings.AuthenticationMethods == [ "publickey" ])
-    ]) "services.openssh: no keys were set in `users.users.*.openssh.authorizedKeys` and `~/.ssh/authorized_keys` will be ignored";
-
    users.users.sshd =
      {
        isSystemUser = true;
--- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
+++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
@ -74,8 +74,6 @@ let

    netbootxyz = optionalString cfg.netbootxyz.enable pkgs.netbootxyz-efi;

-    edk2-uefi-shell = optionalString cfg.edk2-uefi-shell.enable pkgs.edk2-uefi-shell;
-
    checkMountpoints = pkgs.writeShellScript "check-mountpoints" ''
      fail() {
        echo "$1 = '$2' is not a mounted partition. Is the path configured correctly?" >&2
--- a/nixos/tests/openssh.nix
+++ b/nixos/tests/openssh.nix
@ -14,10 +14,7 @@ in {
      { ... }:

      {
-        services.openssh = {
-          enable = true;
-          authorizedKeysInHomedir = true;
-        };
+        services.openssh.enable = true;
        security.pam.services.sshd.limits =
          [ { domain = "*"; item = "memlock"; type = "-"; value = 1024; } ];
        users.users.root.openssh.authorizedKeys.keys = [
@ -42,11 +39,7 @@ in {
      { ... }:

      {
-        services.openssh = {
-          enable = true;
-          startWhenNeeded = true;
-          authorizedKeysInHomedir = true;
-        };
+        services.openssh = { enable = true; startWhenNeeded = true; };
        security.pam.services.sshd.limits =
          [ { domain = "*"; item = "memlock"; type = "-"; value = 1024; } ];
        users.users.root.openssh.authorizedKeys.keys = [
--- a/pkgs/applications/audio/pocket-casts/default.nix
+++ b/pkgs/applications/audio/pocket-casts/default.nix
@ -9,16 +9,16 @@

 buildNpmPackage rec {
  pname = "pocket-casts";
-  version = "0.7.0";
+  version = "0.8.0";

  src = fetchFromGitHub {
    owner = "felicianotech";
    repo = "pocket-casts-desktop-app";
    rev = "v${version}";
-    hash = "sha256-d4uVeHy4/91Ki6Wk6GlOt2lcK6U+M7fOryiOYA7q/x4=";
+    hash = "sha256-PwM9B2Qx4TxlcahQM/KEBTzWKc4cNrleDEYKg0m8bVE=";
  };

-  npmDepsHash = "sha256-rMLUQGcbBJBbxXP67lXp0ww8U2HYM/m1CP2dOw1cCHc=";
+  npmDepsHash = "sha256-WPuXTcHCKrwepITGtZFCIwylVAdYlI3cNsuhqx1AEYI=";

  env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";

@ -52,7 +52,7 @@ buildNpmPackage rec {
    description = "Pocket Casts webapp, packaged for the Linux Desktop";
    homepage = "https://github.com/felicianotech/pocket-casts-desktop-app";
    license = licenses.mit;
-    maintainers = [ ];
+    maintainers = with maintainers; [ yayayayaka ];
    mainProgram = "pocket-casts";
    platforms = platforms.linux;
  };
--- a/pkgs/applications/audio/youtube-music/default.nix
+++ b/pkgs/applications/audio/youtube-music/default.nix
@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {

  pnpmDeps = pnpm.fetchDeps {
    inherit (finalAttrs) pname version src;
-    hash = "sha256-lxqBmtHkyk4mnM/AJQmpyCmvhW2e96vZBkgtoREjEXY=";
+    hash = "sha256-6Fh1fbl7Y33EyWbWUhe70CGzhc4y+I59vPbzZydoJ18=";
  };

  nativeBuildInputs = [ makeWrapper python3 nodejs pnpm.configHook ]
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@ -631,12 +631,12 @@ final: prev:

  ale = buildVimPlugin {
    pname = "ale";
-    version = "2024-10-14";
+    version = "2024-10-19";
    src = fetchFromGitHub {
      owner = "dense-analysis";
      repo = "ale";
-      rev = "2e5f135836a700dcc6b787f10097ebdeb8e22abb";
-      sha256 = "0nai1872lh4069li7c2s0jk24vf6cql2irx8vi7dybcf7a52rmxb";
+      rev = "9854e19fa9f01e5d25a445893ea480f4ac172591";
+      sha256 = "0nsnhp86b3y30w7r34nd1ib3m6dr3dx9xbc7hm15k7f2shjwxnss";
    };
    meta.homepage = "https://github.com/dense-analysis/ale/";
  };
@ -1920,7 +1920,7 @@ final: prev:
      owner = "GaetanLepage";
      repo = "cmp-nixpkgs-maintainers";
      rev = "86711e7d3e92097b26e53f0b146b93863176377d";
-      sha256 = "sha256-NZuDbrKL/ukLIMxbqVzVgzKkKTnw2Zu1/qD/MTIVO2Q=";
+      sha256 = "0r1v2lr33zx0zssrpngh74ls8cl3smfajnyc405ykzlbn9p876rm";
    };
    meta.homepage = "https://github.com/GaetanLepage/cmp-nixpkgs-maintainers/";
  };
@ -2720,12 +2720,12 @@ final: prev:

  copilot-lua = buildVimPlugin {
    pname = "copilot.lua";
-    version = "2024-09-11";
+    version = "2024-10-18";
    src = fetchFromGitHub {
      owner = "zbirenbaum";
      repo = "copilot.lua";
-      rev = "1a237cf50372830a61d92b0adf00d3b23882e0e1";
-      sha256 = "0cjsygqvv2k8lrngln70x1ilb7fmsp812yayxvg3qhc7krc5cz4h";
+      rev = "f8d8d872bb319f640d5177dad5fbf01f7a16d7d0";
+      sha256 = "1yzfkvqjcmnbkxsdjy81cjal8zqqs9x6ai44ky11z0ly1zcqv3ji";
    };
    meta.homepage = "https://github.com/zbirenbaum/copilot.lua/";
  };
@ -2924,12 +2924,12 @@ final: prev:

  cyberdream-nvim = buildVimPlugin {
    pname = "cyberdream.nvim";
-    version = "2024-10-17";
+    version = "2024-10-19";
    src = fetchFromGitHub {
      owner = "scottmckendry";
      repo = "cyberdream.nvim";
-      rev = "358f6bfdd06115c139fb5518d3b95688083b7f70";
-      sha256 = "0cvsj55jv3aggqkrk611hmhb0kcvy7z6xal5p9af00bql97hqh4a";
+      rev = "7e6feb49d2ec47a742215754ec0ecc51eebba55a";
+      sha256 = "0ilv916j4wf110fapy25glc99qyps9dajvb1397xz95r6cyqc7ld";
    };
    meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/";
  };
@ -4465,12 +4465,12 @@ final: prev:

  go-nvim = buildVimPlugin {
    pname = "go.nvim";
-    version = "2024-10-14";
+    version = "2024-10-19";
    src = fetchFromGitHub {
      owner = "ray-x";
      repo = "go.nvim";
-      rev = "fb612d13c34d3d1d2caa4d5785733abe70dc22f0";
-      sha256 = "1k9vcgwnl1nvgww0mnqpmlf1m7478jbrl34cp5h94z40qxhld05v";
+      rev = "51676b430fc9288073769319ba0ccb2a3bcd79c9";
+      sha256 = "03aj4fx8s54wihqa2q025kkwvavxivnska1jv73qz0shcbzhbg4s";
    };
    meta.homepage = "https://github.com/ray-x/go.nvim/";
  };
@ -5390,12 +5390,12 @@ final: prev:

  jinja-vim = buildVimPlugin {
    pname = "jinja.vim";
-    version = "2024-10-17";
+    version = "2024-10-19";
    src = fetchFromGitHub {
      owner = "HiPhish";
      repo = "jinja.vim";
-      rev = "a6a6477f6f75604ce3df6d870bbfbd8dc176e196";
-      sha256 = "095d32c5v8rj5zf86cdasn7xr4qbvrw65mhzh3jj1hq84229bd3k";
+      rev = "81c0602f531ceceb20dba9ccb9a04d047a90b200";
+      sha256 = "0ngan4pijpxa5273s2s141qr9xdf9cmblwgkwha89sqvv50q6h0s";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/HiPhish/jinja.vim/";
@ -5548,12 +5548,12 @@ final: prev:

  kulala-nvim = buildVimPlugin {
    pname = "kulala.nvim";
-    version = "2024-10-17";
+    version = "2024-10-19";
    src = fetchFromGitHub {
      owner = "mistweaverco";
      repo = "kulala.nvim";
-      rev = "c1eebbd9ee63e020ab3fdece1e2ec377ce6da096";
-      sha256 = "1iz9376w1chzl98743mz654mdbynwm6v0bvqg3klmpl70pj3bp1x";
+      rev = "af1de146bf661306789a9f7c546a08ae5b7ff9c8";
+      sha256 = "1x5hv1npwd04bfmivkn4m2bri1nngrhlfx8imqqbph7frqhpnv9c";
    };
    meta.homepage = "https://github.com/mistweaverco/kulala.nvim/";
  };
@ -5656,12 +5656,12 @@ final: prev:

  lean-nvim = buildVimPlugin {
    pname = "lean.nvim";
-    version = "2024-10-18";
+    version = "2024-10-19";
    src = fetchFromGitHub {
      owner = "Julian";
      repo = "lean.nvim";
-      rev = "e217e5eff207c2136a8c3ff65454a04a9dbc4284";
-      sha256 = "06dhmy10yvxvws9dmp6r9ybpi1y9qhxcx5s4xd1k8b5h65ny7ir6";
+      rev = "5acde1275e0d278bfe7373243b1f29165f6b213e";
+      sha256 = "0ramsr7f7sh8f1q80zi13v0l9qc3jw7iz8xrna0c9swzdc28vrs5";
    };
    meta.homepage = "https://github.com/Julian/lean.nvim/";
  };
@ -7409,24 +7409,24 @@ final: prev:

  neoconf-nvim = buildVimPlugin {
    pname = "neoconf.nvim";
-    version = "2024-10-18";
+    version = "2024-10-19";
    src = fetchFromGitHub {
      owner = "folke";
      repo = "neoconf.nvim";
-      rev = "125a2f5cb8689a5a452c34afea9104eaf8fa0a5e";
-      sha256 = "1zbrh46qfafbvzxiqkga5ldssdnn0vnvbi2zcrs740prb7psp7wv";
+      rev = "a5af8418318f2bcc7513d52b001d68d551bf3b55";
+      sha256 = "1vfa38spyl5x5l2p2vaqxiqidrx6lg2sgmwjz95zyv39sjxsal8y";
    };
    meta.homepage = "https://github.com/folke/neoconf.nvim/";
  };

  neocord = buildVimPlugin {
    pname = "neocord";
-    version = "2024-04-24";
+    version = "2024-10-19";
    src = fetchFromGitHub {
      owner = "IogaMaster";
      repo = "neocord";
-      rev = "aa7a58023166533da83ca7b11c0d2569e45d7381";
-      sha256 = "1x4mddm4ax3chmk996w5dw8rzxa7yap356rc68rq6p3016frsmd1";
+      rev = "587e03390a355e9c364d48638e0e0db2a8431d73";
+      sha256 = "13b290yd74w23p6mng225nh14pi030ap7ah8lsby7w895335mmg1";
    };
    meta.homepage = "https://github.com/IogaMaster/neocord/";
  };
@ -7481,12 +7481,12 @@ final: prev:

  neogit = buildVimPlugin {
    pname = "neogit";
-    version = "2024-10-18";
+    version = "2024-10-19";
    src = fetchFromGitHub {
      owner = "NeogitOrg";
      repo = "neogit";
-      rev = "aa3a343c58c378e91d2457f19952f9f2ee3aacc3";
-      sha256 = "05g62dii54b45q94hnirx7s0xqjdq743aq46y57npah6x2lz8zr0";
+      rev = "c41a654d6148e1858d98e37cea371993eac0b126";
+      sha256 = "0nja882dpdaipvfzpqx8l8jxjpx5nrgqn6rxp54gph73cx8ipqr7";
    };
    meta.homepage = "https://github.com/NeogitOrg/neogit/";
  };
@ -7748,12 +7748,12 @@ final: prev:

  neotest-haskell = buildVimPlugin {
    pname = "neotest-haskell";
-    version = "2024-10-13";
+    version = "2024-10-20";
    src = fetchFromGitHub {
      owner = "MrcJkb";
      repo = "neotest-haskell";
-      rev = "6b555ce43d3b9d29f484abf98ccb70e7597a50bb";
-      sha256 = "02wrqp854na7k2rxr204ckwc4kvm1pxlsrxknpm60jqinm1fj3i0";
+      rev = "19d85cd6c1b99ff4a99c16400d5033150331b4ba";
+      sha256 = "17rl29iy8d7gz0vjw3w7wnwirnkx4xpv9w1lbcn4ih2gay4a36by";
    };
    meta.homepage = "https://github.com/MrcJkb/neotest-haskell/";
  };
@ -8312,12 +8312,12 @@ final: prev:

  nvchad = buildVimPlugin {
    pname = "nvchad";
-    version = "2024-10-16";
+    version = "2024-10-19";
    src = fetchFromGitHub {
      owner = "nvchad";
      repo = "nvchad";
-      rev = "8792679a08c6747ba3f5890a01561442abec6935";
-      sha256 = "05f8srjvs2x4ivvg40a2y7ir0jj4z1id8qssmqky217ghqry2778";
+      rev = "09dd13e9c6df98fe5609829a7a0fbccea2f515ae";
+      sha256 = "1j3354kfgj008nl1r24n2xlvjxaz9jhs1ck0vgbqvkl9smxzf74a";
    };
    meta.homepage = "https://github.com/nvchad/nvchad/";
  };
@ -8432,12 +8432,12 @@ final: prev:

  nvim-cmp = buildNeovimPlugin {
    pname = "nvim-cmp";
-    version = "2024-08-01";
+    version = "2024-10-20";
    src = fetchFromGitHub {
      owner = "hrsh7th";
      repo = "nvim-cmp";
-      rev = "ae644feb7b67bf1ce4260c231d1d4300b19c6f30";
-      sha256 = "0fk7s6apvq4r9h82jqm5azf1zg9aklyycgh7ivnb98bw9a0ivjim";
+      rev = "82bd4b59432d44cf5e2a5ce3a40a037a575a6623";
+      sha256 = "0x2n004m0ar8bv4x20qpirld7ih235pm1q39im6cff8rffxf4qwm";
    };
    meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";
  };
@ -8899,12 +8899,12 @@ final: prev:

  nvim-lspconfig = buildVimPlugin {
    pname = "nvim-lspconfig";
-    version = "2024-10-18";
+    version = "2024-10-19";
    src = fetchFromGitHub {
      owner = "neovim";
      repo = "nvim-lspconfig";
-      rev = "b55b9659de9ac17e05df4787bb023e4c7ef45329";
-      sha256 = "0887n4q7z2k9faqd43ki7gpq30dn9vjk217kafj9hwymamqqfmk2";
+      rev = "fd49d5863e873891be37afac79b1f56fb34bb5d3";
+      sha256 = "0sf9v5dj7hgxrp3d96hqwr8j3my8hmjxz9k0mqipysz0rhl926nb";
    };
    meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
  };
@ -9175,12 +9175,12 @@ final: prev:

  nvim-scrollview = buildVimPlugin {
    pname = "nvim-scrollview";
-    version = "2024-10-16";
+    version = "2024-10-19";
    src = fetchFromGitHub {
      owner = "dstein64";
      repo = "nvim-scrollview";
-      rev = "c82821508e50d07fc0696af764fa8604c9f66de8";
-      sha256 = "0v5v2m4akjrbi1qcqpjl5bj8wwh3g863mhkj8k8sf922flyh0mxp";
+      rev = "f7f611330a8f7cd00dc81538fec369611be678ed";
+      sha256 = "1xx5aayjdjc6r8ad3lx70f67nsyi7zi7wclwd4a1zq7rx5j49vn9";
    };
    meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
  };
@ -9331,12 +9331,12 @@ final: prev:

  nvim-treesitter = buildVimPlugin {
    pname = "nvim-treesitter";
-    version = "2024-10-18";
+    version = "2024-10-20";
    src = fetchFromGitHub {
      owner = "nvim-treesitter";
      repo = "nvim-treesitter";
-      rev = "68b2bdd99d889e9705f7e90ae64d990f3ff03cf3";
-      sha256 = "0mwyk0i03dy73djhni55zf3dvlxkx3y4104xhkvlbgp60nl71b1h";
+      rev = "9a94cc23cb5499222923bf6119f6199edf84f381";
+      sha256 = "1kda4nai5r4xj12v5hg8am6lbg8r0niksij0p62r2jjj9bj4bs63";
    };
    meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
  };
@ -9800,12 +9800,12 @@ final: prev:

  other-nvim = buildVimPlugin {
    pname = "other.nvim";
-    version = "2024-08-26";
+    version = "2024-10-19";
    src = fetchFromGitHub {
      owner = "rgroli";
      repo = "other.nvim";
-      rev = "252cc279eb3d76685ef48aaeced1c3cf9793581f";
-      sha256 = "1jcibj2gdhzqwy6rsgv0x246qv2z4maxd6yawymbs9pmxr05lf3v";
+      rev = "64a2f8756468a4d09534a55b98d9d6bf86fa105e";
+      sha256 = "0p4asblgwiagxmz3vlk6xblkfqfdnyirplz3haq6xwwy8a0z574m";
    };
    meta.homepage = "https://github.com/rgroli/other.nvim/";
  };
@ -10077,12 +10077,12 @@ final: prev:

  poimandres-nvim = buildVimPlugin {
    pname = "poimandres.nvim";
-    version = "2023-08-16";
+    version = "2024-10-19";
    src = fetchFromGitHub {
      owner = "olivercederborg";
      repo = "poimandres.nvim";
-      rev = "77635055e686ae3c8a519198006ff0b43b6b2eae";
-      sha256 = "0rnpx5c5pcxr5prpl3642422ggir1vfvll643dj9h21h9k1b12xh";
+      rev = "a488957d803943a4201ac3b774913fcafa9e6b3a";
+      sha256 = "0jxika4w73hhi17y69lpiwwqfl2a2910s8inyskzfddxam1k8ivk";
    };
    meta.homepage = "https://github.com/olivercederborg/poimandres.nvim/";
  };
@ -10234,12 +10234,12 @@ final: prev:

  pum-vim = buildVimPlugin {
    pname = "pum.vim";
-    version = "2024-10-09";
+    version = "2024-10-20";
    src = fetchFromGitHub {
      owner = "Shougo";
      repo = "pum.vim";
-      rev = "b2ca20dedf32b80dd0cbd654770ec3f70841be68";
-      sha256 = "1qq0ha1r3yl4m94p83lcy0lrjazajcpnsd2v9rd9y74mznbh93f1";
+      rev = "c50cbf602dac65cba30111cf1eddb1eaf39ea448";
+      sha256 = "0dnsrxm16avw97c6jirm2mrriyh97lksldq047nbg3ia2g9px58c";
    };
    meta.homepage = "https://github.com/Shougo/pum.vim/";
  };
@ -10426,12 +10426,12 @@ final: prev:

  ranger-nvim = buildVimPlugin {
    pname = "ranger.nvim";
-    version = "2024-02-09";
+    version = "2024-10-19";
    src = fetchFromGitHub {
      owner = "kelly-lin";
      repo = "ranger.nvim";
-      rev = "d3b032feee6b3b0cf923222f260523e2bd7f3ad3";
-      sha256 = "07c0rri7v0z9hjdj3vqsqjms43y2a9kqqac2s5is7ksz2hqi5yzj";
+      rev = "0f06eb92f2a5a618dc0d606d90e634d83e6e6b63";
+      sha256 = "0mq7nlz11xnpla7zw6v9bk92xq1jzjmfnchprq4nnbfld44blibx";
    };
    meta.homepage = "https://github.com/kelly-lin/ranger.nvim/";
  };
@ -10522,12 +10522,12 @@ final: prev:

  render-markdown-nvim = buildVimPlugin {
    pname = "render-markdown.nvim";
-    version = "2024-10-18";
+    version = "2024-10-19";
    src = fetchFromGitHub {
      owner = "MeanderingProgrammer";
      repo = "render-markdown.nvim";
-      rev = "1871dc4ced6fd775591a63df8e4c343ebaf1a2d2";
-      sha256 = "0pjhn4wrbbd7mbkxa6i7ifalf3p41srbabn6likngl8sj4bxdc2h";
+      rev = "e1a2289106a9ce5ea1b20b78c90aef4d890950b7";
+      sha256 = "15xf4d6fsl68fqv31y6dk3kr2818z4jlc236gdg4kn7mxgyj3azm";
    };
    meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/";
  };
@ -11825,12 +11825,12 @@ final: prev:

  telescope-manix = buildNeovimPlugin {
    pname = "telescope-manix";
-    version = "2024-10-13";
+    version = "2024-10-20";
    src = fetchFromGitHub {
      owner = "MrcJkb";
      repo = "telescope-manix";
-      rev = "b04d358d3c1bf65e1a3b10812c4f0a9f57fb6fc0";
-      sha256 = "02b91csvggcw5yln87kbbx7jl7j9h0dl8rd0nlqw77ds0345yvbi";
+      rev = "913dbb2894603ca613f4ff6864827c6383395229";
+      sha256 = "13qc3cf8w0j67g61scg3jb19fyd6pr30rnmwldsqnfz3k2fdcf7a";
    };
    meta.homepage = "https://github.com/MrcJkb/telescope-manix/";
  };
@ -12186,12 +12186,12 @@ final: prev:

  tiny-inline-diagnostic-nvim = buildVimPlugin {
    pname = "tiny-inline-diagnostic.nvim";
-    version = "2024-10-16";
+    version = "2024-10-19";
    src = fetchFromGitHub {
      owner = "rachartier";
      repo = "tiny-inline-diagnostic.nvim";
-      rev = "a4f8b29eb318b507a5e5c11e6d69bea4f5bc2ab2";
-      sha256 = "03q8j80ra185jrvxxbj462apvyb86xa25w049xmpf5r1in2bkqsb";
+      rev = "ccb67504f93b20f36775d3aad620f9dc9ed98bd9";
+      sha256 = "0rhhzf3rza5q7qhk8h320gwhbq7fwajv5gl16yybx2im58vls2l2";
    };
    meta.homepage = "https://github.com/rachartier/tiny-inline-diagnostic.nvim/";
  };
@ -12367,12 +12367,12 @@ final: prev:

  triptych-nvim = buildVimPlugin {
    pname = "triptych.nvim";
-    version = "2024-09-27";
+    version = "2024-10-19";
    src = fetchFromGitHub {
      owner = "simonmclean";
      repo = "triptych.nvim";
-      rev = "7fae7598870f5010696fb79427a475ab0232f175";
-      sha256 = "1p2x86msjmr3zdamrqwmy1zqlv6nig08fwqj8ddwl4r123dq4ima";
+      rev = "ceee8bc858908a0802bcdbf4dfaf8cb732a6877a";
+      sha256 = "1djbs2asscbffi4wmapmxyp4wn3jkm12516nhs2lid6cslvig7ih";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/simonmclean/triptych.nvim/";
@ -13748,12 +13748,12 @@ final: prev:

  vim-dadbod = buildVimPlugin {
    pname = "vim-dadbod";
-    version = "2024-10-15";
+    version = "2024-10-18";
    src = fetchFromGitHub {
      owner = "tpope";
      repo = "vim-dadbod";
-      rev = "b74e49c11707fdfe23d101557dee496496611ab2";
-      sha256 = "0iqq3721hx28p51lm6b7irffqglpsxsjjy1h11x7hrhphn8qdn0q";
+      rev = "fe5a55e92b2dded7c404006147ef97fb073d8b1b";
+      sha256 = "1qy9pm7rwpzk8a5f2a1bqa6fgnkl4y06rqwsrkd3p3396kl1s6f1";
    };
    meta.homepage = "https://github.com/tpope/vim-dadbod/";
  };
@ -18266,12 +18266,12 @@ final: prev:

  yazi-nvim = buildVimPlugin {
    pname = "yazi.nvim";
-    version = "2024-10-18";
+    version = "2024-10-19";
    src = fetchFromGitHub {
      owner = "mikavilpas";
      repo = "yazi.nvim";
-      rev = "6a233f7bbdd2aa57a169471cd783c17e48b1be33";
-      sha256 = "0b7p3zn0c35gcf5bn41a06rwghn818699jy7qmbpjaqs2nq2ica1";
+      rev = "54065a98f27c562484041fd1137118a148468eb1";
+      sha256 = "0w8n7ai9inlgbgzp7hfsskcqnxwxsjwr84zpdcy9p3r0cysiskvp";
    };
    meta.homepage = "https://github.com/mikavilpas/yazi.nvim/";
  };
@ -18446,12 +18446,12 @@ final: prev:

  catppuccin-nvim = buildVimPlugin {
    pname = "catppuccin-nvim";
-    version = "2024-10-05";
+    version = "2024-10-19";
    src = fetchFromGitHub {
      owner = "catppuccin";
      repo = "nvim";
-      rev = "7be452ee067978cdc8b2c5f3411f0c71ffa612b9";
-      sha256 = "1zn3z1wyjaiq27635ifx83b4ikix7svq5rvqmyry3ijsrgpp98cg";
+      rev = "ea02cc8c3c053c6c1c574e0791d743338e3e788f";
+      sha256 = "0z0wff1dd8wh0cqd7yx3d14wcjr80iqqz0s8a3m9nllxp9bqsf65";
    };
    meta.homepage = "https://github.com/catppuccin/nvim/";
  };
@ -18566,12 +18566,12 @@ final: prev:

  nvchad-ui = buildVimPlugin {
    pname = "nvchad-ui";
-    version = "2024-10-18";
+    version = "2024-10-19";
    src = fetchFromGitHub {
      owner = "nvchad";
      repo = "ui";
-      rev = "87578bb7e2bc106127f013f9a1edd7a716f4f6c6";
-      sha256 = "0jz4wgh67xqlmhn0aqlx7i4v7idbxgbmvgysf0crmwps0i80j4ds";
+      rev = "3839b74f58602bec36db8150333c8b09966e42ed";
+      sha256 = "1jxc2jr0vg1yca5md124zcvj6ncmqydmz8fhbzmaak5h8fgqy3qi";
    };
    meta.homepage = "https://github.com/nvchad/ui/";
  };
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@ -403,12 +403,12 @@
  };
  devicetree = buildGrammar {
    language = "devicetree";
-    version = "0.0.0+rev=07a647c";
+    version = "0.0.0+rev=16c9cb9";
    src = fetchFromGitHub {
      owner = "joelspadin";
      repo = "tree-sitter-devicetree";
-      rev = "07a647c8fb70e6b06379a60526721e3141aa2fd2";
-      hash = "sha256-2uJEItLwoBoiB49r2XuO216Dhu9AnAa0p7Plmm4JNY8=";
+      rev = "16c9cb959675bc9bc4f4e5bebe473d511a12a06d";
+      hash = "sha256-UVxLF4IKRXexz+PbSlypS/1QsWXkS/iYVbgmFCgjvZM=";
    };
    meta.homepage = "https://github.com/joelspadin/tree-sitter-devicetree";
  };
@ -526,12 +526,12 @@
  };
  editorconfig = buildGrammar {
    language = "editorconfig";
-    version = "0.0.0+rev=79bb1dc";
+    version = "0.0.0+rev=f5b5ac3";
    src = fetchFromGitHub {
      owner = "ValdezFOmar";
      repo = "tree-sitter-editorconfig";
-      rev = "79bb1dc197d0eb7499843b19d3dd0f9a2ee34d3c";
-      hash = "sha256-A58dlaDQBmufKT/yG+At0NN0Op6gbEU47DvHjpzklwg=";
+      rev = "f5b5ac3f718523fe9d5ee926f64eb177306afdb6";
+      hash = "sha256-l5ryC0wINO/oN8FNrngR7QnDAhiX65y0Hw5AExvAfBo=";
    };
    meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-editorconfig";
  };
@ -846,12 +846,12 @@
  };
  gitcommit = buildGrammar {
    language = "gitcommit";
-    version = "0.0.0+rev=66e2585";
+    version = "0.0.0+rev=67ab180";
    src = fetchFromGitHub {
      owner = "gbprod";
      repo = "tree-sitter-gitcommit";
-      rev = "66e2585f4a3e73e768d42ef1223a5fb0a447bae6";
-      hash = "sha256-TZYdYTyDjvbvkuaKORLpQBqkcSCdG7ZSO1Jo64YkJ3o=";
+      rev = "67ab180883ba5ce3f5b0a5f4288cc6d9f9d83a5d";
+      hash = "sha256-5ieeIuUcaky3gWcrCrPXEGzfqom3Kv6rR8CEaWk797k=";
    };
    meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit";
  };
@ -1364,12 +1364,12 @@
  };
  json = buildGrammar {
    language = "json";
-    version = "0.0.0+rev=8bfdb43";
+    version = "0.0.0+rev=f2503f1";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-json";
-      rev = "8bfdb43f47ad805bb1ce093203cfcbaa8ed2c571";
-      hash = "sha256-zEuPynGi11vr7UvxC+mgZ+zOJBEVDjxvMwx0dozANn0=";
+      rev = "f2503f1c437fe24560876557868ac94c9cfd3216";
+      hash = "sha256-9tkKDvVB5YHqtIiBqrCRGp4H9MwapC1mHrm86iytiz4=";
    };
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-json";
  };
@ -1640,24 +1640,24 @@
  };
  markdown = buildGrammar {
    language = "markdown";
-    version = "0.0.0+rev=b7eba93";
+    version = "0.0.0+rev=be81c59";
    src = fetchFromGitHub {
      owner = "MDeiml";
      repo = "tree-sitter-markdown";
-      rev = "b7eba93e6a3e588e259e831416ac11abdaa8616a";
-      hash = "sha256-lOLLHHMmNAtK+RLOSIt0GpeNRiMj3eu9jhSKS0HT370=";
+      rev = "be81c59efc552bd875650fe078bf6b78d57330ca";
+      hash = "sha256-gqZYUJWijD0UQAQeElx/VxAILI2WZtvC/+Eno3AiCTU=";
    };
    location = "tree-sitter-markdown";
    meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
  };
  markdown_inline = buildGrammar {
    language = "markdown_inline";
-    version = "0.0.0+rev=b7eba93";
+    version = "0.0.0+rev=be81c59";
    src = fetchFromGitHub {
      owner = "MDeiml";
      repo = "tree-sitter-markdown";
-      rev = "b7eba93e6a3e588e259e831416ac11abdaa8616a";
-      hash = "sha256-lOLLHHMmNAtK+RLOSIt0GpeNRiMj3eu9jhSKS0HT370=";
+      rev = "be81c59efc552bd875650fe078bf6b78d57330ca";
+      hash = "sha256-gqZYUJWijD0UQAQeElx/VxAILI2WZtvC/+Eno3AiCTU=";
    };
    location = "tree-sitter-markdown-inline";
    meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
@ -2333,12 +2333,12 @@
  };
  regex = buildGrammar {
    language = "regex";
-    version = "0.0.0+rev=123552e";
+    version = "0.0.0+rev=58f4caf";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-regex";
-      rev = "123552e5849fae9a7c536eac84d471579c7f3328";
-      hash = "sha256-qcVZHrhlx66usrG5aapYdyv8Tx2wK4ZivjzsDNLpmsY=";
+      rev = "58f4caf9db12db3b38b81c77d274aa73c9e85aca";
+      hash = "sha256-IeAp2fEdxVf8r/f8B85ex5Y5DL8Z1ZOqovjVyMBIOKM=";
    };
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-regex";
  };
@ -2734,12 +2734,12 @@
  };
  svelte = buildGrammar {
    language = "svelte";
-    version = "0.0.0+rev=774a65a";
+    version = "0.0.0+rev=ae5199d";
    src = fetchFromGitHub {
      owner = "tree-sitter-grammars";
      repo = "tree-sitter-svelte";
-      rev = "774a65aea563accc35f5d45fafa4d96ec5761f57";
-      hash = "sha256-mkw3s0pZQ6ry+fiTk2fJeKVA7Nqyv2Z2R1AFZknzpFM=";
+      rev = "ae5199db47757f785e43a14b332118a5474de1a2";
+      hash = "sha256-cH9h7i6MImw7KlcuVQ6XVKNjd9dFjo93J1JdTWmEpV4=";
    };
    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-svelte";
  };
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@ -1114,6 +1114,11 @@ in
    };
  };

+  hunk-nvim = super.hunk-nvim.overrideAttrs {
+    dependencies = with self; [ nui-nvim ];
+    nvimRequireCheck = "hunk";
+  };
+
  # https://hurl.dev/
  hurl = buildVimPlugin {
    pname = "hurl";
--- a/pkgs/applications/editors/vim/plugins/patches/ranger.nvim/fix-paths.patch
+++ b/pkgs/applications/editors/vim/plugins/patches/ranger.nvim/fix-paths.patch
@ -1,17 +1,26 @@
 diff --git a/lua/ranger-nvim.lua b/lua/ranger-nvim.lua
-index 3b18880..78eb9db 100644
+index be95e36..3bd1587 100644
 --- a/lua/ranger-nvim.lua
 +++ b/lua/ranger-nvim.lua
-@@ -109,7 +109,7 @@ local function build_ranger_cmd(select_current_file)
- 	end
+@@ -127,7 +127,7 @@ local function build_ranger_cmd(select_current_file)
 	local selectfile_flag = select_current_file and " --selectfile=" .. selected_file or ""
+ 	if select_current_file then
 		return string.format(
 -			"ranger --choosefiles=%s %s %s",
 +			"@ranger@ --choosefiles=%s %s %s",
 			SELECTED_FILEPATH,
 			selectfile_flag,
 			create_ranger_cmd_flags(create_cmd_values(opts.keybinds))
-@@ -182,7 +182,7 @@ end
+@@ -135,7 +135,7 @@ local function build_ranger_cmd(select_current_file)
+ 	else
+ 		vim.api.nvim_buf_delete(1, { force = true })
+ 		return string.format(
+-			"ranger  --choosefiles=%s %s %s",
+			"@ranger@  --choosefiles=%s %s %s",
+ 			SELECTED_FILEPATH,
+ 			create_ranger_cmd_flags(create_cmd_values(opts.keybinds)),
+ 			get_absolute_argument()
+@@ -209,7 +209,7 @@ end
 ---Opens ranger and open selected files on exit.
 ---@param select_current_file boolean|nil open ranger and select the current file. Defaults to true.
 function M.open(select_current_file)
--- a/pkgs/applications/file-managers/nnn/default.nix
+++ b/pkgs/applications/file-managers/nnn/default.nix
@ -10,6 +10,7 @@
 , which
 , musl-fts
 , pcre
+, gnused
  # options
 , conf ? null
 , withIcons ? false
@ -60,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
    ++ lib.optionals withPcre [ "O_PCRE=1" ]
    ++ extraMakeFlags;

-  binPath = lib.makeBinPath [ file which ];
+  binPath = lib.makeBinPath [ file which gnused ];

  installTargets = [ "install" "install-desktop" ];

--- a/pkgs/applications/misc/copyq/default.nix
+++ b/pkgs/applications/misc/copyq/default.nix
@ -17,13 +17,13 @@

 stdenv.mkDerivation rec {
  pname = "CopyQ";
-  version = "9.0.0";
+  version = "9.1.0";

  src = fetchFromGitHub {
    owner = "hluk";
    repo = "CopyQ";
    rev = "v${version}";
-    hash = "sha256-Dxiytspqs4+bcnUM+B3lO8iQp9rrCvMfI+WMFMCtM7g=";
+    hash = "sha256-WBJyLfiPPEQ/Cj5uuwy9KhVc1kw4Hv5TeEuRFDydlGk=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/misc/opencpn/default.nix
+++ b/pkgs/applications/misc/opencpn/default.nix
@ -10,6 +10,7 @@
 , elfutils
 , fetchFromGitHub
 , flac
+, gitMinimal
 , gtk3
 , glew
 , gtest
@ -48,13 +49,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "opencpn";
-  version = "5.8.4";
+  version = "5.10.2";

  src = fetchFromGitHub {
    owner = "OpenCPN";
    repo = "OpenCPN";
    rev = "Release_${finalAttrs.version}";
-    hash = "sha256-axRI3sssj2Q6IBfIeyvOa494b0EgKFP+lFL/QrGIybQ=";
+    hash = "sha256-VuMClQ5k1mTMF5yWstTi9YTF4tEN68acH5OPhjdzIwM=";
  };

  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
@ -77,6 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
    curl
    dbus
    flac
+    gitMinimal
  ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
    AppKit
  ] ++ [
@ -118,7 +120,12 @@ stdenv.mkDerivation (finalAttrs: {
    lame
  ];

-  cmakeFlags = [ "-DOCPN_BUNDLE_DOCS=true" ];
+  cmakeFlags = [
+    "-DOCPN_BUNDLE_DOCS=true"
+  ] ++ lib.optionals stdenv.hostPlatform.isLinux [
+    # Override OpenCPN platform detection.
+    "-DOCPN_TARGET_TUPLE=unknown;unknown;${stdenv.hostPlatform.linuxArch}"
+  ];

  env.NIX_CFLAGS_COMPILE = toString (lib.optionals (!stdenv.hostPlatform.isx86) [
    "-DSQUISH_USE_SSE=0"
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@ -314,7 +314,7 @@ let
    ] ++ lib.optionals (chromiumVersionAtLeast "129") [
      # Rebased variant of patch right above to build M129+ with our rust and our clang.
      ./patches/chromium-129-rust.patch
-    ] ++ lib.optionals (chromiumVersionAtLeast "130") [
+    ] ++ lib.optionals (chromiumVersionAtLeast "130" && !ungoogled) [
      # Our rustc.llvmPackages is too old for std::hardware_destructive_interference_size
      # and std::hardware_constructive_interference_size.
      # So let's revert the change for now and hope that our rustc.llvmPackages and
@ -324,6 +324,7 @@ let
      # Note: We exclude the changes made to the partition_allocator (PA), as the revert
      # would otherwise not apply because upstream reverted those changes to PA already
      # in https://chromium-review.googlesource.com/c/chromium/src/+/5841144
+      # Note: ungoogled-chromium already reverts this as part of its patchset.
      (githubPatch {
        commit = "fc838e8cc887adbe95110045d146b9d5885bf2a9";
        hash = "sha256-NNKzIp6NYdeZaqBLWDW/qNxiDB1VFRz7msjMXuMOrZ8=";
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@ -21,17 +21,17 @@
  ungoogled-chromium = {
    deps = {
      gn = {
-        hash = "sha256-8o3rDdojqVHMQCxI2T3MdJOXKlW3XX7lqpy3zWhJiaA=";
-        rev = "d010e218ca7077928ad7c9e9cc02fe43b5a8a0ad";
+        hash = "sha256-iNXRq3Mr8+wmY1SR4sV7yd2fDiIZ94eReelwFI0UhGU=";
+        rev = "20806f79c6b4ba295274e3a589d85db41a02fdaa";
        url = "https://gn.googlesource.com/gn";
-        version = "2024-08-19";
+        version = "2024-09-09";
      };
      ungoogled-patches = {
-        hash = "sha256-kvpLE6SbXFur5xi1C8Ukvm4OoU5YB8PQCJdiakhFSAM=";
-        rev = "129.0.6668.100-1";
+        hash = "sha256-M+aJ1hhFV88lBBPl9xBYpYRut7yHa/HJYXoclckaZVM=";
+        rev = "130.0.6723.58-1";
      };
    };
-    hash = "sha256-LOZ9EPw7VgBNEV7Wxb8H5WfSYTTWOL8EDP91uCrZAsA=";
-    version = "129.0.6668.100";
+    hash = "sha256-w1xQr+B7ROeCqBRN+M9vmh45YTRqVfjDYSsN5saDuDo=";
+    version = "130.0.6723.58";
  };
 }
--- a/pkgs/applications/science/physics/sherpa/default.nix
+++ b/pkgs/applications/science/physics/sherpa/default.nix
@ -1,12 +1,12 @@
-{ lib, stdenv, fetchurl, autoconf, gfortran, hepmc2, fastjet, lhapdf, rivet, sqlite }:
+{ lib, stdenv, fetchurl, autoconf, gfortran, hepmc3, fastjet, lhapdf, rivet, sqlite }:

 stdenv.mkDerivation rec {
  pname = "sherpa";
-  version = "2.2.15";
+  version = "2.2.16";

  src = fetchurl {
    url = "https://www.hepforge.org/archive/sherpa/SHERPA-MC-${version}.tar.gz";
-    sha256 = "sha256-3zvLa1k/bm7uOWKUsTyQM39cPBXJJlF1OgPgznl1hks=";
+    sha256 = "sha256-AntSN5BhtJFuDBoOFvrzoCr/W4SnX5CeAXiTcz9MjUs=";
  };

  postPatch = lib.optionalString (stdenv.hostPlatform.libc == "glibc") ''
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {

  configureFlags = [
    "--with-sqlite3=${sqlite.dev}"
-    "--enable-hepmc2=${hepmc2}"
+    "--enable-hepmc3=${hepmc3}"
    "--enable-fastjet=${fastjet}"
    "--enable-lhapdf=${lhapdf}"
    "--enable-rivet=${rivet}"
--- a/pkgs/applications/virtualization/podman-desktop/default.nix
+++ b/pkgs/applications/virtualization/podman-desktop/default.nix
@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {

  pnpmDeps = pnpm.fetchDeps {
    inherit (finalAttrs) pname version src;
-    hash = "sha256-mkWbFFv0IdLtog6uZM6xgTNlQPC+ytUQD8po8yiv/6Y=";
+    hash = "sha256-LPsNRd1c/cQeyBn3LZKnKeAsZ981sOkLYTnXIZL82LA=";
  };

  patches = [
--- a/pkgs/applications/window-managers/leftwm/default.nix
+++ b/pkgs/applications/window-managers/leftwm/default.nix
@ -11,25 +11,16 @@ in

 rustPlatform.buildRustPackage rec {
  pname = "leftwm";
-  version = "0.5.1";
+  version = "0.5.3";

  src = fetchFromGitHub {
    owner = "leftwm";
    repo = "leftwm";
    rev = "refs/tags/${version}";
-    hash = "sha256-wn5DurPWFwSUtc5naEL4lBSQpKWTJkugpN9mKx+Ed2Y=";
+    hash = "sha256-3voGKM6MKisc+ZVdZ5sCrs3XVfeRayozIk4SXNjw820=";
  };

-  cargoPatches = [
-    # This pacth can be removed with the next version bump, it just updates the `time` crate
-    ./update-time-crate.patch
-  ];
-
-  # To show the "correct" git-hash in `leftwm-check` we manually set the GIT_HASH env variable
-  # can be remove together with the above patch
-  GIT_HASH = "36609e0 patched";
-
-  cargoHash = "sha256-SNq76pTAPSUGVRp/+fwCjSMP/lKVzh6wU+WZW5n/yjg=";
+  cargoHash = "sha256-w8qgNXxd6tZ1eMpQQqDoax76zYxTVHgVAlchQaRnMCc=";

  buildInputs = rpathLibs;

--- a/pkgs/build-support/substitute/substitute-all.nix
+++ b/pkgs/build-support/substitute/substitute-all.nix
@ -1,8 +1,12 @@
-{ stdenvNoCC }:
-
-args:
-
+{ lib, stdenvNoCC }:
 # see the substituteAll in the nixpkgs documentation for usage and constraints
+args:
+let
+  # keep this in sync with substituteAll
+  isInvalidArgName = x: builtins.match "^[a-z][a-zA-Z0-9_]*$" x == null;
+  invalidArgs = builtins.filter isInvalidArgName (builtins.attrNames args);
+in
+  if invalidArgs == [] then
    stdenvNoCC.mkDerivation ({
      name = if args ? name then args.name else baseNameOf (toString args.src);
      builder = ./substitute-all.sh;
@ -10,3 +14,9 @@ stdenvNoCC.mkDerivation ({
      preferLocalBuild = true;
      allowSubstitutes = false;
    } // args)
+  else throw ''
+    Argument names for `pkgs.substituteAll` must:
+      - start with a lower case ASCII letter
+      - only contain ASCII letters, digits and underscores
+    Found invalid argument names: ${lib.concatStringsSep ", " invalidArgs}.
+  ''
--- a/pkgs/by-name/an/antares/npm-lock.patch
+++ b/pkgs/by-name/an/antares/npm-lock.patch
--- a/pkgs/by-name/an/antares/package.nix
+++ b/pkgs/by-name/an/antares/package.nix
@ -4,29 +4,34 @@
  buildNpmPackage,
  electron,
  nodejs,
+  makeDesktopItem,
+  copyDesktopItems,
 }:

 buildNpmPackage rec {
  pname = "antares";
-  version = "0.7.28";
+  version = "0.7.29";

  src = fetchFromGitHub {
    owner = "antares-sql";
    repo = "antares";
    rev = "v${version}";
-    hash = "sha256-nEI1G0A1c+xjALbIcItzh4CFxAeQPOD8h+Bs0aYnEfU=";
+    hash = "sha256-3zgr3Eefx3WDUW9/1NOaneUbFy3GTnJ3tGgivtW1K/g=";
  };

-  npmDepsHash = "sha256-lSkZTa2zt8BeucOih8XjQ7QW/tg34umIRe4a4DDBW34=";
+  npmDepsHash = "sha256-WJ5HVVa4rEOsvr52L/OGk+vlxRiKLJTxWmUnpN1FnbY=";

  patches = [
-    # In version 0.7.28, package-lock is not updated properly so this patch update it to be able to build the package
+    # Since version 0.7.28, package-lock is not updated properly so this patch update it to be able to build the package
    # This patch will probably be removed in the next version
+    # If it does not build without it, you just need to do a npm update in the antares project and copy the patch
    ./npm-lock.patch
  ];

  buildInputs = [ nodejs ];

+  nativeBuildInputs = [ copyDesktopItems ];
+
  npmBuildScript = "compile";

  installPhase = ''
@ -37,12 +42,30 @@ buildNpmPackage rec {
    makeWrapper ${lib.getExe electron} $out/bin/antares \
      --add-flags $out/lib/node_modules/antares/main.js
    runHook postInstall
+
+    # Install icon files
+    mkdir -pv $out/share/icon/
+    cp assets/icon.ico $out/share/icon/antares.ico
  '';

  npmFlags = [ "--legacy-peer-deps" ];
  env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
  env.PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "1";

+  desktopItems = [
+    (makeDesktopItem {
+      name = pname;
+      desktopName = "Antares SQL";
+      exec = pname;
+      icon = pname;
+      terminal = false;
+      type = "Application";
+      startupWMClass = pname;
+      comment = "A modern, fast and productivity driven SQL client with a focus in UX";
+      categories = [ "Development" ];
+    })
+  ];
+
  meta = with lib; {
    description = "Modern, fast and productivity driven SQL client with a focus in UX";
    homepage = "https://github.com/antares-sql/antares";
--- a/pkgs/by-name/an/anyk/package.nix
+++ b/pkgs/by-name/an/anyk/package.nix
@ -3,6 +3,7 @@
 , fetchurl
 , fetchzip
 , openjdk
+, openjfx
 , writeScript
 , runCommandLocal
 , bash
@ -24,10 +25,16 @@ let
    stripRoot = false;
  };

+  # ÁNYK needs JavaFX for the Ügyfélkapu login webview.
+  jdkWithFX = openjdk.override {
+    enableJavaFX = true;
+    openjfx = openjfx.override { withWebKit = true; };
+  };
+
+  extraClasspath = [
    # ÁNYK uses some SOAP stuff that's not shipped with OpenJDK any more.
    # We don't really want to use openjdk8 because it's unusable on HiDPI
    # and people are more likely to have a modern OpenJDK installed.
-  extraClasspath = [
    (fetchurl {
      url = "mirror://maven/org/glassfish/metro/webservices-rt/2.4.10/webservices-rt-2.4.10.jar";
      hash = "sha256-lHclIZn3HR2B2lMttmmQGIV67qJi5KhL5jT2WNUQpPI=";
@ -43,7 +50,7 @@ let
      hash = "sha256-ueJLfdbgdJVWLqllMb4xMMltuk144d/Yitu96/QzKHE=";
    })

-    # Patch one of the classes so it works with the packages above by removing .internal. from the package names.
+    # Patch one of the ÁNYK classes so it works with the packages above by removing .internal. from the package names.
    (runCommandLocal "anyk-patch" {} ''
      mkdir $out
      cd $out
@ -83,7 +90,7 @@ let
      SCALING_PROP="-Dsun.java2d.uiScale=''${WINDOW_SCALING_FACTOR}"
    fi
    # ÁNYK crashes with NullPointerException with the GTK look and feel so use the cross-platform one.
-    exec ${openjdk}/bin/java -Dswing.systemlaf=javax.swing.plaf.metal.MetalLookAndFeel $SCALING_PROP "$@"
+    exec ${jdkWithFX}/bin/java -Dswing.systemlaf=javax.swing.plaf.metal.MetalLookAndFeel $SCALING_PROP "$@"
  '';
 in stdenv.mkDerivation {
  pname = "anyk";
--- a/pkgs/by-name/as/astro-language-server/package.nix
+++ b/pkgs/by-name/as/astro-language-server/package.nix
@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
      pnpmWorkspace
      prePnpmInstall
      ;
-    hash = "sha256-zCCDlwsKPZQVEYrv85WcMY2JlWgz0tD6iHLSJg1RkRU=";
+    hash = "sha256-WSnXMVWuE6VC75a1bhZHGyUg6r1yMBvoQZeKdIYE7QI=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/au/autoprefixer/package.nix
+++ b/pkgs/by-name/au/autoprefixer/package.nix
@ -24,7 +24,7 @@

  pnpmDeps = pnpm_9.fetchDeps {
    inherit (finalAttrs) pname version src;
-    hash = "sha256-AKOcKly8uBohhxx9nSo8rMrm0Ebk06LHZ1Yt9yoZj7g=";
+    hash = "sha256-Gu2DRDx0YRlSb+EInOfmAOYKvOba6Lq1wkOW9t9fnbA=";
  };

  installPhase = ''
--- a/pkgs/by-name/bu/bustools/package.nix
+++ b/pkgs/by-name/bu/bustools/package.nix
@ -0,0 +1,44 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  zlib,
+  testers,
+  bustools,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "bustools";
+  version = "0.44.0";
+
+  src = fetchFromGitHub {
+    owner = "BUStools";
+    repo = "bustools";
+    rev = "v${version}";
+    sha256 = "sha256-chdHwwnhHFGJLu4KZmFJp3SZ26GFnbelm3Qz0yeKoBs=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [ zlib ];
+
+  passthru.tests.version = testers.testVersion {
+    package = bustools;
+    command = "bustools version";
+  };
+
+  meta = {
+    description = "bustools is a program for manipulating BUS files for single cell RNA-Seq datasets";
+    longDescription = ''
+      bustools is a program for manipulating BUS files for single cell RNA-Seq datasets. It can be used to error correct barcodes, collapse UMIs, produce gene count or transcript compatibility count matrices, and is useful for many other tasks. It is also part of the kallisto | bustools workflow for pre-processing single-cell RNA-seq data.
+    '';
+    homepage = "https://www.kallistobus.tools/";
+    downloadPage = "https://bustools.github.io/download";
+    changelog = "https://github.com/BUStools/bustools/releases/tag/v${version}";
+    maintainers = [ lib.maintainers.dflores ];
+    license = lib.licenses.bsd2;
+    mainProgram = "bustools";
+    platforms = lib.platforms.unix;
+  };
+}
--- a/pkgs/by-name/cl/clash-verge-rev/webui.nix
+++ b/pkgs/by-name/cl/clash-verge-rev/webui.nix
@ -12,7 +12,7 @@ stdenv.mkDerivation {
  pname = "${pname}-webui";
  pnpmDeps = pnpm.fetchDeps {
    inherit pname version src;
-    hash = "sha256-DYsx1X1yXYEPFuMlvZtbJdefcCR8/wSUidFwsMy8oLk=";
+    hash = "sha256-ZKDhBdVyLIPf7CQaYUvj9dJd3lA3zsqroSjTyvOmunQ=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/cr/crabfit-api/package.nix
+++ b/pkgs/by-name/cr/crabfit-api/package.nix
@ -68,7 +68,9 @@ rustPlatform.buildRustPackage rec {

  PROTOC = "${protobuf}/bin/protoc";

-  passthru.tests = [ nixosTests.crabfit ];
+  passthru.tests = {
+    inherit (nixosTests) crabfit;
+  };

  meta = {
    description = "Enter your availability to find a time that works for everyone";
--- a/pkgs/by-name/cr/crabfit-frontend/package.nix
+++ b/pkgs/by-name/cr/crabfit-frontend/package.nix
@ -107,7 +107,9 @@ stdenv.mkDerivation (finalAttrs: {
    ln -s /var/cache/crabfit $out/standalone/.next/cache
  '';

-  passthru.tests = [ nixosTests.crabfit ];
+  passthru.tests = {
+    inherit (nixosTests) crabfit;
+  };

  meta = {
    description = "Enter your availability to find a time that works for everyone";
--- a/pkgs/by-name/cu/cups-brother-hl3170cdw/package.nix
+++ b/pkgs/by-name/cu/cups-brother-hl3170cdw/package.nix
@ -0,0 +1,111 @@
+{lib, stdenv, fetchurl, dpkg, makeWrapper, gnused, coreutils, psutils, gnugrep, ghostscript, file, a2ps, gawk, which, pkgsi686Linux }:
+
+stdenv.mkDerivation rec {
+  pname = "cups-brother-${model}";
+  version = "1.1.4-0";
+  lprVersion = "1.1.2-1";
+
+  model = "hl3170cdw";
+  cupsFileNo = "006743";
+  lprFileNo = "007056";
+
+  src = fetchurl {
+    url = "https://download.brother.com/welcome/dlf${cupsFileNo}/${model}_cupswrapper_GPL_source_${version}.tar.gz";
+    hash = "sha256-E3GSwiMRkuiCIJYkDozoYUPfOqvopPqPPQt1uaMDEAU=";
+  };
+
+  lprdeb = fetchurl {
+    url = "https://download.brother.com/welcome/dlf${lprFileNo}/${model}lpr-${lprVersion}.i386.deb";
+    hash = "sha256-N1GjQHth5k4qhbfWLInzub9DcNsee4gKc3EW2WIfrko=";
+  };
+
+  nativeBuildInputs = [ makeWrapper dpkg ];
+
+  preUnpack = ''
+    dpkg-deb -x ${lprdeb} $out
+  '';
+
+  prePatch = ''
+    substituteInPlace brcupsconfig/brcups_commands.h \
+      --replace-fail "brprintconf[30]=\"" "brprintconf[130]=\"$out/usr/bin/"
+
+    substituteInPlace brcupsconfig/brcupsconfig.c \
+      --replace-fail "exec[300]" "exec[400]"
+  '';
+
+  makeFlags = [ "-C brcupsconfig" ];
+
+  installPhase = ''
+    runHook preInstall
+
+    # cups install
+    dir=$out/opt/brother/Printers/${model}
+
+    # Extract the true brother_lpdwrapper_MODEL filter embedded in cupswrapperMODEL by
+    # slicing out the relevant parts for the writing the embedded file, then running that.
+    sed -n -e '/tmp_filter=/c\tmp_filter=lpdwrapper'  -e ' 1,/device_model=/p ; /<<!ENDOFWFILTER/,/!ENDOFWFILTER/p ; ' \
+      cupswrapper/cupswrapper${model} > lpdwrapperbuilder
+    sh lpdwrapperbuilder
+    chmod +x lpdwrapper
+    mkdir -p $out/lib/cups/filter
+    cp lpdwrapper $out/lib/cups/filter/brother_lpdwrapper_${model}
+
+    mkdir -p $out/share/cups/model/Brother
+    cp PPD/brother_${model}_printer_en.ppd $out/share/cups/model/Brother/brother_${model}_printer_en.ppd
+
+    mkdir -p $dir/cupswrapper/
+    cp brcupsconfig/brcupsconfpt1 $dir/cupswrapper/
+
+    runHook postInstall
+  '';
+
+  preFixup = ''
+    # lpr fixup
+    interpreter=${pkgsi686Linux.glibc.out}/lib/ld-linux.so.2
+
+    substituteInPlace $dir/lpd/filter${model} \
+      --replace-fail /opt "$out/opt"
+    substituteInPlace $dir/inf/setupPrintcapij \
+      --replace-fail /opt "$out/opt" \
+      --replace-fail printcap.local printcap
+
+    wrapProgram $dir/lpd/filter${model} \
+      --prefix PATH ":" ${ lib.makeBinPath [ ghostscript a2ps file gnused coreutils ] }
+
+    wrapProgram $dir/inf/setupPrintcapij \
+      --prefix PATH ":" ${ lib.makeBinPath [ coreutils gnused ] }
+
+    wrapProgram $dir/lpd/psconvertij2 \
+      --prefix PATH ":" ${ lib.makeBinPath [ ghostscript gnused coreutils gawk which ] }
+
+    patchelf --set-interpreter "$interpreter" "$dir/lpd/br${model}filter"
+    patchelf --set-interpreter "$interpreter" "$out/usr/bin/brprintconf_${model}"
+
+    wrapProgram $dir/lpd/br${model}filter \
+      --set LD_PRELOAD "${pkgsi686Linux.libredirect}/lib/libredirect.so" \
+      --set NIX_REDIRECTS "/opt=$out/opt"
+
+    wrapProgram $out/usr/bin/brprintconf_${model} \
+      --set LD_PRELOAD "${pkgsi686Linux.libredirect}/lib/libredirect.so" \
+      --set NIX_REDIRECTS "/opt=$out/opt"
+
+    # cups fixup
+    substituteInPlace $out/lib/cups/filter/brother_lpdwrapper_${model} \
+      --replace-fail /opt/brother/Printers/${model} "$dir" \
+      --replace-fail /usr/bin/psnup "${psutils}/bin/psnup" \
+      --replace-fail /usr/share/cups/model/Brother "$out/share/cups/model/Brother"
+
+    wrapProgram $out/lib/cups/filter/brother_lpdwrapper_${model} \
+      --prefix PATH ":" ${ lib.makeBinPath [ coreutils psutils gnused gnugrep ] }
+  '';
+
+  meta = with lib; {
+    homepage = "https://www.brother.com/";
+    description = "Brother ${model} printer driver";
+    sourceProvenance = with sourceTypes; [ binaryNativeCode fromSource ];
+    license = with licenses; [ unfree gpl2Plus ];
+    platforms = [ "x86_64-linux" "i686-linux" ];
+    downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=${model}_all&os=128";
+    maintainers = with maintainers; [ luna_1024 ];
+  };
+}
--- a/pkgs/by-name/ed/eduke32/convert-bmp-to-png.diff
+++ b/pkgs/by-name/ed/eduke32/convert-bmp-to-png.diff
--- a/pkgs/by-name/ed/eduke32/package.nix
+++ b/pkgs/by-name/ed/eduke32/package.nix
@ -0,0 +1,195 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  makeWrapper,
+  pkg-config,
+  nasm,
+  makeDesktopItem,
+  copyDesktopItems,
+  alsa-lib,
+  flac,
+  gtk2,
+  libvorbis,
+  libvpx,
+  libGL,
+  SDL2,
+  SDL2_mixer,
+  darwin,
+  graphicsmagick,
+}:
+
+let
+  inherit (darwin.apple_sdk.frameworks)
+    AGL
+    Cocoa
+    GLUT
+    OpenGL
+    ;
+  wrapper = "eduke32-wrapper";
+  swWrapper = "voidsw-wrapper";
+  furyWrapper = "fury-wrapper";
+
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "eduke32";
+  version = "0-unstable-2024-07-26";
+
+  src = fetchFromGitLab {
+    domain = "voidpoint.io";
+    owner = "terminx";
+    repo = "eduke32";
+    rev = "19c21b9ab10b0c17147c9ad951cc15279ed33f77";
+    hash = "sha256-lwnx2tVjbHouB0vaT7Dh1Ozea8+7Az6e4Wn6HmxDxCo=";
+  };
+
+  patches = [
+    # gdk-pixbuf-csource no longer supports bmp so convert to png
+    # patch GNUMakefile to use graphicsmagick to convert bmp -> png
+    ./convert-bmp-to-png.diff
+  ];
+
+  buildInputs =
+    [
+      flac
+      libvorbis
+      libvpx
+      SDL2
+      SDL2_mixer
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      alsa-lib
+      gtk2
+      libGL
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      AGL
+      Cocoa
+      GLUT
+      OpenGL
+    ];
+
+  nativeBuildInputs =
+    [
+      makeWrapper
+      pkg-config
+      copyDesktopItems
+      graphicsmagick
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.system == "i686-linux") [
+      nasm
+    ];
+
+  postPatch =
+    ''
+      substituteInPlace source/imgui/src/imgui_impl_sdl2.cpp \
+        --replace-fail '#include <SDL.h>' '#include <SDL2/SDL.h>' \
+        --replace-fail '#include <SDL_syswm.h>' '#include <SDL2/SDL_syswm.h>' \
+        --replace-fail '#include <SDL_vulkan.h>' '#include <SDL2/SDL_vulkan.h>'
+    ''
+    + lib.optionalString stdenv.hostPlatform.isLinux ''
+      for f in glad.c glad_wgl.c ; do
+        substituteInPlace source/glad/src/$f \
+          --replace-fail libGL.so ${libGL}/lib/libGL.so
+      done
+    '';
+
+  makeFlags = [
+    "SDLCONFIG=${SDL2}/bin/sdl2-config"
+    # git rev-list --count HEAD
+    "VC_REV=10593"
+    "VC_HASH=${lib.substring 0 9 finalAttrs.src.rev}"
+    "VC_BRANCH=master"
+  ];
+
+  buildFlags = [
+    "duke3d"
+    "sw"
+  ];
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "eduke32";
+      icon = "eduke32";
+      exec = "${wrapper}";
+      comment = "Duke Nukem 3D port";
+      desktopName = "Enhanced Duke Nukem 3D";
+      genericName = "Duke Nukem 3D port";
+      categories = [ "Game" ];
+    })
+    (makeDesktopItem {
+      name = "voidsw";
+      icon = "voidsw";
+      exec = "${swWrapper}";
+      comment = "Shadow Warrior eduke32 source port";
+      desktopName = "VoidSW";
+      genericName = "Shadow Warrior source port";
+      categories = [ "Game" ];
+    })
+    (makeDesktopItem {
+      name = "fury";
+      icon = "fury";
+      exec = "${furyWrapper}";
+      comment = "Ion Fury eduke32 source port";
+      desktopName = "Ion Fury";
+      genericName = "Ion Fury source port";
+      categories = [ "Game" ];
+    })
+  ];
+
+  enableParallelBuilding = true;
+
+  installPhase =
+    ''
+      runHook preInstall
+
+      install -Dm755 -t $out/bin eduke32 mapster32 voidsw wangulator
+    ''
+    + lib.optionalString stdenv.hostPlatform.isLinux ''
+      makeWrapper $out/bin/eduke32 $out/bin/${wrapper} \
+        --set-default EDUKE32_DATA_DIR /var/lib/games/eduke32 \
+        --add-flags '-j"$EDUKE32_DATA_DIR"' \
+        --add-flags '-gamegrp DUKE3D.GRP'
+      makeWrapper $out/bin/voidsw $out/bin/${swWrapper} \
+        --set-default EDUKE32_DATA_DIR /var/lib/games/eduke32 \
+        --add-flags '-j"$EDUKE32_DATA_DIR"'
+      makeWrapper $out/bin/eduke32 $out/bin/${furyWrapper} \
+        --set-default EDUKE32_DATA_DIR /var/lib/games/eduke32 \
+        --add-flags '-j"$EDUKE32_DATA_DIR"' \
+        --add-flags '-gamegrp FURY.GRP'
+      mkdir -p $out/share/icons/hicolor/scalable/apps
+      gm convert "./source/duke3d/rsrc/game_icon.ico[10]" $out/share/icons/hicolor/scalable/apps/eduke32.png
+      install -Dm644 ./source/sw/rsrc/game_icon.svg $out/share/icons/hicolor/scalable/apps/voidsw.svg
+      gm convert "./source/duke3d/rsrc/fury/game_icon.ico[4]" $out/share/icons/hicolor/scalable/apps/fury.png
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      mkdir -p $out/Applications/EDuke32.app/Contents/MacOS
+      mkdir -p $out/Applications/Mapster32.app/Contents/MacOS
+      mkdir -p $out/Applications/VoidSW.app/Contents/MacOS
+      mkdir -p $out/Applications/Wangulator.app/Contents/MacOS
+
+      cp -r platform/Apple/bundles/EDuke32.app/* $out/Applications/EDuke32.app/
+      cp -r platform/Apple/bundles/Mapster32.app/* $out/Applications/Mapster32.app/
+      cp -r platform/Apple/bundles/VoidSW.app/* $out/Applications/VoidSW.app/
+      cp -r platform/Apple/bundles/Wangulator.app/* $out/Applications/Wangulator.app/
+
+      ln -sf $out/bin/eduke32 $out/Applications/EDuke32.app/Contents/MacOS/eduke32
+      ln -sf $out/bin/mapster32 $out/Applications/Mapster32.app/Contents/MacOS/mapster32
+      ln -sf $out/bin/voidsw $out/Applications/VoidSW.app/Contents/MacOS/voidsw
+      ln -sf $out/bin/wangulator $out/Applications/Wangulator.app/Contents/MacOS/wangulator
+    ''
+    + ''
+      runHook postInstall
+    '';
+
+  meta = {
+    description = "Enhanched port of Duke Nukem 3D for various platforms";
+    homepage = "http://eduke32.com";
+    license = with lib.licenses; [ gpl2Plus ];
+    maintainers = with lib.maintainers; [
+      qubitnano
+      sander
+    ];
+    platforms = lib.platforms.all;
+  };
+})
--- a/pkgs/by-name/en/en-croissant/package.nix
+++ b/pkgs/by-name/en/en-croissant/package.nix
@ -37,7 +37,7 @@ buildRustPackage rec {

  pnpmDeps = pnpm_9.fetchDeps {
    inherit pname version src;
-    hash = "sha256-hjSioKpvrGyo5UKvBrwln0S3aIpnJZ2PUdzBfbT7IC4=";
+    hash = "sha256-hvWXSegUWJvwCU5NLb2vqnl+FIWpCLxw96s9NUIgJTI=";
  };

  cargoLock = {
--- a/pkgs/by-name/en/envoy/0001-nixpkgs-use-system-Python.patch
+++ b/pkgs/by-name/en/envoy/0001-nixpkgs-use-system-Python.patch
@ -1,7 +1,7 @@
-From 07af89ac82e0c5876590f89284795bffa4b0e1c8 Mon Sep 17 00:00:00 2001
+From 47406ebaf0260e5b66a92baac3717936c8386b69 Mon Sep 17 00:00:00 2001
 From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
 Date: Mon, 22 Apr 2024 11:52:59 +0200
-Subject: [PATCH 1/3] nixpkgs: use system Python
+Subject: [PATCH] nixpkgs: use system Python

 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
 ---
@ -10,13 +10,13 @@ Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
 2 files changed, 5 insertions(+), 23 deletions(-)

 diff --git a/bazel/python_dependencies.bzl b/bazel/python_dependencies.bzl
-index b015e851c0..53a2c93c59 100644
+index 9f2b336b1a..53a2c93c59 100644
 --- a/bazel/python_dependencies.bzl
 +++ b/bazel/python_dependencies.bzl
@@ -1,28 +1,25 @@
 load("@com_google_protobuf//bazel:system_python.bzl", "system_python")
 -load("@envoy_toolshed//:packages.bzl", "load_packages")
-load("@python3_11//:defs.bzl", "interpreter")
+-load("@python3_12//:defs.bzl", "interpreter")
 load("@rules_python//python:pip.bzl", "pip_parse")
 
 def envoy_python_dependencies():
@ -47,13 +47,13 @@ index b015e851c0..53a2c93c59 100644
         extra_pip_args = ["--require-hashes"],
     )
 diff --git a/bazel/repositories_extra.bzl b/bazel/repositories_extra.bzl
-index 7fd1dc4095..001de36a16 100644
+index b92dd461ba..cef32b3140 100644
 --- a/bazel/repositories_extra.bzl
 +++ b/bazel/repositories_extra.bzl
@@ -2,19 +2,11 @@ load("@aspect_bazel_lib//lib:repositories.bzl", "aspect_bazel_lib_dependencies")
- load("@com_github_rules_proto_grpc//:repositories.bzl", "rules_proto_grpc_toolchains")
+ load("@bazel_features//:deps.bzl", "bazel_features_deps")
 load("@emsdk//:deps.bzl", emsdk_deps = "deps")
- load("@proxy_wasm_cpp_host//bazel/cargo/wasmtime:crates.bzl", "wasmtime_fetch_remote_crates")
+ load("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:crates.bzl", "crate_repositories")
 -load("@rules_python//python:repositories.bzl", "py_repositories", "python_register_toolchains")
 +load("@rules_python//python:repositories.bzl", "py_repositories")
 load("//bazel/external/cargo:crates.bzl", "raze_fetch_remote_crates")
@ -62,17 +62,17 @@ index 7fd1dc4095..001de36a16 100644
 -    return "_".join(python_version.split(".")[:-1])
 -
 -# Python version for `rules_python`
-PYTHON_VERSION = "3.11.9"
+-PYTHON_VERSION = "3.12.3"
 -PYTHON_MINOR_VERSION = _python_minor_version(PYTHON_VERSION)
 -
 # Envoy deps that rely on a first stage of dependency loading in envoy_dependencies().
 def envoy_dependencies_extra(
 -        python_version = PYTHON_VERSION,
         ignore_root_user_error = False):
+     bazel_features_deps()
     emsdk_deps()
-     raze_fetch_remote_crates()
@@ -22,11 +14,4 @@ def envoy_dependencies_extra(
-     rules_proto_grpc_toolchains()
+     crate_repositories()
     py_repositories()
 
 -    # Registers underscored Python minor version - eg `python3_10`
@ -83,6 +83,3 @@ index 7fd1dc4095..001de36a16 100644
 -    )
 -
     aspect_bazel_lib_dependencies()
-- 
-2.45.1
-
--- a/pkgs/by-name/en/envoy/0002-nixpkgs-use-system-Go.patch
+++ b/pkgs/by-name/en/envoy/0002-nixpkgs-use-system-Go.patch
@ -1,41 +1,23 @@
-From 06b51e6a0c14e5ad7cfc1dc801561e6e6e1b2014 Mon Sep 17 00:00:00 2001
+From 4be181e96199529a36e9a93c837af7173c827493 Mon Sep 17 00:00:00 2001
 From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
 Date: Mon, 22 Apr 2024 11:58:00 +0200
-Subject: [PATCH 2/3] nixpkgs: use system Go
+Subject: [PATCH] nixpkgs: use system Go

 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
 ---
 bazel/dependency_imports.bzl | 2 +-
- bazel/repositories.bzl       | 3 ---
- 2 files changed, 1 insertion(+), 4 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl
-index 1bf6c54a25..4e55a129e4 100644
+index c68eb4bf3e..addee4f6af 100644
 --- a/bazel/dependency_imports.bzl
 +++ b/bazel/dependency_imports.bzl
-@@ -18,7 +18,7 @@ load("@rules_rust//rust:defs.bzl", "rust_common")
+@@ -20,7 +20,7 @@ load("@rules_rust//rust:defs.bzl", "rust_common")
 load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_register_toolchains", "rust_repository_set")
 
 # go version for rules_go
-GO_VERSION = "1.20"
+-GO_VERSION = "1.23.1"
 +GO_VERSION = "host"
 
 JQ_VERSION = "1.7"
 YQ_VERSION = "4.24.4"
-diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
-index 02f7abd725..aad9adac24 100644
--- a/bazel/repositories.bzl
-+++ b/bazel/repositories.bzl
-@@ -246,9 +246,6 @@ def _go_deps(skip_targets):
-     if "io_bazel_rules_go" not in skip_targets:
-         external_http_archive(
-             name = "io_bazel_rules_go",
-            # TODO(wrowe, sunjayBhatia): remove when Windows RBE supports batch file invocation
-            patch_args = ["-p1"],
-            patches = ["@envoy//bazel:rules_go.patch"],
-         )
-         external_http_archive("bazel_gazelle")
- 
-- 
-2.45.1
-
--- a/pkgs/by-name/en/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch
+++ b/pkgs/by-name/en/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch
@ -1,7 +1,7 @@
-From 1213bbf5583c6615f719e0acf5f568e08bca5b35 Mon Sep 17 00:00:00 2001
+From 3ecb08a7603a07310d1a38c0f47bc54bbe1f11c8 Mon Sep 17 00:00:00 2001
 From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
 Date: Mon, 22 Apr 2024 11:59:22 +0200
-Subject: [PATCH 3/3] nixpkgs: use system C/C++ toolchains
+Subject: [PATCH] nixpkgs: use system C/C++ toolchains

 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
 ---
@ -9,10 +9,10 @@ Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
 1 file changed, 5 insertions(+), 1 deletion(-)

 diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl
-index 4e55a129e4..6c2a5f0d82 100644
+index addee4f6af..dc1967e43b 100644
 --- a/bazel/dependency_imports.bzl
 +++ b/bazel/dependency_imports.bzl
-@@ -24,7 +24,11 @@ JQ_VERSION = "1.7"
+@@ -26,7 +26,11 @@ JQ_VERSION = "1.7"
 YQ_VERSION = "4.24.4"
 
 def envoy_dependency_imports(go_version = GO_VERSION, jq_version = JQ_VERSION, yq_version = YQ_VERSION):
@ -25,6 +25,3 @@ index 4e55a129e4..6c2a5f0d82 100644
     go_rules_dependencies()
     go_register_toolchains(go_version)
     if go_version != "host":
-- 
-2.45.1
-
--- a/pkgs/by-name/en/envoy/bazel_nix.BUILD.bazel
+++ b/pkgs/by-name/en/envoy/bazel_nix.BUILD.bazel
@ -0,0 +1,54 @@
+load("@bazel_tools//tools/sh:sh_toolchain.bzl", "sh_toolchain")
+load("@rules_rust//rust:toolchain.bzl", "rust_toolchain")
+
+toolchains = {
+    "x86_64": "x86_64-unknown-linux-gnu",
+    "aarch64": "aarch64-unknown-linux-gnu",
+}
+
+exports_files(["cargo", "rustdoc", "ruststd", "rustc"])
+
+[
+    rust_toolchain(
+        name = "rust_nix_" + k + "_impl",
+        binary_ext = "",
+        dylib_ext = ".so",
+        exec_triple = v,
+        cargo = ":cargo",
+        rust_doc = ":rustdoc",
+        rust_std = ":ruststd",
+        rustc = ":rustc",
+        stdlib_linkflags = ["-ldl", "-lpthread"],
+        staticlib_ext = ".a",
+        target_triple = v,
+    )
+    for k, v in toolchains.items()
+]
+
+[
+    toolchain(
+        name = "rust_nix_" + k,
+        exec_compatible_with = [
+            "@platforms//cpu:" + k,
+            "@platforms//os:linux",
+        ],
+        target_compatible_with = [
+            "@platforms//cpu:" + k,
+            "@platforms//os:linux",
+        ],
+        toolchain = ":rust_nix_" + k + "_impl",
+        toolchain_type = "@rules_rust//rust:toolchain_type",
+    )
+    for k in toolchains.keys()
+]
+
+sh_toolchain(
+    name = "local_sh_impl",
+    path = "@bash@",
+)
+
+toolchain(
+    name = "local_sh",
+    toolchain = ":local_sh_impl",
+    toolchain_type = "@bazel_tools//tools/sh:toolchain_type",
+)
--- a/pkgs/by-name/en/envoy/package.nix
+++ b/pkgs/by-name/en/envoy/package.nix
@ -5,6 +5,10 @@
  buildBazelPackage,
  fetchFromGitHub,
  stdenv,
+  cacert,
+  cargo,
+  rustc,
+  rustPlatform,
  cmake,
  gn,
  go,
@ -25,20 +29,20 @@ let
    # However, the version string is more useful for end-users.
    # These are contained in a attrset of their own to make it obvious that
    # people should update both.
-    version = "1.31.2";
-    rev = "cc4a75482810de4b84c301d13deb551bd3147339";
-    hash = "sha256-mfQpEGLMJV3UKqcUdbhy6/pP1sWut26zjwN6vDE7LmA=";
+    version = "1.32.0";
+    rev = "86dc7ef91ca15fb4957a74bd599397413fc26a24";
+    hash = "sha256-Wcbt62RfaNcTntmPjaAM0cP3LJangm4ht7Q0bzEpu5A=";
  };

  # these need to be updated for any changes to fetchAttrs
  depsHash =
    {
-      x86_64-linux = "sha256-9KXZdSvRfi5mWOSotG//+ljsx64I4bYwzbeQFuCIwDE=";
-      aarch64-linux = "sha256-knrCfUYUL+bYuHSNrNeX3SwoGDf2rLYNXuukEmj4BjA=";
+      x86_64-linux = "sha256-LkDNPFT7UUCsGPG1dMnwzdIw0lzc5+3JYDoblF5oZVk=";
+      aarch64-linux = "sha256-DkibjmY1YND9Q2aQ41bhNdch0SKM5ghY2mjYSQfV30M=";
    }
    .${stdenv.system} or (throw "unsupported system ${stdenv.system}");
 in
-buildBazelPackage {
+buildBazelPackage rec {
  pname = "envoy";
  inherit (srcVer) version;
  bazel = bazel_6;
@ -58,6 +62,22 @@ buildBazelPackage {
    sed -i 's,#!/usr/bin/env python3,#!${python3}/bin/python,' bazel/foreign_cc/luajit.patch
    sed -i '/javabase=/d' .bazelrc
    sed -i '/"-Werror"/d' bazel/envoy_internal.bzl
+
+    mkdir -p bazel/nix/
+    substitute ${./bazel_nix.BUILD.bazel} bazel/nix/BUILD.bazel \
+      --subst-var-by bash "$(type -p bash)"
+    ln -sf "${cargo}/bin/cargo" bazel/nix/cargo
+    ln -sf "${rustc}/bin/rustc" bazel/nix/rustc
+    ln -sf "${rustc}/bin/rustdoc" bazel/nix/rustdoc
+    ln -sf "${rustPlatform.rustLibSrc}" bazel/nix/ruststd
+    substituteInPlace bazel/dependency_imports.bzl \
+      --replace-fail 'crate_universe_dependencies()' 'crate_universe_dependencies(rust_toolchain_cargo_template="@@//bazel/nix:cargo", rust_toolchain_rustc_template="@@//bazel/nix:rustc")' \
+      --replace-fail 'crates_repository(' 'crates_repository(rust_toolchain_cargo_template="@@//bazel/nix:cargo", rust_toolchain_rustc_template="@@//bazel/nix:rustc",'
+
+    substitute ${./rules_rust_extra.patch} bazel/nix/rules_rust_extra.patch \
+      --subst-var-by bash "$(type -p bash)"
+    cat bazel/nix/rules_rust_extra.patch bazel/rules_rust.patch > bazel/nix/rules_rust.patch
+    mv bazel/nix/rules_rust.patch bazel/rules_rust.patch
  '';

  patches = [
@ -79,14 +99,23 @@ buildBazelPackage {
    jdk
    ninja
    patchelf
+    cacert
  ];

  buildInputs = [ linuxHeaders ];

  fetchAttrs = {
    sha256 = depsHash;
+    env.CARGO_BAZEL_REPIN = true;
    dontUseCmakeConfigure = true;
    dontUseGnConfigure = true;
+    postPatch = ''
+      ${postPatch}
+
+      substituteInPlace bazel/dependency_imports.bzl \
+        --replace-fail 'crate_universe_dependencies(' 'crate_universe_dependencies(bootstrap=True, ' \
+        --replace-fail 'crates_repository(' 'crates_repository(generator="@@cargo_bazel_bootstrap//:cargo-bazel", '
+    '';
    preInstall = ''
      # Strip out the path to the build location (by deleting the comment line).
      find $bazelOut/external -name requirements.bzl | while read requirements; do
@ -113,6 +142,12 @@ buildBazelPackage {

      # fix tcmalloc failure https://github.com/envoyproxy/envoy/issues/30838
      sed -i '/TCMALLOC_GCC_FLAGS = \[/a"-Wno-changes-meaning",' $bazelOut/external/com_github_google_tcmalloc/tcmalloc/copts.bzl
+
+      # Install repinned rules_rust lockfile
+      cp source/extensions/dynamic_modules/sdk/rust/Cargo.Bazel.lock $bazelOut/external/Cargo.Bazel.lock
+
+      # Don't save cargo_bazel_bootstrap or the crate index cache
+      rm -rf $bazelOut/external/cargo_bazel_bootstrap $bazelOut/external/dynamic_modules_rust_sdk_crate_index/.cargo_home $bazelOut/external/dynamic_modules_rust_sdk_crate_index/splicing-output
    '';
  };
  buildAttrs = {
@ -125,7 +160,7 @@ buildBazelPackage {
        file "$execbin" | grep -q ': ELF .*, dynamically linked,' || continue
        patchelf \
          --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \
-          "$execbin"
+          "$execbin" || echo "$execbin"
      done

      ln -s ${bazel-gazelle}/bin $bazelOut/external/bazel_gazelle_go_repository_tools/bin
@ -139,6 +174,9 @@ buildBazelPackage {
        $bazelOut/external/com_github_luajit_luajit/build.py \
        $bazelOut/external/local_config_sh/BUILD \
        $bazelOut/external/*_pip3/BUILD.bazel
+
+      # Install repinned rules_rust lockfile
+      cp $bazelOut/external/Cargo.Bazel.lock source/extensions/dynamic_modules/sdk/rust/Cargo.Bazel.lock
    '';
    installPhase = ''
      install -Dm0755 bazel-bin/source/exe/envoy-static $out/bin/envoy
@ -162,6 +200,9 @@ buildBazelPackage {
      "--java_runtime_version=local_jdk"
      "--tool_java_runtime_version=local_jdk"

+      # Force use of system Rust.
+      "--extra_toolchains=//bazel/nix:rust_nix_aarch64,//bazel/nix:rust_nix_x86_64"
+
      # undefined reference to 'grpc_core::*Metadata*::*Memento*
      #
      # During linking of the final binary, we see undefined references to grpc_core related symbols.
@ -182,6 +223,9 @@ buildBazelPackage {
  bazelFetchFlags = [
    "--define=wasm=${wasmRuntime}"

+    # Force use of system Rust.
+    "--extra_toolchains=//bazel/nix:rust_nix_aarch64,//bazel/nix:rust_nix_x86_64"
+
    # https://github.com/bazelbuild/rules_go/issues/3844
    "--repo_env=GOPROXY=https://proxy.golang.org,direct"
    "--repo_env=GOSUMDB=sum.golang.org"
--- a/pkgs/by-name/en/envoy/rules_rust_extra.patch
+++ b/pkgs/by-name/en/envoy/rules_rust_extra.patch
@ -0,0 +1,18 @@
+--- crate_universe/src/metadata/cargo_tree_rustc_wrapper.sh
+++ crate_universe/src/metadata/cargo_tree_rustc_wrapper.sh
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
+#!@bash@
+ #
+ # For details, see:
+ # `@rules_rust//crate_universe/src/metadata/cargo_tree_resolver.rs - TreeResolver::create_rustc_wrapper`
+
+--- util/process_wrapper/private/process_wrapper.sh
+++ util/process_wrapper/private/process_wrapper.sh
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
+#!@bash@
+ 
+ set -euo pipefail
+ 
+
--- a/pkgs/by-name/fe/feishin/package.nix
+++ b/pkgs/by-name/fe/feishin/package.nix
@ -11,13 +11,13 @@
 }:
 let
  pname = "feishin";
-  version = "0.10.1";
+  version = "0.11.1";

  src = fetchFromGitHub {
    owner = "jeffvli";
    repo = "feishin";
    rev = "v${version}";
-    hash = "sha256-YdtGhGcG5qVoVa1534NQIbI02gy0pzR9U1PU2lL1u/A=";
+    hash = "sha256-fHaNluLes25P/mSTSYFt97pC6uKYuBI/3PUHc84zoWg=";
  };

  electron = electron_31;
@ -26,7 +26,7 @@ buildNpmPackage {
  inherit pname version;

  inherit src;
-  npmDepsHash = "sha256-3fY0NCswRTnpDDsr1fDK9YZm8TUKCIMJ1+yw38dj0M8=";
+  npmDepsHash = "sha256-8xFB47PJpa+3U+Xy+DEdWoW3/f+naFKtLQsDDVgUccA=";

  npmFlags = [ "--legacy-peer-deps" ];
  makeCacheWritable = true;
@ -60,7 +60,7 @@ buildNpmPackage {
        inherit version;

        src = "${src}/release/app";
-        npmDepsHash = "sha256-YkLT69QU7WMGRe95rfZ8TmnfIdWwtpWaqGY+wU48veQ=";
+        npmDepsHash = "sha256-gufOUBfHTDkIqRTdPqXuuk1ZT0y80y/GyI7ssvHnBYo=";

        npmFlags = [ "--ignore-scripts" ];
        dontNpmBuild = true;
--- a/pkgs/by-name/fo/follow/package.nix
+++ b/pkgs/by-name/fo/follow/package.nix
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {

  pnpmDeps = pnpm.fetchDeps {
    inherit pname version src;
-    hash = "sha256-JFAONU1C8pB2Hu4PJqqdqcXk9Ec+iPiAL8J+dk4oPj0=";
+    hash = "sha256-e9Ui3oIS0wbDLgntF7PQZCll12yvWeKLISXVoK6BjuE=";
  };

  env = {
--- a/pkgs/by-name/gi/gitbutler/package.nix
+++ b/pkgs/by-name/gi/gitbutler/package.nix
@ -51,7 +51,7 @@ rustPlatform.buildRustPackage rec {

  pnpmDeps = pnpm_9.fetchDeps {
    inherit pname version src;
-    hash = "sha256-r2PkNDvOofginL5Y0K+7Qhnsev2zle1q9qraG/ub7Wo=";
+    hash = "sha256-rlEwFwN6DrOJZm1Hzy6qu7rLKQx69rRIqrScx9FExZM=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/go/goofcord/package.nix
+++ b/pkgs/by-name/go/goofcord/package.nix
@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {

  pnpmDeps = pnpm'.fetchDeps {
    inherit (finalAttrs) pname version src;
-    hash = "sha256-8i/ip0ZIo80bLb7UNO/h856CD7i3DV9QaPaNrxhViqE=";
+    hash = "sha256-8dSyU9arSvISc2kDWbg/CP6L4sZjZi/Zv7TZN4ONOjQ=";
  };

  env = {
--- a/pkgs/by-name/gz/gzdoom/package.nix
+++ b/pkgs/by-name/gz/gzdoom/package.nix
@ -28,14 +28,14 @@

 stdenv.mkDerivation rec {
  pname = "gzdoom";
-  version = "4.13.0";
+  version = "4.13.1";

  src = fetchFromGitHub {
    owner = "ZDoom";
    repo = "gzdoom";
    rev = "g${version}";
    fetchSubmodules = true;
-    hash = "sha256-Cm4ww/QXTzRiSojeGtZ+CwAL2oSxKaTaTLiGkcNjxaE=";
+    hash = "sha256-pp05tcXFM2NqAPtOtsUprWyV6RE8MQoRSXyp56yELVI=";
  };

  outputs = [
--- a/pkgs/by-name/ho/homebox/package.nix
+++ b/pkgs/by-name/ho/homebox/package.nix
@ -38,7 +38,7 @@ buildGo123Module {
  pnpmDeps = pnpm.fetchDeps {
    inherit pname version;
    src = "${src}/frontend";
-    hash = "sha256-SyKET+W9Fn1WETzF4KlAtLOzNI/DOavHUbC7Yfv6kFw=";
+    hash = "sha256-fOb3oboNlOv/TpIrs3BsSlxIqNbbtSCE8zLMia2RIDw=";
  };
  pnpmRoot = "../frontend";

--- a/pkgs/by-name/hy/hyprdim/package.nix
+++ b/pkgs/by-name/hy/hyprdim/package.nix
@ -8,16 +8,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "hyprdim";
-  version = "2.2.6";
+  version = "3.0.0";

  src = fetchFromGitHub {
    owner = "donovanglover";
    repo = "hyprdim";
    rev = version;
-    hash = "sha256-zE1GYgS3fFO6Zz1I5zr+ApEux9ndKOeegj2n/rF/4HY=";
+    hash = "sha256-+nzIDtRLVA6CgCtbyeR+TU5euSZQb7wi2187IxLrAmQ=";
  };

-  cargoHash = "sha256-WchQXRlU/fkjnCOeP9E5JXVdM8UZlG3ixfLGHvmezHg=";
+  cargoHash = "sha256-UhlwVZ70t6CSQ4ZoXk0OdUqEVeOVMp+TmOSX5iyNNVI=";

  nativeBuildInputs = [ installShellFiles ];

--- a/pkgs/by-name/is/isc-cron/0000-nixpkgs-specific.diff
+++ b/pkgs/by-name/is/isc-cron/0000-nixpkgs-specific.diff
@ -35,10 +35,10 @@ diff -Naur cron-old/pathnames.h cron-new/pathnames.h
 +#define _PATH_SENDMAIL "@sendmailPath@"
 +
 +#undef _PATH_VI
-+#define _PATH_VI "@VIPATH@"
+#define _PATH_VI "@viPath@"
 +
 +#undef _PATH_DEFPATH
-+#define _PATH_DEFPATH "@DEFPATH@"
+#define _PATH_DEFPATH "@defPath@"
 +
 +/* Nixpkgs-specific patch end */
 +
--- a/pkgs/by-name/is/isc-cron/package.nix
+++ b/pkgs/by-name/is/isc-cron/package.nix
@ -20,8 +20,8 @@ stdenv.mkDerivation (finalAttrs: {
    (substituteAll {
      src = ./0000-nixpkgs-specific.diff;
      inherit sendmailPath;
-      VIPATH = lib.getExe' vim "vim";
-      DEFPATH = lib.concatStringsSep ":" [
+      viPath = lib.getExe' vim "vim";
+      defPath = lib.concatStringsSep ":" [
        "/run/wrappers/bin"
        "/nix/var/nix/profiles/default/bin"
        "/run/current-system/sw/bin"
--- a/pkgs/by-name/le/legcord/package.nix
+++ b/pkgs/by-name/le/legcord/package.nix
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {

  pnpmDeps = pnpm.fetchDeps {
    inherit pname version src;
-    hash = "sha256-UCErcNNGAVOe1CvbYc1OSwPQzXVM5tpUUtBpLXoaQdY=";
+    hash = "sha256-73v8xkidY9IBUFz/M0BYEVGnoVsr3uh3jP0p6T8QBbA=";
  };

  ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
--- a/pkgs/by-name/lu/luaformatter/fix-lib-paths.patch
+++ b/pkgs/by-name/lu/luaformatter/fix-lib-paths.patch
@ -12,7 +12,7 @@ index 4a21b94..0ac7911 100644
 -  ${PROJECT_SOURCE_DIR}/third_party/antlr4/runtime/Cpp/runtime/src
 +  @libargs@/include
 +  @catch2@/include
-+  @yaml-cpp@/include
+  @yamlCpp@/include
 +  @antlr4RuntimeCpp@/include/antlr4-runtime
   ${PROJECT_SOURCE_DIR}/src/
   )
--- a/pkgs/by-name/lu/luaformatter/package.nix
+++ b/pkgs/by-name/lu/luaformatter/package.nix
@ -27,7 +27,8 @@ stdenv.mkDerivation rec {
    (substituteAll {
      src = ./fix-lib-paths.patch;
      antlr4RuntimeCpp = antlr4.runtime.cpp.dev;
-      inherit libargs catch2 yaml-cpp;
+      yamlCpp = yaml-cpp;
+      inherit libargs catch2;
    })
  ];

--- a/pkgs/by-name/lu/lug-helper/package.nix
+++ b/pkgs/by-name/lu/lug-helper/package.nix
@ -12,12 +12,12 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
  name = "lug-helper";
-  version = "2.18";
+  version = "3.0.1";
  src = fetchFromGitHub {
    owner = "starcitizen-lug";
    repo = "lug-helper";
    rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-x6o9hNXadlZrww5+a9xZtNfRwxKuTO/O9M9iYvhMIYc=";
+    hash = "sha256-GL+pPyj3Qz+wmJD59kfGz80LufotPq2KdaLQCkQnCFg=";
  };

  buildInputs = [
@ -45,7 +45,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {

  postInstall = ''
    install -Dm755 lug-helper.sh $out/bin/lug-helper
-    install -Dm644 lug-logo.png $out/share/pixmaps/lug-logo.png
+    install -Dm644 lug-logo.png $out/share/icons/hicolor/256x256/apps/lug-logo.png
+    install -Dm644 rsi-launcher.png $out/share/icons/hicolor/256x256/apps/rsi-launcher.png
    install -Dm644 lib/* -t $out/share/lug-helper

    wrapProgram $out/bin/lug-helper \
--- a/pkgs/by-name/me/metacubexd/package.nix
+++ b/pkgs/by-name/me/metacubexd/package.nix
@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {

  pnpmDeps = pnpm.fetchDeps {
    inherit (finalAttrs) pname version src;
-    hash = "sha256-yH7L3lb/7mfz73pWBvPCSvAlQ8hlZu+u6yLEZql8D/4=";
+    hash = "sha256-OFcXsAFMwY6BnyEVK9Px1g17CHCQWyPpr1My7u3XPpU=";
  };

  buildPhase = ''
--- a/pkgs/by-name/mi/misskey/package.nix
+++ b/pkgs/by-name/mi/misskey/package.nix
@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
  # https://nixos.org/manual/nixpkgs/unstable/#javascript-pnpm
  pnpmDeps = pnpm.fetchDeps {
    inherit (finalAttrs) pname version src;
-    hash = "sha256-ZEBrYqLc0+yKbroSWk01UZwA97CyOVPhqgqFArM2U8g=";
+    hash = "sha256-oH4raw+zIQKY+mydteKkY0LqW+13u1408ibm30j1Wss=";
  };

  buildPhase = ''
--- a/pkgs/by-name/n8/n8n/package.nix
+++ b/pkgs/by-name/n8/n8n/package.nix
@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {

  pnpmDeps = pnpm.fetchDeps {
    inherit (finalAttrs) pname version src;
-    hash = "sha256-OUZpPXXGWW7ceWxpHqjQolCr+OVeVO4DgRwsU8VvgWo=";
+    hash = "sha256-lZLWqlR6xq7DYpnydgJK8gL7WdfZcRU+8Autzh6e7kY=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/oh/oh-my-fish/omf-install
+++ b/pkgs/by-name/oh/oh-my-fish/omf-install
@ -1,6 +1,6 @@
 #!@runtimeShell@

@fish@/bin/fish \
-    @OMF@/share/oh-my-fish/bin/install \
+    @omf@/share/oh-my-fish/bin/install \
    --noninteractive \
-    --offline=@OMF@/share/oh-my-fish
+    --offline=@omf@/share/oh-my-fish
--- a/pkgs/by-name/oh/oh-my-fish/package.nix
+++ b/pkgs/by-name/oh/oh-my-fish/package.nix
@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
    cp -v ${substituteAll {
      name = "omf-install";
      src = ./omf-install;
-      OMF = placeholder "out";
+      omf = placeholder "out";
      inherit fish runtimeShell;
    }} $out/bin/omf-install

--- a/pkgs/by-name/op/openpgp-card-tools/package.nix
+++ b/pkgs/by-name/op/openpgp-card-tools/package.nix
@ -4,6 +4,7 @@
 , fetchFromGitea
 , pkg-config
 , pcsclite
+, dbus
 , testers
 , openpgp-card-tools
 , darwin
@ -11,21 +12,21 @@

 rustPlatform.buildRustPackage rec {
  pname = "openpgp-card-tools";
-  version = "0.11.3";
+  version = "0.11.6";

  src = fetchFromGitea {
    domain = "codeberg.org";
    owner = "openpgp-card";
    repo = "openpgp-card-tools";
    rev = "v${version}";
-    hash = "sha256-htFhNzBuinj9qiTzcW0eia74jvCT/+9b1aLli594JJQ=";
+    hash = "sha256-ZnIJLNg9soRzGEjoRNbUzDUtj71y54t+qTC4QDjiCmM=";
  };

-  cargoHash = "sha256-I2ExtUUM0ZJyhtyzP+IsgiMPMUFVHqPiMHFlvuUMjRc=";
+  cargoHash = "sha256-t+fKCviu9UOz2GHkIBqtSp0vyqXPAR1TuWi4yOYR0Bc=";

  nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ];

-  buildInputs = [ pcsclite ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+  buildInputs = [ pcsclite dbus ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
    darwin.apple_sdk.frameworks.PCSC
    darwin.apple_sdk.frameworks.Security
  ];
--- a/pkgs/by-name/ou/outguess/package.nix
+++ b/pkgs/by-name/ou/outguess/package.nix
@ -1,7 +1,8 @@
-{ fetchFromGitHub
-, stdenv
-, lib
-, autoreconfHook
+{
+  fetchFromGitHub,
+  stdenv,
+  lib,
+  autoreconfHook,
 }:

 stdenv.mkDerivation (finalAttrs: {
@ -11,12 +12,14 @@ stdenv.mkDerivation (finalAttrs: {
  src = fetchFromGitHub {
    owner = "resurrecting-open-source-projects";
    repo = "outguess";
-    rev = finalAttrs.version;
+    rev = "refs/tags/${finalAttrs.version}";
    hash = "sha256-yv01jquPTnVk9fd1tqAt1Lxis+ZHZqdG3NiTFxfoXAE=";
  };

  nativeBuildInputs = [ autoreconfHook ];

+  strictDeps = true;
+
  configureFlags = [ "--with-generic-jconfig" ];

  meta = {
--- a/pkgs/by-name/ov/overlayed/webui.nix
+++ b/pkgs/by-name/ov/overlayed/webui.nix
@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {

  pnpmDeps = pnpm.fetchDeps {
    inherit (finalAttrs) src pname version;
-    hash = "sha256-FBJrVXTgKh8Op7TiZjA/i2LY2OOIKmqGR+GwGUecqVI=";
+    hash = "sha256-YTZ6uT1hcNSh+xhRvOq4q/opMOEksXT/MH3BgCnccrA=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/pg/pgrok/package.nix
+++ b/pkgs/by-name/pg/pgrok/package.nix
@ -29,7 +29,7 @@ buildGoModule {

  pnpmDeps = pnpm.fetchDeps {
    inherit pname version src;
-    hash = "sha256-1PUcISW1pC9+5HZyI9SIDRyhos5f/6aW1wa2z0OKams=";
+    hash = "sha256-xObDEkNGMXcUqX9thAJoE45yzd7f15k2odDWv9X3RRE=";
  };

  vendorHash = "sha256-X5FjzliIJdfJnNaUXBjv1uq5tyjMVjBbnLCBH/P0LFM=";
--- a/pkgs/by-name/pl/plasma-panel-colorizer/package.nix
+++ b/pkgs/by-name/pl/plasma-panel-colorizer/package.nix
@ -4,27 +4,41 @@
  fetchFromGitHub,
  cmake,
  kdePackages,
+  nix-update-script,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "plasma-panel-colorizer";
-  version = "0.5.2";
+  version = "1.0.0";

  src = fetchFromGitHub {
    owner = "luisbocanegra";
    repo = "plasma-panel-colorizer";
    rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-+JweNB+zjbXh6Htyvu2vgogAr5Fl5wDPCpm6GV18NJ0=";
+    hash = "sha256-O+qIsYF0E+9LeiDcOUh8pZVY1rVoMlniju6yLact2Bc=";
  };

  nativeBuildInputs = [
    cmake
    kdePackages.extra-cmake-modules
+  ];
+
+  buildInputs = [
    kdePackages.plasma-desktop
  ];

+  strictDeps = true;
+
+  cmakeFlags = [
+    (lib.cmakeBool "INSTALL_PLASMOID" true)
+    (lib.cmakeBool "BUILD_PLUGIN" true)
+    (lib.cmakeFeature "Qt6_DIR" "${kdePackages.qtbase}/lib/cmake/Qt6")
+  ];
+
  dontWrapQtApps = true;

+  passthru.updateScript = nix-update-script { };
+
  meta = {
    description = "Fully-featured widget to bring Latte-Dock and WM status bar customization features to the default KDE Plasma panel";
    homepage = "https://github.com/luisbocanegra/plasma-panel-colorizer";
--- a/pkgs/by-name/re/renovate/package.nix
+++ b/pkgs/by-name/re/renovate/package.nix
@ -43,7 +43,7 @@ stdenv'.mkDerivation (finalAttrs: {

  pnpmDeps = pnpm_9.fetchDeps {
    inherit (finalAttrs) pname version src;
-    hash = "sha256-zTbwivYqNeArgwA6tePe2vExKoT/iLV3TS5ag8PlRgQ=";
+    hash = "sha256-AdNleEe1wVBfhhoM6xit06ql1xEz/TLhZ7qpofwQ874=";
  };

  env.COREPACK_ENABLE_STRICT = 0;
--- a/pkgs/by-name/rs/rsshub/package.nix
+++ b/pkgs/by-name/rs/rsshub/package.nix
@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {

  pnpmDeps = pnpm.fetchDeps {
    inherit (finalAttrs) pname version src;
-    hash = "sha256-+tlBJGJTkxjsXS0zj6rsn2j4FIQNh70gj8pVdOa3mlU=";
+    hash = "sha256-mAAo4SdJ8cj8aqnbm+azcnxq8lFBvOy3BlSEKz9MA0Q=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/si/siyuan/package.nix
+++ b/pkgs/by-name/si/siyuan/package.nix
@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
      src
      sourceRoot
      ;
-    hash = "sha256-g6O6YE1irE3Hy+Xu7MeH97Oc4bq32IDnfP1VLSiF/U4=";
+    hash = "sha256-ZaurLQlM81lCGdMwvl/1YDzpC/mU08Wlgx4/MAm6un4=";
  };

  sourceRoot = "${finalAttrs.src.name}/app";
--- a/pkgs/by-name/sk/sketchybar-app-font/package.nix
+++ b/pkgs/by-name/sk/sketchybar-app-font/package.nix
@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {

  pnpmDeps = pnpm.fetchDeps {
    inherit (finalAttrs) pname version src;
-    hash = "sha256-u0Rr086p6gotS+p9365+P8uKEqxDNGnWCsZDCaj8eEE=";
+    hash = "sha256-gS1/n4UimdPi79/a1itsh172YtBr2jvRSu+u2C4NZ70=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/sk/skypeforlinux/package.nix
+++ b/pkgs/by-name/sk/skypeforlinux/package.nix
@ -42,8 +42,8 @@ let

  # Please keep the version x.y.0.z and do not update to x.y.76.z because the
  # source of the latter disappears much faster.
-  version = "8.129.0.202";
-  revision = "365";
+  version = "8.130.0.205";
+  revision = "368";

  rpath =
    lib.makeLibraryPath [
@ -103,7 +103,7 @@ let
      fetchurl {
        name = "skypeforlinux-${version}-${revision}.snap";
        url = "https://api.snapcraft.io/api/v1/snaps/download/QRDEfjn4WJYnm0FzDKwqqRZZI77awQEV_${revision}.snap";
-        hash = "sha512-pxLh/dU/RK1H5gjFLB0V4mVddgQkO8ZcJowpNNihECsLaELgoeXmWXflhYFs2G7fdEzNMeujuc4/ZoGCFSZCvw==";
+        hash = "sha512-eDSJQndUDxSsRg9bSevWUih1iXDp3n1kU0RdRAu3GsHeRC/JJx3m4vKxP0F/Rcf2Toxd3MPG2r6Oa1Wa7upcGg==";
      }
    else
      throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";
--- a/pkgs/by-name/st/stylelint-lsp/package.nix
+++ b/pkgs/by-name/st/stylelint-lsp/package.nix
@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {

  pnpmDeps = pnpm_9.fetchDeps {
    inherit (finalAttrs) pname version src;
-    hash = "sha256-/QJ4buPOt5KFJxwsQp7L9WYE1RtODj4LMq21l99QwhA=";
+    hash = "sha256-PVA6sXbiuxqvi9u3sPoeVIJSSpSbFQHQQnTFO3w31WE=";
  };

  buildPhase = ''
--- a/pkgs/by-name/su/surrealist/package.nix
+++ b/pkgs/by-name/su/surrealist/package.nix
@ -85,7 +85,7 @@ in stdenv.mkDerivation (finalAttrs: {

  pnpmDeps = pnpm.fetchDeps {
    inherit (finalAttrs) pname version src;
-    hash = "sha256-zGs1MWJ8TEFuHOoekCNIKQo2PBnp95xLz+R8mzeJXh8=";
+    hash = "sha256-Y14wBYiAsctMf4Ljt7G/twGEQP2nCSDQZVG8otImnIE=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/sy/syncyomi/package.nix
+++ b/pkgs/by-name/sy/syncyomi/package.nix
@ -27,7 +27,7 @@ buildGoModule rec {

    pnpmDeps = pnpm_9.fetchDeps {
      inherit (finalAttrs) pname version src sourceRoot;
-      hash = "sha256-25Bg8sTeH/w25KdfwgZNoqBXz2d5c1QD5vGb33xpTCA=";
+      hash = "sha256-edcZIqshnvM3jJpZWIR/UncI0VCMLq26h/n3VvV/384=";
    };

    nativeBuildInputs = [
--- a/pkgs/by-name/ta/taler-wallet-core/package.nix
+++ b/pkgs/by-name/ta/taler-wallet-core/package.nix
@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {

  pnpmDeps = pnpm.fetchDeps {
    inherit (finalAttrs) pname version src;
-    hash = "sha256-7az1wJ6BK9nPKirtW/fmXo3013JCPf+TNk/aG/mGTfo=";
+    hash = "sha256-+RxTTm5t0/0hLKxhWILzb0qf6aZzbOZJYJenRpX8UdA=";
  };

  buildInputs = [ nodejs ];
--- a/pkgs/by-name/ta/taterclient-ddnet/package.nix
+++ b/pkgs/by-name/ta/taterclient-ddnet/package.nix
@ -0,0 +1,136 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cargo,
+  cmake,
+  ninja,
+  pkg-config,
+  rustPlatform,
+  rustc,
+  curl,
+  freetype,
+  libGLU,
+  libnotify,
+  libogg,
+  libX11,
+  opusfile,
+  pcre,
+  python3,
+  SDL2,
+  sqlite,
+  wavpack,
+  ffmpeg,
+  x264,
+  vulkan-headers,
+  vulkan-loader,
+  glslang,
+  spirv-tools,
+  gtest,
+  darwin,
+}:
+let
+  clientExecutable = "TaterClient-DDNet";
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "taterclient-ddnet";
+  version = "8.6.0";
+
+  src = fetchFromGitHub {
+    owner = "sjrc6";
+    repo = "taterclient-ddnet";
+    rev = finalAttrs.version;
+    hash = "sha256-IfTQRMC2wcEH+KhlADHVIhfavlTN4mfTtlN5+/KojA0=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoTarball {
+    inherit (finalAttrs) pname src version;
+    hash = "sha256-L6NsLC5hg4/MlTfnOITBNoPIoKxlDx5BwXWnV7W4uT0=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+    pkg-config
+    rustc
+    cargo
+    rustPlatform.cargoSetupHook
+  ];
+
+  nativeCheckInputs = [ gtest ];
+
+  buildInputs =
+    [
+      curl
+      libnotify
+      pcre
+      python3
+      sqlite
+      freetype
+      libGLU
+      libogg
+      opusfile
+      SDL2
+      wavpack
+      ffmpeg
+      x264
+      vulkan-loader
+      vulkan-headers
+      glslang
+      spirv-tools
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin (
+      with darwin.apple_sdk.frameworks;
+      [
+        Carbon
+        Cocoa
+        OpenGL
+        Security
+      ]
+    );
+
+  postPatch = ''
+    substituteInPlace src/engine/shared/storage.cpp \
+      --replace-fail /usr/ $out/
+  '';
+
+  cmakeFlags = [
+    "-DAUTOUPDATE=OFF"
+    "-DCLIENT=ON"
+    "-DSERVER=OFF"
+    "-DTOOLS=OFF"
+    "-DCLIENT_EXECUTABLE=${clientExecutable}"
+  ];
+
+  # Tests loop forever on Darwin for some reason
+  doCheck = !stdenv.hostPlatform.isDarwin;
+  checkTarget = "run_tests";
+
+  preFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # Upstream links against <prefix>/lib while it installs this library in <prefix>/lib/ddnet
+    install_name_tool -change "$out/lib/libsteam_api.dylib" "$out/lib/ddnet/libsteam_api.dylib" "$out/bin/${clientExecutable}"
+  '';
+
+  postInstall = ''
+    # Desktop application conflicts with the ddnet package
+    mv "$out/share/applications/ddnet.desktop" "$out/share/applications/taterclient-ddnet.desktop"
+
+    substituteInPlace $out/share/applications/taterclient-ddnet.desktop \
+      --replace-fail "Exec=DDNet" "Exec=${clientExecutable}" \
+      --replace-fail "Name=DDNet" "Name=TaterClient (DDNet)" \
+      --replace-fail "Comment=Launch DDNet" "Comment=Launch ${clientExecutable}"
+  '';
+
+  meta = {
+    description = "Modification of DDNet teeworlds client";
+    homepage = "https://github.com/sjrc6/taterclient-ddnet";
+    changelog = "https://github.com/sjrc6/taterclient-ddnet/releases";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
+      melon
+      theobori
+    ];
+    mainProgram = clientExecutable;
+  };
+})
--- a/pkgs/by-name/va/valuta/package.nix
+++ b/pkgs/by-name/va/valuta/package.nix
@ -15,7 +15,7 @@

 python3Packages.buildPythonApplication rec {
  pname = "valuta";
-  version = "1.2.0";
+  version = "1.3.2";

  pyproject = false;

@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec {
    owner = "ideveCore";
    repo = "Valuta";
    rev = "v${version}";
-    hash = "sha256-ygroF9hlmsjQTocly7CNL6zQi4N6h8va/ZkJ8w8QHms=";
+    hash = "sha256-g2x+pqs7dXdTMSxzSU5TeQtE+Q+tdQ93xaMtUVEE5/U=";
  };

  nativeBuildInputs = [
@ -43,6 +43,7 @@ python3Packages.buildPythonApplication rec {
  ];

  propagatedBuildInputs = with python3Packages; [
+    babel
    dbus-python
    pygobject3
  ];
--- a/pkgs/by-name/ve/vencord/package.nix
+++ b/pkgs/by-name/ve/vencord/package.nix
@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
  pnpmDeps = pnpm.fetchDeps {
    inherit (finalAttrs) pname src;

-    hash = "sha256-bosCE9gBFCcM3Ww6sJmhps/cl4lovXKMieYpkqAMst8=";
+    hash = "sha256-YBWe4MEmFu8cksOIxuTK0deO7q0QuqgOUc9WkUNBwp0=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/ve/vesktop/package.nix
+++ b/pkgs/by-name/ve/vesktop/package.nix
@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
      src
      patches
      ;
-    hash = "sha256-rizJu6v04wFEpJtakC2tfPg/uylz7gAOzJiXvUwdDI4=";
+    hash = "sha256-BOVjbaDbZw6H6X8o945M0Bx6fqnRQjFBviOLkTYVJ1I=";
  };

  nativeBuildInputs =
--- a/pkgs/by-name/vi/vikunja/package.nix
+++ b/pkgs/by-name/vi/vikunja/package.nix
@ -17,7 +17,7 @@ let

    pnpmDeps = pnpm.fetchDeps {
      inherit (finalAttrs) pname version src sourceRoot;
-      hash = "sha256-pp4AZnoI7gON/meZalfXmaliKR/wSjkj9GTX3My678s=";
+      hash = "sha256-D2dOyYsdsNV1ZSQdjpy6rfoix7yBACEHj/2XyHb7HWE=";
    };

    nativeBuildInputs = [
--- a/pkgs/applications/video/vivictpp/default.nix
+++ b/pkgs/applications/video/vivictpp/default.nix
@ -4,10 +4,11 @@
 , SDL2, SDL2_ttf
 , freetype, harfbuzz
 , ffmpeg
-, cacert }:
+, cacert
+, zlib }:

 let
-  version = "1.0.0";
+  version = "1.1.0";
  withSubprojects = stdenv.mkDerivation {
    name = "sources-with-subprojects";

@ -15,7 +16,7 @@ let
      owner = "vivictorg";
      repo = "vivictpp";
      rev = "v${version}";
-      hash = "sha256-dCtMjemEjXe63ELAfQhzJl3GecqWLcjL2y5Htn6hYgU=";
+      hash = "sha256-ScuCOmcK714YXEHncizwj6EWdiNIJA1xRMn5gfmg4K4=";
    };

    nativeBuildInputs = [
@ -33,9 +34,9 @@ let
    '';

    outputHashMode = "recursive";
-    outputHash = "sha256-a7NBQJt5T+KwP8Djc8TQiVLNZF8UcXlXrv2G/dZ54aM=";
+    outputHash = "sha256-/6nuTKjQEXfJlHkTkeX/A4PeGb8SOk6Q801gjx1SB6M=";
  };
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
  pname = "vivictpp";
  inherit version;

@ -57,6 +58,7 @@ in stdenv.mkDerivation rec {
    freetype
    harfbuzz
    ffmpeg
+    zlib
  ];

  preConfigure = ''
--- a/pkgs/by-name/wi/windmill/Cargo.lock
+++ b/pkgs/by-name/wi/windmill/Cargo.lock
--- a/pkgs/by-name/wi/windmill/package.nix
+++ b/pkgs/by-name/wi/windmill/package.nix
@ -1,36 +1,37 @@
-{ lib
-, rustPlatform
-, fetchFromGitHub
-, buildNpmPackage
-, bash
-, cmake
-, cairo
-, deno
-, fetchurl
-, go
-, lld
-, makeWrapper
-, nsjail
-, openssl
-, pango
-, pixman
-, giflib
-, pkg-config
-, python3
-, rustfmt
-, stdenv
-, swagger-cli
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  buildNpmPackage,
+  bash,
+  cmake,
+  cairo,
+  deno,
+  fetchurl,
+  go,
+  lld,
+  makeWrapper,
+  nsjail,
+  openssl,
+  pango,
+  pixman,
+  giflib,
+  pkg-config,
+  python3,
+  rustfmt,
+  stdenv,
+  swagger-cli,
 }:

 let
  pname = "windmill";
-  version = "1.333.2";
+  version = "1.410.3";

  src = fetchFromGitHub {
    owner = "windmill-labs";
    repo = "windmill";
    rev = "v${version}";
-    hash = "sha256-QwjmkKe3jxgXQjj/+WlhOdGOXZsrYdRmHtVakoNqYtI=";
+    hash = "sha256-QPabzgSs+zxgI2dHcMY9ki4jEwm5jQbzwSMaIfBbFG8=";
  };

  pythonEnv = python3.withPackages (ps: [ ps.pip-tools ]);
@ -42,7 +43,7 @@ let

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

-    npmDepsHash = "sha256-I9h2MvngsluWYaoOP44ufE82SFW+8yhNI2qQNi6oyZE=";
+    npmDepsHash = "sha256-3AeDGd/4dGHm8kGKEH3sqNOuQ1LPjP5n4qOEaqVMm0w=";

    # without these you get a
    # FATAL ERROR: Ineffective mark-compacts near heap limit Allocation failed - JavaScript heap out of memory
@ -52,8 +53,16 @@ let
      npm run generate-backend-client
    '';

-    buildInputs = [ pixman cairo pango giflib ];
-    nativeBuildInputs = [ python3 pkg-config ];
+    buildInputs = [
+      pixman
+      cairo
+      pango
+      giflib
+    ];
+    nativeBuildInputs = [
+      python3
+      pkg-config
+    ];

    installPhase = ''
      mkdir -p $out/share
@ -69,11 +78,14 @@ rustPlatform.buildRustPackage {
    SQLX_OFFLINE = "true";
    RUSTY_V8_ARCHIVE =
      let
-        fetch_librusty_v8 = args:
+        fetch_librusty_v8 =
+          args:
          fetchurl {
            name = "librusty_v8-${args.version}";
            url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a";
-            sha256 = args.shas.${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}");
+            sha256 =
+              args.shas.${stdenv.hostPlatform.system}
+                or (throw "Unsupported platform ${stdenv.hostPlatform.system}");
            meta = {
              inherit (args) version;
              sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
@ -94,8 +106,6 @@ rustPlatform.buildRustPackage {
  cargoLock = {
    lockFile = ./Cargo.lock;
    outputHashes = {
-      "archiver-rs-0.5.1" = "sha256-ZIik0mMABmhdx/ullgbOrKH5GAtqcOKq5A6vB7aBSjk=";
-      "pg-embed-0.7.2" = "sha256-R/SrlzNK7aAOyXVTQ/WPkiQb6FyMg9tpsmPTsiossDY=";
      "php-parser-rs-0.1.3" = "sha256-ZeI3KgUPmtjlRfq6eAYveqt8Ay35gwj6B9iOQRjQa9A=";
      "progenitor-0.3.0" = "sha256-F6XRZFVIN6/HfcM8yI/PyNke45FL7jbcznIiqj22eIQ=";
      "rustpython-ast-0.3.1" = "sha256-q9N+z3F6YICQuUMp3a10OS792tCq0GiSSlkcaLxi3Gs=";
@ -151,7 +161,15 @@ rustPlatform.buildRustPackage {
    patchelf --set-rpath ${lib.makeLibraryPath [ openssl ]} $out/bin/windmill

    wrapProgram "$out/bin/windmill" \
-      --prefix PATH : ${lib.makeBinPath [go pythonEnv deno nsjail bash]} \
+      --prefix PATH : ${
+        lib.makeBinPath [
+          go
+          pythonEnv
+          deno
+          nsjail
+          bash
+        ]
+      } \
      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ stdenv.cc.cc.lib ]} \
      --set PYTHON_PATH "${pythonEnv}/bin/python3" \
      --set GO_PATH "${go}/bin/go" \
@ -164,9 +182,16 @@ rustPlatform.buildRustPackage {
    description = "Open-source developer platform to turn scripts into workflows and UIs";
    homepage = "https://windmill.dev";
    license = lib.licenses.agpl3Only;
-    maintainers = with lib.maintainers; [ dit7ya happysalada ];
+    maintainers = with lib.maintainers; [
+      dit7ya
+      happysalada
+    ];
    mainProgram = "windmill";
    # limited by librusty_v8
-    platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
+    # nsjail not available on darwin
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
  };
 }
--- a/pkgs/by-name/wr/wrangler/package.nix
+++ b/pkgs/by-name/wr/wrangler/package.nix
@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {

  pnpmDeps = pnpm_9.fetchDeps {
    inherit (finalAttrs) pname version src;
-    hash = "sha256-ld2+WUVJ2DtiwWmsxkYsU3ft3knHJvjMwSwZlk7reG8=";
+    hash = "sha256-8EItfBV2n2rnXPCTYjDZlr/tdlEn8YOdIzOsj35w5gQ=";
  };

  buildInputs = [
--- a/pkgs/by-name/ze/zenn-cli/package.nix
+++ b/pkgs/by-name/ze/zenn-cli/package.nix
@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {

  pnpmDeps = pnpm_9.fetchDeps {
    inherit (finalAttrs) pname version src;
-    hash = "sha256-FfqBe1WQc6ditizjxYLmjb8mvCjQJMpvyUDdaW29sXY=";
+    hash = "sha256-AjdXclrNl1AHJ4LXq9I5Rk6KGyDaWXW187o2uLwRy/o=";
  };

  preBuild =
--- a/pkgs/desktops/gnome/extensions/extensionOverrides.nix
+++ b/pkgs/desktops/gnome/extensions/extensionOverrides.nix
@ -103,7 +103,7 @@ super: lib.trivial.pipe super [
    nativeBuildInputs = [ wrapGAppsHook3 ];
    patches = [
      (substituteAll {
-        inherit gjs util-linux xdg-utils;
+        inherit gjs;
        util_linux = util-linux;
        xdg_utils = xdg-utils;
        src = ./extensionOverridesPatches/gtk4-ding_at_smedius.gitlab.com.patch;
--- a/pkgs/development/libraries/fftw/default.nix
+++ b/pkgs/development/libraries/fftw/default.nix
@ -85,5 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
      }.${precision}
    ];
    platforms = platforms.unix;
+    # quad-precision requires libquadmath from gfortran, but libquadmath is not supported on aarch64
+    badPlatforms = lib.optionals (precision == "quad-precision") platforms.aarch64;
  };
 })
--- a/pkgs/development/libraries/libportal/default.nix
+++ b/pkgs/development/libraries/libportal/default.nix
@ -1,64 +1,79 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, meson
-, ninja
-, pkg-config
-, gobject-introspection
-, vala
-, gi-docgen
-, glib
-, gtk3
-, gtk4
-, libsForQt5
-, variant ? null
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  meson,
+  ninja,
+  pkg-config,
+  gobject-introspection,
+  vala,
+  gi-docgen,
+  glib,
+  gtk3,
+  gtk4,
+  libsForQt5,
+  qt6Packages,
+  variant ? null,
 }:

-assert variant == null || variant == "gtk3" || variant == "gtk4" || variant == "qt5";
+assert
+  variant == null || variant == "gtk3" || variant == "gtk4" || variant == "qt5" || variant == "qt6";

 stdenv.mkDerivation rec {
  pname = "libportal" + lib.optionalString (variant != null) "-${variant}";
-  version = "0.7.1";
+  version = "0.8.1";

-  outputs = [ "out" "dev" ]
-    ++ lib.optional (variant != "qt5") "devdoc";
+  outputs = [
+    "out"
+    "dev"
+  ] ++ lib.optional (variant != "qt5") "devdoc";

  src = fetchFromGitHub {
    owner = "flatpak";
    repo = "libportal";
    rev = version;
-    sha256 = "sha256-3roZJHnGFM7ClxbB7I/haexPTwYskidz9F+WV3RL9Ho=";
+    sha256 = "sha256-NAkD5pAQpmAtVxsFZt74PwURv+RbGBfqENIwyxEEUSc=";
  };

  depsBuildBuild = [
    pkg-config
  ];

-  nativeBuildInputs = [
+  nativeBuildInputs =
+    [
      meson
      ninja
      pkg-config
      gi-docgen
-  ] ++ lib.optionals (variant != "qt5") [
+    ]
+    ++ lib.optionals (variant != "qt5") [
      gobject-introspection
      vala
    ];

-  propagatedBuildInputs = [
+  propagatedBuildInputs =
+    [
      glib
-  ] ++ lib.optionals (variant == "gtk3") [
+    ]
+    ++ lib.optionals (variant == "gtk3") [
      gtk3
-  ] ++ lib.optionals (variant == "gtk4") [
+    ]
+    ++ lib.optionals (variant == "gtk4") [
      gtk4
-  ] ++ lib.optionals (variant == "qt5") [
+    ]
+    ++ lib.optionals (variant == "qt5") [
      libsForQt5.qtbase
      libsForQt5.qtx11extras
+    ]
+    ++ lib.optionals (variant == "qt6") [
+      qt6Packages.qtbase
    ];

  mesonFlags = [
    (lib.mesonEnable "backend-gtk3" (variant == "gtk3"))
    (lib.mesonEnable "backend-gtk4" (variant == "gtk4"))
    (lib.mesonEnable "backend-qt5" (variant == "qt5"))
+    (lib.mesonEnable "backend-qt6" (variant == "qt6"))
    (lib.mesonBool "vapi" (variant != "qt5"))
    (lib.mesonBool "introspection" (variant != "qt5"))
    (lib.mesonBool "docs" (variant != "qt5")) # requires introspection=true
@ -72,11 +87,11 @@ stdenv.mkDerivation rec {
  # we don't have any binaries
  dontWrapQtApps = true;

-  meta = with lib; {
+  meta = {
    description = "Flatpak portal library";
    homepage = "https://github.com/flatpak/libportal";
-    license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ jtojnar ];
-    platforms = platforms.unix;
+    license = lib.licenses.lgpl3Plus;
+    maintainers = with lib.maintainers; [ jtojnar ];
+    platforms = lib.platforms.unix;
  };
 }
--- a/pkgs/development/libraries/libqofono/0001-NixOS-provide-mobile-broadband-provider-info-path.patch
+++ b/pkgs/development/libraries/libqofono/0001-NixOS-provide-mobile-broadband-provider-info-path.patch
@ -16,7 +16,7 @@ index b5877ed..455167c 100644
     QString provider = providerString;
 
 -    query.setFocus(QUrl("/usr/share/mobile-broadband-provider-info/serviceproviders.xml"));
-+    query.setFocus(QUrl("@mobile-broadband-provider-info@/share/mobile-broadband-provider-info/serviceproviders.xml"));
+    query.setFocus(QUrl("@mobileBroadbandProviderInfo@/share/mobile-broadband-provider-info/serviceproviders.xml"));
 
     if (provider.contains("\'")) {
         provider = provider.replace("\'", "&apos;");
@ -25,7 +25,7 @@ index b5877ed..455167c 100644
 #ifdef QOFONO_PROVISIONING
     QXmlQuery query;
 -    query.setFocus(QUrl("/usr/share/mobile-broadband-provider-info/serviceproviders.xml"));
-+    query.setFocus(QUrl("@mobile-broadband-provider-info@/share/mobile-broadband-provider-info/serviceproviders.xml"));
+    query.setFocus(QUrl("@mobileBroadbandProviderInfo@/share/mobile-broadband-provider-info/serviceproviders.xml"));
 
     QString providerStr = provider;
     if (providerStr.contains("\'")) {
--- a/pkgs/development/libraries/libqofono/default.nix
+++ b/pkgs/development/libraries/libqofono/default.nix
@ -23,7 +23,7 @@ mkDerivation rec {
  patches = [
    (substituteAll {
      src = ./0001-NixOS-provide-mobile-broadband-provider-info-path.patch;
-      inherit mobile-broadband-provider-info;
+      mobileBroadbandProviderInfo = mobile-broadband-provider-info;
    })
    ./0001-NixOS-Skip-tests-they-re-shock-full-of-hardcoded-FHS.patch
  ];
--- a/pkgs/development/libraries/physics/fastnlo-toolkit/default.nix
+++ b/pkgs/development/libraries/physics/fastnlo-toolkit/default.nix
@ -22,6 +22,11 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-7aIMYCOkHC/17CHYiEfrxvtSJxTDivrS7BQ32cGiEy0=";
  };

+  patches = [
+    # Compatibility with YODA 2.x
+    ./yoda2_support.patch
+  ];
+
  buildInputs = [
    boost
    gfortran
--- a/pkgs/development/libraries/physics/fastnlo-toolkit/yoda2_support.patch
+++ b/pkgs/development/libraries/physics/fastnlo-toolkit/yoda2_support.patch
@ -0,0 +1,247 @@
+diff --git a/src/fnlo-tk-statunc.cc b/src/fnlo-tk-statunc.cc
+index 62d1eec..ad62cac 100644
+--- a/src/fnlo-tk-statunc.cc
+++ b/src/fnlo-tk-statunc.cc
+@@ -30,7 +30,16 @@
+ #include "fastnlotk/fastNLOLHAPDF.h"
+ #include "fastnlotk/speaker.h"
+ #ifdef WITH_YODA
+#if defined __has_include
+#if !__has_include("YODA/WriterAIDA.h")
+#define WITH_YODA2
+#endif
+#endif
+#ifdef WITH_YODA2
+#include "YODA/Scatter.h"
+#else
+ #include "YODA/Scatter2D.h"
+#endif
+ #include "YODA/WriterYODA.h"
+ #endif
+ 
+@@ -493,28 +502,25 @@ int main(int argc, char** argv) {
+ 
+    //! --- 1D
+    if (NDim == 1) {
+-      //! Vectors to fill 2D scatter plot
+-      vector < double > x;
+-      vector < double > y;
+-      vector < double > exminus;
+-      vector < double > explus;
+-      vector < double > eyminus;
+-      vector < double > eyplus;
+      //! Vector to fill 2D scatter plot
+      vector<YODA::Point2D> points;
+       //! Loop over bins in outer (1st) dimension
+       for (unsigned int k =0 ; k<NDimBins[0] ; k++) {
+-         x.push_back((bins[iobs].second + bins[iobs].first)/2.0);
+-         explus.push_back((bins[iobs].second - bins[iobs].first)/2.0);
+-         exminus.push_back((bins[iobs].second - bins[iobs].first)/2.0);
+-         y.push_back(xs[iobs]);
+-         eyplus.push_back(dxsu[iobs]);
+-         eyminus.push_back(std::abs(dxsl[iobs]));
+         points.emplace_back(
+            (bins[iobs].second + bins[iobs].first)/2.0,
+            xs[iobs],
+            (bins[iobs].second - bins[iobs].first)/2.0,
+            (bins[iobs].second - bins[iobs].first)/2.0,
+            std::abs(dxsl[iobs]),
+            dxsu[iobs]
+         );
+          iobs++;
+       }
+       stringstream plotno;                                                                         // To make i+1 from int
+       plotno << offset;                                                                            // to a string for the naming
+       //      RivetId.replace( capital_pos +3 - plotno.str().size(), plotno.str().size(), plotno.str());   // Next plot name
+       // Pointer in order not to be deleted after we exit the loop, so we can then save them into the yoda file
+-      YODA::Scatter2D * plot = new YODA::Scatter2D(x,y,exminus,explus,eyminus,eyplus,"/" + RivetId,LineName);
+      YODA::Scatter2D * plot = new YODA::Scatter2D(points, "/" + RivetId, LineName);
+       // Insert the plot pointer into the vector of analysis object pointers
+       aos.push_back(plot);
+    }
+@@ -522,29 +528,26 @@ int main(int argc, char** argv) {
+    else if (NDim == 2) {
+       //! Loop over bins in outer (1st) dimension
+       for (unsigned int j=0; j<NDimBins[0]; j++) {
+-         //! Vectors to fill 2D scatter plot
+-         vector < double > x;
+-         vector < double > y;
+-         vector < double > exminus;
+-         vector < double > explus;
+-         vector < double > eyminus;
+-         vector < double > eyplus;
+         //! Vector to fill 2D scatter plot
+         vector<YODA::Point2D> points;
+          //! Loop over bins in inner (2nd) dimension
+          NDimBins[1] = fnlo.GetNDim1Bins(j);
+          for (unsigned int k = 0; k<NDimBins[1]; k++) {
+-            x.push_back((bins[iobs].second + bins[iobs].first)/2.0);
+-            explus.push_back((bins[iobs].second - bins[iobs].first)/2.0);
+-            exminus.push_back((bins[iobs].second - bins[iobs].first)/2.0);
+-            y.push_back(xs[iobs]);
+-            eyplus.push_back(dxsu[iobs]);
+-            eyminus.push_back(std::abs(dxsl[iobs]));
+            points.emplace_back(
+               (bins[iobs].second + bins[iobs].first)/2.0,
+               xs[iobs],
+               (bins[iobs].second - bins[iobs].first)/2.0,
+               (bins[iobs].second - bins[iobs].first)/2.0,
+               std::abs(dxsl[iobs]),
+               dxsu[iobs]
+            );
+             iobs++;
+          }
+          stringstream plotno;                                                                         // To make i+1 from int
+          plotno << offset+j;                                                                          // to a string for the naming
+          RivetId.replace( capital_pos +3 - plotno.str().size(), plotno.str().size(), plotno.str());   // Next plot name
+          // Pointer in order not to be deleted after we exit the loop, so we can then save them into the yoda file
+-         YODA::Scatter2D * plot = new YODA::Scatter2D(x,y,exminus,explus,eyminus,eyplus,"/" + RivetId,LineName);
+         YODA::Scatter2D * plot = new YODA::Scatter2D(points, "/" + RivetId, LineName);
+          // Insert the plot pointer into the vector of analysis object pointers
+          aos.push_back(plot);
+       }
+diff --git a/src/fnlo-tk-yodaout.cc b/src/fnlo-tk-yodaout.cc
+index 9aa8ac3..dabe924 100644
+--- a/src/fnlo-tk-yodaout.cc
+++ b/src/fnlo-tk-yodaout.cc
+@@ -25,7 +25,16 @@
+ #include "fastnlotk/fastNLOTools.h"
+ #include "fastnlotk/speaker.h"
+ #ifdef WITH_YODA
+#if defined __has_include
+#if !__has_include("YODA/WriterAIDA.h")
+#define WITH_YODA2
+#endif
+#endif
+#ifdef WITH_YODA2
+#include "YODA/Scatter.h"
+#else
+ #include "YODA/Scatter2D.h"
+#endif
+ #include "YODA/WriterYODA.h"
+ #endif
+ 
+@@ -548,26 +557,23 @@ int main(int argc, char** argv) {
+ 
+    //! --- 1D
+    if (NDim == 1) {
+-      //! Vectors to fill 2D scatter plot
+-      vector < double > x;
+-      vector < double > y;
+-      vector < double > exminus;
+-      vector < double > explus;
+-      vector < double > eyminus;
+-      vector < double > eyplus;
+      //! Vector to fill 2D scatter plot
+      vector < YODA::Point2D > points;
+       //! Loop over bins in outer (1st) dimension
+       for (unsigned int k =0 ; k<NDimBins[0] ; k++) {
+-         x.push_back((bins[iobs].second + bins[iobs].first)/2.0);
+-         explus.push_back((bins[iobs].second - bins[iobs].first)/2.0);
+-         exminus.push_back((bins[iobs].second - bins[iobs].first)/2.0);
+-         y.push_back(xs[iobs]);
+-         eyplus.push_back(dxsu[iobs]);
+-         eyminus.push_back(std::abs(dxsl[iobs]));
+         points.emplace_back(
+           (bins[iobs].second + bins[iobs].first)/2.0,
+           xs[iobs],
+           (bins[iobs].second - bins[iobs].first)/2.0,
+           (bins[iobs].second - bins[iobs].first)/2.0,
+           std::abs(dxsl[iobs]),
+           dxsu[iobs]
+         );
+          iobs++;
+       }
+ #ifdef WITH_YODA
+       /// Pointer in order not to be deleted after we exit the loop, so we can then save them into the yoda file
+-      YODA::Scatter2D * plot = new YODA::Scatter2D(x,y,exminus,explus,eyminus,eyplus,"/" + RivetId,LineName);
+      YODA::Scatter2D * plot = new YODA::Scatter2D(points, "/" + RivetId, LineName);
+       /// Insert the plot pointer into the vector of analysis object pointers
+       aos.push_back(plot);
+ #endif
+@@ -577,23 +583,20 @@ int main(int argc, char** argv) {
+       //! Loop over bins in outer (1st) dimension
+       int nhist = 0;
+       for (unsigned int j=0; j<NDimBins[0]; j++) {
+-         //! Vectors to fill 2D scatter plot
+         //! Vector to fill 2D scatter plot
+          nhist++;
+-         vector < double > x;
+-         vector < double > y;
+-         vector < double > exminus;
+-         vector < double > explus;
+-         vector < double > eyminus;
+-         vector < double > eyplus;
+         vector < YODA::Point2D > points;
+          //! Loop over bins in inner (2nd) dimension
+          NDimBins[1] = fnlo->GetNDim1Bins(j);
+          for (unsigned int k = 0; k<NDimBins[1]; k++) {
+-            x.push_back((bins[iobs].second + bins[iobs].first)/2.0);
+-            explus.push_back((bins[iobs].second - bins[iobs].first)/2.0);
+-            exminus.push_back((bins[iobs].second - bins[iobs].first)/2.0);
+-            y.push_back(xs[iobs]);
+-            eyplus.push_back(dxsu[iobs]);
+-            eyminus.push_back(std::abs(dxsl[iobs]));
+            points.emplace_back(
+              (bins[iobs].second + bins[iobs].first)/2.0,
+              xs[iobs],
+              (bins[iobs].second - bins[iobs].first)/2.0,
+              (bins[iobs].second - bins[iobs].first)/2.0,
+              std::abs(dxsl[iobs]),
+              dxsu[iobs]
+            );
+             iobs++;
+          }
+          /// Derive histogram counter
+@@ -610,7 +613,7 @@ int main(int argc, char** argv) {
+          RivetId.replace(capital_pos +3 - histno.str().size(), histno.str().size(), histno.str());
+ #ifdef WITH_YODA
+          /// Pointer in order not to be deleted after we exit the loop, so we can then save the plots into the yoda file
+-         YODA::Scatter2D * plot = new YODA::Scatter2D(x,y,exminus,explus,eyminus,eyplus,"/" + RivetId,LineName);
+         YODA::Scatter2D * plot = new YODA::Scatter2D(points, "/" + RivetId, LineName);
+          /// Insert the plot pointer into the vector of analysis object pointers
+          aos.push_back(plot);
+ #endif
+@@ -624,23 +627,20 @@ int main(int argc, char** argv) {
+          //! Loop over bins in middle (2nd) dimension
+          NDimBins[1] = fnlo->GetNDim1Bins(j);
+          for (unsigned int k = 0; k<NDimBins[1]; k++) {
+-            //! Vectors to fill 2D scatter plot
+            //! Vector to fill 2D scatter plot
+             nhist++;
+-            vector < double > x;
+-            vector < double > y;
+-            vector < double > exminus;
+-            vector < double > explus;
+-            vector < double > eyminus;
+-            vector < double > eyplus;
+            vector < YODA::Point2D > points;
+             //! Loop over bins in inner (3rd) dimension
+             NDimBins[2] = fnlo->GetNDim2Bins(j,k);
+             for (unsigned int l = 0; l<NDimBins[2]; l++) {
+-               x.push_back((bins[iobs].second + bins[iobs].first)/2.0);
+-               explus.push_back((bins[iobs].second - bins[iobs].first)/2.0);
+-               exminus.push_back((bins[iobs].second - bins[iobs].first)/2.0);
+-               y.push_back(xs[iobs]);
+-               eyplus.push_back(dxsu[iobs]);
+-               eyminus.push_back(std::abs(dxsl[iobs]));
+               points.emplace_back(
+                  (bins[iobs].second + bins[iobs].first)/2.0,
+                  xs[iobs],
+                  (bins[iobs].second - bins[iobs].first)/2.0,
+                  (bins[iobs].second - bins[iobs].first)/2.0,
+                  std::abs(dxsl[iobs]),
+                  dxsu[iobs]
+               );
+                iobs++;
+             }
+             /// Derive histogram counter
+@@ -657,7 +657,7 @@ int main(int argc, char** argv) {
+             RivetId.replace(capital_pos +3 - histno.str().size(), histno.str().size(), histno.str());
+ #ifdef WITH_YODA
+             /// Pointer in order not to be deleted after we exit the loop, so we can then save the plots into the yoda file
+-            YODA::Scatter2D * plot = new YODA::Scatter2D(x,y,exminus,explus,eyminus,eyplus,"/" + RivetId,LineName);
+            YODA::Scatter2D * plot = new YODA::Scatter2D(points, "/" + RivetId, LineName);
+             /// Insert the plot pointer into the vector of analysis object pointers
+             aos.push_back(plot);
+ #endif
--- a/pkgs/development/libraries/physics/rivet/default.nix
+++ b/pkgs/development/libraries/physics/rivet/default.nix
@ -1,12 +1,12 @@
-{ lib, stdenv, fetchurl, fastjet, fastjet-contrib, ghostscript, hepmc, imagemagick, less, python3, rsync, texliveBasic, yoda, which, makeWrapper }:
+{ lib, stdenv, fetchurl, fastjet, fastjet-contrib, ghostscript, hdf5, hepmc3, highfive, imagemagick, less, pkg-config, python3, rsync, texliveBasic, yoda, which, makeWrapper }:

 stdenv.mkDerivation rec {
  pname = "rivet";
-  version = "3.1.10";
+  version = "4.0.1";

  src = fetchurl {
    url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2";
-    hash = "sha256-RYuODfHec46ZctJLJg6qCH3xLJnU/p3uU3fUfqakmRk=";
+    hash = "sha256-ToaS1uilOWHHeYPra6SJPDdlzyP3BXieTYZb5Iku/3k=";
  };

  latex = texliveBasic.withPackages (ps: with ps; [
@ -25,43 +25,43 @@ stdenv.mkDerivation rec {
    xstring
  ]);

-  nativeBuildInputs = [ rsync makeWrapper ];
-  buildInputs = [ hepmc imagemagick python3 latex python3.pkgs.yoda ];
-  propagatedBuildInputs = [ fastjet fastjet-contrib ];
+  nativeBuildInputs = [ rsync makeWrapper pkg-config ];
+  buildInputs = [ hepmc3 highfive imagemagick python3 latex python3.pkgs.yoda ];
+  propagatedBuildInputs = [ hdf5 fastjet fastjet-contrib ];

  preConfigure = ''
+    substituteInPlace configure \
+      --replace-fail 'if test $HEPMC_VERSION -le 310; then' 'if false; then'
    substituteInPlace bin/rivet-build.in \
-      --replace 'num_jobs=$(getconf _NPROCESSORS_ONLN)' 'num_jobs=''${NIX_BUILD_CORES:-$(getconf _NPROCESSORS_ONLN)}' \
-      --replace 'which' '"${which}/bin/which"' \
-      --replace 'mycxx=' 'mycxx=${stdenv.cc}/bin/${if stdenv.cc.isClang or false then "clang++" else "g++"}  #' \
-      --replace 'mycxxflags="' "mycxxflags=\"$NIX_CFLAGS_COMPILE $NIX_CXXSTDLIB_COMPILE $NIX_CFLAGS_LINK "
+      --replace-fail 'num_jobs=$(getconf _NPROCESSORS_ONLN)' 'num_jobs=''${NIX_BUILD_CORES:-$(getconf _NPROCESSORS_ONLN)}' \
+      --replace-fail 'which' '"${which}/bin/which"' \
+      --replace-fail 'mycxx=' 'mycxx=${stdenv.cc}/bin/${if stdenv.cc.isClang or false then "clang++" else "g++"}  #' \
+      --replace-fail 'mycxxflags="' "mycxxflags=\"$NIX_CFLAGS_COMPILE $NIX_CXXSTDLIB_COMPILE $NIX_CFLAGS_LINK "
  '';

  preInstall = ''
    substituteInPlace bin/make-plots \
-      --replace '"which"' '"${which}/bin/which"' \
-      --replace '"latex"' '"'$latex'/bin/latex"' \
-      --replace '"dvips"' '"'$latex'/bin/dvips"' \
-      --replace '"ps2pdf"' '"${ghostscript}/bin/ps2pdf"' \
-      --replace '"ps2eps"' '"${ghostscript}/bin/ps2eps"' \
-      --replace '"kpsewhich"' '"'$latex'/bin/kpsewhich"' \
-      --replace '"convert"' '"${imagemagick.out}/bin/convert"'
+      --replace-fail '"which"' '"${which}/bin/which"' \
+      --replace-fail '"latex"' '"'$latex'/bin/latex"' \
+      --replace-fail '"dvips"' '"'$latex'/bin/dvips"' \
+      --replace-fail '"ps2pdf"' '"${ghostscript}/bin/ps2pdf"' \
+      --replace-fail '"ps2eps"' '"${ghostscript}/bin/ps2eps"' \
+      --replace-fail '"kpsewhich"' '"'$latex'/bin/kpsewhich"' \
+      --replace-fail '"convert"' '"${imagemagick.out}/bin/convert"'
    substituteInPlace bin/rivet \
-      --replace '"less"' '"${less}/bin/less"'
-    substituteInPlace bin/rivet-mkhtml \
-      --replace '"make-plots"' \"$out/bin/make-plots\" \
-      --replace '"rivet-cmphistos"' \"$out/bin/rivet-cmphistos\" \
-      --replace 'ch_cmd = [sys.executable, os.path.join(os.path.dirname(__file__),' 'ch_cmd = [('
+      --replace-fail '"less"' '"${less}/bin/less"'
+    substituteInPlace bin/rivet-mkhtml-tex \
+      --replace-fail '"make-plots"' \"$out/bin/make-plots\" \
+      --replace-fail '"rivet-cmphistos"' \"$out/bin/rivet-cmphistos\" \
+      --replace-fail 'ch_cmd = [sys.executable, os.path.join(os.path.dirname(__file__),' 'ch_cmd = [('
  '';

  configureFlags = [
    "--with-fastjet=${fastjet}"
    "--with-yoda=${yoda}"
-  ] ++ (if lib.versions.major hepmc.version == "3" then [
-    "--with-hepmc3=${hepmc}"
-  ] else [
-    "--with-hepmc=${hepmc}"
-  ]);
+    "--with-hepmc3=${hepmc3}"
+    "--with-highfive=${highfive}"
+  ];

  enableParallelBuilding = true;

--- a/pkgs/development/libraries/physics/thepeg/default.nix
+++ b/pkgs/development/libraries/physics/thepeg/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, autoreconfHook, boost, fastjet, gsl, hepmc2, lhapdf, rivet, zlib }:
+{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, boost, fastjet, gsl, hepmc3, lhapdf, rivet, zlib }:

 stdenv.mkDerivation rec {
  pname = "thepeg";
@ -9,12 +9,21 @@ stdenv.mkDerivation rec {
    hash = "sha256-rDWXmuicKWCMqSwVakn/aKrOeloSoMkvCgGoM9LTRXI=";
  };

+  patches = [
+    # Rivet 4 support
+    (fetchpatch {
+      url = "https://github.com/hep-mirrors/thepeg/commit/d974704fe48876c13cb7f544cabcf6ef30c00f48.diff";
+      hash = "sha256-HzyNigbhWzSpjvvYw3+LZvnrSoV6Pmzghw/5VY5nlqk=";
+    })
+  ];
+
  nativeBuildInputs = [ autoreconfHook ];

-  buildInputs = [ boost fastjet gsl hepmc2 lhapdf rivet zlib ];
+  buildInputs = [ boost fastjet gsl hepmc3 lhapdf rivet zlib ];

  configureFlags = [
-    "--with-hepmc=${hepmc2}"
+    "--with-hepmc=${hepmc3}"
+    "--with-hepmcversion=3"
    "--with-rivet=${rivet}"
    "--without-javagui"
  ];
--- a/pkgs/development/libraries/physics/yoda/default.nix
+++ b/pkgs/development/libraries/physics/yoda/default.nix
@ -1,6 +1,7 @@
 { lib
 , stdenv
-, fetchurl
+, fetchFromGitLab
+, autoreconfHook
 , python
 , root
 , makeWrapper
@ -10,14 +11,17 @@

 stdenv.mkDerivation rec {
  pname = "yoda";
-  version = "1.9.10";
+  version = "2.0.1";

-  src = fetchurl {
-    url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2";
-    hash = "sha256-CnCO6dcElF0zh8xDexX/3fOCxw/lurOe0r2/g8LCjG8=";
+  src = fetchFromGitLab {
+    owner = "hepcedar";
+    repo = pname;
+    rev = "yoda-${version}";
+    hash = "sha256-WeMOd1dsy+qwiODQ7EWiLa1GNfUWXwpTtkS4EKUWF+c=";
  };

  nativeBuildInputs = with python.pkgs; [
+    autoreconfHook
    cython
    makeWrapper
  ];
--- a/pkgs/development/lisp-modules/imported.nix
+++ b/pkgs/development/lisp-modules/imported.nix
--- a/pkgs/development/lisp-modules/nix-cl.nix
+++ b/pkgs/development/lisp-modules/nix-cl.nix
@ -177,15 +177,23 @@ let
        asdf = "${asdfFasl}/asdf.${faslExt}";
      };

-      preConfigure = ''
+      configurePhase = ''
+        runHook preConfigure
+
        source ${./setup-hook.sh}
        buildAsdfPath
+
+        runHook postConfigure
      '';

      buildPhase = optionalString (src != null) ''
+        runHook preBuild
+
        export CL_SOURCE_REGISTRY=$CL_SOURCE_REGISTRY:$src//
        export ASDF_OUTPUT_TRANSLATIONS="$src:$(pwd):${storeDir}:${storeDir}"
        ${pkg}/bin/${program} ${toString flags} < $buildScript
+
+        runHook postBuild
      '';

      # Copy compiled files to store
@ -200,6 +208,8 @@ let
            concatMapStringsSep "\\|" (replaceStrings ["." "+"] ["[.]" "[+]"]) systems;
        in
      ''
+        runHook preInstall
+
        mkdir -pv $out
        cp -r * $out

@ -207,6 +217,8 @@ let
        find $out -name "*.asd" \
        | grep -v "/\(${mkSystemsRegex systems}\)\.asd$" \
        | xargs rm -fv || true
+
+        runHook postInstall
      '';

      dontPatchShebangs = true;
--- a/pkgs/development/lisp-modules/packages.nix
+++ b/pkgs/development/lisp-modules/packages.nix
@ -9,6 +9,7 @@ let
    setAttr
    hasAttr
    optionals
+    isDerivation
    hasSuffix
    splitString
    remove
@ -23,23 +24,33 @@ let
  # E.g. cl-unicode creating .txt files during compilation
  build-with-compile-into-pwd = args:
    let
-      build = (build-asdf-system (args // { version = args.version + "-build"; }))
+      args' = if isDerivation args then args.drvAttrs else args;
+      build = (build-asdf-system (args' // { version = args'.version + "-build"; }))
        .overrideAttrs(o: {
          buildPhase = with builtins; ''
+            runHook preBuild
+
            mkdir __fasls
            export ASDF_OUTPUT_TRANSLATIONS="$(pwd):$(pwd)/__fasls:${storeDir}:${storeDir}"
            export CL_SOURCE_REGISTRY=$CL_SOURCE_REGISTRY:$(pwd)//
            ${o.pkg}/bin/${o.program} ${toString (o.flags or [])} < ${o.buildScript}
+
+            runHook postBuild
          '';
          installPhase = ''
+            runHook preInstall
+
            mkdir -pv $out
            rm -rf __fasls
            cp -r * $out
+
+            runHook postInstall
          '';
        });
-    in build-asdf-system (args // {
+    in build-asdf-system (args' // {
      # Patches are already applied in `build`
      patches = [];
+      postPatch = "";
      src = build;
    });

@ -49,39 +60,11 @@ let

  packages = ql.overrideScope (self: super: {

-  cl-environments = super.cl-environments.overrideLispAttrs (old: {
-    patches = old.patches or [] ++ [
-      # Needed because SB-INT:TRULY-DYNAMIC-EXTENT has been removed since sbcl 2.3.10.
-      # The update isn't available on quicklisp yet, but we can fetch from upstream directly
-      (pkgs.fetchpatch {
-        url = "https://github.com/alex-gutev/cl-environments/commit/1bd7ecf68adeaf654616c6fb763c1239e0f2e221.patch";
-        sha256 = "sha256-i6KdthYqPlJPvxM2c2kossHYvXNhpZHl/7NzELNrOHU=";
-      })
-    ];
-  });
-
  cl-unicode = build-with-compile-into-pwd {
    inherit (super.cl-unicode) pname version src systems;
    lispLibs = super.cl-unicode.lispLibs ++ [ self.flexi-streams ];
  };

-  dissect = super.dissect.overrideAttrs {
-    version = "1.0.0-trunk";
-    src = pkgs.fetchFromGitHub {
-      owner = "Shinmera";
-      repo = "dissect";
-      rev = "a70cabcd748cf7c041196efd711e2dcca2bbbb2c";
-      hash = "sha256-WXv/jbokgKJTc47rBjvOF5npnqDlsyr8oSXIzN/7ofo=";
-    };
-  };
-
-  cl-gobject-introspection = super.cl-gobject-introspection.overrideLispAttrs (o: {
-    postPatch = ''
-      substituteInPlace src/init.lisp \
-        --replace sb-ext::set-floating-point-modes sb-int:set-floating-point-modes
-    '';
-  });
-
  jzon = super.com_dot_inuoe_dot_jzon;

  cl-notify = build-asdf-system {
@ -99,12 +82,7 @@ let
    ];
  };

-  cl-liballegro-nuklear = build-with-compile-into-pwd {
-    inherit (super.cl-liballegro-nuklear) pname version src;
-    nativeBuildInputs = [ pkgs.allegro5 ];
-    nativeLibs = [ pkgs.allegro5 ];
-    lispLibs = super.cl-liballegro-nuklear.lispLibs ++ [ self.cl-liballegro ];
-  };
+  cl-liballegro-nuklear = build-with-compile-into-pwd super.cl-liballegro-nuklear;

  lessp = build-asdf-system {
    pname = "lessp";
@ -182,9 +160,15 @@ let
  cephes = build-with-compile-into-pwd {
    inherit (super.cephes) pname version src lispLibs;
    patches = [ ./patches/cephes-make.patch ];
+    postPatch = ''
+      find \( -name '*.dll' -o -name '*.dylib' -o -name '*.so' \) -delete
+    '';
    postConfigure = ''
      substituteAllInPlace cephes.asd
    '';
+    postInstall = ''
+      find $out -name '*.o' -delete
+    '';
  };

  clx-truetype = build-asdf-system {
@ -266,37 +250,9 @@ let
    inherit (super.magicl) pname version src lispLibs;
    nativeBuildInputs = [ pkgs.gfortran ];
    nativeLibs = [ pkgs.openblas ];
-    patches = [ ./patches/magicl-dont-build-fortran-twice.patch ];
  };

-  cl-glib = build-asdf-system {
-    pname = "cl-glib";
-    version = "1.0.0";
-    src = pkgs.fetchFromGitHub {
-      owner = "bohonghuang";
-      repo = "cl-glib";
-      rev = "84b128192d6b11cf03f1150e474a23368f07edff";
-      hash = "sha256-A56Yz+W4n1rAxxZg15zfkrLMbKMEG/zsWqaX7+kx4Qg=";
-    };
-    lispLibs = with self; [
-      cl-gobject-introspection-wrapper
-      bordeaux-threads
-    ];
-  };
-
-  cl-glib_dot_gio = build-asdf-system {
-    pname = "cl-glib.gio";
-    version = "1.0.0";
-    src = pkgs.fetchFromGitHub {
-      owner = "bohonghuang";
-      repo = "cl-glib";
-      rev = "84b128192d6b11cf03f1150e474a23368f07edff";
-      hash = "sha256-A56Yz+W4n1rAxxZg15zfkrLMbKMEG/zsWqaX7+kx4Qg=";
-    };
-    lispLibs = with self; [
-      cl-gobject-introspection-wrapper
-    ];
-  };
+  cl-glib_dot_gio = throw "cl-glib_dot_gio was replaced by cl-gio";

  cl-gtk4 = build-asdf-system {
    pname = "cl-gtk4";
@ -304,13 +260,14 @@ let
    src = pkgs.fetchFromGitHub {
      owner = "bohonghuang";
      repo = "cl-gtk4";
-      rev = "e18f621b996fd986d9829d590203c690440dee64";
-      hash = "sha256-++qydw6db4O3m+DAjutVPN8IuePOxseo9vhWEvwiR6E=";
+      rev = "ff60e3495cdbba5c09d0bb8aa49f3184cc060c8e";
+      hash = "sha256-06cyPf+5z+GE3YvZEJ67kC281nkwRz/hoaykTISsni0=";
    };
    lispLibs = with self; [
      cl-gobject-introspection-wrapper
      cl-glib
-      cl-glib_dot_gio
+      cl-gio
+      cl-gobject
    ];
    nativeBuildInputs = [
      pkgs.gobject-introspection
@ -323,13 +280,8 @@ let

  cl-gtk4_dot_adw = build-asdf-system {
    pname = "cl-gtk4.adw";
-    version = "1.0.0";
-    src = pkgs.fetchFromGitHub {
-      owner = "bohonghuang";
-      repo = "cl-gtk4";
-      rev = "e18f621b996fd986d9829d590203c690440dee64";
-      hash = "sha256-++qydw6db4O3m+DAjutVPN8IuePOxseo9vhWEvwiR6E=";
-    };
+    version = self.cl-gtk4.version;
+    src = self.cl-gtk4.src;
    lispLibs = with self; [
      cl-gobject-introspection-wrapper
      cl-gtk4
@ -342,15 +294,12 @@ let
    ];
  };

-  cl-gtk4_dot_webkit2 = build-asdf-system {
-    pname = "cl-gtk4.webkit2";
-    version = "1.0.0";
-    src = pkgs.fetchFromGitHub {
-      owner = "bohonghuang";
-      repo = "cl-gtk4";
-      rev = "e18f621b996fd986d9829d590203c690440dee64";
-      hash = "sha256-++qydw6db4O3m+DAjutVPN8IuePOxseo9vhWEvwiR6E=";
-    };
+  cl-gtk4_dot_webkit2 = throw "cl-gtk4_dot_webkit2 was replaced by cl-gtk4_dot_webkit";
+
+  cl-gtk4_dot_webkit = build-asdf-system {
+    pname = "cl-gtk4.webkit";
+    version = self.cl-gtk4.version;
+    src = self.cl-gtk4.src;
    lispLibs = with self; [
      cl-gobject-introspection-wrapper
      cl-gtk4
@ -361,8 +310,6 @@ let
    nativeLibs = [
      pkgs.webkitgtk_6_0
    ];
-    # Requires old webkitgtk_5_0 which was replaced by webkitgtk_6_0
-    meta.broken = true;
  };

  cl-avro = build-asdf-system {
@ -371,97 +318,43 @@ let
    src = pkgs.fetchFromGitHub {
      owner = "SahilKang";
      repo = "cl-avro";
-      rev = "7d624253e98afb987a01729bd72c99bae02f0d7d";
-      hash = "sha256-AlTn+Q1gKnAFEfcnz9+VeHz681pPIirg2za3VXYiNWk=";
+      rev = "b8fa26320fa0ae88390215140d57f9cca937f691";
+      hash = "sha256-acXsotvKWuffrLbrG9YJ8yZc5E6WC8N0qCFCAiX6N0Q=";
    };
    lispLibs = with self; [
-      alexandria
-      babel
-      chipz
-      closer-mop
-      ieee-floats
-      flexi-streams
-      local-time
-      local-time-duration
-      md5
-      salza2
-      st-json
-      time-interval
+      alexandria babel chipz closer-mop ieee-floats flexi-streams local-time
+      local-time-duration md5 salza2 st-json time-interval
      trivial-extensible-sequences
    ];
  };

-  trivial-clock = build-asdf-system {
-    pname = "trivial-clock";
-    version = "trunk";
-    src = pkgs.fetchFromGitHub {
-      owner = "ak-coram";
-      repo = "cl-trivial-clock";
-      rev = "641e12ab1763914996beb1ceee67aabc9f1a3b1e";
-      hash = "sha256-mltQEJ2asxyQ/aS/9BuWmN3XZ9bGmmkopcF5YJU1cPk=";
-    };
-    systems = [ "trivial-clock" "trivial-clock/test" ];
-    lispLibs = [ self.cffi self.fiveam ];
-  };
-
-  frugal-uuid = build-asdf-system {
-    pname = "frugal-uuid";
-    version = "trunk";
-    src = pkgs.fetchFromGitHub {
-      owner = "ak-coram";
-      repo = "cl-frugal-uuid";
-      rev = "be27972333a16fc3f16bc7fbf9e3013b2123d75c";
-      hash = "sha256-rWO43vWMibF8/OxL70jle5nhd9oRWC7+MI44KWrQD48=";
-    };
-    systems = [ "frugal-uuid"
+  frugal-uuid = super.frugal-uuid.overrideLispAttrs (o: {
+    systems = [
+      "frugal-uuid"
      "frugal-uuid/non-frugal"
      "frugal-uuid/benchmark"
-                "frugal-uuid/test" ];
-    lispLibs = with self; [
-      babel
-      bordeaux-threads
-      fiveam
+      "frugal-uuid/test"
+    ];
+    lispLibs = o.lispLibs ++ (with self; [
      ironclad
-      trivial-benchmark
+      babel
      trivial-clock
-    ];
-  };
+      trivial-benchmark
+      fiveam
+    ]);
+  });

-  duckdb = build-asdf-system {
-    pname = "duckdb";
-    version = "trunk";
-    src = pkgs.fetchFromGitHub {
-      owner = "ak-coram";
-      repo = "cl-duckdb";
-      rev = "3ed1df5ba5c738a0b7fed7aa73632ec86f558d09";
-      hash = "sha256-AJMxhtDACe6WTwEOxLsC8y6uBaPqjt8HLRw/eIZI02E=";
-    };
+  duckdb = super.duckdb.overrideLispAttrs (o: {
    systems = [ "duckdb" "duckdb/test" "duckdb/benchmark" ];
-    lispLibs = with self; [
-      bordeaux-threads
-      cffi-libffi
-      cl-ascii-table
-      cl-spark
-      cl-ppcre
-      frugal-uuid
-      let-plus
-      local-time
-      local-time-duration
-      periods
-      float-features
-    ];
-    nativeLibs = with pkgs; [
-      duckdb libffi
-    ];
-  };
+  });

  polyclot = build-asdf-system {
    pname = "polyclot";
    version = "trunk";
    src = pkgs.fetchfossil {
-      url = "https://fossil.turtleware.eu/polyclot";
-      rev = "e678b3c3e002f53b446780406c9ed13f8451309d22a1dc50ced4dbeedf08a1ec";
-      sha256 = "sha256-J08bU9HSVbzEivYtQsyIYPZJTrugj+jJSa4LglS0Olg=";
+      url = "https://fossil.turtleware.eu/fossil.turtleware.eu/polyclot";
+      rev = "18500c968b1fc1e2a915b5c70b8cddc4a2b54de51da4eedc5454e42bfea3b479";
+      sha256 = "sha256-KgBL1QQN4iG6d8E9GlKAuxSwkrY6Zy7e1ZzEDGKad+A=";
    };
    systems = [ "eu.turtleware.polyclot" "eu.turtleware.polyclot/demo" ];
    lispLibs = with self; [ clim mcclim mcclim-layouts ];
@ -473,29 +366,18 @@ let
    src = pkgs.fetchFromGitHub {
      owner = "kaveh808";
      repo = "kons-9";
-      rev = "95ad44fac0566f445c4b7bd040339dcff75ee992";
-      sha256 = "19rl7372j9f1cv2kl55r8vyf4dhcz4way4hkjgysbxzrb1psp17n";
+      rev = "08770e7fbb839b91fd035f1cd4a50ecc81b42d57";
+      sha256 = "sha256-Tit/qmOU5+zp43/ecIXGbh4CtgWzltWM7tHdVWkga0k=";
    };
    systems = [ "kons-9" "kons-9/testsuite" ];
+    patches = [ ./patches/kons-9-fix-testsuite-compilation.patch ];
    lispLibs = with self; [
      closer-mop trivial-main-thread trivial-backtrace cffi cl-opengl cl-glu
-      cl-glfw3 cl-paths-ttf zpb-ttf cl-vectors origin clobber
+      cl-glfw3 cl-paths-ttf zpb-ttf cl-vectors origin clobber shasht
      org_dot_melusina_dot_confidence
    ];
  };

-  sb-cga = build-asdf-system {
-    pname = "sb-cga";
-    version = "1.0.1";
-    src = pkgs.fetchFromGitHub {
-      owner = "nikodemus";
-      repo = "sb-cga";
-      rev = "9a554ea1c01cac998ff7eaa5f767bc5bcdc4c094";
-      sha256 = "sha256-iBM+VXu6JRqGmeIFzfXbGot+elvangmfSpDB7DjFpPg";
-    };
-    lispLibs = [ self.alexandria ];
-  };
-
  nsb-cga = super.nsb-cga.overrideLispAttrs (oa: {
    lispLibs = oa.lispLibs ++ [ self.sb-cga ];
  });
@ -560,30 +442,8 @@ let
    meta.mainProgram = "qlot";
  };

-  misc-extensions = super.misc-extensions.overrideLispAttrs (old: rec {
-    version = "4.0.3";
-    src = pkgs.fetchFromGitLab {
-      domain = "gitlab.common-lisp.net";
-      owner = "misc-extensions";
-      repo = "misc-extensions";
-      rev = "v${version}";
-      hash = "sha256-bDNI4mIaNw/rf7ZwvwolKo6+mUUxsgubGUd/988sHAo=";
-    };
-  });
-
-  fset = super.fset.overrideLispAttrs (old: rec {
-    version = "1.4.0";
-    src = pkgs.fetchFromGitHub {
-      owner = "slburson";
-      repo = "fset";
-      rev = "v${version}";
-      hash = "sha256-alO8Ek5Xpyl5N99/LgyIZ50aoRbY7bKh3XBntFV6Q5k=";
-    };
-    lispLibs = with super; [
-      self.misc-extensions
-      mt19937
-      named-readtables
-    ];
+  fset = super.fset.overrideLispAttrs (oa: {
+    systems = [ "fset" "fset/test" ];
    meta = {
      description = "functional collections library";
      homepage = "https://gitlab.common-lisp.net/fset/fset/-/wikis/home";
@ -591,32 +451,25 @@ let
    };
  });

-  coalton = build-asdf-system {
-    pname = "coalton";
-    version = "trunk";
-    src = pkgs.fetchFromGitHub {
-      owner = "coalton-lang";
-      repo = "coalton";
-      rev = "05111b8a59e3f7346b175ce1ec621bff588e1e1f";
-      hash = "sha256-L9o7Y3zDx9qLXGe/70c1LWEKUWsSRgBQru66mIuaCFw=";
-    };
-    lispLibs = with super; [
-      alexandria
-      eclector-concrete-syntax-tree
-      fiasco
-      float-features
-      self.fset
-      named-readtables
-      trivial-garbage
+  thih-coalton = self.coalton;
+  quil-coalton = self.coalton;
+  coalton = super.coalton.overrideLispAttrs (oa: {
+    systems = [
+      "coalton"
+      "thih-coalton"
+      "quil-coalton"
+      "thih-coalton/tests"
+      "quil-coalton/tests"
+      "coalton/tests"
    ];
+    lispLibs = oa.lispLibs ++ [ self.fiasco ];
    nativeLibs = [ pkgs.mpfr ];
-    systems = [ "coalton" "coalton/tests" ];
    meta = {
      description = "statically typed functional programming language that supercharges Common Lisp";
      homepage = "https://coalton-lang.github.io";
      license = pkgs.lib.licenses.mit;
    };
-  };
+  });

  });

--- a/pkgs/development/lisp-modules/patches/cephes-make.patch
+++ b/pkgs/development/lisp-modules/patches/cephes-make.patch
@ -1,22 +1,21 @@
 --- a/cephes.asd
 +++ b/cephes.asd
-@@ -5,7 +5,7 @@
+@@ -16,7 +16,7 @@
   (defclass makefile (source-file) ((type :initform "m")))
   (defmethod perform ((o load-op) (c makefile)) t)
   (defmethod perform ((o compile-op) (c makefile))
-  (let* ((lib-dir (system-relative-pathname "cephes" "scipy-cephes"))
-+  (let* ((lib-dir #P"@out@/scipy-cephes")
-          (lib (make-pathname :directory `(:relative ,(namestring lib-dir))
-                              :name "libmd"
-                              :type #+darwin "dylib" #+(and unix (not darwin)) "so" #+(or windows win32) "dll"))
-@@ -14,7 +14,7 @@
+-    (let* ((lib-dir (system-relative-pathname "cephes" "scipy-cephes/"))
+    (let* ((lib-dir #P"@out@/scipy-cephes/")
+            (lib (make-pathname :directory (pathname-directory lib-dir)
+                                :name #+(or (and unix (not darwin)) windows win32) "libmd"
+ 			       #+(and darwin arm64) "libmd-arm64"
+@@ -30,7 +30,7 @@
 	  (format *error-output* "Library ~S exists, skipping build" lib)
 	  (format *error-output* "Building ~S~%" lib))
       (unless built
 -	(chdir (native-namestring lib-dir))
 +	(chdir "scipy-cephes")
-       (run-program "make" :output t))))
+ 	(run-program "make" :output t)))))
 
 (defsystem "cephes"

-Diff finished.  Thu Mar 28 08:13:30 2024
--- a/pkgs/development/lisp-modules/patches/kons-9-fix-testsuite-compilation.patch
+++ b/pkgs/development/lisp-modules/patches/kons-9-fix-testsuite-compilation.patch
@ -0,0 +1,22 @@
+--- a/testsuite/assertions.lisp
+++ b/testsuite/assertions.lisp
+@@ -13,7 +13,7 @@
+ relation when computing with floating point numbers. Two floating point numbers are
+ essentially equal when they are in a neighbourhood whose size is based
+ on the magnitude orders of these floating point numbers and the inaccuracy."
+-  (:report
+   :report
+    (lambda (stream)
+      (flet ((maybe-report (name float1 float2)
+ 	      (unless (float-is-essentially-equal (p:y point1) (p:y point2) :inaccuracy inaccuracy)
+@@ -29,7 +29,7 @@
+ 	    inaccuracy (confidence::float-comparison-threshold 'single-float max inaccuracy float1 float2)))))
+        (maybe-report "X" (p:x point1) (p:x point2))
+        (maybe-report "Y" (p:y point1) (p:y point2))
+-       (maybe-report "Z" (p:z point1) (p:z point2)))))
+       (maybe-report "Z" (p:z point1) (p:z point2))))
+   (and (float-is-essentially-equal (p:x point1) (p:x point2) :inaccuracy inaccuracy)
+        (float-is-essentially-equal (p:y point1) (p:y point2) :inaccuracy inaccuracy)
+        (float-is-essentially-equal (p:z point1) (p:z point2) :inaccuracy inaccuracy)))
+
+Diff finished.  Sun Oct 20 03:05:54 2024
--- a/Show More
+++ b/Show More