ungoogled-chromium: init at 81.0.4044.92-2 #76082

squalus · 2019-12-20T06:45:56Z

Motivation for this change

Adds support for the ungoogled-chromium patch set to the nixpkgs chromium derivation. Requested in #53579.

ungoogled-chromium is Google Chromium, sans dependency on Google web services. It also features some tweaks to enhance privacy, control, and transparency (almost all of which require manual activation or enabling). ungoogled-chromium retains the default Chromium experience as closely as possible.

Applies the full patch set (except for Widevine removal, which is covered by an existing patch)
Runs all ungoogled-chromium patching utilities, including binary pruning and domain substitution.
Applies the GN flags from ungoogled-chromium. Unforunately they are duplicated in the chromium nix expression. An alternative would be to parse them out of the flags.gn file in the ungoogled-chromium repo. That would still involve some tweaking and deduping though. I'm interested in feedback as to whether it's worth doing this.
Supports multiple versions of chromium with the ungoogled-src.nix file, which maps a chromium version to a ungoogled-chromium revision (although it's not able to be auto-updated like upstream-info.nix).
Tested 79.0.3945.79 on NixOS 19.09. Everything works ok for me, including WebGL acceleration.

The patch set can be enabled with the following nixpkgs config:

chromium = {
     ungoogled = true;
};

I'm very interested in feedback!

Prior work: #51195.

Things done

Notify maintainers

cc @bendlas @ivan @thefloweringash

worldofpeace · 2019-12-20T13:50:11Z

pkgs/applications/networking/browsers/chromium/ungoogled.nix

+, patch
+}:
+{ rev, sha256 }:
+stdenv.mkDerivation {


This expression lacks good whitespace like other expressions in nixpkgs.

See like https://github.com/NixOS/nixpkgs/blob/master/pkgs/desktops/pantheon/apps/elementary-camera/default.nix

Updated whitespace.

ivan

If you would like to package ungoogled-chromium, I think it should be its own package, with the upstream versions decoupled from chromium's versions. Chromium is already frequently difficult and time-consuming (as in, whole day down the drain) to update. I cannot hold back a new release with 50 CVE fixes just because the ungoogled-chromium patchset has not been updated yet. This would also burden the chromium maintainer with another 3+ hour build and smoke test.

ungoogled-chromium is basically a separate browser product, even if it is distributed as a patchset, so I recommend copying nixpkgs chromium/ into a new directory and replacing the maintainers :-)

squalus · 2019-12-20T19:16:46Z

I'd be willing to copy/paste into a new package. I agree that the chromium release should not be held back due to a delay in the patchset release.

squalus · 2020-01-03T07:44:46Z

I updated the PR to duplicate the chromium expressions.

The maintenance workflow will be to start with copy/pasted chromium expressions, then reapply the ungoogled-chromium expression diff on top of that, then update the ungoogled-chromium sources as needed.

Ideally I wouldn't need to modify the copy/pasted chromium expressions at all, instead just naively duplicate them and keep the patchset-related stuff in separate files. However, I couldn't figure out any way to do that with the current chromium expressions. What I would need is the ability to externally (through an override maybe) provide extra gnFlags and add extra postPatch steps.

LouisDK1 · 2020-01-14T22:57:35Z

@squalus Any update on your work on a separate package? I'd love to have Ungoogled chromium available for NixOS.

squalus · 2020-01-15T01:11:37Z

@LouisDK1 Yeah, in the latest update to this PR there's a separate chromiumUngoogled package available. I've been running it for about a week.

LouisDK1 · 2020-01-16T17:15:53Z

@LouisDK1 Yeah, in the latest update to this PR there's a separate chromiumUngoogled package available. I've been running it for about a week.

Awesome. I differently think this should get into the main repo.
Wouldn't it be a good idea to add "enableParallelBuilding = true;" somewhere in common.nix to minimize build time?
EDIT 2: Parallel building already enabled using "ninja".

LouisDK1 · 2020-01-22T16:31:33Z

