node2nix: 1.6.0 -> 1.7.0 and regenerate all Nix expressions, introduce nodePackages_12_x attribute set

This commit is contained in:
Sander van der Burg 2019-06-05 23:48:42 +02:00
parent a6549852e8
commit 18c2b52314
25 changed files with 2819 additions and 3207 deletions

View file

@ -1,4 +1,4 @@
# This file has been generated by node2nix 1.6.0. Do not edit!
# This file has been generated by node2nix 1.7.0. Do not edit!
{pkgs ? import <nixpkgs> {
inherit system;

View 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-12_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-v12.nix {
inherit (pkgs) fetchurl fetchgit;
inherit nodeEnv;
}

View file

@ -1,4 +1,4 @@
# This file has been generated by node2nix 1.6.0. Do not edit!
# This file has been generated by node2nix 1.7.0. Do not edit!
{pkgs ? import <nixpkgs> {
inherit system;

View file

@ -0,0 +1,16 @@
{ pkgs, nodejs, stdenv }:
let
nodePackages = import ./composition-v12.nix {
inherit pkgs nodejs;
inherit (stdenv.hostPlatform) system;
};
in
nodePackages // {
node2nix = nodePackages.node2nix.override {
buildInputs = [ pkgs.makeWrapper ];
postInstall = ''
wrapProgram "$out/bin/node2nix" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nix ]}
'';
};
}

View file

@ -1,23 +0,0 @@
{ pkgs, nodejs, stdenv }:
let
nodePackages = import ./composition-v6.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
'';
};
}

View file

@ -6,3 +6,4 @@ set -eu -o pipefail
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-12 -i node-packages-v12.json -o node-packages-v12.nix -c composition-v12.nix

View file

