Skip to content

Commit 23fa8cc

Browse files
nixpkgs-ci[bot]nixpkgs-ci[bot]
authored
Merge master into staging-next
2 parents 3e72182 + a07d4ce commit 23fa8cc

68 files changed

Lines changed: 749 additions & 625 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎doc/languages-frameworks/neovim.section.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ For instance, `sqlite-lua` needs `g:sqlite_clib_path` to be set to work. Nixpkgs
6464
- `wrapRc`: Nix, not being able to write in your `$HOME`, loads the
6565
generated Neovim configuration via the `$VIMINIT` environment variable, i.e. : `export VIMINIT='lua dofile("/nix/store/…-init.lua")'`. This has side effects like preventing Neovim from sourcing your `init.lua` in `$XDG_CONFIG_HOME/nvim` (see bullet 7 of [`:help startup`](https://neovim.io/doc/user/starting.html#startup) in Neovim). Disable it if you want to generate your own wrapper. You can still reuse the generated vimscript init code via `neovim.passthru.initRc`.
6666
- `plugins`: A list of plugins to add to the wrapper.
67+
- `extraLuaPackages`: A function passed on to `lua.withPackages`
6768
- `withPython3`, `withNodeJs`, `withRuby` control when to enable neovim
6869
providers (see `:h provider`).
6970

@@ -90,6 +91,7 @@ wrapNeovimUnstable neovim-unwrapped {
9091
(nvim-treesitter.withPlugins (p: [ p.nix p.python ]))
9192
hex-nvim
9293
];
94+
extraLuaPackages = lp: [ lp.mpack ];
9395
withPython3 = true;
9496
withNodeJs = false;
9597
withRuby = false;

‎pkgs/applications/editors/neovim/tests/default.nix‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -348,12 +348,12 @@ pkgs.lib.recurseIntoAttrs rec {
348348
configure.packages.foo.start = with vimPlugins; [ deoplete-nvim ];
349349
};
350350

351-
nvimWithLuaPackages = wrapNeovim2 "-with-lua-packages" (makeNeovimConfig {
351+
nvimWithLuaPackages = wrapNeovim2 "-with-lua-packages" {
352352
extraLuaPackages = ps: [ ps.mpack ];
353-
customRC = ''
354-
lua require("mpack")
353+
luaRcContent = ''
354+
require("mpack")
355355
'';
356-
});
356+
};
357357

358358
nvim_with_lua_packages = runTest nvimWithLuaPackages ''
359359
${nvimWithLuaPackages}/bin/nvim -V3log.txt -i NONE --noplugin +quitall! -e

‎pkgs/applications/editors/neovim/wrapper.nix‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ let
6969
# { plugin=far-vim; config = "let g:far#source='rg'"; optional = false; }
7070
# ]
7171
plugins ? [ ],
72+
# the function you would have passed to lua.withPackages
73+
extraLuaPackages ? (_: [ ]),
7274
...
7375
}@attrs:
7476
assert
@@ -105,8 +107,23 @@ let
105107
packpathDirs.myNeovimPackages = vimPackageInfo.vimPackage;
106108
finalPackdir = neovimUtils.packDir packpathDirs;
107109

110+
luaPathLuaRc =
111+
let
112+
luaEnv = lua.withPackages extraLuaPackages;
113+
114+
# getLuaPath / getLuaCPath are not interpreter dependant at the moment and might thus cause
115+
# errors between luajit/Puc lua
116+
generatedLuaPath = lua.pkgs.getLuaPath luaEnv;
117+
generatedLuaCPath = lua.pkgs.getLuaCPath luaEnv;
118+
in
119+
''
120+
package.path = "${generatedLuaPath}".. ";" .. package.path
121+
package.cpath = "${generatedLuaCPath}".. ";" .. package.cpath
122+
'';
123+
108124
rcContent = lib.concatStringsSep "\n" (
109125
[
126+
luaPathLuaRc
110127
providerLuaRc
111128
]
112129
++ lib.optional (luaRcContent != "") luaRcContent

‎pkgs/applications/networking/cluster/rke2/1_32/images-versions.json‎

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,138 +1,138 @@
11
{
22
"images-calico-linux-amd64-tar-gz": {
3-
"url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz",
4-
"sha256": "41986d200020dc3701a6c856abe9ddf6528d4ccff6cb7c25cd4134d76db7ea20"
3+
"url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz",
4+
"sha256": "b2b1ce6fc213202829513dd99997de7979dc5dd26f4fad8e02918848928ac892"
55
},
66
"images-calico-linux-amd64-tar-zst": {
7-
"url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst",
8-
"sha256": "e423f7a8e0ce39534ded83bba7775c69ef29b374ec9da9f66d62cee7fa6a8c5b"
7+
"url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst",
8+
"sha256": "9aae79e102c20418d184906f5e1e36bb01c6a2c41b7e9405b2a20816d0ec58ff"
99
},
1010
"images-calico-linux-arm64-tar-gz": {
11-
"url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz",
12-
"sha256": "5b2eed3462d4e50938c773232b3ab9b2645eeb63f86c6b4e1c94ca001581b328"
11+
"url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz",
12+
"sha256": "52bdb3ebd6f2cbe4fe0a1894dda8f853e33bc31eaee83a352d014f3464168116"
1313
},
1414
"images-calico-linux-arm64-tar-zst": {
15-
"url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst",
16-
"sha256": "58c2942534eb1bba50e72f19db7da3b982e933380461b4489f9df57a08fbf983"
15+
"url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst",
16+
"sha256": "86f6f5cfe607e15eeb7a35522325ccbea56f1d84ca27cd02c626e4356ca54c56"
1717
},
1818
"images-canal-linux-amd64-tar-gz": {
19-
"url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz",
20-
"sha256": "0f351f3c8b10db857c7fb4258d0699b0644dc14da780461022b5437b277191b4"
19+
"url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz",
20+
"sha256": "1fbe1a2c48fcedcec613cee071f0b524f007a191c858952c0c6243c28a292e30"
2121
},
2222
"images-canal-linux-amd64-tar-zst": {
23-
"url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst",
24-
"sha256": "a7c22d3de484a2f9e9b6ca9d2a454d392160a1fada9a958917f2aa3bf3f38b81"
23+
"url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst",
24+
"sha256": "7e3f80b037079922f6a0aaf5a701459ef550d67ca31119a0c74955254fa52b1e"
2525
},
2626
"images-canal-linux-arm64-tar-gz": {
27-
"url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz",
28-
"sha256": "90a3f2f93055fed4b2990de9cbdb89bc444424d9e7798944c5850e209b62fd6b"
27+
"url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz",
28+
"sha256": "1152d6f24c5b955e37300cbfcd68a8c212c1036ce8964e2ffc22422522fa1d83"
2929
},
3030
"images-canal-linux-arm64-tar-zst": {
31-
"url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst",
31+
"url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst",
3232
"sha256": "50f4d1b1bb03523b922d7ce989d2d83f009d751d7fbf4aa8821fe52c9b9fd96d"
3333
},
3434
"images-cilium-linux-amd64-tar-gz": {
35-
"url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz",
36-
"sha256": "96a22c3e25093a0fe244180bb4156ddd1c8718e522297f8a45505d9946297f49"
35+
"url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz",
36+
"sha256": "c28b224620327061bb707c31733c3428a7573e2f905178ddd9d038dec7d00370"
3737
},
3838
"images-cilium-linux-amd64-tar-zst": {
39-
"url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst",
40-
"sha256": "1899735f0c9bf506a4a510301cbb4848030d34c37584f5ba6a83ffcbcc06dc5a"
39+
"url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst",
40+
"sha256": "8db98924c2e9534574bab2584b08467cc1c379e740d345b8bad3768d1bed4c5f"
4141
},
4242
"images-cilium-linux-arm64-tar-gz": {
43-
"url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz",
44-
"sha256": "d4c93346ccb0298b6e8d8301971cef71f0ab2e60daed43f898883d595febc59c"
43+
"url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz",
44+
"sha256": "b6a8a882c1285687a78add12e4be64c335f13de8975f9bb7c142aadbaa1f10c5"
4545
},
4646
"images-cilium-linux-arm64-tar-zst": {
47-
"url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst",
48-
"sha256": "b7b737cb758527ce045fa189891bff4a7ec6199ed152a04271ac52be4d541027"
47+
"url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst",
48+
"sha256": "7ea32966e4a4fb2ad0c5fae8eece897d22e1a1515ce7d7954f7aa341c6ca51ac"
4949
},
5050
"images-core-linux-amd64-tar-gz": {
51-
"url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-core.linux-amd64.tar.gz",
52-
"sha256": "380f47b868a8fbe25b5bcad2a181c0eae9586423383ff84e54ed2bdef21ec5fc"
51+
"url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-core.linux-amd64.tar.gz",
52+
"sha256": "02c940745706a79eedb0b579f2368cdbdf8c54de148f4d8fda70f7ee66d7ecf2"
5353
},
5454
"images-core-linux-amd64-tar-zst": {
55-
"url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-core.linux-amd64.tar.zst",
56-
"sha256": "39be1f6bec9aef6352711e95a6b5c0f9dcaed86830dfb853d88034cc0e069d2e"
55+
"url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-core.linux-amd64.tar.zst",
56+
"sha256": "a52feceeb43d21fb8494def190841a046b896c4dfc8e964f3646916f1b20f829"
5757
},
5858
"images-core-linux-arm64-tar-gz": {
59-
"url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-core.linux-arm64.tar.gz",
60-
"sha256": "1cfe8fc43cffd97c4be1257a2c4295343c78ae17790df7440834995ed03b19f2"
59+
"url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-core.linux-arm64.tar.gz",
60+
"sha256": "2d2e23a72f23bedee62d2163df68009fc099ae9c3de1aa34c5cbcfa75f1a8e73"
6161
},
6262
"images-core-linux-arm64-tar-zst": {
63-
"url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-core.linux-arm64.tar.zst",
64-
"sha256": "b3cb602f172cd9a3145afa7cd0af9c02a0451163a9d0972d4c2f6cb3838be64d"
63+
"url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-core.linux-arm64.tar.zst",
64+
"sha256": "e872a4ceb854138916c4a283904f658398c6894e2595c348b40f03e1cdcc6f86"
6565
},
6666
"images-flannel-linux-amd64-tar-gz": {
67-
"url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz",
68-
"sha256": "b85385c0b94747af38453a57219348ae6c048526dfeac548af4d8b8a44f459b3"
67+
"url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz",
68+
"sha256": "a3f60044c7da90d4c2dd5cbc44c897ffcc2660bd1d2dcafa8a900bf8ca100589"
6969
},
7070
"images-flannel-linux-amd64-tar-zst": {
71-
"url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst",
71+
"url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst",
7272
"sha256": "d843630e86003cf4b18a1ef070b44c3a73e1431770244e853eafcecdb714bfa3"
7373
},
7474
"images-flannel-linux-arm64-tar-gz": {
75-
"url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz",
76-
"sha256": "b35d755a8e4d27774496619676c1bf23870a99f532de6826137c9c3406d90202"
75+
"url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz",
76+
"sha256": "e4a605d5af2a79bd7901f1678e488f776774916e1c5104090e813bd45a257bc3"
7777
},
7878
"images-flannel-linux-arm64-tar-zst": {
79-
"url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst",
79+
"url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst",
8080
"sha256": "c94fecb19b6b1eaa347c49fc60def2e1251d866714e9ab05ea6ce29d5da41fb3"
8181
},
8282
"images-harvester-linux-amd64-tar-gz": {
83-
"url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz",
84-
"sha256": "c3d3613c1c980bea49ace10e89559eff886d3f86a8fc9a35f314903f8414e1d8"
83+
"url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz",
84+
"sha256": "d0d213e4e6a3931950b5b61f67c9c0163838095f3fb5486e9256902aff397547"
8585
},
8686
"images-harvester-linux-amd64-tar-zst": {
87-
"url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst",
88-
"sha256": "852ace7b2824bb2a191fcf8ab40f625596ea33b3460ca897d04f97d4a319ec4f"
87+
"url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst",
88+
"sha256": "6a914bba0f07f9f3431058f2b1b2c5ed9d8124069f436bfea747c293b5276dff"
8989
},
9090
"images-harvester-linux-arm64-tar-gz": {
91-
"url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz",
92-
"sha256": "775b52176ae09fa3e758b7cf4137e81fdcc0e2b4525359b86bdf3167acc02d9d"
91+
"url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz",
92+
"sha256": "a133106b2348dcbfa28c7b219a22e6cc7cf399a741196c1a435a211050aba4b5"
9393
},
9494
"images-harvester-linux-arm64-tar-zst": {
95-
"url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst",
96-
"sha256": "166d640c5a11ac3d23bc2f95a46b47e345311af2c5186753320a32acb2092491"
95+
"url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst",
96+
"sha256": "0a28d456de6bdc33b806a236e0732c5bcb8bd01dc0e64e84eb2daee51467dace"
9797
},
9898
"images-multus-linux-amd64-tar-gz": {
99-
"url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz",
100-
"sha256": "725d693a24711ac0b235c907a2353ededb21d9666819ecb6a5c2149470832a80"
99+
"url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz",
100+
"sha256": "7df59c19b452c971cd5e739042d0cc3146ba061f3e54aeae25794203592e6866"
101101
},
102102
"images-multus-linux-amd64-tar-zst": {
103-
"url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst",
104-
"sha256": "8d3884444e465f8f41a8fc64d2af0a9ee010239ab5d7cc531fdad8e8e48952f9"
103+
"url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst",
104+
"sha256": "83c9451a8dfc116bddc38146f2a6eddef95d09348386e2b11c7d5479a114de34"
105105
},
106106
"images-multus-linux-arm64-tar-gz": {
107-
"url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz",
108-
"sha256": "535b58068296a8f9226e36f969527bca3a23ac1a917b0d99b4ac97e558041aa1"
107+
"url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz",
108+
"sha256": "77a270820a7955fe9bc7b0d2b6b4b6b8b73e6f042ddd9101b89d1cc0a1b95908"
109109
},
110110
"images-multus-linux-arm64-tar-zst": {
111-
"url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst",
112-
"sha256": "ba77ac84eda9704594aa9eb6629430f7b60606fb532e245c21bf4ca0f7fbee9b"
111+
"url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst",
112+
"sha256": "d3eb6dab20944a417d0cbc6eed3a4838c008646a40c3e6b637729f7f9251ff8c"
113113
},
114114
"images-traefik-linux-amd64-tar-gz": {
115-
"url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz",
116-
"sha256": "7682596ee35cdab6c049289ff751d83ce68cbf9771f543b6971452ec93dd16f8"
115+
"url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz",
116+
"sha256": "24f246a655706dbcfc34fb1fbe055978f79bee25791e3ba8c0239cd370b3630a"
117117
},
118118
"images-traefik-linux-amd64-tar-zst": {
119-
"url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst",
120-
"sha256": "ffdcdf38e2b9d7ceaa9d158f55294ea350015fa69e9b1a18587e8eb6bff7847e"
119+
"url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst",
120+
"sha256": "3b5b1a5016c70cc91676165a21594ce9ddc8866704c54613b98e5360e59a9f30"
121121
},
122122
"images-traefik-linux-arm64-tar-gz": {
123-
"url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz",
124-
"sha256": "f1860511e58d40827c20d742e0012b4a2eb7c1d3f69d442186f66aedfb7a1638"
123+
"url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz",
124+
"sha256": "1f553eb44e38ffe20cae2a8297c249b3d46fa1ddee859b5823102077525e2ca7"
125125
},
126126
"images-traefik-linux-arm64-tar-zst": {
127-
"url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst",
128-
"sha256": "9b19e64407a5e12c73d9c00a121e1d78481ef2fa2e7597a9e20a201a6c527013"
127+
"url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst",
128+
"sha256": "c642a0fece74ba83840a1683159c06ca029012eda63458f42919ca69d14bd724"
129129
},
130130
"images-vsphere-linux-amd64-tar-gz": {
131-
"url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz",
132-
"sha256": "83cfd9e7f8e4763e0fae6be5fa006c86caa43e6ddf8751c31c93dbbffc02c509"
131+
"url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz",
132+
"sha256": "a38d2489e69e4e25ecba96c3ecc91d087df4eb0ebb7f7dbffc9a25f3fef9e823"
133133
},
134134
"images-vsphere-linux-amd64-tar-zst": {
135-
"url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst",
136-
"sha256": "29305bfc62707f37a51b263c9a93620f1491b76b494432aca9d512262f5d11b6"
135+
"url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst",
136+
"sha256": "768defc1af4754f6a77ac7fda8bf9472764dab3cc82b9b3f8f9622ed17fb311c"
137137
}
138138
}

‎pkgs/applications/networking/cluster/rke2/1_32/versions.nix‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
2-
rke2Version = "1.32.12+rke2r1";
3-
rke2Commit = "74d4362acaa7234e3fc909841cdaf906c73eb6f5";
4-
rke2TarballHash = "sha256-DC0XG/m6/ApzLUFBykGGHNBRTPYhCqAJNxhYpXk4Zzc=";
5-
rke2VendorHash = "sha256-wMxOKsnf6s3CB2+ocjHovXa/RUJPAZT0WubcnUZMiV8=";
6-
k8sImageTag = "v1.32.12-rke2r1-build20260210";
7-
etcdVersion = "v3.5.26-k3s1-build20260126";
2+
rke2Version = "1.32.13+rke2r1";
3+
rke2Commit = "a361386c83e8e581c2634a408bc7e4dd44fdcedc";
4+
rke2TarballHash = "sha256-jEr7wTMRUk0dOO50G0+iIKywVlBM5Et//nbt7R2mu/0=";
5+
rke2VendorHash = "sha256-rptP0Pb5tgufcXMmtaYaNk/Lyqp1bmlk9upm2amKfno=";
6+
k8sImageTag = "v1.32.13-rke2r1-build20260227";
7+
etcdVersion = "v3.5.26-k3s1-build20260227";
88
pauseVersion = "3.6";
99
ccmVersion = "v1.32.12-0.20260211145907-0dc662e80238-build20260211";
10-
dockerizedVersion = "v1.32.12-rke2r1";
10+
dockerizedVersion = "v1.32.13-rke2r1";
1111
helmJobVersion = "v0.9.14-build20260210";
1212
imagesVersions = with builtins; fromJSON (readFile ./images-versions.json);
1313
}

0 commit comments

Comments
 (0)