Merge pull request #14020 from Baughn/dosage

dosage: Init at 2016.03.17

joachifm 59caca43 fba95202

+24
+2
pkgs/top-level/all-packages.nix
··· 874 875 dlx = callPackage ../misc/emulators/dlx { }; 876 877 dpic = callPackage ../tools/graphics/dpic { }; 878 879 dragon-drop = callPackage ../tools/X11/dragon-drop {
··· 874 875 dlx = callPackage ../misc/emulators/dlx { }; 876 877 + dosage = pythonPackages.dosage; 878 + 879 dpic = callPackage ../tools/graphics/dpic { }; 880 881 dragon-drop = callPackage ../tools/X11/dragon-drop {
+22
pkgs/top-level/python-packages.nix
··· 1966 }; 1967 }; 1968 1969 dugong = buildPythonPackage rec { 1970 name = "${pname}-${version}"; 1971 pname = "dugong";
··· 1966 }; 1967 }; 1968 1969 + dosage = buildPythonPackage rec { 1970 + name = "${pname}-${version}"; 1971 + pname = "dosage"; 1972 + version = "2016.03.17"; 1973 + PBR_VERSION = version; 1974 + src = pkgs.fetchFromGitHub { 1975 + owner = "webcomics"; 1976 + repo = "dosage"; 1977 + rev = "1af022895e5f86bc43da95754c4c4ed305790f5b"; 1978 + sha256 = "1bkqhlzigy656pam0znp2ddp1y5sqzyhw3c4fyy58spcafldq4j6"; 1979 + }; 1980 + buildInputs = with self; [ pytest ]; 1981 + propagatedBuildInputs = with self; [ requests2 lxml pbr ]; 1982 + # prompt_toolkit doesn't work on 3.5 on OSX. 1983 + doCheck = !isPy35; 1984 + 1985 + meta = { 1986 + description = "A comic strip downloader and archiver"; 1987 + homepage = http://dosage.rocks/; 1988 + }; 1989 + }; 1990 + 1991 dugong = buildPythonPackage rec { 1992 name = "${pname}-${version}"; 1993 pname = "dugong";