JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
110,506 Commits 2 Branches 0 Tags 12 GiB
ceff05aa4f
Commit Graph

2548 Commits

Author SHA1 Message Date
Frederik Rietdijk
d33f6f4032 Python 3.6: use system expat and ffi 2017-02-26 14:51:26 +01:00
Frederik Rietdijk
1531b5edd2 Python 3.6: improve determinism 2017-02-26 14:51:26 +01:00
Frederik Rietdijk
14a88e76cf Python 3.5: use system expat and ffi 2017-02-26 14:50:09 +01:00
Frederik Rietdijk
dd3a501a4b Python: mkPythonDerivation: use PYTHONHASHSEED=0 2017-02-26 14:50:09 +01:00
Frederik Rietdijk
8970a9c86e Python 3.5: improve determinism 
- Windows installers are indeterministic and we don't need them.
- since Python 3 ensurepip is installed by default. pip is indeteministic and we don't need it.
- rebuild bytecode to ensure its deterministic
 2017-02-26 14:50:09 +01:00
Frederik Rietdijk
09f6b03b2e Python 2.7: improve determinism 
There is some randomness in the Windows installers. Since we don't need
them, we delete them.
 2017-02-26 14:50:09 +01:00
Bart Brouns
4bb14b23ab supercollider: 3.7.2 -> 3.8.0 2017-02-26 14:21:21 +01:00
Vladimír Čunát
2f1945dcd3
python-3.6: fix random numbers with glibc-2.25 
I missed this upstream patch. /cc #22874.
 2017-02-22 17:34:33 +01:00
