bitwarden-cli: move to nodePackages version (#76489)

bitwarden-cli: move to nodePackages version
This commit is contained in:
Jörg Thalheim 2020-01-01 09:07:44 +00:00 committed by GitHub
commit 060bd74d3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 1020 additions and 2080 deletions

View File

@ -31,6 +31,10 @@ nodePackages // {
''; '';
}; };
bitwarden-cli = pkgs.lib.overrideDerivation nodePackages."@bitwarden/cli" (drv: {
name = "bitwarden-cli-${drv.version}";
});
ios-deploy = nodePackages.ios-deploy.override (drv: { ios-deploy = nodePackages.ios-deploy.override (drv: {
nativeBuildInputs = drv.nativeBuildInputs or [] ++ [ pkgs.buildPackages.rsync ]; nativeBuildInputs = drv.nativeBuildInputs or [] ++ [ pkgs.buildPackages.rsync ];
preRebuild = '' preRebuild = ''

View File

@ -2,6 +2,7 @@
"@angular/cli" "@angular/cli"
, "@antora/cli" , "@antora/cli"
, "@antora/site-generator-default" , "@antora/site-generator-default"
, "@bitwarden/cli"
, "@vue/cli" , "@vue/cli"
, "@webassemblyjs/cli" , "@webassemblyjs/cli"
, "@webassemblyjs/repl" , "@webassemblyjs/repl"

File diff suppressed because it is too large Load Diff

View File

@ -157,13 +157,13 @@ let
sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
}; };
}; };
"aws4-1.8.0" = { "aws4-1.9.0" = {
name = "aws4"; name = "aws4";
packageName = "aws4"; packageName = "aws4";
version = "1.8.0"; version = "1.9.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz"; url = "https://registry.npmjs.org/aws4/-/aws4-1.9.0.tgz";
sha512 = "ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="; sha512 = "Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A==";
}; };
}; };
"balanced-match-1.0.0" = { "balanced-match-1.0.0" = {
@ -526,13 +526,13 @@ let
sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49";
}; };
}; };
"fast-json-stable-stringify-2.0.0" = { "fast-json-stable-stringify-2.1.0" = {
name = "fast-json-stable-stringify"; name = "fast-json-stable-stringify";
packageName = "fast-json-stable-stringify"; packageName = "fast-json-stable-stringify";
version = "2.0.0"; version = "2.1.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz";
sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==";
}; };
}; };
"fill-range-4.0.0" = { "fill-range-4.0.0" = {
@ -1219,22 +1219,22 @@ let
sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="; sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==";
}; };
}; };
"mime-db-1.40.0" = { "mime-db-1.42.0" = {
name = "mime-db"; name = "mime-db";
packageName = "mime-db"; packageName = "mime-db";
version = "1.40.0"; version = "1.42.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz"; url = "https://registry.npmjs.org/mime-db/-/mime-db-1.42.0.tgz";
sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="; sha512 = "UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ==";
}; };
}; };
"mime-types-2.1.24" = { "mime-types-2.1.25" = {
name = "mime-types"; name = "mime-types";
packageName = "mime-types"; packageName = "mime-types";
version = "2.1.24"; version = "2.1.25";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz"; url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.25.tgz";
sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ=="; sha512 = "5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg==";
}; };
}; };
"minimatch-3.0.4" = { "minimatch-3.0.4" = {
@ -1624,13 +1624,13 @@ let
sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849";
}; };
}; };
"psl-1.4.0" = { "psl-1.6.0" = {
name = "psl"; name = "psl";
packageName = "psl"; packageName = "psl";
version = "1.4.0"; version = "1.6.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz"; url = "https://registry.npmjs.org/psl/-/psl-1.6.0.tgz";
sha512 = "HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw=="; sha512 = "SYKKmVel98NCOYXpkwUqZqh0ahZeeKfmisiLIcEZdsb+WbLv02g/dI5BUmZnIyOe7RzZtLax81nnb2HbvC2tzA==";
}; };
}; };
"punycode-1.4.1" = { "punycode-1.4.1" = {
@ -1714,13 +1714,13 @@ let
sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==";
}; };
}; };
"resolve-1.12.0" = { "resolve-1.14.1" = {
name = "resolve"; name = "resolve";
packageName = "resolve"; packageName = "resolve";
version = "1.12.0"; version = "1.14.1";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz"; url = "https://registry.npmjs.org/resolve/-/resolve-1.14.1.tgz";
sha512 = "B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w=="; sha512 = "fn5Wobh4cxbLzuHaE+nphztHy43/b++4M6SsGFC2gB8uYwf0C8LcarfCz1un7UTW8OFQg9iNjZ4xpcFVGebDPg==";
}; };
}; };
"resolve-dir-1.0.1" = { "resolve-dir-1.0.1" = {
@ -2497,7 +2497,7 @@ in
sources."regex-not-1.0.2" sources."regex-not-1.0.2"
sources."repeat-element-1.1.3" sources."repeat-element-1.1.3"
sources."repeat-string-1.6.1" sources."repeat-string-1.6.1"
sources."resolve-1.12.0" sources."resolve-1.14.1"
sources."resolve-dir-1.0.1" sources."resolve-dir-1.0.1"
sources."resolve-url-0.2.1" sources."resolve-url-0.2.1"
sources."ret-0.1.15" sources."ret-0.1.15"
@ -2608,7 +2608,7 @@ in
sources."assert-plus-1.0.0" sources."assert-plus-1.0.0"
sources."asynckit-0.4.0" sources."asynckit-0.4.0"
sources."aws-sign2-0.7.0" sources."aws-sign2-0.7.0"
sources."aws4-1.8.0" sources."aws4-1.9.0"
sources."balanced-match-1.0.0" sources."balanced-match-1.0.0"
sources."base64-js-1.3.1" sources."base64-js-1.3.1"
sources."bcrypt-pbkdf-1.0.2" sources."bcrypt-pbkdf-1.0.2"
@ -2631,7 +2631,7 @@ in
sources."extend-3.0.2" sources."extend-3.0.2"
sources."extsprintf-1.3.0" sources."extsprintf-1.3.0"
sources."fast-deep-equal-2.0.1" sources."fast-deep-equal-2.0.1"
sources."fast-json-stable-stringify-2.0.0" sources."fast-json-stable-stringify-2.1.0"
sources."findit-2.0.0" sources."findit-2.0.0"
sources."foreachasync-3.0.0" sources."foreachasync-3.0.0"
sources."forever-agent-0.6.1" sources."forever-agent-0.6.1"
@ -2671,8 +2671,8 @@ in
sources."json-stringify-safe-5.0.1" sources."json-stringify-safe-5.0.1"
sources."jsonfile-1.0.1" sources."jsonfile-1.0.1"
sources."jsprim-1.4.1" sources."jsprim-1.4.1"
sources."mime-db-1.40.0" sources."mime-db-1.42.0"
sources."mime-types-2.1.24" sources."mime-types-2.1.25"
sources."minimatch-3.0.4" sources."minimatch-3.0.4"
sources."minimist-0.0.8" sources."minimist-0.0.8"
sources."minipass-2.9.0" sources."minipass-2.9.0"
@ -2716,7 +2716,7 @@ in
sources."performance-now-2.1.0" sources."performance-now-2.1.0"
sources."process-nextick-args-2.0.1" sources."process-nextick-args-2.0.1"
sources."proto-list-1.2.4" sources."proto-list-1.2.4"
sources."psl-1.4.0" sources."psl-1.6.0"
sources."punycode-2.1.1" sources."punycode-2.1.1"
sources."qs-6.5.2" sources."qs-6.5.2"
(sources."readable-stream-2.3.6" // { (sources."readable-stream-2.3.6" // {
@ -2725,7 +2725,7 @@ in
]; ];
}) })
sources."request-2.88.0" sources."request-2.88.0"
sources."resolve-1.12.0" sources."resolve-1.14.1"
sources."retry-0.10.1" sources."retry-0.10.1"
sources."rimraf-2.6.3" sources."rimraf-2.6.3"
sources."safe-buffer-5.2.0" sources."safe-buffer-5.2.0"

