summary refs log tree commit diff
path: root/pkgs/development/web
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>2018-05-26 19:01:18 +0300
committerTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>2018-05-26 19:01:18 +0300
commit2760b2446242e7873962e5e6548bee95dfe35aff (patch)
tree86d929e5c62e2a7054d6872adad7889a595a1bda /pkgs/development/web
parent840e430744013afa1e5df95173977e070b6edfa1 (diff)
parent59c09a52f2793bc31a68742082d8a89ca4795a8f (diff)
downloadnixpkgs-2760b2446242e7873962e5e6548bee95dfe35aff.tar
nixpkgs-2760b2446242e7873962e5e6548bee95dfe35aff.tar.gz
nixpkgs-2760b2446242e7873962e5e6548bee95dfe35aff.tar.bz2
nixpkgs-2760b2446242e7873962e5e6548bee95dfe35aff.tar.lz
nixpkgs-2760b2446242e7873962e5e6548bee95dfe35aff.tar.xz
nixpkgs-2760b2446242e7873962e5e6548bee95dfe35aff.tar.zst
nixpkgs-2760b2446242e7873962e5e6548bee95dfe35aff.zip
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/development/web')
-rw-r--r--pkgs/development/web/nodejs/v6.nix4
-rw-r--r--pkgs/development/web/nodejs/v8.nix4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix
index 6dd9dd6f8e1..d648cf957d1 100644
--- a/pkgs/development/web/nodejs/v6.nix
+++ b/pkgs/development/web/nodejs/v6.nix
@@ -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 ];
   }
diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix
index 942c6cc3fd8..5f81842ca23 100644
--- a/pkgs/development/web/nodejs/v8.nix
+++ b/pkgs/development/web/nodejs/v8.nix
@@ -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 ];
   }