diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix index 9a460216e6c4..03e2fcacc00d 100644 --- a/pkgs/by-name/bi/bitwarden-cli/package.nix +++ b/pkgs/by-name/bi/bitwarden-cli/package.nix @@ -13,13 +13,13 @@ buildNpmPackage rec { pname = "bitwarden-cli"; - version = "2025.1.2"; + version = "2025.1.3"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "cli-v${version}"; - hash = "sha256-Ibf25+aaEKFUCp5uiqmHySfdZq2JPAu2nBzfiS4Sc/k="; + hash = "sha256-a8OQ/vQCJSjipLnuNWaWqnAJK+Str6FdHPBTbC04VxA="; }; postPatch = '' @@ -29,7 +29,7 @@ buildNpmPackage rec { nodejs = nodejs_20; - npmDepsHash = "sha256-+LpF5zxC4TG5tF+RNgimLyEmGYyUfFDXHqs2RH9oQLY="; + npmDepsHash = "sha256-BoHwgv/1QiIfUPCJ3+ZHvbMelngRSEKlbkpBHRtnoP8="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ cctools @@ -50,9 +50,6 @@ buildNpmPackage rec { npmFlags = [ "--legacy-peer-deps" ]; - # FIXME temporarily disable the symlink check as there are symlink after the build in the `node_modules/@bitwarden` directory linking to `../../`. - dontCheckForBrokenSymlinks = true; - npmRebuildFlags = [ # FIXME one of the esbuild versions fails to download @esbuild/linux-x64 "--ignore-scripts" @@ -72,6 +69,13 @@ buildNpmPackage rec { shopt -u globstar ''; + postInstall = '' + # The @bitwarden modules are actually npm workspaces inside the source tree, which + # leave dangling symlinks behind. They can be safely removed, because their source is + # bundled via webpack and thus not needed at run-time. + rm -rf $out/lib/node_modules/@bitwarden/clients/node_modules/{@bitwarden,.bin} + ''; + passthru = { tests = { vaultwarden = nixosTests.vaultwarden.sqlite;