Merge master into staging-next

2025-07-02 12:07:14 +00:00
parent 858f9904d5 e6ff9e9481
commit 38cb123b52
719 changed files with 1606 additions and 436 deletions
@@ -61,6 +61,10 @@
 - `reaction` has been updated to version 2, which includes some breaking changes.
  For more information, [check the release article](https://blog.ppom.me/en-reaction-v2).

+- The `buildPythonPackage` and `buildPythonApplication` functions now require
+  an explicit `format` attribute. Previously the default format used setuptools
+  and called `setup.py` from the source tree, which is deprecated.
+  The modern alternative is to configure `pyproject = true` with `build-system = [ setuptools ]`.

 ### Deprecations {#sec-nixpkgs-release-25.11-lib-deprecations}

@@ -98,7 +98,7 @@ in
      };

      serviceConfig = {
-        ExecStart = "${pkgs.greetd.greetd}/bin/greetd --config ${settingsFormat.generate "greetd.toml" cfg.settings}";
+        ExecStart = "${lib.getExe cfg.package} --config ${settingsFormat.generate "greetd.toml" cfg.settings}";

        Restart = lib.mkIf cfg.restart "on-success";

@@ -137,6 +137,7 @@ let
  nixos-taskserver =
    with pkgs.python3.pkgs;
    buildPythonApplication {
+      format = "setuptools";
      name = "nixos-taskserver";

      src = pkgs.runCommand "nixos-taskserver-src" { preferLocalBuild = true; } ''
@@ -323,6 +323,11 @@ in
      description = "Avahi mDNS/DNS-SD Stack Activation Socket";
      listenStreams = [ "/run/avahi-daemon/socket" ];
      wantedBy = [ "sockets.target" ];
+      after = [
+        # Ensure that `/run/avahi-daemon` owned by `avahi` is created by `systemd.tmpfiles.rules` before the `avahi-daemon.socket`,
+        # otherwise `avahi-daemon.socket` will automatically create it owned by `root`, which will cause `avahi-daemon.service` to fail.
+        "systemd-tmpfiles-setup.service"
+      ];
    };

    systemd.tmpfiles.rules = [ "d /run/avahi-daemon - avahi avahi -" ];
@@ -1049,6 +1049,7 @@ in
  overlayfs = runTest ./overlayfs.nix;
  pacemaker = runTest ./pacemaker.nix;
  packagekit = runTest ./packagekit.nix;
+  paisa = runTest ./paisa.nix;
  pam-file-contents = runTest ./pam/pam-file-contents.nix;
  pam-oath-login = runTest ./pam/pam-oath-login.nix;
  pam-u2f = runTest ./pam/pam-u2f.nix;
@@ -0,0 +1,23 @@
+{ ... }:
+{
+  name = "paisa";
+  nodes.machine =
+    { pkgs, lib, ... }:
+    {
+      systemd.services.paisa = {
+        description = "Paisa";
+        wantedBy = [ "multi-user.target" ];
+        serviceConfig.ExecStart = "${lib.getExe pkgs.paisa} serve";
+      };
+    };
+  testScript = ''
+    start_all()
+
+    machine.systemctl("start network-online.target")
+    machine.wait_for_unit("network-online.target")
+    machine.wait_for_unit("paisa.service")
+    machine.wait_for_open_port(7500)
+
+    machine.succeed("curl --location --fail http://localhost:7500")
+  '';
+}
@@ -6,6 +6,7 @@ import ../make-test-python.nix {
    let
      testLib = pkgs.python3Packages.buildPythonPackage {
        name = "confinement-testlib";
+        format = "setuptools";
        unpackPhase = ''
          cat > setup.py <<EOF
          from setuptools import setup
@@ -8,6 +8,7 @@ with pythonPackages;
 buildPythonApplication rec {
  pname = "greg";
  version = "0.4.8";
+  format = "setuptools";

  disabled = !isPy3k;

@@ -17,6 +17,7 @@
 buildPythonApplication {
  pname = "hushboard";
  version = "unstable-2021-03-17";
+  format = "setuptools";

  src = fetchFromGitHub {
    owner = "stuartlangridge";
@@ -8,6 +8,7 @@
 python3Packages.buildPythonApplication rec {
  pname = "Mopidy-Bandcamp";
  version = "1.1.5";
+  format = "setuptools";
  src = fetchPypi {
    inherit pname version;
    hash = "sha256-wg9zcOKfZQRhpyA1Cu5wvdwKpmrlcr2m9mrqBHgUXAQ=";
@@ -8,6 +8,7 @@
 python3Packages.buildPythonApplication rec {
  pname = "Mopidy-Iris";
  version = "3.69.3";
+  format = "setuptools";

  src = fetchPypi {
    inherit pname version;
@@ -8,6 +8,7 @@
 python3Packages.buildPythonApplication rec {
  pname = "mopidy-jellyfin";
  version = "1.0.6";
+  format = "setuptools";

  src = fetchPypi {
    inherit version;
@@ -8,6 +8,7 @@
 python3Packages.buildPythonApplication rec {
  pname = "Mopidy-Local";
  version = "3.3.0";
+  format = "setuptools";

  src = fetchPypi {
    inherit version;
@@ -9,6 +9,7 @@
 pythonPackages.buildPythonApplication rec {
  pname = "Mopidy-Moped";
  version = "0.7.1";
+  format = "setuptools";

  src = fetchPypi {
    inherit pname version;
@@ -14,6 +14,7 @@
 pythonPackages.buildPythonApplication rec {
  pname = "mopidy";
  version = "3.4.2";
+  format = "setuptools";

  src = fetchFromGitHub {
    owner = "mopidy";
@@ -8,6 +8,7 @@
 pythonPackages.buildPythonApplication rec {
  pname = "Mopidy-Mopify";
  version = "1.7.3";
+  format = "setuptools";

  src = fetchPypi {
    inherit pname version;
@@ -8,6 +8,7 @@
 python3Packages.buildPythonApplication rec {
  pname = "Mopidy-MPD";
  version = "3.3.0";
+  format = "setuptools";

  src = fetchPypi {
    inherit pname version;
@@ -8,6 +8,7 @@
 python3Packages.buildPythonApplication rec {
  pname = "mopidy-mpris";
  version = "3.0.3";
+  format = "setuptools";

  src = fetchPypi {
    inherit version;
@@ -8,6 +8,7 @@
 pythonPackages.buildPythonApplication rec {
  pname = "mopidy-muse";
  version = "0.0.33";
+  format = "setuptools";

  src = fetchPypi {
    inherit version;
@@ -8,6 +8,7 @@
 pythonPackages.buildPythonApplication rec {
  pname = "mopidy-musicbox-webclient";
  version = "3.1.0";
+  format = "setuptools";

  src = fetchFromGitHub {
    owner = "pimusicbox";
@@ -8,6 +8,7 @@
 pythonPackages.buildPythonApplication rec {
  pname = "Mopidy-Notify";
  version = "0.2.1";
+  format = "setuptools";

  src = fetchPypi {
    inherit pname version;
@@ -8,6 +8,7 @@
 python3Packages.buildPythonApplication rec {
  pname = "mopidy-podcast";
  version = "3.0.1";
+  format = "setuptools";

  src = fetchPypi {
    inherit version;
@@ -8,6 +8,7 @@
 python3Packages.buildPythonApplication rec {
  pname = "Mopidy-Scrobbler";
  version = "2.0.1";
+  format = "setuptools";

  src = fetchPypi {
    inherit pname version;
@@ -8,6 +8,7 @@
 python3Packages.buildPythonApplication rec {
  pname = "mopidy-somafm";
  version = "2.0.2";
+  format = "setuptools";

  src = fetchPypi {
    inherit version;
@@ -8,6 +8,7 @@
 pythonPackages.buildPythonApplication rec {
  pname = "mopidy-soundcloud";
  version = "3.0.2";
+  format = "setuptools";

  src = fetchFromGitHub {
    owner = "mopidy";
@@ -8,6 +8,7 @@
 pythonPackages.buildPythonApplication rec {
  pname = "mopidy-subidy";
  version = "1.0.0";
+  format = "setuptools";

  src = fetchFromGitHub {
    owner = "Prior99";
@@ -8,6 +8,7 @@
 python3Packages.buildPythonApplication rec {
  pname = "mopidy-tunein";
  version = "1.1.0";
+  format = "setuptools";

  src = fetchPypi {
    inherit version;
@@ -10,6 +10,7 @@
 buildPythonApplication rec {
  pname = "cryptop";
  version = "0.2.0";
+  format = "setuptools";

  src = fetchPypi {
    inherit pname version;
@@ -46,6 +46,7 @@ rustPlatform.buildRustPackage rec {
      Comes with agreety, a simple, text-based greeter.
    '';
    homepage = "https://sr.ht/~kennylevinsen/greetd/";
+    mainProgram = "greetd";
    license = licenses.gpl3Plus;
    maintainers = with maintainers; [ ];
    platforms = platforms.linux;
@@ -16,6 +16,7 @@
 buildPythonApplication rec {
  pname = "formiko";
  version = "1.5.0";
+  format = "setuptools";

  src = fetchFromGitHub {
    owner = "ondratu";
@@ -8,6 +8,7 @@
 python3.pkgs.buildPythonPackage rec {
  pname = "coq-jupyter";
  version = "1.6.0";
+  format = "setuptools";

  src = fetchFromGitHub {
    owner = "EugeneLoy";
@@ -9,6 +9,7 @@ with python3Packages;
 buildPythonPackage rec {
  pname = "octave-kernel";
  version = "0.34.2";
+  format = "setuptools";

  src = fetchPypi {
    pname = "octave_kernel";
@@ -12,12 +12,12 @@
  pkgs,
 }:
 let
-  version = "0.0.25-unstable-2025-06-21";
+  version = "0.0.25-unstable-2025-07-02";
  src = fetchFromGitHub {
    owner = "yetone";
    repo = "avante.nvim";
-    rev = "86743a1d7d6232a820709986e971b3c1de62d9a7";
-    hash = "sha256-7lLnC/tcl5yVM6zBIk41oJ3jhRTv8AqXwJdXF2yPjwk=";
+    rev = "6bbf3d2004133252cd0e2d057add5c1431dc8511";
+    hash = "sha256-xHYogeovrd2n7oZB935ma2qwqhfu0eEDieQv5j5d9dQ=";
  };
  avante-nvim-lib = rustPlatform.buildRustPackage {
    pname = "avante-nvim-lib";
@@ -43,12 +43,12 @@
  };
  angular = buildGrammar {
    language = "angular";
-    version = "0.0.0+rev=820566b";
+    version = "0.0.0+rev=93bb92f";
    src = fetchFromGitHub {
      owner = "dlvandenberg";
      repo = "tree-sitter-angular";
-      rev = "820566bb4eb3d288822dbfee42417a5a9491aea6";
-      hash = "sha256-sSa/a0Py0M5fDRxe/9jTLHDq7Wl4bK3umSZOI82FLwg=";
+      rev = "93bb92f1289b7fe765da6cc747c82ccdc0afeb8d";
+      hash = "sha256-s6RLY8vGNbA3VHyaRbhE/cbe1T1llhaiZNTiYXkBCQc=";
    };
    meta.homepage = "https://github.com/dlvandenberg/tree-sitter-angular";
  };
@@ -319,12 +319,12 @@
  };
  clojure = buildGrammar {
    language = "clojure";
-    version = "0.0.0+rev=40c5fc2";
+    version = "0.0.0+rev=be514ee";
    src = fetchFromGitHub {
      owner = "sogaiu";
      repo = "tree-sitter-clojure";
-      rev = "40c5fc2e2a0f511a802a82002553c5de00feeaf4";
-      hash = "sha256-t5lLOUBgsUewnfTOIreGq83OnGNzUbl6UDDB/HCocpg=";
+      rev = "be514eec2c86d560c18fab146e9298e21b8eab62";
+      hash = "sha256-VnzOuLrE/lcXOCg3Iuntj9m8zy/Exwi1Mv+nZvi62Qs=";
    };
    meta.homepage = "https://github.com/sogaiu/tree-sitter-clojure";
  };
@@ -972,12 +972,12 @@
  };
  gleam = buildGrammar {
    language = "gleam";
-    version = "0.0.0+rev=ee93c63";
+    version = "0.0.0+rev=21e0e7b";
    src = fetchFromGitHub {
      owner = "gleam-lang";
      repo = "tree-sitter-gleam";
-      rev = "ee93c639dc82148d716919df336ad612fd33538e";
-      hash = "sha256-SZ2LX068EaDXTtit+GQ7oxS7rDuVnFtCurp18/hMCcQ=";
+      rev = "21e0e7ba6f4f60ee80934cb368aa13c00d370734";
+      hash = "sha256-NJBD/IeJ8V2tuJHuUGwAinldubrRgLlA+4MUD7zyjzA=";
    };
    meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam";
  };
@@ -1369,12 +1369,12 @@
  };
  idl = buildGrammar {
    language = "idl";
-    version = "0.0.0+rev=b14e797";
+    version = "0.0.0+rev=da50751";
    src = fetchFromGitHub {
      owner = "cathaysia";
      repo = "tree-sitter-idl";
-      rev = "b14e7971cfbd64fa0ebcdeaa4dfbb3cb0bfabd7c";
-      hash = "sha256-gVg1v2pL/c8ZFMBQoFeyIaqZ9QYDncHJv/4bJdTX/nw=";
+      rev = "da50751d826030fcf8b1424de9f56cec2a274b38";
+      hash = "sha256-5FAppUTuPNNrRuLdS4zZMh4xeYDT/JOsQS53u/0nT/0=";
    };
    meta.homepage = "https://github.com/cathaysia/tree-sitter-idl";
  };
@@ -1446,12 +1446,12 @@
  };
  javadoc = buildGrammar {
    language = "javadoc";
-    version = "0.0.0+rev=3f2ed55";
+    version = "0.0.0+rev=ac58d03";
    src = fetchFromGitHub {
      owner = "rmuir";
      repo = "tree-sitter-javadoc";
-      rev = "3f2ed5575909874927489d2d47a3a2fda36959ee";
-      hash = "sha256-rbo+l5JR/m2PDmcHtso+tXEgXIcR1bvu9+dOoKNfWq8=";
+      rev = "ac58d03fde1aaf7dbf499e57bfed9ce87e36188d";
+      hash = "sha256-wMXcozRsJE4rZO81QCKL3mNR08z4gO02pYlaT1XPm+E=";
    };
    meta.homepage = "https://github.com/rmuir/tree-sitter-javadoc";
  };
@@ -1468,24 +1468,24 @@
  };
  jinja = buildGrammar {
    language = "jinja";
-    version = "0.0.0+rev=258d7fb";
+    version = "0.0.0+rev=2511019";
    src = fetchFromGitHub {
      owner = "cathaysia";
      repo = "tree-sitter-jinja";
-      rev = "258d7fb22fa6cd2dc800f201cfdcbe05111a836c";
-      hash = "sha256-pf9jYK/Rj/axmQ9GVrMLjcfL6xtv3rDPr+hjTwfOWxU=";
+      rev = "251101981d86ccb2901741eddf3e7cf21567a66d";
+      hash = "sha256-JbutCmJFKmB1UKIGkEJdiBJOaFmIeea8jK9nhYMkikY=";
    };
    location = "tree-sitter-jinja";
    meta.homepage = "https://github.com/cathaysia/tree-sitter-jinja";
  };
  jinja_inline = buildGrammar {
    language = "jinja_inline";
-    version = "0.0.0+rev=258d7fb";
+    version = "0.0.0+rev=2511019";
    src = fetchFromGitHub {
      owner = "cathaysia";
      repo = "tree-sitter-jinja";
-      rev = "258d7fb22fa6cd2dc800f201cfdcbe05111a836c";
-      hash = "sha256-pf9jYK/Rj/axmQ9GVrMLjcfL6xtv3rDPr+hjTwfOWxU=";
+      rev = "251101981d86ccb2901741eddf3e7cf21567a66d";
+      hash = "sha256-JbutCmJFKmB1UKIGkEJdiBJOaFmIeea8jK9nhYMkikY=";
    };
    location = "tree-sitter-jinja_inline";
    meta.homepage = "https://github.com/cathaysia/tree-sitter-jinja";
@@ -1713,12 +1713,12 @@
  };
  liquidsoap = buildGrammar {
    language = "liquidsoap";
-    version = "0.0.0+rev=8e51fa6";
+    version = "0.0.0+rev=68e6b24";
    src = fetchFromGitHub {
      owner = "savonet";
      repo = "tree-sitter-liquidsoap";
-      rev = "8e51fa63ddb93ac179d4e34a311d3d3f03780b42";
-      hash = "sha256-i6cQoMeKOS2hEId9bpqNchQDh2vjAfKk+hLTEMOUegU=";
+      rev = "68e6b247c880d1521f7b454663fb3735609eacf2";
+      hash = "sha256-fcZYpNPKZeVu9+B357kyCjAt4RNBKHc7Ce03zG8eK9k=";
    };
    meta.homepage = "https://github.com/savonet/tree-sitter-liquidsoap";
  };
@@ -1925,12 +1925,12 @@
  };
  nim = buildGrammar {
    language = "nim";
-    version = "0.0.0+rev=897e5d3";
+    version = "0.0.0+rev=9ed4696";
    src = fetchFromGitHub {
      owner = "alaviss";
      repo = "tree-sitter-nim";
-      rev = "897e5d346f0b59ed62b517cfb0f1a845ad8f0ab7";
-      hash = "sha256-JwR5Og1pGDTHI49rFsnfStrTcZ7hOseK6YyFIVlQ1o4=";
+      rev = "9ed4696d7f76e4937e2b63512a249a3ead7a0399";
+      hash = "sha256-kQit97vmuyNpguVIscNthi0ekBfkao1SwwCJRip4Mac=";
    };
    meta.homepage = "https://github.com/alaviss/tree-sitter-nim";
  };
@@ -1980,12 +1980,12 @@
  };
  nu = buildGrammar {
    language = "nu";
-    version = "0.0.0+rev=b64f0d1";
+    version = "0.0.0+rev=d62bb4a";
    src = fetchFromGitHub {
      owner = "nushell";
      repo = "tree-sitter-nu";
-      rev = "b64f0d1c93a76d167fabb01271905f0d18c5f10c";
-      hash = "sha256-bKWbEdgRzOqQDKQFf4soaBW9Ug7DNpe6c/4dYKL44Sk=";
+      rev = "d62bb4a0c78e9476a6dd0081761444f6870252ed";
+      hash = "sha256-pmW4F3Gif5VRosA+4CVzbF0ZrZioRujyiEJyWq6+dwg=";
    };
    meta.homepage = "https://github.com/nushell/tree-sitter-nu";
  };
@@ -2172,12 +2172,12 @@
  };
  poe_filter = buildGrammar {
    language = "poe_filter";
-    version = "0.0.0+rev=2902dc4";
+    version = "0.0.0+rev=e449216";
    src = fetchFromGitHub {
      owner = "tree-sitter-grammars";
      repo = "tree-sitter-poe-filter";
-      rev = "2902dc45439125b9386812c1089a8e9b5f71c4ab";
-      hash = "sha256-j/634pLyfgF7Pyjmh4ETuW0U38kH6Seik1w4pJKBmec=";
+      rev = "e449216700449f1bccaebbd3820cce794d6fd687";
+      hash = "sha256-6X+ZXtca0TKrVveD2aMMh0tTIrIwe9VsYqR7tiWDRLI=";
    };
    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-poe-filter";
  };
@@ -2406,11 +2406,11 @@
  };
  r = buildGrammar {
    language = "r";
-    version = "0.0.0+rev=95aff09";
+    version = "0.0.0+rev=7b4eb04";
    src = fetchFromGitHub {
      owner = "r-lib";
      repo = "tree-sitter-r";
-      rev = "95aff097aa927a66bb357f715b58cde821be8867";
+      rev = "7b4eb04dfcc86e6705cade825f8c1edbd46584b2";
      hash = "sha256-H4iK2p4xXjP6gGrOP/qpHQCiO3Jyy0jmb8u29RM0sBg=";
    };
    meta.homepage = "https://github.com/r-lib/tree-sitter-r";
@@ -2839,12 +2839,12 @@
  };
  ssh_config = buildGrammar {
    language = "ssh_config";
-    version = "0.0.0+rev=0dd3c7e";
+    version = "0.0.0+rev=2d620d0";
    src = fetchFromGitHub {
      owner = "tree-sitter-grammars";
      repo = "tree-sitter-ssh-config";
-      rev = "0dd3c7e9f301758f6c69a6efde43d3048deb4d8a";
-      hash = "sha256-jNB9cHOfHDIRPELm8LedJjNzjx16/ApcPGi8eaaJKZs=";
+      rev = "2d620d0ad636705800cf0ddb92c30afe703cd84f";
+      hash = "sha256-9eSiS8xhCmOJ4KaC3FUkTZE2iLWpE8xbDgsmj0DtgOA=";
    };
    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-ssh-config";
  };
@@ -2973,12 +2973,12 @@
  };
  systemverilog = buildGrammar {
    language = "systemverilog";
-    version = "0.0.0+rev=a412f4a";
+    version = "0.0.0+rev=3089b3f";
    src = fetchFromGitHub {
      owner = "gmlarumbe";
      repo = "tree-sitter-systemverilog";
-      rev = "a412f4a00a6e56c65f519117969c926c35e80ce4";
-      hash = "sha256-DGqJqFVWF2LHdFkCxnG2p8e4+zc/OLMw1W5dGD/SpVo=";
+      rev = "3089b3fe310dd6cf9531e5e45f123202053a29a1";
+      hash = "sha256-k3UGnWn2grkbiJ3L4mgyuVXKsJWOOtOMRtTnRVz3IyI=";
    };
    meta.homepage = "https://github.com/gmlarumbe/tree-sitter-systemverilog";
  };
@@ -3298,12 +3298,12 @@
  };
  v = buildGrammar {
    language = "v";
-    version = "0.0.0+rev=0f963ca";
+    version = "0.0.0+rev=5720fd0";
    src = fetchFromGitHub {
      owner = "vlang";
      repo = "v-analyzer";
-      rev = "0f963ca4c0cc888252f5a31f37c974d5e2527d06";
-      hash = "sha256-kDPxBgmde4ChaH+45yly2kkqW7G3w68JZMWOZKYwBas=";
+      rev = "5720fd00538ed069b43917fe377ca3fc21c89cb3";
+      hash = "sha256-U+SZkJ0ae1w+7y9sEgXIHn4/vQkapaSqyN3j2I1bSvI=";
    };
    location = "tree_sitter_v";
    meta.homepage = "https://github.com/vlang/v-analyzer";
@@ -3330,17 +3330,6 @@
    };
    meta.homepage = "https://github.com/ventojs/tree-sitter-vento";
  };
-  verilog = buildGrammar {
-    language = "verilog";
-    version = "0.0.0+rev=ba3c1e3";
-    src = fetchFromGitHub {
-      owner = "gmlarumbe";
-      repo = "tree-sitter-systemverilog";
-      rev = "ba3c1e305caf948f718293c86c6018a82ed5043e";
-      hash = "sha256-RuoPx2iSVVrZ37k4Cnj6DIsRZBY6v9C6d6tPhQztAPA=";
-    };
-    meta.homepage = "https://github.com/gmlarumbe/tree-sitter-systemverilog";
-  };
  vhdl = buildGrammar {
    language = "vhdl";
    version = "0.0.0+rev=eacafa5";
@@ -98,7 +98,7 @@ in
          ''
            touch $out
            ln -s ${withAllGrammars}/CONTRIBUTING.md .
-            export ALLOWED_INSTALLATION_FAILURES=ipkg,norg
+            export ALLOWED_INSTALLATION_FAILURES=ipkg,norg,verilog

            nvim --headless "+luafile ${withAllGrammars}/scripts/check-queries.lua" | tee log

@@ -758,14 +758,12 @@ in
  command-t = super.command-t.overrideAttrs {
    nativeBuildInputs = [
      getconf
-      ruby
    ];
    buildPhase = ''
      substituteInPlace lua/wincent/commandt/lib/Makefile \
        --replace-fail '/bin/bash' 'bash' \
        --replace-fail xcrun ""
      make build
-      rm ruby/command-t/ext/command-t/*.o
    '';
  };

@@ -1508,6 +1506,10 @@ in
    dependencies = [ self.nvim-treesitter ];
  };

+  jdd-nvim = super.lazyjj-nvim.overrideAttrs {
+    dependencies = [ self.plenary-nvim ];
+  };
+
  jedi-vim = super.jedi-vim.overrideAttrs {
    # checking for python3 support in vim would be neat, too, but nobody else seems to care
    buildInputs = [ python3.pkgs.jedi ];
@@ -1632,6 +1634,7 @@ in
  };

  leetcode-nvim = super.leetcode-nvim.overrideAttrs {
+    checkInputs = [ self.snacks-nvim ];
    dependencies = with self; [
      nui-nvim
      plenary-nvim
@@ -1654,6 +1657,7 @@ in
      "leetcode.picker.language.fzf"
      "leetcode.picker.question.fzf"
      "leetcode.picker.question.init"
+      "leetcode.picker.question.snacks"
      "leetcode.picker.question.telescope"
      "leetcode.picker.tabs.fzf"
      "leetcode.runner.init"
@@ -2908,6 +2912,10 @@ in
    '';
  };

+  plantuml-nvim = super.plantuml-nvim.overrideAttrs {
+    dependencies = [ self.LibDeflate-nvim ];
+  };
+
  playground = super.playground.overrideAttrs {
    dependencies = with self; [
      # we need the 'query' grammar to make
@@ -119,7 +119,7 @@ if __name__ == "__main__":
    logging.basicConfig(level=logging.INFO, format="%(levelname)s: %(message)s")

    generated = update_grammars()
-    output_path = Path(__file__).parent.parent / "nvim-treesitter/generated.nix"
+    output_path = Path(__file__).parent.parent.parent / "nvim-treesitter/generated.nix"
    log.info("Writing output to %s", output_path)
    with open(output_path, "w") as f:
        f.write(generated)
@@ -16,6 +16,7 @@ https://github.com/martinda/Jenkinsfile-vim-syntax/,,
 https://github.com/vigoux/LanguageTool.nvim/,,
 https://github.com/LazyVim/LazyVim/,,
 https://github.com/Yggdroot/LeaderF/,,
+https://github.com/goropikari/LibDeflate.nvim/,HEAD,
 https://github.com/molleweide/LuaSnip-snippets.nvim/,HEAD,
 https://github.com/Valloric/MatchTagAlways/,,
 https://github.com/numToStr/Navigator.nvim/,,
@@ -502,6 +503,7 @@ https://github.com/twerth/ir_black/,,
 https://github.com/Vigemus/iron.nvim/,HEAD,
 https://github.com/haya14busa/is.vim/,,
 https://github.com/vim-scripts/jdaddy.vim/,,
+https://github.com/mahyarmirrashed/jdd.nvim/,HEAD,
 https://github.com/davidhalter/jedi-vim/,,
 https://github.com/metalelf0/jellybeans-nvim/,,
 https://github.com/nanotech/jellybeans.vim/,,
@@ -949,6 +951,7 @@ https://github.com/phha/zenburn.nvim/,,phha-zenburn
 https://github.com/motus/pig.vim/,,
 https://github.com/weirongxu/plantuml-previewer.vim/,HEAD,
 https://github.com/aklt/plantuml-syntax/,,
+https://github.com/goropikari/plantuml.nvim/,HEAD,
 https://github.com/nvim-treesitter/playground/,,
 https://github.com/olivercederborg/poimandres.nvim/,HEAD,
 https://github.com/epwalsh/pomo.nvim/,HEAD,
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
  core = "bsnes";
-  version = "0-unstable-2025-06-20";
+  version = "0-unstable-2025-06-27";

  src = fetchFromGitHub {
    owner = "libretro";
    repo = "bsnes-libretro";
-    rev = "1362fc8afda0502a5a427d409d8e40b95fe3f696";
-    hash = "sha256-+hPxLDwhjzlSnNIw3xlXLJH3TrwEbil+81VbPQszQX0=";
+    rev = "d9697514a1901b7fcace0a77a7deccc693db38fb";
+    hash = "sha256-PS0Wc9ckVDuXS8bEimlzwXkiz5klAGJrApL04VdDW0A=";
  };

  makefile = "Makefile";
@@ -8,13 +8,13 @@
 }:
 mkLibretroCore {
  core = "flycast";
-  version = "0-unstable-2025-06-20";
+  version = "0-unstable-2025-06-27";

  src = fetchFromGitHub {
    owner = "flyinghead";
    repo = "flycast";
-    rev = "449d256995de36de0629dd1b97f4d67a0e50c92e";
-    hash = "sha256-7+Dn7+AUnd3+eEKRMuahaxiEMWTT1uUEP2y0ZgIs81Q=";
+    rev = "3f79b6baed2eebbf133b950197c418de06f28916";
+    hash = "sha256-C4Q9jTS5UcnwiP7i+Ka4CH2S+dXLbm2vwS93955/RoY=";
    fetchSubmodules = true;
  };

@@ -1,8 +1,8 @@
 diff --git a/src/emu/emuopts.cpp b/src/emu/emuopts.cpp
-index 3defd33d0bb..33daacc4fc8 100644
+index 834710c9eb0..6394ad8a7bc 100644
 --- a/src/emu/emuopts.cpp
 +++ b/src/emu/emuopts.cpp
-@@ -39,16 +39,16 @@ const options_entry emu_options::s_option_entries[] =
+@@ -42,16 +42,16 @@ const options_entry emu_options::s_option_entries[] =
 	{ nullptr,                                           nullptr,     core_options::option_type::HEADER,     "CORE SEARCH PATH OPTIONS" },
 	{ OPTION_PLUGINDATAPATH,                             ".",         core_options::option_type::PATH,       "path to base folder for plugin data (read/write)" },
 	{ OPTION_MEDIAPATH ";rp;biospath;bp",                "roms",      core_options::option_type::MULTIPATH,  "path to ROM sets and hard disk images" },
@@ -27,3 +27,16 @@ index 3defd33d0bb..33daacc4fc8 100644
 	{ OPTION_SWPATH,                                     "software",  core_options::option_type::MULTIPATH,  "path to loose software" },
 
 	// output directory options
+diff --git a/src/osd/modules/lib/osdobj_common.cpp b/src/osd/modules/lib/osdobj_common.cpp
+index 82fabfdc0ba..eefdaba7fbe 100644
+--- a/src/osd/modules/lib/osdobj_common.cpp
+++ b/src/osd/modules/lib/osdobj_common.cpp
+@@ -158,7 +158,7 @@ const options_entry osd_options::s_option_entries[] =
+ 	{ OSDOPTION_NETWORK_PROVIDER,                OSDOPTVAL_AUTO,   core_options::option_type::STRING,    "Emulated networking provider: " },
+ 
+ 	{ nullptr,                                   nullptr,           core_options::option_type::HEADER,   "BGFX POST-PROCESSING OPTIONS" },
+-	{ OSDOPTION_BGFX_PATH,                       "bgfx",            core_options::option_type::PATH,     "path to BGFX-related files" },
+	{ OSDOPTION_BGFX_PATH,                       "@mamePath@/bgfx",            core_options::option_type::PATH,     "path to BGFX-related files" },
+ 	{ OSDOPTION_BGFX_BACKEND,                    "auto",            core_options::option_type::STRING,   "BGFX backend to use (d3d9, d3d11, d3d12, metal, opengl, gles, vulkan)" },
+ 	{ OSDOPTION_BGFX_DEBUG,                      "0",               core_options::option_type::BOOLEAN,  "enable BGFX debugging statistics" },
+ 	{ OSDOPTION_BGFX_SCREEN_CHAINS,              "",                core_options::option_type::STRING,   "comma-delimited list of screen chain JSON names, colon-delimited per-window" },
@@ -123,8 +123,10 @@ stdenv.mkDerivation rec {
  # it is not possible to use substituteAll
  postPatch =
    ''
-      substituteInPlace src/emu/emuopts.cpp \
-        --subst-var-by mamePath "$out/opt/mame"
+      for file in src/emu/emuopts.cpp src/osd/modules/lib/osdobj_common.cpp; do
+        substituteInPlace "$file" \
+          --subst-var-by mamePath "$out/opt/mame"
+      done
    ''
    # MAME's build system uses `sw_vers` to test whether it needs to link with
    # the Metal framework or not. However:
@@ -22,6 +22,7 @@ in
 python3.pkgs.buildPythonApplication rec {
  pname = "textext";
  version = "1.11.1";
+  format = "setuptools";

  src = fetchFromGitHub {
    owner = "textext";
@@ -10,6 +10,7 @@
 python3Packages.buildPythonApplication rec {
  pname = "kcc";
  version = "5.5.1";
+  format = "setuptools";

  src = fetchPypi {
    inherit version;
@@ -8,6 +8,7 @@
 python3Packages.buildPythonApplication rec {
  pname = "veusz";
  version = "4.1";
+  format = "setuptools";

  src = fetchPypi {
    inherit pname version;
@@ -7,6 +7,7 @@
 python3Packages.buildPythonApplication {
  pname = "avell-unofficial-control-center";
  version = "1.0.4";
+  format = "setuptools";

  src = fetchFromGitHub {
    owner = "rodgomesc";
@@ -10,6 +10,7 @@
 buildPythonApplication rec {
  pname = "dmensamenu";
  version = "1.2.2";
+  format = "setuptools";

  src = fetchFromGitHub {
    owner = "dotlambda";
@@ -34,6 +34,7 @@ in
 python3.pkgs.buildPythonApplication rec {
  pname = "electrum";
  version = "4.5.8";
+  format = "setuptools";

  src = fetchurl {
    url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
@@ -34,6 +34,7 @@ in
 python3.pkgs.buildPythonApplication {
  pname = "electrum-grs";
  inherit version;
+  format = "setuptools";

  src = fetchFromGitHub {
    owner = "Groestlcoin";
@@ -48,6 +48,7 @@ in
 python3.pkgs.buildPythonApplication {
  pname = "electrum-ltc";
  inherit version;
+  format = "setuptools";

  src = fetchurl {
    url = "https://electrum-ltc.org/download/Electrum-LTC-${version}.tar.gz";
@@ -16,6 +16,7 @@
 buildPythonApplication rec {
  pname = "hovercraft";
  version = "2.7";
+  format = "setuptools";
  disabled = !isPy3k;

  src = fetchFromGitHub {
@@ -9,6 +9,7 @@
 python3Packages.buildPythonApplication rec {
  pname = "hue-plus";
  version = "1.4.5";
+  format = "setuptools";

  src = fetchFromGitHub {
    owner = "kusti8";
@@ -11,6 +11,7 @@
 buildPythonApplication rec {
  pname = "mu-repo";
  version = "1.9.0";
+  format = "setuptools";

  src = fetchFromGitHub {
    owner = "fabioz";
@@ -14,6 +14,7 @@
    mkDerivationWith buildPythonPackage rec {
      pname = "plover";
      version = "4.0.2";
+      format = "setuptools";

      meta = with lib; {
        broken = stdenv.hostPlatform.isDarwin;
@@ -11,6 +11,7 @@
 buildPythonApplication rec {
  pname = "remarkable-mouse";
  version = "7.1.1";
+  format = "setuptools";

  src = fetchPypi {
    inherit pname version;
@@ -11,6 +11,7 @@
 buildPythonApplication rec {
  pname = "termdown";
  version = "1.18.0";
+  format = "setuptools";

  src = fetchFromGitHub {
    owner = "trehn";
@@ -16,6 +16,7 @@
 buildPythonApplication {
  pname = "termpdf.py";
  version = "2022-03-28";
+  format = "setuptools";

  src = fetchFromGitHub {
    owner = "dsanson";
@@ -10,6 +10,7 @@
 buildPythonApplication rec {
  pname = "twitch-chat-downloader";
  version = "2.5.4";
+  format = "setuptools";

  # NOTE: Using maintained fork because upstream has stopped working, and it has
  # not been updated in a while.
@@ -52,6 +52,7 @@
 buildPythonApplication rec {
  pname = "visidata";
  version = "3.1.1";
+  format = "setuptools";

  src = fetchFromGitHub {
    owner = "saulpw";
@@ -6,6 +6,7 @@

 pythonPackages.buildPythonApplication rec {
  version = "1.4";
+  format = "setuptools";
  pname = "wikicurses";

  src = fetchFromGitHub {
@@ -12,6 +12,7 @@
 buildPythonApplication rec {
  pname = "yokadi";
  version = "1.3.0";
+  format = "setuptools";

  src = fetchurl {
    url = "https://yokadi.github.io/download/${pname}-${version}.tar.gz";
@@ -6,6 +6,7 @@
 python3Packages.buildPythonApplication {
  pname = "av-98";
  version = "1.0.2dev";
+  format = "setuptools";

  src = fetchgit {
    url = "https://tildegit.org/solderpunk/AV-98.git";
@@ -12,6 +12,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec {

  pname = "webmacs";
  version = "0.8";
+  format = "setuptools";

  disabled = python3Packages.isPy27;

@@ -11,6 +11,7 @@ with pythonPackages;
 buildPythonApplication rec {
  pname = "rss2email";
  version = "3.14";
+  format = "setuptools";

  propagatedBuildInputs = [
    feedparser
@@ -17,6 +17,7 @@
 python3Packages.buildPythonApplication rec {
  pname = "gns3-gui";
  inherit version;
+  format = "setuptools";

  src = fetchFromGitHub {
    inherit hash;
@@ -19,6 +19,7 @@
 python3Packages.buildPythonApplication {
  pname = "gns3-server";
  inherit version;
+  format = "setuptools";

  src = fetchFromGitHub {
    inherit hash;
@@ -12,6 +12,7 @@
 buildPythonApplication rec {
  pname = "tg";
  version = "0.19.0";
+  format = "setuptools";
  disabled = pythonOlder "3.8";

  src = fetchFromGitHub {
@@ -18,6 +18,7 @@ let
  pycrypto = python3Packages.buildPythonPackage rec {
    pname = "pycrypto";
    version = "2.6.1-13.1";
+    format = "setuptools";

    src = fetchgit {
      url = "https://salsa.debian.org/sramacher/python-crypto.git";
@@ -25,6 +25,7 @@
 python3Packages.buildPythonApplication rec {
  pname = "mailnag";
  version = "2.2.0";
+  format = "setuptools";

  src = fetchFromGitHub {
    owner = "pulb";
@@ -9,6 +9,7 @@
 python3Packages.buildPythonPackage rec {
  pname = "mailnag-goa-plugin";
  version = "2.0.0";
+  format = "setuptools";

  src = fetchFromGitHub {
    owner = "pulb";
@@ -34,6 +34,7 @@ in
 python3Packages.buildPythonApplication {
  pname = "mkchromecast-unstable";
  version = "2022-10-31";
+  format = "setuptools";

  src = fetchFromGitHub {
    owner = "muammar";
@@ -22,6 +22,7 @@ let
    pypkgs.buildPythonPackage rec {
      inherit pname;
      version = "2.2.0";
+      format = "setuptools";

      src = fetchurl {
        url = "http://download.deluge-torrent.org/source/${lib.versions.majorMinor version}/deluge-${version}.tar.xz";
@@ -16,6 +16,7 @@
 buildPythonApplication rec {
  pname = "acd_cli";
  version = "0.3.2";
+  format = "setuptools";

  doCheck = false;

@@ -10,6 +10,7 @@ python3Packages.buildPythonPackage rec {
  pname = "qnotero";

  version = "2.3.1";
+  format = "setuptools";

  src = fetchFromGitHub {
    owner = "ealbiter";
@@ -25,6 +25,7 @@ let
  js8py = buildPythonPackage rec {
    pname = "js8py";
    version = "0.1.1";
+    format = "setuptools";

    src = fetchFromGitHub {
      owner = "jketterl";
@@ -83,6 +84,7 @@ in
 buildPythonApplication rec {
  pname = "openwebrx";
  version = "1.2.2";
+  format = "setuptools";

  src = fetchFromGitHub {
    owner = "jketterl";
@@ -10,6 +10,7 @@
 python3Packages.buildPythonApplication rec {
  pname = "obitools3";
  version = "3.0.1b11";
+  format = "setuptools";

  src = fetchurl {
    url = "https://git.metabarcoding.org/obitools/${pname}/repository/v${version}/archive.tar.gz";
@@ -0,0 +1,53 @@
+diff --git a/lp_solve/ccc b/lp_solve/ccc
+index bd5a938..7fe0427 100644
+--- a/lp_solve/ccc
+++ b/lp_solve/ccc
+@@ -1,6 +1,6 @@
+ :
+ src='../lp_MDO.c ../shared/commonlib.c ../colamd/colamd.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c lp_solve.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
+-c=cc
+c=$CC
+ 
+ MYTMP=`mktemp -d "${TMPDIR:-/tmp}"/lp_solve_XXXXXX`
+ 
+@@ -10,7 +10,7 @@ echo '#include <stdlib.h>'>>"$MYTMP"/platform.c
+ echo '#include <stdio.h>'>>"$MYTMP"/platform.c
+ echo 'main(){printf("ux%d", (int) (sizeof(void *)*8));}'>>"$MYTMP"/platform.c
+ $c "$MYTMP"/platform.c -o "$MYTMP"/platform
+-PLATFORM=`"$MYTMP"/platform`
+PLATFORM=`@emulator@ "$MYTMP"/platform`
+ rm "$MYTMP"/platform "$MYTMP"/platform.c >/dev/null 2>&1
+ 
+ mkdir bin bin/$PLATFORM >/dev/null 2>&1
+diff --git a/lpsolve55/ccc b/lpsolve55/ccc
+index 999f5f6..ff69b17 100644
+--- a/lpsolve55/ccc
+++ b/lpsolve55/ccc
+@@ -1,6 +1,6 @@
+ :
+ src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
+-c=cc
+c=$CC
+ 
+ MYTMP=`mktemp -d "${TMPDIR:-/tmp}"/lp_solve_XXXXXX`
+ 
+@@ -10,7 +10,7 @@ echo '#include <stdlib.h>'>>"$MYTMP"/platform.c
+ echo '#include <stdio.h>'>>"$MYTMP"/platform.c
+ echo 'main(){printf("ux%d", (int) (sizeof(void *)*8));}'>>"$MYTMP"/platform.c
+ $c "$MYTMP"/platform.c -o "$MYTMP"/platform
+-PLATFORM=`"$MYTMP"/platform`
+PLATFORM=`@emulator@ "$MYTMP"/platform`
+ rm "$MYTMP"/platform "$MYTMP"/platform.c >/dev/null 2>&1
+ 
+ mkdir bin bin/$PLATFORM >/dev/null 2>&1
+@@ -42,8 +42,8 @@ fi
+ opts='-O3'
+ 
+ $c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
+-ar rv bin/$PLATFORM/liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
+-ranlib bin/$PLATFORM/liblpsolve55.a
+$AR rv bin/$PLATFORM/liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
+$RANLIB bin/$PLATFORM/liblpsolve55.a
+ 
+ if [ "$so" != "" ]
+ then
@@ -5,6 +5,9 @@
  cctools,
  fixDarwinDylibNames,
  autoSignDarwinBinariesHook,
+  replaceVars,
+  buildPackages,
+  binutils,
 }:

 stdenv.mkDerivation rec {
@@ -17,7 +20,10 @@ stdenv.mkDerivation rec {
  };

  nativeBuildInputs =
-    lib.optionals stdenv.hostPlatform.isDarwin [
+    [
+      binutils
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
      cctools
      fixDarwinDylibNames
    ]
@@ -35,6 +41,12 @@ stdenv.mkDerivation rec {

  dontConfigure = true;

+  patches = [
+    (replaceVars ./0001-fix-cross-compilation.patch {
+      emulator = "${stdenv.hostPlatform.emulator buildPackages}";
+    })
+  ];
+
  buildPhase =
    let
      ccc = if stdenv.hostPlatform.isDarwin then "ccc.osx" else "ccc";
@@ -18,6 +18,7 @@
 buildPythonApplication rec {
  pname = "MAVProxy";
  version = "1.8.71";
+  format = "setuptools";

  src = fetchFromGitHub {
    owner = "ArduPilot";
@@ -10,6 +10,7 @@
 buildPythonApplication rec {
  pname = "git-annex-metadata-gui";
  version = "0.2.0";
+  format = "setuptools";

  src = fetchFromGitHub {
    owner = "alpernebbi";
@@ -10,6 +10,7 @@
 buildPythonApplication rec {
  pname = "git-annex-remote-dbx";
  version = "1.0.3";
+  format = "setuptools";

  src = fetchPypi {
    inherit pname version;
@@ -11,6 +11,7 @@
 buildPythonApplication rec {
  pname = "git-archive-all";
  version = "1.23.1";
+  format = "setuptools";

  src = fetchFromGitHub {
    owner = "Kentzo";
@@ -8,6 +8,7 @@
 buildPythonApplication rec {
  pname = "git-imerge";
  version = "1.2.0";
+  format = "setuptools";

  src = fetchPypi {
    inherit pname version;
@@ -9,6 +9,7 @@
 buildPythonApplication rec {
  pname = "gitup";
  version = "0.5.1";
+  format = "setuptools";

  src = fetchPypi {
    inherit pname version;
@@ -11,6 +11,7 @@
 buildPythonApplication rec {
  pname = "git-review";
  version = "2.5.0";
+  format = "setuptools";

  # Manually set version because prb wants to get it from the git
  # upstream repository (and we are installing from tarball instead)
@@ -9,6 +9,7 @@

 buildPythonApplication rec {
  version = "0.16.6.1";
+  format = "setuptools";
  pname = "gita";

  src = fetchFromGitHub {
@@ -20,6 +20,7 @@
 buildPythonApplication rec {
  pname = "jellyfin-mpv-shim";
  version = "2.9.0";
+  format = "setuptools";

  src = fetchPypi {
    inherit pname version;
@@ -26,6 +26,7 @@ let
  };
 in
 mkDerivationWith python3.pkgs.buildPythonApplication {
+  format = "setuptools";
  inherit pname version src;

  outputs = [ "out" ]; # "lib" can't be split
@@ -17,6 +17,7 @@
 buildPythonApplication rec {
  pname = "plex-mpv-shim";
  version = "1.11.0";
+  format = "setuptools";

  src = fetchFromGitHub {
    owner = "iwalton3";
@@ -17,6 +17,7 @@
 python3Packages.buildPythonApplication rec {
  pname = "tartube";
  version = "2.5.100";
+  format = "setuptools";

  src = fetchFromGitHub {
    owner = "axcore";
@@ -7,6 +7,7 @@
 python3Packages.buildPythonApplication rec {
  pname = "i3altlayout";
  version = "0.3";
+  format = "setuptools";

  src = fetchPypi {
    inherit pname version;
@@ -8,6 +8,7 @@
 buildPythonPackage rec {
  pname = "i3-balance-workspace";
  version = "1.8.6";
+  format = "setuptools";

  src = fetchPypi {
    inherit pname version;
@@ -14,6 +14,7 @@
 buildPythonApplication rec {
  pname = "i3-resurrect";
  version = "1.4.5";
+  format = "setuptools";

  src = fetchPypi {
    inherit pname version;
@@ -1,35 +1,43 @@
 {
  lib,
  stdenv,
-  fetchurl,
+  fetchgit,
  fetchpatch,
+  autoreconfHook,
  pkg-config,
  ncurses,
  readline,
-  autoreconfHook,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "abook";
-  version = "0.6.1";
+  version = "0.6.2";

-  src = fetchurl {
-    url = "http://abook.sourceforge.net/devel/abook-${version}.tar.gz";
-    sha256 = "1yf0ifyjhq2r003pnpn92mn0924bn9yxjifxxj2ldcsgd7w0vagh";
+  src = fetchgit {
+    url = "https://git.code.sf.net/p/abook/git";
+    rev = "ver_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
+    hash = "sha256-aV57Ob6KN6/eNPrxxmNOy/qfhG687uVy5WY0cd4daCU=";
  };

  patches = [
    (fetchpatch {
-      url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/gcc5.patch?h=packages/abook";
-      name = "gcc5.patch";
-      sha256 = "13n3qd6yy45i5n8ppjn9hj6y63ymjrq96280683xk7f7rjavw5nn";
+      url = "https://aur.archlinux.org/cgit/aur.git/plain/abook-gcc15.patch?h=abook";
+      hash = "sha256-+73+USELoby8JvuVOWZe6E+xtdhajnLnDkzD/77QoTo=";
    })
  ];

+  # error: implicit declaration of function 'isalnum' [-Wimplicit-function-declaration]
+  # if (isalnum (*str)) *(p++) = *str;
+  postPatch = ''
+    substituteInPlace database.c \
+      --replace-fail '#include "xmalloc.h"' $'#include "xmalloc.h"\n#include <ctype.h>'
+  '';
+
  nativeBuildInputs = [
-    pkg-config
    autoreconfHook
+    pkg-config
  ];
+
  buildInputs = [
    ncurses
    readline
@@ -38,9 +46,9 @@ stdenv.mkDerivation rec {
  meta = {
    homepage = "http://abook.sourceforge.net/";
    description = "Text-based addressbook program designed to use with mutt mail client";
-    license = lib.licenses.gpl2;
+    license = lib.licenses.gpl3Only;
    maintainers = [ lib.maintainers.edwtjo ];
-    platforms = with lib.platforms; unix;
+    platforms = lib.platforms.unix;
    mainProgram = "abook";
  };
-}
+})
@@ -7,6 +7,7 @@
 python3Packages.buildPythonApplication {
  pname = "accelergy";
  version = "unstable-2022-05-03";
+  format = "setuptools";

  src = fetchFromGitHub {
    owner = "Accelergy-Project";
@@ -9,6 +9,7 @@ with python3.pkgs;
 buildPythonApplication rec {
  pname = "adafruit-ampy";
  version = "1.1.0";
+  format = "setuptools";

  src = fetchPypi {
    inherit pname version;
@@ -7,6 +7,7 @@
 python3Packages.buildPythonApplication rec {
  pname = "addic7ed-cli";
  version = "1.4.6";
+  format = "setuptools";

  src = fetchPypi {
    inherit pname version;
@@ -9,6 +9,7 @@ with python3.pkgs;
 buildPythonApplication rec {
  pname = "almonds";
  version = "1.25b";
+  format = "setuptools";

  src = fetchFromGitHub {
    owner = "Tenchi2xh";
@@ -13,6 +13,7 @@ let
  description = "Advanced typing practice program";
 in
 python3Packages.buildPythonApplication {
+  format = "setuptools";
  inherit pname version;

  src = fetchFromGitLab {
--- a/Show More
+++ b/Show More