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

Merge pull request #19980 from cko/cleanup_node_packages 

node-packages: update & cleanup
This commit is contained in:
Tim Steinbach 2016-11-01 09:20:26 -04:00 committed by GitHub
parent 79424a0c7f caa10b7233
commit dc04a8e49d
9 changed files with 5130 additions and 4578 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/node-packages/composition-v5.nix → pkgs/development/node-packages/composition-v6.nix
View File

@ -10,7 +10,7 @@ let
inherit nodejs; inherit nodejs;
}; };
in in
import ./node-packages-v5.nix { import ./node-packages-v6.nix {
inherit (pkgs) fetchurl fetchgit; inherit (pkgs) fetchurl fetchgit;
inherit nodeEnv; inherit nodeEnv;
} }

33
pkgs/development/node-packages/default-v0_10.nix
View File

@ -1,33 +0,0 @@
{pkgs, system, nodejs}:
let
nodePackages = import ./composition-v4.nix {
inherit pkgs system nodejs;
};
in
nodePackages // {
node-inspector = nodePackages.node-inspector.override (oldAttrs: {
buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-pre-gyp ];
});
phantomjs = nodePackages.phantomjs.override (oldAttrs: {
buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ];
});
webdrvr = nodePackages.webdrvr.override (oldAttrs: {
buildInputs = oldAttrs.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
'';
});
}

44
pkgs/development/node-packages/default-v5.nix
View File

@ -1,44 +0,0 @@
{pkgs, system, nodejs}:
let
nodePackages = import ./composition-v5.nix {
inherit pkgs system nodejs;
};
in
nodePackages // {
node-inspector = nodePackages.node-inspector.override (oldAttrs: {
buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-pre-gyp ];
});
phantomjs = nodePackages.phantomjs.override (oldAttrs: {
buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ];
});
webdrvr = nodePackages.webdrvr.override (oldAttrs: {
buildInputs = oldAttrs.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.
});
bower2nix = nodePackages.bower2nix.override (oldAttrs: {
buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ];
postInstall = ''
for prog in bower2nix fetch-bower; do
wrapProgram "$out/bin/$prog" --prefix PATH : "${pkgs.git}/bin"
done
'';
});
}

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

@ -1,7 +1,7 @@
{pkgs, system, nodejs}: {pkgs, system, nodejs}:
let let
nodePackages = import ./composition-v5.nix { nodePackages = import ./composition-v6.nix {
inherit pkgs system nodejs; inherit pkgs system nodejs;
}; };
in in

3
pkgs/development/node-packages/generate.sh
View File

@ -2,4 +2,5 @@
rm -f node-env.nix rm -f node-env.nix
node2nix -i node-packages.json -o node-packages-v4.nix -c composition-v4.nix node2nix -i node-packages.json -o node-packages-v4.nix -c composition-v4.nix
node2nix -5 -i node-packages.json -o node-packages-v5.nix -c composition-v5.nix # node2nix doesn't explicitely support node v6 so far
node2nix -5 -i node-packages.json -o node-packages-v6.nix -c composition-v6.nix

93
pkgs/development/node-packages/node-env.nix
View File

