Refactor Nix package definitions for improved clarity and consistency, including updates to overlays, dependencies, and build inputs across multiple packages.

pkgs_wip/aviator.nix

@@ -16,7 +16,7 @@
   gtk4,
 }:
 
-stdenv.mkDerivation (finaAttrs: rec {
+stdenv.mkDerivation (_finaAttrs: rec {
   pname = "aviator";
   version = "0.6.0";
   pyproject = true;

pkgs_wip/hiit.nix

@@ -49,23 +49,22 @@ stdenv.mkDerivation rec {
     desktop-file-utils
   ];
 
-  buildInputs =
-    [
-      cairo
-      gdk-pixbuf
-      glib
-      gtk4
-      libadwaita
-      pango
-    ]
-    ++ lib.optionals stdenv.isDarwin [
-      darwin.apple_sdk.frameworks.CoreAudio
-    ]
-    ++ lib.optionals stdenv.isLinux [
-      alsa-lib
-      pulseaudio
-      pipewire
-    ];
+  buildInputs = [
+    cairo
+    gdk-pixbuf
+    glib
+    gtk4
+    libadwaita
+    pango
+  ]
+  ++ lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.CoreAudio
+  ]
+  ++ lib.optionals stdenv.isLinux [
+    alsa-lib
+    pulseaudio
+    pipewire
+  ];
 
   meta = {
     description = "Timer app for high intensity interval training";

pkgs_wip/qbit-manage.nix

@@ -2,57 +2,48 @@
   lib,
   python3,
   fetchFromGitHub,
-  callPackage,
 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "qbit-manage";
-  version = "4.3.0";
+  version = "4.6.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "StuffAnThings";
     repo = "qbit_manage";
     rev = "v${version}";
-    hash = "sha256-Wj1s11PwHfH4hDGEn0jW/REO2gI7+AGyb2B/QKUhlyk=";
+    hash = "sha256-cTxM3nHQQto7lpoNjShYcCbJCSYiwS9bKqw0DWAjw6A=";
   };
 
   postPatch = ''
     rm LICENSE
   '';
 
-  build-system = [
-    python3.pkgs.setuptools
-    python3.pkgs.wheel
-  ];
+  build-system = builtins.attrValues {
+    inherit (python3.pkgs)
+      setuptools
+      wheel
+      ;
+  };
 
-  dependencies = with python3.pkgs; [
-    croniter
-    gitpython
-    humanize
-    pytimeparse2
-    bencode-py
-    requests
-    retrying
-    ruamel-yaml
-    schedule
-    (callPackage ./qbittorrent-api.nix {
-      inherit lib;
-      inherit (python3.pkgs)
-        buildPythonPackage
-        fetchPypi
-
-        # build-system
-        setuptools
-        setuptools-scm
-
-        # dependencies
-        packaging
-        requests
-        urllib3
-        ;
-    })
-  ];
+  propagatedBuildInputs = builtins.attrValues {
+    inherit (python3.pkgs)
+      argon2-cffi
+      bencode-py
+      croniter
+      fastapi
+      gitpython
+      humanize
+      pytimeparse2
+      qbittorrent-api
+      requests
+      retrying
+      ruamel-yaml
+      slowapi
+      uvicorn
+      ;
+  };
 
   meta = {
     description = "This tool will help manage tedious tasks in qBittorrent and automate them. Tag, categorize, remove Orphaned data, remove unregistered torrents and much much more";