mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-09-01 13:14:42 +00:00
Merge release-26.05 into staging-next-26.05
This commit is contained in:
nixpkgs-ci[bot]
@@ -675,6 +675,20 @@ let
|
||||
includes = [ "chrome/browser/first_run/first_run.h" ];
|
||||
hash = "sha256-d1Zm2flZPG++ROF4CCawn9U8T7/qgZFMHTXArqIShTk=";
|
||||
})
|
||||
]
|
||||
++ lib.optionals (chromiumVersionAtLeast "152") [
|
||||
# ERROR at //build/rust/crubit/BUILD.gn:31:19: Unable to load "/build/src/third_party/rust-toolchain/lib/third_party/crubit/BUILD.gn".
|
||||
# public_deps = [ "$crubit_src_dir:cpp_api_from_rust_bindings_cpp_deps" ]
|
||||
# ^----------------------------------------------------
|
||||
#
|
||||
# Source: https://github.com/ungoogled-software/ungoogled-chromium/pull/3928
|
||||
# by https://github.com/Ahrotahn (ungoogled-chromium, BSD-3-Clause)
|
||||
./patches/ungoogled-chromium-152-crubit.patch
|
||||
]
|
||||
++ lib.optionals (chromiumVersionAtLeast "152" && lib.versionOlder llvmVersion "23") [
|
||||
# error: unknown argument: '-fno-lifetime-safety-inference'
|
||||
# error: unknown argument: '-fno-experimental-lifetime-safety-tu-analysis'
|
||||
./patches/chromium-152-dawn-llvm-22.patch
|
||||
];
|
||||
|
||||
postPatch =
|
||||
|
||||
@@ -1,28 +1,28 @@
|
||||
{
|
||||
"chromium": {
|
||||
"version": "151.0.7922.173",
|
||||
"version": "152.0.7977.64",
|
||||
"chromedriver": {
|
||||
"version": "151.0.7922.174",
|
||||
"hash_darwin": "sha256-ZvSYSZVVXOUVNjBkrXNQ04qdUcAj7Z2RbWPt6/rVkdo=",
|
||||
"hash_darwin_aarch64": "sha256-10cDX124TzB9kIQfx+Jxzz6mgo3Aq/C+Nfwy9BR0F2c="
|
||||
"version": "152.0.7977.65",
|
||||
"hash_darwin": "sha256-efjEqr5pSmFfY8nz0qQntSnSg93oIDUahsy6GL4cHro=",
|
||||
"hash_darwin_aarch64": "sha256-lMI/fxkiQsKlGzARb0xfdr10VKNEMDQ4Y1u2I4WRfG0="
|
||||
},
|
||||
"deps": {
|
||||
"depot_tools": {
|
||||
"rev": "94e89b10b92cc9d6e58fc8d1b6474b7d29e8a114",
|
||||
"hash": "sha256-2kfg2f5lamTyq0BMEt5LGuc4BW07Zx+Z9hZCErTVuUs="
|
||||
"rev": "38c391feba5fb96812f9028da12413ffc39df394",
|
||||
"hash": "sha256-yOd+k4GJ/unOVCm2Fj1oDHOMKV87CuBO/z0li3owNQk="
|
||||
},
|
||||
"gn": {
|
||||
"version": "0-unstable-2026-06-29",
|
||||
"rev": "1d86777e7f2562a86ecea77d1809ac4f82bb5bfe",
|
||||
"hash": "sha256-T2LdISIkp8fcUli5ZetTqrESBAc7coJhWdJv7I+o9kk="
|
||||
"version": "0-unstable-2026-07-23",
|
||||
"rev": "641ace93dd9560e75e7add0d08f77b446fbb3b78",
|
||||
"hash": "sha256-ovLx6KaORdXqnWgbsGEty10k2CHuCmTk3yEqy5//ovk="
|
||||
},
|
||||
"npmHash": "sha256-pF0JtwFpPC4/fodbhSJnQKkczA9WlDg4VqEAy9aDVLg="
|
||||
},
|
||||
"DEPS": {
|
||||
"src": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git",
|
||||
"rev": "a96602f30358e9b5d256a0464e7e4d4bec223004",
|
||||
"hash": "sha256-uumIVSzf318Xd1JB9jESXgpLxXlrvMDclOzSFQqweZ8=",
|
||||
"rev": "506c834ecceaa943c5f41e6cfe7f68acb5c45346",
|
||||
"hash": "sha256-KEr9nzF55+c8Rvvay3SZjcWMDWVGTyv1f5Pjv3ckl3E=",
|
||||
"recompress": true
|
||||
},
|
||||
"src/third_party/clang-format/script": {
|
||||
@@ -32,13 +32,13 @@
|
||||
},
|
||||
"src/third_party/compiler-rt/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git",
|
||||
"rev": "57d6af57c374757d67349eaf85b41efc3c603bd3",
|
||||
"hash": "sha256-9nnW5gittMng5VvDiMrd2Q7rstZqgd+uhx9+k/W3XMY="
|
||||
"rev": "e1c9323385b40780f574f440a8a9ad83855712b0",
|
||||
"hash": "sha256-oxGL+ct1z5S9wduYINjiZrjJx1HlAJjyMPEoDyhIfvo="
|
||||
},
|
||||
"src/third_party/libc++/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git",
|
||||
"rev": "5abc7f839700f0f17338434e1c1c6a8c87c00c11",
|
||||
"hash": "sha256-vT1km7JgVpotDoNK+ae1gplSHcwrVNLsv/QAFUrDsIM="
|
||||
"rev": "b16984ce99c702355a5b2b4c52574e82cec41fb9",
|
||||
"hash": "sha256-ZVgUAi5rYj17N3nAEvLQXZLCxnmvxIo2RpJ3geTSyWQ="
|
||||
},
|
||||
"src/third_party/libc++abi/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git",
|
||||
@@ -47,13 +47,13 @@
|
||||
},
|
||||
"src/third_party/libunwind/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git",
|
||||
"rev": "6de9f6eebca9aefbb32383a92baa9bf0f59f1457",
|
||||
"hash": "sha256-o0MSKm65+hFyUO4CZkzoozt1Lup+/1JYmV9FEXCnD0Q="
|
||||
"rev": "b2ff0e6b9ac002918d7a9ce982eee88dcc27a450",
|
||||
"hash": "sha256-VK9w68Im896xi4cymhtfvh7xdRJZB78YEvUYyxqBu48="
|
||||
},
|
||||
"src/third_party/llvm-libc/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git",
|
||||
"rev": "265cc6a83652bac5cb8ceb59741bc288ebe6b312",
|
||||
"hash": "sha256-yFp/1m0tPdMZAExu88DphqTklb2fVC2pLSE7SPU13aI="
|
||||
"rev": "3ea89f4304312567e31a8eb45e0737577e65b676",
|
||||
"hash": "sha256-g8ZtRI0yazHgli0/TMz/SeAJ5SoMZdir+/29GFQAczM="
|
||||
},
|
||||
"src/chrome/test/data/perf/canvas_bench": {
|
||||
"url": "https://chromium.googlesource.com/chromium/canvas_bench.git",
|
||||
@@ -72,18 +72,18 @@
|
||||
},
|
||||
"src/docs/website": {
|
||||
"url": "https://chromium.googlesource.com/website.git",
|
||||
"rev": "18d64b46a208ab5432e2a9a44f700ece50e8cc3e",
|
||||
"hash": "sha256-OxAlqEh0+yldlU5XQorwFtocTLJ0AjYRO8xwjN8PxyQ="
|
||||
"rev": "e9dfa88cee41c025709e79164ceb0758cfe76a67",
|
||||
"hash": "sha256-mWAwegdaC7LEOYN5Y/xcJBv4R9dInK4VW35/U8rn7Wg="
|
||||
},
|
||||
"src/media/cdm/api": {
|
||||
"url": "https://chromium.googlesource.com/chromium/cdm.git",
|
||||
"rev": "33c977516b3dfe5b065bc298aa74175e1999ab51",
|
||||
"hash": "sha256-GsaRxLnsz1jrFZ3m5tv65d1dioG23uJnmfa+WD7XcFc="
|
||||
"rev": "d6c4e1ea4c8fc3dcd98ac3ab5a981f63067223a4",
|
||||
"hash": "sha256-DnDeyVG+uEDBg4tA84rMBhLXy9hSpP8CX8f7Y34jLLg="
|
||||
},
|
||||
"src/net/third_party/quiche/src": {
|
||||
"url": "https://quiche.googlesource.com/quiche.git",
|
||||
"rev": "4729ceb221725bb52c6f4d48229d9c3ba059c36e",
|
||||
"hash": "sha256-ekGYdv1AiQLPGxN16hpJBn/jhtVrmZPcunO4wNRjSog="
|
||||
"rev": "1ba0d99a5c2fec4f4dbb7f98f251b05dcf4e2968",
|
||||
"hash": "sha256-odzVQD9WyldgAv8QRvXABKaSLy1DL6DRhdVQSer4HVM="
|
||||
},
|
||||
"src/testing/libfuzzer/fuzzers/wasm_corpus": {
|
||||
"url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git",
|
||||
@@ -92,8 +92,8 @@
|
||||
},
|
||||
"src/third_party/angle": {
|
||||
"url": "https://chromium.googlesource.com/angle/angle.git",
|
||||
"rev": "a17d6c8e92696bc78bcbdaf56fc197ebd0cc1fde",
|
||||
"hash": "sha256-lz8BqENfeHI31L1EOHWlCcE+tANVwuZVrqVDYXMjqQU="
|
||||
"rev": "736ed80c7552a4b267bd54a282b971aa4555cb3e",
|
||||
"hash": "sha256-3ZCIFT7j944HWPOiADQa88TQZctLej5vbrBFA/FwyHw="
|
||||
},
|
||||
"src/third_party/angle/third_party/glmark2/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
|
||||
@@ -107,13 +107,13 @@
|
||||
},
|
||||
"src/third_party/angle/third_party/VK-GL-CTS/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS",
|
||||
"rev": "06ae3bf12ae573de7144c5935505993a07fe69d3",
|
||||
"hash": "sha256-8HV3ieJS3P5cfAhVtJ+4bo2B6kR1wseO+qwhuAG8O5M="
|
||||
"rev": "3b7cbad78e93bcda20ccf68efae2d71695dd0f65",
|
||||
"hash": "sha256-bPgrkZ3my/tl+H2/YuAxmn83svPSw4l6lnz8zGHQtuk="
|
||||
},
|
||||
"src/third_party/anonymous_tokens/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git",
|
||||
"rev": "f5499d91ee1b8ab56b6d110e8e9a0d94c0a6eca7",
|
||||
"hash": "sha256-hKdtDbVKC4v0BFsuGouG/6f/4VK8M0yIMCPxHWw1ESk="
|
||||
"rev": "e07c92bc81cfd4203e6158cac115fc44c27b31b8",
|
||||
"hash": "sha256-NY/RkTCl/7KBJuIS6pa3sjdgyccWDrSfrUwBqWgL/4I="
|
||||
},
|
||||
"src/third_party/aria-practices/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/w3c/aria-practices.git",
|
||||
@@ -132,23 +132,23 @@
|
||||
},
|
||||
"src/third_party/dav1d/libdav1d": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git",
|
||||
"rev": "77ef66354d76a3c8aa4b11cde8093294fce23b0f",
|
||||
"hash": "sha256-YYFY2OYumhE7WMDr7DNfr+drqQAoNJRiYepbdRjhNRM="
|
||||
"rev": "54706fc6bc0cdecab7e9593974a4039cc038fca7",
|
||||
"hash": "sha256-L3a9MmPWJlxmRa19glWDLvkXHev5oiM5/fxtKOBPMxI="
|
||||
},
|
||||
"src/third_party/dawn": {
|
||||
"url": "https://dawn.googlesource.com/dawn.git",
|
||||
"rev": "29256ad98530582b82d1d6b76bae8354f1565e74",
|
||||
"hash": "sha256-7fh6g+xTrmqa1flbs2NTdiQiaj8N3LShIx3GeqqbZq0="
|
||||
"rev": "571752c9cb3ed36a3194854374984427794c4dda",
|
||||
"hash": "sha256-YMgRmVMXo1Ra5M034zij/ik/1aHpb3veK4VWsKHIwhI="
|
||||
},
|
||||
"src/third_party/dawn/third_party/glfw3/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
|
||||
"rev": "ed6452b13c76f7b4da216a9952bc7837aeb0f031",
|
||||
"hash": "sha256-bKhh53IG5k5UPEUbcjY5+Xv+/H/qnNdoW9CFWffozkA="
|
||||
"rev": "463cf73610d911e8eff95ae345143137cf610be4",
|
||||
"hash": "sha256-+WG+0KALV10B+1hOJzyiU4azlJIej/F5DtqtSkEN040="
|
||||
},
|
||||
"src/third_party/dawn/third_party/directx-shader-compiler/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler",
|
||||
"rev": "02e491eb019766b866bcf09c427365713353841b",
|
||||
"hash": "sha256-h70zf9zCWHxbdBloRETQBQJRDdF/zYVEE0wj2Iav5y8="
|
||||
"rev": "1f8a14aecd4f2f25991fa9f7aad6c320fea91409",
|
||||
"hash": "sha256-nesLgajCiFHwb2TKwzlCERFb6wOkwqpMT5z6nzj2Q9Y="
|
||||
},
|
||||
"src/third_party/dawn/third_party/directx-headers/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers",
|
||||
@@ -167,13 +167,23 @@
|
||||
},
|
||||
"src/third_party/dawn/third_party/webgpu-cts": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts",
|
||||
"rev": "663ea46471861e51f6a320e078a1fe39bf7f623e",
|
||||
"hash": "sha256-yPgQhVgy3atQtqBi/FPOMeZqoEyGOpSID4Fhh3zSLRE="
|
||||
"rev": "499044af47ec2717e06e644d0943e6fcdb3f3538",
|
||||
"hash": "sha256-M8TWqKdqoiZ01vbDpcRyPWIOaBPCPdSSflxcIpbYjFA="
|
||||
},
|
||||
"src/third_party/dawn/third_party/webgpu-headers/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers",
|
||||
"rev": "a11ef4462405c4506ad7284e5b1edeff2750bb54",
|
||||
"hash": "sha256-gEoyN14mN1Pkym/d4LtBe5hwV+3K+Ln3OXJVMfXf9lI="
|
||||
"rev": "b3f67b89929c133403fd95638be4ef96b56ddca0",
|
||||
"hash": "sha256-pLsvlbh1BCEtfQNejm2XilpelZmNg1/NuLq0agIGqQI="
|
||||
},
|
||||
"src/third_party/disarm/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/aengelke/disarm.git",
|
||||
"rev": "2d13d3f410a52daff1c5d8ef07d623332f372560",
|
||||
"hash": "sha256-uQC4EhF4ytsGzc5B0uaQKDmuVIGiPDPbY275yIeyWVE="
|
||||
},
|
||||
"src/third_party/fadec/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/aengelke/fadec.git",
|
||||
"rev": "c9f78f532b9004de278489019ab2c6c28ae9746e",
|
||||
"hash": "sha256-+4xVWPOeXrf8tgEQicoMKzBbz5XMB1H7sBfOBfwiDvs="
|
||||
},
|
||||
"src/third_party/highway/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/highway.git",
|
||||
@@ -192,13 +202,13 @@
|
||||
},
|
||||
"src/third_party/boringssl/src": {
|
||||
"url": "https://boringssl.googlesource.com/boringssl.git",
|
||||
"rev": "29e593e29165df578ab778269a1f04da2055c32f",
|
||||
"hash": "sha256-141WOYj1OLfQmrs7otUnwJmvGKnt0O3T3rH9q0exOZ0="
|
||||
"rev": "572a4c68475d284b34675f45ddbb9c158ef3c2ae",
|
||||
"hash": "sha256-gW+Ksd/boITK5ZTDIwhIgPAdPQNi8MvP7ru6qMdtorI="
|
||||
},
|
||||
"src/third_party/breakpad/breakpad": {
|
||||
"url": "https://chromium.googlesource.com/breakpad/breakpad.git",
|
||||
"rev": "9aebd3d8ef5a246deb2c929b5666aaba160ebce6",
|
||||
"hash": "sha256-dIEFfTWa/GazNcCY3gigcxPCljN8IFKaKhYhgqWaBm0="
|
||||
"rev": "69e9aada412e81575a95d0d94f4592fe1b8dfc15",
|
||||
"hash": "sha256-v0Qw8nlXR6Dnkbt7I0Fe7HKv9mtf/9h0xl4HaCHPJjA="
|
||||
},
|
||||
"src/third_party/cast_core/public/src": {
|
||||
"url": "https://chromium.googlesource.com/cast_core/public",
|
||||
@@ -207,8 +217,8 @@
|
||||
},
|
||||
"src/third_party/catapult": {
|
||||
"url": "https://chromium.googlesource.com/catapult.git",
|
||||
"rev": "c7282e69291240dbee993364a340934982443334",
|
||||
"hash": "sha256-kYmzjsjMDj96QBwpvZagsqsibouMx/q3UkuMFJd1jt4="
|
||||
"rev": "d810008022eeaefcbea50393ea5baa0930b27047",
|
||||
"hash": "sha256-H2CpevfSmr6suNHkkO97u0Nmu1n3g9v36ea+M8JPpZo="
|
||||
},
|
||||
"src/third_party/ced/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git",
|
||||
@@ -242,28 +252,28 @@
|
||||
},
|
||||
"src/third_party/cros_system_api": {
|
||||
"url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git",
|
||||
"rev": "14884f726cc15dfacbcde0f0aa7fd3fe8f44ba7e",
|
||||
"hash": "sha256-MTqcRpDJNltx2Jed4wn9L9vy7Oi+uMAzQlZhHIdh6UU="
|
||||
"rev": "54e5484f94e59fdc31e7821293692a8bb47f88a3",
|
||||
"hash": "sha256-TUW8y9as37owHYgg4mTs9ZUmZ4G+N1Njtrs6eyY5MDU="
|
||||
},
|
||||
"src/third_party/crossbench": {
|
||||
"url": "https://chromium.googlesource.com/crossbench.git",
|
||||
"rev": "09cc246dd2b3697225e8ee277628b9e890e37adb",
|
||||
"hash": "sha256-qHmQ9+kQ0C0IcqJJox2eN3WSZyKPdt7FCMccrBVrN80="
|
||||
"rev": "eb6e4790f4fc6f2f66a20aba07de9a58985db46b",
|
||||
"hash": "sha256-kEMKNDP57Q3m2eBjb0McScZTxrFpLTIE/9dSAupTOJ4="
|
||||
},
|
||||
"src/third_party/crossbench-web-tests": {
|
||||
"url": "https://chromium.googlesource.com/chromium/web-tests.git",
|
||||
"rev": "b5fd07ef7b048d8cf8cc59856db939173c4bb83e",
|
||||
"hash": "sha256-RC70rVFobg5NY8IU0bwd0taDZht9qVfDW7FuR0gnys0="
|
||||
"rev": "92d748acb154cb58c76ad1d509378d5aa8669755",
|
||||
"hash": "sha256-vh6uX1jXhxDgqfXnme/nh8W+O4Qq+Fx33lSQ08LNunM="
|
||||
},
|
||||
"src/third_party/depot_tools": {
|
||||
"url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git",
|
||||
"rev": "94e89b10b92cc9d6e58fc8d1b6474b7d29e8a114",
|
||||
"hash": "sha256-2kfg2f5lamTyq0BMEt5LGuc4BW07Zx+Z9hZCErTVuUs="
|
||||
"rev": "38c391feba5fb96812f9028da12413ffc39df394",
|
||||
"hash": "sha256-yOd+k4GJ/unOVCm2Fj1oDHOMKV87CuBO/z0li3owNQk="
|
||||
},
|
||||
"src/third_party/devtools-frontend/src": {
|
||||
"url": "https://chromium.googlesource.com/devtools/devtools-frontend",
|
||||
"rev": "3edf00b60c60c9248990a39a702ca4882809fe06",
|
||||
"hash": "sha256-14qm+rI536GCqNkd9umSpJ9JoXf/47wuknJsVUb3ty0="
|
||||
"rev": "941348cf79c423892e1c7c219091a7103d18a68b",
|
||||
"hash": "sha256-/b+NCAr1jRJd/Uq4Cf5aO/yTdNP00ImIWuSJ4aP+TEw="
|
||||
},
|
||||
"src/third_party/dom_distiller_js/dist": {
|
||||
"url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
|
||||
@@ -277,8 +287,8 @@
|
||||
},
|
||||
"src/third_party/eigen3/src": {
|
||||
"url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git",
|
||||
"rev": "3fccdcd589b11da58e5e5d87c9f1f537c7c642f6",
|
||||
"hash": "sha256-4cXU5J7LBAMxnqC9GyX85dcuL7pNJPCl4jpCpmzQOWE="
|
||||
"rev": "d53ac33805ba0a23fa139adaf24227fb6707e6fa",
|
||||
"hash": "sha256-+s/4HVUzKJR5OVcoxwiEzB8F89lov24g0HBPg3tp9Xs="
|
||||
},
|
||||
"src/third_party/farmhash/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git",
|
||||
@@ -297,8 +307,8 @@
|
||||
},
|
||||
"src/third_party/ffmpeg": {
|
||||
"url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git",
|
||||
"rev": "ad41607c61898cf7150e0fb20fe4bbabd44922a3",
|
||||
"hash": "sha256-41qpsOTedB51WMzzHXDiXA19OIzA7wG/Qgbz6IkmWpk="
|
||||
"rev": "2b68d2babae73714846961fb0ee47e3b3d2e39a9",
|
||||
"hash": "sha256-Bl8lAM5sHLZ9BHSIaWr5+P/8s014SXsgSmdLya5gd64="
|
||||
},
|
||||
"src/third_party/flac": {
|
||||
"url": "https://chromium.googlesource.com/chromium/deps/flac.git",
|
||||
@@ -312,8 +322,8 @@
|
||||
},
|
||||
"src/third_party/fontconfig/src": {
|
||||
"url": "https://chromium.googlesource.com/external/fontconfig.git",
|
||||
"rev": "d62c2ab268d1679335daa8fb0ea6970f35224a76",
|
||||
"hash": "sha256-Oo4ewK86dbEkO5EXyGWvdmsPHa8Wk1BHQah784vIem0="
|
||||
"rev": "b707078e6e8bb6fd115e2080e69b3194c05e4f1c",
|
||||
"hash": "sha256-8kCxPpJgVtZryhtTUG/36oo8mlDiKmWALGUxMDQ+wOQ="
|
||||
},
|
||||
"src/third_party/fp16/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git",
|
||||
@@ -327,8 +337,8 @@
|
||||
},
|
||||
"src/third_party/freetype/src": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git",
|
||||
"rev": "12f5eb32aedb3e27d47c22b0447dc4363703ed94",
|
||||
"hash": "sha256-CXkHYz+xFSnClEjLqE5WlJQriHrdRZ/P7/15AtUiFCw="
|
||||
"rev": "656cb777798fa420a13faba3758779e9ed6c4798",
|
||||
"hash": "sha256-i1X/ETNJTAL3A5pOiUcZRYpqjhPvZIm8FG1HMQreW6g="
|
||||
},
|
||||
"src/third_party/fxdiv/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git",
|
||||
@@ -337,13 +347,13 @@
|
||||
},
|
||||
"src/third_party/harfbuzz/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git",
|
||||
"rev": "511df88b82e697cd2a0f1f0635787aa0b18bddbb",
|
||||
"hash": "sha256-wEOux4PN+3/IhTp55bTGjkQEl0I5VoQ/NWrkdzTWiKg="
|
||||
"rev": "28f4dc622fef010dab12f4275ac195b5d4a4a704",
|
||||
"hash": "sha256-wqycfs0TITlLu0iJICjAqSX82u8LGrr/NaZ+pgPvycs="
|
||||
},
|
||||
"src/third_party/ink/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/ink.git",
|
||||
"rev": "e959d434fa1e4965c72799b80c1431f1e9ad2dcd",
|
||||
"hash": "sha256-t5cO3YKV6FiLrp+Av4tnDhfcBAfP4sATGJW4BmBu0+Q="
|
||||
"rev": "e781093cb91ad22a666f1880f5122fe2ed30ecfd",
|
||||
"hash": "sha256-j9FIfGrrNEQB3wI2zMvjUksLBEdx8yrVf1NAbJSyjAI="
|
||||
},
|
||||
"src/third_party/instrumented_libs": {
|
||||
"url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git",
|
||||
@@ -357,8 +367,8 @@
|
||||
},
|
||||
"src/third_party/oak/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/project-oak/oak.git",
|
||||
"rev": "96c00a6c99ac382f3f3a8f376bc7a70890d1adaa",
|
||||
"hash": "sha256-+ouwII+i5CbWoJ3NAxQPmczofzkPwtZTtjIPaXyyXt8="
|
||||
"rev": "e6c31df79a45e4ad6e25a85872622822c48d7e66",
|
||||
"hash": "sha256-O8eRirwsYi68wydxhy/+KD6IFmMmmNq/EPnJTJZFjvs="
|
||||
},
|
||||
"src/third_party/ots/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git",
|
||||
@@ -367,8 +377,8 @@
|
||||
},
|
||||
"src/third_party/libgav1/src": {
|
||||
"url": "https://chromium.googlesource.com/codecs/libgav1.git",
|
||||
"rev": "9b9ac8689588b245fb1ab6ce5a61c0aaaf81dc91",
|
||||
"hash": "sha256-g2fM5AD6x7njzy6mEQVetru7IYbVj7urLaNZBISSJwc="
|
||||
"rev": "c1deec657b32b911920c78e078cfd089faa77200",
|
||||
"hash": "sha256-HV9Ob0UywJcJD9+crmPmZmx8rJMomJQU0KZbCxBg5Ww="
|
||||
},
|
||||
"src/third_party/googletest/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/googletest.git",
|
||||
@@ -387,13 +397,13 @@
|
||||
},
|
||||
"src/third_party/nlohmann_json/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/nlohmann/json.git",
|
||||
"rev": "75d9166a68355d2cd5a98bfd1a75a3a3dae8f071",
|
||||
"hash": "sha256-t+ygFLws+E4D0Avia7swt4wruaDFaAT6shN6tl92q8k="
|
||||
"rev": "3565f40229515411177c196ec912a06307802ed6",
|
||||
"hash": "sha256-kngBPCN5i+5kzJ95pJ5vY2RLa9P4JYs4e+7Qn3QWsc4="
|
||||
},
|
||||
"src/third_party/jsoncpp/source": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git",
|
||||
"rev": "b5ab350ff38ed25fa5b6e0dc30820f2215cad345",
|
||||
"hash": "sha256-VvHdQkp7JZrcWca513oLG8sa+NOjW12Z6hi0cVHCMsQ="
|
||||
"rev": "edc01ab10f52135ec80e3589b6b4e0a9c65b27fd",
|
||||
"hash": "sha256-mdQo7AiS3DzTF8CqCRT9oL60AzGLQCFng7KUFaFEBIM="
|
||||
},
|
||||
"src/third_party/leveldatabase/src": {
|
||||
"url": "https://chromium.googlesource.com/external/leveldb.git",
|
||||
@@ -402,18 +412,18 @@
|
||||
},
|
||||
"src/third_party/libFuzzer/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git",
|
||||
"rev": "4b46c0ed586f91aa1ad9b5ebbcad907c9dd956e5",
|
||||
"hash": "sha256-xXHjGaNlp47bZnTOVZcwNrb1O16MSMJg9YE7AFSfGWY="
|
||||
"rev": "3f386be62e362fa50284ebd24262966f1a93798e",
|
||||
"hash": "sha256-vQBWi+4ynPBhZma/2+ApbhT9tbOCd8U+QrabC8GnqKQ="
|
||||
},
|
||||
"src/third_party/fuzztest/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git",
|
||||
"rev": "1a18c86d947c25ff2b73562a90d41a2207e8cba9",
|
||||
"hash": "sha256-e3YahhYNt/y30uEPhHMvbz7tIve14ciYdM3sO56cRYg="
|
||||
"rev": "239bf6cc1ffcbad7d5c96e3b836b474654cbf96c",
|
||||
"hash": "sha256-h268YPbMTgr5zd0bhTh1Xj/BcCxBhDD60o6+oelW/BQ="
|
||||
},
|
||||
"src/third_party/domato/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git",
|
||||
"rev": "053714bccbda79cf76dac3fee48ab2b27f21925e",
|
||||
"hash": "sha256-fYxoA0fxKe9U23j+Jp0MWj4m7RfsRpM0XjF6/yOhX1I="
|
||||
"rev": "fadff396cc45d521cc594d3e2396e27e887b1963",
|
||||
"hash": "sha256-5hs+IRwCYA4hSKMzJ9NjW1DSW5YZN5bcHEcNAnfAfac="
|
||||
},
|
||||
"src/third_party/libaddressinput/src": {
|
||||
"url": "https://chromium.googlesource.com/external/libaddressinput.git",
|
||||
@@ -422,13 +432,13 @@
|
||||
},
|
||||
"src/third_party/libaom/source/libaom": {
|
||||
"url": "https://aomedia.googlesource.com/aom.git",
|
||||
"rev": "b973895c4c1e93f770433258ece300344f744964",
|
||||
"hash": "sha256-6w66nlUkL88c3M7YB6I7nLYwpBxbjbfqcmmrrueN8/8="
|
||||
"rev": "d08a82575de50dc99f3b3d324e7b8304836fe0ef",
|
||||
"hash": "sha256-32WklYoVgBiMxnY+2nOckwmKjZBKZtgwKBmStoO8y/Q="
|
||||
},
|
||||
"src/third_party/crabbyavif/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git",
|
||||
"rev": "ef606847911d4968b80f778135d3528bf4041b74",
|
||||
"hash": "sha256-yThyl7Ec0JqxBWRqZ2C9euw3RVrky1lLt1YONBJTnRI="
|
||||
"rev": "61f5abadda7b179f90e557fed6ae7a3d78bd8231",
|
||||
"hash": "sha256-N9YwO68d3CXPje43fWs9CoO5Sc3wIULta7n8cp+2Efs="
|
||||
},
|
||||
"src/third_party/nearby/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git",
|
||||
@@ -512,8 +522,8 @@
|
||||
},
|
||||
"src/third_party/libphonenumber/src": {
|
||||
"url": "https://chromium.googlesource.com/external/libphonenumber.git",
|
||||
"rev": "5f4c9f039934e2d56fb71c17bdf43d4ceb78fdbf",
|
||||
"hash": "sha256-350wPwBWEgBDiAttVFPR9NC30JKtiqGeMZ9sMXjWlXY="
|
||||
"rev": "eee81630a337b9045c6db4577cf60bb1a2c6cbd1",
|
||||
"hash": "sha256-voK+aAFzFGTXg6UVprNiD5Mbh6hW75EKbtzqIjPsxI0="
|
||||
},
|
||||
"src/third_party/libprotobuf-mutator/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git",
|
||||
@@ -537,8 +547,8 @@
|
||||
},
|
||||
"src/third_party/libvpx/source/libvpx": {
|
||||
"url": "https://chromium.googlesource.com/webm/libvpx.git",
|
||||
"rev": "91bba32d5cebc0c132bafa78f937643aa41bb7e5",
|
||||
"hash": "sha256-YK/TbAjNjsyWlvk2z+X2GbcVk16JWGEwAoEnwYsFxeQ="
|
||||
"rev": "ade52487a37ef76a0f209bd39bea9fe67d6db4c4",
|
||||
"hash": "sha256-Ke28x3c0Ssg2GFfHmFlfW8fex3jSuBcN0e6PXzH0b5g="
|
||||
},
|
||||
"src/third_party/libwebm/source": {
|
||||
"url": "https://chromium.googlesource.com/webm/libwebm.git",
|
||||
@@ -552,8 +562,8 @@
|
||||
},
|
||||
"src/third_party/libyuv": {
|
||||
"url": "https://chromium.googlesource.com/libyuv/libyuv.git",
|
||||
"rev": "8aeb3a9ca36341a640528e59b34b5d641080dca8",
|
||||
"hash": "sha256-FGl0xK7ooaRFzFBxuV6oOu3h1x2b/myLLO2En3xgVCk="
|
||||
"rev": "26e56be0f984af3dae4d0c0ab7a0bac8ac20e1b0",
|
||||
"hash": "sha256-Ievf2MXM7VX9+R85N3i2W+1jZSbt5mvy1SCNc0iqJYw="
|
||||
},
|
||||
"src/third_party/lss": {
|
||||
"url": "https://chromium.googlesource.com/linux-syscall-support.git",
|
||||
@@ -570,6 +580,11 @@
|
||||
"rev": "9d21b5cb5896c0cde186b54d430131f9f537104c",
|
||||
"hash": "sha256-uzdoA4yBp3ZIHYtW/OsxfNwxtxKFo+V9jx3u3MEkrV8="
|
||||
},
|
||||
"src/third_party/pipewire/src": {
|
||||
"url": "https://chromium.googlesource.com/external/gitlab.freedesktop.org/pipewire/pipewire.git",
|
||||
"rev": "b741e0c74f5436f0c925f7741140db0efd32cf4e",
|
||||
"hash": "sha256-sxS6+LtvpEWCKoKLDUSYkW4+rrcIXPjWPBglReIDh/k="
|
||||
},
|
||||
"src/third_party/nasm": {
|
||||
"url": "https://chromium.googlesource.com/chromium/deps/nasm.git",
|
||||
"rev": "525a09a813be0f75b646ee93fc2a31c27b87d722",
|
||||
@@ -602,13 +617,13 @@
|
||||
},
|
||||
"src/third_party/pdfium": {
|
||||
"url": "https://pdfium.googlesource.com/pdfium.git",
|
||||
"rev": "c01585b18e5b7492a5ecfc9b179af023a560455e",
|
||||
"hash": "sha256-wU8qxIM8ktbrmTCe4wGB9Hfl643BHcJrByNTLXRmd5k="
|
||||
"rev": "8f3e90282ef137adf7d380079c3178b24407104a",
|
||||
"hash": "sha256-4OhJcWZJ3UC/Mf4DJNzLLYQtrw0y0suO/wy0d1GYP4w="
|
||||
},
|
||||
"src/third_party/perfetto": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git",
|
||||
"rev": "ec4b996c753b3e301b183736f54566239b0df68d",
|
||||
"hash": "sha256-2tv43yeasCuUgr4JnTz58x31Zq4M56xJUozp8uZVbTI="
|
||||
"rev": "9c7ce42050379be8c24a270f395e00c7347965cb",
|
||||
"hash": "sha256-wbHdFhzbOP98IOQnXyUWDQtjt/nOD4VABSyvErhLBI4="
|
||||
},
|
||||
"src/third_party/protobuf-javascript/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript",
|
||||
@@ -642,13 +657,13 @@
|
||||
},
|
||||
"src/third_party/ruy/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/ruy.git",
|
||||
"rev": "2af88863614a8298689cc52b1a47b3fcad7be835",
|
||||
"hash": "sha256-4To1BMUgzj2/sV7USN9W0CgHnpRmaktEspfhwWWeVBc="
|
||||
"rev": "2264753777198e4393fb83c44c693462d57a2be1",
|
||||
"hash": "sha256-ZzkeS9ujkcFxtBQW+IWLXUYBF79N2jBw1CLyyn70/64="
|
||||
},
|
||||
"src/third_party/search_engines_data/resources": {
|
||||
"url": "https://chromium.googlesource.com/external/search_engines_data.git",
|
||||
"rev": "b4f28b2133e46ebbb5483ea53d9cd4b533594531",
|
||||
"hash": "sha256-KAMu3FteZgN8nmj1rToFbiLNM/CPfU+9AJ84poMSkmI="
|
||||
"rev": "cf814b5cc732a437b4ee636f1c7907f8f1ced51a",
|
||||
"hash": "sha256-koTwcthcJn3a4XH+rY+E3z4uvWbv+1yuX9qkcqu5t5A="
|
||||
},
|
||||
"src/third_party/sframe/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/cisco/sframe",
|
||||
@@ -657,8 +672,8 @@
|
||||
},
|
||||
"src/third_party/skia": {
|
||||
"url": "https://skia.googlesource.com/skia.git",
|
||||
"rev": "7ad44b72c93c242f96f2563edb566439fe816c0a",
|
||||
"hash": "sha256-hCMg8otfjZU/zzlLZT4ywLFAU1HbXymSTqr7BfQcu5E="
|
||||
"rev": "b6d106297ff9ef2ff8094033695d045e87775581",
|
||||
"hash": "sha256-sun/P/JVhTKfRwmVK5dgnz8UZEFnQoyXZZS6PN5z9us="
|
||||
},
|
||||
"src/third_party/smhasher/src": {
|
||||
"url": "https://chromium.googlesource.com/external/smhasher.git",
|
||||
@@ -672,8 +687,8 @@
|
||||
},
|
||||
"src/third_party/sqlite/src": {
|
||||
"url": "https://chromium.googlesource.com/chromium/deps/sqlite.git",
|
||||
"rev": "fc121d7d03cd6cbf499ec06a5112b263471b1181",
|
||||
"hash": "sha256-hf9PxQhXEKT49GbkFYCvRPBT0Qu+hDnDpebI92yO1Oo="
|
||||
"rev": "0a5fe1b18a5b651b6c4c90d397e3d0b8061f73fb",
|
||||
"hash": "sha256-y+lJK8Qi22KUcYyY62x9xCXej85on9e0FxySaMNSYPY="
|
||||
},
|
||||
"src/third_party/swiftshader": {
|
||||
"url": "https://swiftshader.googlesource.com/SwiftShader.git",
|
||||
@@ -687,23 +702,23 @@
|
||||
},
|
||||
"src/third_party/tflite/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git",
|
||||
"rev": "66fe77c30816f9c0a503fb9f2f12fdb56c6eee76",
|
||||
"hash": "sha256-1m9caGzYfg1ISFzra6BEDhWEHkmqMrzo0P1mvf6JfT8="
|
||||
"rev": "7bedf2e94aff6ca62150d74fd40aa63cb73c6583",
|
||||
"hash": "sha256-Uv1SbtjalHt7XLAcvOfiycgepDrEK8/JdpD3GPK1MNo="
|
||||
},
|
||||
"src/third_party/litert/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google-ai-edge/LiteRT.git",
|
||||
"rev": "ee121300b37b49cd4f9942c0f1256936aa9e611a",
|
||||
"hash": "sha256-D4lNgq9YvCuajK2qfHVJzQ54BPShna0EkTEDw43J5/g="
|
||||
"rev": "1ae23176dd5d3a43e35961d8236d5adda7f8c0a1",
|
||||
"hash": "sha256-xcCqZA8BKZG/TV/fAUAWPOoZwSQkRDATlhE6A05PyX0="
|
||||
},
|
||||
"src/third_party/vulkan-deps": {
|
||||
"url": "https://chromium.googlesource.com/vulkan-deps",
|
||||
"rev": "285f3b19c49c06a71994a664567418504d5367d9",
|
||||
"hash": "sha256-UZ6eGC1Zwx3ysDeTa1YPnjQ29GuDDqxfbvQsPFSQsvc="
|
||||
"rev": "9bf18397113dbdc7adf4f76408df7f79d4ad141a",
|
||||
"hash": "sha256-ol8SSAFHrEfsKWUmg64klpFFXIlZU4gyibENmzZD454="
|
||||
},
|
||||
"src/third_party/glslang/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang",
|
||||
"rev": "ce138e2c2d6992b31ff4cd2e955904637785a881",
|
||||
"hash": "sha256-zJ+612mODx6ptEWXzf1Q1WFSlgSTEoWaXlD07v1Z1yI="
|
||||
"rev": "8292684e941bf22583b257bd9dfe47daccacb665",
|
||||
"hash": "sha256-1D971MPCHr8vnj31IFUwe1s+X3UAabxYUQ1Cd/VyqDA="
|
||||
},
|
||||
"src/third_party/spirv-cross/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross",
|
||||
@@ -712,43 +727,43 @@
|
||||
},
|
||||
"src/third_party/spirv-headers/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers",
|
||||
"rev": "daa093dd29aab8cbb6562b808370562f56e399fb",
|
||||
"hash": "sha256-2xYphq6uMRlPaaaVSiwqPrWRkCfyOMjeJcWewRja/WY="
|
||||
"rev": "29981f65241605e08b0ede4cfeb999fe3b723c6a",
|
||||
"hash": "sha256-tGY4H3+5p9M5LBK/xxRdMT9CX+qq3e7fPkaftnpjU9I="
|
||||
},
|
||||
"src/third_party/spirv-tools/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools",
|
||||
"rev": "d5bbf95d87dd6d2694fbf09acfb42a00c93575e8",
|
||||
"hash": "sha256-VGq4LDVzCj2KG14YIio//kE0/d3fUyuaPb4pg/GbsXc="
|
||||
"rev": "a665e21f3061f34064b39937cf00fe8d8769f4ef",
|
||||
"hash": "sha256-4m/xdMk/r4C5zdU/CZzdoXtRN0MWs8pN5QUPI5Ej3+w="
|
||||
},
|
||||
"src/third_party/vulkan-headers/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers",
|
||||
"rev": "d2d8ded679e53c9f27c0c7a18750e661745886eb",
|
||||
"hash": "sha256-d/3CSWsu5ttwLlG4bSnJ+47vvQSkZVeKSjhEP139rn0="
|
||||
"rev": "d314eae73fdc90847bb8304a86ee7c6a8ee023b6",
|
||||
"hash": "sha256-YU51vfV/8vQqVTngS2SRHKXpgxU/5IJ+jAT5pcYUcpw="
|
||||
},
|
||||
"src/third_party/vulkan-loader/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader",
|
||||
"rev": "0d210fdf88a81b0e833096079f73dda477da62f8",
|
||||
"hash": "sha256-FTv0TIZhWNhczuzq5/H09P4e61JkrrRQTcYOBvt7vDU="
|
||||
"rev": "59a70594de4559fd3aed73fe8ac2d6c48ca002d4",
|
||||
"hash": "sha256-M/gm3fkCcFZJyslWCO/v2DzuavTOfvvKvx+0bNihEqs="
|
||||
},
|
||||
"src/third_party/vulkan-tools/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools",
|
||||
"rev": "b7ae55b37cda76d16368c302f37cb0c7ea2f8409",
|
||||
"hash": "sha256-FADvu38L8F52pGlC0kDRlqaN4FnIlgLggv2hsQ5YuqU="
|
||||
"rev": "286299bb6b732e4b22771cfb9d7d421542d40501",
|
||||
"hash": "sha256-kbySCu2c5nh6icnPQV6qplfg1gHFnGPEYOG6G6TG8EU="
|
||||
},
|
||||
"src/third_party/vulkan-utility-libraries/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries",
|
||||
"rev": "ba450228e2ebb4059f8a7d4bb36610464e2f0741",
|
||||
"hash": "sha256-gETVlFG3sj/sp+0SA4nY4HwVPpk129MIstMrM2fUlnM="
|
||||
"rev": "e9585c3e3d41ab608ee3b098ce4721d357308fc8",
|
||||
"hash": "sha256-WcSiUe3vB7zUO0vpqcVJkKqhnZXz76ApWaoMO49efXg="
|
||||
},
|
||||
"src/third_party/vulkan-validation-layers/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers",
|
||||
"rev": "cf9b84986ad6f29b73e781be7e55535adfe3b680",
|
||||
"hash": "sha256-xKCChjPpLlWoiWLt2H+t6VmE3brl2P+Y3fTZausO8Ps="
|
||||
"rev": "11079f041fa85ec27c40c4ef2d63531138a2ab98",
|
||||
"hash": "sha256-1lG6shUQRKXtojLHwfZD6gDz5yVnNoVp6BHMyUz70Co="
|
||||
},
|
||||
"src/third_party/vulkan_memory_allocator": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
|
||||
"rev": "7e55b011e16182fc349149abbd3aaf3b1db46421",
|
||||
"hash": "sha256-fOnFkcQDEGIe5yB507qnP9nA1LBBPFblncNiJ8JxAwI="
|
||||
"rev": "82a9d47e4f9d91f0e32d2b6acd9714fcee1933a0",
|
||||
"hash": "sha256-cllZTX7WHoVNugE0efOfY71y8BJg+8w/MI9EDHaVswM="
|
||||
},
|
||||
"src/third_party/wayland/src": {
|
||||
"url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git",
|
||||
@@ -777,13 +792,13 @@
|
||||
},
|
||||
"src/third_party/webgl/src": {
|
||||
"url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git",
|
||||
"rev": "216b10fafd3f6a900c715a8c758a4c7f9883b030",
|
||||
"hash": "sha256-Aax2hr/9Zq6Avk+TMU1OMBLGshUL6hyRTX6eoOQesqM="
|
||||
"rev": "064aaf18207438d4f6dd10c98b02b25778257b7f",
|
||||
"hash": "sha256-1B0qHufnOreV7z6TAQggfX5l8TeLq2NgQg0a5Cr0Q3M="
|
||||
},
|
||||
"src/third_party/webgpu-cts/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git",
|
||||
"rev": "663ea46471861e51f6a320e078a1fe39bf7f623e",
|
||||
"hash": "sha256-yPgQhVgy3atQtqBi/FPOMeZqoEyGOpSID4Fhh3zSLRE="
|
||||
"rev": "499044af47ec2717e06e644d0943e6fcdb3f3538",
|
||||
"hash": "sha256-M8TWqKdqoiZ01vbDpcRyPWIOaBPCPdSSflxcIpbYjFA="
|
||||
},
|
||||
"src/third_party/webpagereplay": {
|
||||
"url": "https://chromium.googlesource.com/webpagereplay.git",
|
||||
@@ -797,13 +812,13 @@
|
||||
},
|
||||
"src/third_party/webrtc": {
|
||||
"url": "https://webrtc.googlesource.com/src.git",
|
||||
"rev": "f20ebb8adbf4fa781830e4384c61f732bd28a217",
|
||||
"hash": "sha256-r6slVo1WGITEXqyu8iMrV6Pyo3giJkxBbrmJdGLooRc="
|
||||
"rev": "6f37672d358475cd17544121a12494da454d85fb",
|
||||
"hash": "sha256-c0h6bD8zNZbacnOgRei+yVB+5+AvfglW+eQDNZU945M="
|
||||
},
|
||||
"src/third_party/wuffs/src": {
|
||||
"url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
|
||||
"rev": "50869df0ea703b4f41b238bfe26aec6ec9c86889",
|
||||
"hash": "sha256-V7inWJqH7Q4Ac/ZB//7XHrpgfAYUPBxWBerBem6Q/Kk="
|
||||
"rev": "7411f488fe2e2c205c3d3b3d28638b7356522930",
|
||||
"hash": "sha256-AMuAaCbNJYnSeac1B1IRSUh4rlE2KphT04/Ak4Pig5M="
|
||||
},
|
||||
"src/third_party/weston/src": {
|
||||
"url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git",
|
||||
@@ -812,8 +827,8 @@
|
||||
},
|
||||
"src/third_party/xnnpack/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git",
|
||||
"rev": "4b7c368f5e48d9292c5834593c2f83e66b55ce83",
|
||||
"hash": "sha256-EJ118E6awFO+yW8FkzlaBWVCkwduK1X/j/Evuzka+8k="
|
||||
"rev": "09c4a9137f3a19b053dc45724a62f4f73ec7746a",
|
||||
"hash": "sha256-eoS9qQ1hOJJBw6RQ2mTyRQb/AaAj8XnFbtqPpAb99y4="
|
||||
},
|
||||
"src/third_party/libei/src": {
|
||||
"url": "https://chromium.googlesource.com/external/gitlab.freedesktop.org/libinput/libei.git",
|
||||
@@ -827,13 +842,13 @@
|
||||
},
|
||||
"src/v8": {
|
||||
"url": "https://chromium.googlesource.com/v8/v8.git",
|
||||
"rev": "4b407bc23f23059b1019cde542601c2cf8f70eb2",
|
||||
"hash": "sha256-TB1A+iIyZOdlbHvim1JOaXOf9uQnoAYqbUL2+PFKUcs="
|
||||
"rev": "6aacaf6256a069ee455142333b7d38cad1c8d6e0",
|
||||
"hash": "sha256-1NX4HP/BIJ6bWxoF42K89X8ADHuHjA5akkOL/WkIeME="
|
||||
},
|
||||
"src/agents/shared": {
|
||||
"url": "https://chromium.googlesource.com/chromium/agents.git",
|
||||
"rev": "aa733bca85501395a2854a1e86084aa707704c3e",
|
||||
"hash": "sha256-SORAKZ5ZVaXH8FuajaVa7mRM4VIvmmKlDXYzyy1iqlU="
|
||||
"rev": "559f135fc214d637f85174c6be7010804e31f1e5",
|
||||
"hash": "sha256-/PhF9Pc8wPx+TLABd3yD218TfEatBySazVci1Wc+9e4="
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
diff --git b/third_party/dawn/src/utils/BUILD.gn a/third_party/dawn/src/utils/BUILD.gn
|
||||
index b9f0be693eea5aacdac6f7940642a29e0205c7a9..ed7ad3b6d3de1336c7c89cb18d4b6e4359205417 100644
|
||||
--- b/third_party/dawn/src/utils/BUILD.gn
|
||||
+++ a/third_party/dawn/src/utils/BUILD.gn
|
||||
@@ -218,8 +218,6 @@ config("dawn_warnings") {
|
||||
# the analysis pass.
|
||||
"-Wno-lifetime-safety",
|
||||
"-Wno-lifetime-safety-all",
|
||||
- "-Xclang=-fno-lifetime-safety-inference",
|
||||
- "-Xclang=-fno-experimental-lifetime-safety-tu-analysis",
|
||||
]
|
||||
|
||||
# P3. Checks that could be nice but probably don't help with hardening.
|
||||
@@ -0,0 +1,31 @@
|
||||
diff --git a/components/cbor/BUILD.gn b/components/cbor/BUILD.gn
|
||||
index 91fbfffd3c143..d87ef0d404b20 100644
|
||||
--- a/components/cbor/BUILD.gn
|
||||
+++ b/components/cbor/BUILD.gn
|
||||
@@ -12,7 +12,7 @@ buildflag_header("buildflags") {
|
||||
# TODO(crbug.com/535682335): Remove `USE_CBOR_RUST` buildflag entirely,
|
||||
# unconditionally enable Rust CBOR parser, and drop `is_cronet_build` check
|
||||
# once Cronet supports Crubit dependencies.
|
||||
- flags = [ "USE_CBOR_RUST=!$is_cronet_build" ]
|
||||
+ flags = [ "USE_CBOR_RUST=$enable_cpp_api_from_rust" ]
|
||||
}
|
||||
|
||||
component("cbor") {
|
||||
@@ -37,7 +37,7 @@ component("cbor") {
|
||||
"//base",
|
||||
]
|
||||
|
||||
- if (!is_cronet_build) {
|
||||
+ if (enable_cpp_api_from_rust) {
|
||||
public_deps = [
|
||||
"//build/rust/crubit",
|
||||
"//components/cbor/rust:cbor_rust_bindings",
|
||||
@@ -63,7 +63,7 @@ source_set("unit_tests") {
|
||||
"//testing/gtest",
|
||||
"//third_party/fuzztest",
|
||||
]
|
||||
- if (!is_cronet_build) {
|
||||
+ if (enable_cpp_api_from_rust) {
|
||||
deps += [ "//components/cbor/rust:cbor_rust_unittests" ]
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -9,10 +9,10 @@
|
||||
|
||||
buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "154.0";
|
||||
version = "154.0.1";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "a77cd664982add628681167ef5939bd6bf0c894aa380cca66f9b5fb265947874d1e819d42264f1dd07c843f8a6dc020da268cca9ff1e064fca019de91af9b996";
|
||||
sha512 = "9141e34978c2ecbe1b267b3cc63136142625734618e67cbbbf6536e1427af66d01f19851200eba0db7c715991f39e7d5d0200abb9e2cd7c15d58a8a411b1b412";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -1,138 +1,138 @@
|
||||
{
|
||||
"images-calico-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-calico.linux-amd64.tar.gz",
|
||||
"sha256": "f2341239b5fd73f2b07b074d88c7b34334a808684462f4a6e70fa27591e479a7"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-calico.linux-amd64.tar.gz",
|
||||
"sha256": "b96aefa4fbf96dc0b5cb082149b284a73b2e5ffc65d301470c8be50d6e24171a"
|
||||
},
|
||||
"images-calico-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-calico.linux-amd64.tar.zst",
|
||||
"sha256": "8b91f83ee480ae60cc85601e150a2bf412531763ab8e2eaab0b0e4cefa1a83a5"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-calico.linux-amd64.tar.zst",
|
||||
"sha256": "1ff5a5b1cdb4146dadf2e6496f2234999b441c178e4b49018c49fa1215f48619"
|
||||
},
|
||||
"images-calico-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-calico.linux-arm64.tar.gz",
|
||||
"sha256": "4fdf2f4bc634c60e6503c7ddd52042baa2d65570a8a0a41eb883bd34920e6766"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-calico.linux-arm64.tar.gz",
|
||||
"sha256": "35841cab143b72339f60a3b7ffd5135bea57ba44c88daf066648a9189f904a4f"
|
||||
},
|
||||
"images-calico-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-calico.linux-arm64.tar.zst",
|
||||
"sha256": "dacd942276d2ffe8487bee4f7ff8df1522b935eed4eef2cae89f260580eb3305"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-calico.linux-arm64.tar.zst",
|
||||
"sha256": "ceb7630706258aade56b68f90f6d64fcf5f7a6472d54b4b97af1bd8265458df3"
|
||||
},
|
||||
"images-canal-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-canal.linux-amd64.tar.gz",
|
||||
"sha256": "a3e0c2e05174839fe3e66639afa40bb96466a09e60fb73ec15685d1628f96191"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-canal.linux-amd64.tar.gz",
|
||||
"sha256": "1e0a7b2a0861f6b27c3fab39431892ceddd42db5aa5a1f5cfd6ca5cab1e411f7"
|
||||
},
|
||||
"images-canal-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-canal.linux-amd64.tar.zst",
|
||||
"sha256": "3a7828ce0143c3eb91cae940cebdfa0145960e91be056e88a8b077ee39ccc54d"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-canal.linux-amd64.tar.zst",
|
||||
"sha256": "9e89572eb2a5958b456dc1ca418bdbdbd694a176dd2cf41e6df55fe0488156ba"
|
||||
},
|
||||
"images-canal-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-canal.linux-arm64.tar.gz",
|
||||
"sha256": "d86eb346ca1db9ab0efaaf5b4c3418cc096ffd476d2c57f9d4a98a3bab06ef32"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-canal.linux-arm64.tar.gz",
|
||||
"sha256": "56d2d64e2ffd0e646b6080c604e892852e7c55b840f7775dd212d64c9e125a0f"
|
||||
},
|
||||
"images-canal-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-canal.linux-arm64.tar.zst",
|
||||
"sha256": "63b0888d1adebb72a77c2d1f1eb1ced1519cfdeb57681026a94c1f53f87f5610"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-canal.linux-arm64.tar.zst",
|
||||
"sha256": "3ce45e29db6ef82e475477dd1e4e58049917ffaef7e21b1d7c87b78a10864c48"
|
||||
},
|
||||
"images-cilium-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-cilium.linux-amd64.tar.gz",
|
||||
"sha256": "fd6f6e0051f68efd21425364f17156d58f605063f562069fddf398e208a08032"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-cilium.linux-amd64.tar.gz",
|
||||
"sha256": "e10abc0506747cb9dcb354af4c29d37f31679d3319e3814888364feb686836b9"
|
||||
},
|
||||
"images-cilium-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-cilium.linux-amd64.tar.zst",
|
||||
"sha256": "3623e1e59fd4d4a47c4b5e4143d7a8ef31707efbca7d7bf9c299d700c0e1d291"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-cilium.linux-amd64.tar.zst",
|
||||
"sha256": "6fceeec753283b5b3c929a57b59e72b73377b4ed6a95d73555de5e624923e101"
|
||||
},
|
||||
"images-cilium-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-cilium.linux-arm64.tar.gz",
|
||||
"sha256": "70b362df86f882e64c4d7a8a01901a528bb22e12a28a6996d754bd04b9f396e5"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-cilium.linux-arm64.tar.gz",
|
||||
"sha256": "5abf640b766d1e6fd836cca8eb85aafca0106f5a4789c379559b428b9aeb9578"
|
||||
},
|
||||
"images-cilium-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-cilium.linux-arm64.tar.zst",
|
||||
"sha256": "030d22fd0cb52d90321b37e2d1cd9448b571ba5eeb6b1d68daba40ecff515214"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-cilium.linux-arm64.tar.zst",
|
||||
"sha256": "d67e47e302b9284dcd2948e209caf9821b5e2c1b8490af7326bbf888f97139c1"
|
||||
},
|
||||
"images-core-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-core.linux-amd64.tar.gz",
|
||||
"sha256": "4513f277d0380330eba4d31dc8096142c2a654a34f01f1c90ab167b78dc58181"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-core.linux-amd64.tar.gz",
|
||||
"sha256": "8b02c772cb20cec6bc61968a0a4071dced6102bfd10238f2c3d5a682dfd25770"
|
||||
},
|
||||
"images-core-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-core.linux-amd64.tar.zst",
|
||||
"sha256": "a82003606da83f683a7025de7481ef9939d1b10a9f9b222ca5e80f34885a87dc"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-core.linux-amd64.tar.zst",
|
||||
"sha256": "c3648746e25fb04d6bfedd15acfff93c99eaf77cfd5d17072781b56796ea1d70"
|
||||
},
|
||||
"images-core-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-core.linux-arm64.tar.gz",
|
||||
"sha256": "121690236b9c7f0dd094d4070e80cf9b624888e2418b10c66ebbf894d63c2788"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-core.linux-arm64.tar.gz",
|
||||
"sha256": "b539ab5039895868b6fd5ffea1185be5c1f7a52c1234d9db032d4834f7e9c267"
|
||||
},
|
||||
"images-core-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-core.linux-arm64.tar.zst",
|
||||
"sha256": "26edec0d747a5578f7e638a36f54e8f301a06bcc87814d3b2274db571900f44f"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-core.linux-arm64.tar.zst",
|
||||
"sha256": "8d2782b68a84cf828bc0cfa33fc9279f7d8c2019ce46b1dfc75f0378b0adb8f6"
|
||||
},
|
||||
"images-flannel-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-flannel.linux-amd64.tar.gz",
|
||||
"sha256": "cb33139d9e7569f9b6ad5822f481c83f259a6cd13639f3980e2ad8c2dabb8284"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-flannel.linux-amd64.tar.gz",
|
||||
"sha256": "51a04645359b508e1df9e9bb4968888d1612cc722f8729c98cf4f140d8ab929c"
|
||||
},
|
||||
"images-flannel-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-flannel.linux-amd64.tar.zst",
|
||||
"sha256": "23695fd8c2a77f043a089c44437d12b5bde88422dbcd1d70edcda7a78f651137"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-flannel.linux-amd64.tar.zst",
|
||||
"sha256": "1da33715d88f49ae0451aca366a7831b758800df23cb86b37798fb4e7893bbd5"
|
||||
},
|
||||
"images-flannel-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-flannel.linux-arm64.tar.gz",
|
||||
"sha256": "a4d428464b3e3e11aafa8fab70a7f183d57d152049f02bd295a6bb4e925a4dbf"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-flannel.linux-arm64.tar.gz",
|
||||
"sha256": "6346d2a01245ba8ef1c597fe5a9a790bedf62023e9b08d22cccac1b360d293da"
|
||||
},
|
||||
"images-flannel-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-flannel.linux-arm64.tar.zst",
|
||||
"sha256": "8aa8e19b739bc3fd897115f92d54acd081453441ee4dae8ca694ec47662838a7"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-flannel.linux-arm64.tar.zst",
|
||||
"sha256": "b3c9944442d8d8070a03349a2c14fea065107fc6fa31a5015d242ada7a11e170"
|
||||
},
|
||||
"images-harvester-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-harvester.linux-amd64.tar.gz",
|
||||
"sha256": "97cd2eb0920d433ef57c1a8c8f4a6680faba9a0589c9605c30a56e2c09110c77"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-harvester.linux-amd64.tar.gz",
|
||||
"sha256": "ccbf694b1c7ce66be5dace3d59b03a24c5f81f16bee75305c316b30bc05e5000"
|
||||
},
|
||||
"images-harvester-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-harvester.linux-amd64.tar.zst",
|
||||
"sha256": "f16ef32d0b9586fb7e600013e56dd9098149dc5ce5239f4828ad03dc7463553f"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-harvester.linux-amd64.tar.zst",
|
||||
"sha256": "ff88c0ece81ac069be668f4e4599a3dd15c811e669a57c48423db3c160d566a7"
|
||||
},
|
||||
"images-harvester-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-harvester.linux-arm64.tar.gz",
|
||||
"sha256": "86fe56d8a277208c26c13a9b04b18b4eb4f2b6debcc7ad754af873e4c64d66c5"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-harvester.linux-arm64.tar.gz",
|
||||
"sha256": "0879e9c11ba3820a854736a0318a279d68099e7050abd311fb8e8bd6417d3b11"
|
||||
},
|
||||
"images-harvester-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-harvester.linux-arm64.tar.zst",
|
||||
"sha256": "dc8e9aa0dd1ce2a62b58b7ebfc673911364bd2c3228781f4a226e4796d0436be"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-harvester.linux-arm64.tar.zst",
|
||||
"sha256": "9c560f992ea61b0ffa2b2f781ebd860dff73852f3f3c5614621e0eb7040c0c17"
|
||||
},
|
||||
"images-multus-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-multus.linux-amd64.tar.gz",
|
||||
"sha256": "287437a99ff5c42516764d625571c10d2fbb44ef82cdb026d37b141e56305664"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-multus.linux-amd64.tar.gz",
|
||||
"sha256": "ff784686ed52ec8a5674d89372904610f7a90a9f000e2145d6cbaf26c46df35a"
|
||||
},
|
||||
"images-multus-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-multus.linux-amd64.tar.zst",
|
||||
"sha256": "108543225439fc50053a904b953813a39a0d0d4e6c7a76a2e99a8ee26a69f1a2"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-multus.linux-amd64.tar.zst",
|
||||
"sha256": "704506a2db41de3035ff4b551bc8b603f33450bfe91438904446787d259eede3"
|
||||
},
|
||||
"images-multus-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-multus.linux-arm64.tar.gz",
|
||||
"sha256": "98f213f7c8a70c4b0d0fb22329212190e08c82d6be482b227e3256637388c732"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-multus.linux-arm64.tar.gz",
|
||||
"sha256": "b39481711942f2b7858b2cc0125d5d60ff31db22bd7e0c816e267d92a738f8f1"
|
||||
},
|
||||
"images-multus-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-multus.linux-arm64.tar.zst",
|
||||
"sha256": "c310597f504b2dd8ac46cc2b87125dcf57a3ae77e4bbbeba4f436a598a2b96f3"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-multus.linux-arm64.tar.zst",
|
||||
"sha256": "abcdce72833b56893aa1234a6f935b457f056cd67107b45b1ff8795c2a6f8aab"
|
||||
},
|
||||
"images-traefik-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-traefik.linux-amd64.tar.gz",
|
||||
"sha256": "86a46ecea0d7a60a68314a5794698d6421aa4ce69c05a1f836360e9be996a36b"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-traefik.linux-amd64.tar.gz",
|
||||
"sha256": "a5d1f4ed24df06c1b55978e3b7230193bbfde54f240ad98ee06e8037ee2bacb6"
|
||||
},
|
||||
"images-traefik-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-traefik.linux-amd64.tar.zst",
|
||||
"sha256": "aec23459c8e51ec16491b4657a3b2a64e49357d3e6cef0a11ac7d3c2f285fe4b"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-traefik.linux-amd64.tar.zst",
|
||||
"sha256": "6dabff733c90a3c2c7304bfe0c530cb6a2304c5a585b0de4fc5f46e700c5fcee"
|
||||
},
|
||||
"images-traefik-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-traefik.linux-arm64.tar.gz",
|
||||
"sha256": "29372e44e2c1b682c4bc070a764746138a850e24c2cef7edbc97bb2afae51bd8"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-traefik.linux-arm64.tar.gz",
|
||||
"sha256": "4c5666b4537ab4e54258c64a35cc965c13513722d6861e73d01c295a6b879ade"
|
||||
},
|
||||
"images-traefik-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-traefik.linux-arm64.tar.zst",
|
||||
"sha256": "dd5efa19d02ca7a8a0bcb05febd2781e8ad85016c09b1defe09cdc5f494f05fc"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-traefik.linux-arm64.tar.zst",
|
||||
"sha256": "d71e455ce8358e31ed590a7a264d9a3ae212c955df8f36cea314243533fe4d83"
|
||||
},
|
||||
"images-vsphere-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-vsphere.linux-amd64.tar.gz",
|
||||
"sha256": "237d3f47fdbc2e511b002ed700536125ccb0fcf7c69f2b192db3bd351043d3cc"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-vsphere.linux-amd64.tar.gz",
|
||||
"sha256": "69c150b8f3e90752d685cd4c76e211afbe0b616b71bd3124c7bce4f0e0b563f2"
|
||||
},
|
||||
"images-vsphere-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-vsphere.linux-amd64.tar.zst",
|
||||
"sha256": "be5e7d4a33142cb07ac687b777c2c892354f44061d769a72b4731af49c307ec1"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.33.13%2Brke2r2/rke2-images-vsphere.linux-amd64.tar.zst",
|
||||
"sha256": "e97c3d30c70e498da1cea062cf3d780fb25a416fb4c0b9956a44892ca9ccf0d0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
{
|
||||
rke2Version = "1.33.12+rke2r2";
|
||||
rke2Commit = "341f3e620b43d178daccfe5199f9cb752b0c3922";
|
||||
rke2TarballHash = "sha256-fjhAeDjX8w3c943wjaOamlR4NXZEIhE68iSIP6co6OQ=";
|
||||
rke2VendorHash = "sha256-I09PTw359mW9b8j/tjbedu7gJ0cp+NPEvmikxJMOufQ=";
|
||||
k8sImageTag = "v1.33.12-rke2r2-build20260521";
|
||||
etcdVersion = "v3.6.7-k3s1-build20260512";
|
||||
pauseVersion = "3.6";
|
||||
ccmVersion = "v1.33.11-0.20260415182038-2566e39d309b-build20260416";
|
||||
dockerizedVersion = "v1.33.12-rke2r2";
|
||||
helmJobVersion = "v0.10.0-build20260513";
|
||||
rke2Version = "1.33.13+rke2r2";
|
||||
rke2Commit = "f0fee0e6a6822f36d0cca144c97e33cb979ec184";
|
||||
rke2TarballHash = "sha256-WoBZxFMVB9l/KcCfO0RbeBNidZ1uZ8fwilZZQRDNHT8=";
|
||||
rke2VendorHash = "sha256-9qYtpCfpmrAEV1gFBke2oeI+lcM6Qzk3MTyuVHmpJLg=";
|
||||
k8sImageTag = "v1.33.13-rke2r2-build20260723";
|
||||
etcdVersion = "v3.6.14-k3s1-build20260723";
|
||||
pauseVersion = "3.10.2";
|
||||
ccmVersion = "v1.33.13-0.20260610231102-b1a9339db253-build20260710";
|
||||
dockerizedVersion = "v1.33.13-rke2r2";
|
||||
helmJobVersion = "v0.13.3-build20260727";
|
||||
imagesVersions = with builtins; fromJSON (readFile ./images-versions.json);
|
||||
}
|
||||
|
||||
@@ -1,138 +1,138 @@
|
||||
{
|
||||
"images-calico-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-calico.linux-amd64.tar.gz",
|
||||
"sha256": "351e9047ce160cbf3b9ed4a32996f36bb4266c200e9957407178d2d28e55f8e5"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz",
|
||||
"sha256": "eca4b54a87b17ca7878a90322a76221cc14b0f191db24a88792a31a128444cb7"
|
||||
},
|
||||
"images-calico-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-calico.linux-amd64.tar.zst",
|
||||
"sha256": "aa746ea4dd91422e37d2cac07b36854ddc1c551b4da061c261d1e0132a983656"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst",
|
||||
"sha256": "914212fd8288f73361ef29d945b3a2102165df70153fc8c20c180f72704c4da2"
|
||||
},
|
||||
"images-calico-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-calico.linux-arm64.tar.gz",
|
||||
"sha256": "96829f58e60b02ccee8e19b9ec4ad2ce7ade6f9030b1379eadedd42d151a783b"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz",
|
||||
"sha256": "34c6c98dd024ce7e5ffcc17112988be2ab703c3a8977f01312815bda38df11e5"
|
||||
},
|
||||
"images-calico-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-calico.linux-arm64.tar.zst",
|
||||
"sha256": "6a7f4404f92e88eb515bbff4513b5771e82c69111dfdd7e88c7d83d4366480e6"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst",
|
||||
"sha256": "d1aac5a3f88163b5c0a6dd152be8e6e62b05b3fe85ebf9d6288b5de585d9e056"
|
||||
},
|
||||
"images-canal-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-canal.linux-amd64.tar.gz",
|
||||
"sha256": "16bc527e0b4ab9612747534c2b5801487a12379a364da4936d01816fcb608040"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz",
|
||||
"sha256": "9351ecae73961309c566991322839acb0df573f0e826cdeb278babe141357d8b"
|
||||
},
|
||||
"images-canal-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-canal.linux-amd64.tar.zst",
|
||||
"sha256": "d4d14e4ae3f34d0615fd6007e7048b54bc5a15be9f57fa6be6cd72346c39ccdf"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst",
|
||||
"sha256": "1f2aeec78ca8380b55f8398905e9dbe4af5cbb8b3ae9cb4bdcc46b08dcb75c56"
|
||||
},
|
||||
"images-canal-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-canal.linux-arm64.tar.gz",
|
||||
"sha256": "ece067531498aec3847a73cd4e4e379c2bb3186f72717601b4766f2a50df0f3a"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz",
|
||||
"sha256": "b52d98c63d46a8b908bbe3fa2a075fb5b7ea4dbb4325f3a9de63dcc4272f04ff"
|
||||
},
|
||||
"images-canal-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-canal.linux-arm64.tar.zst",
|
||||
"sha256": "ede6d29451a99d7f4663b6a2b8eb0cfa093f83b7b025fd5c4899fb02edac703d"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst",
|
||||
"sha256": "3ce45e29db6ef82e475477dd1e4e58049917ffaef7e21b1d7c87b78a10864c48"
|
||||
},
|
||||
"images-cilium-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-cilium.linux-amd64.tar.gz",
|
||||
"sha256": "95d566220546d6b49f6b79fb729c976fc435ae85fcb39add9ca4e8cade953e8f"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz",
|
||||
"sha256": "a0acd19bcf7f99321635aaff76abf5b5ab256f31e71957dda22caf5ee97f383d"
|
||||
},
|
||||
"images-cilium-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-cilium.linux-amd64.tar.zst",
|
||||
"sha256": "fc146c92933270bd4291a75069f1d724629c84ebb6c8cd5549756a895a5a9e3d"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst",
|
||||
"sha256": "ed1e42b4c1db97d65f5ab42faf443fd1786af092bd69b931811557beb17875fe"
|
||||
},
|
||||
"images-cilium-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-cilium.linux-arm64.tar.gz",
|
||||
"sha256": "d5bfc28db9031a8be3a5c325fe6f6cc6dca8f101af5fce394d11e00a0e866dc2"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz",
|
||||
"sha256": "55569b7c58a2cdb2194c14c9b1252fe4545c02c1c0df2e152cf2fa70c29e6e46"
|
||||
},
|
||||
"images-cilium-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-cilium.linux-arm64.tar.zst",
|
||||
"sha256": "0590f43bf3d6ea590a9069d62170956d72f6ff1b1a45574ef7129a6fb07481ae"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst",
|
||||
"sha256": "916bc0aac94e499bdd6015ca727b97c39da5c635ed87edfc5bff432e3b93bb6a"
|
||||
},
|
||||
"images-core-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-core.linux-amd64.tar.gz",
|
||||
"sha256": "2d89ef07043ee8475bd91c97c7419dcb068e089ba8d74f31a503749fdd29a700"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-core.linux-amd64.tar.gz",
|
||||
"sha256": "dbc4e96df1cf68bb1554dffcde377cafde6b58afc6a57ff627bffaaab9387c64"
|
||||
},
|
||||
"images-core-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-core.linux-amd64.tar.zst",
|
||||
"sha256": "663f048d7ad31aeaf5820effc4e9fd6499ee038c2736afa6721c2384c049765c"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-core.linux-amd64.tar.zst",
|
||||
"sha256": "c98faf27f1867a21fd928185c5b3ce11e58576239724547b14dd714d2cf485f1"
|
||||
},
|
||||
"images-core-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-core.linux-arm64.tar.gz",
|
||||
"sha256": "740bed7351bab07dbdaaef316d3c9c817c381fefff4ce43af78381596e1f34d6"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-core.linux-arm64.tar.gz",
|
||||
"sha256": "670909f4bbdf4cae8cd2cd289e127b62753a98a0dde17c94f8287c4f04edb631"
|
||||
},
|
||||
"images-core-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-core.linux-arm64.tar.zst",
|
||||
"sha256": "d224ffbf50eb2be8edaa1b923323df17336b8c435bce034e2ba4ae96a54244ec"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-core.linux-arm64.tar.zst",
|
||||
"sha256": "581e77dfad0c37c8ec8ce21aa62eb04e484476e25ee955e51f2e541bd41eb83e"
|
||||
},
|
||||
"images-flannel-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-flannel.linux-amd64.tar.gz",
|
||||
"sha256": "1a84527d66538b5ff96e331493006bbd3ccc06529d51a8b7c9a3e0d219c25a6f"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz",
|
||||
"sha256": "990ea84921cb04bcc8c4b78e5ef2896a5c1cbc864ca7948af56179f46ea82aed"
|
||||
},
|
||||
"images-flannel-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-flannel.linux-amd64.tar.zst",
|
||||
"sha256": "832aae87b5eba45be64b47a5ebc04824060095dbc79d58adb009dbc0b738252a"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst",
|
||||
"sha256": "1da33715d88f49ae0451aca366a7831b758800df23cb86b37798fb4e7893bbd5"
|
||||
},
|
||||
"images-flannel-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-flannel.linux-arm64.tar.gz",
|
||||
"sha256": "80d7ab29cce2d595926ed0999e663932489c62c9e4b818909a05739357e584bc"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz",
|
||||
"sha256": "b0736b431a1665687a5744307e62e34d98a739c9f28d1b51bbaa3b6d9db81aa7"
|
||||
},
|
||||
"images-flannel-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-flannel.linux-arm64.tar.zst",
|
||||
"sha256": "39b36764f09857c01eaa9520da3e2d5023d7df881bc72379e4c55d05ebde8f6f"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst",
|
||||
"sha256": "b3c9944442d8d8070a03349a2c14fea065107fc6fa31a5015d242ada7a11e170"
|
||||
},
|
||||
"images-harvester-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-harvester.linux-amd64.tar.gz",
|
||||
"sha256": "86299476461d69c9db81c47f1bff915f122dd31f229679033cb9ac3888f34d20"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz",
|
||||
"sha256": "c8129804d926d6916dc17840239dc4ed00dd71dfb9431ef3a52b61e5f763fc9d"
|
||||
},
|
||||
"images-harvester-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-harvester.linux-amd64.tar.zst",
|
||||
"sha256": "c3c2539999dbd963deb1533d76fef211902322d7204c977b7534c37342a6ccba"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst",
|
||||
"sha256": "b0571922737f3b4794880a6a1ed36aecf863fa99756ac97dc3e47e2ba65d84b7"
|
||||
},
|
||||
"images-harvester-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-harvester.linux-arm64.tar.gz",
|
||||
"sha256": "dadfbc1e60b11be02c186343748f3c5e6a7c03bedf4bf36b1007b6addafaf6e2"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz",
|
||||
"sha256": "e78cfd46abc07c7330f1a99a2eb1b3b49aab0f4772c027e16e58fbeeabe26936"
|
||||
},
|
||||
"images-harvester-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-harvester.linux-arm64.tar.zst",
|
||||
"sha256": "ec9d3370c2cb488fe98ed38688fd3cec14ba136783efd894b3bec2a5599f8c08"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst",
|
||||
"sha256": "004a123bc2ae8030a6a79f03a6f20d079f43d040b2730b6bfb573a1d105d89fe"
|
||||
},
|
||||
"images-multus-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-multus.linux-amd64.tar.gz",
|
||||
"sha256": "a4bbad1ab2c8d7f65e6cc9238d63f29524774bc07163a4a23688d9a0a63c4629"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz",
|
||||
"sha256": "f5bc06ea799a91fe0d74929f6882591d8b541d785f91959789b3a17fbcf6cfdd"
|
||||
},
|
||||
"images-multus-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-multus.linux-amd64.tar.zst",
|
||||
"sha256": "98e17b69423ff3de402803a0ec2fb63748252c800c672a232f912d312cf41ff5"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst",
|
||||
"sha256": "6e5795d1367a04ca096cefaececa0f77b180bd343cd806727ce1712b1d28cc98"
|
||||
},
|
||||
"images-multus-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-multus.linux-arm64.tar.gz",
|
||||
"sha256": "1ec1676f8bcb054ab243cc7b3df555e0099fd2a227683615f15c8cbb95db040a"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz",
|
||||
"sha256": "03d4f0ded6a8da7007c241cace1cc007c2074b92846e52c2a73f97e2d1c3ed82"
|
||||
},
|
||||
"images-multus-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-multus.linux-arm64.tar.zst",
|
||||
"sha256": "c310597f504b2dd8ac46cc2b87125dcf57a3ae77e4bbbeba4f436a598a2b96f3"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst",
|
||||
"sha256": "4c4b241191ec370c9fc2c77ed2b319d8b094a7f4ca35d3a2a1563643865ae283"
|
||||
},
|
||||
"images-traefik-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-traefik.linux-amd64.tar.gz",
|
||||
"sha256": "288cb12a19e0419f91a56286c934823eda31c523f865bb24b66c9cdeb89cc73f"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz",
|
||||
"sha256": "1febfa1c29687a343e0c6a829100a2e612ba4dbab4050a39d15fdd9706f0cff2"
|
||||
},
|
||||
"images-traefik-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-traefik.linux-amd64.tar.zst",
|
||||
"sha256": "aec23459c8e51ec16491b4657a3b2a64e49357d3e6cef0a11ac7d3c2f285fe4b"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst",
|
||||
"sha256": "6dabff733c90a3c2c7304bfe0c530cb6a2304c5a585b0de4fc5f46e700c5fcee"
|
||||
},
|
||||
"images-traefik-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-traefik.linux-arm64.tar.gz",
|
||||
"sha256": "f3d34ffea490540c028f800362862c74d1b45efb0acb3db072f5417443b71733"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz",
|
||||
"sha256": "705031339da6ff24d83e3cfcaeca01051055f06f125038cc397d753883f0af91"
|
||||
},
|
||||
"images-traefik-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-traefik.linux-arm64.tar.zst",
|
||||
"sha256": "dd5efa19d02ca7a8a0bcb05febd2781e8ad85016c09b1defe09cdc5f494f05fc"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst",
|
||||
"sha256": "d71e455ce8358e31ed590a7a264d9a3ae212c955df8f36cea314243533fe4d83"
|
||||
},
|
||||
"images-vsphere-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-vsphere.linux-amd64.tar.gz",
|
||||
"sha256": "c87a8f5b553e664f0c7dfa44b2fdea40b7bbe22bbf4d96667009a76f5b181f86"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz",
|
||||
"sha256": "c1ee6654b45f0106e00aa4cd2b423c8b35c79964470419e4c012d963c72ed0f3"
|
||||
},
|
||||
"images-vsphere-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-vsphere.linux-amd64.tar.zst",
|
||||
"sha256": "df524665950321e45d0b8521532263e969533af82f7c77dddc86b4b6dfa675a3"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.34.10%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst",
|
||||
"sha256": "19afe144421cc7f430adb20a91e64ae91f0fac2ea6b7aeab6b480adee21f4fad"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
{
|
||||
rke2Version = "1.34.8+rke2r2";
|
||||
rke2Commit = "b227fefe1936a550450ce3b6248c559fa58b5cd3";
|
||||
rke2TarballHash = "sha256-Ojc4PhsEYJBhgj+r+XEcdFEjZIlJCCVNC+w7mZWY2hA=";
|
||||
rke2VendorHash = "sha256-752RlnL+7reFk4G/X8kgHdad71fatY+Ss714MbJDvg8=";
|
||||
k8sImageTag = "v1.34.8-rke2r2-build20260521";
|
||||
etcdVersion = "v3.6.7-k3s1-build20260512";
|
||||
pauseVersion = "3.6";
|
||||
ccmVersion = "v1.34.7-0.20260415182025-e7567db58dd7-build20260416";
|
||||
dockerizedVersion = "v1.34.8-rke2r2";
|
||||
helmJobVersion = "v0.10.0-build20260513";
|
||||
rke2Version = "1.34.10+rke2r1";
|
||||
rke2Commit = "d419f09226d50a4777d348e5c53ea1bce3849b77";
|
||||
rke2TarballHash = "sha256-upkkAdlrAkj6RLsIbkNB5KdQylxvb1P47x1AfDcpxfY=";
|
||||
rke2VendorHash = "sha256-ep2qR8V3V1F7PHj9rU9hOZb0o4GQVUdtGHyAEWgpM2A=";
|
||||
k8sImageTag = "v1.34.10-rke2r1-build20260723";
|
||||
etcdVersion = "v3.6.14-k3s1-build20260723";
|
||||
pauseVersion = "3.10.2";
|
||||
ccmVersion = "v1.34.9-0.20260610230036-3060dff9c388-build20260710";
|
||||
dockerizedVersion = "v1.34.10-rke2r1";
|
||||
helmJobVersion = "v0.13.3-build20260727";
|
||||
imagesVersions = with builtins; fromJSON (readFile ./images-versions.json);
|
||||
}
|
||||
|
||||
@@ -1,138 +1,138 @@
|
||||
{
|
||||
"images-calico-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-calico.linux-amd64.tar.gz",
|
||||
"sha256": "d53e659b7f934fb811eadeb7d6e348b12ef932b0a414073301bdf03d1501f32f"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz",
|
||||
"sha256": "91e39707c7be99f988db35d2c9a203c2f7ccdfd8419c1a7e7cf9c869a44e82e0"
|
||||
},
|
||||
"images-calico-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-calico.linux-amd64.tar.zst",
|
||||
"sha256": "b7cf99a56b03469169e8b1a32f9aa61b828268dd5aff9482503d00c884260f0e"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst",
|
||||
"sha256": "263eef9bc34b84d25f69d871c5c6b0d968f57b128501c56cd75be76fcd34a5ff"
|
||||
},
|
||||
"images-calico-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-calico.linux-arm64.tar.gz",
|
||||
"sha256": "53a95f56dbd4aeefe631afdf05d00592da7bbb2c089e694d06ffd6c6c8665375"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz",
|
||||
"sha256": "fb88b8044e1143eb65d6d167917c3c5effb0ffbdc6dbc3d5bb87f7b9d73d91d5"
|
||||
},
|
||||
"images-calico-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-calico.linux-arm64.tar.zst",
|
||||
"sha256": "c49ef55be8b1a30597e4315fac563282cac7870045a465ba7e1ee2c81db44cf6"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst",
|
||||
"sha256": "257222e58aa7429c53edc52f647a2c6ce3932b491b2943c3e726afe91219614f"
|
||||
},
|
||||
"images-canal-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-canal.linux-amd64.tar.gz",
|
||||
"sha256": "f6ffb60b14b0fda2e3a138f4d6a7e9cb71e8fc759d69cb0fda00aedcaa03ab0f"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz",
|
||||
"sha256": "af9fe952ce6dcfb1192d40ca01d0d9a7f29477fef21bdae96490c2192f2ded74"
|
||||
},
|
||||
"images-canal-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-canal.linux-amd64.tar.zst",
|
||||
"sha256": "3a7828ce0143c3eb91cae940cebdfa0145960e91be056e88a8b077ee39ccc54d"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst",
|
||||
"sha256": "9e89572eb2a5958b456dc1ca418bdbdbd694a176dd2cf41e6df55fe0488156ba"
|
||||
},
|
||||
"images-canal-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-canal.linux-arm64.tar.gz",
|
||||
"sha256": "2319ab1753330cb13ea7ac56198d9da78123aaa6a3b66ea3d970a6c57de9ce41"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz",
|
||||
"sha256": "b52d98c63d46a8b908bbe3fa2a075fb5b7ea4dbb4325f3a9de63dcc4272f04ff"
|
||||
},
|
||||
"images-canal-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-canal.linux-arm64.tar.zst",
|
||||
"sha256": "63b0888d1adebb72a77c2d1f1eb1ced1519cfdeb57681026a94c1f53f87f5610"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst",
|
||||
"sha256": "3ce45e29db6ef82e475477dd1e4e58049917ffaef7e21b1d7c87b78a10864c48"
|
||||
},
|
||||
"images-cilium-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-cilium.linux-amd64.tar.gz",
|
||||
"sha256": "9c6ab1f22a157e7a74c35c4be3c025eb154e6315be9c2085451f59b11b63f8e1"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz",
|
||||
"sha256": "f943fd65168368d4b76ede3d809daad8733126df8d1bb809cf841b50b0402e94"
|
||||
},
|
||||
"images-cilium-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-cilium.linux-amd64.tar.zst",
|
||||
"sha256": "38892592ae5e45e27e4cad76d4364c549bdb386def54398cc26c9249bbd34760"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst",
|
||||
"sha256": "dc9cb3d8af8db6a0a0312e3be3e31b1fa44a20731b8d3f7a1e30e8481940c12c"
|
||||
},
|
||||
"images-cilium-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-cilium.linux-arm64.tar.gz",
|
||||
"sha256": "a0a02109ef5a5f4eae1a06003ba80544b405b155840ce5c3535b1c4e02d16f0e"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz",
|
||||
"sha256": "bcfee32f8a9bc0c62ad2b747f4fb36bffbdb8cee5e6d4f93827325514ebd9f7d"
|
||||
},
|
||||
"images-cilium-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-cilium.linux-arm64.tar.zst",
|
||||
"sha256": "8110fc9517469dad0c291258e0dbdece6e4e3c9a51d539531527f4236692b7bd"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst",
|
||||
"sha256": "61d4038542e15892ecb122d99cc22226fad4cf4877e6bba9d49406d514624a8d"
|
||||
},
|
||||
"images-core-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-core.linux-amd64.tar.gz",
|
||||
"sha256": "2d32c6205a83ac776fe54d7777472725edfc204fd7a30befa0ee9c5f7fde80cc"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-core.linux-amd64.tar.gz",
|
||||
"sha256": "606d9e6960cf1496668eab999a9bec2eee052027e90a750e2c99b4f185382c4a"
|
||||
},
|
||||
"images-core-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-core.linux-amd64.tar.zst",
|
||||
"sha256": "48bdbb2bc2652eb6647ce3f2ce215ac9bf12cf5fbe4936688e5de34605f0fb2c"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-core.linux-amd64.tar.zst",
|
||||
"sha256": "f7d4aad521229dfa820a3dea2365582681aa1aa4a076bd02122b0ac0eb79e265"
|
||||
},
|
||||
"images-core-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-core.linux-arm64.tar.gz",
|
||||
"sha256": "3e392555a295ec6f7e3ea477ded0bb71c04957dccd168de87d87226dfdbb753f"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-core.linux-arm64.tar.gz",
|
||||
"sha256": "5d3ee44b2d6e3d50258b5f99fdc8356dd7b1eb00198fee429bebe4881375861c"
|
||||
},
|
||||
"images-core-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-core.linux-arm64.tar.zst",
|
||||
"sha256": "29d28cb1b2035c1d5123fdb6bb0fa8cc647ad9cd570edf434bc7e560806426fa"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-core.linux-arm64.tar.zst",
|
||||
"sha256": "87fe42d4052ad62cf25d0cd6bd23a9e8e2adf36961583c25a48d10dac8f39d4e"
|
||||
},
|
||||
"images-flannel-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-flannel.linux-amd64.tar.gz",
|
||||
"sha256": "e86e5631c691d2dcac99764542c875e4bed902f385f5a6e2f6e6b88facf114aa"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz",
|
||||
"sha256": "eda0f523a6b5021bf9a59f7e9e9c0d564f472c22615e83f101ea68027478007c"
|
||||
},
|
||||
"images-flannel-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-flannel.linux-amd64.tar.zst",
|
||||
"sha256": "23695fd8c2a77f043a089c44437d12b5bde88422dbcd1d70edcda7a78f651137"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst",
|
||||
"sha256": "1da33715d88f49ae0451aca366a7831b758800df23cb86b37798fb4e7893bbd5"
|
||||
},
|
||||
"images-flannel-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-flannel.linux-arm64.tar.gz",
|
||||
"sha256": "396084ee38b31e5b78e3d8c3a015f8a56194119204aecb9de052a5be20c61e01"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz",
|
||||
"sha256": "49a0914944127d296890d86686642392f6ceb7d220d05412954aea136d019227"
|
||||
},
|
||||
"images-flannel-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-flannel.linux-arm64.tar.zst",
|
||||
"sha256": "39b36764f09857c01eaa9520da3e2d5023d7df881bc72379e4c55d05ebde8f6f"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst",
|
||||
"sha256": "b3c9944442d8d8070a03349a2c14fea065107fc6fa31a5015d242ada7a11e170"
|
||||
},
|
||||
"images-harvester-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-harvester.linux-amd64.tar.gz",
|
||||
"sha256": "38eecc385bbb77bde48d7dec9aa48bc897136c5714e5eff9c56c9df580dfb35d"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz",
|
||||
"sha256": "dc8586e214ac70a896fa4aab6392ea20e44b0ba078f059fea7470c055558682d"
|
||||
},
|
||||
"images-harvester-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-harvester.linux-amd64.tar.zst",
|
||||
"sha256": "20e7b012ab2802a057be6cf6ef3d8f04a65484403615ddd3c2852d59d3ed7453"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst",
|
||||
"sha256": "fcb029dd456d0a9137714aae73d0b3edcbd400955425a5b9df1c8e7cedc06154"
|
||||
},
|
||||
"images-harvester-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-harvester.linux-arm64.tar.gz",
|
||||
"sha256": "8b712f389d2118a802a70ec4175e83be0557a4b699bc238bd228c862aa337419"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz",
|
||||
"sha256": "3b543d0099c5e4b42c5a8db5610a620e25f554027fea964ad31f3011125d81ed"
|
||||
},
|
||||
"images-harvester-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-harvester.linux-arm64.tar.zst",
|
||||
"sha256": "dfa539c18041a6e0ef1747c469c718f7e608e031dbc99eada2dbf56768f6de72"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst",
|
||||
"sha256": "b55b3c2f9c36a3a9907bf7338eaf83803cb8a851ab18475fa3f9b31262f8c3d2"
|
||||
},
|
||||
"images-multus-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-multus.linux-amd64.tar.gz",
|
||||
"sha256": "48a6e3c5fc5534b6c77957dd82e488f46cd6c6a713233da32ab18e94961f33a2"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz",
|
||||
"sha256": "712a02ff2e07b34ac0f720126d235b4cb86eacac9ede923922f43db696890280"
|
||||
},
|
||||
"images-multus-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-multus.linux-amd64.tar.zst",
|
||||
"sha256": "98e17b69423ff3de402803a0ec2fb63748252c800c672a232f912d312cf41ff5"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst",
|
||||
"sha256": "d29151e7c0fc86483bea1e146ea3e0186a6356f46757849fa67bd4e372d11268"
|
||||
},
|
||||
"images-multus-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-multus.linux-arm64.tar.gz",
|
||||
"sha256": "cf99f6af0ae8389926f9cba977370ffbe1ee261d429281957eb2b5cfb015a71e"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz",
|
||||
"sha256": "e13eddf16db1f7d1ccdf98b12df763bdebe89c10201ab1e824038406464e0706"
|
||||
},
|
||||
"images-multus-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-multus.linux-arm64.tar.zst",
|
||||
"sha256": "f76f06cd2344a2c44283733c0e02a94b1bea6c63bc0b7cb6aa2871a474661628"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst",
|
||||
"sha256": "4c17856eccd8855f8dc5f9b2d34b8d24e2f650c6894f19d6bb3f0c5a7c46f052"
|
||||
},
|
||||
"images-traefik-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-traefik.linux-amd64.tar.gz",
|
||||
"sha256": "f77681adb7835d43c2eb77d189573990f32fa8b3d98bf7d8fb559788f0e30eea"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz",
|
||||
"sha256": "acf5461ddaf78e88fd10d1a8897836298d68f3b1a765e1c4ef02e0b5701d7e55"
|
||||
},
|
||||
"images-traefik-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-traefik.linux-amd64.tar.zst",
|
||||
"sha256": "aec23459c8e51ec16491b4657a3b2a64e49357d3e6cef0a11ac7d3c2f285fe4b"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst",
|
||||
"sha256": "6dabff733c90a3c2c7304bfe0c530cb6a2304c5a585b0de4fc5f46e700c5fcee"
|
||||
},
|
||||
"images-traefik-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-traefik.linux-arm64.tar.gz",
|
||||
"sha256": "5a57534fd048ad725e15a38a8be65a642f6ad443cb55c9dad6eff276d704dd44"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz",
|
||||
"sha256": "f52d58a9d3926ee719ddd26f20c683b5584c6b5debdca085224d492ff7cf959b"
|
||||
},
|
||||
"images-traefik-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-traefik.linux-arm64.tar.zst",
|
||||
"sha256": "dd5efa19d02ca7a8a0bcb05febd2781e8ad85016c09b1defe09cdc5f494f05fc"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst",
|
||||
"sha256": "d71e455ce8358e31ed590a7a264d9a3ae212c955df8f36cea314243533fe4d83"
|
||||
},
|
||||
"images-vsphere-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-vsphere.linux-amd64.tar.gz",
|
||||
"sha256": "c3e5339a35bba7b7184850935bbfcda7d6c2dc7dd4e34d7c9f390a58766ac654"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz",
|
||||
"sha256": "9ccc00fd7c728f9db168a70c8ee25875c7122e101adcd089876345f8963f7331"
|
||||
},
|
||||
"images-vsphere-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-vsphere.linux-amd64.tar.zst",
|
||||
"sha256": "f0a388912b6150d4ff820b53ee58c398d5572c325f381ad5ce4d82f0d10f5849"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.7%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst",
|
||||
"sha256": "75becdf7144effe5894eef6423f2e6ea8c8549bfdf315bdff1a2cb64c41c2b2d"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
{
|
||||
rke2Version = "1.35.5+rke2r2";
|
||||
rke2Commit = "a779b949d9a7987fc51e7c71c146db4160d0e3bf";
|
||||
rke2TarballHash = "sha256-eMqaz7DmIwANpvcQxEA6rJQcLmdBlEFT8Qju+Wr0dTo=";
|
||||
rke2VendorHash = "sha256-LV3ISu7bW6kxlKFe0GUqkB9Jte1Ey5DaWm+OKq1/1uY=";
|
||||
k8sImageTag = "v1.35.5-rke2r2-build20260521";
|
||||
etcdVersion = "v3.6.7-k3s1-build20260512";
|
||||
pauseVersion = "3.6";
|
||||
ccmVersion = "v1.35.4-0.20260415195656-e51c0636351d-build20260415";
|
||||
dockerizedVersion = "v1.35.5-rke2r2";
|
||||
helmJobVersion = "v0.10.0-build20260513";
|
||||
rke2Version = "1.35.7+rke2r1";
|
||||
rke2Commit = "382a8b31a8fd78e376ab6f02c4bb0ec5592aada2";
|
||||
rke2TarballHash = "sha256-+GGX3vfd3JwT+i1ilNx1K4CJV9qlTy9kuOfvA9k21a4=";
|
||||
rke2VendorHash = "sha256-OR3BT9/n/LDn9Ngt0/eF2rNfvJmShvTVcWVBVYy2a+Q=";
|
||||
k8sImageTag = "v1.35.7-rke2r1-build20260723";
|
||||
etcdVersion = "v3.6.14-k3s1-build20260723";
|
||||
pauseVersion = "3.10.2";
|
||||
ccmVersion = "v1.35.6-0.20260610221957-158346759a70-build20260710";
|
||||
dockerizedVersion = "v1.35.7-rke2r1";
|
||||
helmJobVersion = "v0.13.3-build20260727";
|
||||
imagesVersions = with builtins; fromJSON (readFile ./images-versions.json);
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
# Use only versions specified in anytype-ts middleware.version file:
|
||||
# https://github.com/anyproto/anytype-ts/blob/v<anytype-ts-version>/middleware.version
|
||||
version = "0.50.18";
|
||||
version = "0.51.0-rc1";
|
||||
|
||||
# Update only together with 'anytype' package.
|
||||
# nixpkgs-update: no auto update
|
||||
@@ -34,10 +34,10 @@ buildGoModule (finalAttrs: {
|
||||
owner = "anyproto";
|
||||
repo = "anytype-heart";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-OnDhtK9niJlHwW8BNBVwAfgf8nUKX4qtwdu7kXKqYKg=";
|
||||
hash = "sha256-Hxch8p+fIUOyhePZPmb9i1O7IyPMlwZP8ElRu42DEzk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-n0fcWzUSv4AuAbepWPk5c8DldClQX+Juo3MLca+tLV4=";
|
||||
vendorHash = "sha256-6LLIs4iT3qwV6luZ08RS05CmUFnNFYLazHeKNG76gV4=";
|
||||
|
||||
subPackages = [ "cmd/grpcserver" ];
|
||||
tags = [
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "anytype";
|
||||
version = "0.56.1";
|
||||
version = "0.56.5";
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -32,14 +32,14 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
owner = "anyproto";
|
||||
repo = "anytype-ts";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-7e8wGrha3eiW1ou0vJa/njDna87wDOPzpk4fX6qj9qA=";
|
||||
hash = "sha256-X1z2lQtmMuyJKLL43hBYQCj976rCmha43gffZeLrnMY=";
|
||||
};
|
||||
|
||||
locales = fetchFromGitHub {
|
||||
owner = "anyproto";
|
||||
repo = "l10n-anytype-ts";
|
||||
rev = "c16beda3d1a931d3330b1f7cc99185f7bdcba2f5";
|
||||
hash = "sha256-ludb8WyECZW0PxnhR/znHS3uXQuk8KDIXHujha4YeA0=";
|
||||
rev = "2bb4678cebd453559dc17e7bab204f237fa17553";
|
||||
hash = "sha256-e3DfvUlfRJhwp6lLqPEkm4bD1bl+KLP6laVnRaHOYsU=";
|
||||
};
|
||||
|
||||
node_modules = stdenvNoCC.mkDerivation {
|
||||
@@ -87,7 +87,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
|
||||
dontFixup = true;
|
||||
|
||||
outputHash = "sha256-i2GPGi7LgIy8y+//rR0H+vX+bc/v2NKd7xGLargd044=";
|
||||
outputHash = "sha256-phvOKUOqXwqNvZ6njyEf6CTBlDTP8CmSglmaUWqDXqI=";
|
||||
outputHashMode = "recursive";
|
||||
};
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ let
|
||||
else if stdenv.hostPlatform.isPower then
|
||||
"ppc${toString stdenv.hostPlatform.parsed.cpu.bits}"
|
||||
else
|
||||
throw "Add ${stdenv.hostPlatform.parsed.cpu.arch} to chezArch to enable building chez-racket";
|
||||
throw "Add ${stdenv.hostPlatform.parsed.cpu.name} to chezArch to enable building chez-racket";
|
||||
|
||||
chezOs =
|
||||
if stdenv.hostPlatform.isDarwin then
|
||||
|
||||
@@ -56,7 +56,9 @@ stdenv.mkDerivation (
|
||||
homepage = "https://github.com/racket/ChezScheme";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
platforms = lib.intersectLists lib.platforms.unix (
|
||||
lib.platforms.x86 ++ lib.platforms.aarch64 ++ lib.platforms.arm ++ lib.platforms.power
|
||||
);
|
||||
};
|
||||
}
|
||||
)
|
||||
|
||||
@@ -8,15 +8,15 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "7.1.300";
|
||||
version = "7.1.310";
|
||||
srcs = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://github.com/aunetx/deezer-linux/releases/download/v${version}/deezer-desktop-${version}-x64.tar.xz";
|
||||
hash = "sha256-6vS0jh8eaiZTMYbC/gvaTVGy/VuH1pfhRkbwzg/LJ2k=";
|
||||
hash = "sha256-G1nrkyQR3pduZulFE30DTCTfVMmZe7X6nl6bcDfSf8E=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://github.com/aunetx/deezer-linux/releases/download/v${version}/deezer-desktop-${version}-arm64.tar.xz";
|
||||
hash = "sha256-KNs7rk1LCFhaKhgsw87WrKIMHTvP4mESZPuBgc002+Y=";
|
||||
hash = "sha256-fMShKodtD8/icEcpRIVZZ9H3KlF/GEpMyuihcDkviWk=";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -48,10 +48,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
install -d $out/bin $out/share/deezer-desktop/resources $out/share/applications $out/share/icons/hicolor/scalable/apps
|
||||
|
||||
substituteInPlace deezer-desktop-${version}-${archDir}/resources/dev.aunetx.deezer.desktop \
|
||||
--replace-fail "run.sh" "deezer-desktop" \
|
||||
--replace-fail "dev.aunetx.deezer" "deezer-desktop"
|
||||
cp deezer-desktop-${version}-${archDir}/resources/dev.aunetx.deezer.desktop $out/share/applications/deezer-desktop.desktop
|
||||
cp deezer-desktop-${version}-${archDir}/resources/dev.aunetx.deezer.svg $out/share/icons/hicolor/scalable/apps/deezer-desktop.svg
|
||||
--replace-fail "run.sh" "deezer-desktop"
|
||||
cp deezer-desktop-${version}-${archDir}/resources/dev.aunetx.deezer.desktop $out/share/applications/
|
||||
cp deezer-desktop-${version}-${archDir}/resources/dev.aunetx.deezer.svg $out/share/icons/hicolor/scalable/apps/
|
||||
cp -r deezer-desktop-${version}-${archDir}/resources/{app.asar,linux} $out/share/deezer-desktop/resources/
|
||||
|
||||
makeWrapper "${lib.getExe electron}" "$out/bin/deezer-desktop" \
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
{
|
||||
"version": "12.15.2",
|
||||
"version": "12.17.0",
|
||||
"sources": {
|
||||
"aarch64-linux": {
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.15.2/floorp-linux-aarch64.tar.xz",
|
||||
"sha256": "1dbd4002b8e3e907ecc0adf760013a4f22186f9d425ded3372eafedce53bc6df"
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.17.0/floorp-linux-aarch64.tar.xz",
|
||||
"sha256": "7b36eed9e20e5d040a39b1167c6146f683c5883d703018125539fb9e54feb9da"
|
||||
},
|
||||
"x86_64-linux": {
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.15.2/floorp-linux-x86_64.tar.xz",
|
||||
"sha256": "5b068379ccb6f8cbd86e8d03d20a30cb8a03816a871fa28ca6f0ce13fb227960"
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.17.0/floorp-linux-x86_64.tar.xz",
|
||||
"sha256": "9b2c1bbe985f02a009d8b5294ced411ddf2ff1c9c3b5d83e857635222693c890"
|
||||
},
|
||||
"aarch64-darwin": {
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.15.2/floorp-macOS-universal.dmg",
|
||||
"sha256": "c4e64d732cd687e6711230d84cac687e8e4d28cc056f66a665fbf03ac2861b7b"
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.17.0/floorp-macOS-universal.dmg",
|
||||
"sha256": "b35781bc14496ffe6b00792a5d3b18dc1a74617600f7ff553624cfcf3c22ce4f"
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.15.2/floorp-macOS-universal.dmg",
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
{
|
||||
bintools,
|
||||
fetchurl,
|
||||
lib,
|
||||
makeWrapper,
|
||||
patchelf,
|
||||
stdenvNoCC,
|
||||
bintools,
|
||||
testers,
|
||||
|
||||
# Linked dynamic libraries.
|
||||
alsa-lib,
|
||||
@@ -178,7 +179,7 @@ let
|
||||
];
|
||||
|
||||
linux = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta passthru;
|
||||
inherit pname meta;
|
||||
version = "152.0.7977.64";
|
||||
|
||||
src =
|
||||
@@ -296,10 +297,15 @@ let
|
||||
postInstall = lib.optionalString withSymlink ''
|
||||
ln -s $out/bin/google-chrome-stable $out/bin/google-chrome
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = ./update.sh;
|
||||
tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
|
||||
};
|
||||
});
|
||||
|
||||
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta passthru;
|
||||
inherit pname meta;
|
||||
version = "152.0.7977.65";
|
||||
|
||||
src = fetchurl {
|
||||
@@ -337,9 +343,12 @@ let
|
||||
postInstall = lib.optionalString withSymlink ''
|
||||
ln -s $out/bin/google-chrome-stable $out/bin/google-chrome
|
||||
'';
|
||||
});
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
passthru = {
|
||||
updateScript = ./update.sh;
|
||||
tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
|
||||
};
|
||||
});
|
||||
|
||||
meta = {
|
||||
description = "Freeware web browser developed by Google";
|
||||
|
||||
@@ -11,15 +11,15 @@
|
||||
}:
|
||||
let
|
||||
pname = "josm";
|
||||
version = "19555";
|
||||
version = "19613";
|
||||
srcs = {
|
||||
jar = fetchurl {
|
||||
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
|
||||
hash = "sha256-OvpkNeppbaSnZBbRkHqoIVEVhKxhuJYTFDZm1n5reik=";
|
||||
hash = "sha256-e7qbXV61fbOQZy3c5XGmfenVzwsOj+YQxNveFfvlkHc=";
|
||||
};
|
||||
macosx = fetchurl {
|
||||
url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java21.zip";
|
||||
hash = "sha256-dVy+gEokVDImS/wOM8h6RqgfAnMHIiSQfb/8BoZICJo=";
|
||||
hash = "sha256-9qSb8gGNuWhIIV/ZOtLTVnUAGME1HfGuA9zeatWLKmY=";
|
||||
};
|
||||
pkg = fetchsvn {
|
||||
url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
let
|
||||
pname = "ledger-live-desktop";
|
||||
version = "4.15.0";
|
||||
version = "4.17.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
|
||||
hash = "sha256-3gEzJNxuoZuCUt3+tsnR1T2DBK8wvhEGEopd+jliTVk=";
|
||||
hash = "sha256-6wz6o7HX7cRp6nC/cTh5FdLNuDUdjmhzts0+qedP/eY=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
||||
@@ -9,16 +9,19 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "oras";
|
||||
version = "1.3.0";
|
||||
version = "1.3.3";
|
||||
|
||||
# required for tests
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oras-project";
|
||||
repo = "oras";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-kGPHW+SSmCJhvhGxpzKFlc80sjYqeCEmwr/f0ltILE4=";
|
||||
hash = "sha256-jA9x6Y/+3PZNKbHZbOOg9EJ+APz3jAI6RgHmAa/ykQ4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-TDYvYmzAgkL+ZrYKt9HTW7NQAGxd/cYu7e7MRYbW8ho=";
|
||||
vendorHash = "sha256-U+CJPrj404oI51mBTMJqjZEFq265of0K55WRzMhMyOQ=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
callPackage,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
go-md2man,
|
||||
@@ -54,11 +56,9 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
let
|
||||
binPackages = [
|
||||
llama-cpp-vulkan
|
||||
python3Packages.huggingface-hub
|
||||
]
|
||||
++ (with python3Packages; [
|
||||
huggingface-hub
|
||||
mlx-lm
|
||||
])
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin python3Packages.mlx-lm
|
||||
++ lib.optional withPodman podman;
|
||||
in
|
||||
''
|
||||
@@ -82,10 +82,30 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = ./update.sh;
|
||||
|
||||
tests = {
|
||||
nocontainer = callPackage ./tests/nocontainer.nix {
|
||||
ramalama = finalAttrs.finalPackage;
|
||||
};
|
||||
|
||||
withoutPodman = ramalama.override {
|
||||
withPodman = false;
|
||||
};
|
||||
}
|
||||
//
|
||||
lib.optionalAttrs
|
||||
(
|
||||
stdenv.hostPlatform.isDarwin
|
||||
|| (stdenv.hostPlatform.isLinux && (stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isAarch64))
|
||||
)
|
||||
{
|
||||
podman = callPackage ./tests/podman.nix { };
|
||||
}
|
||||
// lib.optionalAttrs stdenv.hostPlatform.isDarwin {
|
||||
mlx = callPackage ./tests/mlx.nix {
|
||||
ramalama = finalAttrs.finalPackage;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
128
pkgs/by-name/ra/ramalama/tests/common.nix
Normal file
128
pkgs/by-name/ra/ramalama/tests/common.nix
Normal file
@@ -0,0 +1,128 @@
|
||||
{
|
||||
curl,
|
||||
lib,
|
||||
ramalama,
|
||||
runCommand,
|
||||
writableTmpDirAsHomeHook,
|
||||
writeShellScriptBin,
|
||||
}:
|
||||
|
||||
let
|
||||
mkServeTestRunner =
|
||||
{
|
||||
model,
|
||||
runtime ? "llama.cpp",
|
||||
port,
|
||||
host ? "127.0.0.1",
|
||||
nocontainer ? false,
|
||||
image ? null,
|
||||
extraCheck ? "",
|
||||
}:
|
||||
|
||||
let
|
||||
ramalamaExe = lib.getExe ramalama;
|
||||
modelArg = lib.escapeShellArg model;
|
||||
serveOptions = lib.concatStringsSep " " (
|
||||
[
|
||||
# Models and container images are preloaded; serving must stay offline.
|
||||
"--pull never"
|
||||
]
|
||||
# Nix's macOS builders cannot initialize Metal.
|
||||
++ lib.optional nocontainer ''--runtime-args "--device none"''
|
||||
++ lib.optional (image != null) "--image ${image}"
|
||||
);
|
||||
in
|
||||
writeShellScriptBin "ramalama-serve-test" ''
|
||||
set -euo pipefail
|
||||
|
||||
test_store="''${TMPDIR:-/tmp}/store"
|
||||
test_log="''${TMPDIR:-/tmp}/ramalama.log"
|
||||
test_url="http://127.0.0.1:${toString port}"
|
||||
|
||||
${ramalamaExe} \
|
||||
--store "$test_store" \
|
||||
pull \
|
||||
${modelArg}
|
||||
|
||||
${ramalamaExe} ${lib.optionalString nocontainer "--nocontainer"} \
|
||||
--runtime ${runtime} \
|
||||
--store "$test_store" \
|
||||
serve \
|
||||
--host ${host} \
|
||||
--port ${toString port} \
|
||||
${serveOptions} \
|
||||
${modelArg} \
|
||||
>"$test_log" 2>&1 &
|
||||
ramalama_pid=$!
|
||||
trap 'kill "$ramalama_pid" 2>/dev/null || true' EXIT
|
||||
|
||||
ready=0
|
||||
for _ in {1..120}; do
|
||||
if ${lib.getExe curl} --fail --silent --max-time 2 "$test_url/health" >/dev/null 2>&1; then
|
||||
ready=1
|
||||
break
|
||||
fi
|
||||
kill -0 "$ramalama_pid" 2>/dev/null || break
|
||||
sleep 1
|
||||
done
|
||||
|
||||
if (( ! ready )); then
|
||||
cat "$test_log"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
${extraCheck}
|
||||
|
||||
chat_response=$(
|
||||
${ramalamaExe} --runtime ${runtime} chat \
|
||||
--url "$test_url/v1" \
|
||||
--max-tokens 16 \
|
||||
--temp 0 \
|
||||
"Hello"
|
||||
)
|
||||
|
||||
if [[ "''${chat_response,,}" != *hello* ]]; then
|
||||
echo "chat response did not contain hello:" >&2
|
||||
printf '%s\n' "$chat_response" >&2
|
||||
exit 1
|
||||
fi
|
||||
'';
|
||||
in
|
||||
{
|
||||
inherit mkServeTestRunner;
|
||||
|
||||
mkServeTest =
|
||||
{
|
||||
name,
|
||||
model,
|
||||
runtime ? "llama.cpp",
|
||||
port,
|
||||
setup ? "",
|
||||
nocontainer ? false,
|
||||
}:
|
||||
|
||||
runCommand name
|
||||
{
|
||||
nativeBuildInputs = [
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
}
|
||||
''
|
||||
${setup}
|
||||
|
||||
${
|
||||
mkServeTestRunner {
|
||||
inherit
|
||||
model
|
||||
runtime
|
||||
port
|
||||
nocontainer
|
||||
;
|
||||
}
|
||||
}/bin/ramalama-serve-test
|
||||
|
||||
touch "$out"
|
||||
'';
|
||||
}
|
||||
8
pkgs/by-name/ra/ramalama/tests/llama-cpp-model.nix
Normal file
8
pkgs/by-name/ra/ramalama/tests/llama-cpp-model.nix
Normal file
@@ -0,0 +1,8 @@
|
||||
{ fetchurl }:
|
||||
|
||||
"file://${
|
||||
fetchurl {
|
||||
url = "https://huggingface.co/bartowski/SmolLM2-135M-Instruct-GGUF/resolve/main/SmolLM2-135M-Instruct-Q4_K_M.gguf";
|
||||
hash = "sha256-LoBAzq54Favg3LNUC5mV6qH6DSyp55fQpjWuRDPGjC0=";
|
||||
}
|
||||
}"
|
||||
22
pkgs/by-name/ra/ramalama/tests/mlx-model-files.json
Normal file
22
pkgs/by-name/ra/ramalama/tests/mlx-model-files.json
Normal file
@@ -0,0 +1,22 @@
|
||||
{
|
||||
"repo": "mlx-community/SmolLM2-135M-Instruct-8bit",
|
||||
"revision": "0f0d9b8218915bc34d401e1a340b8c049d300d5e",
|
||||
"files": [
|
||||
{
|
||||
"name": "config.json",
|
||||
"hash": "sha256-XakZBe/f3pBfVm121AMebKfEyyoB3E44EqcLhVGI/HM="
|
||||
},
|
||||
{
|
||||
"name": "model.safetensors",
|
||||
"hash": "sha256-7Facdx5WQkY2vpliWrqQMavFJaaKX0qxbWeOypb+8Sw="
|
||||
},
|
||||
{
|
||||
"name": "tokenizer.json",
|
||||
"hash": "sha256-fSfEk8cppm7O/INygLBdlIse1Q0TDuvb+RGxs2zzjtc="
|
||||
},
|
||||
{
|
||||
"name": "tokenizer_config.json",
|
||||
"hash": "sha256-on9ji9KDH1w96mVKdYOJMPKxH75VDE1OHV170HFXsu4="
|
||||
}
|
||||
]
|
||||
}
|
||||
50
pkgs/by-name/ra/ramalama/tests/mlx.nix
Normal file
50
pkgs/by-name/ra/ramalama/tests/mlx.nix
Normal file
@@ -0,0 +1,50 @@
|
||||
{
|
||||
callPackage,
|
||||
fetchurl,
|
||||
lib,
|
||||
ramalama,
|
||||
}:
|
||||
|
||||
let
|
||||
modelData = builtins.fromJSON (builtins.readFile ./mlx-model-files.json);
|
||||
|
||||
modelFiles = map (file: {
|
||||
inherit (file) name;
|
||||
src = fetchurl {
|
||||
url = "https://huggingface.co/${modelData.repo}/resolve/${modelData.revision}/${file.name}";
|
||||
inherit (file) hash;
|
||||
};
|
||||
}) modelData.files;
|
||||
|
||||
refFile = builtins.toJSON {
|
||||
version = "v1.0.1";
|
||||
hash = modelData.revision;
|
||||
path = "";
|
||||
files = map (file: {
|
||||
hash = file.name;
|
||||
inherit (file) name;
|
||||
type = if lib.hasSuffix ".safetensors" file.name then "safetensor" else "other";
|
||||
}) modelData.files;
|
||||
};
|
||||
in
|
||||
(callPackage ./common.nix { inherit ramalama; }).mkServeTest {
|
||||
name = "ramalama-mlx-test";
|
||||
runtime = "mlx";
|
||||
port = 18081;
|
||||
model = "hf://${modelData.repo}";
|
||||
|
||||
setup = ''
|
||||
modelBase="$TMPDIR/store/store/huggingface/${modelData.repo}"
|
||||
snapshot="$modelBase/snapshots/${modelData.revision}"
|
||||
mkdir -p "$modelBase/blobs" "$modelBase/refs" "$snapshot"
|
||||
|
||||
${lib.concatMapStrings (file: ''
|
||||
ln -s ${file.src} "$modelBase/blobs/${file.name}"
|
||||
ln -s "$modelBase/blobs/${file.name}" "$snapshot/${file.name}"
|
||||
'') modelFiles}
|
||||
|
||||
cat >"$modelBase/refs/latest.json" <<'EOF'
|
||||
${refFile}
|
||||
EOF
|
||||
'';
|
||||
}
|
||||
11
pkgs/by-name/ra/ramalama/tests/nocontainer.nix
Normal file
11
pkgs/by-name/ra/ramalama/tests/nocontainer.nix
Normal file
@@ -0,0 +1,11 @@
|
||||
{
|
||||
callPackage,
|
||||
ramalama,
|
||||
}:
|
||||
|
||||
(callPackage ./common.nix { inherit ramalama; }).mkServeTest {
|
||||
name = "ramalama-nocontainer-test";
|
||||
port = 18080;
|
||||
model = callPackage ./llama-cpp-model.nix { };
|
||||
nocontainer = true;
|
||||
}
|
||||
15
pkgs/by-name/ra/ramalama/tests/podman-images.json
Normal file
15
pkgs/by-name/ra/ramalama/tests/podman-images.json
Normal file
@@ -0,0 +1,15 @@
|
||||
{
|
||||
"imageName": "quay.io/ramalama/ramalama",
|
||||
"imageTag": "0.22",
|
||||
"imageDigest": "sha256:01f652adb2d7bed7c3eb960ee3fe1dc9b6addff003ed58932048cee01db78302",
|
||||
"images": {
|
||||
"x86_64-linux": {
|
||||
"arch": "amd64",
|
||||
"hash": "sha256-Llykx761YUa50nsckZELxNSbjeDxBElWWshT7KQd5pE="
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"arch": "arm64",
|
||||
"hash": "sha256-9It9EuYxmZ2UThQYr9FD63C/uBVS1ufP7bnZeA9psqI="
|
||||
}
|
||||
}
|
||||
}
|
||||
66
pkgs/by-name/ra/ramalama/tests/podman.nix
Normal file
66
pkgs/by-name/ra/ramalama/tests/podman.nix
Normal file
@@ -0,0 +1,66 @@
|
||||
{
|
||||
callPackage,
|
||||
dockerTools,
|
||||
stdenv,
|
||||
testers,
|
||||
}:
|
||||
|
||||
let
|
||||
imageInfo = builtins.fromJSON (builtins.readFile ./podman-images.json);
|
||||
|
||||
inherit (imageInfo) imageName imageTag;
|
||||
|
||||
system = if stdenv.hostPlatform.isDarwin then "aarch64-linux" else stdenv.hostPlatform.system;
|
||||
imagePin = imageInfo.images.${system};
|
||||
|
||||
ramalamaImage = dockerTools.pullImage {
|
||||
inherit imageName;
|
||||
inherit (imageInfo) imageDigest;
|
||||
inherit (imagePin) hash arch;
|
||||
finalImageTag = imageTag;
|
||||
};
|
||||
|
||||
port = 18082;
|
||||
in
|
||||
testers.runNixOSTest {
|
||||
name = "ramalama-podman-test";
|
||||
|
||||
nodes.machine =
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
serveTestRunner = (pkgs.callPackage ./common.nix { }).mkServeTestRunner {
|
||||
model = pkgs.callPackage ./llama-cpp-model.nix { };
|
||||
inherit port;
|
||||
host = "0.0.0.0";
|
||||
image = "${imageName}:${imageTag}";
|
||||
extraCheck = ''
|
||||
podman ps --format '{{.Image}}' | grep -Fx ${imageName}:${imageTag}
|
||||
'';
|
||||
};
|
||||
in
|
||||
{
|
||||
# Not strictly required on Linux, but on darwin case-insensitive file
|
||||
# systems, libxt_mark.so may be renamed to libxt_mark.so~nix~case~hack~1
|
||||
# which breaks netavark networking inside the machine. Workaround with
|
||||
# nftables.
|
||||
networking.nftables.enable = true;
|
||||
|
||||
virtualisation = {
|
||||
cores = 2;
|
||||
# Podman expands the pinned image under /var/lib/containers/storage.
|
||||
diskSize = 10 * 1024;
|
||||
podman.enable = true;
|
||||
};
|
||||
|
||||
environment.systemPackages = [
|
||||
serveTestRunner
|
||||
];
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
machine.succeed("podman load -i ${ramalamaImage}")
|
||||
|
||||
machine.succeed("ramalama-serve-test")
|
||||
'';
|
||||
}
|
||||
51
pkgs/by-name/ra/ramalama/tests/update-mlx-model-files.sh
Executable file
51
pkgs/by-name/ra/ramalama/tests/update-mlx-model-files.sh
Executable file
@@ -0,0 +1,51 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
script_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
|
||||
metadata_file="$script_dir/mlx-model-files.json"
|
||||
|
||||
repo="$(jq --raw-output '.repo' "$metadata_file")"
|
||||
model_json="$(curl --fail --silent --show-error "https://huggingface.co/api/models/$repo/revision/main")"
|
||||
resolved_revision="$(jq --raw-output '.sha' <<<"$model_json")"
|
||||
base_url="https://huggingface.co/$repo/resolve/$resolved_revision"
|
||||
|
||||
files=$(
|
||||
jq --raw-output '
|
||||
.siblings[].rfilename
|
||||
# Keep the test closure to files needed by MLX at runtime. Hugging Face
|
||||
# repos often also contain docs, examples, or alternate model formats.
|
||||
| select(
|
||||
. == "config.json"
|
||||
or . == "tokenizer.json"
|
||||
or . == "tokenizer_config.json"
|
||||
or (startswith("model") and endswith(".safetensors"))
|
||||
)
|
||||
' <<<"$model_json"
|
||||
)
|
||||
|
||||
files_json="$(mktemp)"
|
||||
trap 'rm -f "$files_json"' EXIT
|
||||
|
||||
while IFS= read -r name; do
|
||||
url="$base_url/$name"
|
||||
hash32="$(nix-prefetch-url "$url")"
|
||||
hash="$(nix hash convert --hash-algo sha256 --to sri "$hash32")"
|
||||
|
||||
jq --null-input \
|
||||
--arg name "$name" \
|
||||
--arg hash "$hash" \
|
||||
'{name: $name, hash: $hash}' \
|
||||
>>"$files_json"
|
||||
done <<<"$files"
|
||||
|
||||
jq --slurp \
|
||||
--arg revision "$resolved_revision" \
|
||||
'. as $inputs
|
||||
| $inputs[0]
|
||||
| .revision = $revision
|
||||
| .files = $inputs[1:]' \
|
||||
"$metadata_file" \
|
||||
"$files_json" \
|
||||
>"$metadata_file.tmp"
|
||||
|
||||
mv "$metadata_file.tmp" "$metadata_file"
|
||||
57
pkgs/by-name/ra/ramalama/update.sh
Executable file
57
pkgs/by-name/ra/ramalama/update.sh
Executable file
@@ -0,0 +1,57 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p jq nix-prefetch-docker nix-update nixfmt
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
cd "$(git rev-parse --show-toplevel)"
|
||||
|
||||
podman_images="pkgs/by-name/ra/ramalama/tests/podman-images.json"
|
||||
|
||||
if [[ $# -gt 0 ]]; then
|
||||
nix-update --format --version "${1#v}" ramalama
|
||||
else
|
||||
nix-update --format --use-github-releases ramalama
|
||||
fi
|
||||
|
||||
version="$(nix-instantiate --eval -A ramalama.version | jq --raw-output .)"
|
||||
|
||||
image_name="quay.io/ramalama/ramalama"
|
||||
image_tag="${version%.*}"
|
||||
|
||||
prefetch_image() {
|
||||
local arch="$1"
|
||||
nix-prefetch-docker \
|
||||
--json \
|
||||
--quiet \
|
||||
--arch "$arch" \
|
||||
"$image_name" \
|
||||
"$image_tag"
|
||||
}
|
||||
|
||||
amd64_image="$(prefetch_image amd64)"
|
||||
arm64_image="$(prefetch_image arm64)"
|
||||
|
||||
jq \
|
||||
--null-input \
|
||||
--arg imageName "$image_name" \
|
||||
--arg imageTag "$image_tag" \
|
||||
--argjson amd64 "$amd64_image" \
|
||||
--argjson arm64 "$arm64_image" \
|
||||
'if $amd64.imageDigest != $arm64.imageDigest then
|
||||
error("image digest differs between architectures")
|
||||
else {
|
||||
imageName: $imageName,
|
||||
imageTag: $imageTag,
|
||||
imageDigest: $amd64.imageDigest,
|
||||
images: {
|
||||
"x86_64-linux": {
|
||||
arch: "amd64",
|
||||
hash: $amd64.hash
|
||||
},
|
||||
"aarch64-linux": {
|
||||
arch: "arm64",
|
||||
hash: $arm64.hash
|
||||
}
|
||||
}
|
||||
} end' >"$podman_images.tmp"
|
||||
mv "$podman_images.tmp" "$podman_images"
|
||||
@@ -16,18 +16,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "spade";
|
||||
version = "0.18.0";
|
||||
version = "0.20.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "spade-lang";
|
||||
repo = "spade";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-BSbE0hJvCIaxxqCo+QltZuoS2yst6TgUnHXAE4kZD2A=";
|
||||
hash = "sha256-POMt+uTSaP+XADFbAwWLxzm6FZiyoMIrDFfTtBMPIgs=";
|
||||
# only needed for vatch, which contains test data
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoHash = "sha256-+lQiXOof6MnjnVf8CXNYgeyzFMf0myLErbSfnjLVZWU=";
|
||||
cargoHash = "sha256-j/h9UzcsojELd/bYX6/w54PwuqMViEAOKE9tsmQOhXY=";
|
||||
|
||||
# TODO: somehow respect https://nixos.org/manual/nixpkgs/stable/#var-passthru-updateScript-commit
|
||||
passthru.updateScript = _experimental-update-script-combinators.sequence [
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "swim";
|
||||
version = "0.18.0";
|
||||
version = "0.20.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "spade-lang";
|
||||
repo = "swim";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-l0iEzctt3WHW7m3wnr5WdthqBlGSh0SxHCQlM6it0Ds=";
|
||||
hash = "sha256-pd/ej6WCS36gHlzkHM+pSyV2e87jIAk/kR8OU+nmrDk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-k3sWg/oG5+ckxa10Jt/AncbyoB8kaOcG3xKPg1fl/ME=";
|
||||
cargoHash = "sha256-7yQytwWDmb58aQzVb4EJZ1e7212qfaPXUhvO6fzbg/M=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -10,12 +10,12 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "terraria-server";
|
||||
version = "1.4.5.6";
|
||||
version = "1.4.5.8";
|
||||
urlVersion = lib.replaceStrings [ "." ] [ "" ] finalAttrs.version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://terraria.org/api/download/pc-dedicated-server/terraria-server-${finalAttrs.urlVersion}.zip";
|
||||
hash = "sha256-11xFWsIX/TQ0RIyPglHBNH8IdahcQ4WJ3HG1V3d+kVU=";
|
||||
hash = "sha256-9ROkrJeJ00r3Zika4hfJzX2UcuE3gqDisXUS9w16gzQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -54,6 +54,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
postInstall = ''
|
||||
mkdir -p $out/lib/xrizer/$platformPath
|
||||
mv "$out/lib/libxrizer.so" "$out/lib/xrizer/$platformPath/vrclient.so"
|
||||
touch $out/lib/xrizer/bin/version.txt
|
||||
'';
|
||||
|
||||
platformPath = platformPaths."${stdenv.hostPlatform.system}";
|
||||
|
||||
@@ -15,14 +15,14 @@ let
|
||||
variants = {
|
||||
# ./update-xanmod.sh lts
|
||||
lts = {
|
||||
version = "6.18.45";
|
||||
hash = "sha256-nY5SSwySTxBEMF3FfMsEaAyzQkBoWrRzVtTTr9l6bCQ=";
|
||||
version = "6.18.46";
|
||||
hash = "sha256-MQm9lAw5U3s9p99XT8eDechXj4lhsv6Gmf79+QF3xYU=";
|
||||
isLTS = true;
|
||||
};
|
||||
# ./update-xanmod.sh main
|
||||
main = {
|
||||
version = "7.1.9";
|
||||
hash = "sha256-CtI5ExbqLKer2H3YdT6SbTSJfIfRfdIYUHnf96PXGgk=";
|
||||
version = "7.1.10";
|
||||
hash = "sha256-W5ipVe/kCQtR2YNsbB7YDEMM1FQUxWrF3HcFzf7i7/I=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
lib,
|
||||
nixosTests,
|
||||
stdenv,
|
||||
fetchpatch,
|
||||
...
|
||||
}@args:
|
||||
|
||||
@@ -13,10 +12,10 @@ callPackage ./generic.nix args {
|
||||
kernelModuleAttribute = "zfs_2_3";
|
||||
|
||||
kernelMinSupportedMajorMinor = "4.18";
|
||||
kernelMaxSupportedMajorMinor = "7.0";
|
||||
kernelMaxSupportedMajorMinor = "7.2";
|
||||
|
||||
# this package should point to the latest release.
|
||||
version = "2.3.8";
|
||||
version = "2.3.9";
|
||||
|
||||
tests = {
|
||||
inherit (nixosTests.zfs) series_2_3;
|
||||
@@ -30,5 +29,5 @@ callPackage ./generic.nix args {
|
||||
amarshall
|
||||
];
|
||||
|
||||
hash = "sha256-qNBInNRpWrmImcermSHC0emYmnnjNvxWj3QnGtA6SUg=";
|
||||
hash = "sha256-JQc9JOJLrqKUqFowg+Bs2d2YWQXBjTqCCelL5JpnvyQ=";
|
||||
}
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
lib,
|
||||
nixosTests,
|
||||
stdenv,
|
||||
fetchpatch,
|
||||
...
|
||||
}@args:
|
||||
|
||||
@@ -13,26 +12,13 @@ callPackage ./generic.nix args {
|
||||
kernelModuleAttribute = "zfs_2_4";
|
||||
|
||||
kernelMinSupportedMajorMinor = "4.18";
|
||||
kernelMaxSupportedMajorMinor = "7.0";
|
||||
kernelMaxSupportedMajorMinor = "7.2";
|
||||
|
||||
# this package should point to the latest release.
|
||||
version = "2.4.3";
|
||||
version = "2.4.4";
|
||||
|
||||
# if adding a patch here, check if it also needs to be applied to zfs_unstable
|
||||
extraPatches = [
|
||||
# https://github.com/openzfs/zfs/issues/18366
|
||||
# dedup data corruption fix unreleased as of OpenZFS 2.4.3
|
||||
(fetchpatch {
|
||||
url = "https://github.com/openzfs/zfs/commit/6fb72fda0f60d9efb591e320f83f78b19ec451cc.patch?full_index=1";
|
||||
hash = "sha256-UuSVmO61Ux5S3F+JAtRnHyeVS4EFobDTKBuD5s8PI+k=";
|
||||
})
|
||||
# backport kernel memory corruption fix
|
||||
# https://github.com/openzfs/zfs/issues/18787
|
||||
(fetchpatch {
|
||||
url = "https://github.com/openzfs/zfs/commit/223b8bc446851e5e796e5446ac24d03bbf468f43.patch?full_index=1";
|
||||
hash = "sha256-I29A+NLYLzy7cMC8FQpBdSYbjFu/kscgTW8mAauPVf4=";
|
||||
})
|
||||
];
|
||||
extraPatches = [ ];
|
||||
|
||||
tests = {
|
||||
inherit (nixosTests.zfs) series_2_4;
|
||||
@@ -46,5 +32,5 @@ callPackage ./generic.nix args {
|
||||
amarshall
|
||||
];
|
||||
|
||||
hash = "sha256-I1wLbstr0cFiGsyynP9kJ9ATRp/2b+fnnsdz0up+IzM=";
|
||||
hash = "sha256-ZgfHTPsNoeDq6GKP4Xiti7Keis3vIZLDaTGQjgCItIc=";
|
||||
}
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{
|
||||
callPackage,
|
||||
nixosTests,
|
||||
fetchpatch,
|
||||
...
|
||||
}@args:
|
||||
|
||||
@@ -11,36 +10,23 @@ callPackage ./generic.nix args {
|
||||
kernelModuleAttribute = "zfs_unstable";
|
||||
|
||||
kernelMinSupportedMajorMinor = "4.18";
|
||||
kernelMaxSupportedMajorMinor = "7.0";
|
||||
kernelMaxSupportedMajorMinor = "7.2";
|
||||
|
||||
# this package should point to a version / git revision compatible with the latest kernel release
|
||||
# IMPORTANT: Always use a tagged release candidate or commits from the
|
||||
# zfs-<version>-staging branch, because this is tested by the OpenZFS
|
||||
# maintainers.
|
||||
version = "2.4.3";
|
||||
version = "2.4.4";
|
||||
# rev = "";
|
||||
|
||||
# if adding a patch here, check if it also needs to be applied to the stable branches
|
||||
extraPatches = [
|
||||
# https://github.com/openzfs/zfs/issues/18366
|
||||
# dedup data corruption fix unreleased as of OpenZFS 2.4.3
|
||||
(fetchpatch {
|
||||
url = "https://github.com/openzfs/zfs/commit/6fb72fda0f60d9efb591e320f83f78b19ec451cc.patch?full_index=1";
|
||||
hash = "sha256-UuSVmO61Ux5S3F+JAtRnHyeVS4EFobDTKBuD5s8PI+k=";
|
||||
})
|
||||
# backport kernel memory corruption fix
|
||||
# https://github.com/openzfs/zfs/issues/18787
|
||||
(fetchpatch {
|
||||
url = "https://github.com/openzfs/zfs/commit/223b8bc446851e5e796e5446ac24d03bbf468f43.patch?full_index=1";
|
||||
hash = "sha256-I29A+NLYLzy7cMC8FQpBdSYbjFu/kscgTW8mAauPVf4=";
|
||||
})
|
||||
];
|
||||
extraPatches = [ ];
|
||||
|
||||
tests = {
|
||||
inherit (nixosTests.zfs) unstable;
|
||||
};
|
||||
|
||||
hash = "sha256-I1wLbstr0cFiGsyynP9kJ9ATRp/2b+fnnsdz0up+IzM=";
|
||||
hash = "sha256-ZgfHTPsNoeDq6GKP4Xiti7Keis3vIZLDaTGQjgCItIc=";
|
||||
|
||||
extraLongDescription = ''
|
||||
This is "unstable" ZFS, and will usually be a pre-release version of ZFS.
|
||||
|
||||
@@ -21,8 +21,8 @@ let
|
||||
in
|
||||
buildMongoDB {
|
||||
inherit avxSupport;
|
||||
version = "7.0.39";
|
||||
hash = "sha256-VB20nhb0mMf9xVs/R4i+4wWoqHoDNWNouDw3FRehBP8=";
|
||||
version = "7.0.40";
|
||||
hash = "sha256-0KDqI/tMxklGkOvXcehmufiWvmNrf8Jj2llCH91gNlw=";
|
||||
patches = [
|
||||
# ModuleNotFoundError: No module named 'mongo_tooling_metrics':
|
||||
# NameError: name 'SConsToolingMetrics' is not defined:
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
config = {
|
||||
allowAliases = false;
|
||||
allowUnfree = true;
|
||||
cudaSupport = true;
|
||||
cudaSupport = false;
|
||||
inHydra = true;
|
||||
};
|
||||
|
||||
@@ -93,7 +93,7 @@ let
|
||||
attrPath: !(lib.hasPrefix "linuxKernel" attrPath || lib.hasPrefix "linuxPackages" attrPath);
|
||||
|
||||
# This is handled by release-cuda.nix
|
||||
isNotCudaPackage = attrPath: !(lib.hasPrefix "cuda" attrPath);
|
||||
isNotCudaPackage = attrPath: !(lib.hasInfix "cuda" attrPath || lib.hasInfix "nvidia" attrPath);
|
||||
|
||||
canSubstituteSrc =
|
||||
pkg:
|
||||
|
||||
Reference in New Issue
Block a user