From 4c654ddbc062083cb37a7e8ea251b4d434405972 Mon Sep 17 00:00:00 2001 From: toonn Date: Sat, 21 Aug 2021 15:04:25 +0200 Subject: [PATCH] dosage: 2018.04.08 -> 2.17 (#132535) * dosage: 2018.04.08 -> 2.17 I've assumed maintainership of the expression because there was none. Using `fetchPypi` rather than `fetchFromGithub` because the Github tarballs don't contain all the metadata necessary for the installation. * dosage: Use pytestCheckHook rather than py.test * dosage: Re-add test dependencies * dosage: Add setuptools_scm build input * dosage: Add six dependency --- pkgs/applications/graphics/dosage/default.nix | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix index db0012a184be..e5e77dccbbb4 100644 --- a/pkgs/applications/graphics/dosage/default.nix +++ b/pkgs/applications/graphics/dosage/default.nix @@ -1,28 +1,30 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ lib, python3Packages }: python3Packages.buildPythonApplication rec { pname = "dosage"; - version = "2018.04.08"; - PBR_VERSION = version; + version = "2.17"; - src = fetchFromGitHub { - owner = "webcomics"; - repo = "dosage"; - rev = "b2fdc13feb65b93762928f7e99bac7b1b7b31591"; - sha256 = "1p6vllqaf9s6crj47xqp97hkglch1kd4y8y4lxvzx3g2shhhk9hh"; + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "0vmxgn9wd3j80hp4gr5iq06jrl4gryz5zgfdd2ah30d12sfcfig0"; }; - checkInputs = with python3Packages; [ pytest responses ]; - propagatedBuildInputs = with python3Packages; [ colorama lxml requests pbr setuptools ]; + + checkInputs = with python3Packages; [ + pytestCheckHook pytest-xdist responses + ]; + + nativeBuildInputs = with python3Packages; [ setuptools-scm ]; + + propagatedBuildInputs = with python3Packages; [ + colorama imagesize lxml requests setuptools six + ]; disabled = python3Packages.pythonOlder "3.3"; - checkPhase = '' - py.test tests/ - ''; - meta = { description = "A comic strip downloader and archiver"; homepage = "https://dosage.rocks/"; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ toonn ]; }; }