JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
91,268 Commits 2 Branches 0 Tags 13 GiB
bccd75094f
Commit Graph

758 Commits

Author SHA1 Message Date
Kirill Boltaev
bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03: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