Merge pull request #58976 from gilligan/remove-nodejs6

Remove nodejs-6_x which is about to enter EOL
NixOS · Apr 7, 2019 · 40d59c6 · 40d59c6
2 parents 096603c + 0e296d5
commit 40d59c6
Show file tree

Hide file tree

Showing 23 changed files with 3,512 additions and 712 deletions.
diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -534,6 +534,13 @@
       Same applies to the new <literal>users.ldap.daemon.rootpwmodpwFile</literal> option.
     </para>
    </listitem>
+   <listitem>
+     <para>
+       <literal>nodejs-6_x</literal> is end-of-life.
+       <literal>nodejs-6_x</literal>, <literal>nodejs-slim-6_x</literal> and
+       <literal>nodePackages_6_x</literal> are removed.
+     </para>
+   </listitem>
   </itemizedlist>
  </section>
 

diff --git a/pkgs/development/node-packages/composition-v6.nix b/pkgs/development/node-packages/composition-v6.nix
diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh
@@ -4,6 +4,5 @@
 set -eu -o pipefail
 
 rm -f node-env.nix
-node2nix -6 -i node-packages-v6.json -o node-packages-v6.nix -c composition-v6.nix
 node2nix -8 -i node-packages-v8.json -o node-packages-v8.nix -c composition-v8.nix
 node2nix --nodejs-10 -i node-packages-v10.json -o node-packages-v10.nix -c composition-v10.nix
diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix
diff --git a/pkgs/development/web/remarkjs/generate.sh b/pkgs/development/web/remarkjs/generate.sh
@@ -1,3 +1,3 @@
 #!/bin/sh -e
 
-node2nix -6 -i pkgs.json -c nodepkgs.nix -e ../../node-packages/node-env.nix
+node2nix -8 -i pkgs.json -c nodepkgs.nix -e ../../node-packages/node-env.nix