Commit graph

663 commits

Author SHA1 Message Date
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
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
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Frederik Rietdijk
58a65c013d python.bootstrapped-pip: 8.0.2 -> 8.1.1 2016-03-28 13:35:46 +02:00
Domen Kožar
9c274b4bef bootstrapped-pip: support Python 2.6 2016-03-24 15:44:34 +00:00
Domen Kožar
1f649bef47 Merge pull request #13958 from ambrop72/wxpython-fix
wxPython: Fix runtime error due to library dependencies not in RUNPATH.
2016-03-24 12:59:58 +00:00
Corey Farwell
beabbc228c Fetch setuptools from PyPi via HTTPS. 2016-03-22 15:10:08 -04:00
Ambroz Bizjak
e938fbbd10 wxPython: Fix runtime error due to library dependencies not in RUNPATH.
I think what's happening is that the linker automatically adds DT_NEEDED dependencies to some libraries because it finds these libraries are being used directly, but
because they're not linked explicitly with -lflags, the gcc wrapper does not add them to RUNPATH.
2016-03-16 13:13:20 +01:00
宋文武
93feb5d115 drop my maintainership (close #13881) 2016-03-13 18:39:01 +01:00
Vladimír Čunát
09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Nikolay Amiantov
895f51222e buildPythonPackage: add installFlags 2016-02-21 12:20:51 +01:00
Frederik Rietdijk
b0d54e00f9 Merge pull request #13078 from FRidh/matplotlib
pythonPackages: update matplotlib and cycler
2016-02-17 21:15:25 +01:00
Frederik Rietdijk
ddec19c823 pythonPackages.matplotlib: 1.5.0 -> 1.5.1 2016-02-17 21:02:15 +01:00
Vladimír Čunát
e9520e81b3 Merge branch 'master' into staging 2016-02-17 10:06:31 +01:00
Vladimír Čunát
d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00