summary refs log tree commit diff
path: root/pkgs/development/web
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2020-07-23 08:32:33 +0200
committerJan Tojnar <jtojnar@gmail.com>2020-07-23 08:32:33 +0200
commitcf64230d42ba59982643d8e8fe284a2093b2be3c (patch)
tree3386f6ee2793081a872eb4b9078e297758fc2987 /pkgs/development/web
parent434a0111f6a7618a7024b637c5496ea261b23016 (diff)
parent2988feba8cbcf87cc1156f924ad38d5918215a4c (diff)
downloadnixpkgs-cf64230d42ba59982643d8e8fe284a2093b2be3c.tar
nixpkgs-cf64230d42ba59982643d8e8fe284a2093b2be3c.tar.gz
nixpkgs-cf64230d42ba59982643d8e8fe284a2093b2be3c.tar.bz2
nixpkgs-cf64230d42ba59982643d8e8fe284a2093b2be3c.tar.lz
nixpkgs-cf64230d42ba59982643d8e8fe284a2093b2be3c.tar.xz
nixpkgs-cf64230d42ba59982643d8e8fe284a2093b2be3c.tar.zst
nixpkgs-cf64230d42ba59982643d8e8fe284a2093b2be3c.zip
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/development/web')
-rw-r--r--pkgs/development/web/nodejs/v10.nix4
-rw-r--r--pkgs/development/web/nodejs/v12.nix4
-rw-r--r--pkgs/development/web/nodejs/v13.nix13
-rw-r--r--pkgs/development/web/nodejs/v14.nix4
4 files changed, 6 insertions, 19 deletions
diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix
index f473bb250aa..4cd2502f196 100644
--- a/pkgs/development/web/nodejs/v10.nix
+++ b/pkgs/development/web/nodejs/v10.nix
@@ -8,6 +8,6 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "10.21.0";
-    sha256 = "0fxpvjm3gyfwapn55av8q9w1ds0l4nmn6ybdlslcmjiqhfi1zc16";
+    version = "10.22.0";
+    sha256 = "1nz18fa550li10r0kzsm28c2rvvq61nq8bqdygip0rmvbi2paxg0";
   }
diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix
index 503461cc483..571042b73c2 100644
--- a/pkgs/development/web/nodejs/v12.nix
+++ b/pkgs/development/web/nodejs/v12.nix
@@ -8,6 +8,6 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "12.18.2";
-    sha256 = "1wnxab2shqgs5in0h39qy2fc7f32pcz4gl9i2mj1001pfani1g9q";
+    version = "12.18.3";
+    sha256 = "03hdds6ghlmbz8q61alqj18pdnyd6hxmbhiws4pl51wlawk805bi";
   }
diff --git a/pkgs/development/web/nodejs/v13.nix b/pkgs/development/web/nodejs/v13.nix
deleted file mode 100644
index f157269b636..00000000000
--- a/pkgs/development/web/nodejs/v13.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ callPackage, openssl, icu, python3, enableNpm ? true }:
-
-let
-  buildNodejs = callPackage ./nodejs.nix {
-    inherit openssl icu;
-    python = python3;
-  };
-in
-  buildNodejs {
-    inherit enableNpm;
-    version = "13.14.0";
-    sha256 = "1gi9nl99wsiqpwm266jdsa8g6rmjw4wqwgrkx9f2qk1y3hjcs0vf";
-  }
diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix
index 7b83a5db539..495b6656823 100644
--- a/pkgs/development/web/nodejs/v14.nix
+++ b/pkgs/development/web/nodejs/v14.nix
@@ -8,6 +8,6 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "14.5.0";
-    sha256 = "1d6w7ycdiqbkip7m6m8xly31qgx7ywakzvrnqdq8ini5sricjlgb";
+    version = "14.6.0";
+    sha256 = "153a07ffrmvwbsc78wrc0xnwymmzrhva0kn6mgnfi3086v3h1wss";
   }