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.

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

[20.03] chromium: 85.0.4183.83 -> 85.0.4183.121 #98557

Merged
merged 9 commits into from Sep 25, 2020

Conversation

primeos
Copy link
Member

@primeos primeos commented Sep 23, 2020

Motivation for this change

Backport of #98460 (and #97515, which I forgot to backport :o).

Testing status
platform attribute status tester
x86_64 chromium @Frostman
x86_64 nixosTests.chromium ✔️ @Frostman
x86_64 google-chrome - -
aarch64 chromium - -
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

alyssais and others added 9 commits September 23, 2020 12:15
update.nix was a huuuuge hack, abusing checksum collisions, etc., and
was extremely difficult to read and maintain, especially because
values from update.nix were also used in the derivations themselves!

I've replaced this with an implementation in Python, which I chose for
readability.  Rather than generating Nix, I chose to
generate JSON, since Python can do that in the standard library and
Nix can read it.

I also set update.py as an updateScript, so Chromium can now
automatically be updated!

Fixes: NixOS#89635
(cherry picked from commit de69b70)
This is required for certain URIs that require launching external
programs (e.g. mailto:, magnet:, or irc:) or setting the default browser
via xdg-settings.
Fix NixOS#96897 and fix NixOS#92751.

(cherry picked from commit 1fa610b)
This makes Git diffs way easier to read.
Using sort_keys=True is usually better but with this implementation the
output is a bit nicer to read IMO.

(cherry picked from commit ceb3acf)
(cherry picked from commit e249bac)
@Frostman
Copy link
Member

Frostman commented Sep 24, 2020

1 tests built:
nixosTests.chromium

on x86_64

@primeos primeos merged commit 1dd6939 into NixOS:release-20.03 Sep 25, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants