yarn: init at 0.17.8 (#20635)

This commit is contained in:
Maarten Hoogendoorn 2016-12-14 15:46:45 +01:00 committed by Robin Gloster
parent acbbf6a3cc
commit b217c0a99b
5 changed files with 1374 additions and 314 deletions

View File

@ -123,7 +123,7 @@ let
if [ -f "${src}" ] if [ -f "${src}" ]
then then
# Figure out what directory has been unpacked # Figure out what directory has been unpacked
packageDir="$(find . -maxdepth 1 -type d | 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
@ -133,18 +133,11 @@ let
mv "$packageDir" "$DIR/${packageName}" mv "$packageDir" "$DIR/${packageName}"
elif [ -d "${src}" ] elif [ -d "${src}" ]
then then
# Get a stripped name (without hash) of the source directory.
# On old nixpkgs it's already set internally.
if [ -z "$strippedName" ]
then
strippedName="$(stripHash ${src})"
fi
# 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 the stripped name to not confuse the next unpack step
@ -214,9 +207,6 @@ let
if [ "$dontNpmInstall" != "1" ] if [ "$dontNpmInstall" != "1" ]
then then
# NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
rm -f npm-shrinkwrap.json
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
@ -273,13 +263,10 @@ let
# calling executables outside the Nix store as much as possible # calling executables outside the Nix store as much as possible
patchShebangs . patchShebangs .
export HOME=$PWD 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 tries to download packages even when they already exist if npm-shrinkwrap is used.
rm -f npm-shrinkwrap.json
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
''} ''}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -62,4 +62,5 @@
, "webdrvr" , "webdrvr"
, "webpack" , "webpack"
, "wring" , "wring"
, "yarn"
] ]

View File

@ -183,6 +183,7 @@
, "wscat" , "wscat"
, "wu" , "wu"
, "x509" , "x509"
, "yarn"
, { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " } , { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " }
, { "mongoose": "3.6.x" } , { "mongoose": "3.6.x" }
, { "node-uptime": "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" } , { "node-uptime": "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" }