diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-13 15:40:13 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-13 16:27:38 +0100 |
| commit | 9978f5ba5e52bea49e464559a943c4f627c79566 (patch) | |
| tree | c85606dff13323abd781e427c900b8585ce0c8fe | |
| parent | 4b51113a6510de044108a914638df42b279f40de (diff) | |
| download | nixpkgs-9978f5ba5e52bea49e464559a943c4f627c79566.tar nixpkgs-9978f5ba5e52bea49e464559a943c4f627c79566.tar.gz nixpkgs-9978f5ba5e52bea49e464559a943c4f627c79566.tar.bz2 nixpkgs-9978f5ba5e52bea49e464559a943c4f627c79566.tar.lz nixpkgs-9978f5ba5e52bea49e464559a943c4f627c79566.tar.xz nixpkgs-9978f5ba5e52bea49e464559a943c4f627c79566.tar.zst nixpkgs-9978f5ba5e52bea49e464559a943c4f627c79566.zip | |
dosage: fix build, use python3
| -rw-r--r-- | pkgs/applications/graphics/dosage/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix index cf5ecfdd043..e26886b070e 100644 --- a/pkgs/applications/graphics/dosage/default.nix +++ b/pkgs/applications/graphics/dosage/default.nix @@ -1,6 +1,6 @@ -{ stdenv, pythonPackages, fetchFromGitHub }: +{ stdenv, python3Packages, fetchFromGitHub }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "dosage"; version = "2018.04.08"; PBR_VERSION = version; @@ -11,10 +11,10 @@ pythonPackages.buildPythonApplication rec { rev = "b2fdc13feb65b93762928f7e99bac7b1b7b31591"; sha256 = "1p6vllqaf9s6crj47xqp97hkglch1kd4y8y4lxvzx3g2shhhk9hh"; }; - checkInputs = with pythonPackages; [ pytest responses ]; - propagatedBuildInputs = with pythonPackages; [ colorama lxml requests pbr ]; + checkInputs = with python3Packages; [ pytest responses ]; + propagatedBuildInputs = with python3Packages; [ colorama lxml requests pbr setuptools ]; - disabled = pythonPackages.pythonOlder "3.3"; + disabled = python3Packages.pythonOlder "3.3"; checkPhase = '' py.test tests/ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c3639c5fe2..f4a035f494b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1575,9 +1575,7 @@ in dokuwiki = callPackage ../servers/web-apps/dokuwiki { }; - dosage = callPackage ../applications/graphics/dosage { - pythonPackages = python3Packages; - }; + dosage = callPackage ../applications/graphics/dosage { }; dozenal = callPackage ../applications/misc/dozenal { }; |