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
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
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
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