gallery-dl fix

config/overlay.nix

@@ -7,7 +7,11 @@ let
   pkgs = mkpkgs inputs.nixpkgs;
   pkgsU = mkpkgs inputs.nixpkgs-unstable;
 in
-_final: prev: {
+final: prev:
+let
+  jawzScriptsSrc = inputs.jawz-scripts;
+in
+{
   handbrake = prev.handbrake.override { useGtk = true; };
   ripgrep = prev.ripgrep.override { withPCRE2 = true; };
   blender = prev.blender.override { cudaSupport = true; };
@@ -50,6 +54,24 @@ _final: prev: {
       hash = "sha256-RIItbrpkMFglO2NwbgpBhgBSk5+vdywatGVwnbWkNVQ=";
     };
   });
+  python3Packages = prev.python3Packages.override {
+    overrides = pyfinal: _pyprev: {
+      webcomix = prev.python3Packages.callPackage "${jawzScriptsSrc}/pkgs_pr/webcomix.nix" { };
+      download = prev.python3Packages.callPackage "${jawzScriptsSrc}/pkgs/download.nix" {
+        gallery-dl = final.gallery-dl-dev;
+        webcomix = pyfinal.webcomix;
+      };
+    };
+  };
+  gallery-dl-dev = prev.gallery-dl.overrideAttrs (_old: {
+    version = "unstable";
+    src = inputs.gallery-dl-src;
+    meta = prev.gallery-dl.meta // {
+      homepage = "https://github.com/mikf/gallery-dl";
+    };
+  });
+  gallery-dl = final.gallery-dl-dev;
+  download = final.python3Packages.download;
   inherit (pkgsU)
     code-cursor
     symbola
@@ -59,6 +81,5 @@ _final: prev: {
     sillytavern
     open-webui
     codex
-    gallery-dl
     ;
 }

flake.lock

@@ -410,6 +410,22 @@
         "type": "github"
       }
     },
+    "gallery-dl-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1774893445,
+        "narHash": "sha256-pAxYCGOfZvq02Taxs5q2N2WfZodFWfbCSeqWhVPAkj4=",
+        "owner": "mikf",
+        "repo": "gallery-dl",
+        "rev": "f9f9ec97c11f711adca187774efe4891e84123d2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "mikf",
+        "repo": "gallery-dl",
+        "type": "github"
+      }
+    },
     "git-hooks": {
       "inputs": {
         "flake-compat": "flake-compat_2",
@@ -1146,6 +1162,7 @@
         "doom-emacs": "doom-emacs",
         "flake-parts": "flake-parts",
         "fonts": "fonts",
+        "gallery-dl-src": "gallery-dl-src",
         "home-manager": "home-manager",
         "hyprland": "hyprland",
         "jawz-scripts": "jawz-scripts",

flake.nix

@@ -76,6 +76,10 @@
       url = "github:StuffAnThings/qbit_manage";
       flake = false;
     };
+    gallery-dl-src = {
+      url = "github:mikf/gallery-dl";
+      flake = false;
+    };
     synctube = {
       url = "github:RblSb/SyncTube";
       flake = false;

modules/scripts/download/common.nix

@@ -5,7 +5,7 @@
   pkgs,
 }:
 let
-  inherit (inputs.jawz-scripts.packages.x86_64-linux) download;
+  download = pkgs.download;
   gallerySecretsPath = lib.attrByPath [ "sops" "secrets" "gallery-dl/secrets" "path" ] null config;
 in
 {

modules/shell/multimedia/home.nix

@@ -42,6 +42,7 @@ in
         };
         gallery-dl = {
           enable = true;
+          package = pkgs.gallery-dl-dev;
           settings = inputs.self.lib.importDotfile ../../../dotfiles/gallery-dl.nix;
         };
         ${shellType}.initExtra = lib.mkAfter (

parts/packages.nix

@@ -61,7 +61,10 @@
       packages =
         (inputs.jawz-scripts.packages.${system} or { })
         // {
+          download = pkgs.download;
           doom-emacs = portableEmacs.package;
+          gallery-dl = pkgs.gallery-dl;
+          gallery-dl-dev = pkgs.gallery-dl-dev;
           mcp-tests = mcpTests;
           nixos-mcp = nixosMcp;
           nixos-mcp-server = mcpServerPkg;