diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2016-05-30 11:38:12 +0200 |
---|---|---|
committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2016-05-30 11:38:12 +0200 |
commit | 74b5d2a80263e14d3324399352faa826b57a2e4a (patch) | |
tree | 8b93b532df3c4e9c00ef71deed7d5a2ee5d94fa9 /pkgs | |
parent | ea3f1ff7f06a9546c65ef9ec19a767bdb4633e11 (diff) | |
parent | a65e049ca4eec32295d0d7c2ef079223fab551b6 (diff) | |
download | nixpkgs-74b5d2a80263e14d3324399352faa826b57a2e4a.tar nixpkgs-74b5d2a80263e14d3324399352faa826b57a2e4a.tar.gz nixpkgs-74b5d2a80263e14d3324399352faa826b57a2e4a.tar.bz2 nixpkgs-74b5d2a80263e14d3324399352faa826b57a2e4a.tar.lz nixpkgs-74b5d2a80263e14d3324399352faa826b57a2e4a.tar.xz nixpkgs-74b5d2a80263e14d3324399352faa826b57a2e4a.tar.zst nixpkgs-74b5d2a80263e14d3324399352faa826b57a2e4a.zip |
Merge pull request #15782 from FRidh/pithos
pithos: use Python 3.5
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/audio/pithos/default.nix | 5 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix index ac42fc71642..55b9435baaa 100644 --- a/pkgs/applications/audio/pithos/default.nix +++ b/pkgs/applications/audio/pithos/default.nix @@ -6,8 +6,6 @@ pythonPackages.buildPythonApplication rec { version = "1.1.2"; name = "${pname}-${version}"; - namePrefix = ""; - src = fetchFromGitHub { owner = pname; repo = pname; @@ -15,6 +13,9 @@ pythonPackages.buildPythonApplication rec { sha256 = "0zk9clfawsnwmgjbk7y5d526ksxd1pkh09ln6sb06v4ygaiifcxp"; }; + # No tests in repo + doCheck = false; + postPatch = '' substituteInPlace setup.py --replace "/usr/share" "$out/share" ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63d7f380a2f..7f67c240098 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13784,7 +13784,7 @@ in pidgin-opensteamworks = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks { }; pithos = callPackage ../applications/audio/pithos { - pythonPackages = python34Packages; + pythonPackages = python3Packages; }; pinfo = callPackage ../applications/misc/pinfo { }; |