public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into staging

Browse Source 
Conflicts:
	pkgs/applications/networking/browsers/vivaldi/default.nix
	pkgs/misc/emulators/wine/base.nix
This commit is contained in:
Tuomas Tynkkynen
2016-05-03 23:12:48 +03:00
parent 2362891dc8 e7d3166656
commit aadaa91379
506 changed files with 31436 additions and 5404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/interpreters/php/default.nix
View File

@@ -154,8 +154,8 @@ let
};
openssl = {
configureFlags = ["--enable-openssl"];
buildInputs = [openssl];
configureFlags = ["--with-openssl"];
buildInputs = [openssl openssl.dev];
};
mbstring = {
@@ -294,13 +294,13 @@ let
in {
php55 = generic {
version = "5.5.34";
sha256 = "0745wn0qg9rqibwr948bzc719s7pywizvl1ahkg1j9m92r28i25g";
version = "5.5.35";
sha256 = "1msqh8ii0qwzzcwlwn8f493x2r3hy2djzrrwd5jgs87893b8sr1d";
};
php56 = generic {
version = "5.6.20";
sha256 = "07xz48dz1ijwq45vh90jfzdd56k0s5ppi3j5rwc9p9y7mrybziss";
version = "5.6.21";
sha256 = "144m8xzpqv3pimxh2pjhbk4fy1kch9afkzclcinzv2dnfjspmvdl";
};
php70 = generic {

7
pkgs/development/interpreters/spidermonkey/default.nix
View File

@@ -24,4 +24,11 @@ stdenv.mkDerivation rec {
CFLAGS = "-DPIC -fPIC -DJS_C_STRINGS_ARE_UTF8";
makeFlags = "-f ${makefile} JS_DIST=\${out} BUILD_OPT=1 JS_READLINE=1";
meta = with stdenv.lib; {
description = "Mozilla's JavaScript engine written in C/C++";
homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey";
license = licenses.mpl20;
platforms = platforms.all;
};
}