Commit Graph

93761 Commits

Author SHA1 Message Date
Frederik Rietdijk
77dacee416 mesa: use python2
since there is still code that is not compatible with Python 3.x and the
following issue occurs as well
https://bugs.freedesktop.org/show_bug.cgi?id=95338
2016-10-18 23:14:35 +02:00
Frederik Rietdijk
167ca6f93a inginious: use python2 2016-10-18 23:14:34 +02:00
Frederik Rietdijk
e979855566 ansible: use python2 2016-10-18 23:14:34 +02:00
Frederik Rietdijk
1d12d20bcf pythonPackages.consul: broken 2016-10-18 23:14:34 +02:00
Frederik Rietdijk
ba28ce748a pythonPackages.mitmproxy: broken 2016-10-18 23:14:34 +02:00
Frederik Rietdijk
e7834d4ed9 jack2Full: use python2 2016-10-18 23:14:34 +02:00
Frederik Rietdijk
be343cbce4 nvpy: use python2 2016-10-18 23:14:34 +02:00
Frederik Rietdijk
f17f64d203 http-parser: use python2 2016-10-18 23:14:34 +02:00
Frederik Rietdijk
77fa967363 pythonPackages.gyp: disabled on Python 3.x 2016-10-18 23:14:34 +02:00
Frederik Rietdijk
6b05584176 pythonPackages.ofxtools: broken 2016-10-18 23:14:33 +02:00
Frederik Rietdijk
e0e29e249a pythonPackages.gcutil: broken 2016-10-18 23:14:33 +02:00
Frederik Rietdijk
053dd436c9 pythonPackages.pypdf2: disable tests 2016-10-18 23:14:33 +02:00
Frederik Rietdijk
9ab90824d3 bazaarTools: use python2 and refactor expression 2016-10-18 23:14:33 +02:00
Frederik Rietdijk
2c4fbe30fe bazaar: use python 2 2016-10-18 23:14:33 +02:00
Frederik Rietdijk
161df3f276 pythonPackages.thumbor: broken 2016-10-18 23:14:33 +02:00
Frederik Rietdijk
f7b983aeaf grin: use python2 2016-10-18 23:14:33 +02:00
Frederik Rietdijk
b28db671bb pythonPackages.EasyProcess: 0.1.9 -> 0.2.3
- version bump
- rename to upstream name
- disable tests since there aren't any
2016-10-18 23:14:32 +02:00
Frederik Rietdijk
f42a7068da scons: use python2 and refactor expression 2016-10-18 23:14:32 +02:00
Frederik Rietdijk
936bfd23e1 pythonPackages.jaraco_functools: add missing dependency 2016-10-18 23:14:32 +02:00
Frederik Rietdijk
cc1fe56e72 pythonPackages.backports_functools_lru_cache: init at 1.3 2016-10-18 23:14:32 +02:00
Frederik Rietdijk
1c4377034a gobjectIntrospection: use Python 2
because of a TypeError.
2016-10-18 23:14:32 +02:00
Frederik Rietdijk
8e8800884c buildbot: use python2 2016-10-18 23:14:32 +02:00
Frederik Rietdijk
212ce1c3b8 xorg.libxcb: not compatible with Python 3
The following patch is not sufficient.

https://cgit.freedesktop.org/xcb/libxcb/commit/?id=8740a288ca468433141341347aa115b9544891d3
2016-10-18 23:14:32 +02:00
Frederik Rietdijk
47a95edc1e libxml2: use python2 2016-10-18 23:14:31 +02:00
Aneesh Agrawal
95b5d8f752 all-packages: Remove unnecessary python3 overrides
These are unnecessary with Python3 as default Python.
2016-10-18 23:14:31 +02:00
Aneesh Agrawal
708822250e Python 3.x: Add python symlink
Add a symlink for "python" in the python3 derivation to provide a
default Python executable.
2016-10-18 23:14:31 +02:00
Dan Peebles
4f8a1094bd cctools: add patch I forgot 2016-10-17 08:51:48 -04:00
Dan Peebles
e4dba74e8a darwin.stdenv: update MACOSX_DEPLOYMENT_TARGET
No point in claiming we're compatible with a version we don't try to
support, and this will probably help with a few other things elsewhere.
2016-10-16 20:47:43 -04:00
Dan Peebles
ead2424981 cctools: fix triple for the assembler
This was breaking `boost155` and would probably break anything else that
calls `as` with no explicit architecture.
2016-10-16 20:46:36 -04:00
Dan Peebles
b91d64463f Libsystem: update to 10.11.6 version
This actually has no effect but it bugged me to keep seeing an old version
in the package names :) and since we're making a bunch of stdenv changes
at once, I might as well.
2016-10-16 20:44:14 -04:00
Daniel Peebles
1e916de640 Merge pull request #19594 from FRidh/tkinter
Python: no separate output for tkinter but build interpreter twice
2016-10-16 19:28:33 -04:00
Frederik Rietdijk
107c035bf0 Python: remove pythonSmall
In #19309 a separate output for tkinter was added.

