Commit Graph

2513 Commits

Author SHA1 Message Date
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
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
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 d56bf31655)
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
Rahul Gopinath
7163bab78f ruby: 2.2.3 -> 2.2.5 2016-09-06 21:13:59 -07:00
Michael Raskin
d9c76736cc octave: fix overridePlatforms (was just platforms) name collision, thanks to @bjornfor for catching 2016-09-06 19:57:06 +02:00
Michael Raskin
472ac50f5b octave: forbid 32-bit builds of the octaveFull version, looks like too much memory needed 2016-09-06 18:26:58 +02:00
Josef Kemetmueller
b7819e38c4 python3.x: Patch extra stack size on darwin
Compiling python with "-Wl,-stack_size,1000000" causes problems when
compiling for example pygobject3. pygobject3 uses "python3.x-config
--ldflags" during installation and then fails when
"-Wl,-stack_size,1000000" is present. Maybe we should investigate
removing this during the build of pyobject3, but this stack_size flag is
also not used on the popular darwin homebrew-core channel for python3.5,
so it seems safe to remove it.
2016-09-04 10:14:51 +02:00
Frederik Rietdijk
203004d59a pypy27: 5.3.1 -> 5.4.0 2016-09-03 11:42:55 +02:00
Tuomas Tynkkynen
e2c6740c37 Merge commit 'adaee73' from staging into master
This one was already merged into release-16.09, so let's not have the
stable branch is ahead of master and confuse things. In addition to
that, currently we have an odd situation that master has less things
actually finished building than in staging.

Conflicts:
	pkgs/data/documentation/man-pages/default.nix
2016-09-03 01:02:51 +03:00
Eelco Dolstra
7f520bdad8 Revert "Python 2.6: add less"
This reverts commit 6b11c96c86.
2016-09-01 18:58:14 +02:00
Eelco Dolstra
1e370d7de4 Revert "Python 2.7: add less"
This reverts commit bce5a51a9f.
2016-09-01 18:58:09 +02:00
Eelco Dolstra
0810decaa7 python-3.5: Drop dependency on Berkeley DB
The previous commit revealed that Python wasn't actually using
Berkeley DB; it only had it in its closure due to the build-time flag
dump in Makefile and _sysconfigdata.py. When Python detects both GNU
gdbm and Berkeley DB at build time, it will use the former.
2016-09-01 18:57:43 +02:00
Eelco Dolstra
fdd7399a3c python-3.5: Also remove -L flags
This reduces the Python closure size by another 10 MiB.
2016-09-01 18:57:43 +02:00
Eelco Dolstra
02bae39132 tcl: Don't install a copy of tzdata
This cuts about 3 MiB from the installed size. On Linux, the configure
script is supposed to detect that installing tzdata is unnecessary,
but it looks in locations like /usr/share/zoneinfo.
2016-09-01 18:57:43 +02:00
Eelco Dolstra
168192f116 python-3.5: Eliminate -dev paths from the runtime closure
This reduces Python's closure size from 200 MiB to 129 MiB. Even
better would be to get move tkinter to a separate output or package
(since that would get rid of all X11 stuff), but that's a bit harder.
2016-09-01 18:57:43 +02:00
Eelco Dolstra
b0327ac240 tcl: Separate man output and use symlinks
This reduces tcl's total size from 25.0 MiB to 8.6 MiB. Admittedly
this is also because putting the manpages in the right place causes
all man3 pages to be deleted by the multiple outputs setup hook. Not
sure if that's desirable behaviour...
2016-09-01 18:57:43 +02:00
Frederik Rietdijk
e1d1a573e5 Python: fix mkPythonDerivation doCheck 2016-09-01 17:11:32 +02:00
Frederik Rietdijk
4f6b6f1472 pythonPackages: use mkPythonDerivation 2016-09-01 16:16:31 +02:00
Frederik Rietdijk
3e05cce97c Python: separate buildPythonPackage into two functions
1. mkDerivation which is used when the source is without setup.py and
not a wheel
2. buildPythonPackage which is used as before and calls mkDerivation
2016-09-01 16:16:31 +02:00
Frederik Rietdijk
725c37b4d3 Python: move wrapPython into own file 2016-09-01 16:16:31 +02:00
Frederik Rietdijk
b080748d42 Python: move python-modules/generic to interpreter folder 2016-09-01 16:16:31 +02:00
Domen Kožar
10b45d654a fix eval after 0c3b1112af 2016-09-01 13:05:45 +02:00
Eelco Dolstra
0c3b1112af Revert "Python 3.5: add less"
This reverts commit e261818c68 and
others. Having Python propagate less really doesn't make sense.
2016-09-01 12:54:46 +02:00
Tuomas Tynkkynen
8c4aeb1780 Merge staging into master
Brings in:
    - changed output order for multiple outputs:
      https://github.com/NixOS/nixpkgs/pull/14766
    - audit disabled by default
      https://github.com/NixOS/nixpkgs/pull/17916

 Conflicts:
	pkgs/development/libraries/openldap/default.nix
