From 04ce310ddc698dd4747a335edba17a71148c4d1f Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Sun, 2 Jun 2024 07:40:47 +0900 Subject: [PATCH 1/3] gallery-dl: 1.26.9 -> 1.27.0 Signed-off-by: Ludovico Piero --- pkgs/applications/misc/gallery-dl/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index f89fdbe71a04..4a0837bdbdd8 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -1,24 +1,16 @@ -{ lib, buildPythonApplication, fetchPypi, fetchpatch, requests, yt-dlp, pytestCheckHook }: +{ lib, buildPythonApplication, fetchPypi, requests, yt-dlp, pytestCheckHook }: buildPythonApplication rec { pname = "gallery-dl"; - version = "1.26.9"; + version = "1.27.0"; format = "setuptools"; src = fetchPypi { inherit version; pname = "gallery_dl"; - sha256 = "sha256-PgbfppyJCpgFupBQng8MUPihbDmit4C+xWnSzCJyu5k="; + hash = "sha256-zMimHjaXgwOSt8HbSec4o0y3e9Xf6tFFiI4KzsrP850="; }; - patches = [ - # catch general Exceptions. Remove with the next release. - (fetchpatch { - url = "https://github.com/mikf/gallery-dl/commit/5227bb6b1d62ecef5b281592b0d001e7f9c101e3.patch"; - hash = "sha256-rVsd764siP/07XBPVDnpxMm/4kLiH3fp9+NtpHHH23U="; - }) - ]; - propagatedBuildInputs = [ requests yt-dlp From 7c64f88d0410d11f9010a3aa24e9f97f7896eedf Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Sun, 2 Jun 2024 07:43:45 +0900 Subject: [PATCH 2/3] gallery-dl: format with nixfmt Signed-off-by: Ludovico Piero --- pkgs/applications/misc/gallery-dl/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 4a0837bdbdd8..43e16c241374 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -1,4 +1,11 @@ -{ lib, buildPythonApplication, fetchPypi, requests, yt-dlp, pytestCheckHook }: +{ + lib, + buildPythonApplication, + fetchPypi, + requests, + yt-dlp, + pytestCheckHook, +}: buildPythonApplication rec { pname = "gallery-dl"; @@ -16,9 +23,7 @@ buildPythonApplication rec { yt-dlp ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ # requires network access @@ -29,9 +34,7 @@ buildPythonApplication rec { "--ignore=test/test_ytdl.py" ]; - pythonImportsCheck = [ - "gallery_dl" - ]; + pythonImportsCheck = [ "gallery_dl" ]; meta = with lib; { description = "Command-line program to download image-galleries and -collections from several image hosting sites"; From 01d19622b0a96c74fd4f9dd9cae743d2987151db Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Sun, 2 Jun 2024 07:44:27 +0900 Subject: [PATCH 3/3] gallery-dl: remove `meta = with lib;` Signed-off-by: Ludovico Piero --- pkgs/applications/misc/gallery-dl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 43e16c241374..117257148883 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -36,12 +36,12 @@ buildPythonApplication rec { pythonImportsCheck = [ "gallery_dl" ]; - meta = with lib; { + meta = { 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 = licenses.gpl2Only; + license = lib.licenses.gpl2Only; mainProgram = "gallery-dl"; - maintainers = with maintainers; [ dawidsowa ]; + maintainers = with lib.maintainers; [ dawidsowa ]; }; }