Several dependencies of Python depend indirectly on Python. We have the
following two paths:
```
‘python-2.7.12’ - ‘tk-8.6.6’ - ‘libXft-2.3.2’ - ‘libXrender-0.9.10’ -
‘libX11-1.6.4’ - ‘libxcb-1.12’ - ‘libxslt-1.1.29’- ‘libxml2-2.9.4’ -
‘python-2.7.12’

‘python-2.7.12’ - ‘tk-8.6.6’ - ‘libXft-2.3.2’ - ‘fontconfig-2.12.1’ -
‘dejavu-fonts-2.37’ - ‘fontforge-20160404’ - ‘python-2.7.12’
```
Because only `tkinter` needs this, I added
```
pythonSmall = python.override {x11Support = false;};
```
to break the infinite recursion. We also still have the output
`tkinter`.

However, we might as well build without x11Support by default. Then we build with x11Support as well so we get the tkinter module and put that in a separate package.
2016-10-16 14:31:26 +02:00
Frederik Rietdijk
80433e7030 Python: further unify expressions interpreters 2016-10-14 15:52:14 +02:00
Vladimír Čunát
061758490f Merge branch 'master' into staging
... to get the openssl mass rebuild: 942dbf89c.
2016-10-14 13:16:11 +02:00
zimbatm
6351c4d24b Merge pull request #19180 from zimbatm/bundler-env-bins
Bundler env bins
2016-10-14 11:51:23 +01:00
Nikolay Amiantov
7619bea1fe Merge pull request #19544 from kamilchm/blueman
blueman: hicolor_icon_theme dependency
2016-10-14 14:34:50 +04:00
Eelco Dolstra
942dbf89c6 openssl, curl, git: Respect $NIX_SSL_CERT_FILE
$NIX_SSL_CERT_FILE overrides $SSL_CERT_FILE, which in turn overrides
the default CA path (/etc/ssl/certs/ca-certificates.crt). This allows
Nix to set a CA path without interfering with other packages (such as
Homebrew).

See https://github.com/NixOS/nix/issues/921.
2016-10-14 12:06:10 +02:00
Kamil Chmielewski
745b659481 blueman: hicolor_icon_theme dependency 2016-10-14 12:03:04 +02:00
Vladimír Čunát
027efec879 Merge staging without python splitting for now
The split needs more time to finish rebuilding,
but the rest seems OK and there are security fixes.
2016-10-14 09:24:21 +02:00
Vladimír Čunát
e0210d7cbf tested job: fixup evaluation after 5dadc3a
I believe hardcoding system to builtins.currentSystem isn't very good,
as e.g. Hydra surely evaluates on Linux only...
2016-10-14 09:21:38 +02:00
Vladimír Čunát
3eec7ea3f0 gvfs: fix build after update in 0809aeb47f
(cherry picked from commit 56a49e6cda)
2016-10-14 09:11:28 +02:00
Vladimír Čunát
d73646d270 Revert "gtkmm: fix build error by patching missing operator"
This reverts commit 7defda8356.
It breaks the package after update 61c467937b;

(cherry picked from commit 72e0135752)
2016-10-14 09:11:18 +02:00
Jörg Thalheim
fe518a733f Merge pull request #19533 from siddharthist/r-modules/readme-nix-shell
r-modules: add more nix-shell documentation
2016-10-14 09:09:19 +02:00
Daniel Peebles
9615afa04b Merge pull request #19517 from dipinhora/darwin-yosemite-support
Re-enable support for OS X 10.10 for darwin.
2016-10-13 22:46:33 -04:00
Dan Peebles
5dadc3a30c darwin.make-bootstrap-tools: fix for new stdenv setup 2016-10-13 22:32:19 -04:00
Graham Christensen
09e4b78b48 Merge pull request #19507 from grahamc/mb
imagemagick: 6.9.5-10 -> 6.9.6-2 for CVEs (and other fixing from the subsequent breakage.)
2016-10-13 20:37:36 -04:00
Franz Pletz
8435c1637b
gimpPlugins.gap: disable format hardening 2016-10-13 20:33:16 -04:00
Franz Pletz
bb7d270d85
pythonmagick: 0.9.12 -> 0.9.14 2016-10-13 20:33:16 -04:00
Franz Pletz
957a5bdcf3
phpPackages.imagick: 3.4.0RC4 -> 3.4.3RC1
Drops imagick31 as the current version also supports PHP 5.x.
2016-10-13 20:33:16 -04:00
Graham Christensen
241cd0e5db
imagemagick: 6.9.5-10 -> 6.9.6-2 for CVE-2016-7799, CVE-2016-7906 2016-10-13 20:33:10 -04:00