From a040952a1074f66ded15dcbf4a6b2d13075ba5cf Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Sun, 12 Jan 2025 17:04:09 +0000
Subject: [PATCH 1/2] gallery-dl: 1.28.3 -> 1.28.4

Changelog: https://github.com/mikf/gallery-dl/releases/tag/v1.28.4
Diff: https://github.com/mikf/gallery-dl/compare/v1.28.3...v1.28.4
---
 pkgs/by-name/ga/gallery-dl/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ga/gallery-dl/package.nix b/pkgs/by-name/ga/gallery-dl/package.nix
index 02e14e963a17..5c9d91b42bf6 100644
--- a/pkgs/by-name/ga/gallery-dl/package.nix
+++ b/pkgs/by-name/ga/gallery-dl/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "gallery-dl";
-  version = "1.28.3";
+  version = "1.28.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mikf";
     repo = "gallery-dl";
     rev = "v${version}";
-    hash = "sha256-OV+4BJmJNvkNmDsogI9V7SLmnc5HJkZd5xqsFoZCHEk=";
+    hash = "sha256-bfE3QUu+ytxd4YkWxsnQ3hTEDE1OgJN8zJxSah2u08I=";
   };
 
   build-system = [ python3Packages.setuptools ];

From 7cb48f8223ebe3b36e28115ff694039ad072e83a Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Sun, 12 Jan 2025 19:09:27 +0200
Subject: [PATCH 2/2] gallery-dl: refactor

---
 pkgs/by-name/ga/gallery-dl/package.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ga/gallery-dl/package.nix b/pkgs/by-name/ga/gallery-dl/package.nix
index 5c9d91b42bf6..c0c162d5e324 100644
--- a/pkgs/by-name/ga/gallery-dl/package.nix
+++ b/pkgs/by-name/ga/gallery-dl/package.nix
@@ -1,20 +1,23 @@
 {
   lib,
   fetchFromGitHub,
-  gitUpdater,
+  nix-update-script,
   yt-dlp,
   python3Packages,
 }:
 
-python3Packages.buildPythonApplication rec {
+let
   pname = "gallery-dl";
   version = "1.28.4";
+in
+python3Packages.buildPythonApplication {
+  inherit pname version;
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mikf";
     repo = "gallery-dl";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-bfE3QUu+ytxd4YkWxsnQ3hTEDE1OgJN8zJxSah2u08I=";
   };
 
@@ -43,17 +46,17 @@ python3Packages.buildPythonApplication rec {
 
   pythonImportsCheck = [ "gallery_dl" ];
 
-  passthru.updateScript = gitUpdater { rev-prefix = "v"; };
+  passthru.updateScript = nix-update-script { };
 
   meta = {
+    changelog = "https://github.com/mikf/gallery-dl/blob/v${version}/CHANGELOG.md";
     description = "Command-line program to download image-galleries and -collections from several image hosting sites";
     homepage = "https://github.com/mikf/gallery-dl";
-    changelog = "https://github.com/mikf/gallery-dl/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.gpl2Only;
     mainProgram = "gallery-dl";
-    maintainers = [
-      lib.maintainers.dawidsowa
-      lib.maintainers.lucasew
+    maintainers = with lib.maintainers; [
+      dawidsowa
+      lucasew
     ];
   };
 }