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

Merge remote-tracking branch 'origin/master' into staging.

Browse Source 
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
This commit is contained in:
Peter Simons
2014-08-04 16:51:47 +02:00
parent 9253a95f6b b35770818d
commit 2d326e5032
1261 changed files with 4697 additions and 3318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/tools/node-webkit/default.nix
View File

@@ -16,13 +16,13 @@ let
in stdenv.mkDerivation rec {
name = "node-webkit-${version}";
version = "0.8.4";
version = "0.9.2";
src = fetchurl {
url = "https://s3.amazonaws.com/node-webkit/v${version}/node-webkit-v${version}-linux-${bits}.tar.gz";
sha256 = if bits == "x64" then
"91229edfb03349306c5ce101fdab2de55f7473cc7c36367e9611a0527d2ef591" else
"12axppynangh0q72swzqcmz2blncgm2dw9n489313ybnp2p42hnp";
"04b9hgrxxnvrzyc7kmlabvrfbzj9d6lif7z69zgsbn3x25nxxd2n" else
"0icwdl564sbx27124js1l4whfld0n6nbysdd522frzk1759dzgri";
};
patchPhase = ''