diff options
author | adisbladis <adisbladis@gmail.com> | 2019-07-05 12:22:58 +0100 |
---|---|---|
committer | adisbladis <adisbladis@gmail.com> | 2019-07-05 12:23:27 +0100 |
commit | d614edeb32684eae23a18ce7c46b82588f697056 (patch) | |
tree | ac5f3fdceabd54c7a7028674eccc678b6e1b1315 /pkgs/servers/web-apps | |
parent | e06c97b71d33bf8480fb40f825e8d3138783f986 (diff) |
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 commit 6a17bdf3974fce9d0c5098e77aa5fe6de279f2c7. Revert "nodejs-8_x: Drop package" This reverts commit e06c97b71d33bf8480fb40f825e8d3138783f986.
Diffstat (limited to 'pkgs/servers/web-apps')
-rw-r--r-- | pkgs/servers/web-apps/codimd/CodeMirror/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/web-apps/codimd/CodeMirror/node.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/web-apps/codimd/default.nix | 10 | ||||
-rw-r--r-- | pkgs/servers/web-apps/codimd/node.nix | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/servers/web-apps/codimd/CodeMirror/default.nix b/pkgs/servers/web-apps/codimd/CodeMirror/default.nix index 79182d926de0b..2dba13d091437 100644 --- a/pkgs/servers/web-apps/codimd/CodeMirror/default.nix +++ b/pkgs/servers/web-apps/codimd/CodeMirror/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchFromGitHub, nodejs-10_x, phantomjs2, which }: +{ stdenv, pkgs, fetchFromGitHub, nodejs-8_x, phantomjs2, which }: let nodePackages = import ./node.nix { @@ -22,7 +22,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ which ]; - buildInputs = [ nodejs-10_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" diff --git a/pkgs/servers/web-apps/codimd/CodeMirror/node.nix b/pkgs/servers/web-apps/codimd/CodeMirror/node.nix index 6a5283528fca5..fd7fc4dfe0ce9 100644 --- a/pkgs/servers/web-apps/codimd/CodeMirror/node.nix +++ b/pkgs/servers/web-apps/codimd/CodeMirror/node.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}: let nodeEnv = import ../../../../development/node-packages/node-env.nix { diff --git a/pkgs/servers/web-apps/codimd/default.nix b/pkgs/servers/web-apps/codimd/default.nix index ac4446ca16498..79ad58dddd8d3 100644 --- a/pkgs/servers/web-apps/codimd/default.nix +++ b/pkgs/servers/web-apps/codimd/default.nix @@ -1,5 +1,5 @@ { stdenv, pkgs, buildEnv, fetchFromGitHub, makeWrapper -, fetchpatch, nodejs-10_x, phantomjs2, runtimeShell }: +, fetchpatch, nodejs-8_x, phantomjs2, runtimeShell }: let nodePackages = let # Some packages fail to install with ENOTCACHED due to a mistakenly added @@ -96,7 +96,7 @@ let # has resolved the issue. (import ./js-sequence-diagrams { inherit pkgs; - nodejs = nodejs-10_x; + nodejs = nodejs-8_x; extraNodePackages = { lodash = nodePackages."lodash-^4.17.4"; eve = nodePackages."eve-^0.5.4"; @@ -143,7 +143,7 @@ stdenv.mkDerivation rec { inherit name version src; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ nodejs-10_x ]; + buildInputs = [ nodejs-8_x ]; NODE_PATH = "${nodeEnv}/lib/node_modules"; @@ -157,7 +157,7 @@ stdenv.mkDerivation rec { postPatch = '' # due to the `dontNpmInstall` workaround, `node_modules/.bin` isn't created anymore. 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 = '' @@ -169,7 +169,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cat > $out/bin/codimd <<EOF #!${runtimeShell} - ${nodejs-10_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/ ''; diff --git a/pkgs/servers/web-apps/codimd/node.nix b/pkgs/servers/web-apps/codimd/node.nix index 8fe405e1b3e90..0983d3e127be7 100644 --- a/pkgs/servers/web-apps/codimd/node.nix +++ b/pkgs/servers/web-apps/codimd/node.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { |