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

Merge remote-tracking branch 'upstream/master' into gcc-7

Browse Source 
Conflicts:
	pkgs/development/compilers/gcc/7/default.nix
	pkgs/development/libraries/SDL2/default.nix
	pkgs/top-level/all-packages.nix
This commit is contained in:
Tuomas Tynkkynen
2018-01-26 16:46:43 +02:00
parent 1830017289 4a2f7a73cc
commit 6a11ebfae9
4038 changed files with 152193 additions and 155007 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/interpreters/spidermonkey/31.nix
+1 -1
View File
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
# probably it would be more ideal to pull a particular tag/revision
# from the mercurial repo
src = fetchurl {
url = "https://people.mozilla.org/~sstangl/mozjs-31.5.0.tar.bz2";
url = "https://people.freebsd.org/~sunpoet/sunpoet/mozjs-31.5.0.tar.bz2";
sha256 = "1q8icql5hh1g3gzg5fp4rl9rfagyhm9gilfn3dgi7qn4i1mrfqsd";
};
pkgs/development/interpreters/spidermonkey/38.nix
+1 -1
View File
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
# probably it would be more ideal to pull a particular tag/revision
# from the mercurial repo
src = fetchurl {
url = "https://people.mozilla.org/~sstangl/mozjs-${version}.tar.bz2";
url = "https://people.freebsd.org/~sunpoet/sunpoet/mozjs-${version}.tar.bz2";
sha256 = "0p4bmbpgkfsj54xschcny0a118jdrdgg0q29rwxigg3lh5slr681";
};