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