Commit graph

4726 commits

Author SHA1 Message Date
Frederik Rietdijk 3209775495 Merge master into staging 2018-07-22 11:14:41 +02:00
Frederik Rietdijk 6c72782d36 Merge staging-next into master 2018-07-22 11:04:28 +02:00
Frederik Rietdijk 610485faa7 python.pkgs.pytest: setupHook to prevent creation of .pytest-cache folder, fixes #40273
When `py.test` was run with a folder as argument, it would not only
search for tests in that folder, but also create a .pytest-cache folder.
Not only is this state we don't want, but it was also causing
collisions.
2018-07-22 09:45:26 +02:00
Benjamin Hipple bc4c0c4f4d pythonPackages.plaid-python: 2.3.0 -> 2.3.3 (#43905) 2018-07-21 23:09:21 +02:00
Frederik Rietdijk ad47d658d1 Merge master into staging-next 2018-07-21 19:43:53 +02:00
Jörg Thalheim 218298b30f
Merge branch 'master' into unused5 2018-07-21 15:41:22 +01:00
Robert Schütz d7cce082b0 remove unused file 2018-07-21 15:34:08 +02:00
Frederik Rietdijk 251a0a9a86
Merge pull request #43860 from volth/unused2
treewide: remove unused 'inherit' in let blocks
2018-07-21 11:13:36 +02:00
Frederik Rietdijk 7db4c3617f
Merge pull request #43809 from Ma27/fix-python-xgboost
pythonPackages.xgboost: fix build
2018-07-21 11:05:44 +02:00
Frederik Rietdijk 7c8af7e9f9
Merge pull request #43837 from pandaman64/qiskit-0.5.7
qiskit: 0.5.4 -> qiskit 0.5.7
2018-07-21 11:04:53 +02:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
volth 6d2857a311 [bot] treewide: remove unused 'inherit' in let blocks 2018-07-20 19:38:19 +00:00
Frederik Rietdijk 1a6af9f88e
Merge pull request #43857 from volth/unused
[bot] treewide: remove unreferenced code
2018-07-20 21:06:32 +02:00
volth 87f5930c3f [bot]: remove unreferenced code 2018-07-20 18:48:37 +00:00
Will Dietz b97a98e524 python3Packages.zconfig: remove test that relies on setlocale failing 2018-07-20 10:15:55 -05:00
Roger Qiu 5fba38d65c pythonPackages.image-match: init at 1.1.2 2018-07-20 07:53:58 +02:00
Frederik Rietdijk 6ed3ea6e74 python.pkgs.scikitimage: 0.12.3 -> 0.14.0 2018-07-20 07:48:39 +02:00
Frederik Rietdijk 9768a80726 python.pkgs.pywavelets: init at 0.5.2 2018-07-20 07:48:38 +02:00
Frederik Rietdijk 9146271578 python.pkgs.scikitimage: move expression 2018-07-20 07:48:38 +02:00
pandaman64 c7fec43ee8 qasm2image: 0.5.0 -> 0.7.0 2018-07-20 13:01:30 +09:00
pandaman64 e97448f7e0 qiskit: 0.5.4 -> 0.5.7 2018-07-20 13:01:30 +09:00
Frederik Rietdijk 8213ff161c Merge master into staging-next 2018-07-19 18:24:24 +02:00
Maximilian Bosch 88a35d8bb5
pythonPackages.xgboost: fix build
The setup.py of `python-package` contains some path resolution magic to
find `libxgboost.so` which is needed for the python API.

Unfortunately the code is incompatible with Nix as it isn't compatible
with the store-based structure for each package and tries to express the
location of the shared object with relative paths.

The detection in `setup.py` and `xgboost/libpath.py` has been either
removed entirely or patched to link to the proper store path of the
`libxgboost` build input.

See https://hydra.nixos.org/build/77702715 for further reference.
2018-07-19 13:32:25 +02:00
Robert Schütz 8ab563d4df
Merge pull request #43693 from Ma27/remove-flask_cache
Remove `pythonPackages.flask_cache`
2018-07-19 08:06:13 +02:00
Matthew Bauer 4ed7a4b993 treewide: preserve hashes from 76999cc40e
76999cc40e changed some hashes resulting in this PR being technically
a mass rebuild. To avoid this, I am restoring some of the hashes (even
though it seems silly). My main goal is to get this PR merged quickly
as treewide changes like this get out-of-date quickly.

This commit should be reverted on the next mass rebuild.
2018-07-19 00:09:01 -04:00
Matthew Bauer 76999cc40e treewide: remove aliases in nixpkgs
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.

Misc...

- qtikz: use libsForQt5.callPackage

  This ensures we get the right poppler.

- rewrites:

  docbook5_xsl -> docbook_xsl_ns
  docbook_xml_xslt -> docbook_xsl

diffpdf: fixup
2018-07-18 23:25:20 -04:00
Maximilian Bosch 1e454c5045
pythonPackages.graphite_api: move expression
According to the current convention python packages should live in
`pkgs/development/python-modules`. As I altered the `graphite_api`
expression previously in d3d1b88873 I decided to move it as well.

Additionally I applied some minor refactorings:

* use `fetchFromGitHub` instead of `fetchgit`.

* use `checkInputs` for test dependencies

* got rid of fixed points

* applied patch which supports flask-caching to 1.3.1 using `git apply
  -3`
2018-07-19 01:26:35 +02:00
Frederik Rietdijk b3af2cd962
Merge pull request #43694 from Ma27/disable-trezor-python2
pythonPackages.trezor: disable build
2018-07-18 07:18:33 +02:00
Matthew Bauer c0beb48fa7
Merge pull request #43627 from oxij/tree/simplify-depcycles
treewide: simplify some dependency cycles
2018-07-17 21:54:43 -04:00
Shea Levy 711c56dd67
pythonPackages.simpy: init at 3.0.11. 2018-07-17 17:37:50 -04:00
Maximilian Bosch ab418335c2
pythonPackages.trezor: disable build
It seems as recent versions of `trezor` don't work with python 2.x:

```
/build/trezor-0.9.1/dist /build/trezor-0.9.1
Processing ./trezor-0.9.1-py2-none-any.whl
trezor requires Python '>=3.3' but the running Python is 2.7.15
builder for '/nix/store/aqyxki0ckanjk4r1f0an4kj1w4s3kk4f-python2.7-trezor-0.9.1.drv' failed with exit code 1
cannot build derivation '/nix/store/gp4smkzc9r87lzajs17jnq4rh2ayc5q0-python2.7-keepkey-4.0.0.drv': 1 dependencies couldn't be built
```
2018-07-17 23:15:57 +02:00
Frederik Rietdijk 12949bf84a Merge master into staging 2018-07-17 10:05:50 +02:00
Frederik Rietdijk 1ae2f10642 Merge staging-next into master 2018-07-17 10:04:59 +02:00
Jan Malakhovski acbee90e2b pythonPackges.hypothesis, pythonPackages.pytest: simpify dependency cycle fix 2018-07-16 23:16:49 +00:00
Eduard Bopp 2977fb19ca pythonPackages.parsy: init at 1.2.0 2018-07-17 00:14:49 +02:00
Frederik Rietdijk 6d339e5863 Merge staging-next into staging 2018-07-16 17:14:44 +02:00
Frederik Rietdijk 3c09808160 Merge master into staging-next 2018-07-16 07:43:37 +02:00
Will Dietz 4626d0b255 gnomecast: init at 1.4.0
also pycaption, required dep.
2018-07-15 17:45:16 -05:00
Robert Schütz eea1776378
Merge pull request #43544 from dotlambda/drop-backports_ssl_match_hostname_3_4_0_2
python.pkgs.backports_ssl_match_hostname_3_4_0_2: remove
2018-07-16 00:33:47 +02:00
Franz Pletz d34cc21526
Merge pull request #43541 from jfrankenau/update-cura
cura: 3.3.1 -> 3.4.1
2018-07-15 21:45:35 +00:00
Benjamin Hipple dab1b67f9a pythonPackages.aws-adfs: init at 0.12.0 (#43458) 2018-07-15 17:16:32 +02:00
Robert Schütz e82de5730f python.pkgs.altair: fix build 2018-07-15 15:41:23 +02:00
Robert Schütz de0c67572f python.pkgs.vega_datasets: init at 0.5.0 2018-07-15 15:41:23 +02:00
Timo Kaufmann 338f71a338 pythonPackages.cvxopt: re-enable tests (#43566)
This reverts commit 64a64e7483. The issue
was fixed in d2f0fc1f41.
2018-07-15 14:26:33 +02:00
Robert Schütz 18774d4173 Merge branch 'master' into staging 2018-07-15 12:31:18 +02:00
Timo Kaufmann 64a64e7483 pythonPackages.cvxopt: temporarily disable tests (#43564)
The tests have transient failures that will be fixed once staging is
merged.
2018-07-15 12:20:47 +02:00
Robert Schütz fcc747ffa0 python.pkgs.backports_ssl_match_hostname: move expression 2018-07-15 01:29:39 +02:00
Johannes Frankenau 14abd80d1f python.pkgs.uranium: 3.3.0 -> 3.4.1 2018-07-14 22:53:29 +02:00
Johannes Frankenau 3bedaf24f8 python.pkgs.libarcus: 3.3.0 -> 3.4.1 2018-07-14 22:53:19 +02:00
xeji 27eb3c2673
Merge pull request #41934 from teto/cmd2_0.9.1
pythonPackages.cmd2: 0.8.0 -> 0.9.1
2018-07-14 21:50:32 +02:00