2016-09-01 13:27:27 +03:00
zimbatm
f1035132f3 Merge pull request #18099 from zimbatm/nokogiri-fixup
Nokogiri fixup
2016-09-01 10:43:22 +01:00
Eelco Dolstra
8172cd734c docdev -> devdoc
It's "developer documentation", not "documentation developer" after
all.
2016-09-01 11:07:23 +02:00
Domen Kožar
e4d784ace5 Merge pull request #18177 from womfoo/fix/jimtcl-build
jimtcl: fix build
2016-09-01 10:55:13 +02:00
Kranium Gikos Mendoza
9fc8731347 jimtcl: fix build 2016-09-01 16:26:10 +08:00
Tuomas Tynkkynen
43a5d30e00 ruby: Fix evaluation error
In the tarball job:

````
checking find-tarballs.nix
error: while evaluating anonymous function at /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/maintainers/scripts/find-tarballs.nix:6:1, called from undefined position:
while evaluating ‘operator’ at /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/maintainers/scripts/find-tarballs.nix:27:16, called from undefined position:
while evaluating ‘immediateDependenciesOf’ at /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/maintainers/scripts/find-tarballs.nix:39:29, called from /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/maintainers/scripts/find-tarballs.nix:27:44:
while evaluating anonymous function at /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/lib/attrsets.nix:224:10, called from undefined position:
while evaluating anonymous function at /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/maintainers/scripts/find-tarballs.nix:40:37, called from /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/lib/attrsets.nix:224:16:
while evaluating ‘derivationsIn’ at /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/maintainers/scripts/find-tarballs.nix:42:19, called from /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/maintainers/scripts/find-tarballs.nix:40:40:
while evaluating ‘optional’ at /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/lib/lists.nix:175:20, called from /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/maintainers/scripts/find-tarballs.nix:44:33:
while evaluating ‘canEval’ at /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/maintainers/scripts/find-tarballs.nix:48:13, called from /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/maintainers/scripts/find-tarballs.nix:44:43:
while evaluating the attribute ‘pkgs’ of the derivation ‘ruby-dev-2.3.1-p0’ at /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/pkgs/build-support/trivial-builders.nix:10:14:
while evaluating ‘override’ at /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/lib/customisation.nix:60:22, called from /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/pkgs/development/interpreters/ruby/dev.nix:10:13:
while evaluating ‘makeOverridable’ at /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/lib/customisation.nix:54:24, called from /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/lib/customisation.nix:60:31:
anonymous function at /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/pkgs/development/ruby-modules/bundix/default.nix:1:1 called with unexpected argument ‘ruby’, at /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/lib/customisation.nix:56:12
````
2016-08-31 21:13:12 +03:00
Domen Kožar
da421bc75f Fix #4210: Remove builderDefs
This was one of the ways to build packages, we are trying
hard to minimize different ways so it's easier for newcomers
to learn only one way.

This also:

- removes texLive (old), fixes #14807
- removed upstream-updater, if that code is still used it should be in
  separate repo
