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

merge: fixing changes with nixpkgs since pull-request

Browse Source 
- pytest-timeout: no longer requires patch
 - joblib: was improperly merged with the github merge tool (never
   using again)
This commit is contained in:
Christopher Ostrouchov
2018-09-10 23:09:00 -04:00
committed by Chris Ostrouchov
parent ed130935c8 8ebb27d4a6
commit dac171dd5d
411 changed files with 14656 additions and 8216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/python-modules/pytest-timeout/default.nix
View File

@@ -10,21 +10,11 @@ buildPythonPackage rec {
pname = "pytest-timeout";
version = "1.3.2";
# remove after version 1.3.1
patches = [
(fetchpatch {
name = "fix-installation-27-3-with-encoding-issue.patch";
url = "https://bitbucket.org/pytest-dev/pytest-timeout/commits/9de81d3fc57a71a36d418d4aa181c241a7c5350f/raw";
sha256 = "0g081j6iyc9825f63ssmmi40rkcgk4p9vvhy9g0lqd0gc6xzwa2p";
})
];
src = fetchPypi {
inherit pname version;
sha256 = "1117fc0536e1638862917efbdc0895e6b62fa61e6cf4f39bb655686af7af9627";
};
buildInputs = [ pytest ];
checkInputs = [ pytest pexpect ];
checkPhase = ''pytest -ra'';