pyrox.dev
lol
Merge pull request #235756 from f2k1de/bitwarden-2023.5
bitwarden: 2023.4.0 -> 2023.5.0
+5
-12
pkgs/tools/security/bitwarden/default.nix
+5
-12
pkgs/tools/security/bitwarden/default.nix
···
4
4
, dbus
5
5
, electron_24
6
6
, fetchFromGitHub
7
-
, fetchpatch
8
7
, glib
9
8
, gnome
10
9
, gtk3
···
27
26
buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_18; };
28
27
electron = electron_24;
29
28
30
-
version = "2023.4.0";
29
+
version = "2023.5.0";
31
30
src = applyPatches {
32
31
src = fetchFromGitHub {
33
32
owner = "bitwarden";
34
33
repo = "clients";
35
34
rev = "desktop-v${version}";
36
-
sha256 = "sha256-TTKDl6Py3k+fAy/kcyiMbAAKQdhVnZTyRXV8D/VpKBE=";
35
+
sha256 = "sha256-ELKpGSY4ZbgSk4vJnTiB+IOa8RQU8Ahy3A1mYsKtthU=";
37
36
};
38
37
39
-
patches = [
40
-
# Bump electron to 24 and node to 18
41
-
(fetchpatch {
42
-
url = "https://github.com/bitwarden/clients/pull/5205.patch";
43
-
hash = "sha256-sKSrh8RHXtxGczyZScjTeiGZgTZCQ7f45ULj/j9cp6M=";
44
-
})
45
-
];
38
+
patches = [ ];
46
39
};
47
40
48
41
desktop-native = rustPlatform.buildRustPackage {
49
42
pname = "bitwarden-desktop-native";
50
43
inherit src version;
51
44
sourceRoot = "source-patched/apps/desktop/desktop_native";
52
-
cargoSha256 = "sha256-VW9DmSh9jvqFCZjH1SAYkydSGjXSVEbv4CmtoJBiw5Y=";
45
+
cargoSha256 = "sha256-SeK8Nbgenof9vXI2v7tJ5oHiX60kBoR+UNOSJTRHdzk=";
53
46
54
47
nativeBuildInputs = [
55
48
pkg-config
···
102
95
npmBuildFlags = [
103
96
"--workspace apps/desktop"
104
97
];
105
-
npmDepsHash = "sha256-UXDn09qyM8GwfUiWLDhhyrGFZeKtTRmQArstw+tm5iE=";
98
+
npmDepsHash = "sha256-G8DEYPjEP3L4s0pr5n2ZTj8kkT0E7Po1BKhZ2hUdJuY=";
106
99
107
100
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
108
101