From 4af05f918e6ca929dbce6d588e722d3045ce2a93 Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Sun, 5 Oct 2025 00:56:11 +0800 Subject: [PATCH] bitwarden-cli: 2025.5.0 -> 2025.9.0 --- .../bi/bitwarden-cli/fix-lockfile.patch | 567 ++++++++++++++++++ pkgs/by-name/bi/bitwarden-cli/package.nix | 43 +- 2 files changed, 592 insertions(+), 18 deletions(-) create mode 100644 pkgs/by-name/bi/bitwarden-cli/fix-lockfile.patch diff --git a/pkgs/by-name/bi/bitwarden-cli/fix-lockfile.patch b/pkgs/by-name/bi/bitwarden-cli/fix-lockfile.patch new file mode 100644 index 000000000000..0b65d6552040 --- /dev/null +++ b/pkgs/by-name/bi/bitwarden-cli/fix-lockfile.patch @@ -0,0 +1,567 @@ +diff --git a/package-lock.json b/package-lock.json +index 1b4fe5f40e..fe3166797e 100644 +--- a/package-lock.json ++++ b/package-lock.json +@@ -230,51 +230,6 @@ + "bw": "build/bw.js" + } + }, +- "apps/cli/node_modules/define-lazy-prop": { +- "version": "2.0.0", +- "license": "MIT", +- "engines": { +- "node": ">=8" +- } +- }, +- "apps/cli/node_modules/is-docker": { +- "version": "2.2.1", +- "license": "MIT", +- "bin": { +- "is-docker": "cli.js" +- }, +- "engines": { +- "node": ">=8" +- }, +- "funding": { +- "url": "https://github.com/sponsors/sindresorhus" +- } +- }, +- "apps/cli/node_modules/is-wsl": { +- "version": "2.2.0", +- "license": "MIT", +- "dependencies": { +- "is-docker": "^2.0.0" +- }, +- "engines": { +- "node": ">=8" +- } +- }, +- "apps/cli/node_modules/open": { +- "version": "8.4.2", +- "license": "MIT", +- "dependencies": { +- "define-lazy-prop": "^2.0.0", +- "is-docker": "^2.1.1", +- "is-wsl": "^2.2.0" +- }, +- "engines": { +- "node": ">=12" +- }, +- "funding": { +- "url": "https://github.com/sponsors/sindresorhus" +- } +- }, + "apps/desktop": { + "name": "@bitwarden/desktop", + "version": "2025.9.0", +@@ -4913,33 +4868,6 @@ + } + } + }, +- "node_modules/@compodoc/compodoc/node_modules/@angular-devkit/schematics/node_modules/chokidar": { +- "version": "3.6.0", +- "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", +- "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", +- "dev": true, +- "license": "MIT", +- "optional": true, +- "peer": true, +- "dependencies": { +- "anymatch": "~3.1.2", +- "braces": "~3.0.2", +- "glob-parent": "~5.1.2", +- "is-binary-path": "~2.1.0", +- "is-glob": "~4.0.1", +- "normalize-path": "~3.0.0", +- "readdirp": "~3.6.0" +- }, +- "engines": { +- "node": ">= 8.10.0" +- }, +- "funding": { +- "url": "https://paulmillr.com/funding/" +- }, +- "optionalDependencies": { +- "fsevents": "~2.3.2" +- } +- }, + "node_modules/@compodoc/compodoc/node_modules/@babel/core": { + "version": "7.25.8", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.8.tgz", +@@ -5122,21 +5050,6 @@ + "dev": true, + "license": "MIT" + }, +- "node_modules/@compodoc/compodoc/node_modules/glob-parent": { +- "version": "5.1.2", +- "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", +- "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", +- "dev": true, +- "license": "ISC", +- "optional": true, +- "peer": true, +- "dependencies": { +- "is-glob": "^4.0.1" +- }, +- "engines": { +- "node": ">= 6" +- } +- }, + "node_modules/@compodoc/compodoc/node_modules/magic-string": { + "version": "0.30.11", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz", +@@ -5147,36 +5060,6 @@ + "@jridgewell/sourcemap-codec": "^1.5.0" + } + }, +- "node_modules/@compodoc/compodoc/node_modules/readdirp": { +- "version": "3.6.0", +- "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", +- "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", +- "dev": true, +- "license": "MIT", +- "optional": true, +- "peer": true, +- "dependencies": { +- "picomatch": "^2.2.1" +- }, +- "engines": { +- "node": ">=8.10.0" +- } +- }, +- "node_modules/@compodoc/compodoc/node_modules/readdirp/node_modules/picomatch": { +- "version": "2.3.1", +- "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", +- "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", +- "dev": true, +- "license": "MIT", +- "optional": true, +- "peer": true, +- "engines": { +- "node": ">=8.6" +- }, +- "funding": { +- "url": "https://github.com/sponsors/jonschlinkert" +- } +- }, + "node_modules/@compodoc/live-server": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/@compodoc/live-server/-/live-server-1.2.3.tgz", +@@ -5908,28 +5791,6 @@ + "node": ">=16.4" + } + }, +- "node_modules/@electron/windows-sign": { +- "version": "1.2.2", +- "resolved": "https://registry.npmjs.org/@electron/windows-sign/-/windows-sign-1.2.2.tgz", +- "integrity": "sha512-dfZeox66AvdPtb2lD8OsIIQh12Tp0GNCRUDfBHIKGpbmopZto2/A8nSpYYLoedPIHpqkeblZ/k8OV0Gy7PYuyQ==", +- "dev": true, +- "license": "BSD-2-Clause", +- "optional": true, +- "peer": true, +- "dependencies": { +- "cross-dirname": "^0.1.0", +- "debug": "^4.3.4", +- "fs-extra": "^11.1.1", +- "minimist": "^1.2.8", +- "postject": "^1.0.0-alpha.6" +- }, +- "bin": { +- "electron-windows-sign": "bin/electron-windows-sign.js" +- }, +- "engines": { +- "node": ">=14.14" +- } +- }, + "node_modules/@emnapi/core": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.4.3.tgz", +@@ -8285,21 +8146,6 @@ + "@msgpack/msgpack": "^2.7.0" + } + }, +- "node_modules/@microsoft/signalr/node_modules/utf-8-validate": { +- "version": "5.0.10", +- "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.10.tgz", +- "integrity": "sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ==", +- "hasInstallScript": true, +- "license": "MIT", +- "optional": true, +- "peer": true, +- "dependencies": { +- "node-gyp-build": "^4.3.0" +- }, +- "engines": { +- "node": ">=6.14.2" +- } +- }, + "node_modules/@microsoft/signalr/node_modules/ws": { + "version": "7.5.10", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz", +@@ -11310,21 +11156,6 @@ + "linux" + ] + }, +- "node_modules/@rollup/rollup-linux-riscv64-musl": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.44.0.tgz", +- "integrity": "sha512-TDKO8KlHJuvTEdfw5YYFBjhFts2TR0VpZsnLLSYmB7AaohJhM8ctDSdDnUGq77hUh4m/djRafw+9zQpkOanE2Q==", +- "cpu": [ +- "riscv64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "linux" +- ], +- "peer": true +- }, + "node_modules/@rollup/rollup-linux-s390x-gnu": { + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.34.8.tgz", +@@ -18997,15 +18828,6 @@ + "integrity": "sha512-vQOuWmBgsgG1ovGeDi8m6Zeu1JaqH/JncrxKmaqMbv/LunyOQdLiQhPHtOsNlbUI05TocR5nod/Mbs3HYtr6sQ==", + "license": "MIT" + }, +- "node_modules/cross-dirname": { +- "version": "0.1.0", +- "resolved": "https://registry.npmjs.org/cross-dirname/-/cross-dirname-0.1.0.tgz", +- "integrity": "sha512-+R08/oI0nl3vfPcqftZRpytksBXDzOUveBq/NBVx0sUp1axwzPQrKinNx5yd5sxPu8j1wIy8AfnVQ+5eFdha6Q==", +- "dev": true, +- "license": "MIT", +- "optional": true, +- "peer": true +- }, + "node_modules/cross-env": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-10.0.0.tgz", +@@ -33661,36 +33483,6 @@ + "dev": true, + "license": "MIT" + }, +- "node_modules/postject": { +- "version": "1.0.0-alpha.6", +- "resolved": "https://registry.npmjs.org/postject/-/postject-1.0.0-alpha.6.tgz", +- "integrity": "sha512-b9Eb8h2eVqNE8edvKdwqkrY6O7kAwmI8kcnBv1NScolYJbo59XUF0noFq+lxbC1yN20bmC0WBEbDC5H/7ASb0A==", +- "dev": true, +- "license": "MIT", +- "optional": true, +- "peer": true, +- "dependencies": { +- "commander": "^9.4.0" +- }, +- "bin": { +- "postject": "dist/cli.js" +- }, +- "engines": { +- "node": ">=14.0.0" +- } +- }, +- "node_modules/postject/node_modules/commander": { +- "version": "9.5.0", +- "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz", +- "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==", +- "dev": true, +- "license": "MIT", +- "optional": true, +- "peer": true, +- "engines": { +- "node": "^12.20.0 || >=14" +- } +- }, + "node_modules/prebuild-install": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz", +@@ -39330,291 +39122,6 @@ + } + } + }, +- "node_modules/vite/node_modules/@rollup/rollup-android-arm-eabi": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.44.0.tgz", +- "integrity": "sha512-xEiEE5oDW6tK4jXCAyliuntGR+amEMO7HLtdSshVuhFnKTYoeYMyXQK7pLouAJJj5KHdwdn87bfHAR2nSdNAUA==", +- "cpu": [ +- "arm" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "android" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-android-arm64": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.44.0.tgz", +- "integrity": "sha512-uNSk/TgvMbskcHxXYHzqwiyBlJ/lGcv8DaUfcnNwict8ba9GTTNxfn3/FAoFZYgkaXXAdrAA+SLyKplyi349Jw==", +- "cpu": [ +- "arm64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "android" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-darwin-arm64": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.44.0.tgz", +- "integrity": "sha512-VGF3wy0Eq1gcEIkSCr8Ke03CWT+Pm2yveKLaDvq51pPpZza3JX/ClxXOCmTYYq3us5MvEuNRTaeyFThCKRQhOA==", +- "cpu": [ +- "arm64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "darwin" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-darwin-x64": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.44.0.tgz", +- "integrity": "sha512-fBkyrDhwquRvrTxSGH/qqt3/T0w5Rg0L7ZIDypvBPc1/gzjJle6acCpZ36blwuwcKD/u6oCE/sRWlUAcxLWQbQ==", +- "cpu": [ +- "x64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "darwin" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-freebsd-arm64": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.44.0.tgz", +- "integrity": "sha512-u5AZzdQJYJXByB8giQ+r4VyfZP+walV+xHWdaFx/1VxsOn6eWJhK2Vl2eElvDJFKQBo/hcYIBg/jaKS8ZmKeNQ==", +- "cpu": [ +- "arm64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "freebsd" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-freebsd-x64": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.44.0.tgz", +- "integrity": "sha512-qC0kS48c/s3EtdArkimctY7h3nHicQeEUdjJzYVJYR3ct3kWSafmn6jkNCA8InbUdge6PVx6keqjk5lVGJf99g==", +- "cpu": [ +- "x64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "freebsd" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-linux-arm-gnueabihf": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.44.0.tgz", +- "integrity": "sha512-x+e/Z9H0RAWckn4V2OZZl6EmV0L2diuX3QB0uM1r6BvhUIv6xBPL5mrAX2E3e8N8rEHVPwFfz/ETUbV4oW9+lQ==", +- "cpu": [ +- "arm" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "linux" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-linux-arm-musleabihf": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.44.0.tgz", +- "integrity": "sha512-1exwiBFf4PU/8HvI8s80icyCcnAIB86MCBdst51fwFmH5dyeoWVPVgmQPcKrMtBQ0W5pAs7jBCWuRXgEpRzSCg==", +- "cpu": [ +- "arm" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "linux" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-linux-arm64-gnu": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.44.0.tgz", +- "integrity": "sha512-ZTR2mxBHb4tK4wGf9b8SYg0Y6KQPjGpR4UWwTFdnmjB4qRtoATZ5dWn3KsDwGa5Z2ZBOE7K52L36J9LueKBdOQ==", +- "cpu": [ +- "arm64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "linux" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-linux-arm64-musl": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.44.0.tgz", +- "integrity": "sha512-GFWfAhVhWGd4r6UxmnKRTBwP1qmModHtd5gkraeW2G490BpFOZkFtem8yuX2NyafIP/mGpRJgTJ2PwohQkUY/Q==", +- "cpu": [ +- "arm64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "linux" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-linux-loongarch64-gnu": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.44.0.tgz", +- "integrity": "sha512-xw+FTGcov/ejdusVOqKgMGW3c4+AgqrfvzWEVXcNP6zq2ue+lsYUgJ+5Rtn/OTJf7e2CbgTFvzLW2j0YAtj0Gg==", +- "cpu": [ +- "loong64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "linux" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-linux-powerpc64le-gnu": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.44.0.tgz", +- "integrity": "sha512-bKGibTr9IdF0zr21kMvkZT4K6NV+jjRnBoVMt2uNMG0BYWm3qOVmYnXKzx7UhwrviKnmK46IKMByMgvpdQlyJQ==", +- "cpu": [ +- "ppc64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "linux" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-linux-riscv64-gnu": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.44.0.tgz", +- "integrity": "sha512-vV3cL48U5kDaKZtXrti12YRa7TyxgKAIDoYdqSIOMOFBXqFj2XbChHAtXquEn2+n78ciFgr4KIqEbydEGPxXgA==", +- "cpu": [ +- "riscv64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "linux" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-linux-s390x-gnu": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.44.0.tgz", +- "integrity": "sha512-8541GEyktXaw4lvnGp9m84KENcxInhAt6vPWJ9RodsB/iGjHoMB2Pp5MVBCiKIRxrxzJhGCxmNzdu+oDQ7kwRA==", +- "cpu": [ +- "s390x" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "linux" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-linux-x64-gnu": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.44.0.tgz", +- "integrity": "sha512-iUVJc3c0o8l9Sa/qlDL2Z9UP92UZZW1+EmQ4xfjTc1akr0iUFZNfxrXJ/R1T90h/ILm9iXEY6+iPrmYB3pXKjw==", +- "cpu": [ +- "x64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "linux" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-linux-x64-musl": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.44.0.tgz", +- "integrity": "sha512-PQUobbhLTQT5yz/SPg116VJBgz+XOtXt8D1ck+sfJJhuEsMj2jSej5yTdp8CvWBSceu+WW+ibVL6dm0ptG5fcA==", +- "cpu": [ +- "x64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "linux" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-win32-arm64-msvc": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.44.0.tgz", +- "integrity": "sha512-M0CpcHf8TWn+4oTxJfh7LQuTuaYeXGbk0eageVjQCKzYLsajWS/lFC94qlRqOlyC2KvRT90ZrfXULYmukeIy7w==", +- "cpu": [ +- "arm64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "win32" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-win32-ia32-msvc": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.44.0.tgz", +- "integrity": "sha512-3XJ0NQtMAXTWFW8FqZKcw3gOQwBtVWP/u8TpHP3CRPXD7Pd6s8lLdH3sHWh8vqKCyyiI8xW5ltJScQmBU9j7WA==", +- "cpu": [ +- "ia32" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "win32" +- ], +- "peer": true +- }, +- "node_modules/vite/node_modules/@rollup/rollup-win32-x64-msvc": { +- "version": "4.44.0", +- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.44.0.tgz", +- "integrity": "sha512-Q2Mgwt+D8hd5FIPUuPDsvPR7Bguza6yTkJxspDGkZj7tBRn2y4KSWYuIXpftFSjBra76TbKerCV7rgFPQrn+wQ==", +- "cpu": [ +- "x64" +- ], +- "dev": true, +- "license": "MIT", +- "optional": true, +- "os": [ +- "win32" +- ], +- "peer": true +- }, + "node_modules/vite/node_modules/rollup": { + "version": "4.44.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.44.0.tgz", diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix index 5e3d3a55a717..99fe107c25f7 100644 --- a/pkgs/by-name/bi/bitwarden-cli/package.nix +++ b/pkgs/by-name/bi/bitwarden-cli/package.nix @@ -2,37 +2,41 @@ lib, stdenv, buildNpmPackage, - nodejs_20, fetchFromGitHub, - cctools, - nix-update-script, - nixosTests, + nodejs_22, perl, xcbuild, + writableTmpDirAsHomeHook, + versionCheckHook, + nixosTests, + nix-update-script, }: -buildNpmPackage rec { +buildNpmPackage (finalAttrs: { pname = "bitwarden-cli"; - version = "2025.5.0"; + version = "2025.9.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; - tag = "cli-v${version}"; - hash = "sha256-8jVKwqKhTfhur226SER4sb1i4dY+TjJRYmOY8YtO6CY="; + tag = "cli-v${finalAttrs.version}"; + hash = "sha256-vxGyDYtv0O5U4pnVrQm/BOIpDtpcDUOyFFdBDehQ2to="; }; + patches = [ + ./fix-lockfile.patch + ]; + postPatch = '' # remove code under unfree license rm -r bitwarden_license ''; - nodejs = nodejs_20; + nodejs = nodejs_22; - npmDepsHash = "sha256-0IoBPRGdtkMeTrT5cqZLHB/WrUCONtsJ6YHh0y4K5Ls="; + npmDepsHash = "sha256-bn39QlZXNUa/GEZhJsjLiG3PRYdQ/Y36Tvef2fXH8yQ="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - cctools perl xcbuild.xcrun ]; @@ -61,9 +65,6 @@ buildNpmPackage rec { rm -r node_modules/**/prebuilds shopt -u globstar - # FIXME one of the esbuild versions fails to download @esbuild/linux-x64 - rm -r node_modules/esbuild node_modules/vite/node_modules/esbuild - npm rebuild --verbose ''; @@ -84,6 +85,14 @@ buildNpmPackage rec { installShellCompletion --cmd bw --zsh <($out/bin/bw completion --shell zsh) ''; + doInstallCheck = true; + nativeInstallCheckInputs = [ + writableTmpDirAsHomeHook + versionCheckHook + ]; + versionCheckKeepEnvironment = [ "HOME" ]; + versionCheckProgramArg = "--version"; + passthru = { tests = { vaultwarden = nixosTests.vaultwarden.sqlite; @@ -97,9 +106,7 @@ buildNpmPackage rec { }; meta = { - # https://github.com/NixOS/nixpkgs/issues/339576 - broken = stdenv.hostPlatform.isDarwin; - changelog = "https://github.com/bitwarden/clients/releases/tag/${src.tag}"; + changelog = "https://github.com/bitwarden/clients/releases/tag/${finalAttrs.src.tag}"; description = "Secure and free password manager for all of your devices"; homepage = "https://bitwarden.com"; license = lib.licenses.gpl3Only; @@ -109,4 +116,4 @@ buildNpmPackage rec { dotlambda ]; }; -} +})