Merge staging-next into staging

2026-07-06 17:13:24 -05:00 · 2026-06-07 18:29:16 +00:00 · 2026-06-07 18:29:16 +00:00 · 6d151c9ef3
commit 6d151c9ef3
parent fb868bf67b b142172cbb
121 changed files with 1214 additions and 853 deletions
--- a/ci/eval/compare/default.nix
+++ b/ci/eval/compare/default.nix
@ -238,34 +238,33 @@ runCommand "compare"
      jq -r -f ${./generate-step-summary.jq} < ${changed-paths}
    } >> $out/step-summary.md

-    if jq -e '(.attrdiff.added | length == 0) and (.attrdiff.removed | length == 0)' "${changed-paths}" > /dev/null; then
-      # Chunks have changed between revisions
-      # We cannot generate a performance comparison
-      {
-        echo
-        echo "# Performance comparison"
-        echo
-        echo "This compares the performance of this branch against its pull request base branch (e.g., 'master')"
-        echo
-        echo "For further help please refer to: [ci/README.md](https://github.com/NixOS/nixpkgs/blob/master/ci/README.md)"
-        echo
-      } >> $out/step-summary.md
+    {
+      echo
+      echo "# Performance comparison"
+      echo
+      echo "This compares the performance of this branch against its pull request base branch (e.g., 'master')"
+      echo
+    } >> $out/step-summary.md

-      cmp-stats --explain ${combined}/before/stats ${combined}/after/stats >> $out/step-summary.md
-
-    else
-      # Package chunks are the same in both revisions
-      # We can use the to generate a performance comparison
+    # cmp-stats only compares the stats chunks present in both revisions, so the
+    # comparison is still produced when packages were added/removed. The paired
+    # chunks may cover different attrs in that case, so caveat the figures.
+    if ! jq -e '(.attrdiff.added | length == 0) and (.attrdiff.removed | length == 0)' "${changed-paths}" > /dev/null; then
      {
+        echo "> [!NOTE]"
+        echo "> The package sets differ between the two revisions. This comparison only"
+        echo "> covers packages evaluated in both, so treat the figures as approximate."
        echo
-        echo "# Performance Comparison"
-        echo
-        echo "Performance stats were skipped because the package sets differ between the two revisions."
-        echo
-        echo "For further help please refer to: [ci/README.md](https://github.com/NixOS/nixpkgs/blob/master/ci/README.md)"
      } >> $out/step-summary.md
    fi

+    {
+      echo "For further help please refer to: [ci/README.md](https://github.com/NixOS/nixpkgs/blob/master/ci/README.md)"
+      echo
+    } >> $out/step-summary.md
+
+    cmp-stats --explain ${combined}/before/stats ${combined}/after/stats >> $out/step-summary.md
+
    jq -r '.[]' "${touchedFilesJson}" > ./touched-files
    readarray -t touchedFiles < ./touched-files
    echo "This PR touches ''${#touchedFiles[@]} files"
--- a/lib/sources.nix
+++ b/lib/sources.nix
@ -43,7 +43,7 @@ let
  cleanSourceFilter =
    name: type:
    let
-      baseName = baseNameOf (toString name);
+      baseName = baseNameOf name;
    in
    !(
      # Filter out version control software files/directories
@ -270,7 +270,7 @@ let
      filter =
        name: type:
        let
-          base = baseNameOf (toString name);
+          base = baseNameOf name;
        in
        type == "directory" || lib.any (ext: lib.hasSuffix ext base) exts;
    in
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -25337,7 +25337,7 @@
  shelvacu = {
    name = "Shelvacu";
    email = "nix-maint@shelvacu.com";
-    matrix = "@s:consortium.chat";
+    matrix = "@s:sv.mt";
    github = "shelvacu";
    githubId = 1731537;
  };
--- a/nixos/modules/services/hardware/fwupd.nix
+++ b/nixos/modules/services/hardware/fwupd.nix
@ -35,7 +35,7 @@ let
    lib.listToAttrs (map mkEtcFile cfg.package.filesInstalledToEtc);
  extraTrustedKeys =
    let
-      mkName = p: "pki/fwupd/${baseNameOf (toString p)}";
+      mkName = p: "pki/fwupd/${baseNameOf p}";
      mkEtcFile = p: lib.nameValuePair (mkName p) { source = p; };
    in
    lib.listToAttrs (map mkEtcFile cfg.extraTrustedKeys);
--- a/nixos/modules/services/networking/wpa_supplicant.nix
+++ b/nixos/modules/services/networking/wpa_supplicant.nix
@ -565,9 +565,9 @@ in
          coercedTo attrs (
            val:
            if builtins.isAttrs val && val ? enable then
-              trace "Obsolete option `networking.wireless.userControlled.enable' is used. It was renamed to networking.wireless.userControlled" val.enable
+              warn "Obsolete option `networking.wireless.userControlled.enable' is used. It was renamed to networking.wireless.userControlled" val.enable
            else if builtins.isAttrs val && val ? group then
-              trace
+              warn
                "The option definition `networking.wireless.userControlled.group' no longer has any effect. The group is now fixed to `wpa_supplicant'."
                (val.enable or false)
            else if builtins.isBool val then
--- a/nixos/tests/systemd-initrd-luks-fido2.nix
+++ b/nixos/tests/systemd-initrd-luks-fido2.nix
@ -38,7 +38,6 @@
          };
        };
        virtualisation.rootDevice = "/dev/mapper/cryptroot";
-        virtualisation.fileSystems."/".autoFormat = true;
      };
    };

@ -52,6 +51,8 @@
      # Create encrypted volume
      machine.wait_for_unit("multi-user.target")
      machine.succeed("echo -n supersecret | cryptsetup luksFormat -q --iter-time=1 /dev/vdb -")
+      machine.succeed("echo -n supersecret | cryptsetup luksOpen   -q               /dev/vdb cryptroot")
+      machine.succeed("mkfs.ext4 /dev/mapper/cryptroot")
      machine.succeed("PASSWORD=supersecret SYSTEMD_LOG_LEVEL=debug systemd-cryptenroll --fido2-device=auto /dev/vdb |& systemd-cat")

      # Boot from the encrypted disk
--- a/nixos/tests/systemd-initrd-luks-unl0kr.nix
+++ b/nixos/tests/systemd-initrd-luks-unl0kr.nix
@ -73,7 +73,6 @@ in
          cryptroot2.device = "/dev/vdc";
        };
        virtualisation.rootDevice = "/dev/mapper/cryptroot";