@squalus - Please update package to: 79.0.3945.130-2 and if possible change the headline to match the fact that this is a separate package.

squalus · 2020-01-23T05:14:51Z

@LouisDK1 Updated the title, and left the version as-is. For now I'm aiming for the smallest possible diff from the "upstream" chromium nix expressions. I'll leave the testing and stabilization of new versions up to them.

LouisDK1 · 2020-01-25T19:10:29Z

@ivan He has done it. Could you review and maybe accept the package? :)

worldofpeace

Can we not call it chromiumUngoogled it's really backwards?
ungoogled-chromium makes more sense https://repology.org/project/ungoogled-chromium/versions.
(and please rename the directories)

LouisDK1 · 2020-01-26T22:24:31Z

@squalus ping

squalus · 2020-01-28T04:56:35Z

changed package name and directories to ungoogled-chromium
updated version to 79.0.3945.117-1

worldofpeace

I've built ungoogled-chromium and it works ✨

rycee · 2020-02-05T17:33:26Z

@worldofpeace Do you feel that the changes you requested were sorted? Your review is still marked as requesting changes 🙂

wizeman · 2020-02-05T17:35:11Z

Works for me 👍 Thanks!

rycee

LGTM

worldofpeace · 2020-02-05T17:36:50Z

@worldofpeace Do you feel that the changes you requested were sorted? Your review is still marked as requesting changes slightly_smiling_face

I don't feel I could properly commentate on adding another chromium flavor in nixpkgs other than it works. I don't completely approve of the maintainability of completely duplicating the chromium expressions. But I would be happy to use this.

rycee · 2020-02-05T19:27:39Z

@worldofpeace Yeah, agreed. It would be great if some more of the common parts could be abstracted out of these packages. I'm inclined to merge as-is, though, since I suppose that would be a job too large for this PR.

worldofpeace · 2020-02-05T19:42:41Z

@worldofpeace Yeah, agreed. It would be great if some more of the common parts could be abstracted out of these packages. I'm inclined to merge as-is, though, since I suppose that would be a job too large for this PR.

It was actually suggested #76082 (review).
I have no disagreements if you merge, I just hope to not see the expressions decay.

nixos-discourse · 2020-02-07T13:16:44Z

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/nixos-20-03-feature-freeze/5655/28

LouisDK1 · 2020-02-23T13:08:54Z

@worldofpeace - can you "accept" your request as it has been fulfilled?
Anything else holding back this package from being merged?

travankor · 2020-03-08T00:19:14Z

symphorien · 2020-03-26T18:24:47Z

I compiled this PR successfully.

neirenoir · 2020-04-23T23:33:45Z

@worldofpeace the changes you requested were fixed. Could we get the patch merged, pretty please? :(

primeos · 2020-04-24T11:25:28Z

My delayed opinion (disclaimer: probably not really constructive, feel free to skip)

tbh I'm not sure if #76082 (review) was a good idea (cop-pasting the Chromium expression instead of overriding it) because:

I consider it a bad practice in general
It might be more difficult to track the differences
- But maybe not since we have good diff tooling :)
Both expressions are likely to diverge over time if we aren't careful, resulting in unnecessary/unintended functional differences
If ungoogled-chromium isn't actively maintained, I'll quickly fall behind and get insecure
- E.g. currently it's already one patch release behind

But at least it doesn't make maintaining chromium more difficult than it already is :)

But I'm too late with this comment (sorry about this delayed note) and who knows, it might be better the way it is anyway.

@squalus I'd suggest the following to maintain this (I'm the current chromium maintainer):

Regularly check for differences, e.g. with:
git diff --no-index pkgs/applications/networking/browsers/{,ungoogled-}chromium
- E.g. currently there are VA-API, flashplayer-ppapi, and version differences
- Re-using changes from chromium will likely help you avoid build failures (I generally try to fix them in advance via testing the beta and dev channels as well)
I can ping/notify you on chromium PRs if you want
If possible ping/notify me about changes that make sense for chromium as well so I can re-use them
- I.e. we'll try to "cherry-pick" changes in both directions
Maybe find a second maintainer, e.g. for NixOS stable (backports) and as fallback

