Skip to content

Commit

Permalink
nodePackages: regenerate with node2nix 1.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@svanderburg
svanderburg committed Jun 29, 2018
1 parent d039b58 commit dcf113c
Show file tree
Hide file tree
Showing 17 changed files with 10,771 additions and 9,522 deletions.
40 changes: 25 additions & 15 deletions pkgs/applications/editors/zed/node-packages.nix
View file
@@ -1,4 +1,4 @@
# This file has been generated by node2nix 1.5.3. Do not edit!
# This file has been generated by node2nix 1.6.0. Do not edit!

{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:

Expand Down Expand Up @@ -82,7 +82,7 @@ let
version = "1.1.11";
src = fetchurl {
url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";
sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8";
sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
};
};
"buffer-crc32-0.2.3" = {
Expand Down Expand Up @@ -280,7 +280,7 @@ let
version = "7.1.2";
src = fetchurl {
url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz";
sha512 = "08vjxzixc9dwc1hn5pd60yyij98krk2pr758aiga97r02ncvaqx1hidi95wk470k1v84gg4alls9bm52m77174z128bgf13b61x951h";
sha512 = "MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==";
};
};
"graceful-fs-3.0.11" = {
Expand Down Expand Up @@ -415,7 +415,7 @@ let
version = "3.0.4";
src = fetchurl {
url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8";
sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
};
};
"minimist-0.0.8" = {
Expand Down Expand Up @@ -454,13 +454,13 @@ let
sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38";
};
};
"natives-1.1.1" = {
"natives-1.1.4" = {
name = "natives";
packageName = "natives";
version = "1.1.1";
version = "1.1.4";
src = fetchurl {
url = "https://registry.npmjs.org/natives/-/natives-1.1.1.tgz";
sha512 = "08a9lf00d2pkqmdi6ipp00pjin0gwl6fh283cjdjbayaz834lppwrw19kn4s642kwa46bfcway3033j6rbqd96iy86qrzrfgz35mr7i";
url = "https://registry.npmjs.org/natives/-/natives-1.1.4.tgz";
sha512 = "Q29yeg9aFKwhLVdkTAejM/HvYG0Y1Am1+HUkFQGn5k2j8GS+v60TVmZh6nujpEAj/qql+wGUrlryO8bF+b1jEg==";
};
};
"negotiator-0.4.7" = {
Expand Down Expand Up @@ -553,6 +553,15 @@ let
sha1 = "c7c566d5eb4e3fad67eeb9c77c5558ccc39b88a8";
};
};
"psl-1.1.28" = {
name = "psl";
packageName = "psl";
version = "1.1.28";
src = fetchurl {
url = "https://registry.npmjs.org/psl/-/psl-1.1.28.tgz";
sha512 = "+AqO1Ae+N/4r7Rvchrdm432afjT9hqJRyBN3DQv9At0tPz4hIFSGKbq64fN9dVoCow4oggIIax5/iONx0r9hZw==";
};
};
"punycode-1.4.1" = {
name = "punycode";
packageName = "punycode";
Expand Down Expand Up @@ -604,7 +613,7 @@ let
version = "2.6.2";
src = fetchurl {
url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz";
sha512 = "3kmrqh8xli7rzfm8wc6j9lp0c6vml172iv3z088an9xlwl1xvkvh3fn92za66ms4c9yww80qa5kan31k1z1ypqvkchmh1mznb09xdwn";
sha512 = "lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==";
};
};
"send-0.8.5" = {
Expand Down Expand Up @@ -643,13 +652,13 @@ let
sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164";
};
};
"tough-cookie-2.3.4" = {
"tough-cookie-2.4.3" = {
name = "tough-cookie";
packageName = "tough-cookie";
version = "2.3.4";
version = "2.4.3";
src = fetchurl {
url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz";
sha512 = "0ncm6j3cjq1f26mzjf04k9bkw1b08w53s4qa3a11c1bdj4pgnqv1422c1xs5jyy6y1psppjx52fhagq5zkjkgrcpdkxcdiry96r77jd";
url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz";
sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==";
};
};
"tunnel-agent-0.3.0" = {
Expand Down Expand Up @@ -805,10 +814,11 @@ in
sources."mime-1.2.11"
sources."node-uuid-1.4.8"
sources."oauth-sign-0.3.0"
sources."psl-1.1.28"
sources."punycode-1.4.1"
sources."qs-0.6.6"
sources."sntp-0.2.4"
sources."tough-cookie-2.3.4"
sources."tough-cookie-2.4.3"
sources."tunnel-agent-0.3.0"
];
buildInputs = globalBuildInputs;
Expand Down Expand Up @@ -842,7 +852,7 @@ in
sources."minimatch-3.0.4"
sources."minimist-0.0.8"
sources."mkdirp-0.5.1"
sources."natives-1.1.1"
sources."natives-1.1.4"
sources."once-1.4.0"
sources."path-is-absolute-1.0.1"
sources."rimraf-2.6.2"
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/editors/zed/node.nix
View file
@@ -1,4 +1,4 @@
# This file has been generated by node2nix 1.5.3. Do not edit!
# This file has been generated by node2nix 1.6.0. Do not edit!

{pkgs ? import <nixpkgs> {
inherit system;
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/node-packages/composition-v6.nix
View file
@@ -1,4 +1,4 @@
# This file has been generated by node2nix 1.5.3. Do not edit!
# This file has been generated by node2nix 1.6.0. Do not edit!

{pkgs ? import <nixpkgs> {
inherit system;
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/node-packages/composition-v8.nix
View file
@@ -1,4 +1,4 @@
# This file has been generated by node2nix 1.5.3. Do not edit!
# This file has been generated by node2nix 1.6.0. Do not edit!

{pkgs ? import <nixpkgs> {
inherit system;
Expand Down
48 changes: 24 additions & 24 deletions pkgs/development/node-packages/default-v6.nix
View file
Expand Up @@ -6,27 +6,27 @@ let
};
in
nodePackages // {
dat = nodePackages.dat.override (oldAttrs: {
buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-gyp-build ];
});
dat = nodePackages.dat.override {
buildInputs = [ nodePackages.node-gyp-build ];
};

dnschain = nodePackages.dnschain.override (oldAttrs: {
buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper nodePackages.coffee-script ];
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 (oldAttrs: {
buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-pre-gyp ];
});
node-inspector = nodePackages.node-inspector.override {
buildInputs = [ nodePackages.node-pre-gyp ];
};

phantomjs = nodePackages.phantomjs.override {
buildInputs = [ pkgs.phantomjs2 ];
};

phantomjs = nodePackages.phantomjs.override (oldAttrs: {
buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ];
});

webdrvr = nodePackages.webdrvr.override (oldAttrs: {
buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ];
webdrvr = nodePackages.webdrvr.override {
buildInputs = [ pkgs.phantomjs ];

preRebuild = ''
mkdir $TMPDIR/webdrvr
Expand All @@ -42,34 +42,34 @@ 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 (oldAttrs: {
buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ];
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 (oldAttrs: {
ios-deploy = nodePackages.ios-deploy.override {
preRebuild = ''
tmp=$(mktemp -d)
ln -s /usr/bin/xcodebuild $tmp
export PATH="$PATH:$tmp"
'';
});
};

fast-cli = nodePackages."fast-cli-1.x".override (oldAttrs: {
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 = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ];
});
buildInputs = [ pkgs.phantomjs2 ];
};
}
48 changes: 24 additions & 24 deletions pkgs/development/node-packages/default-v8.nix
View file
Expand Up @@ -6,27 +6,27 @@ let
};
in
nodePackages // {
dat = nodePackages.dat.override (oldAttrs: {
buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-gyp-build ];
});
dat = nodePackages.dat.override {
buildInputs = [ nodePackages.node-gyp-build ];
};

dnschain = nodePackages.dnschain.override (oldAttrs: {
buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper nodePackages.coffee-script ];
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 (oldAttrs: {
buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-pre-gyp ];
});
node-inspector = nodePackages.node-inspector.override {
buildInputs = [ nodePackages.node-pre-gyp ];
};

phantomjs = nodePackages.phantomjs.override {
buildInputs = [ pkgs.phantomjs2 ];
};

phantomjs = nodePackages.phantomjs.override (oldAttrs: {
buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ];
});

webdrvr = nodePackages.webdrvr.override (oldAttrs: {
buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ];
webdrvr = nodePackages.webdrvr.override {
buildInputs = [ pkgs.phantomjs ];

preRebuild = ''
mkdir $TMPDIR/webdrvr
Expand All @@ -42,34 +42,34 @@ 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 (oldAttrs: {
buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ];
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 (oldAttrs: {
ios-deploy = nodePackages.ios-deploy.override {
preRebuild = ''
tmp=$(mktemp -d)
ln -s /usr/bin/xcodebuild $tmp
export PATH="$PATH:$tmp"
'';
});
};

fast-cli = nodePackages."fast-cli-1.x".override (oldAttrs: {
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 = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ];
});
buildInputs = [ pkgs.phantomjs2 ];
};
}

0 comments on commit dcf113c

Please sign in to comment.