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: 5659cb448e9b
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 1dd693976f0e
Choose a head ref
  • 10 commits
  • 8 files changed
  • 4 contributors

Commits on Sep 23, 2020

  1. chromiumDev: 86.0.4238.0 -> 86.0.4240.8

    (cherry picked from commit 5811b6c)
    alyssais authored and primeos committed Sep 23, 2020
    Copy the full SHA
    710d968 View commit details
    Browse the repository at this point in the history
  2. chromium: replace update.nix with Python impl

    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: #89635
    (cherry picked from commit de69b70)
    alyssais authored and primeos committed Sep 23, 2020
    Copy the full SHA
    0074031 View commit details
    Browse the repository at this point in the history
  3. chromiumBeta: 85.0.4183.83 -> 86.0.4240.22

    (cherry picked from commit 6c92847)
    flokli authored and primeos committed Sep 23, 2020
    Copy the full SHA
    bc8cb02 View commit details
    Browse the repository at this point in the history
  4. chromium: Unblock nixos-unstable by using the correct argument to fet…

    …churl
    
    (cherry picked from commit 2927a19)
    TethysSvensson authored and primeos committed Sep 23, 2020
    Copy the full SHA
    79b88ef View commit details
    Browse the repository at this point in the history
  5. chromium: Prefix $PATH with xdg_utils (#96922)

    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 #96897 and fix #92751.
    
    (cherry picked from commit 1fa610b)
    primeos committed Sep 23, 2020
    Copy the full SHA
    0cd31b9 View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    8504341 View commit details
    Browse the repository at this point in the history
  7. chromium: update.py: Keep the channel order consistent

    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)
    primeos committed Sep 23, 2020
    Copy the full SHA
    f535718 View commit details
    Browse the repository at this point in the history
  8. chromiumDev: M86 -> M87

    (cherry picked from commit e249bac)
    primeos committed Sep 23, 2020
    Copy the full SHA
    40b58a1 View commit details
    Browse the repository at this point in the history
  9. Copy the full SHA
    39d5f7e View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2020

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

    [20.03] chromium: 85.0.4183.83 -> 85.0.4183.121
    primeos committed Sep 25, 2020
    Copy the full SHA
    1dd6939 View commit details
    Browse the repository at this point in the history