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

This commit is contained in:
Tuomas Tynkkynen
2018-05-26 19:01:18 +03:00
30 changed files with 1294 additions and 920 deletions

View File

@@ -5,7 +5,7 @@ let
in
buildNodejs {
inherit enableNpm;
version = "6.14.1";
sha256 = "1hxyasy42ih9brgp37n9j85s5vwir3g32k5i3j0vx2kizy4xlphi";
version = "6.14.2";
sha256 = "1lb2dpzamrag645l47gb33qqx8ppjimkb8gkczzwd5jymnr399dk";
patches = lib.optionals stdenv.isDarwin [ ./no-xcode.patch ./no-xcodebuild.patch ];
}

View File

@@ -5,7 +5,7 @@ let
in
buildNodejs {
inherit enableNpm;
version = "8.11.1";
sha256 = "12kmsh5cl72dq5hzik1cczn2n5crbfqqd1xmrzqgryipx98yp9j0";
version = "8.11.2";
sha256 = "0ya9iz47d7ld4zb0aqym9cpxah0pzhsllhh7xmmmf28q7304d6ak";
patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ./no-xcodebuild.patch ];
}