@ -11,7 +11,7 @@ let
cat > $out/bin/tar <<EOF
#! ${stdenv.shell} -e
$(type -p tar) "\$@" --warning=no-unknown-keyword
$(type -p tar) "\$@" --warning=no-unknown-keyword --delay-directory-restore
EOF
chmod +x $out/bin/tar
@ -72,7 +72,7 @@ let
packageDir="$(find . -maxdepth 1 -type d | tail -1)"
# Restore write permissions to make building work
find "$packageDir" -type d -print0 | xargs -0 chmod u+x
find "$packageDir" -type d -exec chmod u+x {} \;
chmod -R u+w "$packageDir"
# Move the extracted tarball into the output folder
@ -219,7 +219,16 @@ let
packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads.
}
packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories.
if(dependency.resolved) {
packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided
} else {
packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories.
}
if(dependency.from !== undefined) { // Adopt from property if one has been provided
packageObj["_from"] = dependency.from;
}
fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2));
}
@ -308,50 +317,11 @@ let
'';
};
# Builds and composes an NPM package including all its dependencies
buildNodePackage =
{ name
, packageName
, version
, dependencies ? []
, buildInputs ? []
, production ? true
, npmFlags ? ""
, dontNpmInstall ? false
, bypassCache ? false
, preRebuild ? ""
, dontStrip ? true
, unpackPhase ? "true"
, buildPhase ? "true"
, ... }@args:
prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}:
let
forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com";
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ];
in
stdenv.mkDerivation ({
name = "node-${name}-${version}";
buildInputs = [ tarWrapper python nodejs ]
++ stdenv.lib.optional (stdenv.isLinux) utillinux
++ stdenv.lib.optional (stdenv.isDarwin) libtool
++ buildInputs;
inherit dontStrip; # Stripping may fail a build for some package deployments
inherit dontNpmInstall preRebuild unpackPhase buildPhase;
compositionScript = composePackage args;
pinpointDependenciesScript = pinpointDependenciesOfPackage args;
passAsFile = [ "compositionScript" "pinpointDependenciesScript" ];
installPhase = ''
# Create and enter a root node_modules/ folder
mkdir -p $out/lib/node_modules
cd $out/lib/node_modules
# Compose the package and all its dependencies
source $compositionScriptPath
''
# Pinpoint the versions of all dependencies to the ones that are actually being used
echo "pinpointing versions of dependencies..."
source $pinpointDependenciesScriptPath
@ -375,11 +345,18 @@ let
runHook preRebuild
${stdenv.lib.optionalString bypassCache ''
if [ ! -f package-lock.json ]
then
echo "No package-lock.json file found, reconstructing..."
node ${reconstructPackageLock}
fi
${stdenv.lib.optionalString reconstructLock ''
if [ -f package-lock.json ]
then
echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!"
echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!"
rm package-lock.json
else
echo "No package-lock.json file found, reconstructing..."
fi
node ${reconstructPackageLock}
''}
node ${addIntegrityFieldsScript}
''}
@ -393,6 +370,53 @@ let
npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
fi
'';
# Builds and composes an NPM package including all its dependencies
buildNodePackage =
{ name
, packageName
, version
, dependencies ? []
, buildInputs ? []
, production ? true
, npmFlags ? ""
, dontNpmInstall ? false
, bypassCache ? false
, reconstructLock ? false
, preRebuild ? ""
, dontStrip ? true
, unpackPhase ? "true"
, buildPhase ? "true"
, ... }@args:
let
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ];
in
stdenv.mkDerivation ({
name = "node_${name}-${version}";
buildInputs = [ tarWrapper python nodejs ]
++ stdenv.lib.optional (stdenv.isLinux) utillinux
++ stdenv.lib.optional (stdenv.isDarwin) libtool
++ buildInputs;
inherit dontStrip; # Stripping may fail a build for some package deployments
inherit dontNpmInstall preRebuild unpackPhase buildPhase;
compositionScript = composePackage args;
pinpointDependenciesScript = pinpointDependenciesOfPackage args;
passAsFile = [ "compositionScript" "pinpointDependenciesScript" ];
installPhase = ''
# Create and enter a root node_modules/ folder
mkdir -p $out/lib/node_modules
cd $out/lib/node_modules
# Compose the package and all its dependencies
source $compositionScriptPath
${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
# Create symlink to the deployed executable folder, if applicable
if [ -d "$out/lib/node_modules/.bin" ]
@ -431,14 +455,13 @@ let
, npmFlags ? ""
, dontNpmInstall ? false
, bypassCache ? false
, reconstructLock ? false
, dontStrip ? true
, unpackPhase ? "true"
, buildPhase ? "true"
, ... }@args:
let
forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com";
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
nodeDependencies = stdenv.mkDerivation ({
@ -473,39 +496,13 @@ let
fi
''}
# Pinpoint the versions of all dependencies to the ones that are actually being used
echo "pinpointing versions of dependencies..."
# Go to the parent folder to make sure that all packages are pinpointed
cd ..
${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
source $pinpointDependenciesScriptPath
cd ${packageName}
# Patch the shebangs of the bundled modules to prevent them from
# calling executables outside the Nix store as much as possible
patchShebangs .
export HOME=$PWD
${stdenv.lib.optionalString bypassCache ''
if [ ! -f package-lock.json ]
then
echo "No package-lock.json file found, reconstructing..."
node ${reconstructPackageLock}
fi
node ${addIntegrityFieldsScript}
''}
npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
${stdenv.lib.optionalString (!dontNpmInstall) ''
# NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
rm -f npm-shrinkwrap.json
npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
''}
${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
# Expose the executables that were installed
cd ..
${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
@ -532,6 +529,7 @@ let
inherit nodeDependencies;
shellHook = stdenv.lib.optionalString (dependencies != []) ''
export NODE_PATH=$nodeDependencies/lib/node_modules
export PATH="$nodeDependencies/bin:$PATH"
'';
};
in

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,6 @@
[
"nijs"
, "coffee-script"
, "grunt-cli"
, "node2nix"
]

View file

@ -1,9 +0,0 @@
[
"bower"
, "coffee-script"
, "grunt-cli"
, "node-gyp"
, "node-gyp-build"
, "node-pre-gyp"
, "pnpm"
]

View file

@ -1,4 +1,4 @@
# This file has been generated by node2nix 1.6.0. Do not edit!
# This file has been generated by node2nix 1.7.0. Do not edit!
{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
@ -40,13 +40,13 @@ let
sha512 = "xH2e58elpj1X4ynnKp9qSnWlsRTIs6n3tgLGNfwAGHwePw0mulHQllV34n0T25uYSu1k0hRKkWXF890B1yS47w==";
};
};
"@types/node-8.10.48" = {
"@types/node-8.10.49" = {
name = "_at_types_slash_node";
packageName = "@types/node";
version = "8.10.48";
version = "8.10.49";
src = fetchurl {
url = "https://registry.npmjs.org/@types/node/-/node-8.10.48.tgz";
sha512 = "c35YEBTkL4rzXY2ucpSKy+UYHjUBIIkuJbWYbsGIrKLEWU5dgJMmLkkIb3qeC3O3Tpb1ZQCwecscvJTDjDjkRw==";
url = "https://registry.npmjs.org/@types/node/-/node-8.10.49.tgz";
sha512 = "YX30JVx0PvSmJ3Eqr74fYLGeBxD+C7vIL20ek+GGGLJeUbVYRUW3EzyAXpIRA0K8c8o0UWqR/GwEFYiFoz1T8w==";
};
};
"JSV-4.0.2" = {
@ -553,13 +553,13 @@ let
sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==";
};
};
"aws-sdk-2.464.0" = {
"aws-sdk-2.469.0" = {
name = "aws-sdk";
packageName = "aws-sdk";
version = "2.464.0";
version = "2.469.0";
src = fetchurl {
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.464.0.tgz";
sha512 = "DsJ/V/Eaazio5klO49IXIgnDpBcObgOunFs0KsUbdPz5yxvznZQiez9LqTcaj0SaCS7zsrT9K5p+Jtbt60z1SA==";
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.469.0.tgz";
sha512 = "VaIrO3aBX83gKkBPk9xM0RHmu7fmq76kaF0SqbsWlPImgxc5foJ4rBlRMMlmeNogFZZ/XTQdI+gkFDVosV14Ig==";
};
};
"aws-sign2-0.6.0" = {
@ -6061,13 +6061,13 @@ let
sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff";
};
};
"resolve-1.11.0" = {
"resolve-1.11.1" = {
name = "resolve";
packageName = "resolve";
version = "1.11.0";
version = "1.11.1";
src = fetchurl {
url = "https://registry.npmjs.org/resolve/-/resolve-1.11.0.tgz";
sha512 = "WL2pBDjqT6pGUNSUzMw00o4T7If+z4H2x3Gz893WoUQ5KW8Vr9txp00ykiP16VBaZF5+j/OcXJHZ9+PCvdiDKw==";
url = "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz";
sha512 = "vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==";
};
};
"resolve-dir-1.0.1" = {
@ -6970,13 +6970,13 @@ let
sha1 = "8030046939b00096e625c0dd6b3905bc7b85709c";
};
};
"tar-4.4.8" = {
"tar-4.4.10" = {
name = "tar";
packageName = "tar";
version = "4.4.8";
version = "4.4.10";
src = fetchurl {
url = "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz";
sha512 = "LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==";
url = "https://registry.npmjs.org/tar/-/tar-4.4.10.tgz";
sha512 = "g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==";
};
};
"temp-0.8.3" = {
@ -8102,7 +8102,7 @@ in
sources."private-0.1.8"
sources."regenerator-runtime-0.11.1"
sources."repeating-2.0.1"
sources."resolve-1.11.0"
sources."resolve-1.11.1"
sources."safe-buffer-5.1.2"
sources."sax-0.5.8"
sources."slash-1.0.0"
@ -8132,6 +8132,7 @@ in
};
production = true;
bypassCache = true;
reconstructLock = true;
};
azure-cli = nodeEnv.buildNodePackage {
name = "azure-cli";
@ -8142,7 +8143,7 @@ in
sha512 = "MMiK5sFfIocNMWCc5PshUCAe6aY4P13/GCmSwudOziA/pFdQMHU8jhu+jU2SSWFug4K1ugeuCwtMXe43oL0PhQ==";
};
dependencies = [
sources."@types/node-8.10.48"
sources."@types/node-8.10.49"
sources."JSV-4.0.2"
sources."adal-node-0.1.28"
sources."ajv-6.10.0"
@ -8535,6 +8536,7 @@ in
};
production = true;
bypassCache = true;
reconstructLock = true;
};
bower = nodeEnv.buildNodePackage {
name = "bower";
@ -8552,6 +8554,7 @@ in
};
production = true;
bypassCache = true;
reconstructLock = true;
};
coffee-script = nodeEnv.buildNodePackage {
name = "coffee-script";
@ -8569,6 +8572,7 @@ in
};
production = true;
bypassCache = true;
reconstructLock = true;
};
grunt-cli = nodeEnv.buildNodePackage {
name = "grunt-cli";
@ -8743,7 +8747,7 @@ in
sources."regex-not-1.0.2"
sources."repeat-element-1.1.3"
sources."repeat-string-1.6.1"
sources."resolve-1.11.0"
sources."resolve-1.11.1"
sources."resolve-dir-1.0.1"
sources."resolve-url-0.2.1"
sources."ret-0.1.15"
@ -8839,6 +8843,7 @@ in
};
production = true;
bypassCache = true;
reconstructLock = true;
};
node-gyp = nodeEnv.buildNodePackage {
name = "node-gyp";
@ -8935,7 +8940,7 @@ in
sources."string-width-1.0.2"
sources."string_decoder-1.1.1"
sources."strip-ansi-3.0.1"
sources."tar-4.4.8"
sources."tar-4.4.10"
(sources."tough-cookie-2.4.3" // {
dependencies = [
sources."punycode-1.4.1"
@ -8960,6 +8965,7 @@ in
};
production = true;
bypassCache = true;
reconstructLock = true;
};
node-gyp-build = nodeEnv.buildNodePackage {
name = "node-gyp-build";
@ -8977,6 +8983,7 @@ in
};
production = true;
bypassCache = true;
reconstructLock = true;
};
node-pre-gyp = nodeEnv.buildNodePackage {
name = "node-pre-gyp";
@ -9050,7 +9057,7 @@ in
sources."string_decoder-1.1.1"
sources."strip-ansi-3.0.1"
sources."strip-json-comments-2.0.1"
sources."tar-4.4.8"
sources."tar-4.4.10"
sources."util-deprecate-1.0.2"
sources."wide-align-1.1.3"
sources."wrappy-1.0.2"
@ -9064,6 +9071,7 @@ in
};
production = true;
bypassCache = true;
reconstructLock = true;
};
pnpm = nodeEnv.buildNodePackage {
name = "pnpm";
@ -9081,6 +9089,7 @@ in
};
production = true;
bypassCache = true;
reconstructLock = true;
};
stf = nodeEnv.buildNodePackage {
name = "stf";
@ -9150,7 +9159,7 @@ in
sources."async-1.5.2"
sources."async-limiter-1.0.0"
sources."asynckit-0.4.0"
sources."aws-sdk-2.464.0"
sources."aws-sdk-2.469.0"
sources."aws-sign2-0.6.0"
sources."aws4-1.8.0"
sources."babel-runtime-6.26.0"
@ -9629,7 +9638,7 @@ in
sources."require-directory-2.1.1"
sources."require-main-filename-1.0.1"
sources."requires-port-1.0.0"
sources."resolve-1.11.0"
sources."resolve-1.11.1"
sources."ret-0.2.2"
sources."rethinkdb-2.3.3"
sources."retry-0.9.0"
@ -9897,6 +9906,7 @@ in
};
production = true;
bypassCache = true;
reconstructLock = true;
};
titanium = nodeEnv.buildNodePackage {
name = "titanium";
@ -10030,5 +10040,6 @@ in
};
production = true;
bypassCache = true;
reconstructLock = true;
};
}