Also: Thanks for adding this package and good luck! I'm looking forward to a successful cooperation :)

squalus · 2020-04-28T22:39:25Z

Thanks for merging!

@primeos thanks for the comments. I have some maintenance scripts that will do this process semi-automatically. I'll commit them if I can make them look sensible. My plan for maintenance is just to periodically take the entire chromium directory, blindly copy it over, and apply the small set of ungoogled diffs. I would also like to work on the chromium expressions to make this process easier. 👍

No need to notify me over changes, I'll be periodically monitoring them (but feel free). I'm also looking forward to working with you!

danielfullmer · 2020-04-28T22:53:18Z

@squalus Also, I've been testing the chromium PRs by @primeos in the past. If interested, you can CC me on future update PRs of ungoogled-chromium and I can do similar basic building / testing. I have a beefy 32-core threadripper which makes this relatively quick for me.

squalus · 2020-04-28T22:54:42Z

@danielfullmer Will do. Thank you!

ofborg bot added 10.rebuild-darwin: 0 10.rebuild-linux: 0 labels Dec 20, 2019

worldofpeace reviewed Dec 20, 2019

View reviewed changes

squalus force-pushed the ungoogled branch from b72bb2e to 645beb6 Compare December 20, 2019 17:21

ivan suggested changes Dec 20, 2019

View reviewed changes

squalus force-pushed the ungoogled branch 2 times, most recently from 78822b4 to ef5e9ce Compare January 3, 2020 07:43

ofborg bot added 8.has: package (new) 11.by: package-maintainer 10.rebuild-linux: 1-10 and removed 10.rebuild-linux: 0 labels Jan 3, 2020

squalus changed the title ~~chromium: add support for ungoogled patches~~ chromiumUngoogled: init at 79.0.3945.88-1 Jan 23, 2020

worldofpeace suggested changes Jan 25, 2020

View reviewed changes

squalus force-pushed the ungoogled branch from ef5e9ce to f503f65 Compare January 28, 2020 04:54

squalus changed the title ~~chromiumUngoogled: init at 79.0.3945.88-1~~ ungoogled-chromium: init at 79.0.3945.117-1 Jan 28, 2020

squalus force-pushed the ungoogled branch from f503f65 to 98c2001 Compare January 28, 2020 06:20

worldofpeace reviewed Jan 29, 2020

View reviewed changes

squalus force-pushed the ungoogled branch from 98c2001 to 065aa45 Compare January 31, 2020 07:32

squalus changed the title ~~ungoogled-chromium: init at 79.0.3945.117-1~~ ungoogled-chromium: init at 79.0.3945.130-2 Jan 31, 2020

squalus force-pushed the ungoogled branch from 065aa45 to 604a7a3 Compare January 31, 2020 07:38

rycee approved these changes Feb 5, 2020

View reviewed changes

squalus force-pushed the ungoogled branch from 604a7a3 to bd7c9e5 Compare February 16, 2020 06:38

squalus changed the title ~~ungoogled-chromium: init at 79.0.3945.130-2~~ ungoogled-chromium: init at 80.0.3987.106-1 Feb 16, 2020

squalus force-pushed the ungoogled branch from bd7c9e5 to ae2a0a4 Compare February 17, 2020 09:27

primeos mentioned this pull request Mar 12, 2020

Which Chromium flavors to build on Hydra? #82443

Closed

2 tasks

squalus force-pushed the ungoogled branch from ae2a0a4 to 00fd934 Compare March 24, 2020 03:29

squalus force-pushed the ungoogled branch from 00fd934 to 86f1b5a Compare April 11, 2020 19:56

squalus changed the title ~~ungoogled-chromium: init at 80.0.3987.106-1~~ ungoogled-chromium: init at 80.0.3987.163-1 Apr 11, 2020

ofborg bot added the 10.rebuild-linux: 1 label Apr 11, 2020

