about summary refs log tree commit diff
path: root/pkgs/tools/package-management
diff options
context:
space:
mode:
authortobias pflug <tobias.pflug@gmail.com>2019-04-04 19:10:06 +0200
committeradisbladis <adisbladis@gmail.com>2019-04-04 18:43:06 +0100
commit0e296d5fcdaf32dd113e49738dfba6216c01a8da (patch)
tree38177d4df94606db8b125e2077644bc887e14ffa /pkgs/tools/package-management
parentb306b4cf1a9709dd8e671af6ebf75151e359e54f (diff)
downloadnixlib-0e296d5fcdaf32dd113e49738dfba6216c01a8da.tar
nixlib-0e296d5fcdaf32dd113e49738dfba6216c01a8da.tar.gz
nixlib-0e296d5fcdaf32dd113e49738dfba6216c01a8da.tar.bz2
nixlib-0e296d5fcdaf32dd113e49738dfba6216c01a8da.tar.lz
nixlib-0e296d5fcdaf32dd113e49738dfba6216c01a8da.tar.xz
nixlib-0e296d5fcdaf32dd113e49738dfba6216c01a8da.tar.zst
nixlib-0e296d5fcdaf32dd113e49738dfba6216c01a8da.zip
Remove nodejs-6_x which is about to enter EOL
- Remove nodejs-6_x
- Set nodejs / nodejs-slim to nodejs-8_x / nodejs-slim-8_x
- Re-generate node2nix generated files using nodejs-8_x instead
Diffstat (limited to 'pkgs/tools/package-management')
-rwxr-xr-xpkgs/tools/package-management/nixui/generate.sh2
-rw-r--r--pkgs/tools/package-management/nixui/nixui.nix2
-rw-r--r--pkgs/tools/package-management/nixui/node-packages.nix2
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/package-management/nixui/generate.sh b/pkgs/tools/package-management/nixui/generate.sh
index c7a93a716731..334edb4a027a 100755
--- a/pkgs/tools/package-management/nixui/generate.sh
+++ b/pkgs/tools/package-management/nixui/generate.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env nix-shell
 #! nix-shell -i bash -p nodePackages.node2nix
 
-exec node2nix -6 -i pkg.json -c nixui.nix -e ../../../development/node-packages/node-env.nix --no-copy-node-env
+exec node2nix -8 -i pkg.json -c nixui.nix -e ../../../development/node-packages/node-env.nix --no-copy-node-env
diff --git a/pkgs/tools/package-management/nixui/nixui.nix b/pkgs/tools/package-management/nixui/nixui.nix
index 8f3be4cc8c7f..29d77f0bf9a6 100644
--- a/pkgs/tools/package-management/nixui/nixui.nix
+++ b/pkgs/tools/package-management/nixui/nixui.nix
@@ -2,7 +2,7 @@
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}:
 
 let
   nodeEnv = import ../../../development/node-packages/node-env.nix {
diff --git a/pkgs/tools/package-management/nixui/node-packages.nix b/pkgs/tools/package-management/nixui/node-packages.nix
index 846e9bcfc12a..b019c7ef3772 100644
--- a/pkgs/tools/package-management/nixui/node-packages.nix
+++ b/pkgs/tools/package-management/nixui/node-packages.nix
@@ -102,6 +102,6 @@ in
       license = "Apache-2.0";
     };
     production = true;
-    bypassCache = false;
+    bypassCache = true;
   };
 }
\ No newline at end of file