File diff suppressed because it is too large Load diff

View file

@ -1,4 +1,4 @@
# This file has been generated by node2nix 1.6.0. Do not edit!
# This file has been generated by node2nix 1.7.0. Do not edit!
{pkgs ? import <nixpkgs> {
inherit system;

View file

@ -1,4 +1,4 @@
# This file has been generated by node2nix 1.6.0. Do not edit!
# This file has been generated by node2nix 1.7.0. Do not edit!
{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
@ -436,13 +436,13 @@ let
sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
};
};
"js-yaml-3.13.0" = {
"js-yaml-3.13.1" = {
name = "js-yaml";
packageName = "js-yaml";
version = "3.13.0";
version = "3.13.1";
src = fetchurl {
url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz";
sha512 = "pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==";
url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz";
sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==";
};
};
"keypress-0.1.0" = {
@ -706,13 +706,13 @@ let
sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa";
};
};
"pinyin-2.8.3" = {
"pinyin-2.9.0" = {
name = "pinyin";
packageName = "pinyin";
version = "2.8.3";
version = "2.9.0";
src = fetchurl {
url = "https://registry.npmjs.org/pinyin/-/pinyin-2.8.3.tgz";
sha1 = "301ccb4358ccfe802523c4bd640a612bee4d7c4b";
url = "https://registry.npmjs.org/pinyin/-/pinyin-2.9.0.tgz";
sha512 = "TZYQ+2uE12arC1EfCeDmN5KgwIOuNMIweOotKvBZdhVOUuQc5RJsGEGf+BaSvxfVtu9ViYEFJmH0xTaj9t4n3Q==";
};
};
"prepend-http-1.0.4" = {
@ -814,13 +814,13 @@ let
sha1 = "5214c53a926d3552707527fbab415dbc08d06dda";
};
};
"resolve-1.10.0" = {
"resolve-1.11.1" = {
name = "resolve";
packageName = "resolve";
version = "1.10.0";
version = "1.11.1";
src = fetchurl {
url = "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz";
sha512 = "3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==";
url = "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz";
sha512 = "vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==";
};
};
"safe-buffer-5.1.2" = {
@ -895,13 +895,13 @@ let
sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==";
};
};
"spdx-license-ids-3.0.3" = {
"spdx-license-ids-3.0.4" = {
name = "spdx-license-ids";
packageName = "spdx-license-ids";
version = "3.0.3";
version = "3.0.4";
src = fetchurl {
url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz";
sha512 = "uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g==";
url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz";
sha512 = "7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA==";
};
};
"speakingurl-14.0.1" = {
@ -1144,7 +1144,7 @@ in
sources."is-stream-1.1.0"
sources."is-utf8-0.2.1"
sources."isarray-1.0.0"
sources."js-yaml-3.13.0"
sources."js-yaml-3.13.1"
sources."keypress-0.1.0"
sources."latest-version-2.0.0"
sources."limax-1.7.0"
@ -1177,7 +1177,7 @@ in
sources."pify-2.3.0"
sources."pinkie-2.0.4"
sources."pinkie-promise-2.0.1"
sources."pinyin-2.8.3"
sources."pinyin-2.9.0"
sources."prepend-http-1.0.4"
sources."process-nextick-args-2.0.0"
sources."rc-1.2.8"
@ -1189,7 +1189,7 @@ in
sources."registry-auth-token-3.4.0"
sources."registry-url-3.1.0"
sources."repeating-2.0.1"
sources."resolve-1.10.0"
sources."resolve-1.11.1"
sources."safe-buffer-5.1.2"
sources."semver-5.7.0"
sources."semver-diff-2.1.0"
@ -1198,7 +1198,7 @@ in
sources."spdx-correct-3.1.0"
sources."spdx-exceptions-2.2.0"
sources."spdx-expression-parse-3.0.0"
sources."spdx-license-ids-3.0.3"
sources."spdx-license-ids-3.0.4"
sources."speakingurl-14.0.1"
sources."sprintf-js-1.0.3"
sources."string-width-1.0.2"
@ -1228,5 +1228,6 @@ in
};
production = true;
bypassCache = true;
reconstructLock = true;
};
}

