From 2bae2049ba7d7f0b5b7c862bfd3bfeb5855b53cb Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 12 Mar 2018 23:49:33 +0100 Subject: [PATCH] Propagated libtool as a dependency on darwin to make modules with native dependencies work again --- default.nix | 3 +- lib/expressions/CompositionExpression.js | 17 ++++ nix/node-env.nix | 12 ++- node-packages.nix | 74 ++++++++-------- package.json | 2 +- tests/default-v4.nix | 3 +- tests/default-v6.nix | 3 +- tests/default-v8.nix | 3 +- tests/grunt/default.nix | 3 +- tests/grunt/node-packages.nix | 68 +++++++++++---- tests/grunt/supplement.nix | 2 +- tests/node-packages-v4.nix | 105 ++++++++++++++++------- tests/node-packages-v6.nix | 103 +++++++++++++++------- tests/node-packages-v8.nix | 103 +++++++++++++++------- tests/tests.json | 3 +- 15 files changed, 341 insertions(+), 163 deletions(-) diff --git a/default.nix b/default.nix index b7c6104..d905524 100644 --- a/default.nix +++ b/default.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.2. Do not edit! +# This file has been generated by node2nix 1.5.3. Do not edit! {pkgs ? import { inherit system; @@ -8,6 +8,7 @@ let nodeEnv = import ./nix/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.nix { diff --git a/lib/expressions/CompositionExpression.js b/lib/expressions/CompositionExpression.js index bbd1b5b..9ca1de8 100644 --- a/lib/expressions/CompositionExpression.js +++ b/lib/expressions/CompositionExpression.js @@ -106,6 +106,23 @@ CompositionExpression.prototype.toNixAST = function() { stdenv: new nijs.NixInherit("pkgs"), python2: new nijs.NixInherit("pkgs"), utillinux: new nijs.NixInherit("pkgs"), + libtool: new nijs.NixIf({ + ifExpr: new nijs.NixAttrReference({ + attrSetExpr: new nijs.NixExpression("pkgs"), + refExpr: new nijs.NixAttrReference({ + attrSetExpr: new nijs.NixExpression("stdenv"), + refExpr: new nijs.NixExpression("isDarwin") + }), + }), + thenExpr: new nijs.NixAttrReference({ + attrSetExpr: new nijs.NixExpression("pkgs"), + refExpr: new nijs.NixAttrReference({ + attrSetExpr: new nijs.NixExpression("darwin"), + refExpr: new nijs.NixExpression("cctools") + }), + }), + elseExpr: null + }), runCommand: new nijs.NixInherit("pkgs"), writeTextFile: new nijs.NixInherit("pkgs"), nodejs: new nijs.NixInherit() diff --git a/nix/node-env.nix b/nix/node-env.nix index 15bc6c6..fc118a7 100644 --- a/nix/node-env.nix +++ b/nix/node-env.nix @@ -1,6 +1,6 @@ # This file originates from node2nix -{stdenv, nodejs, python2, utillinux, runCommand, writeTextFile}: +{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}: let python = if nodejs ? python then nodejs.python else python2; @@ -316,7 +316,10 @@ let in stdenv.lib.makeOverridable stdenv.mkDerivation (builtins.removeAttrs args [ "dependencies" ] // { 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 + ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ args.buildInputs or []; dontStrip = args.dontStrip or true; # Striping may fail a build for some package deployments inherit dontNpmInstall preRebuild; @@ -413,7 +416,10 @@ let nodeDependencies = stdenv.mkDerivation { 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 + ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ args.buildInputs or []; includeScript = includeDependencies { inherit dependencies; }; pinpointDependenciesScript = pinpointDependenciesOfPackage args; diff --git a/node-packages.nix b/node-packages.nix index dcd2d8a..f44c3a1 100644 --- a/node-packages.nix +++ b/node-packages.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.2. Do not edit! +# This file has been generated by node2nix 1.5.3. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: @@ -211,13 +211,13 @@ let sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818"; }; }; - "concat-stream-1.6.0" = { + "concat-stream-1.6.1" = { name = "concat-stream"; packageName = "concat-stream"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz"; - sha1 = "0aac662fd52be78964d5532f694784e70110acf7"; + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.1.tgz"; + sha512 = "1gyp2id8ifqdpzk81qz5q7200wf8m66ammg6cz8cxv4blmqh7rf761fxd1536ib4kcdp8jccvyx1l9vi6kjl26pwyd05pblki455jc2"; }; }; "config-chain-1.1.11" = { @@ -463,13 +463,13 @@ let sha512 = "1y8kprb3qldxqj31zai5n8dvhydsl9nn5w4rskhnbzzhldn6pm6n5lcyam3sfkb61a62d5m58k8im7z6ngwbd9cw9zp4zm4y7ckrf20"; }; }; - "hosted-git-info-2.5.0" = { + "hosted-git-info-2.6.0" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "2.5.0"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz"; - sha512 = "355g980qsk8k9hkv60z58llbvpscjl5yqkh4wx719s8jcq2swzn4ynzinj8azmvdgs10r22wb297rmixh9vvsml55sbysdf2i8ipn54"; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.0.tgz"; + sha512 = "1vi4baj130s7mladvb4rad9ka8nqzcwws9i1zaaplp0fdrmnfwjfbpq01cghha2c2frd2f900f07awglhbbyym0bpwmrph0hhhf11ll"; }; }; "http-signature-1.2.0" = { @@ -733,22 +733,22 @@ let sha512 = "01wzws79ps84ylshjb7rfpjykgiqxnpr89s52p2yyzfx8nfvyh5flvf1almiiavsi75xgi8g3s5davc1mmgz7gn8yvlqz6gnhax8f7n"; }; }; - "npm-package-arg-5.1.2" = { + "npm-package-arg-6.0.0" = { name = "npm-package-arg"; packageName = "npm-package-arg"; - version = "5.1.2"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-5.1.2.tgz"; - sha512 = "36g1gm57qcvdgb4lm6ibl9pgma8lgx8l8i2jzap6w3v36wfzsqa7vb411zd26yp9rgcq23951vl5j6pac22qd5h9x7jm9raznnnr460"; + url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.0.0.tgz"; + sha512 = "15a1x3fjip5waxap8dbjkm88j0c2bcnay8pw14p74h1499wznynw2if91shrqlrbzwia09x4xiphp6wkxga5z8vf9k08bjarn1vn047"; }; }; - "npm-registry-client-8.5.0" = { + "npm-registry-client-8.5.1" = { name = "npm-registry-client"; packageName = "npm-registry-client"; - version = "8.5.0"; + version = "8.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.5.0.tgz"; - sha512 = "1nwp5cfjmy4k14g6ziz7zpia8f66ximhrdhw49cj2w173bibq1sgc4d5w951ql5dqf0hcmia956ld9y7qs2q1fx6s2j446zhvdk0irn"; + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.5.1.tgz"; + sha512 = "0g7abpykfqb1x17pajm1ndsh61n3ydyimv5npsjrn9hd1s72csxh7fzdn28gldz30n00wgb8rg9y8jfhxli3cnii61i5vl0cwbwdf7f"; }; }; "npmconf-2.1.2" = { @@ -895,22 +895,22 @@ let sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r"; }; }; - "readable-stream-2.3.4" = { + "readable-stream-2.3.5" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.3.4"; + version = "2.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.4.tgz"; - sha512 = "1jpffi1v0l7pkzrhh8i9c6cbswa9npyx114cbfncfnzl9d7w9p08k9n703hq5xr2c3rg86qiq023sl1x8y6mawgsxgggy8ccrwk3rmy"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz"; + sha512 = "09n3j4jsfl2lq3gj65qwn5b3lvzb624lrb8m14h81ls9cw59vvm8436gm5zwaqxf6y1zrfwbrsmizsq48jw1s3qj9zhpjp438735bdl"; }; }; - "request-2.83.0" = { + "request-2.85.0" = { name = "request"; packageName = "request"; - version = "2.83.0"; + version = "2.85.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.83.0.tgz"; - sha512 = "0by1djkn836sqd9pk2c777wcjvp34qbk1plx7s4lmykljrblpjc64dvn6ni2vyxsbyk33wnl6avym8vgw0ggr4226xakck8mw7y07cm"; + url = "https://registry.npmjs.org/request/-/request-2.85.0.tgz"; + sha512 = "2d3hg10zs5ycnr8prmiwdhacf88fl0x0bi6szs0z2r07zcbk419laixwpjp8sqapbc2ifyyih7p3r60wgr58bmcncz3pqnx523c8zph"; }; }; "requizzle-0.2.1" = { @@ -1057,13 +1057,13 @@ let sha1 = "512df6da6287144316dc4c18fe1cf1d940739be3"; }; }; - "ssri-4.1.6" = { + "ssri-5.2.4" = { name = "ssri"; packageName = "ssri"; - version = "4.1.6"; + version = "5.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/ssri/-/ssri-4.1.6.tgz"; - sha512 = "283n1p781cl2pj3jk32blcvwjdlaixng0v5x2f9qi3ndxrmyg3hk4clsjpcfsszkymy40q426yz5skax4ivsmll2p9hhcc00ivc4ijr"; + url = "https://registry.npmjs.org/ssri/-/ssri-5.2.4.tgz"; + sha512 = "2si1dr4dwg0bkvsn38d6rk5raw5lbn2m9giwf8pnhy55wqgxsvv7b1pn252wj166cd8j302a2gwjy00ni473yr1vrxrzmssqs000waj"; }; }; "string-width-1.0.2" = { @@ -1304,7 +1304,7 @@ let args = { name = "node2nix"; packageName = "node2nix"; - version = "1.5.2"; + version = "1.5.3"; src = ./.; dependencies = [ sources."abbrev-1.1.1" @@ -1333,7 +1333,7 @@ let sources."co-4.6.0" sources."code-point-at-1.1.0" sources."combined-stream-1.0.6" - sources."concat-stream-1.6.0" + sources."concat-stream-1.6.1" sources."config-chain-1.1.11" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" @@ -1369,7 +1369,7 @@ let sources."has-unicode-2.0.1" sources."hawk-6.0.2" sources."hoek-4.2.1" - sources."hosted-git-info-2.5.0" + sources."hosted-git-info-2.6.0" sources."http-signature-1.2.0" sources."inherits-2.0.3" sources."ini-1.3.5" @@ -1398,8 +1398,8 @@ let sources."nijs-0.0.25" sources."nopt-3.0.6" sources."normalize-package-data-2.4.0" - sources."npm-package-arg-5.1.2" - sources."npm-registry-client-8.5.0" + sources."npm-package-arg-6.0.0" + sources."npm-registry-client-8.5.1" (sources."npmconf-2.1.2" // { dependencies = [ sources."once-1.3.3" @@ -1420,8 +1420,8 @@ let sources."proto-list-1.2.4" sources."punycode-1.4.1" sources."qs-6.5.1" - sources."readable-stream-2.3.4" - sources."request-2.83.0" + sources."readable-stream-2.3.5" + sources."request-2.85.0" (sources."requizzle-0.2.1" // { dependencies = [ sources."underscore-1.6.0" @@ -1441,7 +1441,7 @@ let sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.0" sources."sshpk-1.13.1" - sources."ssri-4.1.6" + sources."ssri-5.2.4" sources."string-width-1.0.2" sources."string_decoder-1.0.3" sources."stringstream-0.0.5" diff --git a/package.json b/package.json index ac77739..d2acb0c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "node2nix", - "version": "1.5.2", + "version": "1.5.3", "description": "Generate Nix expressions to build NPM packages", "homepage": "https://github.com/svanderburg/node2nix", "author": { diff --git a/tests/default-v4.nix b/tests/default-v4.nix index f3b0486..62625ed 100644 --- a/tests/default-v4.nix +++ b/tests/default-v4.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.2. Do not edit! +# This file has been generated by node2nix 1.5.3. Do not edit! {pkgs ? import { inherit system; @@ -8,6 +8,7 @@ let nodeEnv = import ../nix/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-v4.nix { diff --git a/tests/default-v6.nix b/tests/default-v6.nix index 192af5a..e6a2bed 100644 --- a/tests/default-v6.nix +++ b/tests/default-v6.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.2. Do not edit! +# This file has been generated by node2nix 1.5.3. Do not edit! {pkgs ? import { inherit system; @@ -8,6 +8,7 @@ let nodeEnv = import ../nix/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-v6.nix { diff --git a/tests/default-v8.nix b/tests/default-v8.nix index bdd3680..996b966 100644 --- a/tests/default-v8.nix +++ b/tests/default-v8.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.2. Do not edit! +# This file has been generated by node2nix 1.5.3. Do not edit! {pkgs ? import { inherit system; @@ -8,6 +8,7 @@ let nodeEnv = import ../nix/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-v8.nix { diff --git a/tests/grunt/default.nix b/tests/grunt/default.nix index eb39b42..0def8fd 100644 --- a/tests/grunt/default.nix +++ b/tests/grunt/default.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.2. Do not edit! +# This file has been generated by node2nix 1.5.3. Do not edit! {pkgs ? import { inherit system; @@ -12,6 +12,7 @@ let nodeEnv = import ../../nix/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.nix { diff --git a/tests/grunt/node-packages.nix b/tests/grunt/node-packages.nix index 9896765..70f28bb 100644 --- a/tests/grunt/node-packages.nix +++ b/tests/grunt/node-packages.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.2. Do not edit! +# This file has been generated by node2nix 1.5.3. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: @@ -526,13 +526,13 @@ let sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149"; }; }; - "grunt-legacy-log-1.0.0" = { + "grunt-legacy-log-1.0.1" = { name = "grunt-legacy-log"; packageName = "grunt-legacy-log"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-1.0.0.tgz"; - sha1 = "fb86f1809847bc07dc47843f9ecd6cacb62df2d5"; + url = "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-1.0.1.tgz"; + sha512 = "0fk74316iarjn5hc1sipqnrj4sv192c24aj63zbm0mhb1rham6c8wlqaan68s5isjdmfdc12q890j3hccrcgvs0rw7l48x5salb42xg"; }; }; "grunt-legacy-log-utils-1.0.0" = { @@ -571,13 +571,13 @@ let sha1 = "b834f723cc4a242aa65963459df6d984c5d3d959"; }; }; - "hosted-git-info-2.5.0" = { + "hosted-git-info-2.6.0" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "2.5.0"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz"; - sha512 = "355g980qsk8k9hkv60z58llbvpscjl5yqkh4wx719s8jcq2swzn4ynzinj8azmvdgs10r22wb297rmixh9vvsml55sbysdf2i8ipn54"; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.0.tgz"; + sha512 = "1vi4baj130s7mladvb4rad9ka8nqzcwws9i1zaaplp0fdrmnfwjfbpq01cghha2c2frd2f900f07awglhbbyym0bpwmrph0hhhf11ll"; }; }; "htmlparser2-3.8.3" = { @@ -598,13 +598,13 @@ let sha1 = "197e22cdebd4198585e8694ef6786197b91ed942"; }; }; - "http-parser-js-0.4.10" = { + "http-parser-js-0.4.11" = { name = "http-parser-js"; packageName = "http-parser-js"; - version = "0.4.10"; + version = "0.4.11"; src = fetchurl { - url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.10.tgz"; - sha1 = "92c9c1374c35085f75db359ec56cc257cbb93fa4"; + url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.11.tgz"; + sha512 = "1y4az74zgv7jy1cav126lbrbvfqv30p7v3ijmj91ychbg0337k71cwy2n5dvmdfvwhgv3vxxzw2ymxlbj6wh1wf6aycb313c0xpj920"; }; }; "iconv-lite-0.4.13" = { @@ -1147,6 +1147,15 @@ let sha1 = "04e6926f662895354f3dd015203633b857297e2c"; }; }; + "sprintf-js-1.1.1" = { + name = "sprintf-js"; + packageName = "sprintf-js"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.1.tgz"; + sha1 = "36be78320afe5801f6cea3ee78b6e5aab940ea0c"; + }; + }; "statuses-1.4.0" = { name = "statuses"; packageName = "statuses"; @@ -1246,6 +1255,15 @@ let sha1 = "806992633665d5e5fcb4db1fb3a862eb68e9e6da"; }; }; + "underscore.string-3.3.4" = { + name = "underscore.string"; + packageName = "underscore.string"; + version = "3.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.4.tgz"; + sha1 = "2c2a3f9f83e64762fdc45e6ceac65142864213db"; + }; + }; "unpipe-1.0.0" = { name = "unpipe"; packageName = "unpipe"; @@ -1255,6 +1273,15 @@ let sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; }; }; + "util-deprecate-1.0.2" = { + name = "util-deprecate"; + packageName = "util-deprecate"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + }; "validate-npm-package-license-3.0.3" = { name = "validate-npm-package-license"; packageName = "validate-npm-package-license"; @@ -1335,7 +1362,7 @@ let sources."minimist-1.2.0" (sources."normalize-package-data-2.4.0" // { dependencies = [ - sources."hosted-git-info-2.5.0" + sources."hosted-git-info-2.6.0" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -1480,7 +1507,7 @@ let ]; }) sources."grunt-known-options-1.1.0" - (sources."grunt-legacy-log-1.0.0" // { + (sources."grunt-legacy-log-1.0.1" // { dependencies = [ sources."colors-1.1.2" (sources."grunt-legacy-log-utils-1.0.0" // { @@ -1506,8 +1533,13 @@ let ]; }) sources."hooker-0.2.3" - sources."lodash-3.10.1" - sources."underscore.string-3.2.3" + sources."lodash-4.17.5" + (sources."underscore.string-3.3.4" // { + dependencies = [ + sources."sprintf-js-1.1.1" + sources."util-deprecate-1.0.2" + ]; + }) ]; }) (sources."grunt-legacy-util-1.0.0" // { @@ -1732,7 +1764,7 @@ let dependencies = [ (sources."websocket-driver-0.7.0" // { dependencies = [ - sources."http-parser-js-0.4.10" + sources."http-parser-js-0.4.11" sources."websocket-extensions-0.1.3" ]; }) diff --git a/tests/grunt/supplement.nix b/tests/grunt/supplement.nix index 88d5716..a5c4cac 100644 --- a/tests/grunt/supplement.nix +++ b/tests/grunt/supplement.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.2. Do not edit! +# This file has been generated by node2nix 1.5.3. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: diff --git a/tests/node-packages-v4.nix b/tests/node-packages-v4.nix index b1c5fcc..f664670 100644 --- a/tests/node-packages-v4.nix +++ b/tests/node-packages-v4.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.2. Do not edit! +# This file has been generated by node2nix 1.5.3. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: @@ -22,13 +22,13 @@ let sha1 = "e5f1f3928c6d95fd96558c36ec3d9d0de4a6ecea"; }; }; - "accepts-1.3.4" = { + "accepts-1.3.5" = { name = "accepts"; packageName = "accepts"; - version = "1.3.4"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz"; - sha1 = "86246758c7dd6d21a6474ff084a4740ec05eb21f"; + url = "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz"; + sha1 = "eb777df6011723a3b14e8a72c0805c8e86746bd2"; }; }; "ajv-5.5.2" = { @@ -121,6 +121,15 @@ let sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; }; }; + "bindings-1.2.1" = { + name = "bindings"; + packageName = "bindings"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"; + sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; + }; + }; "body-parser-1.18.2" = { name = "body-parser"; packageName = "body-parser"; @@ -409,13 +418,13 @@ let sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; }; }; - "es5-ext-0.10.39" = { + "es5-ext-0.10.40" = { name = "es5-ext"; packageName = "es5-ext"; - version = "0.10.39"; + version = "0.10.40"; src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.39.tgz"; - sha512 = "3k07fsn3x64wphzrvb5bhv4r8drmvranrh43j8pn7rsnpyk8pia81vy1d4g3ix0ami3xs4crqxpanxff9dwfk7czrl4m5y72dk9fmh2"; + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.40.tgz"; + sha512 = "2ylf5xas3zi45vg84c8r81d1lw1d1wmckzf8pvnkwgmq6js0n5mms6lrpnmac7sbi4fv9aqlnrspz7s97vbqii3c6py7r4sikg63lab"; }; }; "es6-iterator-2.0.3" = { @@ -832,13 +841,13 @@ let sha512 = "11hikgyas884mz8a58vyixaahxbpdwljdw4cb6qp15xa3sfqikp2mm6wgv41jsl34nzsv1hkx9kw3nwczvas5p73whirmaz4sxggwmj"; }; }; - "lru-cache-4.1.1" = { + "lru-cache-4.1.2" = { name = "lru-cache"; packageName = "lru-cache"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz"; - sha512 = "1xz91sizgyzh8plz5jx1labzpygapm6xy3qpxriaj00yvnhy4lnmhqcb20qln4lh80c5g3yzp4j5i6g63njq1r5sl9c0zlkh9xjk2xb"; + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.2.tgz"; + sha512 = "1whynbvy3pbwcpkxk6rqhsymj2h3bh7p13nfhs9ch6hfx96vrh86j7vd4lqcaqjy5dhsfjps6sh2wqndh269wjz42khbh6339g9a1y2"; }; }; "media-typer-0.3.0" = { @@ -967,6 +976,15 @@ let sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; }; }; + "nan-2.3.5" = { + name = "nan"; + packageName = "nan"; + version = "2.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz"; + sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08"; + }; + }; "nan-2.9.2" = { name = "nan"; packageName = "nan"; @@ -1210,13 +1228,13 @@ let sha1 = "bcd60c77d3eb93cde0050295c3f379389bc88f89"; }; }; - "request-2.83.0" = { + "request-2.85.0" = { name = "request"; packageName = "request"; - version = "2.83.0"; + version = "2.85.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.83.0.tgz"; - sha512 = "0by1djkn836sqd9pk2c777wcjvp34qbk1plx7s4lmykljrblpjc64dvn6ni2vyxsbyk33wnl6avym8vgw0ggr4226xakck8mw7y07cm"; + url = "https://registry.npmjs.org/request/-/request-2.85.0.tgz"; + sha512 = "2d3hg10zs5ycnr8prmiwdhacf88fl0x0bi6szs0z2r07zcbk419laixwpjp8sqapbc2ifyyih7p3r60wgr58bmcncz3pqnx523c8zph"; }; }; "resolve-1.1.7" = { @@ -1626,11 +1644,11 @@ in version = "4.16.2"; src = fetchgit { url = "https://github.com/strongloop/express.git"; - rev = "0083372bed2df35abf56ac882bd42f01bd6cff39"; - sha256 = "b52e86487953b0a1f48b0cd8e89963a21c25235ba723c4cdf930c751803b2a00"; + rev = "0e88dceac2b86fbc066cd0f042d093e838604d0d"; + sha256 = "c6b557f686bc58546ec7cfa9dbb879af9c7c0b26f65f9189d4dc3bc32797d7d9"; }; dependencies = [ - (sources."accepts-1.3.4" // { + (sources."accepts-1.3.5" // { dependencies = [ (sources."mime-types-2.1.18" // { dependencies = [ @@ -1852,11 +1870,11 @@ in version = "4.16.2"; src = fetchgit { url = "https://github.com/strongloop/express.git"; - rev = "0083372bed2df35abf56ac882bd42f01bd6cff39"; - sha256 = "b52e86487953b0a1f48b0cd8e89963a21c25235ba723c4cdf930c751803b2a00"; + rev = "0e88dceac2b86fbc066cd0f042d093e838604d0d"; + sha256 = "c6b557f686bc58546ec7cfa9dbb879af9c7c0b26f65f9189d4dc3bc32797d7d9"; }; dependencies = [ - (sources."accepts-1.3.4" // { + (sources."accepts-1.3.5" // { dependencies = [ (sources."mime-types-2.1.18" // { dependencies = [ @@ -1989,8 +2007,8 @@ in version = "4.17.4"; src = fetchgit { url = "git://github.com/lodash/lodash"; - rev = "c1f805f4972843b675056b2786f1165f7db81737"; - sha256 = "078150a3eaf590ebb675cc0c4b9a001f67c1e2249511f196e6c77d86c797f13b"; + rev = "f73b35bb497dd8948dcfa97a6924bf5ee860d467"; + sha256 = "f7808a545a8c06c23c13700ebd57a094a29b35a90446e37593ab0fb83b28edb7"; }; buildInputs = globalBuildInputs; meta = { @@ -2016,22 +2034,22 @@ in es5-ext = nodeEnv.buildNodePackage { name = "es5-ext"; packageName = "es5-ext"; - version = "0.10.39"; + version = "0.10.40"; src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.39.tgz"; - sha512 = "3k07fsn3x64wphzrvb5bhv4r8drmvranrh43j8pn7rsnpyk8pia81vy1d4g3ix0ami3xs4crqxpanxff9dwfk7czrl4m5y72dk9fmh2"; + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.40.tgz"; + sha512 = "2ylf5xas3zi45vg84c8r81d1lw1d1wmckzf8pvnkwgmq6js0n5mms6lrpnmac7sbi4fv9aqlnrspz7s97vbqii3c6py7r4sikg63lab"; }; dependencies = [ (sources."es6-iterator-2.0.3" // { dependencies = [ sources."d-1.0.0" - sources."es5-ext-0.10.39" + sources."es5-ext-0.10.40" ]; }) (sources."es6-symbol-3.1.1" // { dependencies = [ sources."d-1.0.0" - sources."es5-ext-0.10.39" + sources."es5-ext-0.10.40" ]; }) ]; @@ -2039,7 +2057,7 @@ in meta = { description = "ECMAScript extensions and shims"; homepage = "https://github.com/medikoo/es5-ext#readme"; - license = "MIT"; + license = "ISC"; }; production = true; bypassCache = false; @@ -2179,7 +2197,7 @@ in sources."wordwrap-0.0.3" ]; }) - (sources."request-2.83.0" // { + (sources."request-2.85.0" // { dependencies = [ sources."aws-sign2-0.7.0" sources."aws4-1.6.0" @@ -2293,7 +2311,7 @@ in dependencies = [ (sources."cross-spawn-async-2.2.5" // { dependencies = [ - (sources."lru-cache-4.1.1" // { + (sources."lru-cache-4.1.2" // { dependencies = [ sources."pseudomap-1.0.2" sources."yallist-2.1.2" @@ -2338,4 +2356,25 @@ in production = true; bypassCache = false; }; + "bcrypt-0.8.x" = nodeEnv.buildNodePackage { + name = "bcrypt"; + packageName = "bcrypt"; + version = "0.8.7"; + src = fetchurl { + url = "https://registry.npmjs.org/bcrypt/-/bcrypt-0.8.7.tgz"; + sha1 = "bc3875a9afd0a7b2cd231a6a7f218a5ce156b093"; + }; + dependencies = [ + sources."bindings-1.2.1" + sources."nan-2.3.5" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A bcrypt library for NodeJS."; + homepage = "https://github.com/ncb000gt/node.bcrypt.js#readme"; + license = "MIT"; + }; + production = true; + bypassCache = false; + }; } \ No newline at end of file diff --git a/tests/node-packages-v6.nix b/tests/node-packages-v6.nix index cfe795d..1add44b 100644 --- a/tests/node-packages-v6.nix +++ b/tests/node-packages-v6.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.2. Do not edit! +# This file has been generated by node2nix 1.5.3. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: @@ -22,13 +22,13 @@ let sha1 = "e5f1f3928c6d95fd96558c36ec3d9d0de4a6ecea"; }; }; - "accepts-1.3.4" = { + "accepts-1.3.5" = { name = "accepts"; packageName = "accepts"; - version = "1.3.4"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz"; - sha1 = "86246758c7dd6d21a6474ff084a4740ec05eb21f"; + url = "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz"; + sha1 = "eb777df6011723a3b14e8a72c0805c8e86746bd2"; }; }; "ajv-5.5.2" = { @@ -121,6 +121,15 @@ let sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; }; }; + "bindings-1.2.1" = { + name = "bindings"; + packageName = "bindings"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"; + sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; + }; + }; "body-parser-1.18.2" = { name = "body-parser"; packageName = "body-parser"; @@ -409,13 +418,13 @@ let sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; }; }; - "es5-ext-0.10.39" = { + "es5-ext-0.10.40" = { name = "es5-ext"; packageName = "es5-ext"; - version = "0.10.39"; + version = "0.10.40"; src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.39.tgz"; - sha512 = "3k07fsn3x64wphzrvb5bhv4r8drmvranrh43j8pn7rsnpyk8pia81vy1d4g3ix0ami3xs4crqxpanxff9dwfk7czrl4m5y72dk9fmh2"; + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.40.tgz"; + sha512 = "2ylf5xas3zi45vg84c8r81d1lw1d1wmckzf8pvnkwgmq6js0n5mms6lrpnmac7sbi4fv9aqlnrspz7s97vbqii3c6py7r4sikg63lab"; }; }; "es6-iterator-2.0.3" = { @@ -832,13 +841,13 @@ let sha512 = "11hikgyas884mz8a58vyixaahxbpdwljdw4cb6qp15xa3sfqikp2mm6wgv41jsl34nzsv1hkx9kw3nwczvas5p73whirmaz4sxggwmj"; }; }; - "lru-cache-4.1.1" = { + "lru-cache-4.1.2" = { name = "lru-cache"; packageName = "lru-cache"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz"; - sha512 = "1xz91sizgyzh8plz5jx1labzpygapm6xy3qpxriaj00yvnhy4lnmhqcb20qln4lh80c5g3yzp4j5i6g63njq1r5sl9c0zlkh9xjk2xb"; + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.2.tgz"; + sha512 = "1whynbvy3pbwcpkxk6rqhsymj2h3bh7p13nfhs9ch6hfx96vrh86j7vd4lqcaqjy5dhsfjps6sh2wqndh269wjz42khbh6339g9a1y2"; }; }; "media-typer-0.3.0" = { @@ -958,6 +967,15 @@ let sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; }; }; + "nan-2.3.5" = { + name = "nan"; + packageName = "nan"; + version = "2.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz"; + sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08"; + }; + }; "nan-2.9.2" = { name = "nan"; packageName = "nan"; @@ -1201,13 +1219,13 @@ let sha1 = "bcd60c77d3eb93cde0050295c3f379389bc88f89"; }; }; - "request-2.83.0" = { + "request-2.85.0" = { name = "request"; packageName = "request"; - version = "2.83.0"; + version = "2.85.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.83.0.tgz"; - sha512 = "0by1djkn836sqd9pk2c777wcjvp34qbk1plx7s4lmykljrblpjc64dvn6ni2vyxsbyk33wnl6avym8vgw0ggr4226xakck8mw7y07cm"; + url = "https://registry.npmjs.org/request/-/request-2.85.0.tgz"; + sha512 = "2d3hg10zs5ycnr8prmiwdhacf88fl0x0bi6szs0z2r07zcbk419laixwpjp8sqapbc2ifyyih7p3r60wgr58bmcncz3pqnx523c8zph"; }; }; "resolve-1.1.7" = { @@ -1617,11 +1635,11 @@ in version = "4.16.2"; src = fetchgit { url = "https://github.com/strongloop/express.git"; - rev = "0083372bed2df35abf56ac882bd42f01bd6cff39"; - sha256 = "b52e86487953b0a1f48b0cd8e89963a21c25235ba723c4cdf930c751803b2a00"; + rev = "0e88dceac2b86fbc066cd0f042d093e838604d0d"; + sha256 = "c6b557f686bc58546ec7cfa9dbb879af9c7c0b26f65f9189d4dc3bc32797d7d9"; }; dependencies = [ - sources."accepts-1.3.4" + sources."accepts-1.3.5" sources."array-flatten-1.1.1" (sources."body-parser-1.18.2" // { dependencies = [ @@ -1761,11 +1779,11 @@ in version = "4.16.2"; src = fetchgit { url = "https://github.com/strongloop/express.git"; - rev = "0083372bed2df35abf56ac882bd42f01bd6cff39"; - sha256 = "b52e86487953b0a1f48b0cd8e89963a21c25235ba723c4cdf930c751803b2a00"; + rev = "0e88dceac2b86fbc066cd0f042d093e838604d0d"; + sha256 = "c6b557f686bc58546ec7cfa9dbb879af9c7c0b26f65f9189d4dc3bc32797d7d9"; }; dependencies = [ - sources."accepts-1.3.4" + sources."accepts-1.3.5" sources."array-flatten-1.1.1" (sources."body-parser-1.18.2" // { dependencies = [ @@ -1860,8 +1878,8 @@ in version = "4.17.4"; src = fetchgit { url = "git://github.com/lodash/lodash"; - rev = "c1f805f4972843b675056b2786f1165f7db81737"; - sha256 = "078150a3eaf590ebb675cc0c4b9a001f67c1e2249511f196e6c77d86c797f13b"; + rev = "f73b35bb497dd8948dcfa97a6924bf5ee860d467"; + sha256 = "f7808a545a8c06c23c13700ebd57a094a29b35a90446e37593ab0fb83b28edb7"; }; buildInputs = globalBuildInputs; meta = { @@ -1887,14 +1905,14 @@ in es5-ext = nodeEnv.buildNodePackage { name = "es5-ext"; packageName = "es5-ext"; - version = "0.10.39"; + version = "0.10.40"; src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.39.tgz"; - sha512 = "3k07fsn3x64wphzrvb5bhv4r8drmvranrh43j8pn7rsnpyk8pia81vy1d4g3ix0ami3xs4crqxpanxff9dwfk7czrl4m5y72dk9fmh2"; + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.40.tgz"; + sha512 = "2ylf5xas3zi45vg84c8r81d1lw1d1wmckzf8pvnkwgmq6js0n5mms6lrpnmac7sbi4fv9aqlnrspz7s97vbqii3c6py7r4sikg63lab"; }; dependencies = [ sources."d-1.0.0" - sources."es5-ext-0.10.39" + sources."es5-ext-0.10.40" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.1" ]; @@ -1902,7 +1920,7 @@ in meta = { description = "ECMAScript extensions and shims"; homepage = "https://github.com/medikoo/es5-ext#readme"; - license = "MIT"; + license = "ISC"; }; production = true; bypassCache = false; @@ -2044,7 +2062,7 @@ in sources."performance-now-2.1.0" sources."punycode-1.4.1" sources."qs-6.5.1" - sources."request-2.83.0" + sources."request-2.85.0" sources."safe-buffer-5.1.1" sources."sntp-2.1.0" sources."sshpk-1.13.1" @@ -2078,7 +2096,7 @@ in sources."cross-spawn-async-2.2.5" sources."execa-0.2.2" sources."isexe-2.0.0" - sources."lru-cache-4.1.1" + sources."lru-cache-4.1.2" sources."npm-run-path-1.0.0" sources."object-assign-4.1.1" sources."path-key-1.0.0" @@ -2112,4 +2130,25 @@ in production = true; bypassCache = false; }; + "bcrypt-0.8.x" = nodeEnv.buildNodePackage { + name = "bcrypt"; + packageName = "bcrypt"; + version = "0.8.7"; + src = fetchurl { + url = "https://registry.npmjs.org/bcrypt/-/bcrypt-0.8.7.tgz"; + sha1 = "bc3875a9afd0a7b2cd231a6a7f218a5ce156b093"; + }; + dependencies = [ + sources."bindings-1.2.1" + sources."nan-2.3.5" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A bcrypt library for NodeJS."; + homepage = "https://github.com/ncb000gt/node.bcrypt.js#readme"; + license = "MIT"; + }; + production = true; + bypassCache = false; + }; } \ No newline at end of file diff --git a/tests/node-packages-v8.nix b/tests/node-packages-v8.nix index ac49fd5..1e4e227 100644 --- a/tests/node-packages-v8.nix +++ b/tests/node-packages-v8.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.2. Do not edit! +# This file has been generated by node2nix 1.5.3. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: @@ -22,13 +22,13 @@ let sha1 = "e5f1f3928c6d95fd96558c36ec3d9d0de4a6ecea"; }; }; - "accepts-1.3.4" = { + "accepts-1.3.5" = { name = "accepts"; packageName = "accepts"; - version = "1.3.4"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz"; - sha1 = "86246758c7dd6d21a6474ff084a4740ec05eb21f"; + url = "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz"; + sha1 = "eb777df6011723a3b14e8a72c0805c8e86746bd2"; }; }; "ajv-5.5.2" = { @@ -121,6 +121,15 @@ let sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; }; }; + "bindings-1.2.1" = { + name = "bindings"; + packageName = "bindings"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"; + sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; + }; + }; "body-parser-1.18.2" = { name = "body-parser"; packageName = "body-parser"; @@ -409,13 +418,13 @@ let sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; }; }; - "es5-ext-0.10.39" = { + "es5-ext-0.10.40" = { name = "es5-ext"; packageName = "es5-ext"; - version = "0.10.39"; + version = "0.10.40"; src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.39.tgz"; - sha512 = "3k07fsn3x64wphzrvb5bhv4r8drmvranrh43j8pn7rsnpyk8pia81vy1d4g3ix0ami3xs4crqxpanxff9dwfk7czrl4m5y72dk9fmh2"; + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.40.tgz"; + sha512 = "2ylf5xas3zi45vg84c8r81d1lw1d1wmckzf8pvnkwgmq6js0n5mms6lrpnmac7sbi4fv9aqlnrspz7s97vbqii3c6py7r4sikg63lab"; }; }; "es6-iterator-2.0.3" = { @@ -832,13 +841,13 @@ let sha512 = "11hikgyas884mz8a58vyixaahxbpdwljdw4cb6qp15xa3sfqikp2mm6wgv41jsl34nzsv1hkx9kw3nwczvas5p73whirmaz4sxggwmj"; }; }; - "lru-cache-4.1.1" = { + "lru-cache-4.1.2" = { name = "lru-cache"; packageName = "lru-cache"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz"; - sha512 = "1xz91sizgyzh8plz5jx1labzpygapm6xy3qpxriaj00yvnhy4lnmhqcb20qln4lh80c5g3yzp4j5i6g63njq1r5sl9c0zlkh9xjk2xb"; + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.2.tgz"; + sha512 = "1whynbvy3pbwcpkxk6rqhsymj2h3bh7p13nfhs9ch6hfx96vrh86j7vd4lqcaqjy5dhsfjps6sh2wqndh269wjz42khbh6339g9a1y2"; }; }; "media-typer-0.3.0" = { @@ -958,6 +967,15 @@ let sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; }; }; + "nan-2.3.5" = { + name = "nan"; + packageName = "nan"; + version = "2.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz"; + sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08"; + }; + }; "nan-2.9.2" = { name = "nan"; packageName = "nan"; @@ -1201,13 +1219,13 @@ let sha1 = "bcd60c77d3eb93cde0050295c3f379389bc88f89"; }; }; - "request-2.83.0" = { + "request-2.85.0" = { name = "request"; packageName = "request"; - version = "2.83.0"; + version = "2.85.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.83.0.tgz"; - sha512 = "0by1djkn836sqd9pk2c777wcjvp34qbk1plx7s4lmykljrblpjc64dvn6ni2vyxsbyk33wnl6avym8vgw0ggr4226xakck8mw7y07cm"; + url = "https://registry.npmjs.org/request/-/request-2.85.0.tgz"; + sha512 = "2d3hg10zs5ycnr8prmiwdhacf88fl0x0bi6szs0z2r07zcbk419laixwpjp8sqapbc2ifyyih7p3r60wgr58bmcncz3pqnx523c8zph"; }; }; "resolve-1.1.7" = { @@ -1617,11 +1635,11 @@ in version = "4.16.2"; src = fetchgit { url = "https://github.com/strongloop/express.git"; - rev = "0083372bed2df35abf56ac882bd42f01bd6cff39"; - sha256 = "b52e86487953b0a1f48b0cd8e89963a21c25235ba723c4cdf930c751803b2a00"; + rev = "0e88dceac2b86fbc066cd0f042d093e838604d0d"; + sha256 = "c6b557f686bc58546ec7cfa9dbb879af9c7c0b26f65f9189d4dc3bc32797d7d9"; }; dependencies = [ - sources."accepts-1.3.4" + sources."accepts-1.3.5" sources."array-flatten-1.1.1" (sources."body-parser-1.18.2" // { dependencies = [ @@ -1761,11 +1779,11 @@ in version = "4.16.2"; src = fetchgit { url = "https://github.com/strongloop/express.git"; - rev = "0083372bed2df35abf56ac882bd42f01bd6cff39"; - sha256 = "b52e86487953b0a1f48b0cd8e89963a21c25235ba723c4cdf930c751803b2a00"; + rev = "0e88dceac2b86fbc066cd0f042d093e838604d0d"; + sha256 = "c6b557f686bc58546ec7cfa9dbb879af9c7c0b26f65f9189d4dc3bc32797d7d9"; }; dependencies = [ - sources."accepts-1.3.4" + sources."accepts-1.3.5" sources."array-flatten-1.1.1" (sources."body-parser-1.18.2" // { dependencies = [ @@ -1860,8 +1878,8 @@ in version = "4.17.4"; src = fetchgit { url = "git://github.com/lodash/lodash"; - rev = "c1f805f4972843b675056b2786f1165f7db81737"; - sha256 = "078150a3eaf590ebb675cc0c4b9a001f67c1e2249511f196e6c77d86c797f13b"; + rev = "f73b35bb497dd8948dcfa97a6924bf5ee860d467"; + sha256 = "f7808a545a8c06c23c13700ebd57a094a29b35a90446e37593ab0fb83b28edb7"; }; buildInputs = globalBuildInputs; meta = { @@ -1887,14 +1905,14 @@ in es5-ext = nodeEnv.buildNodePackage { name = "es5-ext"; packageName = "es5-ext"; - version = "0.10.39"; + version = "0.10.40"; src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.39.tgz"; - sha512 = "3k07fsn3x64wphzrvb5bhv4r8drmvranrh43j8pn7rsnpyk8pia81vy1d4g3ix0ami3xs4crqxpanxff9dwfk7czrl4m5y72dk9fmh2"; + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.40.tgz"; + sha512 = "2ylf5xas3zi45vg84c8r81d1lw1d1wmckzf8pvnkwgmq6js0n5mms6lrpnmac7sbi4fv9aqlnrspz7s97vbqii3c6py7r4sikg63lab"; }; dependencies = [ sources."d-1.0.0" - sources."es5-ext-0.10.39" + sources."es5-ext-0.10.40" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.1" ]; @@ -1902,7 +1920,7 @@ in meta = { description = "ECMAScript extensions and shims"; homepage = "https://github.com/medikoo/es5-ext#readme"; - license = "MIT"; + license = "ISC"; }; production = true; bypassCache = true; @@ -2044,7 +2062,7 @@ in sources."performance-now-2.1.0" sources."punycode-1.4.1" sources."qs-6.5.1" - sources."request-2.83.0" + sources."request-2.85.0" sources."safe-buffer-5.1.1" sources."sntp-2.1.0" sources."sshpk-1.13.1" @@ -2078,7 +2096,7 @@ in sources."cross-spawn-async-2.2.5" sources."execa-0.2.2" sources."isexe-2.0.0" - sources."lru-cache-4.1.1" + sources."lru-cache-4.1.2" sources."npm-run-path-1.0.0" sources."object-assign-4.1.1" sources."path-key-1.0.0" @@ -2112,4 +2130,25 @@ in production = true; bypassCache = true; }; + "bcrypt-0.8.x" = nodeEnv.buildNodePackage { + name = "bcrypt"; + packageName = "bcrypt"; + version = "0.8.7"; + src = fetchurl { + url = "https://registry.npmjs.org/bcrypt/-/bcrypt-0.8.7.tgz"; + sha1 = "bc3875a9afd0a7b2cd231a6a7f218a5ce156b093"; + }; + dependencies = [ + sources."bindings-1.2.1" + sources."nan-2.3.5" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A bcrypt library for NodeJS."; + homepage = "https://github.com/ncb000gt/node.bcrypt.js#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; } \ No newline at end of file diff --git a/tests/tests.json b/tests/tests.json index 55fc81a..0a000cf 100644 --- a/tests/tests.json +++ b/tests/tests.json @@ -16,5 +16,6 @@ "coffee-script", "floomatic", "@sindresorhus/df", - { "esprima-fb": "~3001.0001.0000-dev-harmony-fb" } + { "esprima-fb": "~3001.0001.0000-dev-harmony-fb" }, + { "bcrypt": "0.8.x" } ]