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
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
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
Graham Christensen
85c9f014ed
mujs: 2016-02-22 -> 2016-09-21
2016-10-13 07:42:30 -04:00
Louis Taylor
39e8623906
Python 3.6: 3.6b1 -> 3.6b2
2016-10-11 22:29:22 +01: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
Michael Raskin
05f56082da
lush2: fix update metadata
2016-09-26 15:49:30 +02:00
c74d
87b8465830
chibi-scheme: 0.7 -> 0.7.3
...
Update the `chibi-scheme` (attribute `chibi`) package from version 0.7
to version 0.7.3.
The homepage listed for this package before this change,
<https://code.google.com/p/chibi-scheme/ >, now redirects to
<https://github.com/ashinn/chibi-scheme >; this patch changes this
package to use this GitHub version of the software.
I have tested this change per nixpkgs manual section 10.1 ("Making
patches").
2016-09-26 04:36:33 +00:00
Vladimír Čunát
fffc7638cd
Merge branch 'master' into staging
2016-09-24 18:54:31 +02:00
Daiderd Jordan
306bfa889a
Merge pull request #18869 from couchemar/erlang-r19.1
...
erlang: 19.0.2 -> 19.1
2016-09-24 00:48:38 +02:00
Andrey Pavlov
0a1ae92bb9
erlang: 19.0.2 -> 19.1
2016-09-23 10:20:50 +03:00
Graham Christensen
f01e56e576
php5: 5.6.25 -> 5.6.26 for CVEs ( http://www.php.net/ChangeLog-5.php\#5.6.26 )
2016-09-22 21:36:30 -04:00
Eelco Dolstra
7a4209c356
Merge remote-tracking branch 'origin/master' into staging
2016-09-20 17:46:09 +02:00
Frederik Rietdijk
8c30f3d962
python3.6: 3.6.0a3 -> 3.6.0b1
...
/Lib/plat* has been removed in this release.
http://bugs.python.org/issue28027
2016-09-20 15:48:32 +02:00
Frederik Rietdijk
63ec0068a7
Python on Nix is not manylinux1 compatible
...
Fixes https://github.com/NixOS/nixpkgs/issues/18484
2016-09-20 15:48:32 +02:00
Frederik Rietdijk
2b66563cde
Python: make versions/prefixes more similar
2016-09-20 15:48:32 +02:00
Lancelot SIX
6fe5b7a2e7
Merge pull request #18696 from FRidh/buildenv
...
python.buildenv: don't filter non-python packages
2016-09-19 12:22:53 +02:00
Aaron Bull Schaefer
e067546765
elixir: 1.3.2 -> 1.3.3
2016-09-18 11:07:10 -07:00
Frederik Rietdijk
1dbb72b91a
python.buildenv: don't filter non-python packages
...
python.buildenv is used to build an env that provides binaries that can
import all modules that were passed in to the env.
Before this change it filtered the propagatedBuildInputs to remove all
non-Python packages, thereby possibly reducing the amount of packages
that were referenced. However, Python packages often don't have non-
Python packages as propagatedBuildInputs. And occasionally, we do want
to be able to add other packages to the env.
2016-09-17 14:28:12 +02:00
Vladimír Čunát
52e1a198cf
Merge branch 'master' into staging
2016-09-17 00:31:34 +02:00
Franz Pletz
a32281639e
php70: 7.0.10 -> 7.0.11 (security)
...
See https://secure.php.net/ChangeLog-7.php#7.0.11 .
2016-09-15 13:57:32 +02:00
Herwig Hochleitner
1172c6be9b
pypy: 5.4.0 -> 5.4.1
2016-09-14 18:11:17 +02:00
Nikolay Amiantov
4748709926
Merge commit 'refs/pull/18498/head' of git://github.com/NixOS/nixpkgs
2016-09-13 12:51:34 +03:00
Franz Pletz
fb9117efa6
Merge pull request #18488 from chris-martin/md5-2
...
Miscellaneous packages: Use sha256 instead of md5 (part 2)
2016-09-13 07:11:43 +02:00
Kirill Boltaev
bccd75094f
treewide: explicitly specify gtk and related package versions
2016-09-12 18:26:06 +03:00
Dan Peebles
7b9d3f8605
stdenv-darwin: upgrade a few more things
...
It's a long build and generally painful to split into smaller commits,
so I apologize for lumping many changes into one commit but this is far
easier.
There are still several outdated parts of the darwin stdenv but these
changes should bring us closer to the goal.
Fixes #18461
2016-09-12 01:46:44 -04:00
Chris Martin
c9d609d0e2
lua-4: md5->sha256
2016-09-10 13:57:03 -04: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
Domen Kožar
d7f1af2fba
renpy: fix build after multiple outputs
...
(cherry picked from commit d56bf316556877bf26bf2c2a4b83dcff3ecae161)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-09-09 16:45:30 +02:00
Moritz Ulrich
e57b658049
elixir: 1.3.1 -> 1.3.2
2016-09-08 11:10:27 +02:00
Bjørn Forsman
41c8aa8d63
php: change config-file-scan-dir from /etc to /etc/php.d
...
By chance I noticed that php picked up my /etc/odbc.ini file (clearly
wrong!). This fixes it by adding a namespace for php.
WARNING: This is a breaking change for anyone that happen to rely on php
picking up .ini files from /etc.
2016-09-08 09:40:07 +02:00
Domen Kožar
4c22a048d7
Revert "Revert "xulrunner: Remove""
...
This reverts commit 5041cae5b7
.
This is fixed in follow up commit.
2016-09-07 16:51:38 +02:00
Eelco Dolstra
5041cae5b7
Revert "xulrunner: Remove"
...
This reverts commit 8c3e9ea53e
.
2016-09-07 15:17:39 +02:00
Eelco Dolstra
8c3e9ea53e
xulrunner: Remove
2016-09-07 14:43:29 +02:00
Rahul Gopinath
3b9b8726bd
ruby: 2.1.7 -> 2.1.10
2016-09-06 21:14:00 -07:00