Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[24.05] electron_31: init at 31.4.0, electron: bump default version to v31, element-desktop: use electron_31 #336018

Merged
merged 8 commits into from
Aug 25, 2024
Merged

[24.05] electron_31: init at 31.4.0, electron: bump default version to v31, element-desktop: use electron_31 #336018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3e0acfe
electron-source: fix update script for electron >=31
teutat3s Aug 11, 2024
214cb05
electron-source.electron_31: init at 31.4.0
teutat3s Aug 11, 2024
0e064ee
electron_31-bin: init at 31.4.0
teutat3s Aug 11, 2024
15c9b3b
electron-bin: update maintainers
teutat3s Aug 11, 2024
f8aafee
element-desktop: use electron version 31
teutat3s Aug 14, 2024
7347b30
electron: bump default version to v31
teutat3s Aug 20, 2024
fe1258d
electron-chromedriver_31: 31.2.0 -> 31.3.0
liam-murphy14 Jul 27, 2024
9863623
electron-chromedriver_31: 31.3.0 -> 31.4.0
teutat3s Aug 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkgs/development/tools/electron/binary/generic.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ let
homepage = "https://github.com/electron/electron";
license = licenses.mit;
mainProgram = "electron";
maintainers = with maintainers; [ travisbhartwell manveru ];
maintainers = with maintainers; [ yayayayaka teutat3s ];
platforms = [ "x86_64-darwin" "x86_64-linux" "armv7l-linux" "aarch64-linux" ]
++ optionals (versionAtLeast version "11.0.0") [ "aarch64-darwin" ]
++ optionals (versionOlder version "19.0.0") [ "i686-linux" ];
Expand Down
11 changes: 11 additions & 0 deletions pkgs/development/tools/electron/binary/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,16 @@
"x86_64-linux": "94d7470d9dae2dd2376612c804068ea6514e5efe342de8946f49f93bf0ed50de"
},
"version": "30.3.1"
},
"31": {
"hashes": {
"aarch64-darwin": "4cd04f75e97f6cdfee1d166c7756b9a3c7341e51a7b12255c37bd46fa5a45da5",
"aarch64-linux": "37fbede76b30bad461cbfa3efec8aef07a34f6991c71c50a69ac489623413098",
"armv7l-linux": "7a6cba2d78ef3ff776d9482121f9b2400370da23b3065bfdafc4cd83c8bbe423",
"headers": "0iclnzcihiw7bnf7nn0p56m8zz8cwn951ccf6g52d7pfr791gbnv",
"x86_64-darwin": "e177e9846bfe63eefea3ecd6a889e9865e1fba21b93179a0cde08bd7c94796ee",
"x86_64-linux": "9b95e66cb4d55bb632e37bcb6083992a5d665f0b378466a771a2948c1aab57b7"
},
"version": "31.4.0"
}
}
14 changes: 7 additions & 7 deletions pkgs/development/tools/electron/chromedriver/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
},
"31": {
"hashes": {
"aarch64-darwin": "6335fb15beeaaa6601a325a9b616b059a289063fc560ff66efd5353d4ab4fcbe",
"aarch64-linux": "de793d036dbce9dbda8603992db8d57d40e37f97ee9bc5808fcb5ec492cb1e10",
"armv7l-linux": "fe4ab8af208fd5d882c9b1cc25f33a0816a6eec4d75f0911b8fa320e9c8cadcc",
"headers": "00i9y8ya03drd5hdhv1pmlai66bjmh04zfc39g65skbgz9yjihmj",
"x86_64-darwin": "5423016c84cde9513ace0d68d06fecd376ab945bae22e2cb39eaf2a6e83813a8",
"x86_64-linux": "70182bd0980458607ed7d1684ded9de88bfd00793e680bb23b9cef595a24a5d6"
"aarch64-darwin": "bca203c7705e56baa5c7c2f972dd3a606ee80589514a3d83283960b67bad446c",
"aarch64-linux": "a040723dc5c7860527f2718e5b3aaf43d219e35ae391a3338c7a85de2d08afb7",
"armv7l-linux": "64306c594ad37c94e2562d3fe4832667191321f90ec797e41ceae4640da26289",
"headers": "0iclnzcihiw7bnf7nn0p56m8zz8cwn951ccf6g52d7pfr791gbnv",
"x86_64-darwin": "47a04768ed44c4f4128d1fe90818b58cbef6da63b1112acaf2bbb7c20d22ad7d",
"x86_64-linux": "61225378c9a6097974638c241730db60230c9d774a2c7242aa9f001299bccf4b"
},
"version": "31.2.0"
"version": "31.4.0"
}
}
7 changes: 6 additions & 1 deletion pkgs/development/tools/electron/common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,14 +169,19 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: {
enable_cet_shadow_stack = false;
is_cfi = false;
use_qt = false;
use_perfetto_client_library = false;
v8_builtins_profiling_log_file = "";
enable_dangling_raw_ptr_checks = false;
} // lib.optionalAttrs (lib.versionAtLeast info.version "28") {
dawn_use_built_dxc = false;
v8_enable_private_mapping_fork_optimization = true;
} // lib.optionalAttrs (lib.versionAtLeast info.version "29") {
v8_expose_public_symbols = true;
} // lib.optionalAttrs (lib.versionOlder info.version "31") {
use_perfetto_client_library = false;
} // lib.optionalAttrs (lib.versionAtLeast info.version "31") {
enable_dangling_raw_ptr_feature_flag = false;
clang_unsafe_buffers_paths = "";
enterprise_cloud_content_analysis = false;
} // {

# other
Expand Down
Loading