Merge master into staging-next

.github/workflows/backport.yml

@@ -9,10 +9,6 @@ on:
   pull_request_target:
     types: [closed, labeled]
 
-concurrency:
-  group: backport-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
-  cancel-in-progress: true
-
 permissions:
   contents: read
   issues: write

ci/labels/labels.cjs

@@ -235,7 +235,7 @@ module.exports = async function ({ github, context, core, dry }) {
 
       const itemLabels = {}
 
-      if (item.pull_request) {
+      if (item.pull_request || context.payload.pull_request) {
         stats.prs++
         Object.assign(itemLabels, await handlePullRequest(item))
       } else {

nixos/modules/services/cluster/k3s/default.nix

@@ -782,7 +782,7 @@ in
       ) "k3s: Images are only imported on nodes with an enabled agent, they will be ignored by this node")
       ++ (lib.optional (
         cfg.role == "agent" && cfg.configPath == null && cfg.serverAddr == ""
-      ) "k3s: ServerAddr or configPath (with 'server' key) should be set if role is 'agent'")
+      ) "k3s: serverAddr or configPath (with 'server' key) should be set if role is 'agent'")
       ++ (lib.optional
         (cfg.role == "agent" && cfg.configPath == null && cfg.tokenFile == null && cfg.token == "")
         "k3s: Token or tokenFile or configPath (with 'token' or 'token-file' keys) should be set if role is 'agent'"

nixos/modules/services/networking/r53-ddns.nix

@@ -41,6 +41,11 @@ in
         '';
       };
 
+      ttl = mkOption {
+        type = types.int;
+        description = "The TTL for the generated record";
+      };
+
       environmentFile = mkOption {
         type = types.str;
         description = ''
@@ -68,7 +73,8 @@ in
       serviceConfig = {
         ExecStart =
           "${pkg}/bin/r53-ddns -zone-id ${cfg.zoneID} -domain ${cfg.domain}"
-          + lib.optionalString (cfg.hostname != null) " -hostname ${cfg.hostname}";
+          + lib.optionalString (cfg.hostname != null) " -hostname ${cfg.hostname}"
+          + lib.optionalString (cfg.ttl != null) " -ttl ${toString cfg.ttl}";
         EnvironmentFile = "${cfg.environmentFile}";
         DynamicUser = true;
       };

nixos/modules/services/web-apps/mastodon.nix

@@ -355,6 +355,7 @@ in
               jobClasses = lib.mkOption {
                 type = listOf (enum [
                   "default"
+                  "fasp"
                   "push"
                   "pull"
                   "mailers"

pkgs/applications/audio/mopidy/bandcamp.nix

@@ -1,24 +1,32 @@
 {
   lib,
-  python3Packages,
+  pythonPackages,
   fetchPypi,
   mopidy,
 }:
 
-python3Packages.buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
-  pname = "Mopidy-Bandcamp";
+  pname = "mopidy-bandcamp";
   version = "1.1.5";
-  format = "setuptools";
+  pyproject = true;
+
   src = fetchPypi {
-    inherit pname version;
+    inherit version;
+    pname = "Mopidy-Bandcamp";
     hash = "sha256-wg9zcOKfZQRhpyA1Cu5wvdwKpmrlcr2m9mrqBHgUXAQ=";
   };
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = [
-    mopidy
+    pythonPackages.setuptools
-    pykka
   ];
 
+  dependencies = [
+    mopidy
+    pythonPackages.pykka
+  ];
+
+  pythonImportsCheck = [ "mopidy_bandcamp" ];
+
   meta = with lib; {
     description = "Mopidy extension for playing music from bandcamp";
     homepage = "https://github.com/impliedchaos/mopidy-bandcamp";

pkgs/applications/audio/mopidy/iris.nix

@@ -1,33 +1,37 @@
 {
   lib,
-  python3Packages,
+  pythonPackages,
   fetchPypi,
   mopidy,
 }:
 
-python3Packages.buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
-  pname = "Mopidy-Iris";
+  pname = "mopidy-iris";
   version = "3.69.3";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
+    inherit version;
+    pname = "Mopidy-Iris";
     hash = "sha256-PEAXnapiyxozijR053I7zQYRYLeDOV719L0QbO2r4r4=";
   };
 
-  propagatedBuildInputs =
+  build-system = [
-    [
+    pythonPackages.setuptools
-      mopidy
+  ];
-    ]
+
-    ++ (with python3Packages; [
+  dependencies = [
-      configobj
+    mopidy
-      requests
+    pythonPackages.configobj
-      tornado
+    pythonPackages.requests
-    ]);
+    pythonPackages.tornado
+  ];
 
   # no tests implemented
   doCheck = false;
 
+  pythonImportsCheck = [ "mopidy_iris" ];
+
   meta = with lib; {
     homepage = "https://github.com/jaedb/Iris";
     description = "Fully-functional Mopidy web client encompassing Spotify and many other backends";

pkgs/applications/audio/mopidy/jellyfin.nix

@@ -1,14 +1,14 @@
 {
   lib,
-  python3Packages,
+  pythonPackages,
   fetchPypi,
   mopidy,
 }:
 
-python3Packages.buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
   pname = "mopidy-jellyfin";
   version = "1.0.6";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit version;
@@ -16,10 +16,12 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-IKCPypMuluR0+mMALp8lB1oB1pSw4rN4rOl/eKn+Qvo=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ pythonPackages.setuptools ];
+
+  dependencies = [
     mopidy
-    python3Packages.unidecode
+    pythonPackages.unidecode
-    python3Packages.websocket-client
+    pythonPackages.websocket-client
   ];
 
   # no tests implemented

pkgs/applications/audio/mopidy/local.nix

@@ -1,14 +1,14 @@
 {
   lib,
   mopidy,
-  python3Packages,
+  pythonPackages,
   fetchPypi,
 }:
 
-python3Packages.buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
-  pname = "Mopidy-Local";
+  pname = "mopidy-local";
   version = "3.3.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit version;
@@ -16,15 +16,21 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-y6btbGk5UiVan178x7d9jq5OTnKMbuliHv0aRxuZK3o=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [
+    pythonPackages.setuptools
+  ];
+
+  dependencies = [
     mopidy
-    python3Packages.uritools
+    pythonPackages.uritools
   ];
 
   nativeCheckInputs = [
-    python3Packages.pytestCheckHook
+    pythonPackages.pytestCheckHook
   ];
 
+  pythonImportsCheck = [ "mopidy_local" ];
+
   meta = with lib; {
     homepage = "https://github.com/mopidy/mopidy-local";
     description = "Mopidy extension for playing music from your local music archive";

pkgs/applications/audio/mopidy/moped.nix

@@ -7,22 +7,28 @@
 }:
 
 pythonPackages.buildPythonApplication rec {
-  pname = "Mopidy-Moped";
+  pname = "mopidy-moped";
   version = "0.7.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
+    inherit version;
+    pname = "Mopidy-Moped";
     sha256 = "15461174037d87af93dd59a236d4275c5abf71cea0670ffff24a7d0399a8a2e4";
   };
 
   LC_ALL = "en_US.UTF-8";
   buildInputs = [ glibcLocales ];
-  propagatedBuildInputs = [ mopidy ];
+
+  build-system = [ pythonPackages.setuptools ];
+
+  dependencies = [ mopidy ];
 
   # no tests implemented
   doCheck = false;
 
+  pythonImportsCheck = [ "mopidy_moped" ];
+
   meta = with lib; {
     homepage = "https://github.com/martijnboland/moped";
     description = "Web client for Mopidy";

pkgs/applications/audio/mopidy/mopidy.nix

@@ -14,13 +14,13 @@
 pythonPackages.buildPythonApplication rec {
   pname = "mopidy";
   version = "3.4.2";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mopidy";
     repo = "mopidy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
-    sha256 = "sha256-2OFav2HaQq/RphmZxLyL1n3suwzt1Y/d4h33EdbStjk=";
+    hash = "sha256-2OFav2HaQq/RphmZxLyL1n3suwzt1Y/d4h33EdbStjk=";
   };
 
   nativeBuildInputs = [ wrapGAppsNoGuiHook ];
@@ -50,25 +50,26 @@ pythonPackages.buildPythonApplication rec {
         }
       ))
     ]
-    ++ lib.optional (!stdenv.hostPlatform.isDarwin) pipewire;
+    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pipewire ];
-
-  propagatedBuildInputs =
-    [ gobject-introspection ]
-    ++ (
-      with pythonPackages;
-      [
-        gst-python
-        pygobject3
-        pykka
-        requests
-        setuptools
-        tornado
-      ]
-      ++ lib.optional (!stdenv.hostPlatform.isDarwin) dbus-python
-    );
 
   propagatedNativeBuildInputs = [ gobject-introspection ];
 
+  propagatedBuildInputs = [ gobject-introspection ];
+
+  build-system = [ pythonPackages.setuptools ];
+
+  dependencies =
+    with pythonPackages;
+    [
+      gst-python
+      pygobject3
+      pykka
+      requests
+      setuptools
+      tornado
+    ]
+    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ dbus-python ];
+
   # There are no tests
   doCheck = false;
 

pkgs/applications/audio/mopidy/mopify.nix

@@ -6,23 +6,30 @@
 }:
 
 pythonPackages.buildPythonApplication rec {
-  pname = "Mopidy-Mopify";
+  pname = "mopidy-mopify";
   version = "1.7.3";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
+    inherit version;
+    pname = "Mopidy-Mopify";
     hash = "sha256-RlCC+39zC+LeA/QDWPHYx5TrEwOgVrnvcH1Xg12qSLE=";
   };
 
