Commit Graph

1176 Commits

Author SHA1 Message Date
Lancelot SIX
8103499e9d
pythonPackages.channels: 1.0.2 -> 1.0.3 2017-02-23 11:00:07 +01:00
davidak
45588a7a7c PyZufall: init at 0.13.2 2017-02-22 22:59:42 +01:00
Frederik Rietdijk
3bcd3d2c34 Merge pull request #23061 from nixy/pythonPackages.snakeviz
pythonPackages.snakeviz: init at 0.4.1
2017-02-22 14:31:26 +01:00
Andrew R. M
99754b2527 pythonPackages.snakeviz: init at 0.4.1 2017-02-22 08:14:53 -05:00
Tom Hunger
bae3d0e49f vowpalwabbit: init at 8.3.2 2017-02-22 07:28:52 +01:00
Johannes Bornhold
87b9ee7680 flake8-blind-except: init at 0.1.1 2017-02-21 10:05:16 +01:00
Johannes Bornhold
c55649ce07 flake8-debugger: init at 1.4.0 2017-02-21 10:05:16 +01:00
Johannes Bornhold
96e1fd6a5a python-stdnum: init at 1.5 2017-02-21 10:05:16 +01:00
Johannes Bornhold
402a6c6dde PyWebDAV: init at 0.9.8 2017-02-21 10:05:16 +01:00
Johannes Bornhold
4518b02c8b simpleeval: init at 0.9.5 2017-02-21 10:05:16 +01:00
Frederik Rietdijk
5bd6331b29 Merge pull request #22944 from johbo/add-trytond
trytond: init at 4.2.1
2017-02-21 08:03:43 +01:00
Johannes Bornhold
79cba3d3ff relatorio: init at 0.6.4 2017-02-20 23:03:04 +01:00
Johannes Bornhold
a2dd4ea7d1 python-sql: init at 0.8 2017-02-20 23:02:04 +01:00
Frederik Rietdijk
dd054e890f Merge pull request #22061 from Mic92/python3-protobuf
python-protobuf: enable python3 and enable py3 tests
2017-02-20 21:17:38 +01:00
Jörg Thalheim
0361776764
pyroute2: 0.4.12 -> 0.4.13 2017-02-19 09:58:13 +01:00
Vladimír Čunát
432dba859e
Merge branch 'staging'
A security update of libxml2 is within.
2017-02-18 08:59:29 +01:00
Daiderd Jordan
8a5c6153d7 Merge pull request #22814 from veprbl/wxpython
wxPython30: fix on darwin
2017-02-17 08:35:39 +01:00
Dmitry Kalinkin
c2a5733654
wxPython: fix on darwin 2017-02-16 18:48:08 -05:00
Vladimír Čunát
e962a3c95f
Merge branch 'master' into staging 2017-02-16 19:02:37 +01:00
Tom Hunger
69363e9611 Move scrapy to its own module and add patch to fix broken permission code.
Scrapy is usually installed via pip where copying all permissions
makes sense. In Nix the files copied are owned by root and
readonly. As a consequence scrapy can't edit the project templates so

  scrapy startproject

