git.iko.soy/typeable/nixpkgs
on master help sign in
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).

commit240a8f746e0e3e698fc87cb9934ffaef7e09e5bf authorMichael Weiss <dev.primeos@gmail.com> dateWed 9 Dec 2020, 19:29 (6 years ago) parent2b6b434
7 files changed+30−13
pkgs/applications/networking/browsers/chromium/browser.nix+3−1 pkgs/applications/networking/browsers/chromium/common.nix+4−5 pkgs/applications/networking/browsers/chromium/default.nix+3−1 pkgs/applications/networking/browsers/chromium/ungoogled-src.nix−6 pkgs/applications/networking/browsers/chromium/update.py+3 pkgs/applications/networking/browsers/chromium/upstream-info.json+16 pkgs/top-level/all-packages.nix+1
pkgs/applications/networking/browsers/chromium/browser.nix+3−1
@@ -85,7 +85,9 @@ mkChromiumDerivation (base: rec {
8585 else [ primeos thefloweringash bendlas ];
8686 license = if enableWideVine then licenses.unfree else licenses.bsd3;
8787 platforms = platforms.linux;
88− hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else [];
88+ hydraPlatforms = if (channel == "stable" || channel == "ungoogled-chromium")
89+ then ["aarch64-linux" "x86_64-linux"]
90+ else [];
8991 timeout = 172800; # 48 hours (increased from the Hydra default of 10h)
9092 };
9193})
pkgs/applications/networking/browsers/chromium/common.nix+4−5
@@ -110,11 +110,10 @@ let
110110 result
111111 else result;
112112
113− ungoogler =
114− let versionEntry = (import ./ungoogled-src.nix)."${upstream-info.version}";
115− in ungoogled-chromium {
116− inherit (versionEntry) rev sha256;
117− };
113+ ungoogler = ungoogled-chromium {
114+ inherit (upstream-info.deps.ungoogled-patches) rev sha256;
115+ };
116+
118117 base = rec {
119118 name = "${packageName}-unwrapped-${version}";
120119 inherit (upstream-info) version;
pkgs/applications/networking/browsers/chromium/default.nix+3−1
@@ -116,7 +116,9 @@ let
116116 };
117117 };
118118
119− suffix = if channel != "stable" then "-" + channel else "";
119+ suffix = if (channel == "stable" || channel == "ungoogled-chromium")
120+ then ""
121+ else "-" + channel;
120122
121123 sandboxExecutableName = chromium.browser.passthru.sandboxExecutableName;
122124
pkgs/applications/networking/browsers/chromium/ungoogled-src.nixdeleted−6
@@ -1,6 +0,0 @@
1−{
2− "87.0.4280.88" = {
3− rev = "87.0.4280.88-1";
4− sha256 = "0w2137w8hfcgl6f938hqnb4ffp33v5r8vdzxrvs814w7dszkiqgg";
5− };
6−}
pkgs/applications/networking/browsers/chromium/update.py+3
@@ -113,9 +113,12 @@ with open(JSON_PATH, 'w') as out:
113113 return 1
114114 elif channel_name == 'dev':
115115 return 2
116+ elif channel_name == 'ungoogled-chromium':
117+ return 3
116118 else:
117119 print(f'Error: Unexpected channel: {channel_name}', file=sys.stderr)
118120 sys.exit(1)
121+ channels['ungoogled-chromium'] = last_channels['ungoogled-chromium'] # Keep ungoogled-chromium unchanged
119122 sorted_channels = OrderedDict(sorted(channels.items(), key=get_channel_key))
120123 json.dump(sorted_channels, out, indent=2)
121124 out.write('\n')
pkgs/applications/networking/browsers/chromium/upstream-info.json+16
@@ -42,5 +42,21 @@
4242 "sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9"
4343 }
4444 }
45+ },
46+ "ungoogled-chromium": {
47+ "version": "87.0.4280.88",
48+ "sha256": "1h09g9b2zxad85vd146ymvg3w2kpngpi78yig3dn1vrmhwr4aiiy",
49+ "deps": {
50+ "ungoogled-patches": {
51+ "rev": "87.0.4280.88-1",
52+ "sha256": "0w2137w8hfcgl6f938hqnb4ffp33v5r8vdzxrvs814w7dszkiqgg"
53+ },
54+ "gn": {
55+ "version": "2020-09-09",
56+ "url": "https://gn.googlesource.com/gn",
57+ "rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2",
58+ "sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk"
59+ }
60+ }
4561 }
4662}
pkgs/top-level/all-packages.nix+1
@@ -24416,6 +24416,7 @@ in
2441624416
2441724417 ungoogled-chromium = callPackage ../applications/networking/browsers/chromium ((config.chromium or {}) // {
2441824418 ungoogled = true;
24419+ channel = "ungoogled-chromium";
2441924420 });
2442024421
2442124422 unigine-valley = callPackage ../applications/graphics/unigine-valley { };