From cd60c3ad69f88e3a0fb4e7f652905c9e829f8eb8 Mon Sep 17 00:00:00 2001
From: Danilo Reyes <danilo.reyes.251@proton.me>
Date: Wed, 29 Oct 2025 00:33:25 -0600
Subject: [PATCH] Update Nix package definitions to include webcomix and
 enhance overlays. Refactor download.nix to utilize buildPythonApplication and
 streamline dependencies, ensuring proper integration of new packages.

---
 flake.nix         | 13 +++++--------
 pkgs/download.nix | 25 +++++++++++++------------
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/flake.nix b/flake.nix
index 356521c..ba4c3cf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,6 +11,7 @@
       pkgs = import nixpkgs {
         inherit system;
         config.allowUnfree = true;
+        overlays = [ inputs.self.overlays.default ];
       };
       generatePackages =
         args:
@@ -29,15 +30,11 @@
     in
     {
       overlays.default = _final: prev: {
-        scrapy = prev.scrapy.overrideAttrs (_old: rec {
-          version = "2.11.2";
-          src = prev.fetchFromGitHub {
-            owner = "scrapy";
-            repo = "scrapy";
-            tag = version;
-            hash = "sha256-EaO1kQ3VSTwEW+r0kSKycOxHNTPwwCVjch1ZBrTU0qQ=";
+        python3Packages = prev.python3Packages.override {
+          overrides = pyself: pysuper: {
+            webcomix = prev.python3Packages.callPackage ./pkgs_pr/webcomix.nix { };
           };
-        });
+        };
       };
       packages.x86_64-linux =
         let
diff --git a/pkgs/download.nix b/pkgs/download.nix
index c373f34..f99e4ec 100644
--- a/pkgs/download.nix
+++ b/pkgs/download.nix
@@ -1,14 +1,19 @@
 {
-  python3Packages,
+  buildPythonApplication,
+  setuptools,
+  pyyaml,
+  types-pyyaml,
+  yt-dlp,
   gallery-dl,
   ffmpeg,
+  webcomix,
   ...
 }:
 let
   pname = "download";
   version = "2.6";
 in
-python3Packages.buildPythonApplication {
+buildPythonApplication {
   inherit pname version;
 
   src = builtins.path {
@@ -18,18 +23,14 @@ python3Packages.buildPythonApplication {
 
   pyproject = true;
 
-  build-system = [ python3Packages.setuptools ];
+  build-system = [ setuptools ];
 
   dependencies = [
     ffmpeg
     gallery-dl
-    # (callPackage ../pkgs_pr/webcomix.nix { })
-  ]
-  ++ builtins.attrValues {
-    inherit (python3Packages)
-      pyyaml
-      types-pyyaml
-      yt-dlp
-      ;
-  };
+    pyyaml
+    types-pyyaml
+    yt-dlp
+    webcomix
+  ];
 }