nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 06:53:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Backport release-24.11] ungoogled-chromium: 131.0.6778.69-1 -> 131.0.6778.85-1 (#357862)

Browse Source
This commit is contained in:
Emily 2024-11-21 12:01:47 +01:00 committed by GitHub
commit b92a8e9e6f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -766,7 +766,7 @@
} }
}, },
"ungoogled-chromium": { "ungoogled-chromium": {
"version": "131.0.6778.69", "version": "131.0.6778.85",
"deps": { "deps": {
"depot_tools": { "depot_tools": {
"rev": "20b9bdcace7ed561d6a75728c85373503473cb6b", "rev": "20b9bdcace7ed561d6a75728c85373503473cb6b",
@ -777,16 +777,16 @@
"hash": "sha256-a8yCdBsl0nBMPS+pCLwrkAvQNP/THx/z/GySyOgx4Jk=" "hash": "sha256-a8yCdBsl0nBMPS+pCLwrkAvQNP/THx/z/GySyOgx4Jk="
}, },
"ungoogled-patches": { "ungoogled-patches": {
"rev": "131.0.6778.69-1", "rev": "131.0.6778.85-1",
"hash": "sha256-1XKlIO8aH3eHNiF4fPJGymo1MGUgHlqD98vWjHGMWHY=" "hash": "sha256-mcSshjdfUEH4ur4z+0P0oWCjlV8EhFMc+7rdfIIPASI="
}, },
"npmHash": "sha256-b1l8SwjAfoColoa3zhTMPEF/rRuxzT3ATHE77rWU5EA=" "npmHash": "sha256-b1l8SwjAfoColoa3zhTMPEF/rRuxzT3ATHE77rWU5EA="
}, },
"DEPS": { "DEPS": {
"src": { "src": {
"url": "https://chromium.googlesource.com/chromium/src.git", "url": "https://chromium.googlesource.com/chromium/src.git",
"rev": "131.0.6778.69", "rev": "131.0.6778.85",
"hash": "sha256-GbhiqLRC5Kilo84XwYHnosNUgtZNCwmuzSOkP6if/8s=", "hash": "sha256-fREToEHVbTD0IVGx/sn7csSju4BYajWZ+LDCiKWV4cI=",
"recompress": true "recompress": true
}, },
"src/third_party/clang-format/script": { "src/third_party/clang-format/script": {
@ -886,8 +886,8 @@
}, },
"src/third_party/dawn": { "src/third_party/dawn": {
"url": "https://dawn.googlesource.com/dawn.git", "url": "https://dawn.googlesource.com/dawn.git",
"rev": "cdc5b4dc1ee1482378b545b6c1efa1a234195ab5", "rev": "7e742cac42c29a14ab7f54b134b2f17592711267",
"hash": "sha256-HtLdotDYA0fsUyFkk/nhJ+GPC+GkbwfmyPbJLKAyKdE=" "hash": "sha256-K2gwKNwonzCIu4hnlYuOaYyKaRV11hwDzF4oykiKsl0="
}, },
"src/third_party/dawn/third_party/glfw": { "src/third_party/dawn/third_party/glfw": {
"url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@ -1526,8 +1526,8 @@
}, },
"src/v8": { "src/v8": {
"url": "https://chromium.googlesource.com/v8/v8.git", "url": "https://chromium.googlesource.com/v8/v8.git",
"rev": "7075674f24f09d3b30913710a31e8793c131000a", "rev": "bd2671b973062afc614b852ec190524b80aaef8a",
"hash": "sha256-N6FB/ocU1KIAGoYTnAl42qjrjatuD5fooRu93akPUjM=" "hash": "sha256-uq0CE7Chqzy2d+iifC3hV9RTnDVinpwjl1pOzyNGbSo="
} }
} }
} }

36
pkgs/applications/networking/browsers/chromium/update.mjs
View File

@ -38,7 +38,7 @@ for (const attr_path of Object.keys(lockfile)) {
} }
const ungoogled = attr_path === 'ungoogled-chromium' const ungoogled = attr_path === 'ungoogled-chromium'
const version_nixpkgs = !ungoogled ? lockfile[attr_path].version : lockfile[attr_path].deps["ungoogled-patches"].rev const version_nixpkgs = !ungoogled ? lockfile[attr_path].version : lockfile[attr_path].deps['ungoogled-patches'].rev
const version_upstream = !ungoogled ? await get_latest_chromium_release() : await get_latest_ungoogled_release() const version_upstream = !ungoogled ? await get_latest_chromium_release() : await get_latest_ungoogled_release()
console.log(`[${attr_path}] ${chalk.red(version_nixpkgs)} (nixpkgs)`) console.log(`[${attr_path}] ${chalk.red(version_nixpkgs)} (nixpkgs)`)
@ -56,7 +56,7 @@ for (const attr_path of Object.keys(lockfile)) {
deps: { deps: {
depot_tools: {}, depot_tools: {},
gn: {}, gn: {},
"ungoogled-patches": ungoogled ? await fetch_ungoogled(version_upstream) : undefined, 'ungoogled-patches': ungoogled ? await fetch_ungoogled(version_upstream) : undefined,
npmHash: dummy_hash, npmHash: dummy_hash,
}, },
DEPS: {}, DEPS: {},
@ -84,18 +84,28 @@ for (const attr_path of Object.keys(lockfile)) {
value.recompress = true value.recompress = true
} }
const cache = lockfile_initial[attr_path].DEPS[path] const cache_hit = (() => {
const cache_hit = for (const attr_path in lockfile_initial) {
cache !== undefined && const cache = lockfile_initial[attr_path].DEPS[path]
value.url === cache.url && const hits_cache =
value.rev === cache.rev && cache !== undefined &&
value.recompress === cache.recompress && value.url === cache.url &&
cache.hash !== undefined && value.rev === cache.rev &&
cache.hash !== '' && value.recompress === cache.recompress &&
cache.hash !== dummy_hash cache.hash !== undefined &&
cache.hash !== '' &&
cache.hash !== dummy_hash
if (hits_cache) {
cache.attr_path = attr_path
return cache;
}
}
})();
if (cache_hit) { if (cache_hit) {
console.log(`[${chalk.green(path)}] Reusing hash from previous info.json for ${cache.url}@${cache.rev}`) console.log(`[${chalk.green(path)}] Reusing hash from previous info.json for ${cache_hit.url}@${cache_hit.rev} from ${cache_hit.attr_path}`)
value.hash = cache.hash value.hash = cache_hit.hash
continue continue
} }