View File

@ -85,13 +85,13 @@ let
sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
}; };
}; };
"aws4-1.8.0" = { "aws4-1.9.0" = {
name = "aws4"; name = "aws4";
packageName = "aws4"; packageName = "aws4";
version = "1.8.0"; version = "1.9.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz"; url = "https://registry.npmjs.org/aws4/-/aws4-1.9.0.tgz";
sha512 = "ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="; sha512 = "Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A==";
}; };
}; };
"balanced-match-1.0.0" = { "balanced-match-1.0.0" = {
@ -292,13 +292,13 @@ let
sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49";
}; };
}; };
"fast-json-stable-stringify-2.0.0" = { "fast-json-stable-stringify-2.1.0" = {
name = "fast-json-stable-stringify"; name = "fast-json-stable-stringify";
packageName = "fast-json-stable-stringify"; packageName = "fast-json-stable-stringify";
version = "2.0.0"; version = "2.1.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz";
sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==";
}; };
}; };
"findit-2.0.0" = { "findit-2.0.0" = {
@ -571,22 +571,22 @@ let
sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2";
}; };
}; };
"mime-db-1.40.0" = { "mime-db-1.42.0" = {
name = "mime-db"; name = "mime-db";
packageName = "mime-db"; packageName = "mime-db";
version = "1.40.0"; version = "1.42.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz"; url = "https://registry.npmjs.org/mime-db/-/mime-db-1.42.0.tgz";
sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="; sha512 = "UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ==";
}; };
}; };
"mime-types-2.1.24" = { "mime-types-2.1.25" = {
name = "mime-types"; name = "mime-types";
packageName = "mime-types"; packageName = "mime-types";
version = "2.1.24"; version = "2.1.25";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz"; url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.25.tgz";
sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ=="; sha512 = "5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg==";
}; };
}; };
"minimatch-3.0.4" = { "minimatch-3.0.4" = {
@ -841,13 +841,13 @@ let
sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849";
}; };
}; };
"psl-1.4.0" = { "psl-1.6.0" = {
name = "psl"; name = "psl";
packageName = "psl"; packageName = "psl";
version = "1.4.0"; version = "1.6.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz"; url = "https://registry.npmjs.org/psl/-/psl-1.6.0.tgz";
sha512 = "HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw=="; sha512 = "SYKKmVel98NCOYXpkwUqZqh0ahZeeKfmisiLIcEZdsb+WbLv02g/dI5BUmZnIyOe7RzZtLax81nnb2HbvC2tzA==";
}; };
}; };
"punycode-1.4.1" = { "punycode-1.4.1" = {
@ -895,13 +895,13 @@ let
sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==";
}; };
}; };
"resolve-1.12.0" = { "resolve-1.14.1" = {
name = "resolve"; name = "resolve";
packageName = "resolve"; packageName = "resolve";
version = "1.12.0"; version = "1.14.1";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz"; url = "https://registry.npmjs.org/resolve/-/resolve-1.14.1.tgz";
sha512 = "B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w=="; sha512 = "fn5Wobh4cxbLzuHaE+nphztHy43/b++4M6SsGFC2gB8uYwf0C8LcarfCz1un7UTW8OFQg9iNjZ4xpcFVGebDPg==";
}; };
}; };
"retry-0.10.1" = { "retry-0.10.1" = {
@ -1276,7 +1276,7 @@ in
sources."assert-plus-1.0.0" sources."assert-plus-1.0.0"
sources."asynckit-0.4.0" sources."asynckit-0.4.0"
sources."aws-sign2-0.7.0" sources."aws-sign2-0.7.0"
sources."aws4-1.8.0" sources."aws4-1.9.0"
sources."balanced-match-1.0.0" sources."balanced-match-1.0.0"
sources."base64-js-1.3.1" sources."base64-js-1.3.1"
sources."bcrypt-pbkdf-1.0.2" sources."bcrypt-pbkdf-1.0.2"
@ -1299,7 +1299,7 @@ in
sources."extend-3.0.2" sources."extend-3.0.2"
sources."extsprintf-1.3.0" sources."extsprintf-1.3.0"
sources."fast-deep-equal-2.0.1" sources."fast-deep-equal-2.0.1"
sources."fast-json-stable-stringify-2.0.0" sources."fast-json-stable-stringify-2.1.0"
sources."findit-2.0.0" sources."findit-2.0.0"
sources."foreachasync-3.0.0" sources."foreachasync-3.0.0"
sources."forever-agent-0.6.1" sources."forever-agent-0.6.1"
@ -1339,8 +1339,8 @@ in
sources."json-stringify-safe-5.0.1" sources."json-stringify-safe-5.0.1"
sources."jsonfile-1.0.1" sources."jsonfile-1.0.1"
sources."jsprim-1.4.1" sources."jsprim-1.4.1"
sources."mime-db-1.40.0" sources."mime-db-1.42.0"
sources."mime-types-2.1.24" sources."mime-types-2.1.25"
sources."minimatch-3.0.4" sources."minimatch-3.0.4"
sources."minimist-0.0.8" sources."minimist-0.0.8"
sources."minipass-2.9.0" sources."minipass-2.9.0"
@ -1384,7 +1384,7 @@ in
sources."performance-now-2.1.0" sources."performance-now-2.1.0"
sources."process-nextick-args-2.0.1" sources."process-nextick-args-2.0.1"
sources."proto-list-1.2.4" sources."proto-list-1.2.4"
sources."psl-1.4.0" sources."psl-1.6.0"
sources."punycode-2.1.1" sources."punycode-2.1.1"
sources."qs-6.5.2" sources."qs-6.5.2"
(sources."readable-stream-2.3.6" // { (sources."readable-stream-2.3.6" // {
@ -1393,7 +1393,7 @@ in
]; ];
}) })
sources."request-2.88.0" sources."request-2.88.0"
sources."resolve-1.12.0" sources."resolve-1.14.1"
sources."retry-0.10.1" sources."retry-0.10.1"
sources."rimraf-2.6.3" sources."rimraf-2.6.3"
sources."safe-buffer-5.2.0" sources."safe-buffer-5.2.0"

