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: 230e0a31a08b
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: f5944b74e670
Choose a head ref
  • 3 commits
  • 16 files changed
  • 1 contributor

Commits on Dec 10, 2020

  1. 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).
    @primeos
    primeos committed Dec 10, 2020
    Copy the full SHA
    2b6b434 View commit details
    Browse the repository at this point in the history

  2. 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).
    @primeos
    primeos committed Dec 10, 2020
    Copy the full SHA
    240a8f7 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2020

  1. Merge pull request #106475 from primeos/ungoogled-chromium-merge 

    Merge ungoogled-chromium back into the chromium expressions
    @primeos
    primeos committed Dec 17, 2020
    Copy the full SHA
    f5944b7 View commit details
    Browse the repository at this point in the history