3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

10 commits

Author SHA1 Message Date
Christopher Ostrouchov dac171dd5d
merge: fixing changes with nixpkgs since pull-request
- pytest-timeout: no longer requires patch
 - joblib: was improperly merged with the github merge tool (never
   using again)
2018-09-11 14:24:59 -04:00
Christopher Ostrouchov ed130935c8
Merge branch 'master' into costrouc/dask-distributed 2018-09-05 23:53:23 -04:00
Frederik Rietdijk 36cd6f2bd5 python: pytest-timeout: 1.3.1 -> 1.3.2 2018-09-01 10:41:37 +02:00
Chris Ostrouchov 7e192a55e7
pythonPackages.pytest-timeout: refactor add python 2.7 compatibiliy
In version 1.3.1 of `pytest-timeout` (latest) the setup.py file is not
compatible with python 2.7 and 3+ due to how `open` is called. A patch
has been added that can be removed once a fix and new relase is given.
2018-08-09 10:46:07 -04:00
Frederik Rietdijk db2545bea7 python: pytest-timeout: 1.3.0 -> 1.3.1 2018-07-26 13:09:42 +02:00
Vladimír Čunát 2059bf9e39
Merge older staging with added firefox-related updates 2018-06-29 21:06:39 +02:00
Ryan Mulligan fce8f26af6 treewide: http -> https (#42665) 2018-06-27 22:12:57 +02:00
Frederik Rietdijk ced21f5e1a pythonPackages: remove name attribute`
The `buildPython*` function computes name from `pname` and `version`.
This change removes `name` attribute from all expressions in
`pkgs/development/python-modules`.

While at it, some other minor changes were made as well, such as
replacing `fetchurl` calls with `fetchPypi`.
2018-06-23 18:14:26 +02:00
Frederik Rietdijk a83e81c59b python: pytest-timeout: 1.2.1 -> 1.3.0 2018-06-22 13:09:44 +02:00
makefu 19ce61d79c
pytest-timeout: init at 1.2.1 2017-12-05 13:31:43 +01:00