fails.
2017-02-16 16:21:46 +00:00
Frederik Rietdijk
397e59b4c9 pythonPackages.Keras: 1.0.3 -> 1.2.2 2017-02-15 12:56:58 +01:00
Frederik Rietdijk
97c3bebd92 tensorflowCuDNN -> tensorflowWithCuda
and move expression
2017-02-15 12:32:44 +01:00
Frederik Rietdijk
a069c16c22 tensorflowNoGpuSupport -> tensorflowWithoutCuda
and move expression
2017-02-15 12:32:44 +01:00
Rahul Gopinath
e69f76470a aenum: Init at 1.4.7 2017-02-15 10:25:37 +01:00
Rahul Gopinath
ce8af120f2 leather: Init at 0.3.3 2017-02-15 10:24:53 +01:00
Frederik Rietdijk
8a4730642f pythonPackages.numba: 0.29.0 -> 0.30.1 2017-02-14 09:23:59 +01:00
Frederik Rietdijk
9ac753323d pythonPackages.llvmlite: 0.14.0 -> 0.15.0 2017-02-14 09:23:59 +01:00
Franz Pletz
04f72ca64c Merge pull request #22740 from Mic92/libasyncns
gajim: use libasyncns as resolver
2017-02-13 15:08:16 +01:00
georgewhewell
99fdc8b651 pythonPackages.matplotlib: re-add Cocoa as buildInput on darwin (#22741) 2017-02-13 15:03:59 +01:00
Jörg Thalheim
b059f63c6e
pythonPackages.libasyncns: init at 0.7.1 2017-02-13 14:11:56 +01:00
Franz Pletz
cf4775571f
poezio: 0.10 -> 0.11 2017-02-12 15:57:39 +01:00
Frederik Rietdijk
1ba17987f7 ansible_2_2: windows support off by default
this was accidentally enabled when moving the expression.
2017-02-11 14:14:07 +01:00
Frederik Rietdijk
8ea925b240 ansible_2_1: windowsSupport off by default 2017-02-11 14:14:07 +01:00
Frederik Rietdijk
9ef6850221 Merge pull request #22344 from lsix/update_netcdf
Update netcdf (including python binding)
2017-02-10 17:22:23 +01:00
Vladimír Čunát
4d18d3bd87
Revert "python-requests2: use system-wide CA bundle"
This reverts commit 768c970c8d.
Moved to staging, as it causes ~16k rebuilds.
2017-02-09 17:24:36 +01:00
Daniel Peebles
7439fe083f Merge pull request #22297 from nand0p/buildbot-0.9.3
buildbot: 0.9.0.post1 -> 0.9.3
2017-02-09 11:15:03 -05:00
Fernando J Pando
6fc34fd48a treq: init 16.12.1
Tested on NixOS unstable
2017-02-09 10:10:51 -05:00
Fernando J Pando
487229654e incremental: init 16.10.1
Tested on NixOS unstable
2017-02-09 10:08:32 -05:00
Peter Simons
768c970c8d python-requests2: use system-wide CA bundle rather than our own
This allows the library to interact gracefully with additional certificates
users might have configured in /etc/ssl/certs/ca-certificates.crt via NixOS.
2017-02-09 15:19:36 +01:00
Franz Pletz
6d0806d061
pythonPackages.searx: 0.10.0 -> 0.11.0 2017-02-08 23:51:02 +01:00
Jascha Geerds
ffb91cc697 docker_compose: Remove upper bound version limitations 2017-02-05 18:39:30 +01:00
Nikolay Amiantov
c226a93a9e pythonPackages.pyqt5: enable qtwebengine support 2017-02-05 15:05:53 +03:00
Frederik Rietdijk
e3f710466f Merge pull request #22325 from lsix/update_pep257
update pythonPackages.pep257
2017-02-03 21:54:26 +01:00
Frederik Rietdijk
8b3db9a0dd pythonPackages.ansible_2_2: use jinja2 2.8.1 2017-02-03 09:54:37 +01:00
Frederik Rietdijk
201a0fe403 pythonPackages.ansible_2_1: use jinja2 2.8.1 2017-02-03 09:54:37 +01:00
Jascha Geerds
888be22aee Merge pull request #22201 from lsix/update_docker_compose
Update docker compose
2017-02-02 00:39:04 +01:00
Lancelot SIX
9d1e203501
pythonPackages.pytest-pep257: 0.0.1 -> 0.0.5 2017-02-01 15:11:45 +01:00
Lancelot SIX
98b602fe3c
pythonPackages.netcdf4: 1.2.4 -> 1.2.7 2017-02-01 14:04:57 +01:00
Lancelot SIX
7680786f90
pythonPackages.pep257: 0.3.2 -> 0.7.0 2017-01-31 22:39:22 +01:00
Frederik Rietdijk
18ac28b45d Merge pull request #22280 from lsix/pytest_defaults_to_30
python*Packages.pytest: defaults to pytest_30
2017-01-31 09:48:38 +01:00
Lancelot SIX
c6c2137a9c
pythonPackages.hypothesis: 3.5.2 -> 3.6.0 2017-01-30 21:15:56 +01:00
Frederik Rietdijk
e4f739fa2f Merge pull request #22003 from lsix/update_matplotlib
pythonPackages.matplotlib: 1.5.3 -> 2.0.0
2017-01-30 18:19:16 +01:00
Lancelot SIX
bf23aaf893
docker_compose: 1.9.0 -> 1.10.0 2017-01-27 12:38:12 +01:00
Lancelot SIX
2aaa39a249
pythonPackages.docker: 1.10.6 -> 2.0.2 2017-01-27 12:38:05 +01:00
Frederik Rietdijk
c42cfa1e91 pythonPackages.ansible_2_1: init at 2.1.4.0 2017-01-27 10:15:31 +01:00
Frederik Rietdijk
46b1ea260a pythonPackages.ansible2: move 2.2 to separate file, make default
`pythonPackages.ansible_2_2` is now the default `ansible`.
2017-01-27 10:15:31 +01:00
Lancelot SIX
86a26322e8
pythonPackages.pytest_30: 3.0.5 -> 3.0.6 2017-01-24 22:13:40 +01:00
Lancelot SIX
18b2c31eaa
pythonPackages.pytest_*: move to pkgs/development/python-modules 2017-01-24 22:13:29 +01:00
Lancelot SIX
b6e5976d4b
pythonPackages.django_guardian: 1.4.4 -> 1.4.6 2017-01-24 22:13:20 +01:00
Lancelot SIX
93d0e4ab5b
pythonPackages.pytestdjango: 2.9.1 -> 3.1.2 2017-01-24 22:13:07 +01:00
Jörg Thalheim
094ac2d9b1
python-protobuf: enable python3 and enable py3 tests
- moved expression out of python-packages
- no significant changes how package is built except the supported
  python versions
2017-01-24 10:31:55 +01:00
Lancelot SIX
43753eafd2 pythonPackages.matplotlib: 1.5.3 -> 2.0.0 2017-01-23 16:48:58 +01:00
schneefux
afb3d5c9cb
pythonPackages.discordpy: 0.16.0 -> 0.16.4 2017-01-21 18:10:10 +01:00
Michael Raskin
5acb6c2cb5 Merge pull request #21991 from layus/fixup-pcsclite
pythonPackages.pcsclite: refactor
2017-01-20 09:31:11 +00:00
Nikolay Amiantov
d75a3cfb29 Merge pull request #21995 from abbradar/opencl
Fix OpenCL support
2017-01-20 12:09:17 +03:00
Nikolay Amiantov
10bae1a207 opencl-icd: remove, point to ocl-icd 2017-01-20 03:37:51 +03:00
Bjørn Forsman
c20062311b Fix evaluation (xmpppy: use correct 'licenses' attr)
CC @Mic92
2017-01-19 20:12:21 +01:00
Jörg Thalheim
6762884a9a
python27Packages.jabberbot: init at 0.16 2017-01-19 19:10:23 +01:00
Jörg Thalheim
1708d4da13
python27Packages.xmpppy: fix ssl socket api 2017-01-19 19:10:16 +01:00
Robin Gloster
9cb67274fc
treewide: fix evaluation
cc @Mic92 @nixy @7c6f434c
2017-01-19 16:50:42 +01:00
Guillaume Maudoux
e735f85c4d pythonPackages.pcsclite: refactor 2017-01-19 15:20:54 +01:00
Jörg Thalheim
805e6804b1 Merge pull request #21873 from Mic92/python-packages
Dependencies for realms-wiki
2017-01-19 12:23:30 +01:00
Jon Meredith
d9340971d9 Add yubioath-desktop application and required pyscard module to support it 2017-01-18 19:13:31 -08:00
Jörg Thalheim
17c457e47b
pythonPackages.twill: init at 0.9.1 2017-01-18 18:26:32 +01:00
Jörg Thalheim
3b44782026
pythonPackages.flask_wtf: init at 0.14.2 2017-01-18 18:26:31 +01:00
Jörg Thalheim
5da2caab63
pythonPackages.flask_testing: init at 0.6.1 2017-01-18 18:26:31 +01:00
Jörg Thalheim
b9e0da457a
pythonPackages.ghdiff: init at 0.4 2017-01-18 18:26:30 +01:00
Jörg Thalheim
f957ce45c4
pythonPackages.flask_oauthlib: init at 0.9.3 2017-01-18 18:26:30 +01:00
Jörg Thalheim
b3bef109c2
pythonPackages.flask-ldap-login: init at 0.3.0 2017-01-18 18:26:30 +01:00
Jörg Thalheim
c065c400e9
pythonPackages.flask_elastic: init at 0.2 2017-01-18 18:26:29 +01:00
Jörg Thalheim
0b3d711fc4
pythonPackages.flask_login: enable python3 tests 2017-01-18 18:26:29 +01:00
Jörg Thalheim
1094e948bf
pythonPackages.markdown2: 2.3.0 -> 2.3.1 2017-01-18 18:26:28 +01:00
Jörg Thalheim
1f5b7484a3
pythonPackages.gunicorn: 19.1.0 -> 19.3.0 2017-01-18 18:26:28 +01:00
Jörg Thalheim
bbe73c77c1
pythonPackages.dulwich: 0.14.0 -> 0.14.1 2017-01-18 18:26:28 +01:00
Jörg Thalheim
c6c5ed15ab
pythonPackages.requests_oauthlib: 0.4.1 -> 0.7.0 2017-01-18 18:26:27 +01:00
Jörg Thalheim
14a65c5ecd
pythonPackages.ldap: 2.4.19 -> 2.4.22 2017-01-18 18:26:27 +01:00
Jörg Thalheim
1f6ca0f37b
pythonPackages.bcrypt: 3.1.0 -> 3.1.2 2017-01-18 18:26:26 +01:00
Jörg Thalheim
8d67d5689c
pyroute2: init at 0.4.12 2017-01-14 10:12:20 +01:00
Frederik Rietdijk
87e67cb4e5 pythonPackages.yenc: init at 0.4.0 2017-01-11 18:12:32 +01:00
Daiderd Jordan
826d6aa6cd Merge pull request #21382 from johbo/darwin-pygtk-quartz-backend
Darwin gtk2/pygtk quartz backend
2017-01-08 00:18:33 +01:00
schneefux
96504cd75c pythonPackages.discordpy: 0.15.1 -> 0.16 2017-01-07 20:02:05 +02:00
Johannes Bornhold
8f7adffe4d pygtk: Add flag -ObjC for darwin
Had to add this so that it was able to parse the headers from the frameworks.
2017-01-07 17:35:09 +01:00
Frederik Rietdijk
3b7193604f pythonPackages.pycrypto: dummy depending on pycryptodome, closes #21671 2017-01-05 11:01:07 +01:00
Franz Pletz
fe9373460c
pythonPackages.pycrypto: add patch to fix CVE-2013-7459
cc #21642
2017-01-05 06:40:43 +01:00
Vladimír Čunát
9d09bc6728
Merge branch 'master' into staging 2016-12-29 13:56:16 +01:00
Frederik Rietdijk
2da75adc5d pythonPackages.pygame-git: broken 2016-12-26 09:21:24 +01:00
Vladimír Čunát
3829d1c17f
Merge branch 'master' into staging
There's been a mass rebuild on master due to python2 update.
2016-12-26 08:42:19 +01:00
Frederik Rietdijk
8916131012 pythonPackages.xlwt: fix patch hash 2016-12-25 16:37:51 +01:00
Frederik Rietdijk
426b2ed9c8 pythonPackages.u-msgpack-python: use python.interpreter 2016-12-25 16:17:33 +01:00
Frederik Rietdijk
9f5e022663 pythonPackages.pytest_expect: init at 1.1.0 2016-12-25 11:12:53 +01:00
Frederik Rietdijk
c1dd42e7d6 pythonPackages.webencodings: init at 0.5 2016-12-25 11:12:53 +01:00
Frederik Rietdijk
bec4794820 pythonPackages.u-msgpack-python: init at 2.3.0 2016-12-25 11:12:53 +01:00
Frederik Rietdijk
3d455ac934 pythonPackages.xlwt: 1.0.0 -> 1.1.2 2016-12-25 10:42:41 +01:00
Frederik Rietdijk
5319587d87 pythonPackages.pandas: 0.19.1 -> 0.19.2 2016-12-25 10:42:41 +01:00
Frederik Rietdijk
d4c7f58301 pythonPackages.numpy: 1.11.2 -> 1.11.3
Furthermore, we fix f2py and use NOSE_EXCLUDE to disable tests.
2016-12-24 12:07:33 +01:00
Vladimír Čunát
86e4c9ed46
Merge branch 'master' into staging 2016-12-17 20:29:25 +01:00
Frederik Rietdijk
f412c87390 Merge pull request #21076 from schneefux/pkg.discordpy
pythonPackages.discordpy: init at 0.15.1
2016-12-14 22:05:44 +01:00
schneefux
0f97f71525
pythonPackages.discordpy: init at 0.15.1 2016-12-14 19:13:52 +01:00
schneefux
64d0c0ec1e
pythonPackages.websockets: init at 3.2 2016-12-14 19:10:14 +01:00
Frederik Rietdijk
c4104539e0 pythonPackages.async_timeout: init at 1.1.0 2016-12-11 20:07:24 +01:00
Frederik Rietdijk
826649ddf4 pythonPackages.multidict: init at 2.1.4 2016-12-11 20:07:24 +01:00
Frederik Rietdijk
7a538938a0 pythonPackages.yarl: init at 0.8.1 2016-12-11 20:07:24 +01:00
Frederik Rietdijk
879a98bf27 pythonPackages.pycairo: fix name 2016-12-10 14:38:09 +01:00
Frederik Rietdijk
47d4575255 pythonPackages.setuptools: 28.8.0 -> 30.2.0 2016-12-05 17:33:21 +01:00
Frederik Rietdijk
4162623460 pythonPackages.cython: 0.24.1 -> 0.25.1 2016-12-03 16:09:37 +01:00
Frederik Rietdijk
74276caf19 koji -> pythonPackages.koji
koji is both a library and an application. It is used in Nixpkgs
primarily as a library and therefore I move it.
2016-12-01 21:07:33 +01:00
Frederik Rietdijk
07dcc4f43a pythonPackages.Theano: move and rename variants
We have two derivations, one that supports Cuda, and one that does not.
The names, TheanoWithCuda and TheanoWithoutCuda, now reflect that.
Furthermore, a boolean passthru.cudaSupport was added.

In the future the two derivations should be merged in one, with a
parameter `cudaSupport`.
2016-11-30 10:04:54 +01:00
Tuomas Tynkkynen
8a4d6516ee Merge remote-tracking branch 'upstream/staging' into master 2016-11-30 00:34:23 +02:00
Andreas Herrmann
44177794d2 matplotlib: Fix "attribute ‘tkinter’ missing"
`tkinter` is not part of `python`, but of `pythonPackages`.
2016-11-28 18:02:35 +01:00
Eric Sagnes
d0e8117ccb rainbowstream: 1.3.5 -> 1.3.6 2016-11-27 11:37:20 +09:00
Vladimír Čunát
925b335607
Merge branch 'master' into staging 2016-11-26 11:27:09 +01:00
Rok Garbas
b09435ea51 pythonPackages.magic-wormhole: enable tests 2016-11-26 04:55:28 +01:00
Frederik Rietdijk
18637d877a magic-wormhole: move to python-packages
since it is actually a library.
2016-11-25 09:13:01 +01:00
Frederik Rietdijk
51645f8f47 Merge pull request #20675 from carlsverre/update/mopidy-gmusic
mopidy-gmusic: 1.0.0 -> 2.0.0
2016-11-25 08:59:56 +01:00
Carl Sverre
99e6b63199 pycryptodome: init at 3.4.3 2016-11-24 14:38:46 -08:00
Frederik Rietdijk
bde10a9b79 pythonPackages.pyside: fix name 2016-11-24 22:28:04 +01:00
Alexey Lebedeff
7e3176bca2 blivet: Remove unneccesary patching
Fixes https://github.com/NixOS/nixops/issues/552

`--cache` argument is now mandatory for `pvscan` both from hetzner rescue
system and from nixpkgs.
2016-11-24 14:13:26 +03:00
Vladimír Čunát
b69f568f4c
Merge branch 'staging'
Hydra rebuild looks fine; only a few Darwin jobs is queued:
http://hydra.nixos.org/eval/1304891?compare=1304807
2016-11-19 04:35:51 +01:00
Thomas Tuegel
b32a1c7244 Merge pull request #20428 from ttuegel/multiple-outputs-gtk
Use multiple outputs for gtkmm and friends
2016-11-18 09:16:34 -06:00
Vladimír Čunát
8b565d6478
Merge #20081: update alsa lib, plugins and utils 2016-11-17 11:26:00 +01:00
Vladimír Čunát
5af7b82336
Merge branch 'master' into staging
To incorporate some larger security rebuilds (jasper).
2016-11-17 11:14:05 +01:00
Lancelot SIX
f7558d07df
poezio: 0.9 -> 0.10 2016-11-16 15:01:43 +01:00
Thomas Tuegel
cec1241677
pygobject3: multiple outputs 2016-11-15 07:16:08 -06:00
Vladimír Čunát
b5e89fe9bf
Merge branch 'master' into staging 2016-11-15 00:20:19 +01:00
Frederik Rietdijk
27a6d61881 pythonPackages.pip: 8.1.2 -> 9.0.1 2016-11-15 00:05:56 +01:00
Frederik Rietdijk
d83d2ba4f3 pythonPackages.setuptools: 26.1.1 -> 28.8.0 2016-11-15 00:05:56 +01:00
Frederik Rietdijk
e23724dc96 pythonPackages.reikna: init at 0.6.7 2016-11-14 12:31:05 +01:00
Frederik Rietdijk
05ca19c679 pythonPackages.pycuda: 2016.1 -> 2016.1.2
and disable tests because they require an available cuda device.
2016-11-14 12:31:05 +01:00
Frederik Rietdijk
6435a85c3f pythonPackages.numba: 0.27.0 -> 0.29.0
and move expression in a separate file.
2016-11-14 12:31:05 +01:00
Frederik Rietdijk
dc1b2ed11f pythonPackages.llvmlite: 0.13.0 -> 0.14.0
and move expression in separate file.
2016-11-14 12:31:05 +01:00
Frederik Rietdijk
6c7d501a7b pythonPackages.pyopencl: init at 2016.2 2016-11-14 12:31:05 +01:00
Lancelot SIX
8617a068b8 pythonPackages.mezzanine: Fix template project
This makes sure that the template project can be used and updated.
Otherzise files copied from the store stay readonly and cannot be
updated during the generation process.
2016-10-31 16:38:45 +01:00
Dmitry Kalinkin
46dd9dfc52 numpy: enable numpy.distutils patch only if it's also in distutils
Fixes: 095095c ('python: add C++ compiler support for distutils')
2016-10-26 21:29:55 +00:00
Frederik Rietdijk
fea23020fe Merge pull request #19585 from veprbl/distutils_fix
python: add C++ compiler support for distutils
2016-10-25 14:16:28 +02:00
Frederik Rietdijk
e56832d730 Merge remote-tracking branch 'upstream/master' into HEAD 2016-10-22 17:23:24 +02:00
Frederik Rietdijk
321e073629 Python: bootstrapped-pip: use python.libPrefix in name
See 4de7cbdf04
2016-10-21 14:04:16 +02:00
Vladimír Čunát
4d5b893002 Merge #19081: gnome-3.22
Also master commits are brought in.
2016-10-20 23:04:10 +02:00
Vladimír Čunát
4de7cbdf04 pythonPackages.pip: do not name it python-*
Fixes #19691.  Feel free to find a beter naming.
2016-10-20 17:59:31 +02:00
Frederik Rietdijk
e67e4da8c7 pythonPackages.wxPython: don't pass in pythonPackages 2016-10-18 23:16:09 +02:00
Frederik Rietdijk
ec6f049c09 pythonPackages.pycairo: python.is_py3k was removed 2016-10-18 23:14:36 +02:00
Dmitry Kalinkin
e4574a54d4
cython: disable tests that fail when built against libc++ 2016-10-17 11:23:13 -04:00
Dmitry Kalinkin
095095c479
python: add C++ compiler support for distutils
This should help with builds against clang
2016-10-17 11:23:13 -04:00
Alexander Ried
b03d1996cd pygobject: 3.20.0 -> 3.22.0 2016-10-15 20:32:10 +02:00
Frederik Rietdijk
104c50dd1a Python: remove modules and pythonFull 2016-10-10 10:33:24 +02:00
Lancelot SIX
f910a4e638 pythonPackages.matplotlib: 1.5.1 -> 1.5.3 2016-10-08 23:14:07 +02:00
Profpatsch
23913912c3 searx: fix pyopenssl version
Also remove the old postPatch substitutions (the patch does those).
2016-10-04 15:26:39 +02:00
Frederik Rietdijk
11d7e93624 Merge pull request #19078 from FRidh/pypoppler
pythonPackages.pypoppler: init at 0.12.2
2016-10-01 11:10:40 +02:00
Frederik Rietdijk
f0155e8d70 pythonPackages.pypoppler: init at 0.12.2 2016-10-01 11:10:02 +02:00
Martin Bornhold
3c88d3a9c4 flake8: add patch to avoind pytest config conflict 2016-09-30 14:12:49 +02:00
Asko Soukka
724cf2099e
pythonPackages: zc.buildout-nix: 2.5.0 -> 2.5.3 2016-09-29 11:50:28 +03:00
Frederik Rietdijk
93eb9c6428 pythonSexy -> pythonPackages.libsexy 2016-09-26 11:10:50 +02:00
Frederik Rietdijk
941ee1ba6e pystringtemplate -> pythonPackages.pystringtemplate
and use buildPythonPackage
2016-09-25 22:41:26 +02:00
Frederik Rietdijk
a441efcccc pythonPackages.breathe: disable for Python 3.x 2016-09-25 22:02:28 +02:00
Profpatsch
51314631d6 searx: 0.9.0 -> 0.10.0 (#18608)
With a patch to loosen up searx pip dependency requirements.
Also includes a minor version bump of pysocks.
2016-09-15 17:48:51 +02:00
Nikolay Amiantov
4748709926 Merge commit 'refs/pull/18498/head' of git://github.com/NixOS/nixpkgs 2016-09-13 12:51:34 +03:00
Franz Pletz
fb9117efa6 Merge pull request #18488 from chris-martin/md5-2
Miscellaneous packages: Use sha256 instead of md5 (part 2)
2016-09-13 07:11:43 +02:00
Kirill Boltaev
bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Chris Martin
316f5e8608 pythonPackages.rhpl: md5->sha256 2016-09-10 14:04:49 -04:00
Chris Martin
5ee369902f pythonPackages.breathe: md5->sha256 2016-09-10 14:03:58 -04:00
Frederik Rietdijk
f6ccecefd9 Merge pull request #18025 from knedlsepp/fix-python3.5-jupyter-1.0.0
python3.5-jupyter: Fix build issue #17902
2016-09-10 11:28:48 +02:00
Kamil Chmielewski
e4d62926d6 python27Packages.cairocffi: FIX test_scaled_font
workaround for https://github.com/Kozea/cairocffi/issues/88

(cherry picked from commit 9e18b81dedec6d06f5bdfc80c26f281f1b07a2d1)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-09-09 16:16:53 +02:00
Michael Raskin
16ce4fa511 pythonPackages.pyqt4: actually use dbus-python to build dbus.mainloop.qt; fixes ffadoFull build 2016-09-07 17:32:52 +02:00
Josef Kemetmueller
d12de90e1c pyqt: Fix darwin build 2016-09-04 13:02:53 +02:00
Josef Kemetmueller
717c76716f pygobject3: Add missing dependencies (for darwin)
The packages "which" and "ncurses" are needed for building pygobject3
(on darwin) during the checkPhase. The ncurses library is necessary only
because python3.5 is currently built using "-lncurses" and pygobject3
wants the same libraries that python3.5 was compiled with. (Because it
uses "python3.5-config --ldflags" during the build)
2016-09-04 10:46:04 +02:00
Jörg Thalheim
3ab7bfeb30
pygtk: fix broken symlink
${pygobject.name} now contains a python2- prefix resulting
in a broken symlink. this breaks pygtk and every depending application
2016-09-04 09:42:23 +02:00
Joachim F
e3659cbd53 Merge pull request #18136 from ericsagnes/pkg-update/rainbowstream
rainbowstream: 1.3.3 -> 1.3.5
2016-09-03 17:19:17 +02:00
Vladimír Čunát
fcc76325ef pyqt*: fixup build to close #18250
I don't know why the builder uses `lndir ${dbus-python} $out`,
but this commit should work around the problem caused by
dbus-python starting to propagate some inputs.
2016-09-03 17:13:42 +02:00
Tuomas Tynkkynen
e2c6740c37 Merge commit 'adaee73' from staging into master
This one was already merged into release-16.09, so let's not have the
stable branch is ahead of master and confuse things. In addition to
that, currently we have an odd situation that master has less things
actually finished building than in staging.

Conflicts:
	pkgs/data/documentation/man-pages/default.nix
2016-09-03 01:02:51 +03:00
Karn Kallio
ce3daae51a pygobject
In the pygobject package of pythonPackages the codegen python files are
executable and get wrapped, which causes pygtk to not build because it
uses the python program to execute them.  The attached patch makes them
not executable so they do not get wrapped and cause pygtk to fail its
build.

From 931b7998658fa72323c9a76e7b336fe726a9cc61 Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkallio@skami.org>
Date: Fri, 2 Sep 2016 15:30:42 -0400
Subject: [PATCH] pygobject: prevent wrapping of codegen/*.py files.
2016-09-02 15:58:24 -04:00
Frederik Rietdijk
96a3bf6cea pythonPackages.pyqt4: fix name 2016-09-01 17:42:39 +02:00
Frederik Rietdijk
571ee39714 pythonPackages.pyside: fix evaluation 2016-09-01 17:11:32 +02:00
Frederik Rietdijk
9a851907a8 pythonPackages.setuptools: 19.4 -> 26.1.1 2016-09-01 16:16:31 +02:00
Frederik Rietdijk
4f6b6f1472 pythonPackages: use mkPythonDerivation 2016-09-01 16:16:31 +02:00
Frederik Rietdijk
b080748d42 Python: move python-modules/generic to interpreter folder 2016-09-01 16:16:31 +02:00
Eelco Dolstra
8172cd734c docdev -> devdoc
It's "developer documentation", not "documentation developer" after
all.
2016-09-01 11:07:23 +02:00
Eric Sagnes
5af8e4b001 rainbowstream: 1.3.3 -> 1.3.5 2016-08-31 03:02:53 +09:00
obadz
57ddc155fc Merge branch 'master' into staging
Conflicts:
	pkgs/games/scummvm/default.nix
2016-08-28 12:20:59 +01:00
David Guibert
dfb3707dab h5py: 2.5.0 -> 2.6.0
Tests are broken in 2.5.0 (errors when executing "cythonize()"), not in
version 2.6.0.
2016-08-28 11:42:21 +02:00
obadz
3de6e5be50 Merge branch 'master' into staging
Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix
2016-08-27 23:54:54 +01:00
Frederik Rietdijk
3de68a3979 pythonPackages.dbus: missing test dependency 2016-08-26 16:59:27 +02:00
Shea Levy
8b9b9fad31 Revert "Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs""
Revert a revert of a merge that shouldn't have been in master but was intentionally in staging.

Next time I'll do this right after the revert instead of so far down the line...

This reverts commit 9adad8612b.
2016-08-24 07:35:30 -04:00
obadz
0e8d2725dc Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
Nikolay Amiantov
13c04c837d wrapPython: fix replace of env invokations 2016-08-23 17:55:12 +03:00
Tuomas Tynkkynen
a18ee4acb7 treewide: Make explicit that 'dev' output of boost is used
Also fix one incorrect output in geant.
2016-08-23 04:32:21 +03:00
Tuomas Tynkkynen
51ad423716 treewide: Use makeLibraryPath in 'patchelf --set-rpath' calls 2016-08-23 00:04:39 +03:00
obadz
24a9183f90 Merge branch 'hardened-stdenv' into staging
Closes #12895

Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
2016-08-22 01:19:35 +01:00
Nikolay Amiantov
837cf416ce wrapPythonProgram: exclude Python itself from PYTHONPATH 2016-08-20 00:42:49 +03:00
Nikolay Amiantov
4ad459e3e0 wrapPythonProgram: split into several functions 2016-08-20 00:42:49 +03:00
Nikolay Amiantov
01624e1ac2 wrapPythonProgram: use site.addsitedir instead of PYTHONPATH 2016-08-20 00:42:49 +03:00
Nikolay Amiantov
3e5bf44aab sip: 4.14.7 -> 4.18.1, drop unused old version 2016-08-17 20:30:51 +03:00
Nikolay Amiantov
4b2e1998bb pyqt4: update flags like in pyqt5 2016-08-17 20:20:35 +03:00
Nikolay Amiantov
33cabd882f pythonPackages.pyqt5: 5.5.1 -> 5.6 2016-08-17 20:20:35 +03:00
Frederik Rietdijk
5a501bd828 Remove top-level dbus_python and pythonDBus.
See #11567.

Furthermore, it renames pythonPackages.dbus to pythonPackages.dbus-
python as that's the name upstream uses.

There is a small rebuild but I couldn't figure out the actual cause.
2016-08-16 22:52:37 +02:00
Robin Gloster
33e1c78ae3 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-16 07:54:01 +00:00
Shea Levy
9adad8612b Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"
Was meant to go into staging, sorry

This reverts commit 57b2d1e9b0, reversing
changes made to 760b2b9048.
2016-08-15 19:05:52 -04:00
Nikolay Amiantov
5b296a1470 Merge branch 'master' into staging 2016-08-15 10:34:28 +03:00
Frederik Rietdijk
6842a24b21 Remove top-level pyqt4
See #11567.
2016-08-14 12:38:01 +02:00
Vladimír Čunát
4fbb37c517 Merge branch 'master' into staging
Hydra nixpkgs: ?compare=1287298
2016-08-14 12:02:28 +02:00
Vladimír Čunát
3819044de1 Merge #17430: python: add file encoding to run_setup.py 2016-08-14 11:33:53 +02:00
Robin Gloster
b7787d932e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00
Domen Kožar
256394be60 pyqt: propagate python for nix-shell 2016-08-11 17:26:41 +02:00
Rok Garbas
17e8dda597 Merge pull request #17473 from lancelotsix/add_django_1_10
Add django 1.10
2016-08-07 04:08:26 +02:00
Robin Gloster
1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Lancelot SIX
af154d1ca6
pythonPackags.django: default from 1_9 to 1_10 2016-08-03 09:20:37 +02:00
Tuomas Tynkkynen
21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen
2258b21e4b treewide: Add lots of platforms to packages with no meta
Build-tested on x86_64 Linux and on Darwin.
2016-08-02 21:17:44 +03:00
Franz Pletz
0751027b31 wxPython: Disable format hardening 2016-08-02 17:54:42 +02:00
Frederik Rietdijk
8fad3e81b0 pythonPackages.setuptools: specify priority
Both python3 and setuptools come with easy-install. For some magic
reason this hasn't caused any collisions yet, but it does with #17428.
We hereby prioritize the version that comes with setuptools.
2016-08-02 12:23:15 +02:00
Bjørn Forsman
b6153c8f9c python: add file encoding spec to run_setup.py
Newer 'mutagen' versions have a test suite that trips over missing
encoding in this file. The file is copied to source trees at build time
with the name nix_run_setup.py.
2016-08-02 01:00:26 +02:00
Frederik Rietdijk
6628c55986 pythonPackages.scipy: 0.17.1 -> 0.18.0 2016-07-29 17:22:20 +02:00
Thomas Tuegel
d130c27c62 pyqt5: run configure hooks
Fixes #17045.

Whenever a phase is overridden, the pre- and post-hooks for that phase
must be invoked!
2016-07-19 12:36:09 -05:00
Frederik Rietdijk
c51b8dc224 pythonPackages.{h5py, h5py-mpi}: simplify expression/assertions 2016-07-19 14:12:13 +02:00
Vladimír Čunát
b732af00bb pythonPackages.breathe: init at 4.2.0
It seems to work OK, but I'm not good at packaging python stuff.
2016-07-08 14:54:44 +02:00
Frederik Rietdijk
def310df45 pythonPackages.setuptools: fix for use in buildEnv
pythonPath needs to be set for it to be included in buildEnv.
This will also fix tox.
2016-07-02 23:44:10 +02:00
Vladimír Čunát
3afa246038 Merge branch 'staging'
This includes a security update of expat.
2016-06-29 07:47:04 +02:00
Frederik Rietdijk
59c7eb6025 Merge pull request #16476 from aherrmann/matplotlib-tkagg
Matplotlib tkagg
2016-06-24 20:41:40 +02:00
Andreas Herrmann
ed14f12b89 matplotlib: Add support for the TkAgg backend
Fixes #15993
2016-06-24 15:41:46 +02:00
Andreas Herrmann
616f846894 matplotlib: Don't search in global paths
Sets the `basedirlist` option in setup.cfg such that distutils does not search
for headers and libraries in `/usr`, and `/usr/local`.

Otherwise the build can fail on non-NixOS machines, see #15993.
2016-06-24 12:09:56 +02:00
Vladimír Čunát
6b27ceb006 Merge 'master' into staging and re-revert merge
... from staging to master, reverted temporarily in aa9a04883e.
2016-06-23 12:09:03 +02:00
Vladimír Čunát
aa9a04883e Revert "Merge branch 'staging'" due to glibc
The main output started to retain dependency on bootstrap-tools; see
https://github.com/NixOS/nixpkgs/pull/15867#issuecomment-227949096

This reverts commit c05d829598, reversing
changes made to f073df60d6.
2016-06-23 09:25:10 +02:00
Vladimír Čunát
c05d829598 Merge branch 'staging' 2016-06-22 10:49:56 +02:00
Tobias Geerinckx-Rice
12bf38609e
pythonPackages.scipy: remove unused scipy-0.16.1-decorator-fix.patch 2016-06-22 02:13:39 +02:00
Frederik Rietdijk
8ef747baed Merge pull request #16334 from artuuge/theano_cudnn
Theano-cuda: init at 0.8.2
2016-06-21 14:26:51 +02:00
Bjørn Forsman
bd01fad0ed Captialize meta.description of all packages
In line with the Nixpkgs manual.

A mechanical change, done with this command:

  find pkgs -name "*.nix" | \
      while read f; do \
          sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
      done

I manually skipped some:

* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
2016-06-20 13:55:52 +02:00
artuuge
465d6a2113 Theano-cuda: init at 0.8.2 2016-06-20 01:06:07 +02:00
Vladimír Čunát
e757404555 Merge branch 'master' into staging
Hydra nixpkgs: ?compare=1279790
2016-06-19 12:33:04 +02:00
Domen Kožar
3ea8068181 buildPythonPackage: be able to disable package conflict check 2016-06-16 11:49:19 +01:00
Frederik Rietdijk
9f2699fd30 Python: fix the wheel package 2016-06-16 11:36:10 +02:00
Frederik Rietdijk
fde378480c Merge pull request #16252 from luispedro/shiboken_on_py35
shiboken: add support for Python 3.5
2016-06-16 10:49:00 +02:00
Frederik Rietdijk
2f019896d2 Merge pull request #16236 from artuuge/pycuda
pycuda: init at 2016.1
2016-06-16 10:45:24 +02:00
artuuge
bc41a7d551 switch to the default versions of numpy and scipy in libgpuarray-cuda 2016-06-16 00:03:07 +02:00
Luis Pedro Coelho
26ef210da2 shiboken: add support for Python 3.5
Development upstream is stalled, but this is a trivial patch.
2016-06-15 23:18:34 +02:00
artuuge
1a55add4ca enable the tests only for python older than 3.5 2016-06-15 16:24:21 +02:00
artuuge
be0ade9d03 pycuda: init at 2016.1 2016-06-15 00:47:55 +02:00
artuuge
d1f38e2adc make clblas-cuda and libgpuarray-cuda more functorial 2016-06-14 20:01:51 +02:00
Vladimír Čunát
cec03a8ecd Merge #14753: makeWrapper: allow spaces in variables 2016-06-09 13:09:43 +02:00
artuuge
93a11d8b0f libgpuarray-cuda: init at -9998.0 2016-06-05 14:49:45 +02:00
Frederik Rietdijk
cf32f82b8d Merge pull request #15764 from FRidh/wxpythoncleanup
Python: wxPython cleanup
2016-05-31 10:47:22 +02:00
Frederik Rietdijk
253634c4ac pythonPackages.wxPython28: remove package 2016-05-27 21:37:09 +02:00
Frederik Rietdijk
9597ca718b pythonPackages.wxPython{28,30} : use buildPythonPackage 2016-05-27 21:25:48 +02:00
Vladimír Čunát
69f8016de9 dbus-python: fix build with python-3
Also enable checks again.
2016-05-25 09:23:08 +02:00
Vladimír Čunát
0b192a0976 Merge branch 'master' into staging
That's to get mesa rebuild from master, as it's nontrivial.
2016-05-23 09:02:10 +02:00
Nikolay Amiantov
0e54c74911 pythonPackages.pygame-git: init at 2016-05-17 2016-05-23 04:52:11 +03:00
Nikolay Amiantov
e072200d18 pygame: fix for python 3 2016-05-23 04:38:10 +03:00
Vladimír Čunát
bd757c656e dbus-python: 1.2.0 -> 1.2.4
Despite the version change, the NEWS seem pretty big.
2016-05-22 12:10:42 +02:00
Vladimír Čunát
c4661e9643 Merge: make dev output references explicit
This is a rebase of most commits from #14766,
resolving conflicts and a few other evaluation problems.
2016-05-22 12:09:23 +02:00
Tuomas Tynkkynen
c22f86a853 treewide: Make explicit that 'dev' output of bzip2 is used 2016-05-19 10:00:28 +02:00
Domen Kožar
b49bf121b8 rename iElectric to domenkozar to match GitHub 2016-05-17 13:00:47 +01:00
Tobias Geerinckx-Rice
bf2834a105
pyexiv2: 0.3.0 -> 0.3.2 2016-05-14 16:12:21 +02:00
Nikolay Amiantov
c6a61092e7 pythonPackages.sip: let python.buildEnv detect it 2016-05-14 04:29:22 +03:00
Nikolay Amiantov
38ef2df4a6 pythonPackages.pyqt{,5}: let python.buildEnv detect it 2016-05-14 04:22:50 +03:00
Nikolay Amiantov
4ed271893f pythonPackages.pygobject{,3}: let python.buildEnv detect it 2016-05-14 04:04:41 +03:00
Vladimír Čunát
3e387c3e00 Merge branch 'staging'
Darwin isn't in a perfect state, in particular its bootstrap tools won't
build which will block nixpkgs channel. But on the whole it seems
acceptable.
2016-05-13 10:14:53 +02:00
Jude Taylor
582fef1299 fix pip URL 2016-05-12 13:55:40 -07:00
Frederik Rietdijk
5d68baa8db Python bootstrapped-pip: 8.1.1 -> 8.1.2 2016-05-12 14:27:51 +02:00
Vladimír Čunát
6c2fbfbd77 Merge branch 'master' into staging 2016-05-12 04:53:38 +02:00
Frederik Rietdijk
1d487057e2 Merge pull request #14900 from abbradar/python3-wrap
wrapPython: drop python suffixes
2016-05-10 12:22:48 +02:00
Frederik Rietdijk
3beda443bc Python: re-enable default testing
In 303e976 default testing of setuptools packages was accidentally
disabled.
2016-05-09 18:33:43 +02:00
zimbatm
428db7857e Merge pull request #15010 from FRidh/format
Python: support installing wheels
2016-05-09 14:39:41 +01:00
Frederik Rietdijk
303e976245 Python: allow installing wheels
By passing `format="wheel"` it is now possible to install a wheel.
It's not recommended, but it can be useful.
2016-05-09 13:17:42 +02:00
Vladimír Čunát
65a9fa8cdc Merge branch 'master' into staging 2016-05-08 21:24:48 +02:00
Benjamin Staffin
ee101d0c7a Merge pull request #15294 from rardiol/sympy
sympy and mathics update
2016-05-07 17:42:17 -04:00
Ricardo Ardissone
c4cd453c07 pythonPackages.mathics: 0.8 -> 0.9 2016-05-07 12:17:43 -03:00
Joachim Fasting
50b7a542fe Merge pull request #14983 from adnelson/httpretty_python3
httpretty: working build for python3
2016-05-05 21:07:24 +02:00
Robin Gloster
9820cb1bf2 use dontBuild instead of hacks
changes:
 * buildPhase = "true"
 * buildPhase = ":"
2016-05-04 10:11:04 +00:00
Alexander Ried
cf82611351
pycairo: enable for python35
The patch was taken from FreeBSD, it is also used on debian. see:
https://svnweb.freebsd.org/ports/head/graphics/py3-cairo/files/pycairo-1.10.0-waf-py3_5.patch?revision=401900&view=markup
2016-04-29 02:32:03 +02:00
Sander van der Burg
d76982e181 Merge pull request #14973 from holidaycheck/update-libuv
libuv: 1.7.5 -> 1.9.0
2016-04-28 08:56:31 +00:00
Tobias Pflug
c893105f1f pyuv: 0.11.5 -> 1.2.0 2016-04-27 12:25:22 +02:00
Frederik Rietdijk
d5e6a4494a Python: use PyPI mirror (#15001)
* mirrors: add pypi

* Python: Use pypi mirror for all PyPI packages
2016-04-26 13:38:03 +01:00
Allen Nelson
db3ffaa8f0 httpretty: working build for python3 2016-04-25 12:01:05 -05:00
Frederik Rietdijk
f2f7ec3f97 Revert "pythonPackages.numpy: don't propagate blas"
This reverts commit 983f300d74.
2016-04-25 18:20:01 +02:00
Frederik Rietdijk
443ac8970d Revert "pythonPackages.scipy: don't propagate blas"
This reverts commit d05783a8d7.
2016-04-25 18:19:50 +02:00
Frederik Rietdijk
14b704c842 Merge pull request #14975 from FRidh/pythonblas
Python: don't propagate blas
2016-04-25 18:00:36 +02:00
Frederik Rietdijk
d05783a8d7 pythonPackages.scipy: don't propagate blas 2016-04-25 17:46:15 +02:00
Frederik Rietdijk
983f300d74 pythonPackages.numpy: don't propagate blas 2016-04-25 17:46:06 +02:00
Tiago de Paula Peixoto
d1d779fcbc graph-tool: 2.12 -> 2.16 (#14848)
* graph-tool: 2.12 -> 2.16

* graph-tool: Use correct upstream source

* graph-tool: Use correct hash
2016-04-25 12:37:18 +02:00
Frederik Rietdijk
bb13afea6c pyatspi: call via pythonPackages 2016-04-23 14:32:06 +02:00
Nikolay Amiantov
97e4c19fca wrapPython: drop python suffixes 2016-04-22 20:57:15 +03:00
Nikolay Amiantov
c161258003 pyqt5: move to qmakeHook
This reverts commit f1c2572479.
2016-04-20 18:55:53 +03:00
Vladimír Čunát
57474b7d4a Merge branch 'master' into staging
Compare to Hydra nixpkgs job 1260021.
2016-04-20 16:49:52 +02:00
Damien Cassou
4d968dd416 pygobject: 3.18.2 -> 3.20.0 2016-04-20 16:45:59 +02:00
José Romildo Malaquias
9f44ad975b pygobject: fix some warnings 2016-04-16 00:23:57 -03:00
Marius Bakke
28919e5bfa wrapPythonPrograms: preserve quoted strings from makeWrapperArgs
Currently, if a user tries to to set a variable that contains
spaces, it will be broken up before being passed to wrapProgram.

This commit resolves that by converting makeWrapperArgs to an
array that preserves any quoted elements using bash's parser.
2016-04-16 02:58:02 +01:00
aszlig
f5ec09842d
pygame: Fix build with multiple outputs
The config.py script doesn't seem to cope very well with symlinks, so
let's pass it the right derivation outputs wherever possible and fall
back to drv.out.

I've disabled the tests because they somehow now seem to cause the build
to fail even though the tests failed *before* the merge of the
closure-size branch, but the whole build didn't fail regardless.

Here is a build from before the closure-size branch merge:

http://hydra.nixos.org/build/34367296

If you have a look at the build log, you already see a bunch of failing
tests (to be exact: the same set of tests that are failing now with the
fix of the preConfigure phase).

Other than that, the build now succeeds on my machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:35:11 +02:00
aszlig
f1c2572479
pyqt5: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of pyqt5 override
the whole configurePhase, so this hook isn't run at all.

This fixes the build of pyqt5 and it now successfully compiles on my
machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
Vladimír Čunát
30f14243c3 Merge branch 'master' into closure-size
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Frederik Rietdijk
dddafe61eb Merge pull request #14498 from expipiplus1/python-cgkit
pythonPackages.cgkit: init at 2.0.0
2016-04-09 11:51:15 +02:00
Joe Hermaszewski
a4e7cc58bb pythonPackages.cgkit: init at 2.0.0 2016-04-06 15:31:04 +01:00
Profpatsch
c03c2acc93 pythonPackages/yolk: init at 0.4.3 2016-04-04 02:52:41 +02:00
Graham Christensen
65efc9ee2e pythonPackages.sphinx: 1.3.4 -> 1.3.6 2016-04-02 10:10:38 +02:00