Revert Nodejs-8_x deprecation
This was supposed to go through a pull request Revert "nodePackages: Regenerate node packages for nodejs 10 & 12" This reverts commit6a17bdf397
. Revert "nodejs-8_x: Drop package" This reverts commite06c97b71d
.
This commit is contained in:
parent
e06c97b71d
commit
d614edeb32
|
@ -182,11 +182,6 @@
|
||||||
<xref linkend="opt-programs.zsh.loginShellInit" /> and <xref linkend="opt-programs.zsh.promptInit" /> may break if it relies on those options being set.
|
<xref linkend="opt-programs.zsh.loginShellInit" /> and <xref linkend="opt-programs.zsh.promptInit" /> may break if it relies on those options being set.
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
<listitem>
|
|
||||||
<para>
|
|
||||||
Nodejs 8 is scheduled EOL under the lifetime of 19.09 and has been dropped.
|
|
||||||
</para>
|
|
||||||
</listitem>
|
|
||||||
</itemizedlist>
|
</itemizedlist>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetchFromGitHub, fetchNodeModules, nodejs-10_x, ruby, sencha
|
{ stdenv, fetchFromGitHub, fetchNodeModules, nodejs-8_x, ruby, sencha
|
||||||
, auth0ClientID, auth0Domain }:
|
, auth0ClientID, auth0Domain }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -12,12 +12,12 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "1h44srl2gzkhjaazpwz1pwy4dp5x776fc685kahlvjlsfls0fvy9";
|
sha256 = "1h44srl2gzkhjaazpwz1pwy4dp5x776fc685kahlvjlsfls0fvy9";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ nodejs-10_x ruby sencha ];
|
nativeBuildInputs = [ nodejs-8_x ruby sencha ];
|
||||||
|
|
||||||
node_modules = fetchNodeModules {
|
node_modules = fetchNodeModules {
|
||||||
inherit src;
|
inherit src;
|
||||||
|
|
||||||
nodejs = nodejs-10_x;
|
nodejs = nodejs-8_x;
|
||||||
sha256 = "0qsgr8cq81yismal5sqr02skakqpynwwzk5s98dr5bg91y361fgy";
|
sha256 = "0qsgr8cq81yismal5sqr02skakqpynwwzk5s98dr5bg91y361fgy";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@ rec {
|
||||||
|
|
||||||
buildApp = import ./build-app.nix {
|
buildApp = import ./build-app.nix {
|
||||||
inherit (pkgs) stdenv python which file jdk nodejs;
|
inherit (pkgs) stdenv python which file jdk nodejs;
|
||||||
inherit (pkgs.nodePackages_10_x) alloy titanium;
|
inherit (pkgs.nodePackages_8_x) alloy titanium;
|
||||||
inherit (androidenv) composeAndroidPackages;
|
inherit (androidenv) composeAndroidPackages;
|
||||||
inherit (xcodeenv) composeXcodeWrapper;
|
inherit (xcodeenv) composeXcodeWrapper;
|
||||||
inherit titaniumsdk;
|
inherit titaniumsdk;
|
||||||
|
|
17
pkgs/development/node-packages/composition-v8.nix
Normal file
17
pkgs/development/node-packages/composition-v8.nix
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
# This file has been generated by node2nix 1.7.0. Do not edit!
|
||||||
|
|
||||||
|
{pkgs ? import <nixpkgs> {
|
||||||
|
inherit system;
|
||||||
|
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_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-v8.nix {
|
||||||
|
inherit (pkgs) fetchurl fetchgit;
|
||||||
|
inherit nodeEnv;
|
||||||
|
}
|
|
@ -7,6 +7,15 @@ let
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
nodePackages // {
|
nodePackages // {
|
||||||
|
aws-azure-login = nodePackages.aws-azure-login.override {
|
||||||
|
PUPPETEER_SKIP_CHROMIUM_DOWNLOAD = "true";
|
||||||
|
|
||||||
|
buildInputs = [ pkgs.makeWrapper ];
|
||||||
|
postInstall = ''
|
||||||
|
wrapProgram "$out/bin/aws-azure-login" --set PUPPETEER_EXECUTABLE_PATH "${pkgs.chromium}/bin/chromium"
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
bower2nix = nodePackages.bower2nix.override {
|
bower2nix = nodePackages.bower2nix.override {
|
||||||
buildInputs = [ pkgs.makeWrapper ];
|
buildInputs = [ pkgs.makeWrapper ];
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
|
|
27
pkgs/development/node-packages/default-v8.nix
Normal file
27
pkgs/development/node-packages/default-v8.nix
Normal file
|
@ -0,0 +1,27 @@
|
||||||
|
{ pkgs, nodejs, stdenv }:
|
||||||
|
|
||||||
|
let
|
||||||
|
nodePackages = import ./composition-v8.nix {
|
||||||
|
inherit pkgs nodejs;
|
||||||
|
inherit (stdenv.hostPlatform) system;
|
||||||
|
};
|
||||||
|
in
|
||||||
|
nodePackages // {
|
||||||
|
pnpm = nodePackages.pnpm.override {
|
||||||
|
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||||
|
postInstall = let
|
||||||
|
pnpmLibPath = stdenv.lib.makeBinPath [
|
||||||
|
nodejs.passthru.python
|
||||||
|
nodejs
|
||||||
|
];
|
||||||
|
in ''
|
||||||
|
for prog in $out/bin/*; do
|
||||||
|
wrapProgram "$prog" --prefix PATH : ${pnpmLibPath}
|
||||||
|
done
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
stf = nodePackages.stf.override {
|
||||||
|
nativeBuildInputs = with pkgs; [ yasm czmq protobufc ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -4,5 +4,6 @@
|
||||||
set -eu -o pipefail
|
set -eu -o pipefail
|
||||||
|
|
||||||
rm -f node-env.nix
|
rm -f node-env.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
|
node2nix --nodejs-10 -i node-packages-v10.json -o node-packages-v10.nix -c composition-v10.nix
|
||||||
node2nix --nodejs-12 -i node-packages-v12.json -o node-packages-v12.nix -c composition-v12.nix
|
node2nix --nodejs-12 -i node-packages-v12.json -o node-packages-v12.nix -c composition-v12.nix
|
||||||
|
|
|
@ -1,14 +1,7 @@
|
||||||
[
|
[
|
||||||
"@angular/cli"
|
"@angular/cli"
|
||||||
, "@vue/cli"
|
|
||||||
, "@webassemblyjs/cli"
|
|
||||||
, "@webassemblyjs/repl"
|
|
||||||
, "@webassemblyjs/wasm-strip"
|
|
||||||
, "@webassemblyjs/wasm-text-gen"
|
|
||||||
, "@webassemblyjs/wast-refmt"
|
|
||||||
, "alloy"
|
|
||||||
, "asar"
|
, "asar"
|
||||||
, "azure-cli"
|
, "aws-azure-login"
|
||||||
, "azure-functions-core-tools"
|
, "azure-functions-core-tools"
|
||||||
, "bash-language-server"
|
, "bash-language-server"
|
||||||
, "bower"
|
, "bower"
|
||||||
|
@ -32,10 +25,10 @@
|
||||||
, "elm-live"
|
, "elm-live"
|
||||||
, "elm-oracle"
|
, "elm-oracle"
|
||||||
, "emoj"
|
, "emoj"
|
||||||
, "emojione"
|
|
||||||
, "eslint"
|
, "eslint"
|
||||||
, "eslint_d"
|
, "eslint_d"
|
||||||
, {"fast-cli": "1.x"}
|
, "emojione"
|
||||||
|
, { "fast-cli": "1.x" }
|
||||||
, "fkill-cli"
|
, "fkill-cli"
|
||||||
, "forever"
|
, "forever"
|
||||||
, "git-run"
|
, "git-run"
|
||||||
|
@ -45,26 +38,26 @@
|
||||||
, "grunt-cli"
|
, "grunt-cli"
|
||||||
, "gulp"
|
, "gulp"
|
||||||
, "gulp-cli"
|
, "gulp-cli"
|
||||||
, "html-minifier"
|
|
||||||
, "htmlhint"
|
, "htmlhint"
|
||||||
|
, "html-minifier"
|
||||||
, "http-server"
|
, "http-server"
|
||||||
, "hueadm"
|
, "hueadm"
|
||||||
, "imapnotify"
|
|
||||||
, "indium"
|
|
||||||
, "ionic"
|
, "ionic"
|
||||||
, "ios-deploy"
|
, "ios-deploy"
|
||||||
|
, "imapnotify"
|
||||||
|
, "indium"
|
||||||
, "jake"
|
, "jake"
|
||||||
, "javascript-typescript-langserver"
|
, "javascript-typescript-langserver"
|
||||||
, "joplin"
|
, "joplin"
|
||||||
, "js-beautify"
|
|
||||||
, "js-yaml"
|
|
||||||
, "jsdoc"
|
, "jsdoc"
|
||||||
, "jshint"
|
, "jshint"
|
||||||
, "json"
|
, "json"
|
||||||
|
, "js-beautify"
|
||||||
|
, "jsonlint"
|
||||||
, "json-diff"
|
, "json-diff"
|
||||||
, "json-refs"
|
, "json-refs"
|
||||||
, "json-server"
|
, "json-server"
|
||||||
, "jsonlint"
|
, "js-yaml"
|
||||||
, "karma"
|
, "karma"
|
||||||
, "lcov-result-merger"
|
, "lcov-result-merger"
|
||||||
, "leetcode-cli"
|
, "leetcode-cli"
|
||||||
|
@ -73,7 +66,7 @@
|
||||||
, "less-plugin-clean-css"
|
, "less-plugin-clean-css"
|
||||||
, "live-server"
|
, "live-server"
|
||||||
, "livedown"
|
, "livedown"
|
||||||
, {"lumo-build-deps": "../interpreters/clojurescript/lumo" }
|
, { "lumo-build-deps": "../interpreters/clojurescript/lumo" }
|
||||||
, "madoko"
|
, "madoko"
|
||||||
, "markdown-link-check"
|
, "markdown-link-check"
|
||||||
, "mathjax"
|
, "mathjax"
|
||||||
|
@ -83,25 +76,25 @@
|
||||||
, "multi-file-swagger"
|
, "multi-file-swagger"
|
||||||
, "neovim"
|
, "neovim"
|
||||||
, "nijs"
|
, "nijs"
|
||||||
|
, "node2nix"
|
||||||
, "node-gyp"
|
, "node-gyp"
|
||||||
, "node-gyp-build"
|
, "node-gyp-build"
|
||||||
, "node-inspector"
|
, "node-inspector"
|
||||||
, "node-pre-gyp"
|
, "node-pre-gyp"
|
||||||
, "node-red"
|
|
||||||
, "node2nix"
|
|
||||||
, "nodemon"
|
, "nodemon"
|
||||||
|
, "node-red"
|
||||||
, "npm"
|
, "npm"
|
||||||
|
, { "npm2nix": "git://github.com/NixOS/npm2nix.git#5.12.0" }
|
||||||
, "npm-check-updates"
|
, "npm-check-updates"
|
||||||
, {"npm2nix": "git://github.com/NixOS/npm2nix.git#5.12.0"}
|
|
||||||
, "ocaml-language-server"
|
, "ocaml-language-server"
|
||||||
, "parcel-bundler"
|
|
||||||
, "peerflix"
|
, "peerflix"
|
||||||
, "peerflix-server"
|
, "peerflix-server"
|
||||||
, "pnpm"
|
, "pnpm"
|
||||||
|
, "parcel-bundler"
|
||||||
, "prettier"
|
, "prettier"
|
||||||
, "pulp"
|
, "pulp"
|
||||||
, "react-native-cli"
|
|
||||||
, "react-tools"
|
, "react-tools"
|
||||||
|
, "react-native-cli"
|
||||||
, "reveal.js"
|
, "reveal.js"
|
||||||
, "s3http"
|
, "s3http"
|
||||||
, "scuttlebot"
|
, "scuttlebot"
|
||||||
|
@ -114,10 +107,9 @@
|
||||||
, "socket.io"
|
, "socket.io"
|
||||||
, "speed-test"
|
, "speed-test"
|
||||||
, "stackdriver-statsd-backend"
|
, "stackdriver-statsd-backend"
|
||||||
, "stf"
|
|
||||||
, "svgo"
|
, "svgo"
|
||||||
, "swagger"
|
, "swagger"
|
||||||
, {"tedicross": "git+https://github.com/TediCross/TediCross.git#v0.8.7"}
|
, { "tedicross": "git+https://github.com/TediCross/TediCross.git#v0.8.7" }
|
||||||
, "tern"
|
, "tern"
|
||||||
, "textlint"
|
, "textlint"
|
||||||
, "textlint-plugin-latex"
|
, "textlint-plugin-latex"
|
||||||
|
@ -135,7 +127,6 @@
|
||||||
, "textlint-rule-write-good"
|
, "textlint-rule-write-good"
|
||||||
, "three"
|
, "three"
|
||||||
, "tiddlywiki"
|
, "tiddlywiki"
|
||||||
, "titanium"
|
|
||||||
, "triton"
|
, "triton"
|
||||||
, "tsun"
|
, "tsun"
|
||||||
, "ttf2eot"
|
, "ttf2eot"
|
||||||
|
@ -146,11 +137,17 @@
|
||||||
, "vscode-css-languageserver-bin"
|
, "vscode-css-languageserver-bin"
|
||||||
, "vscode-html-languageserver-bin"
|
, "vscode-html-languageserver-bin"
|
||||||
, "vue-cli"
|
, "vue-cli"
|
||||||
|
, "@vue/cli"
|
||||||
, "vue-language-server"
|
, "vue-language-server"
|
||||||
, "web-ext"
|
, "@webassemblyjs/cli"
|
||||||
|
, "@webassemblyjs/repl"
|
||||||
|
, "@webassemblyjs/wasm-strip"
|
||||||
|
, "@webassemblyjs/wasm-text-gen"
|
||||||
|
, "@webassemblyjs/wast-refmt"
|
||||||
, "webpack"
|
, "webpack"
|
||||||
, "webpack-cli"
|
, "webpack-cli"
|
||||||
, "webtorrent-cli"
|
, "webtorrent-cli"
|
||||||
|
, "web-ext"
|
||||||
, "wring"
|
, "wring"
|
||||||
, "write-good"
|
, "write-good"
|
||||||
, "yarn"
|
, "yarn"
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -256,13 +256,13 @@ let
|
||||||
sha1 = "1b681c21ff84033c826543090689420d187151dc";
|
sha1 = "1b681c21ff84033c826543090689420d187151dc";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
"chownr-1.1.2" = {
|
"chownr-1.1.1" = {
|
||||||
name = "chownr";
|
name = "chownr";
|
||||||
packageName = "chownr";
|
packageName = "chownr";
|
||||||
version = "1.1.2";
|
version = "1.1.1";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://registry.npmjs.org/chownr/-/chownr-1.1.2.tgz";
|
url = "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz";
|
||||||
sha512 = "GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A==";
|
sha512 = "j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
"class-utils-0.3.6" = {
|
"class-utils-0.3.6" = {
|
||||||
|
@ -2607,7 +2607,7 @@ in
|
||||||
sources."buffer-from-1.1.1"
|
sources."buffer-from-1.1.1"
|
||||||
sources."builtins-1.0.3"
|
sources."builtins-1.0.3"
|
||||||
sources."caseless-0.12.0"
|
sources."caseless-0.12.0"
|
||||||
sources."chownr-1.1.2"
|
sources."chownr-1.1.1"
|
||||||
sources."code-point-at-1.1.0"
|
sources."code-point-at-1.1.0"
|
||||||
sources."combined-stream-1.0.8"
|
sources."combined-stream-1.0.8"
|
||||||
sources."concat-map-0.0.1"
|
sources."concat-map-0.0.1"
|
||||||
|
|
13
pkgs/development/node-packages/node-packages-v8.json
Normal file
13
pkgs/development/node-packages/node-packages-v8.json
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
[
|
||||||
|
"alloy"
|
||||||
|
, "azure-cli"
|
||||||
|
, "bower"
|
||||||
|
, "coffee-script"
|
||||||
|
, "grunt-cli"
|
||||||
|
, "node-gyp"
|
||||||
|
, "node-gyp-build"
|
||||||
|
, "node-pre-gyp"
|
||||||
|
, "pnpm"
|
||||||
|
, "stf"
|
||||||
|
, "titanium"
|
||||||
|
]
|
10069
pkgs/development/node-packages/node-packages-v8.nix
Normal file
10069
pkgs/development/node-packages/node-packages-v8.nix
Normal file
File diff suppressed because it is too large
Load diff
10
pkgs/development/web/nodejs/v8.nix
Normal file
10
pkgs/development/web/nodejs/v8.nix
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
{ callPackage, enableNpm ? true }:
|
||||||
|
|
||||||
|
let
|
||||||
|
buildNodejs = callPackage ./nodejs.nix {};
|
||||||
|
in
|
||||||
|
buildNodejs {
|
||||||
|
inherit enableNpm;
|
||||||
|
version = "8.16.0";
|
||||||
|
sha256 = "0h3k5y51fyysqnqb8n5v5zxga937pipag49xzx6xr9b82phfh59m";
|
||||||
|
}
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
{pkgs ? import <nixpkgs> {
|
{pkgs ? import <nixpkgs> {
|
||||||
inherit system;
|
inherit system;
|
||||||
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
|
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}:
|
||||||
|
|
||||||
let
|
let
|
||||||
nodeEnv = import ../../node-packages/node-env.nix {
|
nodeEnv = import ../../node-packages/node-env.nix {
|
||||||
|
|
2
pkgs/misc/base16-builder/node-packages.nix
generated
2
pkgs/misc/base16-builder/node-packages.nix
generated
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
{pkgs ? import <nixpkgs> {
|
{pkgs ? import <nixpkgs> {
|
||||||
inherit system;
|
inherit system;
|
||||||
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
|
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}:
|
||||||
|
|
||||||
let
|
let
|
||||||
nodeEnv = import ../../development/node-packages/node-env.nix {
|
nodeEnv = import ../../development/node-packages/node-env.nix {
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, pkgs, fetchFromGitHub, nodejs-10_x, phantomjs2, which }:
|
{ stdenv, pkgs, fetchFromGitHub, nodejs-8_x, phantomjs2, which }:
|
||||||
|
|
||||||
let
|
let
|
||||||
nodePackages = import ./node.nix {
|
nodePackages = import ./node.nix {
|
||||||
|
@ -22,7 +22,7 @@ stdenv.mkDerivation {
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ which ];
|
nativeBuildInputs = [ which ];
|
||||||
buildInputs = [ nodejs-10_x phantomjs-prebuilt ] ++ (stdenv.lib.attrVals [
|
buildInputs = [ nodejs-8_x phantomjs-prebuilt ] ++ (stdenv.lib.attrVals [
|
||||||
"blint-^1"
|
"blint-^1"
|
||||||
"node-static-0.6.0"
|
"node-static-0.6.0"
|
||||||
"rollup-^0.41.0"
|
"rollup-^0.41.0"
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
{pkgs ? import <nixpkgs> {
|
{pkgs ? import <nixpkgs> {
|
||||||
inherit system;
|
inherit system;
|
||||||
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
|
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}:
|
||||||
|
|
||||||
let
|
let
|
||||||
nodeEnv = import ../../../../development/node-packages/node-env.nix {
|
nodeEnv = import ../../../../development/node-packages/node-env.nix {
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{ stdenv, pkgs, buildEnv, fetchFromGitHub, makeWrapper
|
{ stdenv, pkgs, buildEnv, fetchFromGitHub, makeWrapper
|
||||||
, fetchpatch, nodejs-10_x, phantomjs2, runtimeShell }:
|
, fetchpatch, nodejs-8_x, phantomjs2, runtimeShell }:
|
||||||
let
|
let
|
||||||
nodePackages = let
|
nodePackages = let
|
||||||
# Some packages fail to install with ENOTCACHED due to a mistakenly added
|
# Some packages fail to install with ENOTCACHED due to a mistakenly added
|
||||||
|
@ -96,7 +96,7 @@ let
|
||||||
# has resolved the issue.
|
# has resolved the issue.
|
||||||
(import ./js-sequence-diagrams {
|
(import ./js-sequence-diagrams {
|
||||||
inherit pkgs;
|
inherit pkgs;
|
||||||
nodejs = nodejs-10_x;
|
nodejs = nodejs-8_x;
|
||||||
extraNodePackages = {
|
extraNodePackages = {
|
||||||
lodash = nodePackages."lodash-^4.17.4";
|
lodash = nodePackages."lodash-^4.17.4";
|
||||||
eve = nodePackages."eve-^0.5.4";
|
eve = nodePackages."eve-^0.5.4";
|
||||||
|
@ -143,7 +143,7 @@ stdenv.mkDerivation rec {
|
||||||
inherit name version src;
|
inherit name version src;
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
buildInputs = [ nodejs-10_x ];
|
buildInputs = [ nodejs-8_x ];
|
||||||
|
|
||||||
NODE_PATH = "${nodeEnv}/lib/node_modules";
|
NODE_PATH = "${nodeEnv}/lib/node_modules";
|
||||||
|
|
||||||
|
@ -157,7 +157,7 @@ stdenv.mkDerivation rec {
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
# due to the `dontNpmInstall` workaround, `node_modules/.bin` isn't created anymore.
|
# due to the `dontNpmInstall` workaround, `node_modules/.bin` isn't created anymore.
|
||||||
substituteInPlace package.json \
|
substituteInPlace package.json \
|
||||||
--replace "webpack --config" "${nodejs-10_x}/bin/node ./node_modules/webpack/bin/webpack.js --config"
|
--replace "webpack --config" "${nodejs-8_x}/bin/node ./node_modules/webpack/bin/webpack.js --config"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
|
@ -169,7 +169,7 @@ stdenv.mkDerivation rec {
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
cat > $out/bin/codimd <<EOF
|
cat > $out/bin/codimd <<EOF
|
||||||
#!${runtimeShell}
|
#!${runtimeShell}
|
||||||
${nodejs-10_x}/bin/node $out/app.js
|
${nodejs-8_x}/bin/node $out/app.js
|
||||||
EOF
|
EOF
|
||||||
cp -R {app.js,bin,lib,locales,package.json,public} $out/
|
cp -R {app.js,bin,lib,locales,package.json,public} $out/
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
{pkgs ? import <nixpkgs> {
|
{pkgs ? import <nixpkgs> {
|
||||||
inherit system;
|
inherit system;
|
||||||
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
|
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}:
|
||||||
|
|
||||||
let
|
let
|
||||||
nodeEnv = import ../../../development/node-packages/node-env.nix {
|
nodeEnv = import ../../../development/node-packages/node-env.nix {
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
{pkgs ? import <nixpkgs> {
|
{pkgs ? import <nixpkgs> {
|
||||||
inherit system;
|
inherit system;
|
||||||
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
|
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}:
|
||||||
|
|
||||||
let
|
let
|
||||||
nodeEnv = import ../../../development/node-packages/node-env.nix {
|
nodeEnv = import ../../../development/node-packages/node-env.nix {
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
{pkgs ? import <nixpkgs> {
|
{pkgs ? import <nixpkgs> {
|
||||||
inherit system;
|
inherit system;
|
||||||
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
|
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}:
|
||||||
|
|
||||||
let
|
let
|
||||||
nodeEnv = import ../../../development/node-packages/node-env.nix {
|
nodeEnv = import ../../../development/node-packages/node-env.nix {
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
{pkgs ? import <nixpkgs> {
|
{pkgs ? import <nixpkgs> {
|
||||||
inherit system;
|
inherit system;
|
||||||
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
|
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}:
|
||||||
|
|
||||||
let
|
let
|
||||||
nodeEnv = import ../../../development/node-packages/node-env.nix {
|
nodeEnv = import ../../../development/node-packages/node-env.nix {
|
||||||
|
|
|
@ -647,7 +647,7 @@ in
|
||||||
|
|
||||||
iamy = callPackage ../tools/admin/iamy { };
|
iamy = callPackage ../tools/admin/iamy { };
|
||||||
|
|
||||||
azure-cli = nodePackages_10_x.azure-cli;
|
azure-cli = nodePackages_8_x.azure-cli;
|
||||||
|
|
||||||
azure-storage-azcopy = callPackage ../development/tools/azcopy { };
|
azure-storage-azcopy = callPackage ../development/tools/azcopy { };
|
||||||
|
|
||||||
|
@ -4233,6 +4233,9 @@ in
|
||||||
|
|
||||||
nodejs-slim = nodejs-slim-10_x;
|
nodejs-slim = nodejs-slim-10_x;
|
||||||
|
|
||||||
|
nodejs-8_x = callPackage ../development/web/nodejs/v8.nix {};
|
||||||
|
nodejs-slim-8_x = callPackage ../development/web/nodejs/v8.nix { enableNpm = false; };
|
||||||
|
|
||||||
nodejs-10_x = callPackage ../development/web/nodejs/v10.nix {
|
nodejs-10_x = callPackage ../development/web/nodejs/v10.nix {
|
||||||
openssl = openssl_1_1;
|
openssl = openssl_1_1;
|
||||||
};
|
};
|
||||||
|
@ -4267,6 +4270,10 @@ in
|
||||||
nodejs = pkgs.nodejs-10_x;
|
nodejs = pkgs.nodejs-10_x;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
nodePackages_8_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v8.nix {
|
||||||
|
nodejs = pkgs.nodejs-8_x;
|
||||||
|
});
|
||||||
|
|
||||||
nodePackages = nodePackages_10_x;
|
nodePackages = nodePackages_10_x;
|
||||||
|
|
||||||
npm2nix = nodePackages.npm2nix;
|
npm2nix = nodePackages.npm2nix;
|
||||||
|
@ -16361,7 +16368,7 @@ in
|
||||||
|
|
||||||
|
|
||||||
iosevka = callPackage ../data/fonts/iosevka {
|
iosevka = callPackage ../data/fonts/iosevka {
|
||||||
nodejs = nodejs-10_x;
|
nodejs = nodejs-8_x;
|
||||||
};
|
};
|
||||||
iosevka-bin = callPackage ../data/fonts/iosevka/bin.nix {};
|
iosevka-bin = callPackage ../data/fonts/iosevka/bin.nix {};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue