public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #131449 from primeos/chromium-backport

Browse Source 
[21.05] Preparations for backporting Chromium M92
This commit is contained in:
Michael Weiss 2021-07-25 11:37:34 +02:00 committed by GitHub
commit 40325d6d4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/browsers/chromium/browser.nix
View File

@ -62,7 +62,7 @@ mkChromiumDerivation (base: rec {
-e '/\[Desktop Entry\]/a\' \ -e '/\[Desktop Entry\]/a\' \
-e 'StartupWMClass=chromium-browser' \ -e 'StartupWMClass=chromium-browser' \
$out/share/applications/chromium-browser.desktop $out/share/applications/chromium-browser.desktop
'' + lib.optionalString (channel == "dev") '' '' + lib.optionalString (channel != "stable") ''
cp -v "$buildPath/crashpad_handler" "$libExecPath/" cp -v "$buildPath/crashpad_handler" "$libExecPath/"
''; '';
@ -84,7 +84,7 @@ mkChromiumDerivation (base: rec {
else "https://www.chromium.org/"; else "https://www.chromium.org/";
maintainers = with maintainers; if ungoogled maintainers = with maintainers; if ungoogled
then [ squalus primeos ] then [ squalus primeos ]
else [ primeos thefloweringash bendlas ]; else [ primeos thefloweringash ];
license = if enableWideVine then licenses.unfree else licenses.bsd3; license = if enableWideVine then licenses.unfree else licenses.bsd3;
platforms = platforms.linux; platforms = platforms.linux;
mainProgram = "chromium"; mainProgram = "chromium";

4
pkgs/applications/networking/browsers/chromium/get-commit-message.py
View File

@ -19,14 +19,14 @@ for entry in feed.entries:
continue continue
url = requests.get(entry.link).url.split('?')[0] url = requests.get(entry.link).url.split('?')[0]
content = entry.content[0].value content = entry.content[0].value
content = html_tags.sub('', content) # Remove any HTML tags
if re.search(r'Linux', content) is None: if re.search(r'Linux', content) is None:
continue continue
#print(url) # For debugging purposes #print(url) # For debugging purposes
version = re.search(r'\d+(\.\d+){3}', content).group(0) version = re.search(r'\d+(\.\d+){3}', content).group(0)
print('chromium: TODO -> ' + version) print('chromium: TODO -> ' + version)
print('\n' + url) print('\n' + url)
if fixes := re.search(r'This update includes .+ security fixes\.', content): if fixes := re.search(r'This update includes .+ security fixes\.', content).group(0):
fixes = html_tags.sub('', fixes.group(0))
zero_days = re.search(r'Google is aware( of reports)? that .+ in the wild\.', content) zero_days = re.search(r'Google is aware( of reports)? that .+ in the wild\.', content)
if zero_days: if zero_days:
fixes += " " + zero_days.group(0) fixes += " " + zero_days.group(0)

18
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@ -18,9 +18,9 @@
} }
}, },
"beta": { "beta": {
"version": "92.0.4515.40", "version": "92.0.4515.107",
"sha256": "1v0vmnzdqq7d2rqp1sam8nk7z20xg5l9lnlpqjxj30y8k37gzh8p", "sha256": "04khamgxwzgbm2rn7is53j5g55vm5qfyz7zwxqc51sd429jsqlbf",
"sha256bin64": "0i3plysx51n2gsm5vbf9666rz73pqbbns7v09wznbbncvw9zngrf", "sha256bin64": "179i18lckd85i6cc60mqpvv2jqdshc338m686yackdgz9qjrrlwd",
"deps": { "deps": {
"gn": { "gn": {
"version": "2021-05-07", "version": "2021-05-07",
@ -31,15 +31,15 @@
} }
}, },
"dev": { "dev": {
"version": "93.0.4535.3", "version": "93.0.4577.8",
"sha256": "19iy4p59n0pg9s39g614y4yxh5f6h86bcp471qdnm6fvzmzcxd18", "sha256": "1x6i5bmcnj8bkpcb9gcyd1m9nzpq206yyprxrnpak117k7abr2b1",
"sha256bin64": "16q9s8l20bmr2n0y3pi505l5hbhbmpi8kh47aylj5gzk1nr30a8r", "sha256bin64": "0qjfb9jxr2gmwb1dsvl6yzz06vsjny2l3icrsdcm0pl6r6davk2w",
"deps": { "deps": {
"gn": { "gn": {
"version": "2021-05-07", "version": "2021-07-08",
"url": "https://gn.googlesource.com/gn", "url": "https://gn.googlesource.com/gn",
"rev": "39a87c0b36310bdf06b692c098f199a0d97fc810", "rev": "24e2f7df92641de0351a96096fb2c490b2436bb8",
"sha256": "0x63jr5hssm9dl6la4q5ahy669k4gxvbapqxi5w32vv107jrj8v4" "sha256": "1lwkyhfhw0zd7daqz466n7x5cddf0danr799h4jg3s0yvd4galjl"
} }
} }
}, },