@ -6,19 +6,19 @@ let
# Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
tarWrapper = runCommand "tarWrapper" {} '' tarWrapper = runCommand "tarWrapper" {} ''
mkdir -p $out/bin mkdir -p $out/bin
cat > $out/bin/tar <<EOF cat > $out/bin/tar <<EOF
#! ${stdenv.shell} -e #! ${stdenv.shell} -e
$(type -p tar) "\$@" --warning=no-unknown-keyword $(type -p tar) "\$@" --warning=no-unknown-keyword
EOF EOF
chmod +x $out/bin/tar chmod +x $out/bin/tar
''; '';
# Function that generates a TGZ file from a NPM project # Function that generates a TGZ file from a NPM project
buildNodeSourceDist = buildNodeSourceDist =
{ name, version, src, ... }: { name, version, src, ... }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "node-tarball-${name}-${version}"; name = "node-tarball-${name}-${version}";
inherit src; inherit src;
@ -42,13 +42,13 @@ let
# Bundle the dependencies of the package # Bundle the dependencies of the package
mkdir -p node_modules mkdir -p node_modules
cd node_modules cd node_modules
# Only include dependencies if they don't exist. They may also be bundled in the package. # Only include dependencies if they don't exist. They may also be bundled in the package.
if [ ! -e "${dependency.name}" ] if [ ! -e "${dependency.name}" ]
then then
${composePackage dependency} ${composePackage dependency}
fi fi
cd .. cd ..
'' ''
) dependencies); ) dependencies);
@ -61,13 +61,13 @@ let
text = '' text = ''
var fs = require('fs'); var fs = require('fs');
var url = require('url'); var url = require('url');
/* /*
* Replaces an impure version specification by * * Replaces an impure version specification by *
*/ */
function replaceImpureVersionSpec(versionSpec) { function replaceImpureVersionSpec(versionSpec) {
var parsedUrl = url.parse(versionSpec); var parsedUrl = url.parse(versionSpec);
if(versionSpec == "latest" || versionSpec == "unstable" || if(versionSpec == "latest" || versionSpec == "unstable" ||
versionSpec.substr(0, 2) == ".." || dependency.substr(0, 2) == "./" || dependency.substr(0, 2) == "~/" || dependency.substr(0, 1) == '/') versionSpec.substr(0, 2) == ".." || dependency.substr(0, 2) == "./" || dependency.substr(0, 2) == "~/" || dependency.substr(0, 1) == '/')
return '*'; return '*';
@ -77,9 +77,9 @@ let
else else
return versionSpec; return versionSpec;
} }
var packageObj = JSON.parse(fs.readFileSync('./package.json')); var packageObj = JSON.parse(fs.readFileSync('./package.json'));
/* Replace dependencies */ /* Replace dependencies */
if(packageObj.dependencies !== undefined) { if(packageObj.dependencies !== undefined) {
for(var dependency in packageObj.dependencies) { for(var dependency in packageObj.dependencies) {
@ -87,7 +87,7 @@ let
packageObj.dependencies[dependency] = replaceImpureVersionSpec(versionSpec); packageObj.dependencies[dependency] = replaceImpureVersionSpec(versionSpec);
} }
} }
/* Replace development dependencies */ /* Replace development dependencies */
if(packageObj.devDependencies !== undefined) { if(packageObj.devDependencies !== undefined) {
for(var dependency in packageObj.devDependencies) { for(var dependency in packageObj.devDependencies) {
@ -95,7 +95,7 @@ let
packageObj.devDependencies[dependency] = replaceImpureVersionSpec(versionSpec); packageObj.devDependencies[dependency] = replaceImpureVersionSpec(versionSpec);
} }
} }
/* Replace optional dependencies */ /* Replace optional dependencies */
if(packageObj.optionalDependencies !== undefined) { if(packageObj.optionalDependencies !== undefined) {
for(var dependency in packageObj.optionalDependencies) { for(var dependency in packageObj.optionalDependencies) {
@ -103,7 +103,7 @@ let
packageObj.optionalDependencies[dependency] = replaceImpureVersionSpec(versionSpec); packageObj.optionalDependencies[dependency] = replaceImpureVersionSpec(versionSpec);
} }
} }
/* Write the fixed JSON file */ /* Write the fixed JSON file */
fs.writeFileSync("package.json", JSON.stringify(packageObj)); fs.writeFileSync("package.json", JSON.stringify(packageObj));
''; '';
@ -112,39 +112,40 @@ let
'' ''
DIR=$(pwd) DIR=$(pwd)
cd $TMPDIR cd $TMPDIR
unpackFile ${src} unpackFile ${src}
# Make the base dir in which the target dependency resides first # Make the base dir in which the target dependency resides first
mkdir -p "$(dirname "$DIR/${packageName}")" mkdir -p "$(dirname "$DIR/${packageName}")"
if [ -f "${src}" ] if [ -f "${src}" ]
then then
# Figure out what directory has been unpacked # Figure out what directory has been unpacked
packageDir="$(find . -type d -maxdepth 1 | tail -1)" packageDir=$(find . -type d -maxdepth 1 | tail -1)
# Restore write permissions to make building work # Restore write permissions to make building work
find "$packageDir" -type d -print0 | xargs -0 chmod u+x find "$packageDir" -type d -print0 | xargs -0 chmod u+x
chmod -R u+w "$packageDir" chmod -R u+w "$packageDir"
# Move the extracted tarball into the output folder # Move the extracted tarball into the output folder
mv "$packageDir" "$DIR/${packageName}" mv "$packageDir" "$DIR/${packageName}"
elif [ -d "${src}" ] elif [ -d "${src}" ]
then then
strippedName="$(stripHash ${src})"
# Restore write permissions to make building work # Restore write permissions to make building work
chmod -R u+w $strippedName chmod -R u+w $strippedName
# Move the extracted directory into the output folder # Move the extracted directory into the output folder
mv $strippedName "$DIR/${packageName}" mv $strippedName "$DIR/${packageName}"
fi fi
# Unset the stripped name to not confuse the next unpack step
unset strippedName
# Some version specifiers (latest, unstable, URLs, file paths) force NPM to make remote connections or consult paths outside the Nix store. # Some version specifiers (latest, unstable, URLs, file paths) force NPM to make remote connections or consult paths outside the Nix store.
# The following JavaScript replaces these by * to prevent that # The following JavaScript replaces these by * to prevent that
cd "$DIR/${packageName}" cd "$DIR/${packageName}"
node ${fixImpureDependencies} node ${fixImpureDependencies}
# Include the dependencies of the package # Include the dependencies of the package
${includeDependencies { inherit dependencies; }} ${includeDependencies { inherit dependencies; }}
cd .. cd ..
@ -157,36 +158,36 @@ let
tar --no-same-owner --no-same-permissions -xf ${nodejs.src} tar --no-same-owner --no-same-permissions -xf ${nodejs.src}
mv node-* $out mv node-* $out
''; '';
# Builds and composes an NPM package including all its dependencies # Builds and composes an NPM package including all its dependencies
buildNodePackage = { name, packageName, version, dependencies ? [], production ? true, npmFlags ? "", dontNpmInstall ? false, preRebuild ? "", ... }@args: buildNodePackage = { name, packageName, version, dependencies ? [], production ? true, npmFlags ? "", dontNpmInstall ? false, preRebuild ? "", ... }@args:
stdenv.lib.makeOverridable stdenv.mkDerivation (builtins.removeAttrs args [ "dependencies" ] // { stdenv.lib.makeOverridable stdenv.mkDerivation (builtins.removeAttrs args [ "dependencies" ] // {
name = "node-${name}-${version}"; name = "node-${name}-${version}";
buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or []; buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or [];
dontStrip = args.dontStrip or true; # Striping may fail a build for some package deployments dontStrip = args.dontStrip or true; # Striping may fail a build for some package deployments
inherit dontNpmInstall preRebuild; inherit dontNpmInstall preRebuild;
unpackPhase = args.unpackPhase or "true"; unpackPhase = args.unpackPhase or "true";
buildPhase = args.buildPhase or "true"; buildPhase = args.buildPhase or "true";
compositionScript = composePackage args; compositionScript = composePackage args;
passAsFile = [ "compositionScript" ]; passAsFile = [ "compositionScript" ];
installPhase = args.installPhase or '' installPhase = args.installPhase or ''
# Create and enter a root node_modules/ folder # Create and enter a root node_modules/ folder
mkdir -p $out/lib/node_modules mkdir -p $out/lib/node_modules
cd $out/lib/node_modules cd $out/lib/node_modules
# Compose the package and all its dependencies # Compose the package and all its dependencies
source $compositionScriptPath source $compositionScriptPath
# Patch the shebangs of the bundled modules to prevent them from # Patch the shebangs of the bundled modules to prevent them from
# calling executables outside the Nix store as much as possible # calling executables outside the Nix store as much as possible
patchShebangs . patchShebangs .
# Deploy the Node.js package by running npm install. Since the # Deploy the Node.js package by running npm install. Since the
# dependencies have been provided already by ourselves, it should not # dependencies have been provided already by ourselves, it should not
# attempt to install them again, which is good, because we want to make # attempt to install them again, which is good, because we want to make
@ -196,23 +197,23 @@ let
# #
# The other responsibilities of NPM are kept -- version checks, build # The other responsibilities of NPM are kept -- version checks, build
# steps, postprocessing etc. # steps, postprocessing etc.
export HOME=$TMPDIR export HOME=$TMPDIR
cd "${packageName}" cd "${packageName}"
runHook preRebuild runHook preRebuild
npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
if [ "$dontNpmInstall" != "1" ] if [ "$dontNpmInstall" != "1" ]
then then
npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
fi fi
# Create symlink to the deployed executable folder, if applicable # Create symlink to the deployed executable folder, if applicable
if [ -d "$out/lib/node_modules/.bin" ] if [ -d "$out/lib/node_modules/.bin" ]
then then
ln -s $out/lib/node_modules/.bin $out/bin ln -s $out/lib/node_modules/.bin $out/bin
fi fi
# Create symlinks to the deployed manual page folders, if applicable # Create symlinks to the deployed manual page folders, if applicable
if [ -d "$out/lib/node_modules/${packageName}/man" ] if [ -d "$out/lib/node_modules/${packageName}/man" ]
then then
@ -226,7 +227,7 @@ let
done done
done done
fi fi
# Run post install hook, if provided # Run post install hook, if provided
runHook postInstall runHook postInstall
''; '';
@ -237,17 +238,17 @@ let
let let
nodeDependencies = stdenv.mkDerivation { nodeDependencies = stdenv.mkDerivation {
name = "node-dependencies-${name}-${version}"; name = "node-dependencies-${name}-${version}";
buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or []; buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or [];
includeScript = includeDependencies { inherit dependencies; }; includeScript = includeDependencies { inherit dependencies; };
passAsFile = [ "includeScript" ]; passAsFile = [ "includeScript" ];
buildCommand = '' buildCommand = ''
mkdir -p $out/lib mkdir -p $out/lib
cd $out/lib cd $out/lib
source $includeScriptPath source $includeScriptPath
# Create fake package.json to make the npm commands work properly # Create fake package.json to make the npm commands work properly
cat > package.json <<EOF cat > package.json <<EOF
{ {
@ -255,14 +256,14 @@ let
"version": "${version}" "version": "${version}"
} }
EOF EOF
# Patch the shebangs of the bundled modules to prevent them from # Patch the shebangs of the bundled modules to prevent them from
# calling executables outside the Nix store as much as possible # calling executables outside the Nix store as much as possible
patchShebangs . patchShebangs .
export HOME=$TMPDIR export HOME=$TMPDIR
npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
${stdenv.lib.optionalString (!dontNpmInstall) '' ${stdenv.lib.optionalString (!dontNpmInstall) ''
npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
''} ''}
@ -273,7 +274,7 @@ let
in in
stdenv.lib.makeOverridable stdenv.mkDerivation { stdenv.lib.makeOverridable stdenv.mkDerivation {
name = "node-shell-${name}-${version}"; name = "node-shell-${name}-${version}";
buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or []; buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or [];
buildCommand = '' buildCommand = ''
mkdir -p $out/bin mkdir -p $out/bin
@ -284,7 +285,7 @@ let
EOF EOF
chmod +x $out/bin/shell chmod +x $out/bin/shell
''; '';
# Provide the dependencies in a development shell through the NODE_PATH environment variable # Provide the dependencies in a development shell through the NODE_PATH environment variable
inherit nodeDependencies; inherit nodeDependencies;
shellHook = stdenv.lib.optionalString (dependencies != []) '' shellHook = stdenv.lib.optionalString (dependencies != []) ''

5413
pkgs/development/node-packages/node-packages-v4.nix
View File

File diff suppressed because it is too large Load Diff

4116
pkgs/development/node-packages/node-packages-v5.nix → pkgs/development/node-packages/node-packages-v6.nix
View File

File diff suppressed because it is too large Load Diff

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

@ -2431,7 +2431,7 @@ in
libtool = darwin.cctools; libtool = darwin.cctools;
}; };
nodejs = nodejs-4_x; nodejs = nodejs-6_x;
nodePackages_6_x = callPackage ../development/node-packages/default-v6.nix { nodePackages_6_x = callPackage ../development/node-packages/default-v6.nix {
nodejs = pkgs.nodejs-6_x; nodejs = pkgs.nodejs-6_x;