public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert Nodejs-8_x deprecation

Browse Source 
This was supposed to go through a pull request

Revert "nodePackages: Regenerate node packages for nodejs 10 & 12"
This reverts commit 6a17bdf397.

Revert "nodejs-8_x: Drop package"
This reverts commit e06c97b71d.
This commit is contained in:
adisbladis
2019-07-05 12:23:27 +01:00
parent e06c97b71d
commit d614edeb32
23 changed files with 15447 additions and 8905 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/web-apps/codimd/CodeMirror/default.nix
+2 -2
View File
@@ -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"
pkgs/servers/web-apps/codimd/CodeMirror/node.nix
+1 -1
View File
@@ -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 {
pkgs/servers/web-apps/codimd/default.nix
+5 -5
View File
@@ -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/
'';
pkgs/servers/web-apps/codimd/node.nix
+1 -1
View File
@@ -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 {