Refactor Nix package definitions in flake.nix and run.nix to improve dependency handling and formatting. Changes include renaming variables for clarity, adding the download package to run.nix, and enhancing the structure of package overrides.

flake.nix

@@ -31,21 +31,27 @@
     {
       overlays.default = _final: prev: {
         python3Packages = prev.python3Packages.override {
-          overrides = pyself: pysuper: {
+          overrides = _pyself: _pysuper: {
             webcomix = prev.python3Packages.callPackage ./pkgs_pr/webcomix.nix { };
+            download = prev.python3Packages.callPackage ./pkgs/download.nix {
+              webcomix = _pyself.webcomix;
+            };
           };
         };
+        download = _final.python3Packages.download;
       };
       packages.x86_64-linux =
         let
           scriptBin = path: name: pkgs.writeScriptBin name (builtins.readFile path);
-          pkgsBin = path: _name: 
+          pkgsBin =
+            path: _name:
             let
               content = builtins.readFile path;
             in
-            if builtins.match ".*(buildPythonPackage|buildPythonApplication).*" content != null
+            if builtins.match ".*(buildPythonPackage|buildPythonApplication).*" content != null then
-            then pkgs.python3Packages.callPackage path { }
+              pkgs.python3Packages.callPackage path { }
-            else pkgs.callPackage path { };
+            else
+              pkgs.callPackage path { };
         in
         {
           citra = pkgs.callPackage ./pkgs/citra/default.nix { branch = "nightly"; };

pkgs/run.nix

@@ -7,7 +7,7 @@
   xclip,
   ghostty,
   rmlint,
-  callPackage,
+  download,
   ...
 }:
 writeShellApplication {
@@ -21,6 +21,7 @@ writeShellApplication {
     xclip
     ghostty
     rmlint
+    download
   ];
 
   text = builtins.readFile ../src/packaged_scripts/run.sh;

pkgs_pr/webcomix.nix

@@ -39,11 +39,11 @@ buildPythonApplication rec {
     click
     tqdm
     scrapy
-    (scrapy-splash.overridePythonAttrs (oldAttrs: {
+    (scrapy-splash.overridePythonAttrs (_oldAttrs: {
       doCheck = false;
       nativeCheckInputs = [ ];
     }))
-    (scrapy-fake-useragent.overridePythonAttrs (oldAttrs: {
+    (scrapy-fake-useragent.overridePythonAttrs (_oldAttrs: {
       doCheck = false;
       nativeCheckInputs = [ ];
       checkPhase = "";
@@ -58,7 +58,7 @@ buildPythonApplication rec {
   '';
 
   doCheck = false;
-  
+
   # Skip runtime dependency check due to version mismatches with nixpkgs
   dontCheckRuntimeDeps = true;
 

pkgs_wip/colordle.nix

@@ -28,27 +28,36 @@ stdenv.mkDerivation rec {
   buildInputs = [
     gtk4
     libadwaita
-    (python3.withPackages (ps: with ps; [
+    (python3.withPackages (
-      pygobject3
+      ps: with ps; [
-      pycairo
+        pygobject3
-    ]))
+        pycairo
+      ]
+    ))
   ];
 
   installPhase = ''
     runHook preInstall
-    
+
     mkdir -p $out/bin $out/share/hexcolordle-gtk $out/share/applications $out/share/metainfo
     cp -r * $out/share/hexcolordle-gtk/
-    
+
     # Install desktop file and metainfo
     cp net.krafting.HexColordle.desktop $out/share/applications/
     cp net.krafting.HexColordle.metainfo.xml $out/share/metainfo/
-    
+
     # Create wrapper for the main Python file
-    makeWrapper ${python3.withPackages (ps: with ps; [pygobject3 pycairo])}/bin/python3 $out/bin/hexcolordle-gtk \
+    makeWrapper ${
+      python3.withPackages (
+        ps: with ps; [
+          pygobject3
+          pycairo
+        ]
+      )
+    }/bin/python3 $out/bin/hexcolordle-gtk \
       --add-flags "$out/share/hexcolordle-gtk/HexColordle.py" \
       --prefix PYTHONPATH : "$out/share/hexcolordle-gtk"
-    
+
     runHook postInstall
   '';
 

pkgs_wip/dosage.nix

@@ -15,7 +15,6 @@
   gtk4,
   libadwaita,
   wrapGAppsHook4,
-  makeWrapper,
 }:
 
 stdenv.mkDerivation rec {

pkgs_wip/protonup-qt.nix

@@ -27,7 +27,7 @@ buildPythonApplication rec {
   pythonRemoveDeps = [
     "pyside6-essentials"
   ];
-  
+
   # Skip runtime dependency check for missing packages
   dontCheckRuntimeDeps = true;
 

pkgs_wip/qbit-manage.nix

@@ -55,7 +55,7 @@ buildPythonApplication rec {
     slowapi
     uvicorn
   ];
-  
+
   # Skip runtime dependency check due to version mismatches with nixpkgs
   dontCheckRuntimeDeps = true;
 

pkgs_wip/steam.nix

@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  callPackage,
   setuptools,
   wheel,
   six,