Merge pull request #58976 from gilligan/remove-nodejs6

Remove nodejs-6_x which is about to enter EOL
This commit is contained in:
Samuel Dionne-Riel
2019-04-07 19:49:24 -04:00
committed by GitHub
23 changed files with 3513 additions and 713 deletions
@@ -1,17 +0,0 @@
# This file has been generated by node2nix 1.6.0. Do not edit!
{pkgs ? import <nixpkgs> {
inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}:
let
nodeEnv = import ./node-env.nix {
inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
in
import ./node-packages-v6.nix {
inherit (pkgs) fetchurl fetchgit;
inherit nodeEnv;
}
@@ -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
-10
View File
@@ -1,10 +0,0 @@
{ stdenv, callPackage, lib, enableNpm ? true }:
let
buildNodejs = callPackage ./nodejs.nix {};
in
buildNodejs {
inherit enableNpm;
version = "6.17.0";
sha256 = "0j17cpl1mbqvbaa0bk9n3nd34jdyljbvm53gx8n64bhwly7cgnn1";
}
+1 -1
View File
@@ -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
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -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 ../../node-packages/node-env.nix {