JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dosage: 2016.03.17 -> 2018.04.08

Browse Source 
Dosage works again, but requires Python 3 now. As it is an application,
it was also moved to its own file.
This commit is contained in:
André-Patrick Bubel 2018-04-13 22:10:21 +02:00
parent a415a95e7c
commit 8d61dd8ce3
No known key found for this signature in database
GPG Key ID: 28925CBA8869FF29
3 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/applications/graphics/dosage/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ stdenv, pythonPackages, fetchFromGitHub }:
pythonPackages.buildPythonApplication rec {
name = "${pname}-${version}";
pname = "dosage";
version = "2018.04.08";
PBR_VERSION = version;
src = fetchFromGitHub {
owner = "webcomics";
repo = "dosage";
rev = "b2fdc13feb65b93762928f7e99bac7b1b7b31591";
sha256 = "1p6vllqaf9s6crj47xqp97hkglch1kd4y8y4lxvzx3g2shhhk9hh";
};
buildInputs = [ pythonPackages.pytest ];
propagatedBuildInputs = with pythonPackages; [ colorama lxml requests pbr ];
disabled = pythonPackages.pythonOlder "3.3";
meta = {
description = "A comic strip downloader and archiver";
homepage = http://dosage.rocks/;
};
}

4
pkgs/top-level/all-packages.nix
View File

@ -1120,7 +1120,9 @@ with pkgs;
doitlive = callPackage ../tools/misc/doitlive { };
dosage = pythonPackages.dosage;
dosage = callPackage ../applications/graphics/dosage {
pythonPackages = python3Packages;
};
dpic = callPackage ../tools/graphics/dpic { };

23
pkgs/top-level/python-packages.nix
View File

@ -1221,29 +1221,6 @@ in {
defusedxml = callPackage ../development/python-modules/defusedxml {};
dosage = buildPythonPackage rec {
name = "${pname}-${version}";
pname = "dosage";
version = "2016.03.17";
PBR_VERSION = version;
src = pkgs.fetchFromGitHub {
owner = "webcomics";
repo = "dosage";
rev = "1af022895e5f86bc43da95754c4c4ed305790f5b";
sha256 = "1bkqhlzigy656pam0znp2ddp1y5sqzyhw3c4fyy58spcafldq4j6";
};
buildInputs = with self; [ pytest ];
propagatedBuildInputs = with self; [ requests lxml pbr ];
# prompt_toolkit doesn't work on 3.5 on OSX.
doCheck = !isPy35;
meta = {
description = "A comic strip downloader and archiver";
homepage = http://dosage.rocks/;
broken = true; # ctypes error
};
};
dugong = callPackage ../development/python-modules/dugong {};
iowait = callPackage ../development/python-modules/iowait {};