diff options
author | Vladimír Čunát <v@cunat.cz> | 2024-05-02 09:05:49 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2024-05-02 09:05:49 +0200 |
commit | 725f48a252336419d97f118e015f1b6ef5bbcea8 (patch) | |
tree | b972cb7d31ba489685b4094351960168fe2381c0 /pkgs/applications/networking/browsers | |
parent | dd897ede49954633e34ae9ec694ab7be361993d2 (diff) | |
parent | 0599892e8e36e089c742574ed6c9fd2b1cc7514f (diff) |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/networking/browsers')
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 43da2a13d94d8..d78943a5c5c26 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -272,8 +272,8 @@ let # Partial revert of https://github.com/chromium/chromium/commit/3687976b0c6d36cf4157419a24a39f6770098d61 # allowing us to use our rustc and our clang. ./patches/chromium-121-rust.patch - ] ++ lib.optionals (chromiumVersionAtLeast "124" && !chromiumVersionAtLeast "125") [ - # M124 shipped with broken --ozone-platform-hint flag handling, which we rely on + ] ++ lib.optionals (chromiumVersionAtLeast "124" && !chromiumVersionAtLeast "124.0.6367.118") [ + # M124 < 124.0.6367.118 shipped with broken --ozone-platform-hint flag handling, which we rely on # for our NIXOS_OZONE_WL (wayland) environment variable. # See <https://issues.chromium.org/issues/329678163>. # This is the commit for the fix that landed in M125, which applies clean on M124. diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index c3ef4848ee44e..345370868d715 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -15,9 +15,9 @@ version = "2024-03-14"; }; }; - hash = "sha256-tajZtdiXgs5lRLTmDmgNTM2vD+N+LuWpBS0dYzxUsMA="; - hash_deb_amd64 = "sha256-CyCbZQ5ce8WLTt2JVSqbDkLDboE4BloiZ8pJff3dmSY="; - version = "124.0.6367.91"; + hash = "sha256-+r/48dxipSAo74v1deMuKalW+Hj85hCun63ZcgLYDLk="; + hash_deb_amd64 = "sha256-H3bv6WiVBl4j38ROZ80+SD9UO9ok+xxcKFxDd9yjWNY="; + version = "124.0.6367.118"; }; ungoogled-chromium = { deps = { diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index df90e5dc109cc..8649969d8c30a 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -72,7 +72,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "A new GNOME web browser"; mainProgram = "eolie"; - homepage = "https://wiki.gnome.org/Apps/Eolie"; + homepage = "https://gitlab.gnome.org/World/eolie"; license = licenses.gpl3Plus; maintainers = with maintainers; [ samdroid-apps ]; platforms = platforms.linux; |