-        virtualisation.fileSystems."/".autoFormat = true;
        # test mounting device unlocked in initrd after switching root
        virtualisation.fileSystems."/cryptroot2" = {
          device = "/dev/mapper/cryptroot2";
@ -100,7 +99,7 @@ in
      machine.succeed("mkfs.ext4 /dev/mapper/cryptroot2")

      # Boot from the encrypted disk
-        machine.succeed("${boot-luks}/bin/switch-to-configuration boot")
+      machine.succeed("${boot-luks}/bin/switch-to-configuration boot")
      machine.succeed("sync")
      machine.crash()

--- a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
@ -92,7 +92,7 @@ vimUtils.buildVimPlugin {
        "return '${fff-nvim-lib}/lib'"
  '';

-  nvimSkipModule = [
+  nvimSkipModules = [
    # Skip single file dev config for testing fff.nvim locally
    "empty_config"
  ];
--- a/pkgs/applications/editors/vim/plugins/non-generated/notmuch-vim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/notmuch-vim/default.nix
@ -1 +1,17 @@
-{ notmuch }: notmuch.vim
+{
+  vimUtils,
+  notmuch,
+}:
+vimUtils.buildVimPlugin {
+  inherit (notmuch) pname version;
+  src = notmuch.vim;
+  meta = {
+    inherit (notmuch.meta)
+      changelog
+      description
+      homepage
+      license
+      platforms
+      ;
+  };
+}
--- a/pkgs/applications/editors/vim/plugins/non-generated/parinfer-rust/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/parinfer-rust/default.nix
@ -1 +1,8 @@
-{ parinfer-rust }: parinfer-rust
+{
+  vimUtils,
+  parinfer-rust,
+}:
+vimUtils.buildVimPlugin {
+  inherit (parinfer-rust) pname version meta;
+  src = parinfer-rust;
+}
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@ -478,21 +478,23 @@ assertNoAdditions {
    nvimSkipModules = [ "ccc.kit.Thread.Server._bootstrap" ];
  };

-  chadtree = super.chadtree.overrideAttrs {
+  chadtree = super.chadtree.overrideAttrs (old: {
    # > E5108: Error executing lua ...implugin-chadtree-0-unstable-2026-01-18/lua/chadtree.lua:162: Vim:Failed to start server: address already in use
    doCheck = stdenv.hostPlatform.isLinux;
    buildInputs = [
      python3
    ];
-    passthru.python3Dependencies =
-      ps: with ps; [
-        pynvim-pp
-        pyyaml
-        std2
-      ];
+    passthru = old.passthru // {
+      python3Dependencies =
+        ps: with ps; [
+          pynvim-pp
+          pyyaml
+          std2
+        ];
+    };
    # We need some patches so it stops complaining about not being in a venv
    patches = [ ./patches/chadtree/emulate-venv.patch ];
-  };
+  });

  ChatGPT-nvim = super.ChatGPT-nvim.overrideAttrs {
    dependencies = with self; [
@ -1053,13 +1055,15 @@ assertNoAdditions {
    };
  });

-  coq_nvim = super.coq_nvim.overrideAttrs {
-    passthru.python3Dependencies =
-      ps: with ps; [
-        pynvim-pp
-        pyyaml
-        std2
-      ];
+  coq_nvim = super.coq_nvim.overrideAttrs (old: {
+    passthru = old.passthru // {
+      python3Dependencies =
+        ps: with ps; [
+          pynvim-pp
+          pyyaml
+          std2
+        ];
+    };

    # We need some patches so it stops complaining about not being in a venv
    patches = [ ./patches/coq_nvim/emulate-venv.patch ];
@ -1068,7 +1072,7 @@ assertNoAdditions {
      # Other modules require global variables
      "coq"
    ];
-  };
+  });

  cornelis = super.cornelis.overrideAttrs {
    dependencies = [ self.vim-textobj-user ];
@ -1265,7 +1269,9 @@ assertNoAdditions {

  deoplete-khard = super.deoplete-khard.overrideAttrs (old: {
    dependencies = [ self.deoplete-nvim ];
-    passthru.python3Dependencies = ps: [ (ps.toPythonModule khard) ];
+    passthru = old.passthru // {
+      python3Dependencies = ps: [ (ps.toPythonModule khard) ];
+    };
    meta = old.meta // {
      description = "Address-completion for khard via deoplete";
      homepage = "https://github.com/nicoe/deoplete-khard";
@ -1446,7 +1452,9 @@ assertNoAdditions {
  };

  fcitx-vim = super.fcitx-vim.overrideAttrs (old: {
-    passthru.python3Dependencies = ps: with ps; [ dbus-python ];
+    passthru = old.passthru // {
+      python3Dependencies = ps: with ps; [ dbus-python ];
+    };
    meta = old.meta // {
      description = "Keep and restore fcitx state when leaving/re-entering insert mode or search mode";
      license = lib.licenses.mit;
@ -1858,7 +1866,7 @@ assertNoAdditions {

  indent-blankline-nvim = super.indent-blankline-nvim.overrideAttrs {
    # Meta file
-    nvimSkipModules = "ibl.config.types";
+    nvimSkipModules = [ "ibl.config.types" ];
  };

  indent-tools-nvim = super.indent-tools-nvim.overrideAttrs {
@ -1969,9 +1977,11 @@ assertNoAdditions {
    };
  });

-  jupytext-nvim = super.jupytext-nvim.overrideAttrs {
-    passthru.python3Dependencies = ps: [ ps.jupytext ];
-  };
+  jupytext-nvim = super.jupytext-nvim.overrideAttrs (old: {
+    passthru = old.passthru // {
+      python3Dependencies = ps: [ ps.jupytext ];
+    };
+  });

  just-nvim = super.just-nvim.overrideAttrs {
    checkInputs = with self; [
@ -2366,20 +2376,22 @@ assertNoAdditions {
    runtimeDeps = [ luau-lsp ];
  };

-  magma-nvim = super.magma-nvim.overrideAttrs {
-    passthru.python3Dependencies =
-      ps: with ps; [
-        pynvim
-        jupyter-client
-        ueberzug
-        pillow
-        cairosvg
-        plotly
-        ipykernel
-        pyperclip
-        pnglatex
-      ];
-  };
+  magma-nvim = super.magma-nvim.overrideAttrs (old: {
+    passthru = old.passthru // {
+      python3Dependencies =
+        ps: with ps; [
+          pynvim
+          jupyter-client
+          ueberzug
+          pillow
+          cairosvg
+          plotly
+          ipykernel
+          pyperclip
+          pnglatex
+        ];
+    };
+  });

  maple-nvim = super.maple-nvim.overrideAttrs {
    dependencies = [ self.plenary-nvim ];
@ -2544,7 +2556,7 @@ assertNoAdditions {

  modicator-nvim = super.modicator-nvim.overrideAttrs {
    # Optional lualine integration
-    nvimSkipModules = "modicator.integration.lualine.init";
+    nvimSkipModules = [ "modicator.integration.lualine.init" ];
  };

  molokai = super.molokai.overrideAttrs (old: {
@ -2597,13 +2609,15 @@ assertNoAdditions {
    };
  });

-  ncm2-jedi = super.ncm2-jedi.overrideAttrs {
+  ncm2-jedi = super.ncm2-jedi.overrideAttrs (old: {
    dependencies = with self; [
      nvim-yarp
      ncm2
    ];
-    passthru.python3Dependencies = ps: with ps; [ jedi ];
-  };
+    passthru = old.passthru // {
+      python3Dependencies = ps: with ps; [ jedi ];
+    };
+  });

  ncm2-neoinclude = super.ncm2-neoinclude.overrideAttrs {
    dependencies = [ self.neoinclude-vim ];
@ -2648,7 +2662,7 @@ assertNoAdditions {
      plenary-nvim
      nui-nvim
    ];
-    nvimSkipModule = [
+    nvimSkipModules = [
      "neo-tree.types.fixes.compat-0.10"
    ];
  };
@ -2855,7 +2869,7 @@ assertNoAdditions {
      nvim-nio
    ];
    # Unit test assert
-    nvimSkipModules = "neotest-jest-assertions";
+    nvimSkipModules = [ "neotest-jest-assertions" ];
  };

  neotest-minitest = super.neotest-minitest.overrideAttrs {
@ -2904,7 +2918,7 @@ assertNoAdditions {
      plenary-nvim
    ];
    # Unit test assert
-    nvimSkipModules = "neotest-playwright-assertions";
+    nvimSkipModules = [ "neotest-playwright-assertions" ];
  };

  neotest-plenary = super.neotest-plenary.overrideAttrs {
@ -2965,7 +2979,7 @@ assertNoAdditions {
      plenary-nvim
    ];
    # Unit test assert
-    nvimSkipModules = "neotest-vitest-assertions";
+    nvimSkipModules = [ "neotest-vitest-assertions" ];
  };

  neotest-zig = super.neotest-zig.overrideAttrs {
@ -3206,7 +3220,7 @@ assertNoAdditions {
  nvim-fzf-commands = super.nvim-fzf-commands.overrideAttrs {
    dependencies = [ self.nvim-fzf ];
    # Requires global variable setup nvim_fzf_directory
-    nvimSkipModules = "fzf-commands.rg";
+    nvimSkipModules = [ "fzf-commands.rg" ];
  };

  nvim-genghis = super.nvim-genghis.overrideAttrs {
@ -3280,7 +3294,7 @@ assertNoAdditions {
  };

  nvim-lilypond-suite = super.nvim-lilypond-suite.overrideAttrs {
-    nvimSkipModule = [
+    nvimSkipModules = [
      # Option not set immediately
      "nvls.errors.lilypond-book"
      "nvls.tex"
@ -3591,7 +3605,7 @@ assertNoAdditions {

  omni-vim = super.omni-vim.overrideAttrs {
    # Optional lightline integration
-    nvimSkipModules = "omni-lightline";
+    nvimSkipModules = [ "omni-lightline" ];
  };

  omnisharp-extended-lsp-nvim = super.omnisharp-extended-lsp-nvim.overrideAttrs (old: {
@ -3676,7 +3690,7 @@ assertNoAdditions {

  outline-nvim = super.outline-nvim.overrideAttrs {
    # Requires setup call
-    nvimSkipModules = "outline.providers.norg";
+    nvimSkipModules = [ "outline.providers.norg" ];
  };

  overseer-nvim = super.overseer-nvim.overrideAttrs {
@ -3768,7 +3782,7 @@ assertNoAdditions {

  poimandres-nvim = super.poimandres-nvim.overrideAttrs {
    # Optional treesitter support
-    nvimSkipModules = "poimandres.highlights";
+    nvimSkipModules = [ "poimandres.highlights" ];
  };

  popup-nvim = super.popup-nvim.overrideAttrs {
@ -3829,7 +3843,7 @@ assertNoAdditions {

  pywal-nvim = super.pywal-nvim.overrideAttrs {
    # Optional feline integration
-    nvimSkipModules = "pywal.feline";
+    nvimSkipModules = [ "pywal.feline" ];
  };

  QFEnter = super.QFEnter.overrideAttrs (old: {
@ -4121,7 +4135,7 @@ assertNoAdditions {

  spaceman-nvim = super.spaceman-nvim.overrideAttrs {
    # Optional telescope integration
-    nvimSkipModules = "spaceman.adapters.telescope";
+    nvimSkipModules = [ "spaceman.adapters.telescope" ];
  };

  sqlite-lua = super.sqlite-lua.overrideAttrs (
@ -4327,7 +4341,7 @@ assertNoAdditions {
      plenary-nvim
    ];
    # Meta
-    nvimSkipModules = "frecency.types";
+    nvimSkipModules = [ "frecency.types" ];
  };

  telescope-fzf-native-nvim = super.telescope-fzf-native-nvim.overrideAttrs (old: {
@ -4548,7 +4562,7 @@ assertNoAdditions {

  trouble-nvim = super.trouble-nvim.overrideAttrs {
    # Meta file
-    nvimSkipModules = "trouble.docs";
+    nvimSkipModules = [ "trouble.docs" ];
  };

  trust-vim = super.trust-vim.overrideAttrs (old: {
@ -4567,7 +4581,7 @@ assertNoAdditions {
    '';

    # Unit test
-    nvimSkipModules = "tsc.better-messages-test";
+    nvimSkipModules = [ "tsc.better-messages-test" ];
  };

  tslime-vim = super.tslime-vim.overrideAttrs (old: {
@ -4817,7 +4831,9 @@ assertNoAdditions {
  });

  vim-beancount = super.vim-beancount.overrideAttrs (old: {
-    passthru.python3Dependencies = ps: with ps; [ beancount ];
+    passthru = old.passthru // {
+      python3Dependencies = ps: with ps; [ beancount ];
+    };
    meta = old.meta // {
      license = lib.licenses.vim;
    };
@ -5069,7 +5085,7 @@ assertNoAdditions {

  vim-flog = super.vim-flog.overrideAttrs (old: {
    # Not intended to be required, used by vim plugin
-    nvimSkipModules = "flog.graph_bin";
+    nvimSkipModules = [ "flog.graph_bin" ];
    meta = old.meta // {
      license = lib.licenses.vim;
    };
@ -5300,9 +5316,11 @@ assertNoAdditions {
    };
  });

-  vim-mediawiki-editor = super.vim-mediawiki-editor.overrideAttrs {
-    passthru.python3Dependencies = [ python3.pkgs.mwclient ];
-  };
+  vim-mediawiki-editor = super.vim-mediawiki-editor.overrideAttrs (old: {
+    passthru = old.passthru // {
+      python3Dependencies = ps: [ ps.mwclient ];
+    };
+  });

  vim-merginal = super.vim-merginal.overrideAttrs (old: {
    meta = old.meta // {
@ -5652,7 +5670,7 @@ assertNoAdditions {

  vim-tpipeline = super.vim-tpipeline.overrideAttrs {
    # Requires global variable
-    nvimSkipModules = "tpipeline.main";
+    nvimSkipModules = [ "tpipeline.main" ];
  };

  vim-twiggy = super.vim-twiggy.overrideAttrs (old: {
@ -5860,7 +5878,7 @@ assertNoAdditions {

  virt-column-nvim = super.virt-column-nvim.overrideAttrs {
    # Meta file
-    nvimSkipModules = "virt-column.config.types";
+    nvimSkipModules = [ "virt-column.config.types" ];
  };

  vis = super.vis.overrideAttrs (old: {
@ -5948,7 +5966,7 @@ assertNoAdditions {
  });

  xmake-nvim = super.xmake-nvim.overrideAttrs {
-    nvimSkipModule = [
+    nvimSkipModules = [
      # attempt to index upvalue 'options' (a nil value)
      "xmake.action"
      "xmake.command"
--- a/pkgs/applications/editors/vscode/extensions/ms-python.black-formatter/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-python.black-formatter/default.nix
@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
  mktplcRef = {
    publisher = "ms-python";
    name = "black-formatter";
-    version = "2026.4.0";
-    hash = "sha256-lt/68RWEpoBFTBWEsSSb/KL6BRmdt8mELBA1ypb5Pm0=";
+    version = "2026.6.0";
+    hash = "sha256-jTq5cpP3QwyAOF1VihAJA5ZYCpb3qbmeNIUPFr9Xph8=";
  };

  meta = {
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@ -93,6 +93,7 @@ let
          license = lib.licenses.bsd3;
          maintainers = with lib.maintainers; [
            felixsinger
+            hax404
            lilacious
          ];
          platforms = lib.platforms.linux ++ (overrides.platforms or [ ]);
--- a/pkgs/build-support/replace-vars/replace-vars-with.nix
+++ b/pkgs/build-support/replace-vars/replace-vars-with.nix
@ -122,7 +122,7 @@ in

 stdenvNoCC.mkDerivation (
  {
-    name = baseNameOf (toString src);
+    name = baseNameOf src;
  }
  // optionalAttrs
  // forcedAttrs
--- a/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix
+++ b/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix
@ -4347,7 +4347,7 @@ rec {
    sourceFilter =
      name: type:
      let
-        baseName = baseNameOf (toString name);
+        baseName = baseNameOf name;
      in
      !(
        # Filter out git
--- a/pkgs/build-support/substitute/substitute.nix
+++ b/pkgs/build-support/substitute/substitute.nix
@ -29,7 +29,7 @@
 args:

 let
-  name = if args ? name then args.name else baseNameOf (toString args.src);
+  name = args.name or (baseNameOf args.src);
  deprecationReplacement = lib.pipe args.replacements [
    lib.toList
    (map (lib.splitString " "))
--- a/pkgs/by-name/an/ankacoder-condensed/package.nix
+++ b/pkgs/by-name/an/ankacoder-condensed/package.nix
@ -4,12 +4,12 @@
  fetchzip,
 }:

-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "ankacoder-condensed";
  version = "1.100";

  src = fetchzip {
-    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/anka-coder-fonts/AnkaCoderCondensed.${version}.zip";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/anka-coder-fonts/AnkaCoderCondensed.${finalAttrs.version}.zip";
    stripRoot = false;
    hash = "sha256-NHrkV4Sb7i+DC4e4lToEYzah3pI+sKyYf2rGbhWj7iY=";
  };
@ -30,4 +30,4 @@ stdenvNoCC.mkDerivation rec {
    maintainers = [ ];
    platforms = lib.platforms.all;
  };
-}
+})
--- a/pkgs/by-name/ap/apache-jena-fuseki/package.nix
+++ b/pkgs/by-name/ap/apache-jena-fuseki/package.nix
@ -10,16 +10,19 @@
  pkgs,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "apache-jena-fuseki";
  version = "5.1.0";
+
  src = fetchurl {
-    url = "mirror://apache/jena/binaries/apache-jena-fuseki-${version}.tar.gz";
+    url = "mirror://apache/jena/binaries/apache-jena-fuseki-${finalAttrs.version}.tar.gz";
    hash = "sha256-GcwXcLVM2txPC+kkHjEIpqK9dTkQEN9Jkka0EaJRO7Q=";
  };
+
  nativeBuildInputs = [
    makeWrapper
  ];
+
  installPhase = ''
    cp -r . "$out"
    chmod +x $out/fuseki
@ -34,11 +37,13 @@ stdenv.mkDerivation rec {
        ;
    done
  '';
+
  passthru = {
    tests = {
      basic-test = pkgs.callPackage ./basic-test.nix { };
    };
  };
+
  meta = {
    description = "SPARQL server";
    license = lib.licenses.asl20;
@ -52,4 +57,4 @@ stdenv.mkDerivation rec {
    downloadPage = "https://archive.apache.org/dist/jena/binaries/";
    mainProgram = "fuseki";
  };
-}
+})
--- a/pkgs/by-name/ap/apache-jena/package.nix
+++ b/pkgs/by-name/ap/apache-jena/package.nix
@ -6,22 +6,26 @@
  makeWrapper,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "apache-jena";
  version = "6.1.0";
+
  src = fetchurl {
-    url = "mirror://apache/jena/binaries/apache-jena-${version}.tar.gz";
+    url = "mirror://apache/jena/binaries/apache-jena-${finalAttrs.version}.tar.gz";
    hash = "sha256-ZTEIqR/Zswmom8dWJYuuC8oBWHzvR1lC0RhS4766KuM=";
  };
+
  nativeBuildInputs = [
    makeWrapper
  ];
+
  installPhase = ''
    cp -r . "$out"
    for i in "$out"/bin/*; do
      wrapProgram "$i" --prefix "PATH" : "${jre}/bin/"
    done
  '';
+
  meta = {
    description = "RDF database";
    license = lib.licenses.asl20;
@ -30,4 +34,4 @@ stdenv.mkDerivation rec {
    homepage = "https://jena.apache.org";
    downloadPage = "https://archive.apache.org/dist/jena/binaries/";
  };
-}
+})
--- a/pkgs/by-name/ar/arti/package.nix
+++ b/pkgs/by-name/ar/arti/package.nix
@ -3,6 +3,7 @@
  stdenv,
  rustPlatform,
  fetchFromGitLab,
+  fetchpatch,
  pkg-config,
  sqlite,
  openssl,
@ -13,7 +14,7 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "arti";
-  version = "2.3.0";
+  version = "2.4.0";

  src = fetchFromGitLab {
    domain = "gitlab.torproject.org";
@ -21,9 +22,20 @@ rustPlatform.buildRustPackage (finalAttrs: {
    owner = "core";
    repo = "arti";
    tag = "arti-v${finalAttrs.version}";
-    hash = "sha256-OEGKjYJ3p4g0ZfeK6k8IJJPjgSBMrSlKlxsCw1OwyaI=";
+    hash = "sha256-YLOdrHstmN2pLl75uclkbpN5h3iBs3xpraZ8XN6R/+Q=";
  };

+  patches = [
+    # Fixes a panic that could allow malicious directory caches to crash
+    # clients.
+    # https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/4062
+    (fetchpatch {
+      name = "TROVE-2026-024.patch";
+      url = "https://gitlab.torproject.org/tpo/core/arti/-/commit/f69be8c70561629e63004788f0aa4bf898025f93.patch";
+      hash = "sha256-P0sXTKOBW7ulqQZwmTVJfrpLksLyaonuDpxGF2keDqE=";
+    })
+  ];
+
  # Working around a bug in cargo that appears with cargo-auditable, see
  # https://github.com/rust-secure-code/cargo-auditable/issues/124.
  postPatch = ''
@ -31,22 +43,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
      --replace-fail '"tor-rpcbase"' '"dep:tor-rpcbase"'
  '';

-  cargoHash = "sha256-OJgrIXL185W9rcQd7XZsgiqN4in74Oc2jDT1ZmcCC6E=";
+  buildAndTestSubdir = "crates/arti";
+  cargoHash = "sha256-7X3JJbt0/jxaMvBR3XQvguR7tqd96kiqX66G2byvPjM=";

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

  buildInputs = [ sqlite ] ++ lib.optionals stdenv.hostPlatform.isLinux [ openssl ];
-
-  cargoBuildFlags = [
-    "--package"
-    "arti"
-  ];
-
-  cargoTestFlags = [
-    "--package"
-    "arti"
-  ];
-
  # `full` includes all stable and non-conflicting feature flags. the primary
  # downsides are increased binary size and memory usage for building, but
  # those are acceptable for nixpkgs
@ -69,9 +71,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
  # sandbox. this does NOT affect downstream users of Arti.
  env.ARTI_FS_DISABLE_PERMISSION_CHECKS = 1;

-  nativeInstallCheckInputs = [
-    versionCheckHook
-  ];
+  nativeInstallCheckInputs = [ versionCheckHook ];
  doInstallCheck = true;

  passthru = {
@ -84,10 +84,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
    mainProgram = "arti";
    homepage = "https://arti.torproject.org/";
    changelog = "https://gitlab.torproject.org/tpo/core/arti/-/blob/arti-v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [
-      asl20
-      mit
-    ];
+    license =
+      with lib.licenses;
+      OR [
+        asl20
+        mit
+      ];
    maintainers = with lib.maintainers; [
      rapiteanu
      whispersofthedawn
--- a/pkgs/by-name/ca/cargo-mutants/package.nix
+++ b/pkgs/by-name/ca/cargo-mutants/package.nix
@ -7,16 +7,16 @@

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

  src = fetchFromGitHub {
    owner = "sourcefrog";
    repo = "cargo-mutants";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-ctbX5xoxmZzyvwJByDC7f71CLtpn8IkZTXTSdjXf25U=";
+    hash = "sha256-XPcxKBHTwLqHG67d/JNrCBC19DCnLyvLqj26v5MjHvM=";
  };

-  cargoHash = "sha256-+z2QSvSxKIt2giQYVcSOEqHvsUuLnxE2HqkA13W9KhY=";
+  cargoHash = "sha256-zKbw73lnOhgjSiCiXezo71S/9DaNfe7HII0QwUADrFA=";

  # too many tests require internet access
  doCheck = false;
--- a/pkgs/by-name/co/corrscope/package.nix
+++ b/pkgs/by-name/co/corrscope/package.nix
@ -2,6 +2,7 @@
  stdenv,
  lib,
  fetchFromGitHub,
+  gitUpdater,
  ffmpeg,
  python3Packages,
  qt6Packages,
@ -74,12 +75,18 @@ python3Packages.buildPythonApplication (finalAttrs: {
    )
  '';

-  passthru.tests.version = testers.testVersion {
-    package = corrscope;
-    # Tries writing to
-    # - $HOME/.local/share/corrscope on Linux
-    # - $HOME/Library/Application Support/corrscope on Darwin
-    command = "env HOME=$TMPDIR ${lib.getExe corrscope} --version";
+  passthru = {
+    tests.version = testers.testVersion {
+      package = corrscope;
+      # Tries writing to
+      # - $HOME/.local/share/corrscope on Linux
+      # - $HOME/Library/Application Support/corrscope on Darwin
+      command = "env HOME=$TMPDIR ${lib.getExe corrscope} --version";
+    };
+
+    updateScript = gitUpdater {
+      allowedVersions = "^[0-9.]+$";
+    };
  };

  meta = {
--- a/pkgs/by-name/de/delineate/package.nix
+++ b/pkgs/by-name/de/delineate/package.nix
@ -39,18 +39,18 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "delineate";
-  version = "0.1.1";
+  version = "0.1.2";

  src = fetchFromGitHub {
    owner = "SeaDve";
    repo = "Delineate";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-rYA5TKHX3QJHcUhaTFDpcXQ6tdaG3MbX8buvzV0V5iY=";
+    hash = "sha256-6SYYDxzBzs6nSrPp9TPKnIYHdoZJklTr5K0DSFx7S0s=";
  };

  cargoDeps = rustPlatform.fetchCargoVendor {
    inherit (finalAttrs) src;
-    hash = "sha256-6XBg9kbIr5k+TMQ/TE/qsAA5rKIevU9M1m+jsPrqfYw=";
+    hash = "sha256-G7K3aeSBnKcJHOlQQIHd3Kzoe/ienFVycTWOKOSRhZc=";
  };

  # rename $out/src -> $out/opt
--- a/pkgs/by-name/dr/drawio/package.nix
+++ b/pkgs/by-name/dr/drawio/package.nix
@ -14,25 +14,25 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "drawio";
-  version = "29.7.9";
+  version = "30.0.4";

  src = fetchFromGitHub {
    owner = "jgraph";
    repo = "drawio-desktop";
    rev = "v${finalAttrs.version}";
    fetchSubmodules = true;
-    hash = "sha256-D3jrVGP0RHKssSjvA8pg1qXfTjYq+linbXCbZz2kTNw=";
+    hash = "sha256-kkKiGRxztEVFo/wlcdBYcDlxadNarcTyL1MqwonfVY4=";
  };

  # `@electron/fuses` tries to run `codesign` and fails. Disable and use autoSignDarwinBinariesHook instead
  postPatch = ''
-    substituteInPlace ./build/fuses.cjs \
+    substituteInPlace ./build/fuses.mjs \
      --replace-fail "resetAdHocDarwinSignature:" "// resetAdHocDarwinSignature:"
  '';

  offlineCache = fetchNpmDeps {
    src = finalAttrs.src;
-    hash = "sha256-luOQn7S5hXdUa3VrJyQRt0IFLnzfrnTNHIIZSqHQhaI=";
+    hash = "sha256-hv1LQwsSOsBR5l/joUmXq6foQsVilH+jw3Wje24ISCg=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/du/dufs/package.nix
+++ b/pkgs/by-name/du/dufs/package.nix
@ -4,6 +4,7 @@
  fetchFromGitHub,
  installShellFiles,
  stdenv,
+  cacert,
 }:

 rustPlatform.buildRustPackage (finalAttrs: {
@ -23,6 +24,10 @@ rustPlatform.buildRustPackage (finalAttrs: {

  __darwinAllowLocalNetworking = true;

+  preCheck = ''
+    export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
+  '';
+
  checkFlags = [
    # tests depend on network interface, may fail with virtual IPs.
    "--skip=validate_printed_urls"
--- a/pkgs/by-name/fr/freeipmi/package.nix
+++ b/pkgs/by-name/fr/freeipmi/package.nix
@ -10,12 +10,12 @@
 }:

 stdenv.mkDerivation (finalAttrs: {
-  version = "1.6.17";
+  version = "1.6.18";
  pname = "freeipmi";

  src = fetchurl {
    url = "mirror://gnu/freeipmi/freeipmi-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-Fng9EPqiiEenlczgv4be6qcrj75x0fDcEQHROmtQHsE=";
+    sha256 = "sha256-gJiyOCADitCqOavw+aAS4kaD04TZ+R52CssqaLRl4P4=";
  };

  postPatch = lib.optionalString stdenv.cc.isClang ''
--- a/pkgs/by-name/gd/gdcm/package.nix
+++ b/pkgs/by-name/gd/gdcm/package.nix
@ -19,13 +19,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = if enablePython then "python-gdcm" else "gdcm";
-  version = "3.2.6";
+  version = "3.2.7";

  src = fetchFromGitHub {
    owner = "malaterre";
    repo = "GDCM";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-8ZNq89a369mm/hPe0tywo4Tqzt65Xhb0pbEguy8CSsA=";
+    hash = "sha256-j4n/IOLQiw+9j2hAS/fN2zWJI1xItFgm0BquPOZJr9E=";
  };

  cmakeFlags = [
--- a/pkgs/by-name/gl/glm/1_0_1.nix
+++ b/pkgs/by-name/gl/glm/1_0_1.nix
@ -9,7 +9,7 @@ callPackage ./generic.nix rec {
  src = fetchFromGitHub {
    owner = "g-truc";
    repo = "glm";
-    rev = version;
-    sha256 = "sha256-GnGyzNRpzuguc3yYbEFtYLvG+KiCtRAktiN+NvbOICE=";
+    tag = version;
+    hash = "sha256-GnGyzNRpzuguc3yYbEFtYLvG+KiCtRAktiN+NvbOICE=";
  };
 }
--- a/pkgs/by-name/gl/glm/generic.nix
+++ b/pkgs/by-name/gl/glm/generic.nix
@ -55,6 +55,7 @@ stdenv.mkDerivation rec {
  '';

  meta = {
+    changelog = "https://github.com/g-truc/glm/releases/tag/${src.tag}";
    description = "OpenGL Mathematics library for C++";
    longDescription = ''
      OpenGL Mathematics (GLM) is a header only C++ mathematics library for
--- a/pkgs/by-name/gl/glm/package.nix
+++ b/pkgs/by-name/gl/glm/package.nix
@ -4,12 +4,12 @@
 }:

 callPackage ./generic.nix rec {
-  version = "1.0.2";
+  version = "1.0.3";

  src = fetchFromGitHub {
    owner = "g-truc";
    repo = "glm";
-    rev = version;
-    sha256 = "sha256-2xKv1nO+OdwA0r+I9OZ+OCL9dJFg/LJsQfIvIF76vc0=";
+    tag = version;
+    hash = "sha256-6WnVvFiTe1/OYj/oTGpCjZKNFurR9MxJ4zf0nDg0Alk=";
  };
 }
--- a/pkgs/by-name/ha/handheld-daemon/package.nix
+++ b/pkgs/by-name/ha/handheld-daemon/package.nix
@ -16,14 +16,14 @@
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
  pname = "handheld-daemon";
-  version = "4.1.8";
+  version = "4.1.9";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "hhd-dev";
    repo = "hhd";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-KPjna0yJXXSQBwpRO5b3Fc9C6H14uboJzvQ1LefeXFc=";
+    hash = "sha256-pzcMIXLZUkSqJuZTujAoKjfPuZgtit4u08wHZPPz8Ss=";
  };

  # Handheld-daemon runs some selinux-related utils which are not in nixpkgs.
--- a/pkgs/by-name/ic/icewm/package.nix
+++ b/pkgs/by-name/ic/icewm/package.nix
@ -33,6 +33,7 @@
  libsndfile,
  libtiff,
  libxcb,
+  libxcursor,
  mkfontdir,
  pcre2,
  perl,
@ -41,13 +42,13 @@

 gccStdenv.mkDerivation (finalAttrs: {
  pname = "icewm";
-  version = "3.8.2";
+  version = "4.0.0";

  src = fetchFromGitHub {
    owner = "ice-wm";
    repo = "icewm";
    tag = finalAttrs.version;
-    hash = "sha256-CbIQICov0h3lBDT54dEODkINNXou6CUEhRQAPZwfYK0=";
+    hash = "sha256-4+nW8JJ3CDEPOZZ4p0EZM86h+rAifTuGDZxoFMUI7K0=";
  };

  strictDeps = true;
@ -90,6 +91,7 @@ gccStdenv.mkDerivation (finalAttrs: {
    libsndfile
    libtiff
    libxcb
+    libxcursor
    mkfontdir
    pcre2
  ];
@ -109,6 +111,7 @@ gccStdenv.mkDerivation (finalAttrs: {

  meta = {
    homepage = "https://ice-wm.org/";
+    changelog = "https://github.com/ice-wm/icewm/releases/tag/${finalAttrs.src.tag}";
    description = "Simple, lightweight X window manager";
    longDescription = ''
      IceWM is a window manager for the X Window System. The goal of IceWM is
--- a/pkgs/by-name/in/intel-vaapi-driver/package.nix
+++ b/pkgs/by-name/in/intel-vaapi-driver/package.nix
@ -20,15 +20,15 @@
  nix-update-script,
 }:

-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
  pname = "intel-vaapi-driver";
-  version = "2.4.1-unstable-2024-10-29";
+  version = "2.4.5";

  src = fetchFromGitHub {
-    owner = "intel";
+    owner = "irql-notlessorequal";
    repo = "intel-vaapi-driver";
-    rev = "fd727a4e9cb8b2878a1e93d4dddc8dd1c1a4e0ea";
-    hash = "sha256-OMFdRjzpUKdxB9eK/1OLYLaOC3NHnzZVxmh6yKrbYoE=";
+    tag = finalAttrs.version;
+    hash = "sha256-exQBA42jCmwybE7WIfF83cjmzBdtluDzUtOdqt49HSg=";
  };

  # Set the correct install path:
@ -67,10 +67,11 @@ stdenv.mkDerivation {

  enableParallelBuilding = true;

-  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+  passthru.updateScript = nix-update-script { };

  meta = {
-    homepage = "https://01.org/linuxmedia";
+    homepage = "https://github.com/irql-notlessorequal/intel-vaapi-driver";
+    changelog = "https://github.com/irql-notlessorequal/intel-vaapi-driver/blob/${finalAttrs.src.tag}/NEWS";
    license = lib.licenses.mit;
    description = "VA-API user mode driver for Intel GEN Graphics family";
    longDescription = ''
@ -89,4 +90,4 @@ stdenv.mkDerivation {
    ];
    maintainers = with lib.maintainers; [ SuperSandro2000 ];
  };
-}
+})
--- a/pkgs/by-name/ka/katago/package.nix
+++ b/pkgs/by-name/ka/katago/package.nix
@ -29,10 +29,8 @@ assert lib.assertOneOf "backend" backend [
  "eigen"
 ];

-# N.b. older versions of cuda toolkit (e.g. 10) do not support newer versions
-# of gcc.  If you need to use cuda10, please override stdenv with gcc8Stdenv
 let
-  githash = "cd0ed6c0712088ddb901be68189ba7fa1439a9e7";
+  githash = "ba938676d7f42d70950b3a535af2466fb642008c";
  fakegit = writeShellScriptBin "git" "echo ${githash}";
  stdenv' =
    if
@ -47,13 +45,13 @@ let
 in
 stdenv'.mkDerivation rec {
  pname = "katago";
-  version = "1.15.3";
+  version = "1.16.5";

  src = fetchFromGitHub {
    owner = "lightvector";
    repo = "katago";
    rev = "v${version}";
-    sha256 = "sha256-hZc8LlOxnVqJqyqOSIWKv3550QOaGr79xgqsAQ8B8SM=";
+    sha256 = "sha256-+s4JO6+UMyeSHUqyRFEhJD2kmsdhcydanFWjTqxC1Tc=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/ki/kilo/package.nix
+++ b/pkgs/by-name/ki/kilo/package.nix
@ -0,0 +1,200 @@
+{
+  lib,
+  stdenvNoCC,
+  bun,
+  fetchFromGitHub,
+  installShellFiles,
+  makeBinaryWrapper,
+  models-dev,
+  nix-update-script,
+  ripgrep,
+  sysctl,
+  versionCheckHook,
+  writableTmpDirAsHomeHook,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "kilo";
+  version = "7.3.40";
+
+  src = fetchFromGitHub {
+    owner = "Kilo-Org";
+    repo = "kilocode";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Jw2C8C7dFPwOGp8tg6ewcRXdVsJEDDFSe+xuF86Xwfc=";
+  };
+
+  node_modules = stdenvNoCC.mkDerivation {
+    pname = "${finalAttrs.pname}-node_modules";
+    inherit (finalAttrs) version src;
+
+    impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
+      "GIT_PROXY_COMMAND"
+      "SOCKS_SERVER"
+    ];
+
+    nativeBuildInputs = [
+      bun
+      writableTmpDirAsHomeHook
+    ];
+
+    dontConfigure = true;
+
+    buildPhase = ''
+      runHook preBuild
+
+      export BUN_INSTALL_CACHE_DIR=$(mktemp -d)
+      bun install \
+        --cpu="*" \
+        --frozen-lockfile \
+        --ignore-scripts \
+        --no-progress \
+        --os="*"
+
+      bun --bun ./nix/scripts/canonicalize-node-modules.ts
+      bun --bun ./nix/scripts/normalize-bun-binaries.ts
+
+      runHook postBuild
+    '';
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out
+      find . -type d -name node_modules -exec cp -R --parents {} $out \;
+
+      runHook postInstall
+    '';
+
+    dontFixup = true;
+
+    outputHash = "sha256-Defmk7fN49UQtBpmWIFGnUiPlBpJtLp+8QaFFQCAY8k=";
+    outputHashAlgo = "sha256";
+    outputHashMode = "recursive";
+  };
+
+  nativeBuildInputs = [
+    bun
+    installShellFiles
+    makeBinaryWrapper
+    models-dev
+    writableTmpDirAsHomeHook
+  ];
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  postPatch = ''
+    # NOTE: Relax Bun version check to be a warning instead of an error.
+    substituteInPlace packages/script/src/index.ts \
+      --replace-fail 'throw new Error(`This script requires bun@''${expectedBunVersionRange}' \
+                     'console.warn(`Warning: This script requires bun@''${expectedBunVersionRange}'
+    substituteInPlace packages/opencode/script/build.ts \
+      --replace-fail 'await $`patchelf --set-interpreter ''${interpreter} dist/''${name}/bin/kilo`' \
+                     'await $`true`'
+  '';
+
+  configurePhase = ''
+    runHook preConfigure
+
+    cp -R ${finalAttrs.node_modules}/. .
+    patchShebangs node_modules
+    patchShebangs packages/*/node_modules
+
+    runHook postConfigure
+  '';
+
+  env.KILO_CHANNEL = "latest";
+  env.KILO_VERSION = finalAttrs.version;
+  env.MODELS_DEV_API_JSON = "${models-dev}/dist/_api.json";
+
+  buildPhase = ''
+    runHook preBuild
+
+    cd ./packages/opencode
+    bun --bun ./script/build.ts --single --skip-install --skip-embed-web-ui
+    bun --bun ./script/schema.ts config.json tui.json
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 dist/@kilocode/cli-*/bin/kilo $out/bin/kilo
+    ln -s kilo $out/bin/kilocode
+
+    wrapProgram $out/bin/kilo \
+      --prefix PATH : ${
+        lib.makeBinPath (
+          [
+            ripgrep
+          ]
+          ++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [
+            sysctl
+          ]
+        )
+      }
+
+    install -Dm644 config.json $out/share/kilocode/config.json
+    install -Dm644 tui.json $out/share/kilocode/tui.json
+
+    runHook postInstall
+  '';
+
+  postInstall = lib.optionalString (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) ''
+    installShellCompletion --cmd kilo \
+      --bash <($out/bin/kilo completion) \
+      --zsh <(SHELL=/bin/zsh $out/bin/kilo completion)
+  '';
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+    writableTmpDirAsHomeHook
+  ];
+  doInstallCheck = true;
+  versionCheckKeepEnvironment = [
+    "HOME"
+    "KILO_CHANNEL"
+    "KILO_VERSION"
+    "MODELS_DEV_API_JSON"
+  ];
+  versionCheckProgram = "${placeholder "out"}/bin/kilo";
+  versionCheckProgramArg = "--version";
+
+  passthru = {
+    jsonschema = {
+      config = "${placeholder "out"}/share/kilocode/config.json";
+      tui = "${placeholder "out"}/share/kilocode/tui.json";
+    };
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--subpackage"
+        "node_modules"
+      ];
+    };
+  };
+
+  meta = {
+    description = "Terminal User Interface for Kilo Code";
+    homepage = "https://github.com/Kilo-Org/kilocode";
+    changelog = "https://github.com/Kilo-Org/kilocode/releases/tag/v${finalAttrs.version}";
+    downloadPage = "https://www.npmjs.com/package/@kilocode/cli";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      xiaoxiangmoe
+    ];
+    sourceProvenance = with lib.sourceTypes; [ fromSource ];
+    mainProgram = "kilo";
+    platforms = [
+      "aarch64-linux"
+      "x86_64-linux"
+      "aarch64-darwin"
+      "x86_64-darwin"
+    ];
+    badPlatforms = [
+      # Broken due to Bun requiring AVX when run via Rosetta 2 on Apple Silicon.
+      "x86_64-darwin"
+    ];
+  };
+})
--- a/pkgs/by-name/ki/kilocode-cli/package.nix
+++ b/pkgs/by-name/ki/kilocode-cli/package.nix
@ -1,136 +0,0 @@
-{
-  lib,
-  stdenv,
-  stdenvNoCC,
-  fetchFromGitHub,
-  fetchPnpmDeps,
-  fetchNpmDeps,
-  nodejs,
-  writableTmpDirAsHomeHook,
-  pnpmConfigHook,
-  pnpm_10,
-  unzip,
-  patchelf,
-  autoPatchelfHook,
-  ripgrep,
-  versionCheckHook,
-  nix-update-script,
-}:
-let
-  pnpm = pnpm_10;
-in
-stdenvNoCC.mkDerivation (finalAttrs: {
-  pname = "kilocode-cli";
-  version = "0.25.1";
-
-  src = fetchFromGitHub {
-    owner = "Kilo-Org";
-    repo = "kilocode-legacy";
-    tag = "cli-v${finalAttrs.version}";
-    hash = "sha256-XlJ9/9FABLpKVJXdIRzbzOpJVXdIzgFvPPeER1LRsuk=";
-  };
-
-  pnpmDeps = fetchPnpmDeps {
-    inherit (finalAttrs) pname version src;
-    inherit pnpm;
-    fetcherVersion = 3;
-    hash = "sha256-Q/LamZwVaIQVILtXRi1RQrYtpxYJWEKPAt3knwm47S0=";
-  };
-
-  npmDeps = fetchNpmDeps {
-    name = "${finalAttrs.pname}-npm-deps";
-    inherit (finalAttrs) src;
-    sourceRoot = "${finalAttrs.src.name}/cli";
-    postPatch = ''
-      cp ./npm-shrinkwrap.dist.json ./npm-shrinkwrap.json
-    '';
-    hash = "sha256-wH4Gyd5nv8sCSQStFqIidoICvlXXEs2xNNX+DH133wA=";
-  };
-
-  buildInputs = [
-    nodejs
-  ];
-
-  nativeBuildInputs = [
-    writableTmpDirAsHomeHook
-    pnpmConfigHook
-    pnpm
-    nodejs
-    unzip
-    patchelf
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isElf [ autoPatchelfHook ];
-
-  strictDeps = true;
-
-  env.npm_config_manage_package_manager_versions = "false";
-
-  buildPhase = ''
-    runHook preBuild
-
-    mkdir -p ./cli/.dist/
-    find ./cli -maxdepth 1 -type f -name "*.dist.*" -print0 | while IFS= read -r -d "" file; do
-      cp "$file" "./cli/.dist/$(basename "$file" | sed 's/\.dist\././')"
-    done
-
-    if ! diff "$PWD/cli/npm-shrinkwrap.dist.json" "$npmDeps/package-lock.json"; then
-      echo "npm-shrinkwrap.json is out of date"
-      echo "The npm-shrinkwrap.json in src is not the same as the in $npmDeps."
-      echo "To fix the issue:"
-      echo '1. Use `lib.fakeHash` as the npmDepsHash value'
-      echo "2. Build the derivation and wait for it to fail with a hash mismatch"
-      echo "3. Copy the 'got: sha256-' value back into the npmDepsHash field"
-      exit 1
-    fi
-    export npm_config_cache="$npmDeps"
-    export npm_config_offline="true"
-    export npm_config_progress="false"
-    (
-      cd ./cli/.dist
-      npm ci --omit=dev --ignore-scripts
-      patchShebangs node_modules
-      if [ -d node_modules/@vscode/ripgrep ]; then
-        mkdir -p node_modules/@vscode/ripgrep/bin
-        ln -s ${lib.getExe ripgrep} node_modules/@vscode/ripgrep/bin/rg
-      fi
-      npm rebuild
-    )
-    substituteInPlace cli/package.json \
-      --replace-fail 'npm install --omit=dev --prefix ./dist' 'mv ./.dist/node_modules ./dist/node_modules'
-
-    node --run cli:bundle
-    touch ./cli/dist/.env
-
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/bin/ $out/lib/node_modules/@kilocode/
-    mv ./cli/dist $out/lib/node_modules/@kilocode/cli
-    ln -s $out/lib/node_modules/@kilocode/cli/index.js $out/bin/kilocode
-    chmod +x $out/bin/kilocode
-
-    runHook postInstall
-  '';
-
-  nativeInstallCheckInputs = [ versionCheckHook ];
-  doInstallCheck = true;
-  versionCheckProgramArg = "--version";
-
-  passthru = {
-    updateScript = nix-update-script { extraArgs = [ "--version-regex=^cli-v(.+)$" ]; };
-  };
-
-  meta = {
-    description = "Terminal User Interface for Kilo Code";
-    homepage = "https://kilocode.ai/cli";
-    downloadPage = "https://www.npmjs.com/package/@kilocode/cli";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [
-      xiaoxiangmoe
-    ];
-    mainProgram = "kilocode";
-  };
-})
--- a/pkgs/by-name/kl/klog-rs/package.nix
+++ b/pkgs/by-name/kl/klog-rs/package.nix
@ -7,26 +7,34 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "klog-rs";
-  version = "0.5.1";
+  version = "0.6.0";
+
+  __structuredAttrs = true;

  src = fetchFromGitHub {
    owner = "tobifroe";
    repo = "klog";
-    rev = finalAttrs.version;
-    hash = "sha256-VyUUzhVwJ1tNLICXwy7f85queH+pn4vL5HTL8IHcQ7w=";
+    tag = finalAttrs.version;
+    hash = "sha256-9NYtT4psGaWBVpwprpAdzEaWrmDRRnI1UDVD3Quzj6g=";
  };

-  cargoHash = "sha256-KJxssCN9/WoRR1Cv67CK5muVy+cqEEfzSioQtptplQs=";
-  checkFlags = [
+  cargoHash = "sha256-sDjNJAOFW+0wRN9CCDZRj1q0juczugLibst7ys/mERc=";
+
+  checkFlags = map (t: "--skip=${t}") [
    # this integration test depends on a running kubernetes cluster
-    "--skip=k8s::tests::test_get_pod_list"
-    "--skip=k8s::tests::test_get_pod_list_for_resource"
+    "k8s::tests::test_get_pod_list"
+    "k8s::tests::test_get_pod_list_for_resource"
+    "tests::test_active_pods_tracking"
+    "tests::test_pod_manager_clone"
+    "tests::test_pod_manager_creation"
+    "tests::test_refresh_interval_zero_disables_refresh"
+    "tests::test_start_pod_logs_spawns_task"
  ];

  meta = {
    description = "Tool to tail logs of multiple Kubernetes pods simultaneously";
    homepage = "https://github.com/tobifroe/klog";
-    changelog = "https://github.com/tobifroe/klog/releases/tag/${finalAttrs.version}";
+    changelog = "https://github.com/tobifroe/klog/releases/tag/${finalAttrs.src.tag}";
    license = lib.licenses.mit;
    mainProgram = "klog";
    maintainers = with lib.maintainers; [ tobifroe ];
--- a/pkgs/by-name/ko/konbucase/package.nix
+++ b/pkgs/by-name/ko/konbucase/package.nix
@ -16,13 +16,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "konbucase";
-  version = "4.4.0";
+  version = "4.5.1";

  src = fetchFromGitHub {
    owner = "ryonakano";
    repo = "konbucase";
    tag = finalAttrs.version;
-    hash = "sha256-56P2RueZSsuQth8IB73r3WYXCQ+rEyfQpGXhLAAeFlY=";
+    hash = "sha256-MD+hWZ2+gDuaXdqPUMwbROEzvUgq/YcxGjbz+1fkI9M=";
    fetchSubmodules = true;
  };

--- a/pkgs/by-name/ku/kulala-core/package.nix
+++ b/pkgs/by-name/ku/kulala-core/package.nix
@ -10,7 +10,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "kulala-core";
-  version = "0.13.0";
+  version = "0.14.1";

  strictDeps = true;
  __structuredAttrs = true;
@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "mistweaverco";
    repo = "kulala-core";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-pUBG8tlybpd/YPArIssCEy5Op47MVPLJsOOolVItZpU=";
+    hash = "sha256-1EtYAKulMQbtYWHZ8MkUA1fMcL3V07/Sz1sjl5PnaI4=";
  };

  node_modules = stdenv.mkDerivation {
@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {

    dontFixup = true;

-    outputHash = "sha256-NjHm6KU6Cd0ZyL1c+bmNbEHb5E83/xjQ5UGRjY1hzgQ=";
+    outputHash = "sha256-XQlBawD3vt8pVc7Gy9XeiGie89HWbljNJt7kUEDaDKk=";
    outputHashAlgo = "sha256";
    outputHashMode = "recursive";
  };
--- a/pkgs/by-name/ku/kulala-fmt/package.nix
+++ b/pkgs/by-name/ku/kulala-fmt/package.nix
@ -1,36 +1,116 @@
 {
  lib,
-  buildGoModule,
+  stdenv,
+  bun,
  fetchFromGitHub,
+  kulala-core,
+  makeBinaryWrapper,
+  nodejs,
+  writableTmpDirAsHomeHook,
 }:

-buildGoModule (finalAttrs: {
+stdenv.mkDerivation (finalAttrs: {
  pname = "kulala-fmt";
-  version = "1.4.0";
+  version = "3.1.0";
+
+  strictDeps = true;
+  __structuredAttrs = true;

  src = fetchFromGitHub {
    owner = "mistweaverco";
    repo = "kulala-fmt";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-yq7DMrt+g5wM/tynI7Cf6MBJs/d+fP3IppndKnTJMTw=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-4rVsw3dyoKrC6lj8m2R42iZmBk5G2LIVtV6Ro9pHSBo=";
  };

-  vendorHash = "sha256-GazDEm/qv0nh8vYT+Tf0n4QDGHlcYtbMIj5rlZBvpKo=";
+  node_modules = stdenv.mkDerivation {
+    pname = "${finalAttrs.pname}-node_modules";
+    inherit (finalAttrs) version src;

-  env.CGO_ENABLED = 0;
+    strictDeps = true;
+    __structuredAttrs = true;

-  ldflags = [
-    "-s"
-    "-w"
-    "-X github.com/mistweaverco/kulala-fmt/cmd/kulalafmt.VERSION=${finalAttrs.version}"
+    nativeBuildInputs = [
+      bun
+      writableTmpDirAsHomeHook
+    ];
+
+    dontConfigure = true;
+
+    buildPhase = ''
+      runHook preBuild
+
+      bun install \
+        --cpu="*" \
+        --frozen-lockfile \
+        --ignore-scripts \
+        --no-progress \
+        --os="*"
+
+      runHook postBuild
+    '';
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out
+      cp -R node_modules $out/
+
+      runHook postInstall
+    '';
+
+    dontFixup = true;
+
+    outputHash = "sha256-z+jQC2RCav3VG/agWizcWFat8KgkGdBzaGQriviEbyo=";
+    outputHashAlgo = "sha256";
+    outputHashMode = "recursive";
+  };
+
+  nativeBuildInputs = [
+    bun
+    makeBinaryWrapper
+    nodejs
  ];

+  dontConfigure = true;
+
+  buildPhase = ''
+    runHook preBuild
+
+    cp -R ${finalAttrs.node_modules}/node_modules .
+    patchShebangs node_modules
+    bun run build
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 dist/cli.cjs $out/lib/kulala-fmt/cli.cjs
+    makeBinaryWrapper ${lib.getExe nodejs} $out/bin/kulala-fmt \
+      --add-flags $out/lib/kulala-fmt/cli.cjs \
+      --set KULALA_CORE_PATH ${lib.getExe kulala-core}
+
+    runHook postInstall
+  '';
+
+  doInstallCheck = true;
+  installCheckPhase = ''
+    runHook preInstallCheck
+
+    $out/bin/kulala-fmt --version | grep -x ${lib.escapeShellArg finalAttrs.version}
+    printf '%s\n' 'GET https://example.com' | $out/bin/kulala-fmt format --stdin | grep 'GET https://example.com'
+
+    runHook postInstallCheck
+  '';
+
  meta = {
    description = "Opinionated .http and .rest files linter and formatter";
    homepage = "https://github.com/mistweaverco/kulala-fmt";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ CnTeng ];
    mainProgram = "kulala-fmt";
-    platforms = lib.platforms.all;
+    platforms = nodejs.meta.platforms;
  };
 })
--- a/pkgs/by-name/li/libcmis/package.nix
+++ b/pkgs/by-name/li/libcmis/package.nix
@ -2,39 +2,37 @@
  lib,
  stdenv,
  fetchFromGitHub,
-  fetchpatch,
  boost,
  libxml2,
  pkg-config,
-  docbook2x,
+  docbook_xml_dtd_43,
  curl,
  autoreconfHook,
  cppunit,
+  xmlto,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "libcmis";
-  version = "0.6.2";
+  version = "0.6.3";

  src = fetchFromGitHub {
    owner = "tdf";
    repo = "libcmis";
-    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-HXiyQKjOlQXWABY10XrOiYxPqfpmUJC3a6xD98LIHDw=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-chLY9tbhVPIiP+twsNM2SM7Bqyau/evQGKHfjlac6ys=";
  };

-  patches = [
-    # Backport to fix build with boost 1.86
-    (fetchpatch {
-      url = "https://github.com/tdf/libcmis/commit/3659d32999ff7593662dcf5136bcb7ac15c13f61.patch";
-      hash = "sha256-EXmQcXCHaVnF/dwU3Z4WLtaiHjYHeeonlKdyK27UkiY=";
-    })
-  ];
+  postPatch = ''
+    substituteInPlace doc/cmis-client.xml.in \
+      --replace-fail "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \
+                     "${docbook_xml_dtd_43}/xml/dtd/docbook/docbookx.dtd"
+  '';

  nativeBuildInputs = [
    autoreconfHook
    pkg-config
-    docbook2x
+    xmlto
  ];
  buildInputs = [
    boost
@ -45,7 +43,6 @@ stdenv.mkDerivation (finalAttrs: {

  configureFlags = [
    "--disable-werror"
-    "DOCBOOK2MAN=${docbook2x}/bin/docbook2man"
    "--with-boost=${boost.dev}"
  ];

@ -54,6 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
  enableParallelBuilding = true;

  meta = {
+    changelog = "https://github.com/tdf/libcmis/blob/${finalAttrs.src.tag}/NEWS";
    description = "C++ client library for the CMIS interface";
    homepage = "https://github.com/tdf/libcmis";
    license = lib.licenses.gpl2;
--- a/pkgs/by-name/li/libetpan/package.nix
+++ b/pkgs/by-name/li/libetpan/package.nix
@ -2,7 +2,6 @@
  stdenv,
  lib,
  fetchFromGitHub,
-  fetchpatch,
  autoconf,
  automake,
  libtool,
@ -12,13 +11,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "libetpan";
-  version = "1.9.4";
+  version = "1.10";

  src = fetchFromGitHub {
    owner = "dinhviethoa";
    repo = "libetpan";
-    rev = finalAttrs.version;
-    hash = "sha256-lukeWURNsRPTuFk2q2XVnwkKz5Y+PRiPba5GPQCw6jw=";
+    tag = finalAttrs.version;
+    hash = "sha256-dG1qsYv9W0l6LLMW+XnKtUunga3IGVxEy34Tnp+K99o=";
  };

  outputs = [
@ -26,75 +25,6 @@ stdenv.mkDerivation (finalAttrs: {
    "dev"
  ];

-  patches = [
-    # The following patches are security and/or reliability fixes.
-    # They all must be removed for the next version bump.
-
-    # Fix potential null pointer deference
-    # https://github.com/dinhvh/libetpan/pull/348
-    (fetchpatch {
-      name = "pr-348-null-pointer-deference.patch";
-      url = "https://github.com/dinhvh/libetpan/commit/720e92e5752e562723a9730f8e604cb78f3a9163.patch";
-      hash = "sha256-/bA/ekeMhLE3OyREHIanlrb+uuSxwur+ZloeaX9AyyM=";
-    })
-
-    # Fix potential null pointer deference
-    # https://github.com/dinhvh/libetpan/pull/361
-    (fetchpatch {
-      name = "pr-361-null-pointer-deference.patch";
-      url = "https://github.com/dinhvh/libetpan/commit/0cdefb017fcfd0fae56a151dc14c8439a38ecc44.patch";
-      hash = "sha256-qbWisOCPI91AIXzg3n7mceSVbBKHZXd8Z0z1u/SrIG8=";
-    })
-
-    # Fix potential null pointer deference
-    # https://github.com/dinhvh/libetpan/pull/363
-    (fetchpatch {
-      name = "pr-363-null-pointer-deference.patch";
-      url = "https://github.com/dinhvh/libetpan/commit/68bde8b12b40a680c29d228f0b8fe4dfbf2d8d0b.patch";
-      hash = "sha256-dUbnh2RoeELk/usHeFsdGC+J198jcudx3rb6/3sUAX0=";
-    })
-
-    # Missing boundary fix
-    # https://github.com/dinhvh/libetpan/pull/384
-    (fetchpatch {
-      name = "pr-384-missing-boundary-fix.patch";
-      url = "https://github.com/dinhvh/libetpan/commit/24c485495216c00076b29391591f46b61fcb3dac.patch";
-      hash = "sha256-6ry8EfiYgbMtQYtT7L662I1A7N7N6OOy9T2ECgR7+cI=";
-    })
-
-    # CVE-2020-15953: Detect extra data after STARTTLS response and exit
-    # https://github.com/dinhvh/libetpan/pull/387
-    (fetchpatch {
-      name = "cve-2020-15953-imap.patch";
-      url = "https://github.com/dinhvh/libetpan/commit/1002a0121a8f5a9aee25357769807f2c519fa50b.patch";
-      hash = "sha256-dqnHZAzX6ym8uF23iKVotdHQv9XQ/BGBAiRGSb7QLcE=";
-    })
-
-    # CVE-2020-15953: Detect extra data after STARTTLS responses in SMTP and POP3 and exit
-    # https://github.com/dinhvh/libetpan/pull/388
-    (fetchpatch {
-      name = "cve-2020-15953-pop3-smtp.patch";
-      url = "https://github.com/dinhvh/libetpan/commit/298460a2adaabd2f28f417a0f106cb3b68d27df9.patch";
-      hash = "sha256-QI0gvLGUik4TQAz/pxwVfOhZc/xtj6jcWPZkJVsSCFM=";
-    })
-
-    # Fix buffer overwrite for empty string in remove_trailing_eol
-    # https://github.com/dinhvh/libetpan/pull/408
-    (fetchpatch {
-      name = "pr-408-fix-buffer-overwrite.patch";
-      url = "https://github.com/dinhvh/libetpan/commit/078b924c7f49ac435b10b0f53a73f1bbc4717064.patch";
-      hash = "sha256-lBRS+bv/7IK7yat2p3mc0SRYn/wRB/spjE7ungj6DT0=";
-    })
-
-    # CVE-2022-4121: Fixed crash when st_info_list is NULL.
-    # https://github.com/dinhvh/libetpan/issues/420
-    (fetchpatch {
-      name = "cve-2022-4121.patch";
-      url = "https://github.com/dinhvh/libetpan/commit/5c9eb6b6ba64c4eb927d7a902317410181aacbba.patch";
-      hash = "sha256-O+LUkI91oej7MFg4Pg6/xq1uhSanweH81VzPXBdiPh4=";
-    })
-  ];
-
  nativeBuildInputs = [
    autoconf
    automake
@ -109,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
  configureScript = "./autogen.sh";

  meta = {
+    changelog = "https://github.com/dinhvh/libetpan/releases/tag/${finalAttrs.src.tag}";
    description = "Mail Framework for the C Language";
    homepage = "https://www.etpan.org/libetpan.html";
    license = lib.licenses.bsd3;
--- a/pkgs/by-name/li/libfreehand/package.nix
+++ b/pkgs/by-name/li/libfreehand/package.nix
@ -2,7 +2,6 @@
  lib,
  stdenv,
  fetchzip,
-  fetchpatch,
  perl,
  pkg-config,
  boost,
@ -16,11 +15,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "libfreehand";
-  version = "0.1.2";
+  version = "0.1.3";

  src = fetchzip {
    url = "https://dev-www.libreoffice.org/src/libfreehand/libfreehand-${finalAttrs.version}.tar.xz";
-    hash = "sha256-0icEGnTtYveP24FbYjRB7tFW/TquSOszbqZspHAhQ7I=";
+    hash = "sha256-ZcvG00JP3BoFv1PIeAhZyr7t1zANhTVluBZQqEbWCvY=";
  };

  nativeBuildInputs = [
@ -41,13 +40,6 @@ stdenv.mkDerivation (finalAttrs: {

  configureFlags = [ "--disable-werror" ];

-  patches = [
-    (fetchpatch {
-      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libfreehand/-/raw/main/libfreehand-0.1.2-icu-fix.patch?ref_type=heads";
-      hash = "sha256-SRkcF+FRkFdueLSTOMYWo6+CCl05f0OBP6G5VrXRyCw=";
-    })
-  ];
-
  meta = {
    description = "Adobe Freehand import library";
    homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libfreehand";
--- a/pkgs/by-name/li/liblangtag/package.nix
+++ b/pkgs/by-name/li/liblangtag/package.nix
@ -16,18 +16,18 @@

 stdenv.mkDerivation rec {
  pname = "liblangtag";
-  version = "0.6.7";
+  version = "0.6.8";

  # Artifact tarball contains lt-localealias.h needed for darwin
  src = fetchurl {
-    url = "https://bitbucket.org/tagoh/liblangtag/downloads/liblangtag-${version}.tar.bz2";
-    hash = "sha256-Xta81K4/PAXJEuYvIWzRpEEjhGFH9ymkn7VmjaUeAw4=";
+    url = "https://gitlab.com/tagoh/liblangtag/-/releases/${version}/downloads/liblangtag-${version}.tar.bz2";
+    hash = "sha256-qWl1t53dj+9tkpXAg/4/GvoaiJilcjXUBpJVreROXPI=";
  };

  core_zip = fetchurl {
    # please update if an update is available
-    url = "http://www.unicode.org/Public/cldr/46/core.zip";
-    hash = "sha256-+86cInWGKtJmaPs0eD/mwznz2S3f61oQoXdftYGBoV0=";
+    url = "http://www.unicode.org/Public/cldr/48/core.zip";
+    hash = "sha256-BsfGmNb9jWfO+sFaAgawEJsA4O8WNvhvhESfqVlWH3Q=";
  };

  language_subtag_registry = fetchurl {
@ -66,11 +66,11 @@ stdenv.mkDerivation rec {
  ];

  meta = {
+    changelog = "https://gitlab.com/tagoh/liblangtag/-/blob/${version}/NEWS";
    description = "Interface library to access tags for identifying languages";
    license = lib.licenses.mpl20;
    maintainers = [ lib.maintainers.raskin ];
    platforms = lib.platforms.unix;
-    # There are links to a homepage that are broken by a BitBucket change
-    homepage = "https://bitbucket.org/tagoh/liblangtag/overview";
+    homepage = "https://gitlab.com/tagoh/liblangtag";
  };
 }
--- a/pkgs/by-name/li/libminc/package.nix
+++ b/pkgs/by-name/li/libminc/package.nix
@ -11,13 +11,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "libminc";
-  version = "2.4.07";
+  version = "2.5.0";

  src = fetchFromGitHub {
    owner = "BIC-MNI";
    repo = "libminc";
    tag = "release-${finalAttrs.version}";
-    hash = "sha256-F5c0S4fybkrdpDJQ0nz6MvTdjq1qM1nJVxXuxXbCeSI=";
+    hash = "sha256-IQS8JDkZwLR73I5GpWKRT07zj7Ek2tdZ2TOjy02OjaQ=";
  };

  postPatch = ''
--- a/pkgs/by-name/ma/manix/package.nix
+++ b/pkgs/by-name/ma/manix/package.nix
@ -6,16 +6,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "manix";
-  version = "0.8.0";
+  version = "0.9.0";

  src = fetchFromGitHub {
    owner = "nix-community";
    repo = "manix";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-b/3NvY+puffiQFCQuhRMe81x2wm3vR01MR3iwe/gJkw=";
+    hash = "sha256-hniN0mc7Ud+5zDlOuf2F+/DKrtQ6grZF74ej0L6gMso=";
  };

-  cargoHash = "sha256-6KkZg8MXQIewhwdLE8NiqllJifa0uvebU1/MqeE/bdI=";
+  cargoHash = "sha256-FTrKdOuXTOqr7on4RzYl/UxgUJqh+Rk3KJXqsW0fuo0=";

  meta = {
    description = "Fast CLI documentation searcher for Nix";
--- a/pkgs/by-name/me/megabasterd/package.nix
+++ b/pkgs/by-name/me/megabasterd/package.nix
@ -6,7 +6,7 @@
  maven,
 }:
 let
-  version = "8.51";
+  version = "8.57";
 in
 maven.buildMavenPackage {
  pname = "megabasterd";
@ -16,7 +16,7 @@ maven.buildMavenPackage {
    owner = "tonikelope";
    repo = "megabasterd";
    tag = "v${version}";
-    hash = "sha256-FbExOSdJ4XiXKzetIlsSPrD9x2H4MxM2kKCMA4XkMLA=";
+    hash = "sha256-6PKBzQA3lBa9/7J8bymGmnW3OPsRV4GgZ7dc7H6fOuE=";
  };

  mvnHash = "sha256-DVfPmW0ep6y/GxnwNKXxo68W5idcTkoNqUEKm7ouTEY=";
--- a/pkgs/by-name/ne/netatalk/package.nix
+++ b/pkgs/by-name/ne/netatalk/package.nix
@ -26,6 +26,15 @@
  iniparser,
  pandoc,
  sqlite,
+  talloc,
+  xapian,
+  flex,
+  bison,
+  dconf,
+  localsearch,
+  tinysparql,
+  xapianSupport ? false,
+  localsearchSupport ? false,
 }:

 stdenv.mkDerivation (finalAttrs: {
@ -42,6 +51,10 @@ stdenv.mkDerivation (finalAttrs: {
    meson
    ninja
    file
+  ]
+  ++ lib.optionals localsearchSupport [
+    flex
+    bison
  ];

  buildInputs = [
@ -64,6 +77,16 @@ stdenv.mkDerivation (finalAttrs: {
    iniparser
    pandoc
    sqlite
+    talloc
+  ]
+  ++ lib.optionals xapianSupport [
+    xapian
+    file
+  ]
+  ++ lib.optionals localsearchSupport [
+    tinysparql
+    dconf
+    localsearch
  ];

  mesonFlags = [
@ -77,8 +100,26 @@ stdenv.mkDerivation (finalAttrs: {
    "-Dwith-cracklib=true"
    "-Dwith-cracklib-path=${cracklib.out}"
    "-Dwith-statedir-creation=false"
+    "-Dwith-spotlight-backends=${
+      lib.concatStringsSep "," (
+        [ "cnid" ] ++ lib.optional xapianSupport "xapian" ++ lib.optional localsearchSupport "localsearch"
+      )
+    }"
  ];

+  # TODO: drop once upstream makes this path configurable.
+  postPatch = lib.optionalString localsearchSupport ''
+    substituteInPlace meson.build \
+      --replace-fail "install_emptydir('/etc/dconf/db')" "install_emptydir('etc/dconf/db')"
+    substituteInPlace config/dconf/meson.build \
+      --replace-fail "install_dir: '/etc/dconf/profile'" "install_dir: 'etc/dconf/profile'"
+  '';
+
+  # netatalk probes for the LocalSearch schema at configure time.
+  preConfigure = lib.optionalString localsearchSupport ''
+    export XDG_DATA_DIRS="''${XDG_DATA_DIRS:+$XDG_DATA_DIRS:}${localsearch}/share/gsettings-schemas/localsearch-${localsearch.version}"
+  '';
+
  enableParallelBuilding = true;

  meta = {
--- a/pkgs/by-name/ng/ngrok/update.sh
+++ b/pkgs/by-name/ng/ngrok/update.sh
@ -7,7 +7,7 @@ cd "$(dirname "${BASH_SOURCE[0]}")"

 get_download_info() {
    xh --json \
-        https://update.equinox.io/check \
+        https://update.ngrok-agent.com/check \
        'Accept:application/json; q=1; version=1; charset=utf-8' \
        'Content-Type:application/json; charset=utf-8' \
        app_id=app_c3U4eZcDbjV \
--- a/pkgs/by-name/ng/ngrok/versions.json
+++ b/pkgs/by-name/ng/ngrok/versions.json
@ -1,38 +1,38 @@
 {
  "linux-386": {
    "sys": "linux-386",
-    "url": "https://bin.equinox.io/a/nNTqdX4Ydi/ngrok-v3-3.31.0-linux-386",
-    "sha256": "df57220616e209b18fad5db27ebab459b79d79431845a9f35e39f5f7b482646d",
-    "version": "3.31.0"
+    "url": "https://bin.ngrok.com/a/5AtU98awTaa/ngrok-v3-3.39.5-linux-386",
+    "sha256": "6aa61bedebbe653013856ce21d0548fbc3448ed1c5832a934e650a9163f23ad5",
+    "version": "3.39.5"
  },
  "linux-amd64": {
    "sys": "linux-amd64",
-    "url": "https://bin.equinox.io/a/mWtsD5CQpnc/ngrok-v3-3.31.0-linux-amd64",
-    "sha256": "1dab42535428db2a55f44abb0d14f6d9fec7f930f9346c9bd69f0cf5b6529dca",
-    "version": "3.31.0"
+    "url": "https://bin.ngrok.com/a/cB2psTgibNx/ngrok-v3-3.39.5-linux-amd64",
+    "sha256": "1488d85d044c0d0b89105881c75ab3f918c58f6b398645835213505f279218e5",
+    "version": "3.39.5"
  },
  "linux-arm": {
    "sys": "linux-arm",
-    "url": "https://bin.equinox.io/a/dDdHR6qWaFy/ngrok-v3-3.31.0-linux-arm",
-    "sha256": "e713bfc77f2fe0a1225215ce5651a3beefb27773b01f1cce442a271512ee60bd",
-    "version": "3.31.0"
+    "url": "https://bin.ngrok.com/a/hwheiurqdR4/ngrok-v3-3.39.5-linux-arm",
+    "sha256": "075983ff3a5663483f3ed52e4fb6c6642d3be4f829bd24b54f07b3493ca5a84a",
+    "version": "3.39.5"
  },
  "linux-arm64": {
    "sys": "linux-arm64",
-    "url": "https://bin.equinox.io/a/2SEt27vYGV3/ngrok-v3-3.31.0-linux-arm64",
-    "sha256": "4bd600d663bcdec42a7d1a6f0c5a042042fecd529b9867b532bd794e62fdb9b4",
-    "version": "3.31.0"
+    "url": "https://bin.ngrok.com/a/mVUZcKSXYG5/ngrok-v3-3.39.5-linux-arm64",
+    "sha256": "5ce6dc3b2fd96f0de3ee481a46da0d8f4b2304a57d922a3cc0ed2eaa303d3d83",
+    "version": "3.39.5"
  },
  "darwin-amd64": {
    "sys": "darwin-amd64",
-    "url": "https://bin.equinox.io/a/8YrgUfMJ8FH/ngrok-v3-3.31.0-darwin-amd64",
-    "sha256": "b4855f6d9b170ffe9a77393e43d1e40a4a5ce66a6906fa2cfcddaf5e05938b98",
-    "version": "3.31.0"
+    "url": "https://bin.ngrok.com/a/dk3BUFutK45/ngrok-v3-3.39.5-darwin-amd64",
+    "sha256": "f0eabc3ac471d82761757c9a32c2482e020e89360f0dd0fafa03c65a3dd8240f",
+    "version": "3.39.5"
  },
  "darwin-arm64": {
    "sys": "darwin-arm64",
-    "url": "https://bin.equinox.io/a/9XVR1UCtCce/ngrok-v3-3.31.0-darwin-arm64",
-    "sha256": "407f7e88a57f93536d0981544d4132cdf100aa2799a5b56640ec13726febc970",
-    "version": "3.31.0"
+    "url": "https://bin.ngrok.com/a/hem5SxTwypP/ngrok-v3-3.39.5-darwin-arm64",
+    "sha256": "e05361eb605cbb794aa3a0805d3e345c674266117ae72d300442c4d8b0166ef2",
+    "version": "3.39.5"
  }
 }
--- a/pkgs/by-name/ni/nirimon/package.nix
+++ b/pkgs/by-name/ni/nirimon/package.nix
@ -0,0 +1,52 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  makeWrapper,
+  nix-update-script,
+  versionCheckHook,
+  wl-mirror,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "nirimon";
+  version = "2026.605.1";
+
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "stepbrobd";
+    repo = "nirimon";
+    tag = finalAttrs.version;
+    hash = "sha256-mdBl2QuvAYEltGB2kE0EJhQtWSSZ78qdpSzWKreDZUY=";
+  };
+
+  vendorHash = "sha256-txuaYMyYYalKGQ5RIuPL/ERyDt/eMeo85aZSgx4HbZk=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.Version=${finalAttrs.version}"
+  ];
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  postFixup = ''
+    wrapProgram $out/bin/nirimon --prefix PATH : "${lib.makeBinPath [ wl-mirror ]}"
+  '';
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "-version";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "TUI monitor configuration tool for niri with visual layout, drag-and-drop, and profile management";
+    homepage = "https://github.com/stepbrobd/nirimon";
+    license = lib.licenses.asl20;
+    mainProgram = "nirimon";
+    maintainers = with lib.maintainers; [ stepbrobd ];
+    platforms = lib.platforms.linux;
+  };
+})
--- a/pkgs/by-name/ns/nsis/package.nix
+++ b/pkgs/by-name/ns/nsis/package.nix
@ -13,15 +13,15 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "nsis";
-  version = "3.11";
+  version = "3.12";

  src = fetchurl {
    url = "mirror://sourceforge/project/nsis/NSIS%203/${finalAttrs.version}/nsis-${finalAttrs.version}-src.tar.bz2";
-    sha256 = "19e72062676ebdc67c11dc032ba80b979cdbffd3886c60b04bb442cdd401ff4b";
+    sha256 = "11miw8jbhqcn5wmndcjdjfs0r7jm08x5cfvxyj64xkx29a77mvgk";
  };
  srcWinDistributable = fetchzip {
    url = "mirror://sourceforge/project/nsis/NSIS%203/${finalAttrs.version}/nsis-${finalAttrs.version}.zip";
-    sha256 = "e574f335ab9d3ad73118f46615e5c9f2a52f3e4622ecbb7e5886badbc8601348";
+    sha256 = "0rp9bycykjgx2aq656sdba1h4v14nfyiic2lgp1xm93l2czx9k9q";
  };

  postUnpack = ''
--- a/pkgs/by-name/ol/olympus-unwrapped/package.nix
+++ b/pkgs/by-name/ol/olympus-unwrapped/package.nix
@ -22,9 +22,9 @@ let

  phome = "$out/lib/olympus";
  # The following variables are to be updated by the update script.
-  version = "26.05.23.02";
-  buildId = "5612"; # IMPORTANT: This line is matched with regex in update.sh.
-  rev = "989853e83d30d5eebcd767341db401d647169bef";
+  version = "26.06.06.03";
+  buildId = "5632"; # IMPORTANT: This line is matched with regex in update.sh.
+  rev = "bc2ed6f1e1082d4bff67c871be2d0f215f6dbc85";
 in
 buildDotnetModule {
  pname = "olympus-unwrapped";
@ -37,7 +37,7 @@ buildDotnetModule {
    owner = "EverestAPI";
    repo = "Olympus";
    fetchSubmodules = true; # Required. See upstream's README.
-    hash = "sha256-63MeXtRxp7e9QAfhGrqozRwnhN2kk18lAx+gDWV2sRM=";
+    hash = "sha256-86APse6yodcqWUgi7eG/LJIcoN1JEiIgyKaZRHTstCY=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/ox/oxicloud/package.nix
+++ b/pkgs/by-name/ox/oxicloud/package.nix
@ -29,6 +29,12 @@ rustPlatform.buildRustPackage (finalAttrs: {

  cargoBuildFlags = [ "--bin=oxicloud" ];

+  postPatch = ''
+    # Upstream pins `target-cpu=native`, making the binary non-portable
+    # (breaks the binary cache). Build for the generic baseline instead.
+    rm -f .cargo/config.toml
+  '';
+
  postInstall = ''
    mkdir -p $out/share/oxicloud
    cp -r static-dist $out/share/oxicloud/static
--- a/pkgs/by-name/pg/pgdog/package.nix
+++ b/pkgs/by-name/pg/pgdog/package.nix
@ -14,16 +14,16 @@ let
 in
 rustPlatform.buildRustPackage.override { inherit stdenv; } (finalAttrs: {
  pname = "pgdog";
-  version = "0.1.42";
+  version = "0.1.43";

  src = fetchFromGitHub {
    owner = "pgdogdev";
    repo = "pgdog";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-X0UsaToKHWAZzDA/xBoBqtpFSlFdso3tMwci3SD80/I=";
+    hash = "sha256-0ilN89DChNOFcwsOZK7ZZPsbMCMH3NQlZlSvjT6F4oY=";
  };

-  cargoHash = "sha256-6iWmNqlUoRLi9HxsX7Vhpu+KIsNrakzG97/Orwt3LOU=";
+  cargoHash = "sha256-wh63mNo2dX4ngLW+dEu9UtWVuqNSBNrtYvK2ejHxNKg=";

  # Hardcoded paths for C compiler and linker
  postPatch = ''
--- a/pkgs/by-name/pi/pigz/package.nix
+++ b/pkgs/by-name/pi/pigz/package.nix
@ -3,7 +3,9 @@
  stdenv,
  fetchFromGitHub,
  zlib,
-  util-linux,
+  ncompress,
+  which,
+  nix-update-script,
 }:

 stdenv.mkDerivation (finalAttrs: {
@ -17,31 +19,51 @@ stdenv.mkDerivation (finalAttrs: {
    sha256 = "sha256-PzdxyO4mCg2jE/oBk1MH+NUdWM95wIIIbncBg71BkmQ=";
  };

+  strictDeps = true;
+  __structuredAttrs = true;
  enableParallelBuilding = true;

-  buildInputs = [ zlib ] ++ lib.optional stdenv.hostPlatform.isLinux util-linux;
+  outputs = [
+    "out"
+    "doc"
+    "man"
+  ];

-  makeFlags = [ "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" ];
+  makeFlags = [ "CC=${lib.getExe stdenv.cc}" ];
+  buildInputs = [
+    zlib
+  ];

  doCheck = stdenv.hostPlatform.isLinux;
  checkTarget = "tests";
+  nativeCheckInputs = [
+    which
+    ncompress
+  ];
+
  installPhase = ''
    runHook preInstall

    install -Dm755 pigz "$out/bin/pigz"
    ln -s pigz "$out/bin/unpigz"
-    install -Dm755 pigz.1 "$out/share/man/man1/pigz.1"
-    ln -s pigz.1 "$out/share/man/man1/unpigz.1"
-    install -Dm755 pigz.pdf "$out/share/doc/pigz/pigz.pdf"
+    install -Dm755 pigz.1 "$man/share/man/man1/pigz.1"
+    ln -s pigz.1 "$man/share/man/man1/unpigz.1"
+    install -Dm755 pigz.pdf "$doc/share/doc/pigz/pigz.pdf"

    runHook postInstall
  '';

+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
  meta = {
    homepage = "https://www.zlib.net/pigz/";
    description = "Parallel implementation of gzip for multi-core machines";
    mainProgram = "pigz";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [
+      sandarukasa
+    ];
    license = lib.licenses.zlib;
    platforms = lib.platforms.unix;
  };
--- a/pkgs/by-name/pl/plasticity/package.nix
+++ b/pkgs/by-name/pl/plasticity/package.nix
@ -40,11 +40,11 @@
 }:
 stdenv.mkDerivation rec {
  pname = "plasticity";
-  version = "25.3.9";
+  version = "26.1.3";

  src = fetchurl {
    url = "https://github.com/nkallen/plasticity/releases/download/v${version}/Plasticity-${version}-1.x86_64.rpm";
-    hash = "sha256-92DokpVmywh7EZZMKAoXf0RzkEuG/4Ngd5l0l/o6Klk=";
+    hash = "sha256-gHoih3CldhrHPLBpu3slRUxJSBIbYYhQ9WhEbhjHzyM=";
  };

  passthru.updateScript = ./update.sh;
--- a/pkgs/by-name/pr/pragtical/package.nix
+++ b/pkgs/by-name/pr/pragtical/package.nix
@ -7,6 +7,7 @@
  ninja,
  pkg-config,
  freetype,
+  harfbuzz,
  libgit2,
  libkqueue,
  libuchardet,
@ -17,14 +18,15 @@
  pcre2,
  sdl3,
  sdl3-image,
+  sdl3-net,
  xz,
  zlib,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "pragtical";
-  version = "3.9.0";
-  pluginManagerRev = "ae9bd107783b1b8cbe7f0dec53b1b0b401f6ac91";
+  version = "3.11.2";
+  pluginManagerRev = "v1.5.1";
  linenoiseRev = "e78e236c8d85c078fdd9fc4e1f08716058aa1a42";

  src = fetchFromGitHub {
@ -45,12 +47,14 @@ stdenv.mkDerivation (finalAttrs: {
        --replace-fail 'revision = master' 'revision = ${finalAttrs.linenoiseRev}'

      ${lib.getExe meson} subprojects download \
-          colors linenoise plugins ppm widget
+        colors linenoise plugins ppm widget mbedtls
+      # TODO: remove mbedtls from list once ppm supports mbedtls_4
+      # See https://github.com/pragtical/plugin-manager/issues/11

      find subprojects -type d -name .git -prune -execdir rm -r {} +
    '';

-    hash = "sha256-hs4WFBqR9G+YsHw9/qaO0BCeIMqPEWOvFaeuN2W9hSQ=";
+    hash = "sha256-6S4hnmSsejLr7IiZ4mtHT5ImBsVlyKFtLx9PBgv6b90=";
  };

  strictDeps = true;
@ -64,6 +68,7 @@ stdenv.mkDerivation (finalAttrs: {

  buildInputs = [
    freetype
+    harfbuzz
    libgit2
    libkqueue # optional
    libuchardet
@ -74,6 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
    pcre2
    sdl3
    sdl3-image
+    sdl3-net
    xz
    zlib
  ];
--- a/pkgs/by-name/qq/qq/package.nix
+++ b/pkgs/by-name/qq/qq/package.nix
@ -21,7 +21,6 @@
  systemd,
  stdenv,
  undmg,
-  vips,
  at-spi2-core,
  autoPatchelfHook,
  writeShellScript,
@ -112,7 +111,6 @@ else
      libkrb5
      libgbm
      nss
-      vips
      libxdamage
    ];

@ -201,9 +199,6 @@ else
            --run '${versionConfigScript} || true'
          ''}

-        # Remove bundled libraries
-        rm -r $out/opt/QQ/resources/app/sharp-lib
-
        # https://aur.archlinux.org/cgit/aur.git/commit/?h=linuxqq&id=f7644776ee62fa20e5eb30d0b1ba832513c77793
        rm -r $out/opt/QQ/resources/app/libssh2.so.1

--- a/pkgs/by-name/qq/qq/sources.nix
+++ b/pkgs/by-name/qq/qq/sources.nix
@ -1,12 +1,12 @@
 # Generated by ./update.sh - do not update manually!
-# Last updated: 2026-04-15
+# Last updated: 2026-06-03
 { fetchurl }:
 let
  any-darwin = {
-    version = "6.9.93-2026-04-01";
+    version = "6.9.96-2026-05-28";
    src = fetchurl {
-      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Mac/QQ_6.9.93_260401_01.dmg";
-      hash = "sha256-xCyvVAxYKma92SkL1fLraXKeDcKlRLLybtwKPWUKlis=";
+      url = "https://qqdl.gtimg.cn/qqfile/QQNT/9.9.31/release/045f4292/QQ_6.9.96_260528_01.dmg";
+      hash = "sha256-cMgWMXfKtL4ZLBrjGhROpCMNAHtFIdnZRfyi9XtsIjI=";
    };
  };
 in
@ -14,17 +14,17 @@ in
  aarch64-darwin = any-darwin;
  x86_64-darwin = any-darwin;
  aarch64-linux = {
-    version = "3.2.27-2026-04-01";
+    version = "3.2.29-2026-05-28";
    src = fetchurl {
-      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.27_260401_arm64_01.deb";
-      hash = "sha256-sGLYPAdZmcxGy+3Lo7MEeEXysqP24XTWaQY/iM9bRLU=";
+      url = "https://qqdl.gtimg.cn/qqfile/QQNT/9.9.31/release/00e6a3e7/QQ_3.2.29_260528_arm64_01.deb";
+      hash = "sha256-W82MzaQB+/oYIafDx1j4SiU8MXVo8LnC10QmokdJ6aY=";
    };
  };
  x86_64-linux = {
-    version = "3.2.27-2026-04-01";
+    version = "3.2.29-2026-05-28";
    src = fetchurl {
-      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.27_260401_amd64_01.deb";
-      hash = "sha256-iI5gc0VSZAzab2B+w1I/6idSD/zx45Ou+uyqSJzCC+c=";
+      url = "https://qqdl.gtimg.cn/qqfile/QQNT/9.9.31/release/00e6a3e7/QQ_3.2.29_260528_amd64_01.deb";
+      hash = "sha256-HjgoB5ZzyUmUvA9HgNXYUoZHY5kgZZhi1J0cLyoZjiU=";
    };
  };
 }
--- a/pkgs/by-name/ra/rapidraw/package.nix
+++ b/pkgs/by-name/ra/rapidraw/package.nix
@ -42,20 +42,20 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "rapidraw";
-  version = "1.5.5";
+  version = "1.5.6";

  src = fetchFromGitHub {
    owner = "CyberTimon";
    repo = "RapidRAW";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-CnH8EuHzHxuXbnOry2gMU/tMqpE8++ztyNPk3HHdZqE=";
+    hash = "sha256-pfOdq2Q7GLGbzcgFkrRiczMWnS5TImbayYE1VWenYuo=";
  };

-  cargoHash = "sha256-c2MK1DyonfeZKfZAVWfwVh/In5SqKq7nnFrlz2686SM=";
+  cargoHash = "sha256-liWOY+Jq8Yqo0QsntKjq2ntMAacfFyHCm6yhQM+KwRA=";

  npmDeps = fetchNpmDeps {
    inherit (finalAttrs) src;
-    hash = "sha256-1A6b63FjNvkAbu62dRXfMjTL1y2wr2gEsZkLqYvTk0w=";
+    hash = "sha256-JtkzeCt21KIEshvoCHWo1QoxUgvVJN1loJrUHgvV4qE=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/ra/ratty/package.nix
+++ b/pkgs/by-name/ra/ratty/package.nix
@ -14,16 +14,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "ratty";
-  version = "0.3.0";
+  version = "0.4.1";

  src = fetchFromGitHub {
    owner = "orhun";
    repo = "ratty";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-Vxqd5peP4dcUyhM3JYzMUohYjlnsgZXRTnerKDC5VPg=";
+    hash = "sha256-P9cHNK6yYa4JjoxW8I06nuS4e/qitNVXPDIBSGWa+AA=";
  };

-  cargoHash = "sha256-/9ekk3B96OanoEXxRDd8eN0gx4IK0qfysOd6DkIZg+k=";
+  cargoHash = "sha256-ICNkUmRLtx6ay1ay/TtnLLkzv5KN+C9F8NNHwxmC/6M=";

  nativeBuildInputs = [
    pkg-config
--- a/pkgs/by-name/sa/samrewritten/package.nix
+++ b/pkgs/by-name/sa/samrewritten/package.nix
@ -15,16 +15,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "samrewritten";
-  version = "1.4.0";
+  version = "1.4.2";

  src = fetchFromGitHub {
    owner = "PaulCombal";
    repo = "SamRewritten";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-y8ByD/dGjc+QJCbhy519fBHDXRh+m4sIC7ew17sj03g=";
+    hash = "sha256-p24V0rUnCPanci8KqxGhWA793HVcqO8VSHzabSAOR0A=";
  };

-  cargoHash = "sha256-anV5tiXgX9DviKe8ZlnbBrQw5vCnpgQ1xKUki8/f+20=";
+  cargoHash = "sha256-beHc4EETX6cyRFEHaiCghvaRZ6uYQOfllygdkiMg+OA=";

  # Tests require network access and a running Steam client. Skipping.
  doCheck = false;
--- a/pkgs/by-name/si/simh/package.nix
+++ b/pkgs/by-name/si/simh/package.nix
@ -6,7 +6,7 @@
  SDL2_ttf,
  libpcap,
  vde2,
-  pcre,
+  pcre2,
 }:

 stdenv.mkDerivation rec {
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
    SDL2_ttf
    libpcap
    vde2
-    pcre
+    pcre2
  ];

  dontConfigure = true;
--- a/pkgs/by-name/sp/spectre-meltdown-checker/package.nix
+++ b/pkgs/by-name/sp/spectre-meltdown-checker/package.nix
@ -10,13 +10,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "spectre-meltdown-checker";
-  version = "26.33.0420460";
+  version = "26.36.0602723";

  src = fetchFromGitHub {
    owner = "speed47";
    repo = "spectre-meltdown-checker";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-lydZqvX20QmulwTrsGnInTF1j6CmJw8DUFfAaq0R5l4=";
+    hash = "sha256-UPpArgFbz2nce63fS6AScitHeL8/XlA0aInyeRxN9ZM=";
  };

  passthru.updateScript = gitUpdater { };
--- a/pkgs/by-name/st/style50/package.nix
+++ b/pkgs/by-name/st/style50/package.nix
@ -2,20 +2,21 @@
  lib,
  python3Packages,
  fetchFromGitHub,
+  djhtml,
  libclang,
  versionCheckHook,
 }:

 python3Packages.buildPythonApplication (finalAttrs: {
  pname = "style50";
-  version = "2.11.0";
+  version = "3.0.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "cs50";
    repo = "style50";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-THmxq69peJwT3XQKEpT+ooBYaDDkn1HHGVH5rvM/FF8=";
+    hash = "sha256-D2ucfVVGZFzmcAUyOfu97QJ8x9pzRo1hYrwZlV8MRN8=";
  };

  build-system = [
@ -24,11 +25,14 @@ python3Packages.buildPythonApplication (finalAttrs: {

  dependencies = with python3Packages; [
    autopep8
+    cssbeautifier
+    djhtml
    icdiff
    jinja2
    jsbeautifier
    pycodestyle
    python-magic
+    sqlparse
    termcolor
  ];

@ -50,9 +54,10 @@ python3Packages.buildPythonApplication (finalAttrs: {

  pythonImportsCheck = [ "style50" ];

-  nativeCheckInputs = [ versionCheckHook ];
-
-  # no python tests
+  nativeCheckInputs = [
+    python3Packages.pytestCheckHook
+    versionCheckHook
+  ];

  meta = {
    description = "Tool for checking code against the CS50 style guide";
--- a/pkgs/by-name/su/sub-store-frontend/package.nix
+++ b/pkgs/by-name/su/sub-store-frontend/package.nix
@ -14,13 +14,13 @@ let
 in
 buildNpmPackage (finalAttrs: {
  pname = "sub-store-frontend";
-  version = "2.17.19";
+  version = "2.17.31";

  src = fetchFromGitHub {
    owner = "sub-store-org";
    repo = "Sub-Store-Front-End";
    tag = finalAttrs.version;
-    hash = "sha256-fhJy/bErS9DHjjX5R+6KjqDNYyPOQaYPr54CS1vd3zc=";
+    hash = "sha256-/L5qdjqXZ8MjEjOGT8e8vdS/F9uudkemboAVrYih0Zc=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/su/surf/package.nix
+++ b/pkgs/by-name/su/surf/package.nix
@ -8,9 +8,8 @@
  gcr,
  glib-networking,
  gsettings-desktop-schemas,
-  gtk2,
-  libsoup_2_4,
-  # webkitgtk_4_0,
+  gtk3,
+  libsoup_3,
  webkitgtk_4_1,
  xprop,
  dmenu,
@ -20,16 +19,15 @@
  gst_all_1,
  patches ? null,
 }:
-
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  pname = "surf";
-  version = "2.1";
+  version = "2.1-unstable-2025-04-19";

  # tarball is missing file common.h
  src = fetchgit {
    url = "git://git.suckless.org/surf";
-    rev = version;
-    sha256 = "1v926hiayddylq79n8l7dy51bm0dsa9n18nx9bkhg666cx973x4z";
+    rev = "48517e586cdc98bc1af7115674b554cc70c8bc2e";
+    hash = "sha256-+qg1mF5X/hYxCy7N3CxIEM2yHi1jmUGiK/vaQBjKy1I=";
  };

  nativeBuildInputs = [
@ -41,9 +39,9 @@ stdenv.mkDerivation rec {
    gcr
    glib-networking
    gsettings-desktop-schemas
-    gtk2
-    libsoup_2_4
-    # webkitgtk_4_0
+    libsoup_3
+    gtk3
+    webkitgtk_4_1
  ]
  ++ (with gst_all_1; [
    # Audio & video support for webkitgtk WebView
@ -72,13 +70,11 @@ stdenv.mkDerivation rec {
    ''
      gappsWrapperArgs+=(
        --suffix PATH : ${depsPath}
+        --set GDK_BACKEND x11
      )
    '';

  meta = {
-    # webkitgtk_4_0 was removed. master is supposed to support 4.1
-    # but it crashes with BadWindow X Error
-    broken = true;
    description = "Simple web browser based on WebKitGTK";
    mainProgram = "surf";
    longDescription = ''
--- a/pkgs/by-name/ta/tableplus/darwin.nix
+++ b/pkgs/by-name/ta/tableplus/darwin.nix
@ -7,10 +7,10 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "tableplus";
-  version = "538";
+  version = "662";
  src = fetchurl {
-    url = "https://download.tableplus.com/macos/${finalAttrs.version}/TablePlus.dmg";
-    hash = "sha256-db3dvjEzkqWrEO+lXyImk0cVBkh8MnCwHOYKIg+kRC4=";
+    url = "https://files.tableplus.com/macos/${finalAttrs.version}/TablePlus.dmg";
+    hash = "sha256-VR0sSTZfRjjv+p4DcYciKBJG5DHIwj4KLhTHPGRsSX0=";
  };

  sourceRoot = "TablePlus.app";
--- a/pkgs/by-name/ta/tauon/package.nix
+++ b/pkgs/by-name/ta/tauon/package.nix
@ -2,7 +2,6 @@
  lib,
  stdenv,
  fetchFromGitHub,
-  fetchPypi,
  kissfft,
  miniaudio,
  pkg-config,
@ -27,35 +26,16 @@
  pulseaudio,
  withDiscordRPC ? true,
 }:
-
-let
-  # fork of pypresence, to be reverted if/when there's an upstream release
-  lynxpresence = python3Packages.buildPythonPackage rec {
-    pname = "lynxpresence";
-    version = "4.6.2";
-    pyproject = true;
-
-    src = fetchPypi {
-      inherit pname version;
-      hash = "sha256-w4WShLTTSf4JGQVL4lTkbOLL8C7cjnf8WwHyfwKK2zA=";
-    };
-
-    build-system = with python3Packages; [ setuptools ];
-
-    doCheck = false; # tests require internet connection
-    pythonImportsCheck = [ "lynxpresence" ];
-  };
-in
 python3Packages.buildPythonApplication rec {
  pname = "tauon";
-  version = "9.1.3";
+  version = "10.0.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "Taiko2k";
    repo = "Tauon";
    tag = "v${version}";
-    hash = "sha256-Z/+8UCtwvY9000b1Y+HaTIehK8axzyR+eeeBPhllS4U=";
+    hash = "sha256-atLyNePy3pc3xJFliy5hITC5R0VU6jfHYqfq8RxqGoM=";
  };

  postUnpack = ''
@ -74,7 +54,7 @@ python3Packages.buildPythonApplication rec {
  pythonRemoveDeps = [
    "opencc"
    "tekore"
-    # Whether or not it is enabled (withDiscordRPC), it isn't present during build.
+    # Not present when withDiscordRPC is disabled.
    "pypresence"
  ];

@ -131,7 +111,7 @@ python3Packages.buildPythonApplication rec {
      setproctitle
      tidalapi
    ]
-    ++ lib.optional withDiscordRPC lynxpresence
+    ++ lib.optional withDiscordRPC pypresence
    ++ lib.optional stdenv.hostPlatform.isLinux pulsectl;

  makeWrapperArgs = [
@ -164,7 +144,10 @@ python3Packages.buildPythonApplication rec {
    homepage = "https://tauonmusicbox.rocks/";
    changelog = "https://github.com/Taiko2k/Tauon/releases/tag/v${version}";
    license = lib.licenses.gpl3;
-    maintainers = with lib.maintainers; [ jansol ];
+    maintainers = with lib.maintainers; [
+      jansol
+      alfarel
+    ];
    platforms = lib.platforms.linux ++ lib.platforms.darwin;
  };
 }
--- a/pkgs/by-name/va/vacuum-tube/package.nix
+++ b/pkgs/by-name/va/vacuum-tube/package.nix
@ -10,16 +10,16 @@

 buildNpmPackage rec {
  pname = "vacuum-tube";
-  version = "1.7.1";
+  version = "1.7.2";

  src = fetchFromGitHub {
    owner = "shy1132";
    repo = "VacuumTube";
    tag = "v${version}";
-    hash = "sha256-ccxJ2ALWnU9D6OTKbP9IfV0uYGR2DnIEAckoIOWVt6Q=";
+    hash = "sha256-WSK0SKgT7CZ+7ibTCpMw6LUVvis7/Iqfyzi8sWclYDM=";
  };

-  npmDepsHash = "sha256-V0XlTsFX/TM7KwplYHCEdkj/KJDEUOleeM6KpL2vWHk=";
+  npmDepsHash = "sha256-jnWsxMxMTA+tsPSRJIQa/iJWWrLTWlWsVfAz8okRDhk=";
  makeCacheWritable = true;

  env = {
--- a/pkgs/by-name/wa/waytrogen/package.nix
+++ b/pkgs/by-name/wa/waytrogen/package.nix
@ -4,7 +4,6 @@
  rustPlatform,
  pkg-config,
  wrapGAppsHook4,
-  glib,
  nix-update-script,
  stdenv,
  meson,
@ -14,22 +13,37 @@
  sqlite,
  openssl,
  desktop-file-utils,
+  bash,
+  dbus,
+  gtk4,
+  ffmpeg,
+  libx11,
+  libxcursor,
+  libxrandr,
+  libxi,
+  libxcb,
+  libxkbcommon,
+  vulkan-loader,
+  wayland,
+  xdg-utils,
+  xdg-desktop-portal,
+  libGL,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "waytrogen";
-  version = "0.9.5";
+  version = "0.9.8";

  src = fetchFromGitHub {
    owner = "nikolaizombie1";
    repo = "waytrogen";
    tag = finalAttrs.version;
-    hash = "sha256-+1HiTmJAkhd+zbLAyRRk9tHDbR7qcslkfJ2HyGipZCo=";
+    hash = "sha256-Nf1qPIFlhQl5T3RYVK4GMinO2vOJDNoYBrrVY93VF0Q=";
  };

  cargoDeps = rustPlatform.fetchCargoVendor {
    inherit (finalAttrs) pname version src;
-    hash = "sha256-UKd/h/O9EE7gZ8B+QtFVGJEit0BIQ0OC0CG/GLYzMEo=";
+    hash = "sha256-EXP6Mt04Z+2ag2BhihzAtjwPGE82Ig6GoD1Vgor7oHc=";
  };

  nativeBuildInputs = [
@ -41,30 +55,62 @@ stdenv.mkDerivation (finalAttrs: {
    cargo
    rustc
    desktop-file-utils
+    bash
+    dbus
+    sqlite
+    gtk4
+    dbus
+    xdg-utils
+    xdg-desktop-portal
  ];

  buildInputs = [
-    glib
    sqlite
    openssl
+    gtk4
+    ffmpeg
+    libx11
+    libxcursor
+    libxrandr
+    libxi
+    libxcb
+    libxkbcommon
+    vulkan-loader
+    wayland
+    dbus
+    xdg-utils
+    xdg-desktop-portal
  ];

-  preBuild = "export OUT_PATH=$out";
-
  env = {
    OPENSSL_NO_VENDOR = 1;
  };

-  mesonFlags = [ "-Dcargo_features=nixos" ];
+  passthru = {
+    updateScript = nix-update-script { };
+    tests = { };
+  };

-  passthru.updateScript = nix-update-script { };
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --suffix LD_LIBRARY_PATH : ${
+        lib.makeLibraryPath [
+          wayland
+          libxkbcommon
+          vulkan-loader
+          libGL
+          dbus
+        ]
+      }
+    )
+  '';

  meta = {
    description = "Lightning fast wallpaper setter for Wayland";
    longDescription = ''
      A GUI wallpaper setter for Wayland that is a spiritual successor
      for the minimalistic wallpaper changer for X11 nitrogen. Written purely
-      in the Rust 🦀 programming language. Supports hyprpaper, swaybg, mpvpaper and swww wallpaper changers.
+      in the Rust 🦀 programming language. Supports hyprpaper, swaybg, mpvpaper, swww  and gSlapper wallpaper changers.
    '';
    homepage = "https://github.com/nikolaizombie1/waytrogen";
    changelog = "https://github.com/nikolaizombie1/waytrogen/releases/tag/${finalAttrs.version}";
@ -75,5 +121,6 @@ stdenv.mkDerivation (finalAttrs: {
    ];
    mainProgram = "waytrogen";
    platforms = lib.platforms.linux;
+    badPlatforms = lib.platforms.darwin;
  };
 })
--- a/pkgs/by-name/we/weblate/package.nix
+++ b/pkgs/by-name/we/weblate/package.nix
@ -97,6 +97,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
    "requests"
    "pygobject"
    "certifi"
+    "hiredis"
  ];

  dependencies =
--- a/pkgs/by-name/xe/xev/package.nix
+++ b/pkgs/by-name/xe/xev/package.nix
@ -10,11 +10,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "xev";
-  version = "1.2.6";
+  version = "1.2.7";

  src = fetchurl {
    url = "mirror://xorg/individual/app/xev-${finalAttrs.version}.tar.xz";
-    hash = "sha256-YeHF4AismXOsp83d826d90EOdwg7Aw6wT03HN8UYB9c=";
+    hash = "sha256-lRZ4lZJN5Y40sQE7KwyEdukNCIjGw5566bw146GdugQ=";
  };

  strictDeps = true;
@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
    homepage = "https://gitlab.freedesktop.org/xorg/app/xev";
    license = lib.licenses.x11;
    mainProgram = "xev";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ aiyion ];
    platforms = lib.platforms.unix;
  };
 })
--- a/pkgs/by-name/xn/xneur/package.nix
+++ b/pkgs/by-name/xn/xneur/package.nix
@ -1,80 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchurl,
-  fetchpatch,
-  autoreconfHook,
-  intltool,
-  pkg-config,
-  wrapGAppsHook3,
-  enchant,
-  gdk-pixbuf,
-  glib,
-  gst_all_1,
-  libnotify,
-  pcre,
-  libxtst,
-  libxi,
-  libxext,
-  libx11,
-  xosd,
-}:
-
-stdenv.mkDerivation {
-  pname = "xneur";
-  version = "0.20.0";
-
-  src = fetchurl {
-    url = "https://github.com/AndrewCrewKuznetsov/xneur-devel/raw/f66723feb272c68f7c22a8bf0dbcafa5e3a8a5ee/dists/0.20.0/xneur_0.20.0.orig.tar.gz";
-    sha256 = "1lg3qpi9pkx9f5xvfc8yf39wwc98f769yb7i2438vqn66kla1xpr";
-  };
-
-  nativeBuildInputs = [
-    autoreconfHook
-    intltool
-    pkg-config
-    wrapGAppsHook3
-  ];
-
-  buildInputs = [
-    enchant
-    gdk-pixbuf
-    glib
-    gst_all_1.gst-plugins-base
-    gst_all_1.gst-plugins-good
-    gst_all_1.gstreamer
-    libnotify
-    pcre
-    libx11
-    libxext
-    libxi
-    libxtst
-    xosd
-  ];
-
-  patches = [
-    (fetchpatch {
-      name = "gcc-10.patch";
-      url = "https://salsa.debian.org/debian/xneur/-/raw/da38ad9c8e1bf4e349f5ed4ad909f810fdea44c9/debian/patches/gcc-10.patch";
-      sha256 = "0pc17a4sdrnrc4z7gz28889b9ywqsm5mzm6m41h67j2f5zh9k3fy";
-    })
-    (fetchpatch {
-      name = "enchant2.patch";
-      url = "https://salsa.debian.org/debian/xneur/-/raw/695b0fea56cde4ff6cf0f3988218c5cb9d7ff5ae/debian/patches/enchant2.patch";
-      sha256 = "02a3kkfzdvs5f8dfm6j5x3jcn5j8qah9ykfymp6ffqsf4fijp65n";
-    })
-  ];
-
-  postPatch = ''
-    sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure.ac
-  '';
-
-  meta = {
-    description = "Utility for switching between keyboard layouts";
-    mainProgram = "xneur";
-    homepage = "https://xneur.ru";
-    license = lib.licenses.gpl2Plus;
-    maintainers = [ lib.maintainers.raskin ];
-    platforms = lib.platforms.linux;
-  };
-}
--- a/pkgs/by-name/ya/yarn-berry/fetcher/fetch-yarn-berry-deps.nix
+++ b/pkgs/by-name/ya/yarn-berry/fetcher/fetch-yarn-berry-deps.nix
@ -47,6 +47,8 @@ stdenv.mkDerivation (
      cacert
    ];

+    impureEnvVars = lib.fetchers.proxyImpureEnvVars;
+
    buildPhase = ''
      runHook preBuild

--- a/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-fetcher.nix
+++ b/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-fetcher.nix
@ -13,21 +13,23 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "yarn-berry-${toString berryVersion}-fetcher";
-  version = "1.2.3";
+  version = "1.3.0";

  src = fetchFromGitLab {
    domain = "cyberchaos.dev";
    owner = "yuka";
    repo = "yarn-berry-fetcher";
    tag = finalAttrs.version;
-    hash = "sha256-Qfhx1lwd050GabP2Xj0kRi4nIlOHUE4xbZO0kO0IJ8A=";
+    hash = "sha256-7WW/fHTi1i7dcsSJDl4kb1E6hUY6flRaVdbjD93OKPk=";
  };

-  cargoHash = "sha256-tOu1x8kmVCXKvthV0xyzisTb7BwOtfWTyu/cv4HRbpc=";
+  cargoHash = "sha256-l8zTzr2y8i2ENb8iadIBz59YLmNwfDZcrbUqIUibFqg=";

  env.YARN_ZIP_SUPPORTED_CACHE_VERSION = berryCacheVersion;
  env.LIBZIP_SYS_USE_PKG_CONFIG = 1;

+  impureEnvVars = lib.fetchers.proxyImpureEnvVars;
+
  nativeBuildInputs = [
    rustPlatform.bindgenHook
    pkg-config
--- a/pkgs/development/compilers/llvm/common/default.nix
+++ b/pkgs/development/compilers/llvm/common/default.nix
@ -71,7 +71,7 @@ let
      ;
    src = monorepoSrc;
    versionDir =
-      (toString ../.) + "/${if (gitRelease != null) then "git" else lib.versions.major release_version}";
+      ../. + "/${if (gitRelease != null) then "git" else lib.versions.major release_version}";
    getVersionFile =
      p:
      builtins.path {
@ -95,15 +95,12 @@ let
              matchBefore && matchAfter;

            patchDir =
-              toString
-                (
-                  if constraints == null then
-                    { path = metadata.versionDir; }
-                  else
-                    (lib.findFirst matchConstraint { path = metadata.versionDir; } constraints)
-                ).path;
+              if constraints == null then
+                metadata.versionDir
+              else
+                (lib.findFirst matchConstraint { path = metadata.versionDir; } constraints).path;
          in
-          "${patchDir}/${p}";
+          patchDir + ("/" + p);
      };
  };

--- a/pkgs/development/libraries/qzxing/default.nix
+++ b/pkgs/development/libraries/qzxing/default.nix
@ -2,7 +2,7 @@
  stdenv,
  lib,
  fetchFromGitHub,
-  nix-update-script,
+  gitUpdater,
  testers,
  qmake,
  qtmultimedia,
@ -52,7 +52,9 @@ stdenv.mkDerivation (finalAttrs: {

  passthru = {
    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-    updateScript = nix-update-script { };
+    updateScript = gitUpdater {
+      rev-prefix = "v";
+    };
  };

  meta = {
--- a/pkgs/development/ocaml-modules/awa/default.nix
+++ b/pkgs/development/ocaml-modules/awa/default.nix
@ -20,11 +20,11 @@

 buildDunePackage (finalAttrs: {
  pname = "awa";
-  version = "0.6.0";
+  version = "0.6.1";

  src = fetchurl {
    url = "https://github.com/mirage/awa-ssh/releases/download/v${finalAttrs.version}/awa-${finalAttrs.version}.tbz";
-    hash = "sha256-TO4O2n+L1avIGGKBnZ0wo6jSQBml5Yn6C46VWEPvcvE=";
+    hash = "sha256-xis3+I4cY9gQVSZmMCavIl9qGe7njoRQKfFZ6yh1kQE=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/octave-modules/netcdf/default.nix
+++ b/pkgs/development/octave-modules/netcdf/default.nix
@ -4,23 +4,45 @@
  fetchFromGitHub,
  netcdf,
  nix-update-script,
+  pkg-config,
+  autoreconfHook,
 }:

 buildOctavePackage rec {
  pname = "netcdf";
-  version = "1.0.19";
+  version = "1.0.20";

  src = fetchFromGitHub {
    owner = "gnu-octave";
    repo = "octave-netcdf";
    tag = "v${version}";
-    sha256 = "sha256-yt39bd6EBLj7mr6EYngPfPXEMusncc9tx5So1Cp1zkM=";
+    sha256 = "sha256-47+8daOrPjjsVWi6Sz2V/GNK4vQ5nbGCrQmgnZRap+k=";
  };

+  nativeBuildInputs = [
+    pkg-config
+    autoreconfHook
+  ];
+
  propagatedBuildInputs = [
    netcdf
  ];

+  # autoreconfHook provides an autoreconfPhase that is run as a
+  # preconfigurePhase, which means it runs AFTER the source is un-tarred, and
+  # before buildOctavePackage's buildPhase re-tars it up into a format for later
+  # consumption by Octave's "pkg build" command.
+  preAutoreconf = ''
+    pushd src
+    # Upstream's bootstrap script uses wget to fetch config.guess & config.sub
+    # and has them committed to the repository. We must remove them so autoreconf
+    # actually fires for our environment.
+    rm config.*
+  '';
+  postAutoreconf = ''
+    popd
+  '';
+
  meta = {
    homepage = "https://gnu-octave.github.io/packages/netcdf/";
    license = lib.licenses.gpl2Plus;
--- a/pkgs/development/python-modules/apcaccess/default.nix
+++ b/pkgs/development/python-modules/apcaccess/default.nix
@ -3,25 +3,28 @@
  buildPythonPackage,
  fetchFromGitHub,
  pytestCheckHook,
+  setuptools,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "apcaccess";
  version = "0.0.13";
-  format = "setuptools";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "flyte";
    repo = "apcaccess";
-    rev = version;
+    tag = finalAttrs.version;
    hash = "sha256-XLoNRh6MgXCfRtWD9NpVZSyroW6E9nRYw6Grxa+AQkc=";
  };

  postPatch = ''
    substituteInPlace setup.py \
-      --replace "setup_requires='pytest-runner'," ""
+      --replace-fail "setup_requires='pytest-runner'," ""
  '';

+  build-system = [ setuptools ];
+
  pythonImportsCheck = [ "apcaccess" ];

  nativeCheckInputs = [ pytestCheckHook ];
@ -30,7 +33,8 @@ buildPythonPackage rec {
    description = "Library offers programmatic access to the status information provided by apcupsd over its Network Information Server";
    mainProgram = "apcaccess";
    homepage = "https://github.com/flyte/apcaccess";
+    changelog = "https://github.com/flyte/apcaccess/releases/tag/${finalAttrs.version}";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ uvnikita ];
  };
-}
+})
--- a/pkgs/development/python-modules/asyncio-rlock/default.nix
+++ b/pkgs/development/python-modules/asyncio-rlock/default.nix
@ -2,19 +2,22 @@
  lib,
  buildPythonPackage,
  fetchPypi,
+  setuptools,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "asyncio-rlock";
  version = "0.1.0";
-  format = "setuptools";
+  pyproject = true;

  src = fetchPypi {
    pname = "asyncio_rlock";
-    inherit version;
-    sha256 = "7e29824331619873e10d5d99dcc46d7b8f196c4a11b203f4eeccc0c091039d43";
+    inherit (finalAttrs) version;
+    hash = "sha256-fimCQzFhmHPhDV2Z3MRte48ZbEoRsgP07szAwJEDnUM=";
  };

+  build-system = [ setuptools ];
+
  # no tests on PyPI, no tags on GitLab
  doCheck = false;

@ -26,4 +29,4 @@ buildPythonPackage rec {
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ dotlambda ];
  };
-}
+})
--- a/pkgs/development/python-modules/avro-python3/default.nix
+++ b/pkgs/development/python-modules/avro-python3/default.nix
@ -5,19 +5,22 @@
  isPy3k,
  pycodestyle,
  isort,
+  setuptools,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "avro-python3";
  version = "1.10.2";
-  format = "setuptools";
+  pyproject = true;
  disabled = !isPy3k;

  src = fetchPypi {
-    inherit pname version;
-    sha256 = "3b63f24e6b04368c3e4a6f923f484be0230d821aad65ac36108edbff29e9aaab";
+    inherit (finalAttrs) pname version;
+    hash = "sha256-O2PyTmsENow+Sm+SP0hL4CMNghqtZaw2EI7b/ynpqqs=";
  };

+  build-system = [ setuptools ];
+
  buildInputs = [
    pycodestyle
    isort
@ -35,4 +38,4 @@ buildPythonPackage rec {
      lib.maintainers.timma
    ];
  };
-}
+})
--- a/pkgs/development/python-modules/azure-applicationinsights/default.nix
+++ b/pkgs/development/python-modules/azure-applicationinsights/default.nix
@ -4,20 +4,23 @@
  fetchPypi,
  azure-common,
  msrest,
+  setuptools,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "azure-applicationinsights";
  version = "0.1.1";
-  format = "setuptools";
+  pyproject = true;

  src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
    extension = "zip";
    hash = "sha256-qIRbgDZbfyALrR9xqA0NMfO+wB7f1GfftsE+or1xupY=";
  };

-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
    azure-common
    msrest
  ];
@ -31,4 +34,4 @@ buildPythonPackage rec {
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ maxwilson ];
  };
-}
+})
--- a/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix
+++ b/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix
@ -3,19 +3,22 @@
  buildPythonPackage,
  fetchPypi,
  azure-nspkg,
+  setuptools,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "azure-cosmosdb-nspkg";
  version = "2.0.2";
-  format = "setuptools";
+  pyproject = true;

  src = fetchPypi {
-    inherit pname version;
-    sha256 = "acf691e692818d9a65c653c7a3485eb8e35c0bdc496bba652e5ea3905ba09cd8";
+    inherit (finalAttrs) pname version;
+    hash = "sha256-rPaR5pKBjZplxlPHo0heuONcC9xJa7plLl6jkFugnNg=";
  };

-  propagatedBuildInputs = [ azure-nspkg ];
+  build-system = [ setuptools ];
+
+  dependencies = [ azure-nspkg ];

  # has no tests
  doCheck = false;
@ -26,4 +29,4 @@ buildPythonPackage rec {
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ maxwilson ];
  };
-}
+})
--- a/pkgs/development/python-modules/azure-datalake-store/default.nix
+++ b/pkgs/development/python-modules/azure-datalake-store/default.nix
@ -6,20 +6,23 @@
  fetchPypi,
  msal,
  requests,
+  setuptools,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "azure-datalake-store";
  version = "1.0.1";
-  format = "setuptools";
+  pyproject = true;

  src = fetchPypi {
    pname = "azure_datalake_store";
-    inherit version;
+    inherit (finalAttrs) version;
    hash = "sha256-U2TURFqrFUocfLECFWKcPORs5ceqrxYHGJDAP65ToDU=";
  };

-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
    adal
    azure-common
    msal
@ -35,4 +38,4 @@ buildPythonPackage rec {
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ maxwilson ];
  };
-}
+})
--- a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix
+++ b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix
@ -6,20 +6,25 @@
  buildPythonPackage,
  fetchPypi,
  isodate,
+  setuptools,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "azure-synapse-artifacts";
  version = "0.22.0";
-  format = "setuptools";
+  pyproject = true;
+
+  __structuredAttrs = true;

  src = fetchPypi {
    pname = "azure_synapse_artifacts";
-    inherit version;
+    inherit (finalAttrs) version;
    hash = "sha256-3cD7Yic4w+q3RlzkKM+gzUGtAahw+9RTYeTVjRdcYjw=";
  };

-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
    azure-common
    azure-core
    azure-mgmt-core
@ -34,8 +39,8 @@ buildPythonPackage rec {
  meta = {
    description = "Microsoft Azure Synapse Artifacts Client Library for Python";
    homepage = "https://github.com/Azure/azure-sdk-for-python";
-    changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-synapse-artifacts_${version}/sdk/synapse/azure-synapse-artifacts/CHANGELOG.md";
+    changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-synapse-artifacts_${finalAttrs.version}/sdk/synapse/azure-synapse-artifacts/CHANGELOG.md";
    license = lib.licenses.mit;
    maintainers = [ ];
  };
-}
+})
--- a/pkgs/development/python-modules/baseline/default.nix
+++ b/pkgs/development/python-modules/baseline/default.nix
@ -2,6 +2,7 @@
  lib,
  buildPythonPackage,
  fetchFromGitHub,
+  setuptools,
  isPy3k,
  pytestCheckHook,
 }:
@ -9,18 +10,25 @@
 buildPythonPackage {
  pname = "baseline";
  version = "1.2.1";
-  format = "setuptools";
+  pyproject = true;
+
+  __structuredAttrs = true;
+
  disabled = !isPy3k;

  src = fetchFromGitHub {
    owner = "dmgass";
    repo = "baseline";
    rev = "95a0b71806ed16310eb0f27bc48aa5e21f731423";
-    sha256 = "0qjg46ipyfjflvjqzqr5p7iylwwqn2mhhrq952d01vi8wvfds10d";
+    hash = "sha256-DQTd3OYo7gCaKAlnCKuwmHPq47kl44/lpk46f6MhT2I=";
  };

+  build-system = [ setuptools ];
+
  nativeCheckInputs = [ pytestCheckHook ];

+  pythonImportsCheck = [ "baseline" ];
+
  meta = {
    description = "Easy String Baseline";
    mainProgram = "baseline";
--- a/pkgs/development/python-modules/basiciw/default.nix
+++ b/pkgs/development/python-modules/basiciw/default.nix
@ -2,25 +2,32 @@
  lib,
  buildPythonPackage,
  fetchPypi,
+  setuptools,
  gcc,
  wirelesstools,
  isPyPy,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "basiciw";
  version = "0.2.2";
-  format = "setuptools";
+  pyproject = true;
+
+  __structuredAttrs = true;

  disabled = isPyPy;

  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1ajmflvvlkflrcmqmkrx0zaira84z8kv4ssb2jprfwvjh8vfkysb";
+    inherit (finalAttrs) pname version;
+    hash = "sha256-S/vpNoJyc5evFEtrsif6BKkc1Qc9z4ory9RNujd1Vao=";
  };

+  build-system = [ setuptools ];
+
  buildInputs = [ gcc ];
-  propagatedBuildInputs = [ wirelesstools ];
+  dependencies = [ wirelesstools ];
+
+  pythonImportsCheck = [ "basiciw" ];

  meta = {
    description = "Get info about wireless interfaces using libiw";
@ -28,4 +35,4 @@ buildPythonPackage rec {
    platforms = lib.platforms.linux;
    license = lib.licenses.gpl2;
  };
-}
+})
--- a/pkgs/development/python-modules/before-after/default.nix
+++ b/pkgs/development/python-modules/before-after/default.nix
@ -2,18 +2,21 @@
  buildPythonPackage,
  fetchPypi,
  fetchpatch,
+  setuptools,
  pytestCheckHook,
  lib,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "before-after";
  version = "1.0.1";
-  format = "setuptools";
+  pyproject = true;
+
+  __structuredAttrs = true;

  src = fetchPypi {
    pname = "before_after";
-    inherit version;
+    inherit (finalAttrs) version;
    hash = "sha256-x9T5uLi7UgldoUxLnFnqaz9bnqn9zop7/HLsrg9aP4U=";
  };

@ -29,6 +32,8 @@ buildPythonPackage rec {
    })
  ];

+  build-system = [ setuptools ];
+
  nativeCheckInputs = [ pytestCheckHook ];

  pythonImportsCheck = [ "before_after" ];
@ -39,4 +44,4 @@ buildPythonPackage rec {
    maintainers = [ ];
    license = lib.licenses.gpl2Only;
  };
-}
+})
--- a/pkgs/development/python-modules/bincopy/default.nix
+++ b/pkgs/development/python-modules/bincopy/default.nix
@ -2,6 +2,7 @@
  lib,
  buildPythonPackage,
  fetchPypi,
+  setuptools,
  argparse-addons,
  humanfriendly,
  pyelftools,
@ -10,14 +11,18 @@
 buildPythonPackage (finalAttrs: {
  pname = "bincopy";
  version = "20.1.1";
-  format = "setuptools";
+  pyproject = true;
+
+  __structuredAttrs = true;

  src = fetchPypi {
    inherit (finalAttrs) pname version;
    hash = "sha256-6UpJi5pKvnZwPDdyqtRm8VY7T8mAnaeWXxG8dwlAk7k=";
  };

-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
    argparse-addons
    humanfriendly
    pyelftools
--- a/pkgs/development/python-modules/bravia-tv/default.nix
+++ b/pkgs/development/python-modules/bravia-tv/default.nix
@ -2,22 +2,27 @@
  lib,
  buildPythonPackage,
  fetchFromGitHub,
+  setuptools,
  requests,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "bravia-tv";
  version = "1.0.11";
-  format = "setuptools";
+  pyproject = true;
+
+  __structuredAttrs = true;

  src = fetchFromGitHub {
    owner = "dcnielsen90";
    repo = "python-bravia-tv";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
    hash = "sha256-g47bDd5bZl0jad3o6T1jJLcnZj8nx944kz3Vxv8gD2U=";
  };

-  propagatedBuildInputs = [ requests ];
+  build-system = [ setuptools ];
+
+  dependencies = [ requests ];

  # Package does not include tests
  doCheck = false;
@ -30,4 +35,4 @@ buildPythonPackage rec {
    license = lib.licenses.mit;
    maintainers = [ ];
  };
-}
+})
--- a/pkgs/development/python-modules/cachier/default.nix
+++ b/pkgs/development/python-modules/cachier/default.nix
@ -6,9 +6,12 @@
  setuptools,
  click,
  watchdog,
+  pympler,
  portalocker,
  pytestCheckHook,
  pytest-cov-stub,
+  pytest-asyncio,
+  aiosqlite,
  sqlalchemy,
  pymongo,
  dnspython,
@ -19,14 +22,14 @@

 buildPythonPackage rec {
  pname = "cachier";
-  version = "4.1.0";
+  version = "4.2.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "python-cachier";
    repo = "cachier";
    tag = "v${version}";
-    hash = "sha256-FmrwH5Ksmgt0HA5eUN5LU36P5sY4PymRKsUWVkQlvBo=";
+    hash = "sha256-hiyevLMtKV8M8znB2mznHLRM+pVN6uCxZZVf3H0gjTI=";
  };

  pythonRemoveDeps = [ "setuptools" ];
@ -37,6 +40,7 @@ buildPythonPackage rec {

  dependencies = [
    watchdog
+    pympler
    portalocker
    # not listed as dep, but needed to run main script entrypoint
    click
@ -45,6 +49,8 @@ buildPythonPackage rec {
  nativeCheckInputs = [
    pytestCheckHook
    pytest-cov-stub
+    pytest-asyncio
+    aiosqlite
    sqlalchemy
    pymongo
    dnspython
@ -83,7 +89,7 @@ buildPythonPackage rec {

  disabledTestPaths = [
    # Keeps breaking due to concurrent access or failing to close the db between tests.
-    "tests/test_sql_core.py"
+    "tests/sql_tests/test_sql_core.py"
  ];

  preBuild = ''
--- a/pkgs/development/python-modules/calysto/default.nix
+++ b/pkgs/development/python-modules/calysto/default.nix
@ -2,6 +2,7 @@
  lib,
  buildPythonPackage,
  fetchFromGitHub,
+  setuptools,
  metakernel,
  svgwrite,
  ipywidgets,
@ -9,19 +10,23 @@
  numpy,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "calysto";
  version = "1.0.6";
-  format = "setuptools";
+  pyproject = true;
+
+  __structuredAttrs = true;

  src = fetchFromGitHub {
    owner = "Calysto";
    repo = "calysto";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
    hash = "sha256-lr/cHFshpFs/PGMCsa3FKMRPTP+eE9ziH5XCpV+KzO8=";
  };

-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
    metakernel
    svgwrite
    ipywidgets
@ -40,4 +45,4 @@ buildPythonPackage rec {
    license = lib.licenses.bsd2;
    maintainers = [ ];
  };
-}
+})
--- a/pkgs/development/python-modules/cccolutils/default.nix
+++ b/pkgs/development/python-modules/cccolutils/default.nix
@ -2,6 +2,7 @@
  lib,
  buildPythonPackage,
  fetchPypi,
+  setuptools,
  git,
  gitpython,
  krb5-c, # C krb5 library, not PyPI krb5
@ -9,20 +10,24 @@
  pytestCheckHook,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "cccolutils";
  version = "1.5";
-  format = "setuptools";
+  pyproject = true;
+
+  __structuredAttrs = true;

  src = fetchPypi {
    pname = "CCColUtils";
-    inherit version;
+    inherit (finalAttrs) version;
    hash = "sha256-YzKjG43biRbTZKtzSUHHhtzOfcZfzISHDFolqzrBjL8=";
  };

+  build-system = [ setuptools ];
+
  buildInputs = [ krb5-c ];

-  propagatedBuildInputs = [
+  dependencies = [
    git
    gitpython
    mock
@ -37,4 +42,4 @@ buildPythonPackage rec {
    homepage = "https://pagure.io/cccolutils";
    license = lib.licenses.gpl2Plus;
  };
-}
+})
--- a/pkgs/development/python-modules/chat-downloader/default.nix
+++ b/pkgs/development/python-modules/chat-downloader/default.nix
@ -2,6 +2,7 @@
  lib,
  buildPythonPackage,
  fetchPypi,
+  setuptools,
  requests,
  isodate,
  docstring-parser,
@ -10,17 +11,21 @@
  pytestCheckHook,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "chat-downloader";
  version = "0.2.8";
-  format = "setuptools";
+  pyproject = true;
+
+  __structuredAttrs = true;

  src = fetchPypi {
-    inherit version pname;
+    inherit (finalAttrs) version pname;
    hash = "sha256-WBasBhefgRkOdMdz2K/agvS+cY6m3/33wiu+Jl4d1Cg=";
  };

-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
    requests
    isodate
    docstring-parser
@ -39,8 +44,8 @@ buildPythonPackage rec {
    description = "Simple tool used to retrieve chat messages from livestreams, videos, clips and past broadcasts";
    mainProgram = "chat_downloader";
    homepage = "https://github.com/xenova/chat-downloader";
-    changelog = "https://github.com/xenova/chat-downloader/releases/tag/v${version}";
+    changelog = "https://github.com/xenova/chat-downloader/releases/tag/v${finalAttrs.version}";
    license = lib.licenses.mit;
    maintainers = [ ];
  };
-}
+})
--- a/pkgs/development/python-modules/ci-info/default.nix
+++ b/pkgs/development/python-modules/ci-info/default.nix
@ -2,17 +2,22 @@
  lib,
  buildPythonPackage,
  fetchPypi,
+  setuptools,
  pytest,
  pytestCheckHook,
 }:

-buildPythonPackage rec {
-  version = "0.3.0";
-  format = "setuptools";
+buildPythonPackage (finalAttrs: {
  pname = "ci-info";
+  version = "0.3.0";
+  pyproject = true;
+
+  __structuredAttrs = true;
+
+  build-system = [ setuptools ];

  src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
    hash = "sha256-H9UMvUAfKa3/7rGLBIniMtFqwadFisa8MW3qtq5TX7A=";
  };

@ -31,4 +36,4 @@ buildPythonPackage rec {
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ bcdarwin ];
  };
-}
+})
--- a/pkgs/development/python-modules/ci-py/default.nix
+++ b/pkgs/development/python-modules/ci-py/default.nix
@ -2,22 +2,27 @@
  lib,
  buildPythonPackage,
  fetchPypi,
+  setuptools,
  pytestCheckHook,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "ci-py";
  version = "1.0.0";
-  format = "setuptools";
+  pyproject = true;
+
+  __structuredAttrs = true;

  src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
    hash = "sha256-R/6bLsXOKGxiJDZUvvOuvLp3usEhfg698qvvgOwBXYk=";
  };

+  build-system = [ setuptools ];
+
  postPatch = ''
    substituteInPlace setup.py \
-      --replace "'pytest-runner', " ""
+      --replace-fail "'pytest-runner', " ""
  '';

  nativeCheckInputs = [ pytestCheckHook ];
@ -31,4 +36,4 @@ buildPythonPackage rec {
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ bcdarwin ];
  };
-}
+})
--- a/pkgs/development/python-modules/ciscomobilityexpress/default.nix
+++ b/pkgs/development/python-modules/ciscomobilityexpress/default.nix
@ -2,21 +2,26 @@
  lib,
  buildPythonPackage,
  fetchPypi,
+  setuptools,
  requests,
  python,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "ciscomobilityexpress";
  version = "1.0.2";
-  format = "setuptools";
+  pyproject = true;
+
+  __structuredAttrs = true;

  src = fetchPypi {
-    inherit pname version;
-    sha256 = "d8787245598e8371a83baa4db1df949d8a942c43f13454fa26ee3b09c3ccafc0";
+    inherit (finalAttrs) pname version;
+    hash = "sha256-2HhyRVmOg3GoO6pNsd+UnYqULEPxNFT6Ju47CcPMr8A=";
  };

-  propagatedBuildInputs = [ requests ];
+  build-system = [ setuptools ];
+
+  dependencies = [ requests ];

  # tests directory is set up, but has no tests
  checkPhase = ''
@ -31,4 +36,4 @@ buildPythonPackage rec {
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ uvnikita ];
  };
-}
+})
--- a/Show more
+++ b/Show more