Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 4a75ca4a4e7d
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 0ad09f965676
Choose a head ref
  • 17 commits
  • 16 files changed
  • 1 contributor

Commits on Jan 3, 2021

  1. chromiumDev: 88.0.4324.11 -> 88.0.4324.27

    (cherry picked from commit 8eb2551)
    primeos committed Jan 3, 2021
    Copy the full SHA
    7914045 View commit details
    Browse the repository at this point in the history
  2. chromium: 87.0.4280.66 -> 87.0.4280.88

    https://chromereleases.googleblog.com/2020/12/stable-channel-update-for-desktop.html
    
    This update includes 0 security fixes.
    
    (cherry picked from commit 36d40f7)
    primeos committed Jan 3, 2021
    Copy the full SHA
    35aa1bd View commit details
    Browse the repository at this point in the history
  3. chromiumBeta: 87.0.4280.66 -> 88.0.4324.27

    (cherry picked from commit beb8359)
    primeos committed Jan 3, 2021
    Copy the full SHA
    3b6a0a2 View commit details
    Browse the repository at this point in the history
  4. chromiumDev: 88.0.4324.27 -> 89.0.4343.0

    (cherry picked from commit f4419dd)
    primeos committed Jan 3, 2021
    Copy the full SHA
    9212b77 View commit details
    Browse the repository at this point in the history
  5. chromedriver.src: Update the hash

    I just regenerated upstream-info.json using update.py again and got a
    different hash this time (but the same hash as in #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 #106272.
    
    [0]: https://chromedriver.storage.googleapis.com/87.0.4280.88/chromedriver_linux64.zip
    
    (cherry picked from commit d35b635)
    primeos committed Jan 3, 2021
    Copy the full SHA
    5ed42de View commit details
    Browse the repository at this point in the history
  6. ungoogled-chromium: Merge back into chromium

    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)
    primeos committed Jan 3, 2021
    Copy the full SHA
    ea38a15 View commit details
    Browse the repository at this point in the history
  7. ungoogled-chromium: Move ungoogled-src.nix into upstream-info.json

    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)
    primeos committed Jan 3, 2021
    Copy the full SHA
    870ed72 View commit details
    Browse the repository at this point in the history
  8. chromiumBeta: 88.0.4324.27 -> 88.0.4324.41

    (cherry picked from commit 4ea2b21)
    primeos committed Jan 3, 2021
    Copy the full SHA
    05ced2c View commit details
    Browse the repository at this point in the history
  9. chromiumDev: 89.0.4343.0 -> 89.0.4350.4

    (cherry picked from commit 397a5ee)
    primeos committed Jan 3, 2021
    Copy the full SHA
    6e62377 View commit details
    Browse the repository at this point in the history
  10. chromiumBeta: 88.0.4324.41 -> 88.0.4324.50

    (cherry picked from commit 39c5d11)
    primeos committed Jan 3, 2021
    Copy the full SHA
    e019044 View commit details
    Browse the repository at this point in the history
  11. chromiumDev: 89.0.4350.4 -> 89.0.4356.6

    (cherry picked from commit 40199cd)
    primeos committed Jan 3, 2021
    Copy the full SHA
    4b5b1b5 View commit details
    Browse the repository at this point in the history
  12. ungoogled-chromium: Try to fix an evaluation error on Hydra

    This should fix a regression from #106475 (hopefully this is the only
    issue, my current implementation with channel+ungoogled isn't ideal):
    #106475 (comment)
    
    (cherry picked from commit be94a4c)
    primeos committed Jan 3, 2021
    Copy the full SHA
    2475e60 View commit details
    Browse the repository at this point in the history
  13. chromium: Improve update.py (documentation + linting fixes)

    (cherry picked from commit 9b846b9)
    primeos committed Jan 3, 2021
    Copy the full SHA
    898e237 View commit details
    Browse the repository at this point in the history
  14. ungoogled-chromium: Support automatic updates via update.py

    (cherry picked from commit 94bee10)
    primeos committed Jan 3, 2021
    Copy the full SHA
    9c0286e View commit details
    Browse the repository at this point in the history
  15. ungoogled-chromium: Support enableWideVine=true

    Building with Google's proprietary Widevine DRM technology requires
    fetching the Google Chrome sources.
    
    (cherry picked from commit 86ff1e4)
    primeos committed Jan 3, 2021
    Copy the full SHA
    8848038 View commit details
    Browse the repository at this point in the history
  16. chromiumDev: Fix the build (libxshmfence is now required)

    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 committed Jan 3, 2021
    Copy the full SHA
    48591c4 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2021

  1. Merge pull request #108336 from primeos/chromium-backport

    [20.09] chromium: 87.0.4280.66 -> 87.0.4280.88
    primeos committed Jan 5, 2021
    Copy the full SHA
    0ad09f9 View commit details
    Browse the repository at this point in the history