-  propagatedBuildInputs = with pythonPackages; [
+  build-system = [
+    pythonPackages.setuptools
+  ];
+
+  dependencies = [
     mopidy
-    configobj
+    pythonPackages.configobj
   ];
 
   # no tests implemented
   doCheck = false;
 
+  pythonImportsCheck = [ "mopidy_mopify" ];
+
   meta = with lib; {
     homepage = "https://github.com/dirkgroenen/mopidy-mopify";
     description = "Mopidy webclient based on the Spotify webbased interface";

pkgs/applications/audio/mopidy/mpd.nix

@@ -1,21 +1,24 @@
 {
   lib,
-  python3Packages,
+  pythonPackages,
   fetchPypi,
   mopidy,
 }:
 
-python3Packages.buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
-  pname = "Mopidy-MPD";
+  pname = "mopidy-mpd";
   version = "3.3.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
+    inherit version;
+    pname = "Mopidy-MPD";
     hash = "sha256-CeLMRqj9cwBvQrOx7XHVV8MjDjwOosONVlsN2o+vTVM=";
   };
 
-  propagatedBuildInputs = [ mopidy ];
+  build-system = [ pythonPackages.setuptools ];
+
+  dependencies = [ mopidy ];
 
   # no tests implemented
   doCheck = false;

pkgs/applications/audio/mopidy/mpris.nix

@@ -1,14 +1,14 @@
 {
   lib,
-  python3Packages,
+  pythonPackages,
   fetchPypi,
   mopidy,
 }:
 
-python3Packages.buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
   pname = "mopidy-mpris";
   version = "3.0.3";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit version;
@@ -16,13 +16,19 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-rHQgNIyludTEL7RDC8dIpyGTMOt1Tazn6i/orKlSP4U=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [
+    pythonPackages.setuptools
+  ];
+
+  dependencies = [
     mopidy
-    python3Packages.pydbus
+    pythonPackages.pydbus
   ];
 
   doCheck = false;
 
+  pythonImportsCheck = [ "mopidy_mpris" ];
+
   meta = with lib; {
     homepage = "https://www.mopidy.com/";
     description = "Mopidy extension for controlling Mopidy through D-Bus using the MPRIS specification";

pkgs/applications/audio/mopidy/muse.nix

@@ -8,7 +8,7 @@
 pythonPackages.buildPythonApplication rec {
   pname = "mopidy-muse";
   version = "0.0.33";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit version;
@@ -16,7 +16,11 @@ pythonPackages.buildPythonApplication rec {
     hash = "sha256-CEPAPWtMrD+HljyqBB6EAyGVeOjzkvVoEywlE4XEJGs=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [
+    pythonPackages.setuptools
+  ];
+
+  dependencies = [
     mopidy
     pythonPackages.pykka
   ];

pkgs/applications/audio/mopidy/musicbox-webclient.nix

@@ -8,16 +8,20 @@
 pythonPackages.buildPythonApplication rec {
   pname = "mopidy-musicbox-webclient";
   version = "3.1.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pimusicbox";
-    repo = pname;
+    repo = "mopidy-musicbox-webclient";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "1lzarazq67gciyn6r8cdms0f7j0ayyfwhpf28z93ydb280mfrrb9";
   };
 
-  propagatedBuildInputs = [
+  build-system = [
+    pythonPackages.setuptools
+  ];
+
+  dependencies = [
     mopidy
   ];
 

pkgs/applications/audio/mopidy/notify.nix

@@ -6,16 +6,23 @@
 }:
 
 pythonPackages.buildPythonApplication rec {
-  pname = "Mopidy-Notify";
+  pname = "mopidy-notify";
   version = "0.2.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
+    inherit version;
+    pname = "Mopidy-Notify";
     hash = "sha256-8FT4O4k0wEsdHA1vJaOW9UamJ3QLyO47HwL5XcSU3Pc=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [
+    pythonPackages.setuptools
+  ];
+
+  pythonRelaxDeps = [ "pykka" ];
+
+  dependencies = [
     mopidy
     pythonPackages.pydbus
   ];

pkgs/applications/audio/mopidy/podcast.nix

@@ -1,14 +1,14 @@
 {
   lib,
-  python3Packages,
+  pythonPackages,
   fetchPypi,
   mopidy,
 }:
 
-python3Packages.buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
   pname = "mopidy-podcast";
   version = "3.0.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit version;
@@ -16,16 +16,22 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-grNPVEVM2PlpYhBXe6sabFjWVB9+q+apIRjcHUxH52A=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [
-    mopidy
+    pythonPackages.setuptools
-    python3Packages.cachetools
-    python3Packages.uritools
   ];
 
-  nativeCheckInputs = with python3Packages; [
+  dependencies = [
-    pytestCheckHook
+    mopidy
+    pythonPackages.cachetools
+    pythonPackages.uritools
   ];
 
+  nativeCheckInputs = [
+    pythonPackages.pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "mopidy_podcast" ];
+
   meta = with lib; {
     homepage = "https://github.com/tkem/mopidy-podcast";
     description = "Mopidy extension for browsing and playing podcasts";

pkgs/applications/audio/mopidy/scrobbler.nix

@@ -1,23 +1,28 @@
 {
   lib,
-  python3Packages,
+  pythonPackages,
   fetchPypi,
   mopidy,
 }:
 
-python3Packages.buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
-  pname = "Mopidy-Scrobbler";
+  pname = "mopidy-scrobbler";
   version = "2.0.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
+    inherit version;
+    pname = "Mopidy-Scrobbler";
     sha256 = "11vxgax4xgkggnq4fr1rh2rcvzspkkimck5p3h4phdj3qpnj0680";
   };
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = [
+    pythonPackages.setuptools
+  ];
+
+  dependencies = [
     mopidy
-    pylast
+    pythonPackages.pylast
   ];
 
   # no tests implemented

pkgs/applications/audio/mopidy/somafm.nix

@@ -1,14 +1,14 @@
 {
   lib,
-  python3Packages,
+  pythonPackages,
   fetchPypi,
   mopidy,
 }:
 
-python3Packages.buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
   pname = "mopidy-somafm";
   version = "2.0.2";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit version;
@@ -16,10 +16,18 @@ python3Packages.buildPythonApplication rec {
     sha256 = "DC0emxkoWfjGHih2C8nINBFByf521Xf+3Ks4JRxNPLM=";
   };
 
-  propagatedBuildInputs = [ mopidy ];
+  build-system = [
+    pythonPackages.setuptools
+  ];
+
+  dependencies = [
+    mopidy
+  ];
 
   doCheck = false;
 
+  pythonImportsCheck = [ "mopidy_somafm" ];
+
   meta = with lib; {
     homepage = "https://www.mopidy.com/";
     description = "Mopidy extension for playing music from SomaFM";

pkgs/applications/audio/mopidy/soundcloud.nix

@@ -8,22 +8,28 @@
 pythonPackages.buildPythonApplication rec {
   pname = "mopidy-soundcloud";
   version = "3.0.2";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mopidy";
     repo = "mopidy-soundcloud";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-1Qqbfw6NZ+2K1w+abMBfWo0RAmIRbNyIErEmalmWJ0s=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [
+    pythonPackages.setuptools
+  ];
+
+  dependencies = [
     mopidy
     pythonPackages.beautifulsoup4
   ];
 
   doCheck = false;
 
+  pythonImportsCheck = [ "mopidy_soundcloud" ];
+
   meta = with lib; {
     description = "Mopidy extension for playing music from SoundCloud";
     license = licenses.mit;

pkgs/applications/audio/mopidy/subidy.nix

@@ -8,21 +8,29 @@
 pythonPackages.buildPythonApplication rec {
   pname = "mopidy-subidy";
   version = "1.0.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Prior99";
-    repo = pname;
+    repo = "mopidy-subidy";
-    rev = version;
+    tag = version;
     sha256 = "0c5ghhhrj5v3yp4zmll9ari6r5c6ha8c1izwqshvadn40b02q7xz";
   };
 
-  propagatedBuildInputs = [
+  build-system = [
+    pythonPackages.setuptools
+  ];
+
+  dependencies = [
     mopidy
     pythonPackages.py-sonic
   ];
 
-  nativeCheckInputs = with pythonPackages; [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pythonPackages.pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "mopidy_subidy" ];
 
   meta = with lib; {
     homepage = "https://www.mopidy.com/";

pkgs/applications/audio/mopidy/tunein.nix

@@ -1,14 +1,14 @@
 {
   lib,
-  python3Packages,
+  pythonPackages,
   fetchPypi,
   mopidy,
 }:
 
-python3Packages.buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
   pname = "mopidy-tunein";
   version = "1.1.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit version;
@@ -16,7 +16,11 @@ python3Packages.buildPythonApplication rec {
     sha256 = "01y1asylscr73yqx071imhrzfzlg07wmqqzkdvpgm6r35marc2li";
   };
 
-  propagatedBuildInputs = [
+  build-system = [
+    pythonPackages.setuptools
+  ];
+
+  dependencies = [
     mopidy
   ];
 

pkgs/applications/audio/mopidy/youtube.nix

@@ -1,44 +1,24 @@
 {
   lib,
   fetchFromGitHub,
-  python3,
+  pythonPackages,
   mopidy,
-  yt-dlp,
+  pkgs,
   extraPkgs ? pkgs: [ ],
 }:
 
-python3.pkgs.buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
   pname = "mopidy-youtube";
   version = "3.7";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "natumbri";
-    repo = pname;
+    repo = "mopidy-youtube";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-iFt7r8Ljymc+grNJiOClTHkZOeo7AcYpcNc8tLMPROk=";
   };
 
-  propagatedBuildInputs =
-    with python3.pkgs;
-    [
-      beautifulsoup4
-      cachetools
-      pykka
-      requests
-      ytmusicapi
-    ]
-    ++ [
-      mopidy
-      yt-dlp
-    ]
-    ++ extraPkgs pkgs;
-
-  nativeCheckInputs = with python3.pkgs; [
-    vcrpy
-    pytestCheckHook
-  ];
-
   postPatch = ''
     substituteInPlace mopidy_youtube/youtube.py \
       --replace-fail 'youtube_dl_package = "youtube_dl"' 'youtube_dl_package = "yt_dlp"'
@@ -49,6 +29,25 @@ python3.pkgs.buildPythonApplication rec {
       --replace-fail '"youtube_dl_package": "youtube_dl",' '"youtube_dl_package": "yt_dlp",'
   '';
 
+  build-system = [
+    pythonPackages.setuptools
+  ];
+
+  dependencies = [
+    mopidy
+    pythonPackages.beautifulsoup4
+    pythonPackages.cachetools
+    pythonPackages.pykka
+    pythonPackages.requests
+    pythonPackages.ytmusicapi
+    pythonPackages.yt-dlp
+  ] ++ extraPkgs pkgs; # should we remove this? If we do, don't forget to also change the docs!
+
+  nativeCheckInputs = with pythonPackages; [
+    vcrpy
+    pytestCheckHook
+  ];
+
   disabledTests = [
     # Test requires a YouTube API key
     "test_get_default_config"

pkgs/applications/misc/rofi-rbw/default.nix

@@ -3,8 +3,7 @@
   buildPythonApplication,
   fetchFromGitHub,
   configargparse,
-  setuptools,
+  hatchling,
-  poetry-core,
   rbw,
 
   waylandSupport ? false,
@@ -18,19 +17,18 @@
 
 buildPythonApplication rec {
   pname = "rofi-rbw";
-  version = "1.4.2";
+  version = "1.5.1";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "fdw";
     repo = "rofi-rbw";
     tag = version;
-    hash = "sha256-wUb89GkNB2lEfb42hMvcxpbjc1O+wx8AkFjq7aJwAko=";
+    hash = "sha256-Qdbz3UjWMCuJUzR6UMt/apt+OjMAr2U7uMtv9wxEZKE=";
   };
 
   nativeBuildInputs = [
-    setuptools
+    hatchling
-    poetry-core
   ];
 
   buildInputs =

pkgs/by-name/am/amqpcat/package.nix

@@ -35,6 +35,6 @@ crystal.buildCrystalPackage rec {
     mainProgram = "amqpcat";
     homepage = "https://github.com/cloudamqp/amqpcat";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ aaronjheng ];
+    maintainers = with lib.maintainers; [ ];
   };
 }

pkgs/by-name/an/ananicy-rules-cachyos/package.nix

@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "ananicy-rules-cachyos";
-  version = "0-unstable-2025-03-19";
+  version = "0-unstable-2025-07-06";
 
   src = fetchFromGitHub {
     owner = "CachyOS";
     repo = "ananicy-rules";
-    rev = "99693d533a238c19915057f9cd5e541e6dbf57d9";
+    rev = "339bee6f2de3de8e866c23b210baf6cabf153549";
-    hash = "sha256-dTGfOw2Cj4q3AiQswcyl9bWUw1qInyqap43r4j+qS1Y=";
+    hash = "sha256-D/+/7NdfV8kHwYm5mJ6b7Vl3QCUdK2+NbZSefWTZt5k=";
   };
 
   dontConfigure = true;

pkgs/by-name/at/attic-client/package.nix

@@ -8,22 +8,26 @@
   pkg-config,
   stdenv,
   installShellFiles,
+  nix-update-script,
   crates ? [ "attic-client" ],
 }:
+
 let
   # Only the attic-client crate builds against the Nix C++ libs
   # This derivation is also used to build the server
   needNixInclude = lib.elem "attic-client" crates;
+  nix = nixVersions.nix_2_28;
 in
+
 rustPlatform.buildRustPackage {
   pname = "attic";
-  version = "0-unstable-2025-07-01";
+  version = "0-unstable-2025-07-08";
 
   src = fetchFromGitHub {
     owner = "zhaofengli";
     repo = "attic";
-    rev = "896ad88fa57ad5dbcd267c0ac51f1b71ccfcb4dd";
+    rev = "07147da79388468ff85c2a650500d11ca0edd12e";
-    hash = "sha256-V0EPQNsQko1a8OqIWc2lLviLnMpR1m08Ej00z5RVTfs=";
+    hash = "sha256-pHsHcWQWGyzDh48YHnSw9YVKEnQ95QWnmHNFtvo7iu0=";
   };
 
   nativeBuildInputs = [
@@ -31,21 +35,15 @@ rustPlatform.buildRustPackage {
     installShellFiles
   ];
 
-  buildInputs = lib.optional needNixInclude nixVersions.nix_2_24 ++ [
+  buildInputs = lib.optional needNixInclude nix ++ [ boost ];
-    boost
-  ];
 
   cargoBuildFlags = lib.concatMapStrings (c: "-p ${c} ") crates;
-  cargoHash = "sha256-AbpWnYfBMrR6oOfy2LkQvIPYsClCWE89bJav+iHTtLM=";
+  cargoHash = "sha256-I5GS32dOCECYKSNMi2Xs2rBRxPLcvLEWHlIIWP/bMBU=";
   useFetchCargoVendor = true;
 
-  env =
+  env = {
-    {
+    ATTIC_DISTRIBUTOR = "nixpkgs";
-      ATTIC_DISTRIBUTOR = "nixpkgs";
+  } // lib.optionalAttrs needNixInclude { NIX_INCLUDE_PATH = "${lib.getDev nix}/include"; };
-    }
-    // lib.optionalAttrs needNixInclude {
-      NIX_INCLUDE_PATH = "${lib.getDev nixVersions.nix_2_24}/include";
-    };
 
   # Attic interacts with Nix directly and its tests require trusted-user access
   # to nix-daemon to import NARs, which is not possible in the build sandbox.
@@ -61,22 +59,21 @@ rustPlatform.buildRustPackage {
   '';
 
   passthru = {
-    tests = {
+    tests = { inherit (nixosTests) atticd; };
-      inherit (nixosTests) atticd;
-    };
 
-    updateScript = ./update.sh;
+    updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Multi-tenant Nix Binary Cache";
     homepage = "https://github.com/zhaofengli/attic";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       zhaofengli
       aciceri
+      defelo
     ];
-    platforms = platforms.linux ++ platforms.darwin;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
     mainProgram = "attic";
   };
 }

pkgs/by-name/at/attic-client/update.sh

@@ -1,40 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p wget nix-prefetch-github jq coreutils
-
-# shellcheck shell=bash
-
-if [ -n "$GITHUB_TOKEN" ]; then
-    TOKEN_ARGS=(--header "Authorization: token $GITHUB_TOKEN")
-fi
-
-if [[ $# -gt 1 || $1 == -* ]]; then
-    echo "Regenerates packaging data for attic."
-    echo "Usage: $0 [git commit]"
-    exit 1
-fi
-
-set -x
-
-cd "$(dirname "$0")"
-rev="$1"
-
-set -euo pipefail
-
-if [ -z "$rev" ]; then
-    rev="$(wget -O- "${TOKEN_ARGS[@]}" "https://api.github.com/repos/zhaofengli/attic/commits?per_page=1" | jq -r '.[0].sha')"
-fi
-
-date="$(wget -O- "${TOKEN_ARGS[@]}" "https://api.github.com/repos/zhaofengli/attic/commits/$rev" | jq -r '.commit.author.date' | cut -dT -f1)"
-
-version="0-unstable-$date"
-
-# Sources
-src_hash=$(nix-prefetch-github zhaofengli attic --rev "$rev" | jq -r .hash)
-
-# Cargo.lock
-src="https://raw.githubusercontent.com/zhaofengli/attic/$rev"
-wget "${TOKEN_ARGS[@]}" "$src/Cargo.lock" -O Cargo.lock
-
-sed -i -E -e "s#version = \".*\"#version = \"$version\"#" package.nix
-sed -i -E -e "s#rev = \".*\"#rev = \"$rev\"#" package.nix
-sed -i -E -e "s#hash = \".*\"#hash = \"$src_hash\"#" package.nix

pkgs/by-name/ba/bats/libraries.nix

@@ -58,12 +58,12 @@
 
   bats-detik = stdenv.mkDerivation (finalAttrs: {
     pname = "bats-detik";
-    version = "1.3.2";
+    version = "1.3.3";
     src = fetchFromGitHub {
       owner = "bats-core";
       repo = "bats-detik";
       rev = "v${finalAttrs.version}";
-      hash = "sha256-f8PN+VsUdUXrR9JiQgVuYDy2QgOtaxE8tkkxOUF0uC4=";
+      hash = "sha256-NM8/WDiTOJORC6+pAa6tYJC7wnuMH9OP5LBaatXyaYw=";
     };
     dontBuild = true;
     installPhase = ''

pkgs/by-name/br/brltty/package.nix

@@ -22,11 +22,11 @@
 
 stdenv.mkDerivation rec {
   pname = "brltty";
-  version = "6.7";
+  version = "6.8";
 
   src = fetchurl {
     url = "https://brltty.app/archive/brltty-${version}.tar.gz";
-    sha256 = "sha256-FsM9AeL1lnBziJlmB7EZAIgDKylT8D4Il81Fe1y9Yjg=";
+    sha256 = "sha256-MoDYjHU6aJY9e5cgjm9InOEDGCs+jvlEurMWg9wo4RY=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/by/bypass-url-parser/package.nix

@@ -0,0 +1,49 @@
+{
+  lib,
+  fetchFromGitHub,
+  python3,
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "bypass-url-parser";
+  version = "0.4.4";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "laluka";
+    repo = "bypass-url-parser";
+    tag = "v${version}";
+    hash = "sha256-h9+kM2LmfPaaM7MK6lK/ARrArwvRn6d+3BW+rNTkqzA=";
+  };
+
+  build-system = with python3.pkgs; [ pdm-backend ];
+
+  dependencies = with python3.pkgs; [
+    coloredlogs
+    docopt
+  ];
+
+  nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "bypass_url_parser" ];
+
+  preCheck = ''
+    # Some tests need the binary
+    export PATH=$out/bin:$PATH
+  '';
+
+  disabledTests = [
+    # Tests require network access
+    "test_sample_usage"
+    "test_sample_cli_usage"
+  ];
+
+  meta = {
+    description = "Tool that tests URL bypasses to reach a 40X protected page";
+    homepage = "https://github.com/laluka/bypass-url-parser";
+    changelog = "https://github.com/laluka/bypass-url-parser/releases/tag/${src.tag}";
+    license = lib.licenses.agpl3Plus;
+    maintainers = with lib.maintainers; [ fab ];
+    mainProgram = "bypass-url-parser";
+  };
+}

pkgs/by-name/fa/fastly/package.nix

@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "fastly";
-  version = "11.3.0";
+  version = "11.4.0";
 
   src = fetchFromGitHub {
     owner = "fastly";
     repo = "cli";
     tag = "v${version}";
-    hash = "sha256-SFBKu30C92BbbwSlmlRU/66mBywROktWUiw8fltFXoA=";
+    hash = "sha256-jfj37b3L3LcPODBYBAOTWq+mA0xrIr3r+6lu65gKyYI=";
     # The git commit is part of the `fastly version` original output;
     # leave that output the same in nixpkgs. Use the `.git` directory
     # to retrieve the commit SHA, and remove the directory afterwards,
@@ -34,7 +34,7 @@ buildGoModule rec {
     "cmd/fastly"
   ];
 
-  vendorHash = "sha256-ypimv9xi3mKL6xmmkAYdUO+lspafXpJsP8StaniboE0=";
+  vendorHash = "sha256-souo+yksoZpUxWfY7flL4uLdRgAIrtZKRIlGK0p1hZs=";
 
   nativeBuildInputs = [
     installShellFiles

pkgs/by-name/ga/gapless/package.nix

@@ -16,14 +16,14 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "gapless";
-  version = "4.4";
+  version = "4.5";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "neithern";
     repo = "g4music";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-10AFaUmqVkL4q8xgewfosN2/SziNhat9p6x/+9mBdyU=";
+    hash = "sha256-P8hmywS/k+24KfFxpQdnBv0ArD+pKgUNcYk/Mnsx5jY=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/gd/gdevelop/darwin.nix

@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}-universal-mac.zip";
-    hash = "sha256-R8RB88K8dymzQnfeZUypo24EkXzpDfcsosQg3gTo3WI=";
+    hash = "sha256-/0wqZN9bVCNXAe9LkGL8/dw2b/stffDbPPaZQrugEhQ=";
   };
 
   sourceRoot = ".";

pkgs/by-name/gd/gdevelop/linux.nix

@@ -13,7 +13,7 @@ let
     if stdenv.hostPlatform.system == "x86_64-linux" then
       fetchurl {
         url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}.AppImage";
-        hash = "sha256-ZVQ5e7Ghj/wZDE0RvoH264KNxaHP6x5fxSWEbbYsa88=";
+        hash = "sha256-+J0AURlpnZ7Do0ZRqzwwvdcyozZLdWGQKr+7OggOn1I=";
       }
     else
       throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}";

pkgs/by-name/gd/gdevelop/package.nix

@@ -5,7 +5,7 @@
   ...
 }:
 let
-  version = "5.5.233";
+  version = "5.5.236";
   pname = "gdevelop";
   meta = {
     description = "Graphical Game Development Studio";

pkgs/by-name/gr/graphite-gtk-theme/package.nix

@@ -62,13 +62,13 @@ lib.checkListOfEnum "${pname}: theme variants"
   stdenvNoCC.mkDerivation
   rec {
     inherit pname;
-    version = "2024-07-15";
+    version = "2025-07-06";
 
     src = fetchFromGitHub {
       owner = "vinceliuice";
       repo = "graphite-gtk-theme";
       rev = version;
-      hash = "sha256-k93l/7DF0HSKPfiIxzBLz0mBflgbdYJyGLEmWZx3q7o=";
+      hash = "sha256-TOIpQTYg+1DX/Tq5BMygxbUC0NpzPWBGDtOnnT55c1w=";
     };
 
     nativeBuildInputs = [

pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix

@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "ha-mqtt-discoverable-cli";
-  version = "0.19.2.1";
+  version = "0.20.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "unixorn";
     repo = "ha-mqtt-discoverable-cli";
     tag = "v${version}";
-    hash = "sha256-SPCbBqdhC+pgV3mQ+e3jkg2hWYegl1wE38Ac06R5uAA=";
+    hash = "sha256-4iQHpz09CbPuU+236HQdRNRDB3bcj9VZ0s/4BdxyB/8=";
   };
 
   pythonRelaxDeps = [ "ha-mqtt-discoverable" ];

pkgs/by-name/ht/httptoolkit-server/only-build-for-one-platform.patch

@@ -1,8 +1,8 @@
 diff --git a/pack.ts b/pack.ts
-index aba98cc..03ce86a 100644
+index 0212d09..03ce86a 100644
 --- a/pack.ts
 +++ b/pack.ts
-@@ -75,33 +75,7 @@ const packageApp = async () => {
+@@ -75,39 +75,7 @@ const packageApp = async () => {
      delete pJson.scripts.prepack; // We don't want to rebuild - all built code will be in the packed content
      await fs.writeJson(path.join(OUTPUT_DIR, 'package.json'), pJson);
  
@@ -10,20 +10,26 @@ index aba98cc..03ce86a 100644
 -
 -    // Run build-release in this folder, for each platform. For each bundle, we copy in
 -    // only the relevant platform-specific NSS files.
--    console.log('Building for Linux');
+-    console.log('Building for Linux x64');
 -    await fs.mkdir(path.join(OUTPUT_DIR, 'nss'));
 -    await fs.copy(path.join(__dirname, 'nss', 'linux'), path.join(OUTPUT_DIR, 'nss', 'linux'));
--    await spawn(buildScript, ['linux'], { cwd: OUTPUT_DIR, stdio: 'inherit' });
+-    await spawn(buildScript, ['linux', 'x64'], { cwd: OUTPUT_DIR, stdio: 'inherit' });
 -
--    console.log('Building for Darwin');
+-    console.log('Building for Linux arm64');
+-    await spawn(buildScript, ['linux', 'arm64'], { cwd: OUTPUT_DIR, stdio: 'inherit' });
+-
+-    console.log('Building for Darwin x64');
 -    await fs.remove(path.join(OUTPUT_DIR, 'nss', 'linux'));
 -    await fs.copy(path.join(__dirname, 'nss', 'darwin'), path.join(OUTPUT_DIR, 'nss', 'darwin'));
--    await spawn(buildScript, ['darwin'], { cwd: OUTPUT_DIR, stdio: 'inherit' });
+-    await spawn(buildScript, ['darwin', 'x64'], { cwd: OUTPUT_DIR, stdio: 'inherit' });
+-
+-    console.log('Building for Darwin arm64');
+-    await spawn(buildScript, ['darwin', 'arm64'], { cwd: OUTPUT_DIR, stdio: 'inherit' });
 -
 -    console.log('Building for Win32');
 -    await fs.remove(path.join(OUTPUT_DIR, 'nss', 'darwin'));
 -    await fs.copy(path.join(__dirname, 'nss', 'win32'), path.join(OUTPUT_DIR, 'nss', 'win32'));
--    await spawn(buildScript, ['win32'], { cwd: OUTPUT_DIR, stdio: 'inherit' });
+-    await spawn(buildScript, ['win32', 'x64'], { cwd: OUTPUT_DIR, stdio: 'inherit' });
 -
 -    // Oclif builds a nodeless platform-agnostic bundle too (although in our case, nothing is
 -    // really platform agnostic). Not necessary, probably won't work - drop it.

pkgs/by-name/ht/httptoolkit-server/package.nix

@@ -9,19 +9,20 @@
   pkg-config,
   openssl,
   libdatachannel,
+  plog,
 }:
 
 let
   nodejs = nodejs_20;
   buildNpmPackage' = buildNpmPackage.override { inherit nodejs; };
 
-  version = "1.19.3";
+  version = "1.20.1";
 
   src = fetchFromGitHub {
     owner = "httptoolkit";
     repo = "httptoolkit-server";
     rev = "refs/tags/v${version}";
-    hash = "sha256-cIxpV155A76TCOXurJhBA0dQpwn63hTpokBRXMLBEUA=";
+    hash = "sha256-iEAYZX7WNk6TvZ44GAOgTqXOcW5oFn4gX+kzixZZbWA=";
   };
 
   overridesNodeModules = buildNpmPackage' {
@@ -29,7 +30,7 @@ let
     inherit version src;
     sourceRoot = "${src.name}/overrides/js";
 
-    npmDepsHash = "sha256-GRN6ua3FY1AE61bB7PM2wgbKPZI/zJeXa5HOOh/2N2Y=";
+    npmDepsHash = "sha256-Uw7XbfwLMX+zbSrzFgvB8lw3hxUyw1eRKazCITrT/28=";
 
     dontBuild = true;
 
@@ -41,20 +42,20 @@ let
 
   nodeDatachannel = buildNpmPackage' {
     pname = "node-datachannel";
-    version = "0.4.3";
+    version = "0.12.0";
 
     src = fetchFromGitHub {
       owner = "murat-dogan";
       repo = "node-datachannel";
       rev = "refs/tags/v${nodeDatachannel.version}";
-      hash = "sha256-BlfeocqSG+pqbK0onnCf0VKbQw8Qq4qMxhAcfGlFYR8=";
+      hash = "sha256-xjYja+e2Z7X5cU4sEuSsJzG0gtmTPl3VrUf+ypd3zdw=";
     };
 
     npmFlags = [ "--ignore-scripts" ];
 
     makeCacheWritable = true;
 
-    npmDepsHash = "sha256-pgcOOjiuWKlpD+WJyPj/c9ZhDjYuEnybpLS/BPmzeFM=";
+    npmDepsHash = "sha256-Qhib9ZGulTXjoYcZIWunf3/BSd2SLXZuWEmMcstaphs=";
 
     nativeBuildInputs = [
       cmake
@@ -64,6 +65,7 @@ let
     buildInputs = [
       openssl
       libdatachannel
+      plog
     ];
 
     dontUseCmakeConfigure = true;
@@ -73,10 +75,12 @@ let
 
     preBuild = ''
       # don't use static libs and don't use FetchContent
+      # don't try to link plog (it's headers-only)
       substituteInPlace CMakeLists.txt \
           --replace-fail 'OPENSSL_USE_STATIC_LIBS TRUE' 'OPENSSL_USE_STATIC_LIBS FALSE' \
           --replace-fail 'if(NOT libdatachannel)' 'if(false)' \
-          --replace-fail 'datachannel-static' 'datachannel'
+          --replace-fail 'datachannel-static' 'datachannel' \
+          --replace-fail 'plog::plog' ""
 
       # don't fetch node headers
       substituteInPlace node_modules/cmake-js/lib/dist.js \
@@ -98,7 +102,7 @@ buildNpmPackage' {
 
   patches = [ ./only-build-for-one-platform.patch ];
 
-  npmDepsHash = "sha256-GZESwRDG1gEVhkclR+LBWwoUYaE1xS0z4EvPN7kYTrA=";
+  npmDepsHash = "sha256-gHXop4CTsQTSMrZ5mBHkMcmpOr2MIjVLrzjLLCfZ3As=";
 
   npmFlags = [ "--ignore-scripts" ];
 

pkgs/by-name/ht/httptoolkit/package.nix

@@ -12,16 +12,18 @@
 
 buildNpmPackage rec {
   pname = "httptoolkit";
-  version = "1.19.4";
+  version = "1.20.1";
 
   src = fetchFromGitHub {
     owner = "httptoolkit";
     repo = "httptoolkit-desktop";
     tag = "v${version}";
-    hash = "sha256-oDwAosyFY4ff9MP82O8q5o+mN/X6+J7hM3b7myfOq7k=";
+    hash = "sha256-1m4okGTNrboyj+QiMFPT7Z0/+FxZtxrqqAbuAobRgvU=";
   };
 
-  npmDepsHash = "sha256-4kREJgw7OjKkOF/J1HpD3uPn+awtQIfUGWqJctwq3N0=";
+  npmDepsHash = "sha256-NH6Ppj6SsM0BXAgboMgp1ZPwN43ciLNBaHkz5yq8Ff8=";
+
+  makeCacheWritable = true;
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
@@ -40,7 +42,7 @@ buildNpmPackage rec {
         '"forceCodeSigning": true' \
         '"forceCodeSigning": false'
 
-    cp -r ${electron.dist} electron-dist
+    cp -rL ${electron.dist} electron-dist
     chmod -R u+w electron-dist
 
     npm exec electron-builder -- \

pkgs/by-name/ki/kitex/package.nix

@@ -40,7 +40,7 @@ buildGoModule (finalAttrs: {
     description = "High-performance and strong-extensibility Golang RPC framework";
     homepage = "https://github.com/cloudwego/kitex";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ aaronjheng ];
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "kitex";
   };
 })

pkgs/by-name/kr/krillinai/package.nix

@@ -11,16 +11,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "krillinai";
-  version = "1.2.2";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "krillinai";
     repo = "KlicStudio";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RHlQeTFeG23LjLwczSGIghH3XPFTR6ZVDFk2KlRQGoA=";
+    hash = "sha256-Cd+MrKXezcBKRSwmoRaD/2jiNT7r8R7IGweXHDZFhWE=";
   };
 
-  vendorHash = "sha256-PN0ntMoPG24j3DrwuIiYHo71QmSU7u/A9iZ5OruIV/w=";
+  vendorHash = "sha256-bAKLNpt0K06egScyn7ImHV0csDsMQGUm92kU1PVQK+I=";
 
   nativeBuildInputs = [ pkg-config ];
 

pkgs/by-name/li/libremines/package.nix

@@ -3,46 +3,45 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  wrapQtAppsHook,
+  qt6,
-  qtmultimedia,
+  qt6Packages,
-  qtwayland,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libremines";
   version = "2.0.1";
 
   src = fetchFromGitHub {
     owner = "Bollos00";
-    repo = pname;
+    repo = "libremines";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-TQwjEgtqAvKnrpia6VloRgFwtq5TNDmxU+ZWjtEK/n8=";
   };
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs =
     [
-      qtmultimedia
+      qt6Packages.qtmultimedia
     ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [
-      qtwayland
+      qt6Packages.qtwayland
     ];
 
   cmakeFlags = [ "-DUSE_QT6=TRUE" ];
 
-  meta = with lib; {
+  meta = {
     description = "Qt based Minesweeper game";
     mainProgram = "libremines";
     longDescription = ''
       A Free/Libre and Open Source Software Qt based Minesweeper game available for GNU/Linux, FreeBSD and Windows systems.
     '';
     homepage = "https://bollos00.github.io/LibreMines";
-    license = licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
-    maintainers = with maintainers; [ aleksana ];
+    maintainers = with lib.maintainers; [ aleksana ];
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
-}
+})

pkgs/by-name/li/libvirt/package.nix

@@ -115,14 +115,14 @@ assert enableZfs -> isLinux;
 stdenv.mkDerivation rec {
   pname = "libvirt";
   # if you update, also bump <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> and SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix>
-  version = "11.4.0";
+  version = "11.5.0";
 
   src = fetchFromGitLab {
     owner = "libvirt";
     repo = "libvirt";
     tag = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-0bOX95Ly8d1/XZan/EyxI6JaACJvOu9QsTkFNQTreqI=";
+    hash = "sha256-wp/igqlyGqJiMCxcXFmPQgVDarVhR87Qlvuct+Eb8zA=";
   };
 
   patches =

pkgs/by-name/ne/nekoray/package.nix

@@ -4,17 +4,15 @@
 
   buildGoModule,
   fetchFromGitHub,
+  fetchpatch,
   makeDesktopItem,
 
   cmake,
   copyDesktopItems,
   ninja,
 
-  libcpr,
   protobuf,
   qt6Packages,
-  yaml-cpp,
-  zxing-cpp,
 
   sing-geoip,
   sing-geosite,
@@ -22,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nekoray";
-  version = "4.3.5";
+  version = "4.3.7";
 
   src = fetchFromGitHub {
     owner = "Mahdi-zarei";
     repo = "nekoray";
     tag = finalAttrs.version;
-    hash = "sha256-dq3rBvCFEs+4+UadFObMnHhIiYeFlpvvLjTo0lcG8rE=";
+    hash = "sha256-oRoHu9mt4LiGJFe2OEATbPQ8buYT/6o9395BxYg1qKI=";
   };
 
   strictDeps = true;
@@ -41,12 +39,9 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libcpr
     protobuf
     qt6Packages.qtbase
     qt6Packages.qttools
-    yaml-cpp
-    zxing-cpp
   ];
 
   cmakeFlags = [
@@ -106,9 +101,18 @@ stdenv.mkDerivation (finalAttrs: {
     patches = [
       # also check cap_net_admin so we don't have to set suid
       ./core-also-check-capabilities.patch
+
+      # adds missing entries to the lockfile
+      # can be removed next update
+      (fetchpatch {
+        name = "fix-lockfile.patch";
+        url = "https://github.com/Mahdi-zarei/nekoray/commit/6f9b2c69e21b0b86242fcc5731f21561373d0963.patch";
+        stripLen = 2;
+        hash = "sha256-LDLgCQUXOqaV++6Z4/8r2IaBM+Kz/LckjVsvZn/0lLM=";
+      })
     ];
 
-    vendorHash = "sha256-hZiEIJ4/TcLUfT+pkqs6WfzjqppSTjKXEtQC+DS26Ug=";
+    vendorHash = "sha256-6Q6Qi3QQOmuLBaV4t/CEER6s1MUvL7ER6Hfm44sQk4M=";
 
     # ldflags and tags are taken from script/build_go.sh
     ldflags = [

pkgs/by-name/oc/oci-cli/package.nix

@@ -25,19 +25,23 @@ in
 
 py.pkgs.buildPythonApplication rec {
   pname = "oci-cli";
-  version = "3.61.0";
+  version = "3.62.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "oracle";
     repo = "oci-cli";
     tag = "v${version}";
-    hash = "sha256-/Dl7y4asXDJiqAF5uvffrCnVWlObQt2cemQ23OKL0Xc=";
+    hash = "sha256-Y1bkBdmgmaiHHizGJkBINXN/pL/DEcjIwFq8XjoK5Kc=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
 
-  propagatedBuildInputs = with py.pkgs; [
+  build-system = with py.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with py.pkgs; [
     arrow
     certifi
     click
@@ -55,6 +59,7 @@ py.pkgs.buildPythonApplication rec {
   ];
 
   pythonRelaxDeps = [
+    "click"
     "PyYAML"
     "cryptography"
     "oci"

pkgs/by-name/on/onioncircuits/package.nix

@@ -11,7 +11,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "onioncircuits";
   version = "0.8.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitLab {
     domain = "gitlab.tails.boum.org";
@@ -25,10 +25,14 @@ python3.pkgs.buildPythonApplication rec {
     gobject-introspection
     intltool
     wrapGAppsHook3
-    python3.pkgs.distutils-extra
   ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
+    setuptools
+    distutils-extra
+  ];
+
+  dependencies = with python3.pkgs; [
     pygobject3
     stem
   ];

pkgs/by-name/on/onlykey-cli/package.nix

@@ -7,7 +7,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "onlykey-cli";
   version = "1.2.10";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit version;
@@ -16,10 +16,14 @@ python3Packages.buildPythonApplication rec {
   };
 
   build-system = with python3Packages; [
-    cython
+    setuptools
   ];
 
-  propagatedBuildInputs = with python3Packages; [
+  pythonRemoveDeps = [
+    "Cython" # don't know why cython is listed as a runtime dependency, let's just remove it
+  ];
+
+  dependencies = with python3Packages; [
     aenum
     ecdsa
     hidapi

pkgs/by-name/op/opencloud-desktop/package.nix

@@ -12,12 +12,12 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "opencloud-desktop";
-  version = "1.0.0";
+  version = "2.0.0";
   src = fetchFromGitHub {
     owner = "opencloud-eu";
     repo = "desktop";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-sGbjFPidPncCu9LqaeClrXoKQUzhbR1XbX8RoLuz+N8=";
+    hash = "sha256-NM9SspeMXu1q3tfpcFk4OuLapu/clbotJLu2u4nmAlY=";
   };
 
   buildInputs = [

pkgs/by-name/op/opensnitch-ui/package.nix

@@ -6,7 +6,7 @@
 }:
 
 python3Packages.buildPythonApplication {
-  format = "setuptools";
+  pyproject = true;
   pname = "opensnitch-ui";
 
   inherit (opensnitch) src version;
@@ -18,7 +18,6 @@ python3Packages.buildPythonApplication {
   '';
 
   nativeBuildInputs = [
-    python3Packages.pyqt5
     qt5.wrapQtAppsHook
   ];
 
@@ -26,6 +25,11 @@ python3Packages.buildPythonApplication {
     qt5.qtwayland
   ];
 
+  build-system = with python3Packages; [
+    setuptools
+    pyqt5
+  ];
+
   dependencies = with python3Packages; [
     grpcio-tools
     notify2
@@ -59,6 +63,8 @@ python3Packages.buildPythonApplication {
   # All tests are sandbox-incompatible and disabled for now
   doCheck = false;
 
+  pythonImportsCheck = [ "opensnitch" ];
+
   meta = {
     description = "Application firewall";
     mainProgram = "opensnitch-ui";

pkgs/by-name/op/opentimestamps-client/package.nix

@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "opentimestamps-client";
   version = "0.7.2";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "opentimestamps";
@@ -16,7 +16,11 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-ny2svB8WcoUky8UfeilANo1DlS+f3o9RtV4YNmUwjJk=";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
     appdirs
     gitpython
     opentimestamps

pkgs/by-name/ou/outputcheck/package.nix

@@ -8,7 +8,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "outputcheck";
   version = "0.4.2";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "stp";
@@ -23,16 +23,18 @@ python3.pkgs.buildPythonApplication rec {
   # - Fix version number cannot find error
   postPatch = ''
     substituteInPlace OutputCheck/Driver.py \
-      --replace "argparse.FileType('rU')" "argparse.FileType('r')"
+      --replace-fail "argparse.FileType('rU')" "argparse.FileType('r')"
 
     substituteInPlace tests/invalid-regex-syntax.smt2 \
-      --replace "unbalanced parenthesis" "missing ), unterminated subpattern"
+      --replace-fail "unbalanced parenthesis" "missing ), unterminated subpattern"
 
     echo ${version} > RELEASE-VERSION
   '';
 
   nativeCheckInputs = [ lit ];
 
+  build-system = with python3.pkgs; [ setuptools ];
+
   checkPhase = ''
     runHook preCheck
 

pkgs/by-name/pa/parsero/package.nix

@@ -7,7 +7,7 @@
 python3Packages.buildPythonApplication {
   pname = "parsero";
   version = "0.81";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "behindthefirewalls";
@@ -16,7 +16,13 @@ python3Packages.buildPythonApplication {
     sha256 = "rqupeJxslL3AfQ+CzBWRb4ZS32VoYd8hlA+eACMKGPY=";
   };
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [ setuptools ];
+
+  pythonRemoveDeps = [
+    "pip" # this dependency is never actually used
+  ];
+
+  dependencies = with python3Packages; [
     beautifulsoup4
     urllib3
   ];

pkgs/by-name/pa/pass-secret-service/package.nix

@@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication {
   # seemingly abandoned D-Bus package pydbus and started using maintained
   # dbus-next. So let's use latest from GitHub.
   version = "0-unstable-2023-12-16";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mdellweg";
@@ -28,14 +28,13 @@ python3.pkgs.buildPythonApplication {
   # /etc/ in check phase.
   postPatch = ''
     substituteInPlace Makefile \
-      --replace "dbus-run-session" "dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf" \
+      --replace-fail "dbus-run-session" "dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf" \
-      --replace '-p $(relpassstore)' '-p $(PASSWORD_STORE_DIR)' \
+      --replace-fail '-p $(relpassstore)' '-p $(PASSWORD_STORE_DIR)'
-      --replace 'pytest-3' 'pytest'
 
     substituteInPlace systemd/org.freedesktop.secrets.service \
-      --replace "/bin/false" "${coreutils}/bin/false"
+      --replace-fail "/bin/false" "${coreutils}/bin/false"
     substituteInPlace systemd/dbus-org.freedesktop.secrets.service \
-      --replace "/usr/local" "$out"
+      --replace-fail "/usr/local" "$out"
   '';
 
   postInstall = ''
@@ -44,7 +43,11 @@ python3.pkgs.buildPythonApplication {
     cp systemd/dbus-org.freedesktop.secrets.service "$out/lib/systemd/user/"
   '';
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
     click
     cryptography
     dbus-next
@@ -67,6 +70,8 @@ python3.pkgs.buildPythonApplication {
 
   checkTarget = "test";
 
+  pythonImportsCheck = [ "pass_secret_service" ];
+
   passthru = {
     updateScript = nix-update-script {
       extraArgs = [ "--version=branch" ];

pkgs/by-name/pa/patatt/package.nix

@@ -7,17 +7,23 @@
 python3Packages.buildPythonApplication rec {
   pname = "patatt";
   version = "0.6.3";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-mAgm9lKdJXbCZ8ofVk1b7wRstH5UIVu1mO1sS5stCig=";
   };
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
     pynacl
   ];
 
+  pythonImportsCheck = [ "patatt" ];
+
   meta = with lib; {
     homepage = "https://git.kernel.org/pub/scm/utils/patatt/patatt.git/about/";
     license = licenses.mit0;

pkgs/by-name/pa/patray/package.nix

@@ -8,7 +8,7 @@
 python312.pkgs.buildPythonApplication rec {
   pname = "patray";
   version = "0.1.2";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit version pname;
@@ -21,6 +21,8 @@ python312.pkgs.buildPythonApplication rec {
     sed -i '/pyside2/d' requirements/production.in
   '';
 
+  build-system = with python312.pkgs; [ setuptools ];
+
   dependencies = with python312.pkgs; [
     pulsectl
     loguru

pkgs/by-name/pe/pentestgpt/package.nix

@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "pentestgpt";
   version = "unstable-2023-06-27";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "GreyDGL";
@@ -16,6 +16,8 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-m0R/kMmbr5Ixuqvw6ZRoaAGCnI3j86Iwk4+TYqv0WbU=";
   };
 
+  build-system = with python3.pkgs; [ setuptools ];
+
   pythonRelaxDeps = [ "playwright" ];
   pythonRemoveDeps = [
     "beautifulsoup4"
@@ -23,7 +25,7 @@ python3.pkgs.buildPythonApplication rec {
     "pytest"
   ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  dependencies = with python3.pkgs; [
     beautifulsoup4
     colorama
     google

pkgs/by-name/pe/perfect-hash/package.nix

@@ -6,7 +6,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "perfect-hash";
   version = "0.4.1";
-  format = "setuptools";
+  pyproject = true;
 
   # Archive on pypi does not contain examples, which are very helpful to
   # understand how to use this program, so we use git source.
@@ -17,6 +17,8 @@ python3.pkgs.buildPythonApplication rec {
     sha256 = "0gkc3n613hl0q4jknrh2nm1n96j97p36q9jjgarb9d8yii9q7792";
   };
 
+  build-system = with python3.pkgs; [ setuptools ];
+
   postInstall = ''
     mkdir -p $out/share/doc/perfect-hash
     cp README.md $out/share/doc/perfect-hash

pkgs/by-name/pe/peru/package.nix

@@ -7,7 +7,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "peru";
   version = "1.3.3";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = python3Packages.pythonOlder "3.5";
 
@@ -18,7 +18,9 @@ python3Packages.buildPythonApplication rec {
     sha256 = "FCyR14jcFjI6epoFPNVyFZ4k1URZ1NraX1+ajVcCQ2A=";
   };
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [ setuptools ];
+
+  dependencies = with python3Packages; [
     pyyaml
     docopt
   ];
@@ -26,6 +28,8 @@ python3Packages.buildPythonApplication rec {
   # No tests in archive
   doCheck = false;
 
+  pythonImportsCheck = [ "peru" ];
+
   meta = with lib; {
     homepage = "https://github.com/buildinspace/peru";
     description = "Tool for including other people's code in your projects";

pkgs/by-name/pe/pew/package.nix

@@ -4,22 +4,24 @@
   fetchPypi,
 }:
 
-with python3.pkgs;
+python3.pkgs.buildPythonApplication rec {
-
-buildPythonApplication rec {
   pname = "pew";
   version = "1.2.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "04anak82p4v9w0lgfs55s7diywxil6amq8c8bhli143ca8l2fcdq";
   };
 
-  propagatedBuildInputs = [
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
     virtualenv
     virtualenv-clone
-    setuptools
+    setuptools # pkg_resources is imported during runtime
   ];
 
   # no tests are packaged

pkgs/by-name/pg/pg_activity/package.nix

@@ -7,7 +7,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "pg_activity";
   version = "3.6.0";
-  format = "setuptools";
+  pyproject = true;
   disabled = python3Packages.pythonOlder "3.8";
 
   src = fetchFromGitHub {
@@ -17,7 +17,9 @@ python3Packages.buildPythonApplication rec {
     sha256 = "sha256-7nHtJl/b2pZqiJbpWArMS5jh7B8dv8V1esic6uFPV/0=";
   };
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [ setuptools ];
+
+  dependencies = with python3Packages; [
     attrs
     blessed
     humanize

pkgs/by-name/ph/photocollage/package.nix

@@ -11,7 +11,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "photocollage";
   version = "1.4.6";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "adrienverge";
@@ -20,7 +20,9 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-jDb2mFsok8TNi9+A/FAieqo7YbAUsmrFRBGwdGv71Xg=";
   };
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [ setuptools ];
+
+  dependencies = with python3Packages; [
     pillow
     pycairo
     pygobject3
@@ -50,6 +52,8 @@ python3Packages.buildPythonApplication rec {
     cp -r ./data/icons $out/share/icons
   '';
 
+  pythonImportsCheck = [ "photocollage" ];
+
   meta = {
     description = "Graphical tool to make photo collage posters";
     homepage = "https://github.com/adrienverge/PhotoCollage";

pkgs/by-name/pi/pianotrans/package.nix

@@ -8,7 +8,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "pianotrans";
   version = "1.0.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "azuwis";
@@ -17,7 +17,9 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-gRbyUQmPtGvx5QKAyrmeJl0stp7hwLBWwjSbJajihdE=";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [ setuptools ];
+
+  dependencies = with python3.pkgs; [
     piano-transcription-inference
     resampy
     tkinter

pkgs/by-name/pi/pick-colour-picker/package.nix

@@ -11,7 +11,7 @@
 python3Packages.buildPythonPackage {
   pname = "pick-colour-picker";
   version = "unstable-2022-05-08";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "stuartlangridge";
@@ -31,6 +31,8 @@ python3Packages.buildPythonPackage {
     wrapGAppsHook3
   ];
 
+  build-system = with python3Packages; [ setuptools ];
+
   pythonPath = with python3Packages; [
     pygobject3
     pycairo
@@ -41,6 +43,8 @@ python3Packages.buildPythonPackage {
     gtk3
   ];
 
+  pythonImportsCheck = [ "pick" ];
+
   meta = with lib; {
     homepage = "https://kryogenix.org/code/pick/";
     license = licenses.mit;

pkgs/by-name/pi/pifpaf/package.nix

@@ -8,14 +8,19 @@
 python3Packages.buildPythonApplication rec {
   pname = "pifpaf";
   version = "3.3.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-xXkMj1sP1xXf6Ad/71BFbq8SHz/uHcaSqv6RQN0Ca1o=";
   };
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = with python3Packages; [
     click
     daiquiri
     fixtures

pkgs/by-name/pi/pipreqs/package.nix

@@ -4,19 +4,19 @@
   fetchPypi,
 }:
 
-with python3.pkgs;
+python3.pkgs.buildPythonApplication rec {
-
-buildPythonApplication rec {
   pname = "pipreqs";
   version = "0.4.13";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-oX8WeIC2khvjdTPOTIHdxuIrRlwQeq1VfbQ7Gt1WqZs=";
   };
 
-  propagatedBuildInputs = [
+  build-system = with python3.pkgs; [ setuptools ];
+
+  dependencies = with python3.pkgs; [
     yarg
     docopt
   ];
@@ -24,6 +24,8 @@ buildPythonApplication rec {
   # Tests requires network access. Works fine without sandboxing
   doCheck = false;
 
+  pythonImportsCheck = [ "pipreqs" ];
+
   meta = with lib; {
     description = "Generate requirements.txt file for any project based on imports";
     homepage = "https://github.com/bndr/pipreqs";

pkgs/by-name/pi/pirate-get/package.nix

@@ -9,19 +9,23 @@ with python3Packages;
 buildPythonApplication rec {
   pname = "pirate-get";
   version = "0.4.2";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-VtnVyJqrdGXTqcyzpHCOMUI9G7/BkXzihDrBrsxl7Eg=";
   };
 
-  propagatedBuildInputs = [
+  build-system = with python3Packages; [ setuptools ];
+
+  dependencies = [
     colorama
     veryprettytable
     pyperclip
   ];
 
+  pythonImportsCheck = [ "pirate" ];
+
   meta = with lib; {
     description = "Command line interface for The Pirate Bay";
     mainProgram = "pirate-get";

pkgs/by-name/pl/plakativ/package.nix

@@ -9,7 +9,7 @@ let
   version = "0.5.3";
 in
 python3Packages.buildPythonApplication {
-  format = "setuptools";
+  pyproject = true;
   inherit pname version;
 
   src = fetchPypi {
@@ -17,13 +17,18 @@ python3Packages.buildPythonApplication {
     hash = "sha256-6TvMznd5obkn/gsQTyZ6Pc/dF55I53987EbuSNAlY58=";
   };
 
+  build-system = with python3Packages; [ setuptools ];
+
   dependencies =
     with python3Packages;
     [
       pymupdf
+      img2pdf
     ]
     ++ lib.optional guiSupport tkinter;
 
+  pythonImportsCheck = [ "plakativ" ];
+
   meta = {
     description = "Convert a PDF into a large poster that can be printed on multiple smaller pages";
     mainProgram = "plakativ";

pkgs/by-name/pl/plecost/package.nix

@@ -8,7 +8,7 @@
 python3Packages.buildPythonApplication {
   pname = "plecost";
   version = "1.1.4";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "iniqua";
@@ -27,7 +27,9 @@ python3Packages.buildPythonApplication {
     })
   ];
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [ setuptools ];
+
+  dependencies = with python3Packages; [
     aiohttp
     async-timeout
     termcolor
@@ -37,6 +39,8 @@ python3Packages.buildPythonApplication {
   # Project has no tests
   doCheck = false;
 
+  pythonImportsCheck = [ "plecost_lib" ];
+
   meta = with lib; {
     description = "Vulnerability fingerprinting and vulnerability finder for Wordpress blog engine";
     mainProgram = "plecost";

pkgs/by-name/po/polygon-cli/package.nix

@@ -7,15 +7,16 @@
 python3.pkgs.buildPythonPackage rec {
   pname = "polygon-cli";
   version = "1.1.11";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-gEz3kcXbXj9dXnMCx0Q8TjCQemXvJne9EwFsPt14xV4=";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [ setuptools ];
-    setuptools
+
+  dependencies = with python3.pkgs; [
     requests
     prettytable
     colorama
@@ -24,6 +25,8 @@ python3.pkgs.buildPythonPackage rec {
 
   doCheck = false;
 
+  pythonImportsCheck = [ "polygon_cli" ];
+
   meta = {
     description = "Command-line tool for polygon.codeforces.com";
     mainProgram = "polygon-cli";

pkgs/by-name/pq/pqos-wrapper/package.nix

@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication {
   pname = "pqos-wrapper";
   version = "unstable-2022-01-31";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitLab {
     group = "sosy-lab";
@@ -17,8 +17,12 @@ python3.pkgs.buildPythonApplication {
     hash = "sha256-SaYr6lVucpJjVtGgxRbDGYbOoBwdfEDVKtvD+M1L0o4=";
   };
 
+  build-system = with python3.pkgs; [ setuptools ];
+
   makeWrapperArgs = [ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ intel-cmt-cat ]}" ];
 
+  pythonImportsCheck = [ "pqos_wrapper" ];
+
   meta = with lib; {
     description = "Wrapper for Intel PQoS for the purpose of using it in BenchExec";
     homepage = "https://gitlab.com/sosy-lab/software/pqos-wrapper";

pkgs/by-name/pr/pre-commit-hook-ensure-sops/package.nix

@@ -8,7 +8,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "pre-commit-hook-ensure-sops";
   version = "1.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "yuvipanda";
@@ -26,8 +26,12 @@ python3Packages.buildPythonApplication rec {
     })
   ];
 
-  propagatedBuildInputs = [
+  build-system = with python3Packages; [
-    python3Packages.ruamel-yaml
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
+    ruamel-yaml
   ];
 
   pythonImportsCheck = [

pkgs/by-name/pr/precice-config-visualizer/package.nix

@@ -7,7 +7,7 @@
 python3Packages.buildPythonApplication {
   pname = "config-visualizer";
   version = "unstable-2022-02-23";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "precice";
@@ -16,7 +16,9 @@ python3Packages.buildPythonApplication {
     hash = "sha256-2dnpkec9hN4oAqwu+1WmDJrfeu+JbfqZ6guv3bC4H1c=";
   };
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [ setuptools ];
+
+  dependencies = with python3Packages; [
     lxml
     pydot
   ];

pkgs/by-name/pr/present/package.nix

@@ -18,14 +18,16 @@ in
 python3Packages.buildPythonPackage rec {
   pname = "present";
   version = "0.6.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-l9W5L4LD9qRo3rLBkgd2I/aDaj+ucib5UYg+X4RYg6c=";
   };
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [ setuptools ];
+
+  dependencies = with python3Packages; [
     click
     pyyaml
     pyfiglet

pkgs/by-name/pr/prometheus-deluge-exporter/package.nix

@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication {
   pname = "deluge-exporter";
   version = "2.4.0-unstable-2024-06-02";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ibizaman";
@@ -16,7 +16,9 @@ python3.pkgs.buildPythonApplication {
     hash = "sha256-1brLWx6IEGffcvHPCkz10k9GCNQIXXJ9PYZuEzlKHTA=";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [ setuptools ];
+
+  dependencies = with python3.pkgs; [
     deluge-client
     loguru
     prometheus-client

pkgs/by-name/pr/protocol/package.nix

@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication {
   pname = "protocol";
   version = "unstable-2019-03-28";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "luismartingarcia";
@@ -18,9 +18,11 @@ python3.pkgs.buildPythonApplication {
 
   postPatch = ''
     substituteInPlace setup.py \
-      --replace "scripts=['protocol', 'constants.py', 'specs.py']" "scripts=['protocol'], py_modules=['constants', 'specs']"
+      --replace-fail "scripts=['protocol', 'constants.py', 'specs.py']" "scripts=['protocol'], py_modules=['constants', 'specs']"
   '';
 
+  build-system = with python3.pkgs; [ setuptools ];
+
   meta = with lib; {
     description = "ASCII Header Generator for Network Protocols";
     homepage = "https://github.com/luismartingarcia/protocol";

pkgs/by-name/pr/proxmove/package.nix

@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "proxmove";
   version = "1.2";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ossobv";
@@ -16,7 +16,11 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-8xzsmQsogoMrdpf8+mVZRWPGQt9BO0dBT0aKt7ygUe4=";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
     proxmoxer
   ];
 

pkgs/by-name/ps/ps_mem/package.nix

@@ -7,7 +7,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "ps_mem";
   version = "3.14";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pixelb";
@@ -16,6 +16,10 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-jCfPtPSky/QFk9Xo/tq3W7609Pie1yLC4iS4dqjCa+E=";
   };
 
+  build-system = with python3Packages; [ setuptools ];
+
+  pythonImportsCheck = [ "ps_mem" ];
+
   meta = {
     description = "Utility to accurately report the in core memory usage for a program";
     homepage = "https://github.com/pixelb/ps_mem";

pkgs/by-name/pu/pulsemeeter/package.nix

@@ -12,7 +12,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "pulsemeeter";
   version = "1.2.14";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "theRealCarneiro";
@@ -47,6 +47,8 @@ python3Packages.buildPythonApplication rec {
 
   dontWrapGApps = true;
 
+  pythonImportsCheck = [ "pulsemeeter" ];
+
   passthru.tests.version = callPackage ./version-test.nix { inherit version; };
 
   meta = {

pkgs/by-name/pw/pwgen-secure/package.nix

@@ -11,7 +11,7 @@ in
 buildPythonApplication rec {
   pname = "pwgen-secure";
   version = "0.9.1";
-  format = "setuptools";
+  pyproject = true;
 
   # it needs `secrets` which was introduced in 3.6
   disabled = pythonOlder "3.6";
@@ -35,7 +35,9 @@ buildPythonApplication rec {
       --replace-fail "os.path.join(path, 'words.txt')" "os.path.join('$shareDir', 'words.txt')"
   '';
 
-  propagatedBuildInputs = with python3Packages; [ docopt ];
+  build-system = with python3Packages; [ setuptools ];
+
+  dependencies = with python3Packages; [ docopt ];
 
   postInstall = ''
     install -Dm555 spwgen.py $out/bin/spwgen
@@ -45,6 +47,8 @@ buildPythonApplication rec {
   # there are no checks
   doCheck = false;
 
+  pythonImportsCheck = [ "pwgen_secure" ];
+
   meta = with lib; {
     description = "Secure password generation library to replace pwgen";
     homepage = "https://github.com/mjmunger/pwgen_secure/";

pkgs/by-name/py/pyCA/package.nix

@@ -49,7 +49,7 @@ in
 python3.pkgs.buildPythonApplication rec {
   pname = "pyca";
   version = "4.5";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "opencast";
@@ -58,7 +58,9 @@ python3.pkgs.buildPythonApplication rec {
     sha256 = "sha256-cTkWkOmgxJZlddqaSYKva2wih4Mvsdrd7LD4NggxKQk=";
   };
 
-  propagatedBuildInputs = with python.pkgs; [
+  build-system = with python3.pkgs; [ setuptools ];
+
+  dependencies = with python.pkgs; [
     pycurl
     python-dateutil
     configobj
@@ -73,6 +75,8 @@ python3.pkgs.buildPythonApplication rec {
     sed -i -e 's#static_folder=.*#static_folder="${frontend}/static")#' pyca/ui/__init__.py
   '';
 
+  pythonImportsCheck = [ "pyca" ];
+
   passthru = {
     inherit frontend;
   };

pkgs/by-name/py/pyamlboot/package.nix

@@ -9,7 +9,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "pyamlboot";
   version = "1.0.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "superna9999";
@@ -24,10 +24,11 @@ python3Packages.buildPythonApplication rec {
 
   dependencies = with python3Packages; [
     pyusb
-    wheel
+    setuptools # pkg_resources is imported during runtime
-    setuptools
   ];
 
+  pythonImportsCheck = [ "pyamlboot" ];
+
   passthru.tests.version = testers.testVersion {
     package = pyamlboot;
     command = "boot.py -v";

pkgs/by-name/py/pychess/package.nix

@@ -14,7 +14,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "pychess";
   version = "1.0.5";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pychess";
@@ -36,7 +36,9 @@ python3Packages.buildPythonApplication rec {
     gtksourceview
   ];
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [ setuptools ];
+
+  dependencies = with python3Packages; [
     pygobject3
     pycairo
     sqlalchemy
@@ -65,6 +67,8 @@ python3Packages.buildPythonApplication rec {
   # No tests available.
   doCheck = false;
 
+  pythonImportsCheck = [ "pychess" ];
+
   meta = {
     description = "Advanced GTK chess client written in Python";
     homepage = "https://pychess.github.io/";

pkgs/by-name/py/pydf/package.nix

@@ -7,13 +7,15 @@
 python3Packages.buildPythonPackage rec {
   pname = "pydf";
   version = "12";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "7f47a7c3abfceb1ac04fc009ded538df1ae449c31203962a1471a4eb3bf21439";
   };
 
+  build-system = with python3Packages; [ setuptools ];
+
   postInstall = ''
     mkdir -p $out/share/man/man1 $out/share/pydf
     install -t $out/share/pydf -m 444 pydfrc

pkgs/by-name/py/pykickstart/package.nix

@@ -9,7 +9,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "pykickstart";
   version = "3.65";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pykickstart";
@@ -35,6 +35,8 @@ python3Packages.buildPythonApplication rec {
   # Can't package it and not really necessary so disable them.
   doCheck = false;
 
+  pythonImportsCheck = [ "pykickstart" ];
+
   meta = {
     description = "Python package to interact with Kickstart files commonly found in the RPM world";
     homepage = "https://github.com/pykickstart/pykickstart";

pkgs/by-name/py/pylode/package.nix

@@ -7,7 +7,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "pylode";
   version = "2.13.3";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = python3.pythonOlder "3.6";
 
@@ -18,7 +18,9 @@ python3.pkgs.buildPythonApplication rec {
     sha256 = "sha256-AtqkxnpEL+580S/iKCaRcsQO6LLYhkJxyNx6fi3atbE=";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [ setuptools ];
+
+  dependencies = with python3.pkgs; [
     beautifulsoup4
     falcon
     jinja2

pkgs/by-name/py/pympress/package.nix

@@ -16,7 +16,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "pympress";
   version = "1.8.6";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cimbali";
@@ -64,6 +64,8 @@ python3Packages.buildPythonApplication rec {
 
   doCheck = false; # there are no tests
 
+  pythonImportsCheck = [ "pympress" ];
+
   meta = {
     description = "Simple yet powerful PDF reader designed for dual-screen presentations";
     mainProgram = "pympress";

pkgs/by-name/py/pyradio/package.nix

@@ -8,7 +8,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "pyradio";
   version = "0.9.3.11.15";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "coderholic";
@@ -21,7 +21,9 @@ python3Packages.buildPythonApplication rec {
     installShellFiles
   ];
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [ setuptools ];
+
+  dependencies = with python3Packages; [
     dnspython
     netifaces
     psutil

pkgs/by-name/py/pyrseas/package.nix

@@ -8,7 +8,7 @@ let
   pgdbconn = python3Packages.buildPythonPackage rec {
     pname = "pgdbconn";
     version = "0.8.0";
-    format = "setuptools";
+    pyproject = true;
 
     src = fetchFromGitHub {
       owner = "perseas";
@@ -17,12 +17,13 @@ let
       sha256 = "09r4idk5kmqi3yig7ip61r6js8blnmac5n4q32cdcbp1rcwzdn6z";
     };
 
+    build-system = with python3Packages; [ setuptools ];
+
     # The tests are impure (they try to access a PostgreSQL server)
     doCheck = false;
 
-    propagatedBuildInputs = with python3Packages; [
+    dependencies = with python3Packages; [
       psycopg2
-      pytest
     ];
   };
 in
@@ -30,7 +31,7 @@ in
 python3Packages.buildPythonApplication rec {
   pname = "pyrseas";
   version = "0.9.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "perseas";
@@ -39,9 +40,10 @@ python3Packages.buildPythonApplication rec {
     sha256 = "sha256-+MxnxvbLMxK1Ak+qKpKe3GHbzzC+XHO0eR7rl4ON9H4=";
   };
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [ setuptools ];
+
+  dependencies = with python3Packages; [
     psycopg2
-    pytest
     pyyaml
     pgdbconn
   ];
@@ -49,6 +51,8 @@ python3Packages.buildPythonApplication rec {
   # The tests are impure (they try to access a PostgreSQL server)
   doCheck = false;
 
+  pythonImportsCheck = [ "pyrseas" ];
+
   meta = {
     description = "Declarative language to describe PostgreSQL databases";
     homepage = "https://perseas.github.io/";

pkgs/by-name/py/pytrainer/package.nix

@@ -32,7 +32,7 @@ in
 python.pkgs.buildPythonApplication rec {
   pname = "pytrainer";
   version = "2.2.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pytrainer";
@@ -41,12 +41,13 @@ python.pkgs.buildPythonApplication rec {
     hash = "sha256-t61vHVTKN5KsjrgbhzljB7UZdRask7qfYISd+++QbV0=";
   };
 
-  propagatedBuildInputs = with python.pkgs; [
+  build-system = with python3.pkgs; [ setuptools ];
+
+  dependencies = with python.pkgs; [
     sqlalchemy
     python-dateutil
     matplotlib
     lxml
-    setuptools
     requests
     gdal
   ];
@@ -88,7 +89,7 @@ python.pkgs.buildPythonApplication rec {
 
   postPatch = ''
     substituteInPlace pytrainer/platform.py \
-        --replace 'sys.prefix' "\"$out\""
+        --replace-fail 'sys.prefix' "\"$out\""
   '';
 
   checkPhase = ''

pkgs/by-name/py/pywalfox-native/package.nix

@@ -6,7 +6,7 @@
 python3.pkgs.buildPythonApplication {
   pname = "pywalfox-native";
   version = "2.7.4";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Frewacom";
@@ -15,6 +15,8 @@ python3.pkgs.buildPythonApplication {
     hash = "sha256-i1DgdYmNVvG+mZiFiBmVHsQnFvfDFOFTGf0GEy81lpE=";
   };
 
+  build-system = with python3.pkgs; [ setuptools ];
+
   pythonImportsCheck = [ "pywalfox" ];
 
   meta = with lib; {

pkgs/by-name/q-/q-text-as-data/package.nix

@@ -7,7 +7,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "q-text-as-data";
   version = "2.0.19";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "harelba";
@@ -16,8 +16,11 @@ python3Packages.buildPythonApplication rec {
     sha256 = "18cwyfjgxxavclyd08bmb943c8bvzp1gnqp4klkq5xlgqwivr4sv";
   };
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [
     setuptools
+  ];
+
+  dependencies = with python3Packages; [
     six
   ];
 
@@ -28,7 +31,7 @@ python3Packages.buildPythonApplication rec {
     rm bin/qtextasdata.py
 
     # not considered good practice pinning in install_requires
-    substituteInPlace setup.py --replace 'six==' 'six>='
+    substituteInPlace setup.py --replace-fail 'six==' 'six>='
   '';
 
   meta = with lib; {

pkgs/by-name/qb/qbittorrent-enhanced/package.nix

@@ -7,13 +7,13 @@
 
 (qbittorrent.override { inherit guiSupport; }).overrideAttrs (old: rec {
   pname = "qbittorrent-enhanced" + lib.optionalString (!guiSupport) "-nox";
-  version = "5.1.0.11";
+  version = "5.1.2.10";
 
   src = fetchFromGitHub {
     owner = "c0re100";
     repo = "qBittorrent-Enhanced-Edition";
     rev = "release-${version}";
-    hash = "sha256-LY79Y7sG6EHGOh1hRujAOMRK3MKSAblJ+FFuGlj13iQ=";
+    hash = "sha256-Q3gipRgZCzihKUQZZmETT65AUSEUfgj9dFxZFybq258=";
   };
 
   meta = old.meta // {

pkgs/by-name/qu/quisk/package.nix

@@ -10,7 +10,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "quisk";
   version = "4.2.42";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
@@ -23,13 +23,19 @@ python3.pkgs.buildPythonApplication rec {
     pulseaudio
   ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
     pyusb
     wxpython
   ];
 
   doCheck = false;
 
+  pythonImportsCheck = [ "quisk" ];
+
   meta = with lib; {
     description = "SDR transceiver for radios that use the Hermes protocol";
     longDescription = ''

pkgs/by-name/r5/r53-ddns/package.nix

@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "r53-ddns";
-  version = "1.1.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "fleaz";
     repo = "r53-ddns";
     rev = "v${version}";
-    sha256 = "sha256-KJAPhSGaC3upWLfo2eeSD3Vit9Blmbol7s8y3f849N4=";
+    sha256 = "sha256-+vJrcRxckAISYjab6kVT2mpChra1D3NflOqNWCch15I=";
   };
 
-  vendorHash = "sha256-KkyMd94cejWkgg/RJudy1lm/M3lsEJXFGqVTzGIX3qM=";
+  vendorHash = "sha256-ImV/jxCYIWObN+jCSbXhuzR4TuRc/EgQ8SIV6x+wEpA=";
 
   meta = with lib; {
     license = licenses.mit;

pkgs/by-name/re/renode-dts2repl/package.nix

@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication {
   pname = "renode-dts2repl";
-  version = "0-unstable-2025-06-16";
+  version = "0-unstable-2025-07-08";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "antmicro";
     repo = "dts2repl";
-    rev = "65232f0be8d171650e050690ade02c50755241c4";
+    rev = "9c75757b1de9e1bd93d1b1de5d516a65c481b026";
-    hash = "sha256-v/RzEXRie3O37DVVY7bX09rnXMLH7L99o8sWPOPnDOw=";
+    hash = "sha256-m3v/HQKDHhfmk7vjbSGxZiyAK2/5b8FVszJjNDHQj2Y=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/sd/sdrangel/package.nix

@@ -30,25 +30,14 @@
   ninja,
   opencv4,
   pkg-config,
-  qt5compat,
+  qt6,
-  qtcharts,
+  qt6Packages,
-  qtdeclarative,
-  qtlocation,
-  qtmultimedia,
-  qtscxml,
-  qtserialport,
-  qtspeech,
-  qttools,
-  qtwayland,
-  qtwebsockets,
-  qtwebengine,
   rtl-sdr,
   serialdv,
   sdrplay,
   sgp4,
   soapysdr-with-plugins,
   uhd,
-  wrapQtAppsHook,
   zlib,
   withSDRplay ? false,
 }:
@@ -60,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "f4exb";
     repo = "sdrangel";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-ymDKHGJNoCOMa1zzFvjTzFa34wP1+iKSfJZZi7Sk/GM=";
   };
 
@@ -68,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     ninja
     pkg-config
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs =
@@ -96,17 +85,17 @@ stdenv.mkDerivation (finalAttrs: {
       limesuite
       mbelib
       opencv4
-      qt5compat
+      qt6Packages.qt5compat
-      qtcharts
+      qt6Packages.qtcharts
-      qtdeclarative
+      qt6Packages.qtdeclarative
-      qtlocation
+      qt6Packages.qtlocation
-      qtmultimedia
+      qt6Packages.qtmultimedia
-      qtscxml
+      qt6Packages.qtscxml
-      qtserialport
+      qt6Packages.qtserialport
-      qtspeech
+      qt6Packages.qtspeech
-      qttools
+      qt6Packages.qttools
-      qtwebsockets
+      qt6Packages.qtwebsockets
-      qtwebengine
+      qt6Packages.qtwebengine
       rtl-sdr
       serialdv
       sgp4
@@ -114,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: {
       uhd
       zlib
     ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6Packages.qtwayland ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_12 ]
     ++ lib.optionals withSDRplay [ sdrplay ];