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
This commit is contained in:
tobias pflug
2019-04-04 18:43:06 +01:00
committed by adisbladis
parent b306b4cf1a
commit 0e296d5fcd
26 changed files with 3521 additions and 721 deletions
@@ -1,4 +1,4 @@
{ stdenv, pkgs, buildEnv, fetchFromGitHub, nodejs-6_x, phantomjs2, which }:
{ stdenv, pkgs, buildEnv, fetchFromGitHub, nodejs-8_x, phantomjs2, which }:
let
nodePackages = import ./node.nix {
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ which ];
buildInputs = [ nodejs-6_x phantomjs-prebuilt ] ++ (stdenv.lib.attrVals [
buildInputs = [ nodejs-8_x phantomjs-prebuilt ] ++ (stdenv.lib.attrVals [
"blint-^1"
"node-static-0.6.0"
"rollup-^0.41.0"
@@ -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 {
@@ -14,4 +14,4 @@ in
import ./node-packages.nix {
inherit (pkgs) fetchurl fetchgit;
inherit nodeEnv;
}
}
+3 -3
View File
@@ -1,5 +1,5 @@
{ stdenv, pkgs, buildEnv, fetchFromGitHub, makeWrapper
, fetchpatch, nodejs-6_x, phantomjs2, runtimeShell }:
, fetchpatch, nodejs-8_x, phantomjs2, runtimeShell }:
let
nodePackages = import ./node.nix {
inherit pkgs;
@@ -107,7 +107,7 @@ stdenv.mkDerivation rec {
inherit name version src;
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ nodejs-6_x ];
buildInputs = [ nodejs-8_x ];
NODE_PATH = "${nodeEnv}/lib/node_modules";
@@ -127,7 +127,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin
cat > $out/bin/codimd <<EOF
#!${runtimeShell}
${nodejs-6_x}/bin/node $out/app.js
${nodejs-8_x}/bin/node $out/app.js
EOF
cp -R {app.js,bin,lib,locales,package.json,public} $out/
'';
+1 -1
View File
@@ -1,7 +1,7 @@
#!/usr/bin/env nix-shell
#! nix-shell -i bash -p nodePackages.node2nix
node2nix -6 -i deps.json \
node2nix -8 -i deps.json \
-e ../../../development/node-packages/node-env.nix \
--no-copy-node-env \
-c node.nix
+2 -2
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 ../../../development/node-packages/node-env.nix {
@@ -14,4 +14,4 @@ in
import ./node-packages.nix {
inherit (pkgs) fetchurl fetchgit;
inherit nodeEnv;
}
}