1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Commit graph

32804 commits

Author SHA1 Message Date
Frederik Rietdijk 8fcccec543 qt55: use python2 2016-10-18 23:16:10 +02:00
Frederik Rietdijk 284f22d19e lldb 3.7: use python2
just like llvm 3.7
2016-10-18 23:16:10 +02:00
Frederik Rietdijk e67e4da8c7 pythonPackages.wxPython: don't pass in pythonPackages 2016-10-18 23:16:09 +02:00
Frederik Rietdijk 982ae5f21a libpqxx: use python2 2016-10-18 23:16:08 +02:00
Frederik Rietdijk abaa750207 vigra: use python2 2016-10-18 23:16:07 +02:00
Frederik Rietdijk 2365726ecb spidermonkey_24: use python2 2016-10-18 23:16:06 +02:00
Frederik Rietdijk 7c8b3550b6 spidermonkey_185: use python2 2016-10-18 23:16:06 +02:00
Frederik Rietdijk caac67aabe spidermonkey_31: use python2 2016-10-18 23:16:06 +02:00
Frederik Rietdijk db0df92bbf heimdal: use python2
because of print statement
2016-10-18 23:16:06 +02:00
Frederik Rietdijk 42f0271d32 telepathy_glib: fix building with python3 2016-10-18 23:16:06 +02:00
Frederik Rietdijk ffd81b6c94 libpst: use python2 2016-10-18 23:16:06 +02:00
Frederik Rietdijk 1ce0e2746f libpst: 0.6.63 -> 0.6.68 2016-10-18 23:16:05 +02:00
Frederik Rietdijk e730b15076 gnome_doc_utils: use python2, rewrite expression 2016-10-18 23:16:05 +02:00
Frederik Rietdijk 9b66b5c2cc liblapack: use python2 2016-10-18 23:16:05 +02:00
Frederik Rietdijk ad227648c0 nodejs: use python2 2016-10-18 23:16:05 +02:00
Frederik Rietdijk bd8b0dffae gst_python: use python2
print statement
2016-10-18 23:16:05 +02:00
Frederik Rietdijk aa652d0df7 edk2: use python2
python 2 print statement
2016-10-18 23:16:04 +02:00
Frederik Rietdijk c531ff2fe8 avro-c++: use python2
python 2 print statement
2016-10-18 23:16:04 +02:00
Frederik Rietdijk 9c3fd2c437 zziplib: use python2 2016-10-18 23:16:04 +02:00
Frederik Rietdijk 2a1c4e9322 itstool: use python2
See https://github.com/NixOS/nixpkgs/issues/19631 for a proper fix.
2016-10-18 23:16:03 +02:00
Frederik Rietdijk adbaed0815 llvm 3.7: use python2 2016-10-18 23:16:03 +02:00
Frederik Rietdijk cda8d652f1 webkitgtk: use python2
because of Python 2 print statement.
2016-10-18 23:16:03 +02:00
Frederik Rietdijk 8a1e52b0d2 aubio: use python2 2016-10-18 23:16:03 +02:00
Frederik Rietdijk 635b4fbce8 Python3: also create symlink pkgconfig/python.pc 2016-10-18 23:16:03 +02:00
Frederik Rietdijk a75358c288 ino: 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 ec6f049c09 pythonPackages.pycairo: python.is_py3k was removed 2016-10-18 23:14:36 +02:00
Frederik Rietdijk ff069a2aa1 pyrex: 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 f17f64d203 http-parser: use python2 2016-10-18 23:14:34 +02:00
Frederik Rietdijk f42a7068da scons: use python2 and refactor expression 2016-10-18 23:14:32 +02:00
Frederik Rietdijk 47a95edc1e libxml2: use python2 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
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
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
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 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
Graham Christensen fcd4b7ea58 Merge pull request #19510 from grahamc/nodejs
Nodejs: Upgrades for security patches
2016-10-13 20:26:47 -04:00
Graham Christensen 66f2a01222
nodejs-6_x: 6.7.0 -> 6.8.0 2016-10-13 20:04:24 -04:00
Graham Christensen f9df1b5de0
nodejs: 4.4.6 -> 4.6.0 2016-10-13 20:04:23 -04:00
Langston Barrett 2b300c9bef r-modules: add more environment documentation
Use nix-shell with a `default.nix` rather than using
config.nix
2016-10-13 22:18:16 +00:00
Daniel Peebles 9703a72f70 Merge pull request #19495 from LnL7/darwin-gdb
gdb: disable format hardening
2016-10-13 15:57:19 -04:00
Vladimír Čunát e4d3254101 intltool: fix #19487 patch download
It's strange.  Maybe they prune the history.
2016-10-13 21:55:25 +02:00
Franz Pletz 3b58daf315
libuecc: init at 7 2016-10-13 21:42:16 +02:00