Vladimír Čunát
cab0b445be
python-3.4: fixup with glibc-2.25 (/cc #22874) 
Upstream won't support it, but let me trick the code into behaving
as if glibc was older.  It seems 3.3 branch should be unaffected.
 2017-02-21 17:56:32 +01:00
Vladimír Čunát
5a38ab8add
Merge branch 'master' into staging 2017-02-20 21:24:35 +01:00
Vladimír Čunát
2cb76ff1ff
Merge branch 'glibc-2.25' into staging 
The largest problem-causers should be fixed now (within).
 2017-02-20 21:18:48 +01:00
Nikolay Amiantov
7cbe538e94 pythonPackages.wrapPython: fix for paths with spaces 2017-02-19 01:43:12 +03:00
Franz Pletz
78abfe951b
php71: 7.1.1 -> 7.1.2 2017-02-18 14:50:16 +01:00
Franz Pletz
405e117d31
php70: 7.0.15 -> 7.0.16 2017-02-18 14:49:59 +01:00
Vladimír Čunát
110f136dc2
python*: upstream patches to fix with glibc-2.25 
https://bugs.python.org/issue29157
The 3.6 release already contains the fix (from 3.5);
the branches in-between are claimed to be unaffected.
/cc #22874.
 2017-02-16 23:13:38 +01:00
Vladimír Čunát
62ca214d4a
guile: fix include path in guile-2.0.pc 
I forgot to /cc maintainer @civodul about the output-splitting.
 2017-02-14 11:22:29 +01:00
Frederik Rietdijk
12285d162c pypy: inherit pythonVersion 2017-02-14 09:23:59 +01:00
Vladimír Čunát
218713aa3d
guile*: split outputs to fix #22757 
The main aim is to decouple propagatedBuildInputs from $out.
 2017-02-14 00:14:41 +01:00
Vladimír Čunát
0c524c63c6
guile: refactor expression 
No rebuild on non-Solaris.
 2017-02-13 23:01:46 +01:00
Frederik Rietdijk
c2e2a4d2c5 Python: remove 2.6 2017-02-13 14:42:24 +01:00
Michael Raskin
b2fcf9fec5 love_0_10: 0.10.1 -> 0.10.2 2017-02-13 12:49:31 +01:00
Graham Christensen
b793d69f12 Merge pull request #22537 from vrthra/jimtcl-0.77 
jimtcl: 0.76 -> 0.77
 2017-02-12 18:58:14 -05:00
Rahul Gopinath
36d6a3041a jimtcl: 0.76 -> 0.77 2017-02-11 11:33:33 -08:00
Joachim F
5627dd27b9 Merge pull request #22540 from vrthra/rakudo-star-2017.01 
rakudo-star: 2016.07 -> 2017.01
 2017-02-11 19:48:37 +01:00
Vladimír Čunát
6bea415b5e
Merge branch 'master' into staging 2017-02-09 08:42:04 +01:00
Frederik Rietdijk
b846a53d2a python34: 3.4.5 -> 3.4.6 2017-02-08 20:48:14 +01:00
Frederik Rietdijk
939f426906 python35: 3.5.2 -> 3.5.3 2017-02-08 20:48:14 +01:00
Rahul Gopinath
b09215bed5 rakudo-star: 2016.07 -> 2017.01 2017-02-07 16:58:14 -08:00
Vladimír Čunát
a2c867fd39
Merge branch 'staging' 2017-02-04 21:02:46 +01:00
Vladimír Čunát
94a7a80f0b
Revert "spidermonkey_24: remove" 
This reverts commit 5dacc53af3.
 2017-02-04 11:53:23 +01:00
Pascal Wittmann
ef3fc82fc4
mujs: 2016-11-30 -> 2017-01-24 2017-02-03 19:42:14 +01:00
Vladimír Čunát
adab4cd58b
Merge branch 'master' into staging 2017-02-03 11:47:38 +01:00
Frederik Rietdijk
50bc1dc0df Merge pull request #22345 from NixOS/python-wip 
Python package updates and new fetchers
 2017-02-02 11:04:32 +01:00
Vladimír Čunát
a2e7770b51
Merge branch 'master' into staging 
There have been some larger security rebuilds on master.
 2017-02-01 15:56:35 +01:00
Frederik Rietdijk
7b6b7f6b78 Python Flit: run tests by default 2017-02-01 14:54:20 +01:00
Shea Levy
73f07ecb28 nix-exec: 4.1.5 -> 4.1.6 
Closes #22316
 2017-01-31 12:02:46 -05:00
Nikolay Amiantov
db99892817 treewide: quote homepages in my packages 2017-01-31 03:27:10 +03:00
Vladimír Čunát
9cd2dbc569
Merge branch 'master' into staging 
Hopefully this will fix the mass abortion on Hydra;
restarting the jobs didn't help.
 2017-01-30 18:39:36 +01:00
Rahul Gopinath
19180957f5 ruby_1_9: remove package 
Remove ruby 1.9 since it is EOLed upstream
 2017-01-30 11:18:44 +00:00
Rahul Gopinath
51dc13b148 ruby: cleanup unneeded files 2017-01-30 11:18:01 +00:00
Tuomas Tynkkynen
424cfe7686 Merge remote-tracking branch 'upstream/master' into staging 2017-01-29 02:16:29 +02:00
Tuomas Tynkkynen
4d059f6f27 spidermonkey_17: Add one more patch for Aarch64 2017-01-29 01:34:02 +02:00
Karn Kallio
9027474b7e racket 6.8 
The attached patch advances the version of the racket expression in
nixpkgs to the latest released 6.8 version.

From 815aae487d5ed4b70145ebadc03a5bd040a8a829 Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkallio@skami.org>
Date: Fri, 27 Jan 2017 22:55:18 -0400
Subject: [PATCH] racket: advance to the 6.8 latest released version.
 2017-01-27 22:01:57 -05:00
Robin Gloster
edef570ad7
clooj: fix download 2017-01-27 20:09:49 +01:00
Tuomas Tynkkynen
be0e48e48f Merge remote-tracking branch 'upstream/master' into staging 2017-01-27 02:18:44 +02:00
Tuomas Tynkkynen
e2a2f6d595 Merge pull request #22117 from dezgeg/aarch64-for-merge 
Aarch64 (ARM64) support
 2017-01-26 17:52:28 +02:00
Vladimír Čunát
6973c7739e
Merge branch 'master' into staging 
There were some larger rebuilds because of security.
 2017-01-26 16:49:41 +01:00
Robin Gloster
5dacc53af3
spidermonkey_24: remove 2017-01-25 20:12:42 +01:00
Robin Gloster
d3cd8b1d58
spidermonkey_1_8_5: add patch to fix build with gcc6 2017-01-25 20:12:39 +01:00
Robin Gloster
cb30150bd5
php: fix build in case mysql is not mariadb 
fixes #20986
 2017-01-25 18:11:38 +01:00
Nathan Zadoks
15b6374918 spidermonkey_17: add AArch64 support patch 2017-01-25 00:01:54 +02:00
Frederik Rietdijk
e33bc13349 Merge pull request #22086 from timbertson/pip-stderr 
buildPythonPackage: send pip output to stderr
 2017-01-24 11:20:53 +01:00
Tim Cuthbertson
7af2d3d6e2 buildPythonPackage: send pip output to stderr 2017-01-24 21:08:42 +11:00
Charles Strahan
d298a961f1 Merge pull request #21416 from cstrahan/mesos-1.1.0 
mesos: 1.0.1 -> 1.1.0
 2017-01-21 19:05:18 -05:00
Pascal Wittmann
487f2cfef8
groovy: 2.4.7 -> 2.4.8 2017-01-21 23:40:13 +01:00
Michael Raskin
e5acde0cf4 php71: 7.1.0 -> 7.1.1 
@NixOS/security-notifications (for all three updates)

Relevant to #21967
 2017-01-20 11:54:44 +01:00
Michael Raskin
ff5ef7d052 php70: 7.0.14 -> 7.0.15 2017-01-20 11:54:34 +01:00
Michael Raskin
35fdfd88d4 php56: 5.6.29 -> 5.6.30 2017-01-20 11:54:03 +01:00
schneefux
a7f25fe167 php: add embedded package 2017-01-19 22:47:10 +01:00
Robin Gloster
9cb67274fc
treewide: fix evaluation 
cc @Mic92 @nixy @7c6f434c
 2017-01-19 16:50:42 +01:00
Michael Raskin
90e7568bfc Merge pull request #21973 from nixy/init/hy 
hy: init at 0.11.1
 2017-01-19 09:32:09 +00:00
Andrew R. M
b8acb928cc hy: init at 0.11.1 
This is the hy language, a dialect of lisp designed to be closely
intergrated with python.
 2017-01-18 09:32:59 -05:00
Moritz Ulrich
666810cd25
elixir: 1.3.3 -> 1.4.0 2017-01-14 20:30:57 +01:00
Eric Bailey
ad3e589c6d
erlangR19: 19.1.6 -> 19.2 
Include sw_vers patch as discussed on #21775.
 2017-01-11 01:43:56 -06:00
Nikolay Amiantov
41b69a09b6 spidermonkey_{31,38}: fix sed problem with build 2017-01-10 01:30:11 +03:00
Pascal Wittmann
655db9b266
ceptre: 2016-01-01 -> 2016-11-27 2017-01-09 21:36:36 +01:00
Jörg Thalheim
90ea0c000c
octave: 4.0.3 -> 4.2.0 2017-01-08 23:40:40 +01:00
Frederik Rietdijk
a3018650a3 Merge pull request #21643 from symphorien/python-tix 
Python tix module
 2017-01-04 20:51:33 +01:00
Symphorien Gibol
a6e3d71361 python: support the tkinter.tix module 2017-01-04 19:39:33 +01:00
Daiderd Jordan
27660cfdc0
Merge branch 'master' into staging 2017-01-04 01:42:26 +01:00
Daiderd Jordan
538d1b688a stdenv: bootstrap cmake and python on darwin 2017-01-03 18:01:47 +01:00
Michael Raskin
6565d7f12e angelscript: 2.31.1 -> 2.31.2 2017-01-02 20:18:51 +01:00
Herwig Hochleitner
09f66a7457 pypy: 5.4.1 -> 5.6.0 2017-01-02 13:41:28 +01:00
Frederik Rietdijk
d68aba4cfb Python: script names now include full path 
Certain programs, like zim, calibre and now also apparently mercurial,
rely on sys.argv[0] providing not just the script name but the full
path.

The Python docs [1] state the following on the matter:

> argv[0] is the script name (it is operating system dependent whether
this is a full pathname or not).

Therefore, scripts should not expect to receive a full path.
Unfortunately some do. While this can be considered a bug, there doesn't
seem any reason not to provide the full path. Therefore we now provide
the full path.

[1]
https://docs.python.org/3.5/library/sys.html?highlight=sys.argv#sys.argv
 2017-01-02 11:29:11 +01:00
Charles Strahan
7ebcada020
mesos: 1.0.1 -> 1.1.0 2016-12-29 20:09:46 -05:00
Michael Raskin
d7bda1ed40 clisp-tip: init at 2.50pre20161201. There hasn't been a release for quite some time, but there has been some development. It is rumored that the fresh version can be built on darwin, but I don't know and cannot test 2016-12-29 17:37:10 +01:00
Peter Simons
774435d0aa maude: update to 2.7.1 2016-12-29 12:18:44 +01:00
Michael Fellinger
df5f88070e ruby: 2.4.0 (#21419) 2016-12-27 17:55:10 +00:00
Frederik Rietdijk
b09000e785 python36: 3.6.0rc1 -> 3.6.0 2016-12-24 16:00:52 +01:00
Frederik Rietdijk
591eda8310 python27: 2.7.12 -> 2.7.13 2016-12-24 16:00:31 +01:00
Peter Simons
9f1880039f maude: update to version 2.7 2016-12-22 13:04:30 +01:00
Matthew Daiter
4bef3ee358 gnuapl: add Darwin support 2016-12-18 13:07:52 +01:00
Jascha Geerds
f92544fe12 falcon: Fix typo in derivation name (closes #21112) 2016-12-15 22:47:45 +01:00
Matthew Daiter
46fc2db7df erlang_basho_R16: add explicit Carbon and Cocoa support 2016-12-15 17:16:00 +01:00
Franz Pletz
60dfc245c7
php70: 7.0.13 -> 7.0.14 2016-12-13 21:56:47 +01:00
Franz Pletz
2ec19900ab
php56: 5.6.28 -> 5.6.29 2016-12-13 21:56:10 +01:00
Franz Pletz
762d902b1d
php71: init at 7.1.0 2016-12-13 21:55:05 +01:00
Frederik Rietdijk
2bcd41b9ff buildPythonPackage: install builds reproducibly 
Without --build a temporary directory is created to unpack the wheel in.
We now set a directory instead.
 2016-12-13 14:45:05 +01:00
Frederik Rietdijk
7c8b1e7b24 python36: 3.6.0b2 -> 3.6.0rc1 2016-12-12 09:31:25 +01:00
Svend Sorensen
e942ed29b3 rubygems: 2.6.6 -> 2.6.8 (#21028) 2016-12-10 17:30:39 +00:00
Eric Bailey
6a86b603f9 lfe: 1.1.1 -> 1.2.1 
- Use buildRebar3 instead of mkDerivation, obviating the need for setup-hook.sh
- Manually build proper and patch rebar.config s.t. it doesn't try to fetch it
- Set checkTarget = "travis" and actually run the tests
 2016-12-08 00:36:38 +02:00
Frederik Rietdijk
736169d01d buildPythonPackage: yet another fix, fixes #20943 
I didn't copy the old behaviour correctly with
c1d98d959b
 2016-12-06 16:48:55 +01:00
Frederik Rietdijk
c1d98d959b buildPythonPackage: add configurePhase, fixes #20926 
I had removed the configurePhase in
https://github.com/NixOS/nixpkgs/pull/20894 because it was empty. This
seemed to break packages that use cmake.
 2016-12-05 17:33:17 +01:00
Frederik Rietdijk
42bad32e13 buildPythonPackage: refactor 2016-12-05 10:29:22 +01:00
Frederik Rietdijk
5ba37dfc7a Merge pull request #20893 from FRidh/fixed3 
Python: use fixed-point combinator, add pkgs to interpreter
 2016-12-05 09:47:43 +01:00
Frederik Rietdijk
31e32b6d9e Python interpreters: add pkgs attribute 
A package set is constructed for a specific interpreter. Therefore, we add the
possibility to override the package set to the interpreter. This should make it
easier to override the interpreter and the package set at the same time.
 2016-12-05 09:43:44 +01:00
Vladimír Čunát
ad0d7f6a05
Merge branch 'staging' 2016-12-04 19:22:36 +01:00
Tomas Hlavaty
13f82b0445 picolisp: 15.11 -> 16.6 2016-12-04 14:26:30 +01:00
Vladimír Čunát
61aa9cb9b2
guile: doCheck = false, as it causes problems sometimes 
... and I don't feel like digging into the exact cause.
It's made worse by the fact that guile is quite a mass rebuild.
 2016-12-04 10:12:13 +01:00
Vladimír Čunát
84d737cfe9
clisp: remove Darwin from meta.platforms for now 
It's problematic.  See #20062.
 2016-12-04 10:01:08 +01:00
Matthew Daiter
d331e538c2 erlang_basho_R16: B03-1 -> B02-8 2016-12-02 16:12:14 +01:00
Graham Christensen
eeb15153b9 Merge pull request #20830 from grahamc/guile 
guile: apply patch fixing 00-repl-server.test stability (WIP)
 2016-11-30 22:45:33 -05:00
Graham Christensen
f1fd88f7f4
guile: apply patch fixing 00-repl-server.test stability 2016-11-30 22:17:04 -05:00
Graham Christensen
0707962235
mujs: 2016-09-21 -> 2016-11-30 for multiple CVEs 
- CVE-2016-7504
 - CVE-2016-7505
 - CVE-2016-7506
 - CVE-2016-9017
 - CVE-2016-9108
 - CVE-2016-9109
 - CVE-2016-9294

See more information: https://lwn.net/Vulnerabilities/707361/
 2016-11-30 08:29:44 -05:00
Tuomas Tynkkynen
8a4d6516ee Merge remote-tracking branch 'upstream/staging' into master 2016-11-30 00:34:23 +02:00
Michael Fellinger
bff2b98290
ruby: 3.2.1 -> 2.3.3 2016-11-27 22:11:49 -05:00
Vladimír Čunát
7a88f314cb
guile: doCheck = false on i686-linux 
It fails on Hydra now; I can't reproduce it locally and don't feel like
debugging it. It might be due to the warning below. That appears on
x86_64-linux as well, but we've got no problems in there so far...

warning: call to primitive-fork while multiple threads are running;
         further behavior unspecified.  See "Processes" in the
         manual, for more information.
 2016-11-26 11:35:23 +01:00
Vladimír Čunát
925b335607
Merge branch 'master' into staging 2016-11-26 11:27:09 +01:00
Frederik Rietdijk
27180b67ce pixie: use python2 2016-11-24 22:28:03 +01:00
Vladimír Čunát
2d7cb1f6c3
luajit: 2.1.0-beta1 -> 2.1.0-beta2 
I'm not very certain about beta as the default,
but let me not change that ATM.
 2016-11-24 13:35:13 +01:00
Nikolay Amiantov
69e649503f Merge pull request #20586 from abbradar/spidermonkey 
SpiderMonkey cleanup
 2016-11-22 11:46:14 +03:00
Daiderd Jordan
dcb37919f7 Merge pull request #20610 from mdaiter/erlang18EnableDirtySchedulers 
erlang: added dirty scheduler support
 2016-11-21 20:36:16 +01:00
Daiderd Jordan
a76076e7d6 Merge pull request #20611 from mdaiter/erlang17EnableDirtySchedulers 
erlang17: enable dirty schedulers
 2016-11-21 20:34:42 +01:00
Matthew Daiter
89ca3425b0 erlang19: enable dirty schedulers 2016-11-21 18:23:15 +01:00
Matthew Daiter
fd0f247658 erlang17: enable dirty schedulers 2016-11-21 18:18:45 +01:00
Matthew Daiter
bbb3299409 erlang: added dirty scheduler support 
erlang: formatting
 2016-11-21 18:16:38 +01:00
Nikolay Amiantov
bc5b9a3fa4 spidermonkey_38: init at 38.2.1.rc0 2016-11-21 02:46:35 +03:00
Nikolay Amiantov
c2274cdfb5 spidermonkey: cleanup and rename versions 2016-11-21 02:46:35 +03:00
Matthew Daiter
b1be1eee51 erlang_basho_R16B03: Limit platforms to x86_64 2016-11-20 16:06:00 +01:00
Pascal Wittmann
c49cd8ee96
groovy: 2.4.6 -> 2.4.7 2016-11-19 21:11:56 +01:00
Tim Steinbach
29356a3ac1 Merge pull request #20457 from DerTim1/erlang 
erlang: 18.3.4 -> 18.3.4.4, erlang: 19.1 -> 19.1.6
 2016-11-17 22:18:30 -05:00
Franz Pletz
7c65e225dd
php70: 7.0.12 -> 7.0.13 2016-11-17 21:17:56 +01:00
Franz Pletz
e53b902559
php56: 5.6.27 -> 5.6.28 2016-11-17 21:17:56 +01:00
Matthew Daiter
8f765490e4 erlang_basho: Init at R16B03 
erlang_basho_R16B03: added package file

erlang_basho_R16B03: added to top-level/all-packages.nix file

erlang_basho_R16B03_odbc: added to top-level/all-packages.nix file

erlang_basho_R16B03: Added the Carbon and Cocoa fields

erlang_basho_R16B03: Removed faulty maintainer

erlang_basho_R16B03: Added license as APL20

erlang_basho_R16B03: Made long and short description more informative

erlang_basho: added myself as a maintainer

erlang_basho: made configureFlags into an array

erlang_basho: added gcc as a dependency

erlang_basho: added escript replacement

erlang_basho: removed debugging cat statement

erlang_basho: changed subsitituteInPlace command to sed command

erlang_basho: added package

erlang_basho: Init at <R16B03
 2016-11-17 12:25:04 +01:00
Tim Digel
2bcaa93aa7 erlang: 19.1 -> 19.1.6 2016-11-16 09:25:04 +01:00
Tim Digel
4c70064cc5 erlang: 18.3.4 -> 18.3.4.4 2016-11-15 15:13:22 +01:00
Frederik Rietdijk
68d15b81c6 Merge pull request #20227 from michalrus/octave 
octave: 4.0.1 → 4.0.3 (+ portaudio dep)
 2016-11-07 13:42:41 +01:00
Peter Simons
6b964d953a erlang-R14: remove invalid meta.maintainer 2016-11-07 12:05:26 +01:00
Michal Rus
91d6779b96
octave: 4.0.1 → 4.0.3 (+ portaudio dep) 2016-11-07 00:26:56 +01:00
Daiderd Jordan
3187b01720 Merge pull request #19816 from veprbl/octave_fixes 
octave: darwin fix
 2016-11-05 10:49:33 +01:00
Karn Kallio
967d3c1192 racket release 6.7 
The attached patch advances racket to the latest released version 6.7

From 30a1d275376ed2f156314c5f99c4a4a9ba69d2b4 Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkallio@skami.org>
Date: Fri, 4 Nov 2016 01:13:58 -0400
Subject: [PATCH] racket : advance to the latest release 6.7
 2016-11-04 09:03:30 -04:00
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
Dmitry Kalinkin
5994c12470
octave: mesa and libX11 are not used on darwin 2016-10-24 17:27:10 -04: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