diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2020-11-29 18:16:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-29 18:16:48 +0100 |
| commit | a7573a0d7d6f670f673d48a3988b63fdecb29fb6 (patch) | |
| tree | 6e3f1043821f1f3ef80b8715d7e3528a90228af2 | |
| parent | 3652f50b1f72461118449e66d8888c009b74f079 (diff) | |
| parent | f75cb9301fa594c7641a85fdec1ecafe97f4d86a (diff) | |
Merge pull request #105367 from siraben/gallery-dl-update
gallery-dl: 1.15.2 -> 1.15.4
| -rw-r--r-- | pkgs/applications/misc/gallery-dl/default.nix | 21 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 12 insertions, 11 deletions
diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 8135dce4d7a3e..a93ebb12ed4c0 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -1,27 +1,28 @@ -{ lib, python3Packages }: +{ lib, buildPythonApplication, fetchPypi, requests, pytestCheckHook }: -python3Packages.buildPythonApplication rec { +buildPythonApplication rec { pname = "gallery_dl"; - version = "1.15.2"; + version = "1.15.4"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; - sha256 = "0f2d1ixg0ir7ispxxggv378dc0m55k9y19075swf893maxf07f35"; + sha256 = "0byn1ggrb9yg9d29205q312v95jy66qp4z384kys8cmrd3mky111"; }; - propagatedBuildInputs = with python3Packages; [ requests ]; + propagatedBuildInputs = [ requests ]; - checkInputs = with python3Packages; [ pytestCheckHook ]; + checkInputs = [ pytestCheckHook ]; pytestFlagsArray = [ # requires network access "--ignore=test/test_results.py" "--ignore=test/test_downloader.py" ]; - meta = { + meta = with lib; { description = "Command-line program to download image-galleries and -collections from several image hosting sites"; homepage = "https://github.com/mikf/gallery-dl"; - license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ dawidsowa ]; + license = licenses.gpl2; + maintainers = with maintainers; [ dawidsowa ]; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 681b79afb1bf5..f91b92bb5dd19 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4070,7 +4070,7 @@ in galen = callPackage ../development/tools/galen {}; - gallery-dl = callPackage ../applications/misc/gallery-dl { }; + gallery-dl = python3Packages.callPackage ../applications/misc/gallery-dl { }; gandi-cli = callPackage ../tools/networking/gandi-cli { }; |