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
, dbus
5
, electron_24
6
, fetchFromGitHub
7
-
, fetchpatch
8
, glib
9
, gnome
10
, gtk3
···
27
buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_18; };
28
electron = electron_24;
29
30
-
version = "2023.4.0";
31
src = applyPatches {
32
src = fetchFromGitHub {
33
owner = "bitwarden";
34
repo = "clients";
35
rev = "desktop-v${version}";
36
-
sha256 = "sha256-TTKDl6Py3k+fAy/kcyiMbAAKQdhVnZTyRXV8D/VpKBE=";
37
};
38
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
-
];
46
};
47
48
desktop-native = rustPlatform.buildRustPackage {
49
pname = "bitwarden-desktop-native";
50
inherit src version;
51
sourceRoot = "source-patched/apps/desktop/desktop_native";
52
-
cargoSha256 = "sha256-VW9DmSh9jvqFCZjH1SAYkydSGjXSVEbv4CmtoJBiw5Y=";
53
54
nativeBuildInputs = [
55
pkg-config
···
102
npmBuildFlags = [
103
"--workspace apps/desktop"
104
];
105
-
npmDepsHash = "sha256-UXDn09qyM8GwfUiWLDhhyrGFZeKtTRmQArstw+tm5iE=";
106
107
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
108
···
4
, dbus
5
, electron_24
6
, fetchFromGitHub
7
, glib
8
, gnome
9
, gtk3
···
26
buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_18; };
27
electron = electron_24;
28
29
+
version = "2023.5.0";
30
src = applyPatches {
31
src = fetchFromGitHub {
32
owner = "bitwarden";
33
repo = "clients";
34
rev = "desktop-v${version}";
35
+
sha256 = "sha256-ELKpGSY4ZbgSk4vJnTiB+IOa8RQU8Ahy3A1mYsKtthU=";
36
};
37
38
+
patches = [ ];
39
};
40
41
desktop-native = rustPlatform.buildRustPackage {
42
pname = "bitwarden-desktop-native";
43
inherit src version;
44
sourceRoot = "source-patched/apps/desktop/desktop_native";
45
+
cargoSha256 = "sha256-SeK8Nbgenof9vXI2v7tJ5oHiX60kBoR+UNOSJTRHdzk=";
46
47
nativeBuildInputs = [
48
pkg-config
···
95
npmBuildFlags = [
96
"--workspace apps/desktop"
97
];
98
+
npmDepsHash = "sha256-G8DEYPjEP3L4s0pr5n2ZTj8kkT0E7Po1BKhZ2hUdJuY=";
99
100
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
101