Commit graph

93772 commits

Author SHA1 Message Date
Frederik Rietdijk 57e5b78a2a pythonPackages.gevent-websocket: disable python3 2016-10-18 23:14:36 +02:00
Frederik Rietdijk 78f46d23fe knockknock: use python2 2016-10-18 23:14:36 +02:00
Frederik Rietdijk d0bf57ae85 devpi-client: fix 2016-10-18 23:14:36 +02:00
Frederik Rietdijk 727fcd3d2b httpstat: fix it 2016-10-18 23:14:36 +02:00
Frederik Rietdijk ec6f049c09 pythonPackages.pycairo: python.is_py3k was removed 2016-10-18 23:14:36 +02:00
Frederik Rietdijk af11ff4cdd gitfs: use python2 2016-10-18 23:14:35 +02:00
Frederik Rietdijk fc9e2b60b5 lastwatch: use python2 2016-10-18 23:14:35 +02:00
Frederik Rietdijk e9f8ee3ab4 iotop: use python2 2016-10-18 23:14:35 +02:00
Frederik Rietdijk ff069a2aa1 pyrex: use python2 2016-10-18 23:14:35 +02:00
Frederik Rietdijk 0389aa9f7d getmail: use python2 2016-10-18 23:14:35 +02:00
Frederik Rietdijk 1247d6bcbd keybinder: use python2 2016-10-18 23:14:35 +02:00
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