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

Merge pull request #267509 from amarshall/bitwarden-update

Browse Source
This commit is contained in:
Artturi 2023-11-15 02:40:42 +02:00 committed by GitHub
commit 3c928233e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,7 @@
, dbus , dbus
, electron_25 , electron_25
, fetchFromGitHub , fetchFromGitHub
, fetchpatch2
, glib , glib
, gnome , gnome
, gtk3 , gtk3
@ -27,26 +28,35 @@ let
electron = electron_25; electron = electron_25;
in buildNpmPackage rec { in buildNpmPackage rec {
pname = "bitwarden"; pname = "bitwarden";
version = "2023.10.0"; version = "2023.10.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bitwarden"; owner = "bitwarden";
repo = "clients"; repo = "clients";
rev = "desktop-v${version}"; rev = "desktop-v${version}";
hash = "sha256-egXToXWfb9XV7JuCRBYJO4p/e+WOwMncPKz0oBgeALQ="; hash = "sha256-cwSIMN40d1ySUSxBl8jXLVndnJJvPnLiTxkYnA3Pqws=";
}; };
patches = [
(fetchpatch2 {
# https://github.com/bitwarden/clients/issues/6812#issuecomment-1806830091
url = "https://github.com/solopasha/bitwarden_flatpak/raw/daec07b067b9cec5e260b44a53216fc65866ba1d/wayland-clipboard.patch";
hash = "sha256-hcaRa9Nl7MYaTNwmB5Qdm65Mtufv3z+IPwLDPiO3pcw=";
})
];
nodejs = nodejs_18; nodejs = nodejs_18;
makeCacheWritable = true; makeCacheWritable = true;
npmWorkspace = "apps/desktop"; npmWorkspace = "apps/desktop";
npmDepsHash = "sha256-iO8ZozVl1vOOqowQARnRJWSFUFnau46+dKfcMSkyU3o="; npmDepsHash = "sha256-KN8C9Y0tfhHVagk+CUMpI/bIRChhzxC9M27HkU4aTEc=";
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
name = "${pname}-${version}"; name = "${pname}-${version}";
inherit src; inherit patches src;
patchFlags = [ "-p4" ];
sourceRoot = "${src.name}/${cargoRoot}"; sourceRoot = "${src.name}/${cargoRoot}";
hash = "sha256-I7wENo4cCxcllEyT/tgAavHNwYPrQkPXxg/oTsl/ClA="; hash = "sha256-AmtdmOR3aZJTZiFbkwRXjeTOJdcN40bTmWx4Ss3JNJ8=";
}; };
cargoRoot = "apps/desktop/desktop_native"; cargoRoot = "apps/desktop/desktop_native";