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.09] chromium: 87.0.4280.66 -> 87.0.4280.88 #108336

Merged
merged 16 commits into from Jan 5, 2021

Conversation

primeos
Copy link
Member

@primeos primeos commented Jan 3, 2021

Motivation for this change
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.

I just regenerated upstream-info.json using update.py again and got a
different hash this time (but the same hash as in NixOS#106272). Therefore,
the only possible explanation I have is that upstream changed the file
that is hosted at [0]. I'll try to contact upstream regarding this.

Fix NixOS#106272.

[0]: https://chromedriver.storage.googleapis.com/87.0.4280.88/chromedriver_linux64.zip

(cherry picked from commit d35b635)
I used nix-instantiate to verify that the derivations for chromium and
ungoogled-chromium remain unchanged (only the meta attributes change
slightly as I added myself as ungoogled-chromium to receive
notifications for PRs/issues).

(cherry picked from commit 2b6b434)
This also adds a dedicated channel for ungoogled-chromium that enables
us to update ungoogled-chromium independently of chromium.
TODO: Automate ungoogled-chromium updates via update.py (currently it
needs to be updated manually).

Note: Unfortunately this changes the ungoogled-chromium derivation
because common.nix passes the channel as an argument to
stdenv.mkDerivation (this makes it more difficult to verify this commit
but the result should remain the same).

(cherry picked from commit 240a8f7)
This should fix a regression from NixOS#106475 (hopefully this is the only
issue, my current implementation with channel+ungoogled isn't ideal):
NixOS#106475 (comment)

(cherry picked from commit be94a4c)
Building with Google's proprietary Widevine DRM technology requires
fetching the Google Chrome sources.

(cherry picked from commit 86ff1e4)
Error:
../../components/viz/service/display_embedder/output_presenter_x11.cc:8:10:
fatal error: 'X11/xshmfence.h' file not found
         ^~~~~~~~~~~~~~~~~
1 error generated.

(cherry picked from commit 351f3c0)
@primeos
Copy link
Member Author

primeos commented Jan 5, 2021

nixosTests.chromium succeeded.

@primeos primeos merged commit 0ad09f9 into NixOS:release-20.09 Jan 5, 2021
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

1 participant