Tim Steinbach
79424a0c7f
Merge pull request #19984 from sternenseemann/license-clash
...
groovy: no easily conflicting files in top-level (#19872 )
2016-11-01 09:09:35 -04:00
Dan Peebles
d0bb7f0c53
ruby: remove unnecessary runtime dependency on groff
2016-10-31 22:16:26 +00:00
sternenseemann
ce90d09404
groovy: no easily conflicting files in top-level ( #19872 )
2016-10-31 10:52:34 +01:00
Dmitry Kalinkin
46dd9dfc52
numpy: enable numpy.distutils patch only if it's also in distutils
...
Fixes: 095095c
('python: add C++ compiler support for distutils')
2016-10-26 21:29:55 +00:00
Vladimír Čunát
1cd7466650
Merge #19800 : fix clisp + xindy -> texlive on Darwin
2016-10-26 21:01:12 +02:00
Frederik Rietdijk
7077a270bf
Merge remote-tracking branch 'upstream/master' into HEAD
2016-10-26 13:06:43 +02:00
Frederik Rietdijk
85a87f5155
mkPythonDerivation: append postFixup, fixes #9204
2016-10-26 10:46:12 +02:00
Frederik Rietdijk
fea23020fe
Merge pull request #19585 from veprbl/distutils_fix
...
python: add C++ compiler support for distutils
2016-10-25 14:16:28 +02:00
Mike Sperber
6f7504d450
clisp: Unbreak on Darwin
...
Clisp depended on libffcall, which does not compile on Darwin. The
dependency is optional though, so omit it on Darwin. Also, make
conditional transitive dependencies on libffcall.
2016-10-25 10:45:46 +02:00
Frederik Rietdijk
3b9d7260a3
python27: add missing parameter
...
that was accidentally removed during merging.
2016-10-22 22:33:15 +02:00
Frederik Rietdijk
e56832d730
Merge remote-tracking branch 'upstream/master' into HEAD
2016-10-22 17:23:24 +02:00
Vladimír Čunát
d26a6a87df
Merge #19450 : python: fix 'nproc not found' on darwin
2016-10-22 16:49:44 +02:00
Graham Christensen
9835b9a943
Merge pull request #19614 from lsix/update_guile_2_0_13
...
guile: 2.0.12 -> 2.0.13 (for CVE)
2016-10-19 21:13:16 -04:00
Dmitry Kalinkin
95237f828b
python: fix 'nproc not found' on darwin
...
Fixes: 58b862b75
('darwin purity: pythonPackages.pandas')
Cc: @pikajude
2016-10-19 19:29:17 -04:00
Periklis Tsirakidis
61ce404598
php: fix pr review comments
2016-10-19 09:35:06 +02:00
Periklis Tsirakidis
b336be90cc
php: fix darwin build
2016-10-19 09:32:06 +02:00
Frederik Rietdijk
2081a69092
pypy: fix build
2016-10-18 23:16:10 +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
635b4fbce8
Python3: also create symlink pkgconfig/python.pc
2016-10-18 23:16:03 +02:00
Frederik Rietdijk
ff069a2aa1
pyrex: use python2
2016-10-18 23:14:35 +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
Franz Pletz
5456d8f007
php70: 7.0.11 -> 7.0.12
...
Fixes some security vulnerabilities:
https://secure.php.net/ChangeLog-7.php#7.0.12
2016-10-18 14:18:04 +02:00
Franz Pletz
0f42ee7c88
php56: 5.6.26 -> 5.6.27
...
Fixes some security vulnerabilities:
https://secure.php.net/ChangeLog-5.php#5.6.27
2016-10-18 14:17:01 +02:00
Dmitry Kalinkin
095095c479
python: add C++ compiler support for distutils
...
This should help with builds against clang
2016-10-17 11:23:13 -04:00
Lancelot SIX
c959cc3d9c
guile: 2.0.12 -> 2.0.13
...
This is a maintenance release on the stable series, containing
security fixes.
It addresses CVE-2016-8606
See http://lists.gnu.org/archive/html/info-gnu/2016-10/msg00009.html
for upstream announcement
2016-10-17 09:44:48 +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
Graham Christensen
85c9f014ed
mujs: 2016-02-22 -> 2016-09-21
2016-10-13 07:42:30 -04:00
Frederik Rietdijk
cffdffe1f6
Merge pull request #19309 from FRidh/outputs
...
Python: use separate output for tkinter
2016-10-13 10:40:14 +02:00
Louis Taylor
39e8623906
Python 3.6: 3.6b1 -> 3.6b2
2016-10-11 22:29:22 +01:00
Frederik Rietdijk
104c50dd1a
Python: remove modules and pythonFull
2016-10-10 10:33:24 +02:00
Frederik Rietdijk
a2720a25b9
Python 3.6: separate output for tkinter
2016-10-10 10:33:24 +02:00
Frederik Rietdijk
0a08fcd858
Python 3.5: separate output for tkinter
2016-10-10 10:33:24 +02:00
Frederik Rietdijk
0bd4b31f87
Python 3.4: separate output for tkinter
2016-10-10 10:33:24 +02:00
Frederik Rietdijk
cf0932ee84
Python 3.3: separate output for tkinter
2016-10-10 10:33:24 +02:00
Frederik Rietdijk
bee439207b
Python 2.7: separate output for tkinter
2016-10-10 10:33:24 +02:00
Jörg Thalheim
8a690b2a9f
Merge pull request #17922 from bjornfor/php-config-file-scan-dir
...
php: change config-file-scan-dir from /etc to /etc/php.d
2016-10-09 21:45:48 +02:00
Vincent Laporte
4168706d4f
OCaml modules: make explicit some dependencies to ocamlbuild
2016-10-09 11:55:19 +02:00
Vladimír Čunát
30f551d8b2
Merge branch 'master' into staging
2016-10-05 19:02:48 +02:00
Peter Hoeg
5a6626f47c
php fpm: add systemd support
...
PHP FPM will now notify systemd when it's done initializing and ready to
serve requests.
Additionally ```systemctl status phpfpm``` will now show statistics such
as:
```
Status: "Processes active: 0, idle: 8, Requests: 0, slow: 0, Traffic: 0req/sec"
```
2016-10-05 23:30:31 +08:00
Jörg Thalheim
888f6a1280
Merge pull request #19199 from wizeman/u/fix-help2man-hash
...
help2man: fix hash
2016-10-03 19:26:44 +02:00
zimbatm
b8bcbec5fd
ruby: fixes rubygems user installs
...
* Manage patches in git
* Fixes the hook invocation to be more safe. Thanks @Mic92
* Install gems as user by default
* Install gem binaries with the /usr/bin/env shebang
* Fixes a bug where the passthru.libPath and passthru.gemPath would
point to the wrong directory
* Overhaul ruby version heuristics
2016-10-02 22:07:22 +01:00
Tuomas Tynkkynen
19225bf5cc
Merge remote-tracking branch 'upstream/master' into staging
2016-10-02 10:36:47 +03:00
Tuomas Tynkkynen
eda2dd3d2f
treewide: Fix more 'lib.optional' misuses
2016-10-02 00:44:10 +03:00
Vladimír Čunát
77604964b6
Merge branch 'master' into staging
2016-09-28 17:13:59 +02:00
Frederik Rietdijk
d5fd65df4e
Merge pull request #18982 from aneeshusa/pin-packages-to-python2-part2
...
Pin packages to python2 part2
2016-09-26 18:33:26 +02:00
Aneesh Agrawal
9ad3c23b39
spidermonkey_17: Pin to Python 2
2016-09-26 11:42:47 -04:00