From 385d6c0d609ea50ba88dba917066ea9c6961fafa Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 11 Jun 2021 11:44:24 +0200
Subject: [PATCH 01/17] chromiumBeta: 92.0.4515.40 -> 92.0.4515.51
(cherry picked from commit 558cb984de748cdf86f08c8bf5d410390d2503ec)
---
.../networking/browsers/chromium/upstream-info.json | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index eaf86f8a1ff..edadcd8cb82 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -18,9 +18,9 @@
}
},
"beta": {
- "version": "92.0.4515.40",
- "sha256": "1v0vmnzdqq7d2rqp1sam8nk7z20xg5l9lnlpqjxj30y8k37gzh8p",
- "sha256bin64": "0i3plysx51n2gsm5vbf9666rz73pqbbns7v09wznbbncvw9zngrf",
+ "version": "92.0.4515.51",
+ "sha256": "0x9c5fy95wnri9z0s8pbwyq1lw684n7d70l1s2rp5yxh0snannxg",
+ "sha256bin64": "036km5dp7asq5n86qx7c9119mdch7sl89lhq1ffss0f4mzcq42yd",
"deps": {
"gn": {
"version": "2021-05-07",
From 08c330473e6691a89704f91283daffc46cb9c2ee Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 16 Jun 2021 12:54:22 +0200
Subject: [PATCH 02/17] chromiumDev: 93.0.4535.3 -> 93.0.4542.2
(cherry picked from commit 0876f689d75ab65caee1c1ba02ca1be65732a90f)
---
.../networking/browsers/chromium/upstream-info.json | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index edadcd8cb82..144b1a9661e 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -31,15 +31,15 @@
}
},
"dev": {
- "version": "93.0.4535.3",
- "sha256": "19iy4p59n0pg9s39g614y4yxh5f6h86bcp471qdnm6fvzmzcxd18",
- "sha256bin64": "16q9s8l20bmr2n0y3pi505l5hbhbmpi8kh47aylj5gzk1nr30a8r",
+ "version": "93.0.4542.2",
+ "sha256": "0sfyi52kaxg5mllcvn61285fjnj72vglv9fjf36ri93v6gh34rgw",
+ "sha256bin64": "0hk31b9nk834gykv977dv7f1hyl7jp527bx5ldxhwcy27333h1hr",
"deps": {
"gn": {
- "version": "2021-05-07",
+ "version": "2021-06-11",
"url": "https://gn.googlesource.com/gn",
- "rev": "39a87c0b36310bdf06b692c098f199a0d97fc810",
- "sha256": "0x63jr5hssm9dl6la4q5ahy669k4gxvbapqxi5w32vv107jrj8v4"
+ "rev": "e0c476ffc83dc10897cb90b45c03ae2539352c5c",
+ "sha256": "01p5w57kksihzg9nb5096a74cw2rp8zzgdjcjm1pgrqvd1mxpjm4"
}
}
},
From dcf696ee71f8f38d986ba35b5aef0a291da164b5 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 17 Jun 2021 12:29:30 +0200
Subject: [PATCH 03/17] chromiumBeta: 92.0.4515.51 -> 92.0.4515.59
(cherry picked from commit 28b48376b992a2126dfa79ddfbcc6c60d5c62438)
---
.../networking/browsers/chromium/upstream-info.json | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 144b1a9661e..9176cc8349e 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -18,9 +18,9 @@
}
},
"beta": {
- "version": "92.0.4515.51",
- "sha256": "0x9c5fy95wnri9z0s8pbwyq1lw684n7d70l1s2rp5yxh0snannxg",
- "sha256bin64": "036km5dp7asq5n86qx7c9119mdch7sl89lhq1ffss0f4mzcq42yd",
+ "version": "92.0.4515.59",
+ "sha256": "0lpmd4sybr9qxqj7ab25xjliaw2dk9njnik51gdffrrwphv9qdxb",
+ "sha256bin64": "0qq9a3pzyn5d6bagx3py86ksl8n488lmlrmadgam2gb7421jq71a",
"deps": {
"gn": {
"version": "2021-05-07",
From 4ee0ab1564c58d493b33a02ecea82bbb32be8544 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 18 Jun 2021 15:55:37 +0200
Subject: [PATCH 04/17] chromiumDev: Fix building from the release tarball
See https://bugs.chromium.org/p/chromium/issues/detail?id=1215229.
Before this the build failed with this error:
[101/47617] ACTION //build/util:chromium_git_revision(//build/toolchain/linux/unbundle:default)oaded_data.pbchain/linux/unbundle:default)
FAILED: gen/build/util/chromium_git_revision.h
python3 ../../build/util/lastchange.py --header gen/build/util/chromium_git_revision.h --revision-id-only --revision-id-prefix @ -m\ CHROMIUM_GIT_REVISION
ERROR:root:Failed to get git top directory from '/build/chromium-93.0.4542.2/build/util': Git command 'git git rev-parse --show-toplevel' in /build/chromium-93.0.4542.2/build/util failed: [Errno 2] No such file or directory: 'git'
(cherry picked from commit 8af443906d795aa562839f4968566dd58b76c0fd)
---
pkgs/applications/networking/browsers/chromium/common.nix | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index c2417d9f524..e276fd107c6 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -175,6 +175,12 @@ let
sha256 = "1bxdhxmiy6h4acq26lq43x2mxx6rawmfmlgsh5j7w8kyhkw5af0c";
revert = true;
})
+ # To fix building from a release tarball (which we do):
+ (githubPatch {
+ # Revert back to generating chromium_git_revision.h via version.py
+ commit = "bd524d08f8465364d12d32a84fd1aa983aecc502";
+ sha256 = "1jsxidg5jzwkrcpx3lylx4gyg56zjyd7sc957kaaqqc853bn83b4";
+ })
];
postPatch = ''
From 04accba48c91113a6462d187d066b9d5a7701ff3 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 22 Jun 2021 23:56:53 +0200
Subject: [PATCH 05/17] chromiumDev: 93.0.4542.2 -> 93.0.4549.3
(cherry picked from commit c8fe353d8be0cb96e91fae004afb0b2d7b02c502)
---
.../networking/browsers/chromium/common.nix | 6 ------
.../networking/browsers/chromium/upstream-info.json | 12 ++++++------
2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index e276fd107c6..c2417d9f524 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -175,12 +175,6 @@ let
sha256 = "1bxdhxmiy6h4acq26lq43x2mxx6rawmfmlgsh5j7w8kyhkw5af0c";
revert = true;
})
- # To fix building from a release tarball (which we do):
- (githubPatch {
- # Revert back to generating chromium_git_revision.h via version.py
- commit = "bd524d08f8465364d12d32a84fd1aa983aecc502";
- sha256 = "1jsxidg5jzwkrcpx3lylx4gyg56zjyd7sc957kaaqqc853bn83b4";
- })
];
postPatch = ''
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 9176cc8349e..7739add5005 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -31,15 +31,15 @@
}
},
"dev": {
- "version": "93.0.4542.2",
- "sha256": "0sfyi52kaxg5mllcvn61285fjnj72vglv9fjf36ri93v6gh34rgw",
- "sha256bin64": "0hk31b9nk834gykv977dv7f1hyl7jp527bx5ldxhwcy27333h1hr",
+ "version": "93.0.4549.3",
+ "sha256": "0bkr67n1d75ayd1d9sa57c99j85r83gadzfs8iw7kwiha9g0mjgp",
+ "sha256bin64": "1hac6m668nrdzvfqx3vyc74pnx8lf973m1jxnm3cfy83g7wynphz",
"deps": {
"gn": {
- "version": "2021-06-11",
+ "version": "2021-06-18",
"url": "https://gn.googlesource.com/gn",
- "rev": "e0c476ffc83dc10897cb90b45c03ae2539352c5c",
- "sha256": "01p5w57kksihzg9nb5096a74cw2rp8zzgdjcjm1pgrqvd1mxpjm4"
+ "rev": "170c2dba1e0c0299fe8c6a441caf2f2352a42ae0",
+ "sha256": "1ylx8a5fxq7aciqs0mx7fld763sqkqn39lb9k951w6gksm15lrn3"
}
}
},
From d6b4569f806e72382afe67e4f61e9a64b6e8ac53 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 24 Jun 2021 15:16:19 +0200
Subject: [PATCH 06/17] chromiumBeta: 92.0.4515.59 -> 92.0.4515.70
(cherry picked from commit e829ab8d659cd9e8c574bd366dadaefbef8793e7)
---
.../networking/browsers/chromium/upstream-info.json | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 7739add5005..0f484ff9264 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -18,9 +18,9 @@
}
},
"beta": {
- "version": "92.0.4515.59",
- "sha256": "0lpmd4sybr9qxqj7ab25xjliaw2dk9njnik51gdffrrwphv9qdxb",
- "sha256bin64": "0qq9a3pzyn5d6bagx3py86ksl8n488lmlrmadgam2gb7421jq71a",
+ "version": "92.0.4515.70",
+ "sha256": "06yhpxr5bg0gx7hmrhc6zg4gr1d9s34y2rb98rpl4dilmc548i6q",
+ "sha256bin64": "1fkakh1r87pg5nr101m6v86y8iyyfba8vnzrg0229kcar7v8wzf7",
"deps": {
"gn": {
"version": "2021-05-07",
From 9c2bdffc2a68c78dd960a03114b1d905091680c1 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 28 Jun 2021 12:43:37 +0200
Subject: [PATCH 07/17] chromiumDev: Fix build errors due to the older system
FFmpeg
The final linking still fails though, even with llvm-git.
We might have to diable use_thin_lto for now:
ld.lld: error: undefined symbol: snappy::Compress(char const*, unsigned long, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >*)
>>> referenced by compression_module.cc
>>> thinlto-cache/Thin-ed5ed5.tmp.o:(reporting::CompressionModule::CompressRecord(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, base::OnceCallback<void (std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, absl::optional<reporting::CompressionInformation>)>) const)
clang-13: error: linker command failed with exit code 1 (use -v to see invocation)
(cherry picked from commit fcdcb819362836505e059ef1c5cb33c737883400)
---
.../networking/browsers/chromium/common.nix | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index c2417d9f524..db0d1606fa0 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -175,6 +175,18 @@ let
sha256 = "1bxdhxmiy6h4acq26lq43x2mxx6rawmfmlgsh5j7w8kyhkw5af0c";
revert = true;
})
+ # To fix build errors with the older system FFmpeg:
+ (githubPatch {
+ # unbundle: add libavcodec/packet.h to shim headers
+ commit = "e4d228ec30607b06bf3fed77497abef89c29966a";
+ sha256 = "02jg2bdmgjcpmk6alb72jc93wy3nf2fpa72hb4aarq337i2mwn4v";
+ })
+ (githubPatch {
+ # Roll src/third_party/ffmpeg/ 7e1d53a09..cf7ee6598 (1000 commits)
+ commit = "3ec3b2992238d4b4764f99f04605e154688c7990";
+ sha256 = "1fwb154s5qcis490rvcvm14zrmaj59g5lg9zg8ada36vw9hycbrf";
+ revert = true;
+ })
];
postPatch = ''
From c0a0749d1cc2b094aa0304ec3b98c3f718346faf Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 30 Jun 2021 19:59:49 +0200
Subject: [PATCH 08/17] chromiumDev: 93.0.4549.3 -> 93.0.4557.4
Would need to temporarily remove "ffmpeg" from gnSystemLibraries and
disable use_thin_lto to fix the build (theoretically).
(cherry picked from commit 5cae43456679428a675fb7074b48ceb5aa3f73e4)
---
.../networking/browsers/chromium/common.nix | 12 ------------
.../networking/browsers/chromium/upstream-info.json | 12 ++++++------
2 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index db0d1606fa0..c2417d9f524 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -175,18 +175,6 @@ let
sha256 = "1bxdhxmiy6h4acq26lq43x2mxx6rawmfmlgsh5j7w8kyhkw5af0c";
revert = true;
})
- # To fix build errors with the older system FFmpeg:
- (githubPatch {
- # unbundle: add libavcodec/packet.h to shim headers
- commit = "e4d228ec30607b06bf3fed77497abef89c29966a";
- sha256 = "02jg2bdmgjcpmk6alb72jc93wy3nf2fpa72hb4aarq337i2mwn4v";
- })
- (githubPatch {
- # Roll src/third_party/ffmpeg/ 7e1d53a09..cf7ee6598 (1000 commits)
- commit = "3ec3b2992238d4b4764f99f04605e154688c7990";
- sha256 = "1fwb154s5qcis490rvcvm14zrmaj59g5lg9zg8ada36vw9hycbrf";
- revert = true;
- })
];
postPatch = ''
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 0f484ff9264..54370802fb5 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -31,15 +31,15 @@
}
},
"dev": {
- "version": "93.0.4549.3",
- "sha256": "0bkr67n1d75ayd1d9sa57c99j85r83gadzfs8iw7kwiha9g0mjgp",
- "sha256bin64": "1hac6m668nrdzvfqx3vyc74pnx8lf973m1jxnm3cfy83g7wynphz",
+ "version": "93.0.4557.4",
+ "sha256": "06397k5mkrrdrmd7icyvd1ifnmhincgw5nskgc3m436qzzifsab9",
+ "sha256bin64": "1q2c2dhx1yya6vhr82asf7h2zrv6kjzjv1a0zlfxkp3i6lnivgrd",
"deps": {
"gn": {
- "version": "2021-06-18",
+ "version": "2021-06-25",
"url": "https://gn.googlesource.com/gn",
- "rev": "170c2dba1e0c0299fe8c6a441caf2f2352a42ae0",
- "sha256": "1ylx8a5fxq7aciqs0mx7fld763sqkqn39lb9k951w6gksm15lrn3"
+ "rev": "4d207c94eab41f09c9a8505eb47f3d2919e47943",
+ "sha256": "1jfgksa7rifh3ynnmd7m8xxggwxckz0jnwjaq9m5xapksb89hbn1"
}
}
},
From 1728c037de7c0b6c305aa81c56423945bbd55498 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 1 Jul 2021 10:32:15 +0200
Subject: [PATCH 09/17] chromiumBeta: 92.0.4515.70 -> 92.0.4515.80
(cherry picked from commit 11237c7d83eb87cf9b608e4917f072b8ed206b27)
---
.../networking/browsers/chromium/upstream-info.json | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 54370802fb5..450a73145c4 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -18,9 +18,9 @@
}
},
"beta": {
- "version": "92.0.4515.70",
- "sha256": "06yhpxr5bg0gx7hmrhc6zg4gr1d9s34y2rb98rpl4dilmc548i6q",
- "sha256bin64": "1fkakh1r87pg5nr101m6v86y8iyyfba8vnzrg0229kcar7v8wzf7",
+ "version": "92.0.4515.80",
+ "sha256": "142v8y275mysgksvfprc83a7r1dlcnb5rqi8a451fmfnj6wrsq8i",
+ "sha256bin64": "0sz2fvg6l7q7syc5pysa246p03sganmgjdfvind42i8cqxw8gycp",
"deps": {
"gn": {
"version": "2021-05-07",
From 9f9708fac7c1c624824f9d517add503d9305ef65 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 3 Jul 2021 11:06:30 +0200
Subject: [PATCH 10/17] chromiumBeta: Install crashpad_handler
This executable is required to fix a startup error.
TODO: Refactor the Nix expressions to allow chromiumVersionAtLeast, etc.
"everywhere" and investigate the VM test failure.
(cherry picked from commit ef7f020ec88c6aa92f3c35a4a83cd3517533d690)
---
pkgs/applications/networking/browsers/chromium/browser.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index cc443764447..602e2e6a829 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -62,7 +62,7 @@ mkChromiumDerivation (base: rec {
-e '/\[Desktop Entry\]/a\' \
-e 'StartupWMClass=chromium-browser' \
$out/share/applications/chromium-browser.desktop
- '' + lib.optionalString (channel == "dev") ''
+ '' + lib.optionalString (channel != "stable") ''
cp -v "$buildPath/crashpad_handler" "$libExecPath/"
'';
From fe5ef8dbc00f4d8f694a6de50061805da5924967 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 9 Jul 2021 10:17:01 +0200
Subject: [PATCH 11/17] chromiumBeta: 92.0.4515.80 -> 92.0.4515.93
(cherry picked from commit a571f3a94530f36ae1016cb74d2c861cb379ad5e)
---
.../networking/browsers/chromium/upstream-info.json | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 450a73145c4..f088ec6f631 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -18,9 +18,9 @@
}
},
"beta": {
- "version": "92.0.4515.80",
- "sha256": "142v8y275mysgksvfprc83a7r1dlcnb5rqi8a451fmfnj6wrsq8i",
- "sha256bin64": "0sz2fvg6l7q7syc5pysa246p03sganmgjdfvind42i8cqxw8gycp",
+ "version": "92.0.4515.93",
+ "sha256": "077i1rw84cgcmg2k0p1ycg5pwvnhgsa3qdfsr7icrn7gmagagqd0",
+ "sha256bin64": "1gf4qv8wvaagdgsinf2gprx9wcfgm8jql6870k50bi26mjqv9800",
"deps": {
"gn": {
"version": "2021-05-07",
From 4857d71209aaa7844512554877755cca7e956d61 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 14 Jul 2021 13:51:12 +0200
Subject: [PATCH 12/17] chromiumDev: 93.0.4557.4 -> 93.0.4573.0
(cherry picked from commit 96a3799050f46967f4b1f0141a5965c79137c4a2)
---
.../networking/browsers/chromium/upstream-info.json | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index f088ec6f631..adadb4a8249 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -31,15 +31,15 @@
}
},
"dev": {
- "version": "93.0.4557.4",
- "sha256": "06397k5mkrrdrmd7icyvd1ifnmhincgw5nskgc3m436qzzifsab9",
- "sha256bin64": "1q2c2dhx1yya6vhr82asf7h2zrv6kjzjv1a0zlfxkp3i6lnivgrd",
+ "version": "93.0.4573.0",
+ "sha256": "0knks0padlcqhwnjpg32d875nycznlbd228sx8qwnylg1ilrzqck",
+ "sha256bin64": "1kxbsdcc0gh2pllz3szmnjswxqbw9sr457pq8aafpgk9rdchikg1",
"deps": {
"gn": {
- "version": "2021-06-25",
+ "version": "2021-07-08",
"url": "https://gn.googlesource.com/gn",
- "rev": "4d207c94eab41f09c9a8505eb47f3d2919e47943",
- "sha256": "1jfgksa7rifh3ynnmd7m8xxggwxckz0jnwjaq9m5xapksb89hbn1"
+ "rev": "24e2f7df92641de0351a96096fb2c490b2436bb8",
+ "sha256": "1lwkyhfhw0zd7daqz466n7x5cddf0danr799h4jg3s0yvd4galjl"
}
}
},
From affa0971db1570a7c6fd9d03be1462edc717d695 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 15 Jul 2021 10:58:56 +0200
Subject: [PATCH 13/17] chromiumBeta: 92.0.4515.93 -> 92.0.4515.101
(cherry picked from commit b22b804e67e546edda690b3ae9a7d0c7cd38f37e)
---
.../networking/browsers/chromium/upstream-info.json | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index adadb4a8249..d7b14cb4ba6 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -18,9 +18,9 @@
}
},
"beta": {
- "version": "92.0.4515.93",
- "sha256": "077i1rw84cgcmg2k0p1ycg5pwvnhgsa3qdfsr7icrn7gmagagqd0",
- "sha256bin64": "1gf4qv8wvaagdgsinf2gprx9wcfgm8jql6870k50bi26mjqv9800",
+ "version": "92.0.4515.101",
+ "sha256": "1jcas265hhlqd9f63h4zw4n4xsl26c5zmjlmbf1px5icvcjfb2xd",
+ "sha256bin64": "0sb5l5nzfzisvrnhcfwhdh9rn6z6pkzqz4p92c40q2mlhmjrfhj0",
"deps": {
"gn": {
"version": "2021-05-07",
From 741f8416c78c30712c212c22f54ee1fa82c5c9bc Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 16 Jul 2021 12:14:45 +0200
Subject: [PATCH 14/17] chromium: get-commit-message.py: Improve the parsing
The current stable release announcement [0] uses more HTML tags which
broke the detection of "fixes" and "zero_days". Proper HTML parsing
could be done using html.parser [1] but for our purposes the naive regex
trick works well enough.
[0]: https://chromereleases.googleblog.com/2021/07/stable-channel-update-for-desktop.html
[1]: https://docs.python.org/3/library/html.parser.html
(cherry picked from commit 3e93811d93b2bc88f047e9a989b456ab3ae3291c)
---
.../networking/browsers/chromium/get-commit-message.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/networking/browsers/chromium/get-commit-message.py b/pkgs/applications/networking/browsers/chromium/get-commit-message.py
index 2768e31bd03..7a91b74c83d 100755
--- a/pkgs/applications/networking/browsers/chromium/get-commit-message.py
+++ b/pkgs/applications/networking/browsers/chromium/get-commit-message.py
@@ -19,14 +19,14 @@ for entry in feed.entries:
continue
url = requests.get(entry.link).url.split('?')[0]
content = entry.content[0].value
+ content = html_tags.sub('', content) # Remove any HTML tags
if re.search(r'Linux', content) is None:
continue
#print(url) # For debugging purposes
version = re.search(r'\d+(\.\d+){3}', content).group(0)
print('chromium: TODO -> ' + version)
print('\n' + url)
- if fixes := re.search(r'This update includes .+ security fixes\.', content):
- fixes = html_tags.sub('', fixes.group(0))
+ if fixes := re.search(r'This update includes .+ security fixes\.', content).group(0):
zero_days = re.search(r'Google is aware( of reports)? that .+ in the wild\.', content)
if zero_days:
fixes += " " + zero_days.group(0)
From 03f1833d1ab072899b9a65e4c3417d00521c3946 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 20 Jul 2021 10:08:44 +0200
Subject: [PATCH 15/17] chromiumBeta: 92.0.4515.101 -> 92.0.4515.107
(cherry picked from commit 5c6608144f9cd108565297c7c03ec79bb0fe611f)
---
.../networking/browsers/chromium/upstream-info.json | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index d7b14cb4ba6..71887b8b85f 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -18,9 +18,9 @@
}
},
"beta": {
- "version": "92.0.4515.101",
- "sha256": "1jcas265hhlqd9f63h4zw4n4xsl26c5zmjlmbf1px5icvcjfb2xd",
- "sha256bin64": "0sb5l5nzfzisvrnhcfwhdh9rn6z6pkzqz4p92c40q2mlhmjrfhj0",
+ "version": "92.0.4515.107",
+ "sha256": "04khamgxwzgbm2rn7is53j5g55vm5qfyz7zwxqc51sd429jsqlbf",
+ "sha256bin64": "179i18lckd85i6cc60mqpvv2jqdshc338m686yackdgz9qjrrlwd",
"deps": {
"gn": {
"version": "2021-05-07",
From 9ede7cd91bdde4634fc43bf12c01839cc7db22ca Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 22 Jul 2021 10:34:59 +0200
Subject: [PATCH 16/17] chromiumDev: 93.0.4573.0 -> 93.0.4577.8
(cherry picked from commit 503dc62d0468e303758a720c8d650075a48956ec)
---
.../networking/browsers/chromium/upstream-info.json | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 71887b8b85f..a278192f136 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -31,9 +31,9 @@
}
},
"dev": {
- "version": "93.0.4573.0",
- "sha256": "0knks0padlcqhwnjpg32d875nycznlbd228sx8qwnylg1ilrzqck",
- "sha256bin64": "1kxbsdcc0gh2pllz3szmnjswxqbw9sr457pq8aafpgk9rdchikg1",
+ "version": "93.0.4577.8",
+ "sha256": "1x6i5bmcnj8bkpcb9gcyd1m9nzpq206yyprxrnpak117k7abr2b1",
+ "sha256bin64": "0qjfb9jxr2gmwb1dsvl6yzz06vsjny2l3icrsdcm0pl6r6davk2w",
"deps": {
"gn": {
"version": "2021-07-08",
From a45acbc8e390eacc7c13b189289a5a959e664650 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 23 Jul 2021 10:38:36 +0200
Subject: [PATCH 17/17] chromium: remove bendlas as maintainer
Their last Chromium commit is a52d7674cc7 from 2019.
Thank you for maintaining Chromium in the past.
(cherry picked from commit d4612af2c0d5e3c220bdd37c19272a69cc16cfd0)
---
pkgs/applications/networking/browsers/chromium/browser.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index 602e2e6a829..1b21093e944 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -84,7 +84,7 @@ mkChromiumDerivation (base: rec {
else "https://www.chromium.org/";
maintainers = with maintainers; if ungoogled
then [ squalus primeos ]
- else [ primeos thefloweringash bendlas ];
+ else [ primeos thefloweringash ];
license = if enableWideVine then licenses.unfree else licenses.bsd3;
platforms = platforms.linux;
mainProgram = "chromium";