View file

@ -1,4 +1,4 @@
# This file has been generated by node2nix 1.6.0. Do not edit!
# This file has been generated by node2nix 1.7.0. Do not edit!
{pkgs ? import <nixpkgs> {
inherit system;

View file

@ -1,4 +1,4 @@
# This file has been generated by node2nix 1.6.0. Do not edit!
# This file has been generated by node2nix 1.7.0. Do not edit!
{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
@ -238,13 +238,13 @@ let
sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1";
};
};
"combined-stream-1.0.7" = {
"combined-stream-1.0.8" = {
name = "combined-stream";
packageName = "combined-stream";
version = "1.0.7";
version = "1.0.8";
src = fetchurl {
url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz";
sha512 = "brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==";
url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz";
sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==";
};
};
"concat-map-0.0.1" = {
@ -706,22 +706,22 @@ let
sha1 = "591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0";
};
};
"mime-db-1.38.0" = {
"mime-db-1.40.0" = {
name = "mime-db";
packageName = "mime-db";
version = "1.38.0";
version = "1.40.0";
src = fetchurl {
url = "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz";
sha512 = "bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==";
url = "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz";
sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==";
};
};
"mime-types-2.1.22" = {
"mime-types-2.1.24" = {
name = "mime-types";
packageName = "mime-types";
version = "2.1.22";
version = "2.1.24";
src = fetchurl {
url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz";
sha512 = "aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==";
url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz";
sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==";
};
};
"minimatch-3.0.4" = {
@ -850,13 +850,13 @@ let
sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be";
};
};
"psl-1.1.31" = {
"psl-1.1.32" = {
name = "psl";
packageName = "psl";
version = "1.1.31";
version = "1.1.32";
src = fetchurl {
url = "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz";
sha512 = "/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==";
url = "https://registry.npmjs.org/psl/-/psl-1.1.32.tgz";
sha512 = "MHACAkHpihU/REGGPLj4sEfc/XKW2bheigvHO1dUqjaKigMp1C8+WLQYRGgeKFMsw5PMfegZcaN8IDXK/cD0+g==";
};
};
"punycode-1.4.1" = {
@ -1206,10 +1206,11 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "No-ceremony linter";
homepage = https://github.com/marijnh/blint;
homepage = http://github.com/marijnh/blint;
};
production = true;
bypassCache = true;
reconstructLock = true;
};
"node-static-0.6.0" = nodeEnv.buildNodePackage {
name = "node-static";
@ -1226,6 +1227,7 @@ in
};
production = true;
bypassCache = true;
reconstructLock = true;
};
"phantomjs-prebuilt-^2.1.12" = nodeEnv.buildNodePackage {
name = "phantomjs-prebuilt";
@ -1245,7 +1247,7 @@ in
sources."bcrypt-pbkdf-1.0.2"
sources."buffer-from-1.1.1"
sources."caseless-0.12.0"
sources."combined-stream-1.0.7"
sources."combined-stream-1.0.8"
sources."concat-stream-1.6.2"
sources."core-util-is-1.0.2"
sources."dashdash-1.14.1"
@ -1282,8 +1284,8 @@ in
sources."jsprim-1.4.1"
sources."kew-0.7.0"
sources."klaw-1.3.1"
sources."mime-db-1.38.0"
sources."mime-types-2.1.22"
sources."mime-db-1.40.0"
sources."mime-types-2.1.24"
sources."minimist-0.0.8"
sources."mkdirp-0.5.1"
sources."ms-2.0.0"
@ -1294,7 +1296,7 @@ in
sources."pinkie-promise-2.0.1"
sources."process-nextick-args-2.0.0"
sources."progress-1.1.8"
sources."psl-1.1.31"
sources."psl-1.1.32"
sources."punycode-2.1.1"
sources."qs-6.5.2"
sources."readable-stream-2.3.6"
@ -1328,6 +1330,7 @@ in
};
production = true;
bypassCache = true;
reconstructLock = true;
};
"rollup-^0.41.0" = nodeEnv.buildNodePackage {
name = "rollup";
@ -1349,6 +1352,7 @@ in
};
production = true;
bypassCache = true;
reconstructLock = true;
};
"rollup-plugin-buble-^0.15.0" = nodeEnv.buildNodePackage {
name = "rollup-plugin-buble";
@ -1389,6 +1393,7 @@ in
};
production = true;
bypassCache = true;
reconstructLock = true;
};
"rollup-watch-^3.2.0" = nodeEnv.buildNodePackage {
name = "rollup-watch";
@ -1409,6 +1414,7 @@ in
};
production = true;
bypassCache = true;
reconstructLock = true;
};
"uglify-js-^2.8.15" = nodeEnv.buildNodePackage {
name = "uglify-js";
@ -1444,6 +1450,7 @@ in
};
production = true;
bypassCache = true;
reconstructLock = true;
};
"url-loader-^0.5.7" = nodeEnv.buildNodePackage {
name = "url-loader";
@ -1469,5 +1476,6 @@ in
};
production = true;
bypassCache = true;
reconstructLock = true;
};
}

