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

Merge pull request #45700 from Mic92/node-packages-v8

Browse Source 
nodePackages: 6_x -> 8_x
This commit is contained in:
Jörg Thalheim 2018-09-01 09:09:24 +01:00 committed by GitHub
commit 4a74aca868
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 46253 additions and 49111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
doc/languages-frameworks/node.section.md
View File

@ -14,7 +14,7 @@ project.
The package set also provides support for multiple Node.js versions. The policy
is that a new package should be added to the collection for the latest stable LTS
release (which is currently 6.x), unless there is an explicit reason to support
release (which is currently 8.x), unless there is an explicit reason to support
a different release.
If your package uses native addons, you need to examine what kind of native
@ -26,7 +26,7 @@ build system it uses. Here are some examples:
After you have identified the correct system, you need to override your package
expression while adding in build system as a build input. For example, `dat`
requires `node-gyp-build`, so we override its expression in `default-v6.nix`:
requires `node-gyp-build`, so we override its expression in `default-v8.nix`:
```nix
dat = nodePackages.dat.override (oldAttrs: {
@ -36,14 +36,14 @@ dat = nodePackages.dat.override (oldAttrs: {
To add a package from NPM to nixpkgs:
1. Modify `pkgs/development/node-packages/node-packages-v6.json` to add, update
or remove package entries. (Or `pkgs/development/node-packages/node-packages-v4.json`
for packages depending on Node.js 4.x)
1. Modify `pkgs/development/node-packages/node-packages-v8.json` to add, update
or remove package entries. (Or `pkgs/development/node-packages/node-packages-v10.json`
for packages depending on Node.js 10.x)
2. Run the script: `(cd pkgs/development/node-packages && ./generate.sh)`.
3. Build your new package to test your changes:
`cd /path/to/nixpkgs && nix-build -A nodePackages.<new-or-updated-package>`.
To build against a specific Node.js version (e.g. 4.x):
`nix-build -A nodePackages_4_x.<new-or-updated-package>`
To build against a specific Node.js version (e.g. 10.x):
`nix-build -A nodePackages_10_x.<new-or-updated-package>`
4. Add and commit all modified and generated files.
For more information about the generation process, consult the

81
pkgs/development/node-packages/default-v6.nix
View File

@ -7,78 +7,17 @@ let
};
in
nodePackages // {
dat = nodePackages.dat.override {
buildInputs = [ nodePackages.node-gyp-build ];
};
dnschain = nodePackages.dnschain.override {
buildInputs = [ pkgs.makeWrapper nodePackages.coffee-script ];
postInstall = ''
wrapProgram $out/bin/dnschain --suffix PATH : ${pkgs.openssl.bin}/bin
'';
};
node-inspector = nodePackages.node-inspector.override {
buildInputs = [ nodePackages.node-pre-gyp ];
};
phantomjs = nodePackages.phantomjs.override {
buildInputs = [ pkgs.phantomjs2 ];
};
webdrvr = nodePackages.webdrvr.override {
buildInputs = [ pkgs.phantomjs ];
preRebuild = ''
mkdir $TMPDIR/webdrvr
ln -s ${pkgs.fetchurl {
url = "https://selenium-release.storage.googleapis.com/2.43/selenium-server-standalone-2.43.1.jar";
sha1 = "ef1b5f8ae9c99332f99ba8794988a1d5b974d27b";
}} $TMPDIR/webdrvr/selenium-server-standalone-2.43.1.jar
ln -s ${pkgs.fetchurl {
url = "http://chromedriver.storage.googleapis.com/2.10/chromedriver_linux64.zip";
sha1 = "26220f7e43ee3c0d714860db61c4d0ecc9bb3d89";
}} $TMPDIR/webdrvr/chromedriver_linux64.zip
'';
dontNpmInstall = true; # We face an error with underscore not found, but the package will work fine if we ignore this.
};
npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0".override {
postInstall = "npm run-script prepublish";
};
bower2nix = nodePackages.bower2nix.override {
buildInputs = [ pkgs.makeWrapper ];
postInstall = ''
for prog in bower2nix fetch-bower; do
wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]}
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
'';
};
ios-deploy = nodePackages.ios-deploy.override {
preRebuild = ''
LD=$CC
tmp=$(mktemp -d)
ln -s /usr/bin/xcodebuild $tmp
export PATH="$PATH:$tmp"
'';
};
fast-cli = nodePackages."fast-cli-1.x".override {
preRebuild = ''
# Simply ignore the phantomjs --version check. It seems to need a display but it is safe to ignore
sed -i -e "s|console.error('Error verifying phantomjs, continuing', err)|console.error('Error verifying phantomjs, continuing', err); return true;|" node_modules/phantomjs-prebuilt/lib/util.js
'';
buildInputs = [ pkgs.phantomjs2 ];
};
node2nix = nodePackages.node2nix.override {
buildInputs = [ pkgs.makeWrapper ];
postInstall = ''
wrapProgram "$out/bin/node2nix" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nix ]}
'';
};
}

96
pkgs/development/node-packages/default-v8.nix
View File

@ -7,25 +7,76 @@ let
};
in
nodePackages // {
bower2nix = nodePackages.bower2nix.override {
buildInputs = [ pkgs.makeWrapper ];
postInstall = ''
for prog in bower2nix fetch-bower; do
wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]}
done
'';
};
dat = nodePackages.dat.override {
buildInputs = [ nodePackages.node-gyp-build ];
};
dnschain = nodePackages.dnschain.override {
dnschain = nodePackages.dnschain.override {
buildInputs = [ pkgs.makeWrapper nodePackages.coffee-script ];
postInstall = ''
wrapProgram $out/bin/dnschain --suffix PATH : ${pkgs.openssl.bin}/bin
'';
};
ios-deploy = nodePackages.ios-deploy.override {
preRebuild = ''
LD=$CC
tmp=$(mktemp -d)
ln -s /usr/bin/xcodebuild $tmp
export PATH="$PATH:$tmp"
'';
};
fast-cli = nodePackages."fast-cli-1.x".override {
preRebuild = ''
# Simply ignore the phantomjs --version check. It seems to need a display but it is safe to ignore
sed -i -e "s|console.error('Error verifying phantomjs, continuing', err)|console.error('Error verifying phantomjs, continuing', err); return true;|" node_modules/phantomjs-prebuilt/lib/util.js
'';
buildInputs = [ pkgs.phantomjs2 ];
};
node-inspector = nodePackages.node-inspector.override {
buildInputs = [ nodePackages.node-pre-gyp ];
};
node2nix = nodePackages.node2nix.override {
buildInputs = [ pkgs.makeWrapper ];
postInstall = ''
wrapProgram "$out/bin/node2nix" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nix ]}
'';
};
npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0".override {
postInstall = "npm run-script prepublish";
};
phantomjs = nodePackages.phantomjs.override {
buildInputs = [ pkgs.phantomjs2 ];
};
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
'';
};
webdrvr = nodePackages.webdrvr.override {
buildInputs = [ pkgs.phantomjs ];
@ -45,47 +96,4 @@ nodePackages // {
dontNpmInstall = true; # We face an error with underscore not found, but the package will work fine if we ignore this.
};
npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0".override {
postInstall = "npm run-script prepublish";
};
bower2nix = nodePackages.bower2nix.override {
buildInputs = [ pkgs.makeWrapper ];
postInstall = ''
for prog in bower2nix fetch-bower; do
wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]}
done
'';
};
ios-deploy = nodePackages.ios-deploy.override {
preRebuild = ''
LD=$CC
tmp=$(mktemp -d)
ln -s /usr/bin/xcodebuild $tmp
export PATH="$PATH:$tmp"
'';
};
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
'';
};
fast-cli = nodePackages."fast-cli-1.x".override {
preRebuild = ''
# Simply ignore the phantomjs --version check. It seems to need a display but it is safe to ignore
sed -i -e "s|console.error('Error verifying phantomjs, continuing', err)|console.error('Error verifying phantomjs, continuing', err); return true;|" node_modules/phantomjs-prebuilt/lib/util.js
'';
buildInputs = [ pkgs.phantomjs2 ];
};
}

48
pkgs/development/node-packages/node-packages-v10.nix
View File

@ -661,13 +661,13 @@ let
sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa";
};
};
"glob-7.1.2" = {
"glob-7.1.3" = {
name = "glob";
packageName = "glob";
version = "7.1.2";
version = "7.1.3";
src = fetchurl {
url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz";
sha512 = "MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==";
url = "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz";
sha512 = "vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==";
};
};
"global-modules-1.0.0" = {
@ -787,13 +787,13 @@ let
sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1";
};
};
"iconv-lite-0.4.23" = {
"iconv-lite-0.4.24" = {
name = "iconv-lite";
packageName = "iconv-lite";
version = "0.4.23";
version = "0.4.24";
src = fetchurl {
url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz";
sha512 = "neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==";
url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz";
sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==";
};
};
"ignore-walk-3.0.1" = {
@ -1183,22 +1183,22 @@ let
sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==";
};
};
"mime-db-1.35.0" = {
"mime-db-1.36.0" = {
name = "mime-db";
packageName = "mime-db";
version = "1.35.0";
version = "1.36.0";
src = fetchurl {
url = "https://registry.npmjs.org/mime-db/-/mime-db-1.35.0.tgz";
sha512 = "JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg==";
url = "https://registry.npmjs.org/mime-db/-/mime-db-1.36.0.tgz";
sha512 = "L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==";
};
};
"mime-types-2.1.19" = {
"mime-types-2.1.20" = {
name = "mime-types";
packageName = "mime-types";
version = "2.1.19";
version = "2.1.20";
src = fetchurl {
url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.19.tgz";
sha512 = "P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw==";
url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.20.tgz";
sha512 = "HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==";
};
};
"minimatch-3.0.4" = {
@ -2416,7 +2416,7 @@ in
sources."fstream-1.0.11"
sources."gauge-2.7.4"
sources."getpass-0.1.7"
sources."glob-7.1.2"
sources."glob-7.1.3"
sources."graceful-fs-4.1.11"
sources."har-schema-2.0.0"
sources."har-validator-5.1.0"
@ -2434,8 +2434,8 @@ in
sources."json-schema-traverse-0.3.1"
sources."json-stringify-safe-5.0.1"
sources."jsprim-1.4.1"
sources."mime-db-1.35.0"
sources."mime-types-2.1.19"
sources."mime-db-1.36.0"
sources."mime-types-2.1.20"
sources."minimatch-3.0.4"
sources."minimist-0.0.8"
sources."mkdirp-0.5.1"
@ -2530,9 +2530,9 @@ in
sources."fs-minipass-1.2.5"
sources."fs.realpath-1.0.0"
sources."gauge-2.7.4"
sources."glob-7.1.2"
sources."glob-7.1.3"
sources."has-unicode-2.0.1"
sources."iconv-lite-0.4.23"
sources."iconv-lite-0.4.24"
sources."ignore-walk-3.0.1"
sources."inflight-1.0.6"
sources."inherits-2.0.3"
@ -2593,10 +2593,10 @@ in
pnpm = nodeEnv.buildNodePackage {
name = "pnpm";
packageName = "pnpm";
version = "2.13.5";
version = "2.13.6";
src = fetchurl {
url = "https://registry.npmjs.org/pnpm/-/pnpm-2.13.5.tgz";
sha512 = "JImNFSl+9EpBYJ4B3mvlAqkh1r8qweq1RsEsQ0BAUgL3+ZsMFtWYjRRlElg0u5FXwU+11p8s1bePIRTCQTKZ4g==";
url = "https://registry.npmjs.org/pnpm/-/pnpm-2.13.6.tgz";
sha512 = "X8zmtUzmEIa/QMg0t0eeq6hSd7kmL5Zvneqpj3Tcbyn2g/FEFTPb9kaghR+DW1WdViOE51eo4ECLK7uY9oogkA==";
};
buildInputs = globalBuildInputs;
meta = {

119
pkgs/development/node-packages/node-packages-v6.json
View File

@ -1,124 +1,9 @@
[
"alloy"
, "asar"
, "azure-cli"
, "bower"
, "bower2nix"
, "browserify"
, "castnow"
, "clean-css"
"bower"
, "coffee-script"
, "coinmon"
, "configurable-http-proxy"
, "cordova"
, "create-react-app"
, "create-react-native-app"
, "csslint"
, "dat"
, "dhcp"
, "dnschain"
, "docker-registry-server"
, "elasticdump"
, "elm-oracle"
, "elm-test"
, "emoj"
, "eslint"
, "eslint_d"
, "emojione"
, { "fast-cli": "1.x" }
, "fetch-bower"
, "forever"
, "git-run"
, "git-standup"
, "graphql-cli"
, "grunt-cli"
, { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " }
, "gulp"
, "hipache"
, "htmlhint"
, "html-minifier"
, "ionic"
, "ios-deploy"
, "istanbul"
, "imapnotify"
, "jake"
, "javascript-typescript-langserver"
, "jayschema"
, "jsdoc"
, "jshint"
, "json"
, "js-beautify"
, "jsonlint"
, "jsontool"
, "json-diff"
, "json-refs"
, "json-server"
, "js-yaml"
, "karma"
, { "kibana-authentication-proxy": "git://github.com/fangli/kibana-authentication-proxy.git" }
, "lcov-result-merger"
, "leetcode-cli"
, "lerna"
, "less"
, "less-plugin-clean-css"
, "live-server"
, "livedown"
, "madoko"
, "meat"
, "meguca"
, "mocha"
, "multi-file-swagger"
, "nijs"
, "node2nix"
, "node-gyp"
, "node-gyp-build"
, "node-inspector"
, "node-pre-gyp"
, "nodemon"
, "node-red"
, { "node-uptime": "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" }
, "npm"
, { "npm2nix": "git://github.com/NixOS/npm2nix.git#5.12.0" }
, "npm-check-updates"
, "nsp"
, "ocaml-language-server"
, { "parsoid": "git://github.com/abbradar/parsoid#stable" }
, "peerflix"
, "peerflix-server"
, "phantomjs"
, "prettier"
, "pulp"
, "quassel-webserver"
, "react-tools"
, "react-native-cli"
, "s3http"
, "semver"
, "serve"
, "shout"
, "sinopia"
, "sloc"
, "smartdc"
, "socket.io"
, "stackdriver-statsd-backend"
, "statsd"
, "statsd-influxdb-backend"
, "statsd-librato-backend"
, "stylus"
, "svgo"
, "tern"
, "tiddlywiki"
, "titanium"
, "triton"
, "typescript"
, "typings"
, "uglify-js"
, "ungit"
, "vue-cli"
, "webdrvr"
, "webpack"
, "webtorrent-cli"
, "web-ext"
, "wring"
, "yarn"
, "yo"
, "pnpm"
]

48676
pkgs/development/node-packages/node-packages-v6.nix
View File

File diff suppressed because it is too large Load Diff

124
pkgs/development/node-packages/node-packages-v8.json
View File

@ -1,20 +1,130 @@
[
"bower"
"alloy"
, "asar"
, "azure-cli"
, "bower"
, "bower2nix"
, "browserify"
, "castnow"
, "clean-css"
, "coffee-script"
, "coinmon"
, "configurable-http-proxy"
, "cordova"
, "create-cycle-app"
, "create-react-app"
, "create-react-native-app"
, "csslint"
, "dat"
, "dhcp"
, "dnschain"
, "docker-registry-server"
, "elasticdump"
, "elm-oracle"
, "elm-test"
, "emoj"
, "eslint"
, "eslint_d"
, "emojione"
, { "fast-cli": "1.x" }
, "fetch-bower"
, "forever"
, "git-run"
, "git-standup"
, "graphql-cli"
, "grunt-cli"
, { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " }
, "gulp"
, "hipache"
, "htmlhint"
, "html-minifier"
, "ionic"
, "ios-deploy"
, "istanbul"
, "imapnotify"
, "jake"
, "javascript-typescript-langserver"
, "jayschema"
, "jsdoc"
, "jshint"
, "json"
, "js-beautify"
, "jsonlint"
, "jsontool"
, "json-diff"
, "json-refs"
, "json-server"
, "js-yaml"
, "karma"
, { "kibana-authentication-proxy": "git://github.com/fangli/kibana-authentication-proxy.git" }
, "lcov-result-merger"
, "leetcode-cli"
, "lerna"
, "less"
, "less-plugin-clean-css"
, "live-server"
, "livedown"
, "madoko"
, "mathjax"
, "meat"
, "meguca"
, "mocha"
, "multi-file-swagger"
, "nijs"
, "node2nix"
, "node-gyp"
, "node-gyp-build"
, "node-inspector"
, "node-pre-gyp"
, "pnpm"
, "semver"
, "sloc"
, "vue-cli"
, "swagger"
, "nodemon"
, "node-red"
, { "node-uptime": "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" }
, "npm"
, { "npm2nix": "git://github.com/NixOS/npm2nix.git#5.12.0" }
, "npm-check-updates"
, "nsp"
, "ocaml-language-server"
, { "parsoid": "git://github.com/abbradar/parsoid#stable" }
, "peerflix"
, "peerflix-server"
, "phantomjs"
, "pnpm"
, "prettier"
, "pulp"
, "quassel-webserver"
, "react-tools"
, "react-native-cli"
, "s3http"
, "semver"
, "serve"
, "shout"
, "sinopia"
, "sloc"
, "smartdc"
, "socket.io"
, "stackdriver-statsd-backend"
, "statsd"
, "statsd-influxdb-backend"
, "statsd-librato-backend"
, "stylus"
, "svgo"
, "swagger"
, "tern"
, "three"
, "mathjax"
, "tiddlywiki"
, "titanium"
, "triton"
, "typescript"
, "typings"
, "uglify-js"
, "ungit"
, "vue-cli"
, "@vue/cli"
, "webdrvr"
, "webpack"
, "webtorrent-cli"
, "web-ext"
, "wring"
, "yarn"
, "yo"
]

46204
pkgs/development/node-packages/node-packages-v8.nix
View File

File diff suppressed because it is too large Load Diff

2
pkgs/top-level/all-packages.nix
View File

@ -3696,7 +3696,7 @@ with pkgs;
nodejs = pkgs.nodejs-6_x;
};
nodePackages = nodePackages_6_x;
nodePackages = nodePackages_8_x;
npm2nix = nodePackages.npm2nix;