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
-            then pkgs.python3Packages.callPackage path { }
-            else pkgs.callPackage path { };
+            if builtins.match ".*(buildPythonPackage|buildPythonApplication).*" content != null then
+              pkgs.python3Packages.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 = "";

pkgs_wip/colordle.nix

@@ -28,10 +28,12 @@ stdenv.mkDerivation rec {
   buildInputs = [
     gtk4
     libadwaita
-    (python3.withPackages (ps: with ps; [
-      pygobject3
-      pycairo
-    ]))
+    (python3.withPackages (
+      ps: with ps; [
+        pygobject3
+        pycairo
+      ]
+    ))
   ];
 
   installPhase = ''
@@ -45,7 +47,14 @@ stdenv.mkDerivation rec {
     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"
 

pkgs_wip/dosage.nix

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

pkgs_wip/steam.nix

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