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
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
96a3bf6cea
pythonPackages.pyqt4: fix name
2016-09-01 17:42:39 +02:00
571ee39714
pythonPackages.pyside: fix evaluation
2016-09-01 17:11:32 +02:00
9a851907a8
pythonPackages.setuptools: 19.4 -> 26.1.1
2016-09-01 16:16:31 +02:00
4f6b6f1472
pythonPackages: use mkPythonDerivation
2016-09-01 16:16:31 +02:00
b080748d42
Python: move python-modules/generic to interpreter folder
2016-09-01 16:16:31 +02:00
8172cd734c
docdev -> devdoc
...
It's "developer documentation", not "documentation developer" after
all.
2016-09-01 11:07:23 +02:00
5af8e4b001
rainbowstream: 1.3.3 -> 1.3.5
2016-08-31 03:02:53 +09:00
57ddc155fc
Merge branch 'master' into staging
...
Conflicts:
pkgs/games/scummvm/default.nix
2016-08-28 12:20:59 +01:00
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
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
3de68a3979
pythonPackages.dbus: missing test dependency
2016-08-26 16:59:27 +02:00
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
0e8d2725dc
Merge branch 'master' into staging
2016-08-23 18:50:06 +01:00
13c04c837d
wrapPython: fix replace of env invokations
2016-08-23 17:55:12 +03:00
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
51ad423716
treewide: Use makeLibraryPath in 'patchelf --set-rpath' calls
2016-08-23 00:04:39 +03:00
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
837cf416ce
wrapPythonProgram: exclude Python itself from PYTHONPATH
2016-08-20 00:42:49 +03:00
4ad459e3e0
wrapPythonProgram: split into several functions
2016-08-20 00:42:49 +03:00
01624e1ac2
wrapPythonProgram: use site.addsitedir instead of PYTHONPATH
2016-08-20 00:42:49 +03:00
3e5bf44aab
sip: 4.14.7 -> 4.18.1, drop unused old version
2016-08-17 20:30:51 +03:00
4b2e1998bb
pyqt4: update flags like in pyqt5
2016-08-17 20:20:35 +03:00
33cabd882f
pythonPackages.pyqt5: 5.5.1 -> 5.6
2016-08-17 20:20:35 +03:00
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
33e1c78ae3
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-08-16 07:54:01 +00:00
9adad8612b
Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"
...
Was meant to go into staging, sorry
This reverts commit 57b2d1e9b0760b2b9048
2016-08-15 19:05:52 -04:00
5b296a1470
Merge branch 'master' into staging
2016-08-15 10:34:28 +03:00
6842a24b21
Remove top-level pyqt4
...
See #11567 .
2016-08-14 12:38:01 +02:00
4fbb37c517
Merge branch 'master' into staging
...
Hydra nixpkgs: ?compare=1287298
2016-08-14 12:02:28 +02:00
3819044de1
Merge #17430 : python: add file encoding to run_setup.py
2016-08-14 11:33:53 +02:00
b7787d932e
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-08-12 09:46:53 +00:00
256394be60
pyqt: propagate python for nix-shell
2016-08-11 17:26:41 +02:00
17e8dda597
Merge pull request #17473 from lancelotsix/add_django_1_10
...
Add django 1.10
2016-08-07 04:08:26 +02:00
1b979d8384
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-08-03 13:34:44 +00:00
af154d1ca6
pythonPackags.django: default from 1_9 to 1_10
2016-08-03 09:20:37 +02:00
21f17d69f6
treewide: Add lots of meta.platforms
...
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
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
0751027b31
wxPython: Disable format hardening
2016-08-02 17:54:42 +02:00
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
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
6628c55986
pythonPackages.scipy: 0.17.1 -> 0.18.0
2016-07-29 17:22:20 +02:00
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
c51b8dc224
pythonPackages.{h5py, h5py-mpi}: simplify expression/assertions
2016-07-19 14:12:13 +02:00
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
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
3afa246038
Merge branch 'staging'
...
This includes a security update of expat.
2016-06-29 07:47:04 +02:00
59c7eb6025
Merge pull request #16476 from aherrmann/matplotlib-tkagg
...
Matplotlib tkagg
2016-06-24 20:41:40 +02:00
ed14f12b89
matplotlib: Add support for the TkAgg backend
...
Fixes #15993
2016-06-24 15:41:46 +02:00
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
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
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 c05d829598f073df60d6
2016-06-23 09:25:10 +02:00
c05d829598
Merge branch 'staging'
2016-06-22 10:49:56 +02:00
12bf38609e
pythonPackages.scipy: remove unused scipy-0.16.1-decorator-fix.patch
2016-06-22 02:13:39 +02:00
8ef747baed
Merge pull request #16334 from artuuge/theano_cudnn
...
Theano-cuda: init at 0.8.2
2016-06-21 14:26:51 +02:00
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
465d6a2113
Theano-cuda: init at 0.8.2
2016-06-20 01:06:07 +02:00
e757404555
Merge branch 'master' into staging
...
Hydra nixpkgs: ?compare=1279790
2016-06-19 12:33:04 +02:00
3ea8068181
buildPythonPackage: be able to disable package conflict check
2016-06-16 11:49:19 +01:00
9f2699fd30
Python: fix the wheel package
2016-06-16 11:36:10 +02:00
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
2f019896d2
Merge pull request #16236 from artuuge/pycuda
...
pycuda: init at 2016.1
2016-06-16 10:45:24 +02:00
bc41a7d551
switch to the default versions of numpy and scipy in libgpuarray-cuda
2016-06-16 00:03:07 +02:00
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
1a55add4ca
enable the tests only for python older than 3.5
2016-06-15 16:24:21 +02:00
be0ade9d03
pycuda: init at 2016.1
2016-06-15 00:47:55 +02:00
d1f38e2adc
make clblas-cuda and libgpuarray-cuda more functorial
2016-06-14 20:01:51 +02:00
cec03a8ecd
Merge #14753 : makeWrapper: allow spaces in variables
2016-06-09 13:09:43 +02:00
93a11d8b0f
libgpuarray-cuda: init at -9998.0
2016-06-05 14:49:45 +02:00
cf32f82b8d
Merge pull request #15764 from FRidh/wxpythoncleanup
...
Python: wxPython cleanup
2016-05-31 10:47:22 +02:00
253634c4ac
pythonPackages.wxPython28: remove package
2016-05-27 21:37:09 +02:00
9597ca718b
pythonPackages.wxPython{28,30} : use buildPythonPackage
2016-05-27 21:25:48 +02:00
69f8016de9
dbus-python: fix build with python-3
...
Also enable checks again.
2016-05-25 09:23:08 +02:00
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
0e54c74911
pythonPackages.pygame-git: init at 2016-05-17
2016-05-23 04:52:11 +03:00
e072200d18
pygame: fix for python 3
2016-05-23 04:38:10 +03:00
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
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
c22f86a853
treewide: Make explicit that 'dev' output of bzip2 is used
2016-05-19 10:00:28 +02:00
b49bf121b8
rename iElectric to domenkozar to match GitHub
2016-05-17 13:00:47 +01:00
bf2834a105
pyexiv2: 0.3.0 -> 0.3.2
2016-05-14 16:12:21 +02:00
c6a61092e7
pythonPackages.sip: let python.buildEnv detect it
2016-05-14 04:29:22 +03:00
38ef2df4a6
pythonPackages.pyqt{,5}: let python.buildEnv detect it
2016-05-14 04:22:50 +03:00
4ed271893f
pythonPackages.pygobject{,3}: let python.buildEnv detect it
2016-05-14 04:04:41 +03:00
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
582fef1299
fix pip URL
2016-05-12 13:55:40 -07:00
5d68baa8db
Python bootstrapped-pip: 8.1.1 -> 8.1.2
2016-05-12 14:27:51 +02:00
6c2fbfbd77
Merge branch 'master' into staging
2016-05-12 04:53:38 +02:00
1d487057e2
Merge pull request #14900 from abbradar/python3-wrap
...
wrapPython: drop python suffixes
2016-05-10 12:22:48 +02:00
3beda443bc
Python: re-enable default testing
...
In 303e976
2016-05-09 18:33:43 +02:00
428db7857e
Merge pull request #15010 from FRidh/format
...
Python: support installing wheels
2016-05-09 14:39:41 +01:00
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
65a9fa8cdc
Merge branch 'master' into staging
2016-05-08 21:24:48 +02:00
ee101d0c7a
Merge pull request #15294 from rardiol/sympy
...
sympy and mathics update
2016-05-07 17:42:17 -04:00
c4cd453c07
pythonPackages.mathics: 0.8 -> 0.9
2016-05-07 12:17:43 -03:00
50b7a542fe
Merge pull request #14983 from adnelson/httpretty_python3
...
httpretty: working build for python3
2016-05-05 21:07:24 +02:00
9820cb1bf2
use dontBuild instead of hacks
...
changes:
* buildPhase = "true"
* buildPhase = ":"
2016-05-04 10:11:04 +00:00
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
d76982e181
Merge pull request #14973 from holidaycheck/update-libuv
...
libuv: 1.7.5 -> 1.9.0
2016-04-28 08:56:31 +00:00
Tuomas Tynkkynen
Karn Kallio
Frederik Rietdijk
Eelco Dolstra
Eric Sagnes
obadz
David Guibert
Shea Levy
Nikolay Amiantov
Robin Gloster
Vladimír Čunát
Domen Kožar
Rok Garbas
Lancelot SIX
Franz Pletz
Bjørn Forsman
Thomas Tuegel
Frederik Rietdijk
Andreas Herrmann
Tobias Geerinckx-Rice
artuuge
Luis Pedro Coelho
Jude Taylor
zimbatm
Benjamin Staffin
Ricardo Ardissone
Joachim Fasting
Alexander Ried
Sander van der Burg