View file

@ -1,4 +1,4 @@
# This file has been generated by node2nix 1.6.0. Do not edit!
# This file has been generated by node2nix 1.7.0. Do not edit!
{pkgs ? import <nixpkgs> {
inherit system;
@ -14,4 +14,4 @@ in
import ./node-packages.nix {
inherit (pkgs) fetchurl fetchgit;
inherit nodeEnv;
}
}

File diff suppressed because it is too large Load diff

View file

@ -1,4 +1,4 @@
# This file has been generated by node2nix 1.6.0. Do not edit!
# This file has been generated by node2nix 1.7.0. Do not edit!
{pkgs ? import <nixpkgs> {
inherit system;
@ -14,4 +14,4 @@ in
import ./node-packages.nix {
inherit (pkgs) fetchurl fetchgit;
inherit nodeEnv;
}
}

View file

@ -1,4 +1,4 @@
# This file has been generated by node2nix 1.6.0. Do not edit!
# This file has been generated by node2nix 1.7.0. Do not edit!
{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
@ -94,13 +94,13 @@ let
sha1 = "1b681c21ff84033c826543090689420d187151dc";
};
};
"combined-stream-1.0.7" = {
"combined-stream-1.0.8" = {
name = "combined-stream";
packageName = "combined-stream";
version = "1.0.7";
version = "1.0.8";
src = fetchurl {
url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz";
sha512 = "brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==";
url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz";
sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==";
};
};
"commander-0.6.1" = {
@ -373,15 +373,6 @@ let
sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2";
};
};
"lodash-4.17.11" = {
name = "lodash";
packageName = "lodash";
version = "4.17.11";
src = fetchurl {
url = "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz";
sha512 = "cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==";
};
};
"methods-0.0.1" = {
name = "methods";
packageName = "methods";
@ -400,22 +391,22 @@ let
sha1 = "b1f86c768c025fa87b48075f1709f28aeaf20365";
};
};
"mime-db-1.38.0" = {
"mime-db-1.40.0" = {
name = "mime-db";
packageName = "mime-db";
version = "1.38.0";
version = "1.40.0";
src = fetchurl {
url = "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz";
sha512 = "bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==";
url = "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz";
sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==";
};
};
"mime-types-2.1.22" = {
"mime-types-2.1.24" = {
name = "mime-types";
packageName = "mime-types";
version = "2.1.22";
version = "2.1.24";
src = fetchurl {
url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz";
sha512 = "aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==";
url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz";
sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==";
};
};
"mkdirp-0.3.3" = {
@ -463,13 +454,13 @@ let
sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
};
};
"psl-1.1.31" = {
"psl-1.1.32" = {
name = "psl";
packageName = "psl";
version = "1.1.31";
version = "1.1.32";
src = fetchurl {
url = "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz";
sha512 = "/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==";
url = "https://registry.npmjs.org/psl/-/psl-1.1.32.tgz";
sha512 = "MHACAkHpihU/REGGPLj4sEfc/XKW2bheigvHO1dUqjaKigMp1C8+WLQYRGgeKFMsw5PMfegZcaN8IDXK/cD0+g==";
};
};
"punycode-1.4.1" = {
@ -526,13 +517,13 @@ let
sha512 = "M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A==";
};
};
"redis-commands-1.4.0" = {
"redis-commands-1.5.0" = {
name = "redis-commands";
packageName = "redis-commands";
version = "1.4.0";
version = "1.5.0";
src = fetchurl {
url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.4.0.tgz";
sha512 = "cu8EF+MtkwI4DLIT0x9P8qNTLFhQD4jLfxLR0cCNkeGzs87FN6879JOJwNQR/1zD7aSYNbU0hgsV9zGY71Itvw==";
url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.5.0.tgz";
sha512 = "6KxamqpZ468MeQC3bkWmCB1fp56XL64D4Kf0zJSwDZbVLLm7KFkoIcHrgRvQ+sk8dnhySs7+yBg94yIkAK7aJg==";
};
};
"redis-parser-2.6.0" = {
@ -680,6 +671,7 @@ in
};
production = true;
bypassCache = true;
reconstructLock = true;
};
"swig-0.14.0" = nodeEnv.buildNodePackage {
name = "swig";
@ -698,6 +690,7 @@ in
};
production = true;
bypassCache = true;
reconstructLock = true;
};
"consolidate-0.10.0" = nodeEnv.buildNodePackage {
name = "consolidate";
@ -714,6 +707,7 @@ in
};
production = true;
bypassCache = true;
reconstructLock = true;
};
redis = nodeEnv.buildNodePackage {
name = "redis";
@ -725,7 +719,7 @@ in
};
dependencies = [
sources."double-ended-queue-2.1.0-0"
sources."redis-commands-1.4.0"
sources."redis-commands-1.5.0"
sources."redis-parser-2.6.0"
];
buildInputs = globalBuildInputs;
@ -736,6 +730,7 @@ in
};
production = true;
bypassCache = true;
reconstructLock = true;
};
connect-redis = nodeEnv.buildNodePackage {
name = "connect-redis";
@ -750,7 +745,7 @@ in
sources."double-ended-queue-2.1.0-0"
sources."ms-2.1.1"
sources."redis-2.8.0"
sources."redis-commands-1.4.0"
sources."redis-commands-1.5.0"
sources."redis-parser-2.6.0"
];
buildInputs = globalBuildInputs;
@ -761,18 +756,16 @@ in
};
production = true;
bypassCache = true;
reconstructLock = true;
};
async = nodeEnv.buildNodePackage {
name = "async";
packageName = "async";
version = "2.6.2";
version = "3.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/async/-/async-2.6.2.tgz";
sha512 = "H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==";
url = "https://registry.npmjs.org/async/-/async-3.0.1.tgz";
sha512 = "ZswD8vwPtmBZzbn9xyi8XBQWXH3AvOQ43Za1KWYq7JeycrZuUYzx01KvHcVbXltjqH4y0MWrQ33008uLTqXuDw==";
};
dependencies = [
sources."lodash-4.17.11"
];
buildInputs = globalBuildInputs;
meta = {
description = "Higher-order functions and common patterns for asynchronous code";
@ -781,6 +774,7 @@ in
};
production = true;
bypassCache = true;
reconstructLock = true;
};
request = nodeEnv.buildNodePackage {
name = "request";
@ -799,7 +793,7 @@ in
sources."aws4-1.8.0"
sources."bcrypt-pbkdf-1.0.2"
sources."caseless-0.12.0"
sources."combined-stream-1.0.7"
sources."combined-stream-1.0.8"
sources."core-util-is-1.0.2"
sources."dashdash-1.14.1"
sources."delayed-stream-1.0.0"
@ -821,11 +815,11 @@ in
sources."json-schema-traverse-0.4.1"
sources."json-stringify-safe-5.0.1"
sources."jsprim-1.4.1"
sources."mime-db-1.38.0"
sources."mime-types-2.1.22"
sources."mime-db-1.40.0"
sources."mime-types-2.1.24"
sources."oauth-sign-0.9.0"
sources."performance-now-2.1.0"
sources."psl-1.1.31"
sources."psl-1.1.32"
sources."punycode-2.1.1"
sources."qs-6.5.2"
sources."safe-buffer-5.1.2"
@ -850,5 +844,6 @@ in
};
production = true;
bypassCache = true;
reconstructLock = true;
};
}

View file

@ -1,4 +1,4 @@
# This file has been generated by node2nix 1.6.0. Do not edit!
# This file has been generated by node2nix 1.7.0. Do not edit!
{pkgs ? import <nixpkgs> {
inherit system;

View file

@ -1,4 +1,4 @@
# This file has been generated by node2nix 1.6.0. Do not edit!
# This file has been generated by node2nix 1.7.0. Do not edit!
{pkgs ? import <nixpkgs> {
inherit system;

View file

@ -1,4 +1,4 @@
# This file has been generated by node2nix 1.6.0. Do not edit!
# This file has been generated by node2nix 1.7.0. Do not edit!
{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
@ -103,5 +103,6 @@ in
};
production = true;
bypassCache = true;
reconstructLock = true;
};
}

View file

@ -4219,6 +4219,10 @@ in
nodejs_latest = nodejs-12_x;
nodejs-slim_latest = nodejs-slim-12_x;
nodePackages_12_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v12.nix {
nodejs = pkgs.nodejs-12_x;
});
nodePackages_10_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v10.nix {
nodejs = pkgs.nodejs-10_x;
});