View File

@ -1,18 +0,0 @@
{ stdenv, pkgs }:
let
# node-packages*.nix generated via:
#
# % node2nix --input node-packages.json \
# --output node-packages-generated.nix \
# --composition node-packages.nix \
# --node-env ./../../../development/node-packages/node-env.nix
#
nodePackages = import ./node-packages.nix {
inherit pkgs;
inherit (stdenv.hostPlatform) system;
};
in pkgs.lib.overrideDerivation nodePackages."@bitwarden/cli" (drv: {
# This defaults to "node-_at_bitwarden_slash_cli-1.7.0"
name = "bitwarden-cli-${drv.version}";
})

View File

@ -1,8 +0,0 @@
#!/usr/bin/env nix-shell
#! nix-shell -i bash -p nodePackages.node2nix
exec node2nix -8 \
--input node-packages.json \
--output node-packages-generated.nix \
--composition node-packages.nix \
--node-env ./../../../development/node-packages/node-env.nix

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +0,0 @@
[
"@bitwarden/cli"
]

View File

@ -1,17 +0,0 @@
# This file has been generated by node2nix 1.7.0. Do not edit!
{pkgs ? import <nixpkgs> {
inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-10_x}:
let
nodeEnv = import ../../../development/node-packages/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-generated.nix {
inherit (pkgs) fetchurl fetchgit;
inherit nodeEnv;
}

View File

@ -773,7 +773,7 @@ in
bitwarden = callPackage ../tools/security/bitwarden { }; bitwarden = callPackage ../tools/security/bitwarden { };
bitwarden-cli = callPackage ../tools/security/bitwarden-cli { }; inherit (nodePackages) bitwarden-cli;
bitwarden_rs = callPackage ../tools/security/bitwarden_rs { bitwarden_rs = callPackage ../tools/security/bitwarden_rs {
inherit (darwin.apple_sdk.frameworks) Security CoreServices; inherit (darwin.apple_sdk.frameworks) Security CoreServices;