ungoogled-chromium: init at 81.0.4044.92-2

7205bd6

squalus force-pushed the ungoogled branch from 86f1b5a to 7205bd6 Compare April 13, 2020 20:31

squalus changed the title ~~ungoogled-chromium: init at 80.0.3987.163-1~~ ungoogled-chromium: init at 81.0.4044.92-2 Apr 13, 2020

worldofpeace merged commit b4d7725 into NixOS:master Apr 24, 2020

squalus deleted the ungoogled branch April 28, 2020 22:39

primeos mentioned this pull request Nov 5, 2020

Merge ungoogled-chromium back into the chromium expressions? #102965

Closed

Janik-Haag added the 12. first-time contribution label Jun 12, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ungoogled-chromium: init at 81.0.4044.92-2 #76082

ungoogled-chromium: init at 81.0.4044.92-2 #76082

squalus commented Dec 20, 2019 •

edited

worldofpeace Dec 20, 2019

squalus Dec 20, 2019

ivan left a comment

squalus commented Dec 20, 2019

squalus commented Jan 3, 2020 •

edited

LouisDK1 commented Jan 14, 2020

squalus commented Jan 15, 2020

LouisDK1 commented Jan 16, 2020 •

edited

LouisDK1 commented Jan 22, 2020

squalus commented Jan 23, 2020

LouisDK1 commented Jan 25, 2020 •

edited

worldofpeace left a comment

LouisDK1 commented Jan 26, 2020

squalus commented Jan 28, 2020

worldofpeace left a comment

rycee commented Feb 5, 2020

wizeman commented Feb 5, 2020

rycee left a comment

worldofpeace commented Feb 5, 2020

rycee commented Feb 5, 2020

worldofpeace commented Feb 5, 2020

nixos-discourse commented Feb 7, 2020

LouisDK1 commented Feb 23, 2020

travankor commented Mar 8, 2020

symphorien commented Mar 26, 2020

neirenoir commented Apr 23, 2020

primeos commented Apr 24, 2020

squalus commented Apr 28, 2020

danielfullmer commented Apr 28, 2020

squalus commented Apr 28, 2020

ungoogled-chromium: init at 81.0.4044.92-2 #76082

ungoogled-chromium: init at 81.0.4044.92-2 #76082

Conversation

squalus commented Dec 20, 2019 • edited

Motivation for this change

Things done

Notify maintainers

worldofpeace Dec 20, 2019

Choose a reason for hiding this comment

squalus Dec 20, 2019

Choose a reason for hiding this comment

ivan left a comment

Choose a reason for hiding this comment

squalus commented Dec 20, 2019

squalus commented Jan 3, 2020 • edited

LouisDK1 commented Jan 14, 2020

squalus commented Jan 15, 2020

LouisDK1 commented Jan 16, 2020 • edited

LouisDK1 commented Jan 22, 2020

squalus commented Jan 23, 2020

LouisDK1 commented Jan 25, 2020 • edited

worldofpeace left a comment

Choose a reason for hiding this comment

LouisDK1 commented Jan 26, 2020

squalus commented Jan 28, 2020

worldofpeace left a comment

Choose a reason for hiding this comment

rycee commented Feb 5, 2020

wizeman commented Feb 5, 2020

rycee left a comment

Choose a reason for hiding this comment

worldofpeace commented Feb 5, 2020

rycee commented Feb 5, 2020

worldofpeace commented Feb 5, 2020

nixos-discourse commented Feb 7, 2020

LouisDK1 commented Feb 23, 2020

travankor commented Mar 8, 2020

symphorien commented Mar 26, 2020

neirenoir commented Apr 23, 2020

primeos commented Apr 24, 2020

squalus commented Apr 28, 2020

danielfullmer commented Apr 28, 2020

squalus commented Apr 28, 2020

squalus commented Dec 20, 2019 •

edited

squalus commented Jan 3, 2020 •

edited

LouisDK1 commented Jan 16, 2020 •

edited

LouisDK1 commented Jan 25, 2020 •

edited