JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #278289 from amarshall/bitwarden-update

Browse Source 
bitwarden: fix build; 2023.12.0 -> 2023.12.1
This commit is contained in:
Robert Schütz 2024-01-02 17:57:29 +01:00 committed by GitHub
commit 4e44fb9c26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/tools/security/bitwarden/default.nix
View File

@ -16,8 +16,10 @@
, moreutils
, napi-rs-cli
, nodejs_18
, patchutils_0_4_2
, pkg-config
, python3
, runCommand
, rustc
, rustPlatform
}:
@ -28,13 +30,13 @@ let
electron = electron_27;
in buildNpmPackage rec {
pname = "bitwarden";
version = "2023.12.0";
version = "2023.12.1";
src = fetchFromGitHub {
owner = "bitwarden";
repo = "clients";
rev = "desktop-v${version}";
hash = "sha256-WYhLKV3j3Ktite5u1H4fSku38hCCrMzKoxtjq6aT9yo=";
hash = "sha256-kmMEi9jYMPFHIdXyZAkeu8rh+34fEAkFw9uhwUt5k9o=";
};
patches = [
@ -51,14 +53,23 @@ in buildNpmPackage rec {
makeCacheWritable = true;
npmWorkspace = "apps/desktop";
npmDepsHash = "sha256-QwG+D0M94HN1AyQlmzKeScZyksiUr5A9igEaox9DYN4=";
npmDepsHash = "sha256-IDqyHiXdMezdPNlZDyRdNzwC3SO5G3gI3h5zoxzzz/g=";
cargoDeps = rustPlatform.fetchCargoTarball {
name = "${pname}-${version}";
inherit patches src;
inherit src;
patches = map
(patch: runCommand
(builtins.baseNameOf patch)
{ nativeBuildInputs = [ patchutils_0_4_2 ]; }
''
< ${patch} filterdiff -p1 --include=${lib.escapeShellArg cargoRoot}'/*' > $out
''
)
patches;
patchFlags = [ "-p4" ];
sourceRoot = "${src.name}/${cargoRoot}";
hash = "sha256-pCy3hGhI3mXm4uTOaFMykOzJqK2PC0t0hE8MrJKtA/k=";
hash = "sha256-8A33f2q9GoSM8Wh55iqnSfqWIpeRBz+EQT+rmsZsuXs=";
};
cargoRoot = "apps/desktop/desktop_native";