- changes a few packages like gitit/mit-scheme to use new texlive
2016-08-31 11:34:46 +02:00
Lancelot SIX
186f5a10f0
lush2: add missing libSM dependency 2016-08-30 13:52:59 +02:00
Tuomas Tynkkynen
c3bcb4e1ce treewide: Use explicit 'dev' references to glibc 2016-08-30 03:11:09 +03:00
Tuomas Tynkkynen
0836f5d3b0 erlangR14: Use dev output of openssl 2016-08-30 02:41:13 +03:00
zimbatm
b046ebbb7c rubygems: 2.6.2 -> 2.6.6 2016-08-29 19:52:40 +01:00
Tuomas Tynkkynen
55fa3b52a3 php: Fix mysql reference
TODO: Fix the mysql expression so this isn't needed.
2016-08-29 14:49:53 +03:00
Tuomas Tynkkynen
ba6d94e6a5 ruby: dev -> devEnv
Otherwise conflicts with the convention of `dev` output.
2016-08-29 14:49:52 +03:00
Tuomas Tynkkynen
a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Robin Gloster
e17bc25943
Merge remote-tracking branch 'upstream/master' into staging 2016-08-29 00:24:47 +00:00
Lancelot SIX
bbf1fdf4e7 gnuapl: 1.5 -> 1.6 (#18060)
Release announcement:
http://lists.gnu.org/archive/html/info-gnu/2016-08/msg00014.html
2016-08-28 23:49:30 +00:00
Joachim Fasting
f16d3800e1
io: disable i686 build
io uses SIMD instructions even on i686, causing the build to fail:

> /nix/store/[...]-gcc-5.4.0/lib/gcc/i686-pc-linux-gnu/5.4.0/include/xmmintrin.h:181:1:
error: inlining failed in call to always_inline '_mm_add_ps': target
specific option mismatch
 _mm_add_ps (__m128 __A, __m128 __B)

(from https://hydra.nixos.org/build/37879114/log/raw)

The simplest solution is to disable the build on this platform.
2016-08-29 01:10:37 +02:00
obadz
3de6e5be50 Merge branch 'master' into staging
Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix
2016-08-27 23:54:54 +01:00
Franz Pletz
113fbe910e spidermonkey_1_8_0rc1: disable pic hardening on i686 2016-08-25 05:01:41 +02:00
Robin Gloster
9ed7196eac
php70: 7.0.9 -> 7.0.10 2016-08-25 00:02:48 +00:00
Robin Gloster
765e1e30ba
php56: 5.6.24 -> 5.6.25 2016-08-25 00:00:48 +00:00
Robin Gloster
07b8f53612
php55: remove unmaintained version
Does not receive security updates from upstream
2016-08-25 00:00:48 +00:00
Franz Pletz
bd739d1fae pypy: disable pic hardening on i686 2016-08-25 01:54:55 +02:00
Robin Gloster
2b4438c294 maude: disable pic and fortify hardening on i686 2016-08-24 18:29:36 +00:00
Franz Pletz
647b2ce168 lua5_0: disable stackprotector hardening on i686 2016-08-24 19:25:19 +02:00
obadz
78b7529ee3 Merge branch 'master' into staging 2016-08-24 11:57:44 +01:00
Daniel Peebles
3f337a2b23 Merge pull request #17685 from matthewbauer/darwin-misc2
Darwin misc. fixes
2016-08-24 11:52:27 +02:00
obadz
0e8d2725dc Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
Tuomas Tynkkynen
cc7c9f5676 treewide: Make explicit that 'dev' output of SDL is used 2016-08-23 03:26:46 +03:00
Tuomas Tynkkynen
74a3a2cd7e treewide: Use makeBinPath 2016-08-23 01:18:10 +03:00
obadz
24a9183f90 Merge branch 'hardened-stdenv' into staging
Closes #12895

Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
2016-08-22 01:19:35 +01:00
Herwig Hochleitner
d620f80318 pixie, dust: rename pxi -> pixie-vm
see https://github.com/pixie-lang/pixie/issues/455
2016-08-19 02:38:12 +02:00
Herwig Hochleitner
df2a847b6d pixie: 1352 -> 1356 2016-08-19 02:38:09 +02:00
Frederik Rietdijk
84bcaf5461 pypy27: 5.1.1 -> 5.3.1 2016-08-17 23:12:30 +02:00
Matthew Bauer
5f0d155f5b rakudo: fix darwin build
needs:

- CoreServices
- ApplicationServices
2016-08-16 19:25:44 +00:00
Matthew Bauer
fa4b1ee68a erlangR16: fix darwin build 2016-08-16 19:25:39 +00:00
Robin Gloster
33e1c78ae3 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-16 07:54:01 +00:00
Frederik Rietdijk
11d1fdfd8b Remove top-level cython and cython3
See #11567.
2016-08-14 12:01:09 +02:00
Robin Gloster
b7787d932e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00
Michael Raskin
5cd1a1649f angel: 2.31.0 -> 2.31.1 2016-08-11 17:57:35 +02:00
Vladimír Čunát
947abb08ac Merge branch 'staging' 2016-08-10 22:09:38 +02:00
Franz Pletz
6c7326aedd lolcode: fix build 2016-08-10 07:12:08 +02:00
Franz Pletz
43c663975c lolcode: 0.10.5 -> 0.11.2 2016-08-10 07:12:08 +02:00
Vladimír Čunát
950feb70b2 treewide: fixup various mysql ocurrences after re-split 2016-08-07 20:46:37 +02:00
Vladimír Čunát
03e32315a5 Merge branch 'master' into staging
Hydra nixpkgs: ?compare=1286624
2016-08-07 11:35:28 +02:00
Vladimír Čunát
942d57f546 Merge #17159: guile: 2.0.11 -> 2.0.12 2016-08-06 17:37:55 +02:00
Robin Gloster
4f6bd094fb spidermonkey_1_8_0rc1: disable format hardening 2016-08-03 20:24:53 +00:00
Robin Gloster
1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Bart Brouns
0621828bb7 supercollider: 3.6.6 -> 3.7.2 (#17395) 2016-08-03 00:27:03 +02:00
Tuomas Tynkkynen
3875690d80 lua5: Re-enabel on Darwin
Prior to 1bf5ded193 this contained
`hydraPlatforms = platforms.linux`, which was apparently misleading.
2016-08-02 23:14:21 +03:00
Tuomas Tynkkynen
21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Franz Pletz
fbbd50dbab unicon-lang: disable fortify hardening
Detects buffer overflow in a tool used at link time.
2016-08-02 20:21:28 +02:00
Tuomas Tynkkynen
2258b21e4b treewide: Add lots of platforms to packages with no meta
Build-tested on x86_64 Linux and on Darwin.
2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
1bf5ded193 treewide: Lots of meta.hydraPlatforms -> meta.platforms
In all of these files, there is no meta.platforms but only
meta.hydraPlatforms, which doesn't seem to have any purpose except being
inconsistent.
2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
b96fe03484 treewide: Fix meta.platforms related typos 2016-08-02 21:17:44 +03:00
Franz Pletz
c22c137c6c ruby_2_0: disable format hardening 2016-08-02 18:01:21 +02:00
Robin Gloster
c0830c1764 wasm: disable format hardening 2016-08-02 15:40:37 +00:00
Robin Gloster
1be4907ca2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-02 13:46:36 +00:00
Frederik Rietdijk
c74ad2ee23 Merge pull request #17339 from FRidh/rename
Python: move interpreters
2016-08-01 15:08:20 +02:00
Robin Gloster
63c7b4f9a7 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-31 20:51:34 +00:00
Vladimír Čunát
dfa2f8040e Merge #17354: tcl/tk: 8.6.4 -> 8.6.6 2016-07-30 08:32:47 +02:00
Rahul Gopinath
0ba631d5bb tcl/tk: 8.6.4 -> 8.6.6 2016-07-28 16:19:08 -07:00
Frederik Rietdijk
1da6775775 Python: move interpreters
Move Python interpreters (CPython, PyPy) to same folder and share
layout.
2016-07-28 17:10:15 +02:00
Franz Pletz
63784b8021 php: 5.5.37 -> 5.5.38, 5.6.23 -> 5.6.24 (security)
https://secure.php.net/ChangeLog-5.php#5.5.38
https://secure.php.net/ChangeLog-5.php#5.6.24
2016-07-28 06:22:23 +02:00
Rok Garbas
cd1dadf860 Merge pull request #17242 from rasendubi/mips-linux
Fixes for mips-linux
2016-07-27 19:01:11 +02:00
Proglodyte
cddcda6e96 wasm: init at 0.0.1
Run WebAssembly from the command line with v8 backend
2016-07-27 01:55:30 -04:00
Alexey Shmalko
6d998e6386
perl: fix build for mips-linux 2016-07-26 01:36:12 +03:00
Robin Gloster
f222d98746 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-25 12:47:13 +00:00
Rahul Gopinath
cbcee08650 racket: 6.5 -> 6.6 (#17233) 2016-07-25 06:03:35 +02:00
Eric Bailey
e6e873beca erlangR19: init at 19.0.2 (#17123)
Add R19.nix, based on @binarin's R18.nix.

N.B. erlang/otp#1023 obviated the need for `rmAndPwdPatch` in R19.
2016-07-23 01:07:41 +02:00
Rahul Gopinath
adf3b24f79 rakudo: 2016.04 -> 2016.07 2016-07-22 11:26:03 -07:00
Lancelot SIX
522533cd36
guile: 2.0.11 -> 2.0.12
2.0.12 is a maintenance release for the 2.0.x stable series.

See http://lists.gnu.org/archive/html/info-gnu/2016-07/msg00007.html
for announcement.
2016-07-21 21:46:17 +02:00
Franz Pletz
77a9ab33a6 php: 7.0.8 -> 7.0.9 (security)
https://secure.php.net/ChangeLog-7.php#7.0.9
2016-07-21 14:12:29 +02:00
Robin Gloster
1f04b4a566 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-21 00:56:43 +00:00
Jookia
33a1d8080b spidermonkey: Enable tests on 31.5. 2016-07-20 02:38:10 +03:00
Jookia
cde9fb47a9 spidermonkey: Fix building 31.5 on GCC 5. 2016-07-20 02:38:10 +03:00
Jookia
6c4ba06597 spidermonkey: Fix building 185-1.0.0 on ARMv7. 2016-07-20 02:38:10 +03:00
Tuomas Tynkkynen
ad16c9ac31 Revert "spidermonkey: Disable tests on ARM"
This reverts commit f9654a88e7.

At least for now, the problem has gone away on ARMv7 by the switch of
FPU flags used by GCC.

Some details of the bug at:
https://github.com/NixOS/nixpkgs/pull/16850#issuecomment-232339143
2016-07-20 02:38:10 +03:00
Robin Gloster
203846b9de Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-19 10:37:02 +00:00
Frederik Rietdijk
b49bedd75b Python 2.7.11 -> 2.7.12 2016-07-19 11:49:38 +02:00
Frederik Rietdijk
6b11c96c86 Python 2.6: add less 2016-07-19 11:11:03 +02:00
Frederik Rietdijk
bce5a51a9f Python 2.7: add less 2016-07-19 10:27:14 +02:00
Frederik Rietdijk
c59d211b4b Python 3.3: add less 2016-07-19 10:27:14 +02:00
Frederik Rietdijk
b410631d6d Python 3.4: add less 2016-07-19 10:27:14 +02:00
Frederik Rietdijk
e261818c68 Python 3.5: add less 2016-07-19 10:27:14 +02:00
Frederik Rietdijk
773f6225cb Python 3.6: add less 2016-07-19 10:27:14 +02:00
Louis Taylor
7c75fa4bc2 python: add alpha release of 3.6
This might be jumping the gun a little, but I needed to use 3.6 locally
and thought I may as well push it upstream.
2016-07-19 10:27:14 +02:00
Anthony Cowley
73ec6bea2c octave: add arpack, libwebp, and darwin compat
This follows on from PR #16965 for qrupdate and PR #16968 for fltk.

WIth these, the added explicit dependencies on arpack (to support
the octave `eigs` function) and `libwebp`, and not pulling X11 things,
octave works properly on darwin.
2016-07-15 17:17:35 -04:00
Robin Gloster
6539901c7f Merge remote-tracking branch 'upstream/hardened-stdenv' into hardened-stdenv 2016-07-15 15:02:16 +00:00
Robin Gloster
5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Alexey Lebedeff
54a15fb2e4 erlang: 18.3 -> 18.3.4 (#16244)
Minor OTP releases (and their manpages) are not available for dowload at
http://erlang.org/download
But e.g.:
- 18.3.1 contains an important fix for mnesia
- 18.3.1-18.3.4 has a lot of SSL/TLS fixes

So we have to fetch from GitHub and build everything ourselves.

Also replace explicit path patching with upstream patches:
- https://github.com/erlang/otp/pull/1023
- https://github.com/erlang/otp/pull/1103 - with this patch it's now
  possible to build erlang in sandboxed mode
2016-07-13 19:41:55 +02:00
Franz Pletz
0cee9febc5 Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-07-13 19:05:09 +02:00
Eric Bailey
9d58f894cd lfe: init at 1.1.1 (#16865)
This is a first pass at adding an LFE package.

N.B. man pages are ignored for now.
2016-07-12 13:48:33 +02:00
Daiderd Jordan
bc39354269 elixir: 1.3.0 -> 1.3.1 2016-07-11 18:06:54 +02:00
Frederik Rietdijk
f04b018111 python 3.4.4 -> 3.4.5 2016-07-10 19:16:56 +02:00
Frederik Rietdijk
52bc8d203f python 3.5.1 -> 3.5.2 2016-07-10 19:05:12 +02:00
Tuomas Tynkkynen
f9654a88e7 spidermonkey: Disable tests on ARM
Some tests fail and cause kernel spam of this sort:

[ 6607.906159] Alignment trap: not handling instruction f4430a1f at [<0021e500>]
[ 6607.913308] Unhandled fault: alignment exception (0x811) at 0x003a15ec
[ 6607.919864] pgd = e8b88000
[ 6607.922601] [003a15ec] *pgd=fb185835
2016-07-10 03:03:51 +03:00
Franz Pletz
26dd9acba5 Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-07-09 13:21:28 +02:00
Joachim Fasting
386d4821b4 Merge pull request #16765 from rasendubi/io
io: clean up
2016-07-07 23:51:44 +02:00
Matthias Beyer
7f4d52e27e Build libjack2 for supercollider with same GCC
Also remove trailing whitespace
2016-07-07 16:07:47 +02:00
Alexey Shmalko
4010167803
io: clean up 2016-07-07 13:45:29 +03:00
Tuomas Tynkkynen
2cf8cb7f46 Merge remote-tracking branch 'upstream/master' into staging 2016-07-05 13:34:36 +03:00
Joachim Fasting
af9b7ba1e3 Merge pull request #16552 from Mayeu/elixir-1.3
elixir: 1.2.6 -> 1.3.0
2016-07-02 14:37:25 +02:00
Frederik Rietdijk
880475bbd5 python: fix modules in buildEnv, closes #16646
Python 2.7 on Nix is stripped of some modules, which can be added when
needed. This was broken with python.buildEnv.
2016-07-01 16:16:55 +02:00
Eelco Dolstra
de1b4e71c1 python-2.7: Don't use ldconfig and speed up uuid load 2016-07-01 14:57:40 +02:00
Vladimír Čunát
3afa246038 Merge branch 'staging'
This includes a security update of expat.
2016-06-29 07:47:04 +02:00
Cast
f055b46a4f elixir: 1.2.6 -> 1.3.0 2016-06-27 18:09:32 +02:00
Vladimír Čunát
19e80fa19d pypy: fix pyexpat tests with expat-2.2.0
/cc #16477. /cc @domenKozar (don't know who better),
as I still experience test failures of different kind:
=================================== FAILURES ===================================
_______________________________________  _______________________________________
Traceback (most recent call last):
  File "/tmp/nix-build-pypy-5.1.1.drv-0/pypy-pypy-b0a649e90b66/pypy/tool/pytest/run-script/regrverbose.py", line 14, in <module>
    indirect_test()
  File "/tmp/nix-build-pypy-5.1.1.drv-0/pypy-pypy-b0a649e90b66/lib-python/2.7/test/test_ctypes.py", line 10, in test_main
    skipped, testcases = ctypes.test.get_tests(ctypes.test, "test_*.py", verbosity=0)
  File "/tmp/nix-build-pypy-5.1.1.drv-0/pypy-pypy-b0a649e90b66/lib-python/2.7/ctypes/test/__init__.py", line 72, in get_tests
    mod = __import__(modname, globals(), locals(), ['*'])
  File "/tmp/nix-build-pypy-5.1.1.drv-0/pypy-pypy-b0a649e90b66/lib-python/2.7/ctypes/test/test_python_api.py", line 9, in <module>
    from _ctypes import PyObj_FromPtr
ImportError: cannot import name 'PyObj_FromPtr'

=========================== short test summary info ============================
FAIL lib-python/2.7/test/test_ctypes.py::unmodified
 9 tests deselected by '-knot ( test_ssl or test_urllib2net or test_urllibnet or test_urllib2_localnet or test_socket or test_shutil or test_zipfile64 or test_epoll )'
======= 1 failed, 341 passed, 51 skipped, 9 deselected in 550.97 seconds =======
2016-06-27 17:06:08 +02:00
Franz Pletz
5c59a30191 php: fix hashes for 5.5 and 5.6 2016-06-27 00:47:39 +02:00
Franz Pletz
56bbc4cc61 php56: 5.6.22 -> 5.6.23 (security)
See https://secure.php.net/ChangeLog-5.php#5.6.23.
2016-06-27 00:14:00 +02:00
Franz Pletz
d6680b73c3 php55: 5.5.36 -> 5.5.37 (security)
See https://secure.php.net/ChangeLog-5.php#5.5.37.
2016-06-27 00:13:40 +02:00
Franz Pletz
82d180145e php70: 7.0.7 -> 7.0.8 (security)
See https://secure.php.net/ChangeLog-7.php#7.0.8.
2016-06-27 00:12:00 +02:00
Rahul Gopinath
ffc05cf028 jimtcl: 0.75 -> 0.76 2016-06-22 20:05:17 -07:00
Eric Sagnes
1485b3a6c0 php: add meta.platforms 2016-06-22 17:45:52 +09:00
Bjørn Forsman
bd01fad0ed Captialize meta.description of all packages
In line with the Nixpkgs manual.

A mechanical change, done with this command:

  find pkgs -name "*.nix" | \
      while read f; do \
          sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
      done

I manually skipped some:

* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
2016-06-20 13:55:52 +02:00
Aristid Breitkreuz
5d9bca7693 Merge pull request #16309 from NixOS/j-fix
J: fix build
2016-06-18 15:18:35 +02:00
Aristid Breitkreuz
92de74293c J: add simple check phase, remove debug parts of build script 2016-06-18 15:18:06 +02:00
Aristid Breitkreuz
fd2d209fff J: mark as Linux-only until it has been tested on non-Linux 2016-06-18 14:40:09 +02:00
Aristid Breitkreuz
333a5bf42b J: fix build 2016-06-18 14:29:09 +02:00
Joachim Fasting
a689df205a Merge pull request #16050 from vrthra/rakudo
rakudo: 2016.01 -> 2016.04
2016-06-15 21:07:36 +02:00
Joachim Fasting
cdcc1b1c53 Merge pull request #16102 from vrthra/rebol
rebol: init at 3-alpha
2016-06-15 20:29:53 +02:00
Joachim Fasting
df5a43929f Merge pull request #16100 from vrthra/unicon
unicon: init at 11.7
2016-06-15 20:29:04 +02:00
Eric Merritt
b1cd08246f beamPackages: turn on debug_info for beam packages
This allows you to turn on debug infor for all the beam packages in the
system with a single change at the top level. This is required for
debugging and dialyzer work. It also allows you to switch it on on a
package by package basis.
2016-06-15 07:20:01 -07:00
Marc Scholten
d1219ba68f php: Fixed libiconv error 2016-06-13 18:25:58 +02:00
Joachim Fasting
41bd0dc373 Merge pull request #16078 from mpscholten/php7
php: Now builds on darwin
2016-06-13 16:45:28 +02:00
Rahul Gopinath
9b01ad3ce8 rebol: init at 3-alpha
Rebol is a cross-platform data exchange language and a multi-paradigm dynamic
programming language for network communications and distributed computing.
2016-06-12 16:32:10 -07:00
Nikolay Amiantov
b0ff10ada2 clojure: 1.7.0 -> 1.8.0 2016-06-12 15:57:29 +03:00
Robin Gloster
8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Rahul Gopinath
b89d4a3a61 unicon: init at 11.7
Unicon is a very high level goal-directed, object-oriented, general purpose
applications language
2016-06-09 13:32:44 -07:00
Marc Scholten
d4babc49dc php: Now builds on darwin 2016-06-09 14:49:55 +02:00
Rahul Gopinath
c860de987d io: 2013.12.04 -> 2015.11.11
Updating IO language to latest version
2016-06-09 04:15:26 -07:00
Rahul Gopinath
70b0f3128d rakudo: 2016.01 -> 2016.04
Updating Rakudo (Perl 6 compiler) to 2016.04
2016-06-09 03:10:09 -07:00
Eelco Dolstra
109096247a php56: update to 5.6.22
(cherry picked from commit 72b4009367)
2016-06-09 10:04:39 +00:00
Rahul Gopinath
367ddbdcd5 icon: Init at 9.5.1
Icon is a very high level general-purpose programming language with
extensive features for processing strings (text) and data structures.

Closes #16036.
2016-06-07 19:09:54 +02:00
zimbatm
5811b47ba3 Merge pull request #16037 from couchemar/elixir-1.2.6
elixir: 1.2.5 -> 1.2.6
2016-06-07 16:30:30 +01:00
Joachim Fasting
c259ad9f49 Merge pull request #15947 from jdanekrh/dart
dart: 0.4 -> 1.16.1
2016-06-07 14:42:42 +02:00
Andrey Pavlov
c38a08f95a elixir: 1.2.5 -> 1.2.6 2016-06-07 10:34:20 +03:00
Jiri Danek
3de59a83da dart: 0.4 -> 1.16.1 2016-06-06 11:15:05 +02:00
Tuomas Tynkkynen
bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Frederik Rietdijk
f44e70a68b pypy.withPackages: fix path 2016-05-31 17:17:28 +02:00
Frederik Rietdijk
3502599730 pypy.withPackages
was forgotten in https://github.com/NixOS/nixpkgs/pull/15804
2016-05-31 16:01:07 +02:00
Robin Gloster
2a5e64b69c maude: disable stackprotector hardening
segfaults during tests
2016-05-31 12:58:10 +00:00
Robin Gloster
2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
Frederik Rietdijk
fa4701e4e8 Merge pull request #15804 from NixOS/python-with-packages
python: add python.withPackages function
2016-05-30 11:39:14 +02:00
Benno Fünfstück
c3ed3914bb python: add python.withPackages function
Fixes #15801
2016-05-29 15:12:23 +02:00
Frederik Rietdijk
ee547881d6 Merge pull request #15501 from FRidh/octave
octave: add libsndfile to buildInputs, fixes #15494
2016-05-28 15:07:13 +02:00
Frederik Rietdijk
fcbd211596 Merge pull request #15709 from vrthra/qnial
qnial: Init at 6.3
2016-05-28 15:02:51 +02:00
Vladimír Čunát
e4832c7541 Merge branch 'staging'
Includes a security update of libxml2.
2016-05-27 15:58:40 +02:00
Franz Pletz
93c010ddad php: 5.5.35 -> 5.5.36, 7.0.6 -> 7.0.7 (security)
See:

  * https://secure.php.net/ChangeLog-5.php#5.5.36
  * https://secure.php.net/ChangeLog-7.php#7.0.7
2016-05-26 18:44:31 +02:00
Rahul Gopinath
9e8edc1389 qnial: Init at 6.3
Qnial is an implementation of the Nial (Nested Array) Language
2016-05-25 14:05:01 -07:00
Vladimír Čunát
0b192a0976 Merge branch 'master' into staging
That's to get mesa rebuild from master, as it's nontrivial.
2016-05-23 09:02:10 +02:00
Vladimír Čunát
c4661e9643 Merge: make dev output references explicit
This is a rebase of most commits from #14766,
resolving conflicts and a few other evaluation problems.
2016-05-22 12:09:23 +02:00
Vladimír Čunát
5dfe6fd034 perl: fix evaluation on cygwin
... and maybe on other platforms that have `stdenv.cc.cc == null`.
No hash changes where it did evaluate previously. Discussion:
https://github.com/NixOS/nixpkgs/commit/b291f1682f#commitcomment-17558440
2016-05-20 21:37:27 +02:00
Tuomas Tynkkynen
7fb29bfa73 treewide: Make explicit that 'dev' output of zlib is used 2016-05-19 10:04:38 +02:00