diff --git a/doc/languages-frameworks/neovim.section.md b/doc/languages-frameworks/neovim.section.md index 6834819c3c40..3b0db2c03629 100644 --- a/doc/languages-frameworks/neovim.section.md +++ b/doc/languages-frameworks/neovim.section.md @@ -64,6 +64,7 @@ For instance, `sqlite-lua` needs `g:sqlite_clib_path` to be set to work. Nixpkgs - `wrapRc`: Nix, not being able to write in your `$HOME`, loads the 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`. - `plugins`: A list of plugins to add to the wrapper. +- `extraLuaPackages`: A function passed on to `lua.withPackages` - `withPython3`, `withNodeJs`, `withRuby` control when to enable neovim providers (see `:h provider`). @@ -90,6 +91,7 @@ wrapNeovimUnstable neovim-unwrapped { (nvim-treesitter.withPlugins (p: [ p.nix p.python ])) hex-nvim ]; + extraLuaPackages = lp: [ lp.mpack ]; withPython3 = true; withNodeJs = false; withRuby = false; diff --git a/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix index 8e1b79cb3036..086bb10a0509 100644 --- a/pkgs/applications/editors/neovim/tests/default.nix +++ b/pkgs/applications/editors/neovim/tests/default.nix @@ -348,12 +348,12 @@ pkgs.lib.recurseIntoAttrs rec { configure.packages.foo.start = with vimPlugins; [ deoplete-nvim ]; }; - nvimWithLuaPackages = wrapNeovim2 "-with-lua-packages" (makeNeovimConfig { + nvimWithLuaPackages = wrapNeovim2 "-with-lua-packages" { extraLuaPackages = ps: [ ps.mpack ]; - customRC = '' - lua require("mpack") + luaRcContent = '' + require("mpack") ''; - }); + }; nvim_with_lua_packages = runTest nvimWithLuaPackages '' ${nvimWithLuaPackages}/bin/nvim -V3log.txt -i NONE --noplugin +quitall! -e diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index c3ec13eec25d..fe461dd08977 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -69,6 +69,8 @@ let # { plugin=far-vim; config = "let g:far#source='rg'"; optional = false; } # ] plugins ? [ ], + # the function you would have passed to lua.withPackages + extraLuaPackages ? (_: [ ]), ... }@attrs: assert @@ -105,8 +107,23 @@ let packpathDirs.myNeovimPackages = vimPackageInfo.vimPackage; finalPackdir = neovimUtils.packDir packpathDirs; + luaPathLuaRc = + let + luaEnv = lua.withPackages extraLuaPackages; + + # getLuaPath / getLuaCPath are not interpreter dependant at the moment and might thus cause + # errors between luajit/Puc lua + generatedLuaPath = lua.pkgs.getLuaPath luaEnv; + generatedLuaCPath = lua.pkgs.getLuaCPath luaEnv; + in + '' + package.path = "${generatedLuaPath}".. ";" .. package.path + package.cpath = "${generatedLuaCPath}".. ";" .. package.cpath + ''; + rcContent = lib.concatStringsSep "\n" ( [ + luaPathLuaRc providerLuaRc ] ++ lib.optional (luaRcContent != "") luaRcContent diff --git a/pkgs/applications/networking/cluster/rke2/1_32/images-versions.json b/pkgs/applications/networking/cluster/rke2/1_32/images-versions.json index 8f4e0d3160ae..a9287cab5d3c 100644 --- a/pkgs/applications/networking/cluster/rke2/1_32/images-versions.json +++ b/pkgs/applications/networking/cluster/rke2/1_32/images-versions.json @@ -1,138 +1,138 @@ { "images-calico-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz", - "sha256": "41986d200020dc3701a6c856abe9ddf6528d4ccff6cb7c25cd4134d76db7ea20" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz", + "sha256": "b2b1ce6fc213202829513dd99997de7979dc5dd26f4fad8e02918848928ac892" }, "images-calico-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst", - "sha256": "e423f7a8e0ce39534ded83bba7775c69ef29b374ec9da9f66d62cee7fa6a8c5b" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst", + "sha256": "9aae79e102c20418d184906f5e1e36bb01c6a2c41b7e9405b2a20816d0ec58ff" }, "images-calico-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz", - "sha256": "5b2eed3462d4e50938c773232b3ab9b2645eeb63f86c6b4e1c94ca001581b328" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz", + "sha256": "52bdb3ebd6f2cbe4fe0a1894dda8f853e33bc31eaee83a352d014f3464168116" }, "images-calico-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst", - "sha256": "58c2942534eb1bba50e72f19db7da3b982e933380461b4489f9df57a08fbf983" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst", + "sha256": "86f6f5cfe607e15eeb7a35522325ccbea56f1d84ca27cd02c626e4356ca54c56" }, "images-canal-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz", - "sha256": "0f351f3c8b10db857c7fb4258d0699b0644dc14da780461022b5437b277191b4" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz", + "sha256": "1fbe1a2c48fcedcec613cee071f0b524f007a191c858952c0c6243c28a292e30" }, "images-canal-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst", - "sha256": "a7c22d3de484a2f9e9b6ca9d2a454d392160a1fada9a958917f2aa3bf3f38b81" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst", + "sha256": "7e3f80b037079922f6a0aaf5a701459ef550d67ca31119a0c74955254fa52b1e" }, "images-canal-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz", - "sha256": "90a3f2f93055fed4b2990de9cbdb89bc444424d9e7798944c5850e209b62fd6b" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz", + "sha256": "1152d6f24c5b955e37300cbfcd68a8c212c1036ce8964e2ffc22422522fa1d83" }, "images-canal-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst", + "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst", "sha256": "50f4d1b1bb03523b922d7ce989d2d83f009d751d7fbf4aa8821fe52c9b9fd96d" }, "images-cilium-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz", - "sha256": "96a22c3e25093a0fe244180bb4156ddd1c8718e522297f8a45505d9946297f49" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz", + "sha256": "c28b224620327061bb707c31733c3428a7573e2f905178ddd9d038dec7d00370" }, "images-cilium-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst", - "sha256": "1899735f0c9bf506a4a510301cbb4848030d34c37584f5ba6a83ffcbcc06dc5a" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst", + "sha256": "8db98924c2e9534574bab2584b08467cc1c379e740d345b8bad3768d1bed4c5f" }, "images-cilium-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz", - "sha256": "d4c93346ccb0298b6e8d8301971cef71f0ab2e60daed43f898883d595febc59c" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz", + "sha256": "b6a8a882c1285687a78add12e4be64c335f13de8975f9bb7c142aadbaa1f10c5" }, "images-cilium-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst", - "sha256": "b7b737cb758527ce045fa189891bff4a7ec6199ed152a04271ac52be4d541027" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst", + "sha256": "7ea32966e4a4fb2ad0c5fae8eece897d22e1a1515ce7d7954f7aa341c6ca51ac" }, "images-core-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-core.linux-amd64.tar.gz", - "sha256": "380f47b868a8fbe25b5bcad2a181c0eae9586423383ff84e54ed2bdef21ec5fc" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-core.linux-amd64.tar.gz", + "sha256": "02c940745706a79eedb0b579f2368cdbdf8c54de148f4d8fda70f7ee66d7ecf2" }, "images-core-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-core.linux-amd64.tar.zst", - "sha256": "39be1f6bec9aef6352711e95a6b5c0f9dcaed86830dfb853d88034cc0e069d2e" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-core.linux-amd64.tar.zst", + "sha256": "a52feceeb43d21fb8494def190841a046b896c4dfc8e964f3646916f1b20f829" }, "images-core-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-core.linux-arm64.tar.gz", - "sha256": "1cfe8fc43cffd97c4be1257a2c4295343c78ae17790df7440834995ed03b19f2" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-core.linux-arm64.tar.gz", + "sha256": "2d2e23a72f23bedee62d2163df68009fc099ae9c3de1aa34c5cbcfa75f1a8e73" }, "images-core-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-core.linux-arm64.tar.zst", - "sha256": "b3cb602f172cd9a3145afa7cd0af9c02a0451163a9d0972d4c2f6cb3838be64d" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-core.linux-arm64.tar.zst", + "sha256": "e872a4ceb854138916c4a283904f658398c6894e2595c348b40f03e1cdcc6f86" }, "images-flannel-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz", - "sha256": "b85385c0b94747af38453a57219348ae6c048526dfeac548af4d8b8a44f459b3" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz", + "sha256": "a3f60044c7da90d4c2dd5cbc44c897ffcc2660bd1d2dcafa8a900bf8ca100589" }, "images-flannel-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst", + "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst", "sha256": "d843630e86003cf4b18a1ef070b44c3a73e1431770244e853eafcecdb714bfa3" }, "images-flannel-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz", - "sha256": "b35d755a8e4d27774496619676c1bf23870a99f532de6826137c9c3406d90202" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz", + "sha256": "e4a605d5af2a79bd7901f1678e488f776774916e1c5104090e813bd45a257bc3" }, "images-flannel-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst", + "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst", "sha256": "c94fecb19b6b1eaa347c49fc60def2e1251d866714e9ab05ea6ce29d5da41fb3" }, "images-harvester-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz", - "sha256": "c3d3613c1c980bea49ace10e89559eff886d3f86a8fc9a35f314903f8414e1d8" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz", + "sha256": "d0d213e4e6a3931950b5b61f67c9c0163838095f3fb5486e9256902aff397547" }, "images-harvester-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst", - "sha256": "852ace7b2824bb2a191fcf8ab40f625596ea33b3460ca897d04f97d4a319ec4f" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst", + "sha256": "6a914bba0f07f9f3431058f2b1b2c5ed9d8124069f436bfea747c293b5276dff" }, "images-harvester-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz", - "sha256": "775b52176ae09fa3e758b7cf4137e81fdcc0e2b4525359b86bdf3167acc02d9d" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz", + "sha256": "a133106b2348dcbfa28c7b219a22e6cc7cf399a741196c1a435a211050aba4b5" }, "images-harvester-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst", - "sha256": "166d640c5a11ac3d23bc2f95a46b47e345311af2c5186753320a32acb2092491" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst", + "sha256": "0a28d456de6bdc33b806a236e0732c5bcb8bd01dc0e64e84eb2daee51467dace" }, "images-multus-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz", - "sha256": "725d693a24711ac0b235c907a2353ededb21d9666819ecb6a5c2149470832a80" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz", + "sha256": "7df59c19b452c971cd5e739042d0cc3146ba061f3e54aeae25794203592e6866" }, "images-multus-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst", - "sha256": "8d3884444e465f8f41a8fc64d2af0a9ee010239ab5d7cc531fdad8e8e48952f9" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst", + "sha256": "83c9451a8dfc116bddc38146f2a6eddef95d09348386e2b11c7d5479a114de34" }, "images-multus-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz", - "sha256": "535b58068296a8f9226e36f969527bca3a23ac1a917b0d99b4ac97e558041aa1" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz", + "sha256": "77a270820a7955fe9bc7b0d2b6b4b6b8b73e6f042ddd9101b89d1cc0a1b95908" }, "images-multus-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst", - "sha256": "ba77ac84eda9704594aa9eb6629430f7b60606fb532e245c21bf4ca0f7fbee9b" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst", + "sha256": "d3eb6dab20944a417d0cbc6eed3a4838c008646a40c3e6b637729f7f9251ff8c" }, "images-traefik-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz", - "sha256": "7682596ee35cdab6c049289ff751d83ce68cbf9771f543b6971452ec93dd16f8" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz", + "sha256": "24f246a655706dbcfc34fb1fbe055978f79bee25791e3ba8c0239cd370b3630a" }, "images-traefik-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst", - "sha256": "ffdcdf38e2b9d7ceaa9d158f55294ea350015fa69e9b1a18587e8eb6bff7847e" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst", + "sha256": "3b5b1a5016c70cc91676165a21594ce9ddc8866704c54613b98e5360e59a9f30" }, "images-traefik-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz", - "sha256": "f1860511e58d40827c20d742e0012b4a2eb7c1d3f69d442186f66aedfb7a1638" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz", + "sha256": "1f553eb44e38ffe20cae2a8297c249b3d46fa1ddee859b5823102077525e2ca7" }, "images-traefik-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst", - "sha256": "9b19e64407a5e12c73d9c00a121e1d78481ef2fa2e7597a9e20a201a6c527013" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst", + "sha256": "c642a0fece74ba83840a1683159c06ca029012eda63458f42919ca69d14bd724" }, "images-vsphere-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz", - "sha256": "83cfd9e7f8e4763e0fae6be5fa006c86caa43e6ddf8751c31c93dbbffc02c509" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz", + "sha256": "a38d2489e69e4e25ecba96c3ecc91d087df4eb0ebb7f7dbffc9a25f3fef9e823" }, "images-vsphere-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.32.12%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst", - "sha256": "29305bfc62707f37a51b263c9a93620f1491b76b494432aca9d512262f5d11b6" + "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst", + "sha256": "768defc1af4754f6a77ac7fda8bf9472764dab3cc82b9b3f8f9622ed17fb311c" } } diff --git a/pkgs/applications/networking/cluster/rke2/1_32/versions.nix b/pkgs/applications/networking/cluster/rke2/1_32/versions.nix index 77ae8dd532fd..fedc30664a4a 100644 --- a/pkgs/applications/networking/cluster/rke2/1_32/versions.nix +++ b/pkgs/applications/networking/cluster/rke2/1_32/versions.nix @@ -1,13 +1,13 @@ { - rke2Version = "1.32.12+rke2r1"; - rke2Commit = "74d4362acaa7234e3fc909841cdaf906c73eb6f5"; - rke2TarballHash = "sha256-DC0XG/m6/ApzLUFBykGGHNBRTPYhCqAJNxhYpXk4Zzc="; - rke2VendorHash = "sha256-wMxOKsnf6s3CB2+ocjHovXa/RUJPAZT0WubcnUZMiV8="; - k8sImageTag = "v1.32.12-rke2r1-build20260210"; - etcdVersion = "v3.5.26-k3s1-build20260126"; + rke2Version = "1.32.13+rke2r1"; + rke2Commit = "a361386c83e8e581c2634a408bc7e4dd44fdcedc"; + rke2TarballHash = "sha256-jEr7wTMRUk0dOO50G0+iIKywVlBM5Et//nbt7R2mu/0="; + rke2VendorHash = "sha256-rptP0Pb5tgufcXMmtaYaNk/Lyqp1bmlk9upm2amKfno="; + k8sImageTag = "v1.32.13-rke2r1-build20260227"; + etcdVersion = "v3.5.26-k3s1-build20260227"; pauseVersion = "3.6"; ccmVersion = "v1.32.12-0.20260211145907-0dc662e80238-build20260211"; - dockerizedVersion = "v1.32.12-rke2r1"; + dockerizedVersion = "v1.32.13-rke2r1"; helmJobVersion = "v0.9.14-build20260210"; imagesVersions = with builtins; fromJSON (readFile ./images-versions.json); } diff --git a/pkgs/applications/networking/cluster/rke2/1_33/images-versions.json b/pkgs/applications/networking/cluster/rke2/1_33/images-versions.json index 1327bf9a877b..1966d5100c46 100644 --- a/pkgs/applications/networking/cluster/rke2/1_33/images-versions.json +++ b/pkgs/applications/networking/cluster/rke2/1_33/images-versions.json @@ -1,138 +1,138 @@ { "images-calico-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.8%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz", - "sha256": "2910dbfb8e1757da596cbe0dc9040b47cb465d900fba641aba9d6c7e7f9f89c2" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz", + "sha256": "641e70087040bffb40e5d021f125ddfe3c3fd1cfa60a6c47abd1647bbc69a460" }, "images-calico-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.8%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst", - "sha256": "eddf7009b6eb86092b3478ac3e05a6092cc7213a0e0414f4f70388de5f9126be" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst", + "sha256": "02579703f9ec013132fb4f1a34d61bb067caa8a0eed987f09bab26bdf34c9d85" }, "images-calico-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.8%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz", - "sha256": "921d65d0b56ecaa07be68486781ca8e70f302d19962a25c9a194b9063aca8c0d" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz", + "sha256": "60ebbb953e2f86f5a8fdc3617298d2fa5b867913c7d1223e7b2a6058a4b55cf4" }, "images-calico-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.8%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst", - "sha256": "3548ad9d6b8f58d7715c3c20e088a86ffb7b6de0f26ac46b8dcbf88c42463722" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst", + "sha256": "0cf92d03e00550af2edbef01f248588dc0ec84346c9068c38dea01e5b33cca0b" }, "images-canal-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.8%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz", - "sha256": "5a9f80bc26caade70a8c12391e1059c8fa1986f1f1940c426b0106a7dd44e746" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz", + "sha256": "825a67b5c88bcd4572b41d684d3a78bc860057331b446b906a43507f6313a40c" }, "images-canal-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.8%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst", - "sha256": "7e3f80b037079922f6a0aaf5a701459ef550d67ca31119a0c74955254fa52b1e" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst", + "sha256": "a7c22d3de484a2f9e9b6ca9d2a454d392160a1fada9a958917f2aa3bf3f38b81" }, "images-canal-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.8%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz", - "sha256": "0f690921d2e6564cc2dc635f8a8bff9a6ea0cc9102b69ae3483ba811cfe227dc" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz", + "sha256": "65354b633f282f77d1462430e05d1814676235c257895c759f4ab67e5d995458" }, "images-canal-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.8%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst", - "sha256": "50f4d1b1bb03523b922d7ce989d2d83f009d751d7fbf4aa8821fe52c9b9fd96d" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst", + "sha256": "8b8af6dadeb165fed27993f0763c31f2fc55742e152c6432d712aa13841650b5" }, "images-cilium-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.8%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz", - "sha256": "f662366fbb5640d698e653634372b695586ef615aa00b333734a472a9396c11b" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz", + "sha256": "079198afe353632ede96795721c8c06d25095e94a37143d82aacffaa0858fad1" }, "images-cilium-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.8%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst", - "sha256": "5cfe063d25d30c92864adce166bf42f12a298b2754b150a5b7f6971a2ec42223" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst", + "sha256": "094ec55290bd89bb058c979a80216ac4d49e3d081e45ee7e1ebb08fb12ea0f50" }, "images-cilium-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.8%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz", - "sha256": "57e8ed0c6e1dff9d389e7ee73ba175fdfe8258a89a4156a8c6f7acd1c34b4431" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz", + "sha256": "d439daf97b18bd91c1b716c22c51a3131ca30b8a8107a33cc98e2238d7fe2ff7" }, "images-cilium-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.8%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst", - "sha256": "a9ecf7c81e9752351e5895753415bb4c1d15cce5e99b9b2eb7b0ec1eb022f642" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst", + "sha256": "8d02d4ef7460929b8dcc8f6be838e8822443bee546e01f0852b158fa8ea1d18e" }, "images-core-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.8%2Brke2r1/rke2-images-core.linux-amd64.tar.gz", - "sha256": "0bdf829a73f66deaa824dffb57740c166f8ba6c374847eca2a2670971c99c281" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-core.linux-amd64.tar.gz", + "sha256": "8a21224c48ddfa8d234045cfeb4f8610df3f4114d2e927310694ce563d5db6e4" }, "images-core-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.8%2Brke2r1/rke2-images-core.linux-amd64.tar.zst", - "sha256": "d9ffc827deda8b3286503a7577617d06d1b9d925a5984ffc2acbe677bea07949" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-core.linux-amd64.tar.zst", + "sha256": "824fc4f4c13d04acec697355dd6c89fe334ec7a0034305fbbe55410d08584e10" }, "images-core-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.8%2Brke2r1/rke2-images-core.linux-arm64.tar.gz", - "sha256": "e7d3f58d535db9ca7bf01518db35d3768f22978c9401238ca2475f4b6477f618" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-core.linux-arm64.tar.gz", + "sha256": "fcae3611339ad4f0437fb5cc8c4f246dd3d49b88d908533c9293eaef14544b4f" }, "images-core-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.8%2Brke2r1/rke2-images-core.linux-arm64.tar.zst", - "sha256": "0f32a127391e09d0b245207e4785afc541ec936597055ac09d85d7eaf090e547" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-core.linux-arm64.tar.zst", + "sha256": "51ed4890c66fdaa75fa33dc2c01296b5231e678b5f0da674216f9f0e9ab04dc3" }, "images-flannel-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.8%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz", - "sha256": "f319b0f22b4d3e6021559ca2881a44b936318a36d8163542c7feebe4cc2f702e" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz", + "sha256": "8527c05d35be8b89343236c2e8c0d0159717750414afb554e14382e348a3984f" }, "images-flannel-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.8%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst", + "url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst", "sha256": "99e1aa2dcf3f39d736abaf8cddf229d9931ab4c80940881cd7c6b89ff357bd17" }, "images-flannel-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.8%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz", - "sha256": "392b74460ac3bb3474ce04f19935432675884bcc2ae35ae6f9cf580dfc8213c0" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz", + "sha256": "0e14946966080e5a71852eb140489916271de41ef9c7a91c5c3bd1dc6c4c3ad8" }, "images-flannel-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.8%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst", + "url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst", "sha256": "c94fecb19b6b1eaa347c49fc60def2e1251d866714e9ab05ea6ce29d5da41fb3" }, "images-harvester-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.8%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz", - "sha256": "2a062316cbd4942d1786468d41cfdfc7dad6ac52a4a96a2197ed71f875980d20" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz", + "sha256": "2580870d652d80dc9d2f6904cb247d42490a96760d020a4a054e5cdc6f68a873" }, "images-harvester-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.8%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst", - "sha256": "e6cf677021b2c5e448faec2aedc4b2aa3b5db8410318f96f2ea156bab380e708" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst", + "sha256": "9def3c6c9094030c258e6e02aa24195f33e4f2ce6abdb5d7a219100bf1d86e11" }, "images-harvester-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.8%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz", - "sha256": "4d90036f9fce836fc38623e120e6d9237b2a580717361fc86c1e4ccdadc16a5a" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz", + "sha256": "9f5777b154a7df4977cd12d162ab559edd8c1ec1a716aab4e2b33e5bb39ae69e" }, "images-harvester-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.8%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst", - "sha256": "391888ab6a14ce3674fb5828a420677e37389b4090c30c9d4177ff5aaa8d7124" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst", + "sha256": "47f9647b674c412ceb915c71790ca1ce71424f733d0dbdb675699335fb33d2d8" }, "images-multus-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.8%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz", - "sha256": "a7c646feb9d06f894bf35900aa2eabc9634399758f399217823630154ee5023b" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz", + "sha256": "7e3ed1fa01a9f44dc957f2adc6e5e877b1e1d32b94a3ea5a1722ed1d12c9189b" }, "images-multus-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.8%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst", - "sha256": "035612c8628d1d18548082bfd72db0393949fbfd5f21a35d96e22dc7070a5d52" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst", + "sha256": "8d3884444e465f8f41a8fc64d2af0a9ee010239ab5d7cc531fdad8e8e48952f9" }, "images-multus-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.8%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz", - "sha256": "ef91e7d9b352303e086f8167527dce337f5ddf8d79833c8180f5548ceb7aeff7" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz", + "sha256": "92fc511e73ffc08defc7b8e71fb6ef769531cb2a8fe3ed2053d4a7d337644cf4" }, "images-multus-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.8%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst", - "sha256": "00f7366eae2e397625e56a1d014632de37ec545276e2632920a416289e175493" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst", + "sha256": "ba77ac84eda9704594aa9eb6629430f7b60606fb532e245c21bf4ca0f7fbee9b" }, "images-traefik-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.8%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz", - "sha256": "234b205b7ca6698759aff22a3a5b4b2c426224c035added48f5317f37322a690" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz", + "sha256": "87ab074fda05e5d55dfeda6c1af492c8e87b2f37a1087183a8faa73ca07d7499" }, "images-traefik-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.8%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst", - "sha256": "ffdcdf38e2b9d7ceaa9d158f55294ea350015fa69e9b1a18587e8eb6bff7847e" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst", + "sha256": "3b5b1a5016c70cc91676165a21594ce9ddc8866704c54613b98e5360e59a9f30" }, "images-traefik-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.8%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz", - "sha256": "6351a0ceebbb0f643de5cb1003b0cc27ca51e3974fdcac3eb3b893c3b15c827a" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz", + "sha256": "beaee2bd0190ecaee7a61f74c20cc4586c1f6e80f74dfe4d2993ec5468f7d26a" }, "images-traefik-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.8%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst", - "sha256": "9b19e64407a5e12c73d9c00a121e1d78481ef2fa2e7597a9e20a201a6c527013" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst", + "sha256": "c642a0fece74ba83840a1683159c06ca029012eda63458f42919ca69d14bd724" }, "images-vsphere-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.8%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz", - "sha256": "d4a7b1e21fb54d53c1ef4e571f52cbc8c41b6b74e4824eb27536ebb6a2277df2" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz", + "sha256": "0e62fd6dae520a9ef9d0ab252cba54d86d434c5de60eb4018f7577877a6b3ae5" }, "images-vsphere-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.8%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst", - "sha256": "a40b47dc7ba754fc4259106087e327de76269c8be926e5f710c0a2e77fcf900b" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.9%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst", + "sha256": "b954552b6235421c910330e2c80a7bea34c93ea64ad15fdfcbced66b826203b2" } } diff --git a/pkgs/applications/networking/cluster/rke2/1_33/versions.nix b/pkgs/applications/networking/cluster/rke2/1_33/versions.nix index 7c72f4caa8cd..0ab6078afd6d 100644 --- a/pkgs/applications/networking/cluster/rke2/1_33/versions.nix +++ b/pkgs/applications/networking/cluster/rke2/1_33/versions.nix @@ -1,13 +1,13 @@ { - rke2Version = "1.33.8+rke2r1"; - rke2Commit = "eb75e3c1774cee5a584259d6fee77eb8cfa9b430"; - rke2TarballHash = "sha256-lurKGrJYKyNVU+MF6k7LFLM+FDnRk0QErcSrookZm7M="; - rke2VendorHash = "sha256-vobzaY0eyTSEaZ1AwWaPuK6VhTcRW1YO9gIpMgsQo0g="; - k8sImageTag = "v1.33.8-rke2r1-build20260210"; - etcdVersion = "v3.5.26-k3s1-build20260126"; + rke2Version = "1.33.9+rke2r1"; + rke2Commit = "91477e5799063a35553b4d855e7a21bdd53c7009"; + rke2TarballHash = "sha256-2QLG5FHmKQJWu/UjdwtXvXpoNu/to29ORDbo7SgjXSI="; + rke2VendorHash = "sha256-1hkGjui1RDE8UzK7h2SrhYwUX59lRsHLJ3g/OQZ9JTQ="; + k8sImageTag = "v1.33.9-rke2r1-build20260227"; + etcdVersion = "v3.5.26-k3s1-build20260227"; pauseVersion = "3.6"; ccmVersion = "v1.33.8-0.20260211145912-3552cfc26032-build20260211"; - dockerizedVersion = "v1.33.8-rke2r1"; + dockerizedVersion = "v1.33.9-rke2r1"; helmJobVersion = "v0.9.14-build20260210"; imagesVersions = with builtins; fromJSON (readFile ./images-versions.json); } diff --git a/pkgs/applications/networking/cluster/rke2/1_34/images-versions.json b/pkgs/applications/networking/cluster/rke2/1_34/images-versions.json index 53ea59797856..45bc65064b6f 100644 --- a/pkgs/applications/networking/cluster/rke2/1_34/images-versions.json +++ b/pkgs/applications/networking/cluster/rke2/1_34/images-versions.json @@ -1,138 +1,138 @@ { "images-calico-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.4%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz", - "sha256": "8427d2a464b9b8222d57d8ccf22c119c14a68490b150ea8d72d861baf04025aa" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz", + "sha256": "3bb5170ba08641b4a285dde9fabb65348f186e1c507d84fa540fe6e966e8aad0" }, "images-calico-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.4%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst", - "sha256": "d6c24b04a544481730141ead0b8a30e8c64d95457455149412fd94f34e3b81c6" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst", + "sha256": "279b3a0ce8d142c8c24a60e1af7a1be542355da75549cec27b3b1135da3da0bd" }, "images-calico-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.4%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz", - "sha256": "a4015e2c69d6d5411214f5b003b3de17c989d87cc20652e85e06fb299c2bf29c" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz", + "sha256": "b144a24be9db33353d78c3c7147c0cbdc3ac66e80e914760d17851f5ecd69373" }, "images-calico-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.4%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst", - "sha256": "15ba95a0fc562a284dbcb6918f8234c1d2a98f4744fe5cde852ae1ab108db57a" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst", + "sha256": "2a2345c6daa2742119fc36118f6b08240465c65354efea0d67c1272fb0d905c7" }, "images-canal-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.4%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz", - "sha256": "264f2abe24c1cd918f41a1299ccbc94edecfabb19c04738db60fb514b4dc39c4" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz", + "sha256": "e500be563eca5c594af9b893abb8187a7f1d8a5dabff2f901d3b5f43c9e7ee31" }, "images-canal-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.4%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst", + "url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst", "sha256": "a7c22d3de484a2f9e9b6ca9d2a454d392160a1fada9a958917f2aa3bf3f38b81" }, "images-canal-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.4%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz", - "sha256": "9a2fa03658ad6f1dbb29bf862509b47d6fc88ba200cefeedc439f1c504ba14cb" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz", + "sha256": "c6aa1b6be5e0795b9261ce53b98421272a03f3351844a70f2677fc36a24af96e" }, "images-canal-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.4%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst", + "url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst", "sha256": "8b8af6dadeb165fed27993f0763c31f2fc55742e152c6432d712aa13841650b5" }, "images-cilium-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.4%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz", - "sha256": "71eb1303f40f52951049194f821fd1c229c8bcad1580d029c86d98c4a359e4ba" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz", + "sha256": "34c22f24882d990843880e297c3296406b76ed270423b6a512c7bba6a3d855cd" }, "images-cilium-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.4%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst", - "sha256": "8835471b4cf5ab8e4e02d3f3fe07badb88448ccfd79af3fa9a327d207358d76a" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst", + "sha256": "1ab41422cc16f5d030b8f62889133dff5d9dce985fbf13360c16049340ede6c1" }, "images-cilium-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.4%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz", - "sha256": "3990fcb9ce30f490bbce5ee99ba6d02688025820711136ec00f3f17063e366ee" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz", + "sha256": "f5736ff7058e98562a6de4720207a7aa47e85633e6cd186c2d50b743934c44cc" }, "images-cilium-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.4%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst", - "sha256": "88509175bda1a8046b4ca70361c9dc762a4696520fc63b1b87df71fc87f3e230" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst", + "sha256": "41dd1cefcaf487a8b3269c6a06ef114ee91d362855bb3c807d15795616bc346c" }, "images-core-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.4%2Brke2r1/rke2-images-core.linux-amd64.tar.gz", - "sha256": "3efae5cf7d76fb44c144fb3928c721dc2a6045dabbfe2ddb4822fc0710074989" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-core.linux-amd64.tar.gz", + "sha256": "2622a22bb70fb4d5167bb116fde2206925d209429ff1ae62fd585f788aa2b885" }, "images-core-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.4%2Brke2r1/rke2-images-core.linux-amd64.tar.zst", - "sha256": "305e2d1acb10f931d74e1428f0dc5e8e1ff06eb2f70a3c82d1033afa4d30de64" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-core.linux-amd64.tar.zst", + "sha256": "0916003d2cb70501fffd58f278a8b24a1f2c991a9b5d9013b4ba7e8aef92e577" }, "images-core-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.4%2Brke2r1/rke2-images-core.linux-arm64.tar.gz", - "sha256": "8f979ebd5bb4a213d3d9cb96d9ec8a3d6d719857da6aeb7eeb4aa470684ccfcc" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-core.linux-arm64.tar.gz", + "sha256": "e3f71f6ac15157c2f03ca9999580f112acdc11f440b1a2f084e08ab7dbafb0fd" }, "images-core-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.4%2Brke2r1/rke2-images-core.linux-arm64.tar.zst", - "sha256": "4467d5e8ef4184f698597f742a6d9797bb5f791f8862c39cde62e2d111a30aff" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-core.linux-arm64.tar.zst", + "sha256": "92b648b60561fec1252194c70949e5e9ea4bd3fa4157e05663f69493bae74138" }, "images-flannel-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.4%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz", - "sha256": "eefef243ff9de14ecf40a315977a43d7b4b81ad0d9de6d034cf520acd1825eaf" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz", + "sha256": "d0350e10ed7766927b4400eab8dda06029ebc72df4ef36f5708056110b74b2fc" }, "images-flannel-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.4%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst", + "url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst", "sha256": "d843630e86003cf4b18a1ef070b44c3a73e1431770244e853eafcecdb714bfa3" }, "images-flannel-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.4%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz", - "sha256": "1e708c26c939942b396daee8a6e22487349f5b21c3f8bea31790c584fa02cbc3" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz", + "sha256": "8037cc34fc3de43395ef89025509c584ac98b9bf4a9e7cb7159b0f24540765bb" }, "images-flannel-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.4%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst", - "sha256": "fd01dba6b0b12d99e575f6c6f428be59d93d7bf89eba6721dab5f9727483facb" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst", + "sha256": "c94fecb19b6b1eaa347c49fc60def2e1251d866714e9ab05ea6ce29d5da41fb3" }, "images-harvester-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.4%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz", - "sha256": "b6074547e56309e8d07a96ce5309eb7375a88618809a52096613dc200d11a8db" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz", + "sha256": "6f8bd02f7c9122238c667f97379ed59756c4dcd2c556ab222ba32970eb1889b9" }, "images-harvester-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.4%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst", - "sha256": "d034bf81cf1e323cf40c22f8e9a1a506a3db629672b57a6c0e23a191b30ce300" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst", + "sha256": "236fb612c6cc5870fb075c0fe964544e3b1c66463c11f8fa84c9bcc6c5c1e93e" }, "images-harvester-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.4%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz", - "sha256": "2444019dda146101a517b7595da9a4ff413d42471d97524a69f46829bf2d7782" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz", + "sha256": "dd3649306bef4a412ca4125c7a71c00225dec711dbe218b2b402f1c7ded8b277" }, "images-harvester-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.4%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst", - "sha256": "a1d7ba943006b17d61808c0073f802c0a186d34d297abd6c577f5dbacfea41a7" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst", + "sha256": "66e2f545da94a72d29090d69cf9a225024095a4f1a644a5bacf1b2e1873665ee" }, "images-multus-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.4%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz", - "sha256": "e0149402647c3aebe207dfb18ede2d4f49291dfddeefba918dd8b9728e6df342" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz", + "sha256": "1e25054f03859407565f9598791212868bdffc007513e21a537a20ada1da8a22" }, "images-multus-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.4%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst", - "sha256": "83c9451a8dfc116bddc38146f2a6eddef95d09348386e2b11c7d5479a114de34" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst", + "sha256": "035612c8628d1d18548082bfd72db0393949fbfd5f21a35d96e22dc7070a5d52" }, "images-multus-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.4%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz", - "sha256": "d7a67efe62637f373dedb2888f4d4f72d81471c62ced92d2a19ace9c6db3762e" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz", + "sha256": "1b6b6f55366e0e7014fb3241d7bb01b786eebf72a13ed1e7c7ea86850d31f28f" }, "images-multus-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.4%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst", - "sha256": "27b8fbe74bcc4d7956b7a341e107b279372a295ae6a37855b20340defd8a6768" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst", + "sha256": "d3eb6dab20944a417d0cbc6eed3a4838c008646a40c3e6b637729f7f9251ff8c" }, "images-traefik-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.4%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz", - "sha256": "3ac31747dd5c8402d46f5dbcfcc5648175fa406424e3b3e2ce714b4d0599ab0a" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz", + "sha256": "3e0daa3ef4f04bf1739e76640fdec8956d81f07d2263b1a3d66555cc0944c17e" }, "images-traefik-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.4%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst", - "sha256": "ffdcdf38e2b9d7ceaa9d158f55294ea350015fa69e9b1a18587e8eb6bff7847e" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst", + "sha256": "3b5b1a5016c70cc91676165a21594ce9ddc8866704c54613b98e5360e59a9f30" }, "images-traefik-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.4%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz", - "sha256": "a1c0816943fca028cf86d968773637ab5c5f6e6e89008e36c8055b4a97a91b2d" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz", + "sha256": "5313e18d388665b358dc8c4f11112d0798ae76b0d03c4bb101de44b334c11479" }, "images-traefik-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.4%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst", - "sha256": "9b19e64407a5e12c73d9c00a121e1d78481ef2fa2e7597a9e20a201a6c527013" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst", + "sha256": "c642a0fece74ba83840a1683159c06ca029012eda63458f42919ca69d14bd724" }, "images-vsphere-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.4%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz", - "sha256": "9a2954842500e3d74b0c82c79a9ec17135faf4a8001e0a07b96cfaf9b5a4ad3b" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz", + "sha256": "4435f093077efbd3e635aab2adb30837d91e45cc28c062918ec0af275317334b" }, "images-vsphere-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.4%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst", - "sha256": "d79bec5e7a5f22e5d84b3ad271b91035602f03d1988192d193c58965de2b240d" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.5%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst", + "sha256": "861be8cbcc110ba986dc1443c83811c2c4ce92a534895f4cfc231d446ecf11d0" } } diff --git a/pkgs/applications/networking/cluster/rke2/1_34/versions.nix b/pkgs/applications/networking/cluster/rke2/1_34/versions.nix index 6ff4a8b1df2b..47683198493c 100644 --- a/pkgs/applications/networking/cluster/rke2/1_34/versions.nix +++ b/pkgs/applications/networking/cluster/rke2/1_34/versions.nix @@ -1,13 +1,13 @@ { - rke2Version = "1.34.4+rke2r1"; - rke2Commit = "c6b97dc03cefec17e8454a6f45b29f4e3d0a81d6"; - rke2TarballHash = "sha256-aYqmYongTjCKh5ntRhyv8w/+MUDjY7HLqkgWvQacR2M="; - rke2VendorHash = "sha256-Asuqicq2xXdT3nL1OZ6M8yEPzhECNvrC9Yswc4g+oHQ="; - k8sImageTag = "v1.34.4-rke2r1-build20260210"; - etcdVersion = "v3.6.7-k3s1-build20260126"; + rke2Version = "1.34.5+rke2r1"; + rke2Commit = "105ddbd880270e1edcf8ea26a73e1f9be922ec83"; + rke2TarballHash = "sha256-Wc0kZsPfxSi+HoNLo//CYDUROiOkdYreUkcnlYQc7uA="; + rke2VendorHash = "sha256-qYMOtIyRb3iZnEunssZOO/O8a9muhFZr62rLH9P7+WU="; + k8sImageTag = "v1.34.5-rke2r1-build20260227"; + etcdVersion = "v3.6.7-k3s1-build20260227"; pauseVersion = "3.6"; ccmVersion = "v1.34.4-0.20260211145917-c6017918a65c-build20260211"; - dockerizedVersion = "v1.34.4-rke2r1"; + dockerizedVersion = "v1.34.5-rke2r1"; helmJobVersion = "v0.9.14-build20260210"; imagesVersions = with builtins; fromJSON (readFile ./images-versions.json); } diff --git a/pkgs/applications/networking/cluster/rke2/1_35/images-versions.json b/pkgs/applications/networking/cluster/rke2/1_35/images-versions.json index 093358e1fd4d..5718446d0dc8 100644 --- a/pkgs/applications/networking/cluster/rke2/1_35/images-versions.json +++ b/pkgs/applications/networking/cluster/rke2/1_35/images-versions.json @@ -1,138 +1,138 @@ { "images-calico-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz", - "sha256": "dd8bbc665a554e628302d1a9f0dafdb2e594f695404c15a1ea3481d86c7bc6af" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz", + "sha256": "adc04088139474163dd7e2f0f80ec7cd9918c50c1f6e4a518d84b1e6f0a717b8" }, "images-calico-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst", - "sha256": "0d50c9781b49166446832f21765485ab72760c3d4ce6c32b70c59c2203392aec" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst", + "sha256": "13b07010c7f9e002557786590b4e3a7e8ad043f6d90ec557eff59e2ffddda11b" }, "images-calico-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz", - "sha256": "d56322d1aa89bf44c70e8b57ed5ed38d54c863551dfe512ee76f8038886c679e" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz", + "sha256": "4e48981cdb0c47b0bc4d19ba7851203c9f862e175a0e791291c69ad5b7f10147" }, "images-calico-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst", - "sha256": "b43a3cfdde3426a5854ba6a67cdb24288a43e89001b819a7dc15930aa76f2085" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst", + "sha256": "1a7db48cd3667b5142eab1ebfd03c1e2c33dd4555aef9a928682c744ea8e568a" }, "images-canal-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz", - "sha256": "065c514b2c9e7be954494bd8dd84a09562b259e54ab4ff79c5b9dbd56e5cf013" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz", + "sha256": "d5d7e0ec035ce8d8c206791a40e384376afad18f830412977c51a280ff2c8067" }, "images-canal-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst", + "url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst", "sha256": "a7c22d3de484a2f9e9b6ca9d2a454d392160a1fada9a958917f2aa3bf3f38b81" }, "images-canal-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz", - "sha256": "33429e35c4f0d0fc653e5e42bedf9a3fd0d0696998dbdfeadd78a238763fe1b4" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz", + "sha256": "441b03258d68260f7ce0a6bda7acee9c2b2a4515182a5ecf55e33876586ea50a" }, "images-canal-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst", - "sha256": "8b8af6dadeb165fed27993f0763c31f2fc55742e152c6432d712aa13841650b5" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst", + "sha256": "50f4d1b1bb03523b922d7ce989d2d83f009d751d7fbf4aa8821fe52c9b9fd96d" }, "images-cilium-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz", - "sha256": "58d47e765f61d528ebd16f4c5d264bf0a126fce060394fc60438c9bed1cad47e" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz", + "sha256": "feaddac5752336c1a883d39848fc604ff2e0c92de3a027460f55303b2591c228" }, "images-cilium-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst", - "sha256": "808f6a9c4104b71e7bfff5e501a3a6996c26e7366fb0144075bbef0c2944ecf8" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst", + "sha256": "443a2c6052035d4953f27516d0dcab0f9a7f68ae93f0c48da74f9569096b87cc" }, "images-cilium-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz", - "sha256": "47954f7372a156a9f1bf4c9e7e94dcff36b51abfc43d0af4d96066633ef6ae64" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz", + "sha256": "98dbee7b3e4a17e42dcf60d1d9bea593ad961893659504a7388ee4dbf1cab4a9" }, "images-cilium-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst", - "sha256": "41e2150756c2012a591206a29b37d538dcd46b690fb9517c272b71cb8f238b0c" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst", + "sha256": "827081118238089e882b2b14218fcb8bade4ea27fde7a460b626c111796cdc50" }, "images-core-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-core.linux-amd64.tar.gz", - "sha256": "fcfb92a39fb46f1ae7f4be8a46ad1d29588187d837b36c4a2dc33ea42cf720ca" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-core.linux-amd64.tar.gz", + "sha256": "e5447136a26f542f7bb0ef9045c1900472928952623e73737e1e6f1eb3900b8f" }, "images-core-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-core.linux-amd64.tar.zst", - "sha256": "28ab86616f0d1d23fc3d89c4e9fac6e36116d340001921d9f5af2e6deabde45a" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-core.linux-amd64.tar.zst", + "sha256": "8f802a9ca9822c0cae78b84e8a67c172294c9278ac76503b1f8b04c5701d9491" }, "images-core-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-core.linux-arm64.tar.gz", - "sha256": "0a7a40d0ba3732e40ca8c661dfc64d5f41af40c014a24692d91e6620bfeefe50" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-core.linux-arm64.tar.gz", + "sha256": "06f57e254ac74f4a7d7a1195592c0fee130470dd0fe23bd7f6fd54f25f3b749a" }, "images-core-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-core.linux-arm64.tar.zst", - "sha256": "1655e472a01c55497b70408a814f0e052aa56d60e789ceb9c515657167af0874" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-core.linux-arm64.tar.zst", + "sha256": "aeca03ab172bd667742262e942b1d799f5524a96757de3c0aab4b84f19b02ba0" }, "images-flannel-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz", - "sha256": "49d83fb9d6c62fb5f1c9f486c599e26fd2cd8cab9f7bf08e9c5ea6602288374b" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz", + "sha256": "f50f5e118230b2b63f85a7a1c99f63a5331e1f7bccf0514b9800012e8a91339c" }, "images-flannel-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst", + "url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst", "sha256": "99e1aa2dcf3f39d736abaf8cddf229d9931ab4c80940881cd7c6b89ff357bd17" }, "images-flannel-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz", - "sha256": "a1f62b2c4b99ad00954aa6044e2223a70d6f0393e4acfac1382bdac19b268d05" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz", + "sha256": "0e3669bc9b0d5f265b361817949f00e5f8cb2fea647b22d69a6c3c8bbf7409ae" }, "images-flannel-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst", - "sha256": "c94fecb19b6b1eaa347c49fc60def2e1251d866714e9ab05ea6ce29d5da41fb3" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst", + "sha256": "fd01dba6b0b12d99e575f6c6f428be59d93d7bf89eba6721dab5f9727483facb" }, "images-harvester-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz", - "sha256": "96773b86966f9c09d72a9cba2b33fb316a11a1b0e85c2f8c930ad87e47ac3e78" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz", + "sha256": "9d43e3d5cbebd9b060c645b101cc11025184309a33c448f91036f9b4c63fe7a1" }, "images-harvester-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst", - "sha256": "ed3514a87eef87925e8d70b122353a60db8226c4eaf4dc27c679c67a05a9708c" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst", + "sha256": "06b37736600989520644d34d2d5a4b797e40f298a9775c2a923e33a159d2c600" }, "images-harvester-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz", - "sha256": "a5e79cfba57d529399161a33dd63367700a100aec84f9a41c311dfbf1d9c53b4" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz", + "sha256": "cd1b237ef3fcdbc193aa324c42385c21e5fd6493824b79e69e360036383589af" }, "images-harvester-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst", - "sha256": "92e492ec64673e47cba058fdca15d7075adbe457989c09e8df2aceb0e43c3ea3" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst", + "sha256": "7321e46d1822e3d3f5c9e751563e8cbd34eaeab77cbd85c7c93e42658ce82f17" }, "images-multus-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz", - "sha256": "176bfe68227e19d598f539ab242615c85a3335005097225d55dfeed72f2a4e88" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz", + "sha256": "45468bf2b855ea9ac2d4b560b9a974796bbcb9a9681c758e78db41cea0f94229" }, "images-multus-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst", + "url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst", "sha256": "988106315218556fd3ea366a6c27dde2a72c231e14d295c0f0f4cb26eddb88fa" }, "images-multus-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz", - "sha256": "b5595ba40f9895b3f70a175bcad74d66a99e767e3d354236457bc3cf36c2e2a5" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz", + "sha256": "1c85da0b7a7946c88d5f4d489b7a76517909f68d436a0558fe89d01a94c0f9ef" }, "images-multus-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst", - "sha256": "d3eb6dab20944a417d0cbc6eed3a4838c008646a40c3e6b637729f7f9251ff8c" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst", + "sha256": "27b8fbe74bcc4d7956b7a341e107b279372a295ae6a37855b20340defd8a6768" }, "images-traefik-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz", - "sha256": "466a56cfb0dc31746b9ff9a36c19a6691c334d6670cbc5b20fc17b6a30abff5c" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz", + "sha256": "dd6d4f1272bcda3e23d8730359848b346b8baed70b5b18eab64fd0dee555b4fc" }, "images-traefik-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst", - "sha256": "ffdcdf38e2b9d7ceaa9d158f55294ea350015fa69e9b1a18587e8eb6bff7847e" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst", + "sha256": "3b5b1a5016c70cc91676165a21594ce9ddc8866704c54613b98e5360e59a9f30" }, "images-traefik-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz", - "sha256": "004e3bd43a13bee43745cb7ebae8c57d19f1f842e3e8cb4483fe26e0485bfc26" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz", + "sha256": "be4d81082cd9334ae1e196165f3a0a18f7d836560eb410b027f3d5ce1d5afb8e" }, "images-traefik-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst", - "sha256": "9b19e64407a5e12c73d9c00a121e1d78481ef2fa2e7597a9e20a201a6c527013" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst", + "sha256": "c642a0fece74ba83840a1683159c06ca029012eda63458f42919ca69d14bd724" }, "images-vsphere-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz", - "sha256": "be4c117dd855175a7447f4d3b91136aa13e57d0c7609ad459c0305a1f1db005a" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz", + "sha256": "4dc6c827aee2411205c2dd9310f761b1f34fd481bae2d2dade3beb9b2e44dea4" }, "images-vsphere-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst", - "sha256": "9fa9e5c74da801d1988cf9b86e92bf48c49334b07b684208a0bc18f04751c868" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.2%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst", + "sha256": "945d0d7cce48975f14e4b5c1230d6ce70cdc4a968df63f8e2d1f6921387b7513" } } diff --git a/pkgs/applications/networking/cluster/rke2/1_35/versions.nix b/pkgs/applications/networking/cluster/rke2/1_35/versions.nix index ce6a9b53b544..7becad0bffd8 100644 --- a/pkgs/applications/networking/cluster/rke2/1_35/versions.nix +++ b/pkgs/applications/networking/cluster/rke2/1_35/versions.nix @@ -1,13 +1,13 @@ { - rke2Version = "1.35.1+rke2r1"; - rke2Commit = "f50bba7b99629037843f9a8d844cf91b62f546f7"; - rke2TarballHash = "sha256-fqDfpa1CLlIBi6QnTQl9OIepr4kbY1gDjZNJXSdHP1I="; - rke2VendorHash = "sha256-i8dhiWA3WGljYIrp09oVt92HI0xkqhEfJgojVNNEsLQ="; - k8sImageTag = "v1.35.1-rke2r1-build20260210"; - etcdVersion = "v3.6.7-k3s1-build20260126"; + rke2Version = "1.35.2+rke2r1"; + rke2Commit = "b1cd9d8e735bcd84cad7407109423a8dd7b648d8"; + rke2TarballHash = "sha256-s5lZK7S+WReRF+Io9+X4bSd6mAvBq9qUXbYEOH++cFA="; + rke2VendorHash = "sha256-3i//hVONK/QxIsiOth92fN0Rxw6Ex4cgBQe7NG//URc="; + k8sImageTag = "v1.35.2-rke2r1-build20260227"; + etcdVersion = "v3.6.7-k3s1-build20260227"; pauseVersion = "3.6"; ccmVersion = "v1.35.1-0.20260211145923-50fa2d70c239-build20260211"; - dockerizedVersion = "v1.35.1-rke2r1"; + dockerizedVersion = "v1.35.2-rke2r1"; helmJobVersion = "v0.9.14-build20260210"; imagesVersions = with builtins; fromJSON (readFile ./images-versions.json); } diff --git a/pkgs/by-name/ad/adguardhome/package.nix b/pkgs/by-name/ad/adguardhome/package.nix index 124f19ca0a04..858e17b6f7ec 100644 --- a/pkgs/by-name/ad/adguardhome/package.nix +++ b/pkgs/by-name/ad/adguardhome/package.nix @@ -9,15 +9,15 @@ buildGoModule (finalAttrs: { pname = "adguardhome"; - version = "0.107.71"; + version = "0.107.73"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = "AdGuardHome"; tag = "v${finalAttrs.version}"; - hash = "sha256-uyDmS/C1nd0DEHy91tMw/2W5Rih/0j59yxGCwTjFjPc="; + hash = "sha256-WsZDwbcF0epmsz/lP2QMcf8CnvCCoc+Z2LQaecB01WU="; }; - vendorHash = "sha256-KSDvI7SljFUZSUFytT1U76HzQydv3rNsOmDMKCXDl6M="; + vendorHash = "sha256-od20SYVMiLmfOpstuKdc99bA3HWcAaXwcLS0tiGlWog="; dashboard = buildNpmPackage { inherit (finalAttrs) src version; @@ -25,7 +25,7 @@ buildGoModule (finalAttrs: { postPatch = '' cd client ''; - npmDepsHash = "sha256-AYm4ZgTsPJ6aNL7fo9DJqC0yq9i1mJghO7zWWC1X9eA="; + npmDepsHash = "sha256-HPWe8ZZKtToUk5CCLeEwwBBK8hEYMjgGQz3hIfFkZz4="; npmBuildScript = "build-prod"; postBuild = '' mkdir -p $out/build/ @@ -45,7 +45,7 @@ buildGoModule (finalAttrs: { passthru = { updateScript = ./update.sh; - schema_version = 32; + schema_version = 33; tests.adguardhome = nixosTests.adguardhome; tests.version = testers.testVersion { package = finalAttrs.finalPackage; diff --git a/pkgs/by-name/ad/adguardhome/update.sh b/pkgs/by-name/ad/adguardhome/update.sh index 77f90b12cb77..e11717999216 100755 --- a/pkgs/by-name/ad/adguardhome/update.sh +++ b/pkgs/by-name/ad/adguardhome/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell --pure -I nixpkgs=. -i bash -p bash cacert common-updater-scripts curl gnugrep jq nix nix-prefetch nix-update +#!nix-shell --pure -I nixpkgs=. -i bash -p bash cacert common-updater-scripts curl git gnugrep jq nix nix-prefetch nix-update # This file is based on /pkgs/servers/gotify/update.sh diff --git a/pkgs/by-name/an/ansible-doctor/package.nix b/pkgs/by-name/an/ansible-doctor/package.nix index 88c829aa3416..78557dafad5c 100644 --- a/pkgs/by-name/an/ansible-doctor/package.nix +++ b/pkgs/by-name/an/ansible-doctor/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "ansible-doctor"; - version = "8.2.1"; + version = "8.2.2"; pyproject = true; src = fetchFromGitHub { owner = "thegeeklab"; repo = "ansible-doctor"; tag = "v${finalAttrs.version}"; - hash = "sha256-cD5X2UuH8w987bMdl3fNgh79oMERuQwIqIFRT1E506Y="; + hash = "sha256-gezpY5iaFxNcngAyUnlVRPGo33zUgjdsm2zFlfWUWfA="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix index 36f3b62e2d51..caad08731d46 100644 --- a/pkgs/by-name/be/beeper/package.nix +++ b/pkgs/by-name/be/beeper/package.nix @@ -9,10 +9,10 @@ }: let pname = "beeper"; - version = "4.2.605"; + version = "4.2.630"; src = fetchurl { url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}-x86_64.AppImage"; - hash = "sha256-c+ISP/6kWR7RMV55LR8Ap4CIn9y1h6Vo9A92+7tpVL8="; + hash = "sha256-1oaJoQ9Ws9Bc+CQFojYCJc5ChgkHUVOKtWrT3ehGMNU="; }; appimageContents = appimageTools.extract { inherit pname version src; diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix index 31a41b34ec88..cdd44491f34d 100644 --- a/pkgs/by-name/br/brave/package.nix +++ b/pkgs/by-name/br/brave/package.nix @@ -3,24 +3,24 @@ let pname = "brave"; - version = "1.87.192"; + version = "1.88.132"; allArchives = { aarch64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; - hash = "sha256-h5V+f/o0QFQG9PbwNUM0Kdnf5wMrdBQbhDErBv1vghk="; + hash = "sha256-PPv1GKX5/EJIXwHfONxbxwfcWXAGo8JfFAYRPWnF6dw="; }; x86_64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-HSHHITkgDWzjeVotqJ1fNBjohC6CWNHlT32Vg7ZlRNQ="; + hash = "sha256-4M0FgrC47czHyPhKMEBor0go8UBzfZQoN11/0TZF15U="; }; aarch64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip"; - hash = "sha256-IQIOJH6m6iX2a/7VC2Eh/HUiGuco19aIBqANbKNLfa8="; + hash = "sha256-qQa120/HekJhrRfp8uI1Eqkij3LQZ04V4YaGA1ndlmE="; }; x86_64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip"; - hash = "sha256-Lir4ZaZoawWm0vbCDPPW+1dKvGKhWnP3lAqAcS4ImFs="; + hash = "sha256-93G1MK6OAO7Cpv4ggribDeg0dOeh3/Wj0YyH2k2Bhj0="; }; }; diff --git a/pkgs/by-name/ca/cargo-show-asm/package.nix b/pkgs/by-name/ca/cargo-show-asm/package.nix index 1cf4bcc7e3bd..01e4e49c080c 100644 --- a/pkgs/by-name/ca/cargo-show-asm/package.nix +++ b/pkgs/by-name/ca/cargo-show-asm/package.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-show-asm"; - version = "0.2.56"; + version = "0.2.57"; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-PBvcAIqCx29UqV8Ky3j0JF1aN6dbFOKxmwvJt4hAut0="; + hash = "sha256-V4RCO+Nd8w3nd4ZeOOlyf6ApzVeZcGqzEMwzznTOtAE="; }; - cargoHash = "sha256-73LAMjYf3yEuBrk45/J2dArc65BAEO4kxrKp6GhBnxs="; + cargoHash = "sha256-ObLN2NfMonQ6IkKN3tnwTuQFd4lSn7sC3QAtRr9ALcE="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/co/code-cursor/sources.json b/pkgs/by-name/co/code-cursor/sources.json index f73edbeea3ec..30fa7021e101 100644 --- a/pkgs/by-name/co/code-cursor/sources.json +++ b/pkgs/by-name/co/code-cursor/sources.json @@ -1,22 +1,22 @@ { - "version": "2.6.13", + "version": "2.6.19", "vscodeVersion": "1.105.1", "sources": { "x86_64-linux": { - "url": "https://downloads.cursor.com/production/60faf7b51077ed1df1db718157bbfed740d2e168/linux/x64/Cursor-2.6.13-x86_64.AppImage", - "hash": "sha256-eqOZQhIWRhfBOB4owcLDt1fI9YAu4uRYlw6HEHutTMk=" + "url": "https://downloads.cursor.com/production/224838f96445be37e3db643a163a817c15b3606c/linux/x64/Cursor-2.6.19-x86_64.AppImage", + "hash": "sha256-KPHcY7KhcWTpiFPvHUXmP57ePOW1ouANYVtFMaSzN3Y=" }, "aarch64-linux": { - "url": "https://downloads.cursor.com/production/60faf7b51077ed1df1db718157bbfed740d2e168/linux/arm64/Cursor-2.6.13-aarch64.AppImage", - "hash": "sha256-/uGwa9AV91dNffhf146b0MUk3kf/Dv2K8plZRc20niQ=" + "url": "https://downloads.cursor.com/production/224838f96445be37e3db643a163a817c15b3606c/linux/arm64/Cursor-2.6.19-aarch64.AppImage", + "hash": "sha256-oyWGiuMkfEgwVd5c28CWfPjZHK3agtfrWZ54/Bk4c6E=" }, "x86_64-darwin": { - "url": "https://downloads.cursor.com/production/60faf7b51077ed1df1db718157bbfed740d2e168/darwin/x64/Cursor-darwin-x64.dmg", - "hash": "sha256-C3jc2iiUaSKKZQA9rPsJsd2dFFgstBO3w+CIXZsjHM8=" + "url": "https://downloads.cursor.com/production/224838f96445be37e3db643a163a817c15b3606c/darwin/x64/Cursor-darwin-x64.dmg", + "hash": "sha256-vHIQTWpYouXll7T661/IlsWzw6nEl09OoxfUZhpFLVs=" }, "aarch64-darwin": { - "url": "https://downloads.cursor.com/production/60faf7b51077ed1df1db718157bbfed740d2e168/darwin/arm64/Cursor-darwin-arm64.dmg", - "hash": "sha256-vICankj6wVh9z3xtxcA6vI2ebXMB//vd3kI5PRyuqGM=" + "url": "https://downloads.cursor.com/production/224838f96445be37e3db643a163a817c15b3606c/darwin/arm64/Cursor-darwin-arm64.dmg", + "hash": "sha256-qDaqhZqUu7WQieSvLHnMk3rghWGhg/rA8tFBuRnh/nk=" } } } diff --git a/pkgs/by-name/co/complgen/package.nix b/pkgs/by-name/co/complgen/package.nix index 6f8e5c5d6204..3f4a2ce116fb 100644 --- a/pkgs/by-name/co/complgen/package.nix +++ b/pkgs/by-name/co/complgen/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "complgen"; - version = "0.8.0"; + version = "0.8.2"; src = fetchFromGitHub { owner = "adaszko"; repo = "complgen"; tag = "v${finalAttrs.version}"; - hash = "sha256-bcVdWxmWEep2RxYs2wx0EsJSKLjw3Xp6+Ni2KDh2Lvg="; + hash = "sha256-cJKcyq5zV4eJboYz4l0NoGKhMilk6aPz3j3E2G+7yoU="; }; - cargoHash = "sha256-Cmj50U/vH0pb1YQ/a93bb22ReQIHFVkJWzStAehoZDI="; + cargoHash = "sha256-2asHTHbh8V2Or+crjNCNNiUN2CGmmsHSJ9XZHKuZhP8="; meta = { changelog = "https://github.com/adaszko/complgen/blob/v${finalAttrs.version}/CHANGELOG.md"; diff --git a/pkgs/by-name/dc/dcp/package.nix b/pkgs/by-name/dc/dcp/package.nix new file mode 100644 index 000000000000..726770fe7844 --- /dev/null +++ b/pkgs/by-name/dc/dcp/package.nix @@ -0,0 +1,95 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + bash, + protobuf, + protoc-gen-go, + protoc-gen-go-grpc, + kubernetes-controller-tools, + installShellFiles, + nix-update-script, + writableTmpDirAsHomeHook, +}: + +buildGoModule (finalAttrs: { + pname = "dcp"; + version = "0.22.8"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "dcp"; + tag = "v${finalAttrs.version}"; + hash = "sha256-fhRTJYtkvPaPw73VZYvm8/GMhUqvnlBoazQziWXrH2U="; + }; + + vendorHash = "sha256-MRsd0+ySmZ8FlX6RBfW1LSYc1RcTMYu0Ji+0uFEWH3M="; + + # This is required so we: + # - Delete an inconsistent vendor directory from upstream + # - Avoid running a preBuild before the codegen step + overrideModAttrs = _: { + preBuild = null; + postUnpack = '' + rm -rf $sourceRoot/vendor + ''; + }; + + nativeBuildInputs = [ + installShellFiles + protoc-gen-go + protoc-gen-go-grpc + writableTmpDirAsHomeHook + ]; + + # Run code generation using the upstream Makefile. + # Override SHELL for Nix sandbox compatibility. + # Use full paths for PROTOC and CONTROLLER_GEN to avoid Makefile target conflicts. + preBuild = '' + make generate \ + SHELL="${bash}/bin/bash -o pipefail" \ + PROTOC="${protobuf}/bin/protoc" \ + CONTROLLER_GEN="${kubernetes-controller-tools}/bin/controller-gen" + ''; + + subPackages = [ + "cmd/dcp" + "cmd/dcptun" + ]; + + ldflags = + let + pkg = "github.com/microsoft/dcp/internal/version"; + in + [ + "-s" + "-w" + "-X ${pkg}.ProductVersion=${finalAttrs.version}" + "-X ${pkg}.CommitHash=v${finalAttrs.version}" + ]; + + # The dcptun binary should be named dcptun_c for compatibility + # https://github.com/microsoft/dcp/blob/3146b1dd5b2ea283947f846a55bf2e01c294e2ba/Makefile#L103 + postInstall = '' + mv $out/bin/dcptun $out/bin/dcptun_c + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd dcp \ + --bash <($out/bin/dcp completion bash) \ + --fish <($out/bin/dcp completion fish) \ + --zsh <($out/bin/dcp completion zsh) + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Developer Control Plane - API server and CLI for managing developer workloads"; + homepage = "https://github.com/microsoft/dcp"; + changelog = "https://github.com/microsoft/dcp/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ mtrsk ]; + mainProgram = "dcp"; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/ga/garmindb/package.nix b/pkgs/by-name/ga/garmindb/package.nix index 2f53ceea0874..2e4ffc4a2b4e 100644 --- a/pkgs/by-name/ga/garmindb/package.nix +++ b/pkgs/by-name/ga/garmindb/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "garmindb"; - version = "3.6.7"; + version = "3.7.0"; pyproject = true; src = fetchFromGitHub { owner = "tcgoetz"; repo = "garmindb"; tag = "v${finalAttrs.version}"; - hash = "sha256-Dosw6/n4GYYJR3KFP4RdNOUpACpRAfMMmyNj/J54TMk="; + hash = "sha256-uM1bklCP/BWsc51LawDQPHzEgPHr8U4uVSoeF/C8oFY="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/gn/gnumeric/package.nix b/pkgs/by-name/gn/gnumeric/package.nix index 03c5237b67b1..e83fa1a42754 100644 --- a/pkgs/by-name/gn/gnumeric/package.nix +++ b/pkgs/by-name/gn/gnumeric/package.nix @@ -27,14 +27,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gnumeric"; - version = "1.12.59"; + version = "1.12.60"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "gnumeric"; tag = "GNUMERIC_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; - hash = "sha256-7xCDOqPx3QLDHLoKG46e8te4smSFrLOgCcWkiJXGjDQ="; + hash = "sha256-fv4RlIfJiLY3MbsAsgRgJ010/Ob1X1be29XfoweCMpI="; }; preConfigure = '' diff --git a/pkgs/by-name/go/goshs/package.nix b/pkgs/by-name/go/goshs/package.nix index 7f54995c4c2c..79f1bf028601 100644 --- a/pkgs/by-name/go/goshs/package.nix +++ b/pkgs/by-name/go/goshs/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "goshs"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "patrickhener"; repo = "goshs"; - tag = finalAttrs.version; - hash = "sha256-oGcGaLPtagyvDNdSkNx4U0wEj57yrYCGnKUGGR4U0aw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-7z/7dUTDHteAwK78hbrvsHk3Gnv7ZSvaW25sC3vkwW4="; }; vendorHash = "sha256-43Bu4BAmMmd6WrDNztQNCi2OdlzIfbrQC100DkcD4uE="; @@ -44,7 +44,7 @@ buildGoModule (finalAttrs: { meta = { description = "Simple, yet feature-rich web server written in Go"; homepage = "https://goshs.de"; - changelog = "https://github.com/patrickhener/goshs/releases/tag/v${finalAttrs.version}"; + changelog = "https://github.com/patrickhener/goshs/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab diff --git a/pkgs/by-name/gp/gpu-screen-recorder/package.nix b/pkgs/by-name/gp/gpu-screen-recorder/package.nix index 40fe71bad33a..943cd6af157c 100644 --- a/pkgs/by-name/gp/gpu-screen-recorder/package.nix +++ b/pkgs/by-name/gp/gpu-screen-recorder/package.nix @@ -28,12 +28,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "gpu-screen-recorder"; - version = "5.12.4"; + version = "5.12.5"; src = fetchgit { url = "https://repo.dec05eba.com/gpu-screen-recorder"; tag = finalAttrs.version; - hash = "sha256-VceAqiWeDJEAqx96Y4WHUTsPLeb4HvkNbl4fmMi296g="; + hash = "sha256-cw3IejeWFhuFSzUgK2sv4LEa2ohHNx6C3T7+GhHljsY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gr/graphite/package.nix b/pkgs/by-name/gr/graphite/package.nix index 3b8474431148..11cad3d79527 100644 --- a/pkgs/by-name/gr/graphite/package.nix +++ b/pkgs/by-name/gr/graphite/package.nix @@ -1,24 +1,23 @@ { lib, stdenv, - rustPlatform, fetchFromGitHub, fetchurl, fetchzip, + rustPlatform, fetchNpmDeps, - symlinkJoin, - makeWrapper, rustc, cargo, npmHooks, - writableTmpDirAsHomeHook, lld, + pkg-config, binaryen, wasm-pack, cargo-about, nodejs, - pkg-config, wasm-bindgen-cli_0_2_100, + xz, + removeReferencesTo, cef-binary, wayland, openssl, @@ -28,19 +27,20 @@ libxcursor, libx11, libxcb, + nix-update-script, }: let - version = "0-unstable-2026-01-27"; - rev = "84e9d8c192bdf49e88e2aefe422656f8f47b3a6a"; + version = "0-unstable-2026-03-13"; + rev = "eb30ee78bcf8971dc0098f07bdef1fef9d4a7e19"; - srcHash = "sha256-Prqm6/ttmCxH99bqQC26qEyOuC3NlTw0kFADJvA4jbw="; + srcHash = "sha256-cQ6dLoFoNyiFFD/JVZ+U9kHrk2ZTcBxBCf8c3sMjCfQ="; shaderHash = "sha256-uc6FU0df5Xqp6YXEwODULhgUjSQvjRFGvdk+uFB7II0="; - cargoHash = "sha256-QvqvguS3KHJVGZJqpkRRZU7clVTfRJHkv6WygaAHOdM="; - npmHash = "sha256-TNoRGR4kWUmY0XDhpjWKudQ5e33gSl72YnXLx96NdLY="; + cargoHash = "sha256-GvKUZrrLYR2J4CnAbMs4TS6eOxSCq4AMecPGp6+008s="; + npmHash = "sha256-r9jfk/fs6mL9L/7heelamOKzlCEu23UWId0kX35mOgE="; - brandingRev = "f44aa2f362ae4fed8d634878b817a1d3948a7dcb"; - brandingHash = "sha256-3w086pZTw6PUlEAYFGkGD8q+EMtuy23YqunxJTxCPLc="; + brandingRev = "8ae15dc9c51a3855475d8cab1d0f29d9d9bc622c"; + brandingHash = "sha256-mHdwHK2lEeFQWNrjbusvRULEmm03dP+0JM5bnUgHcF8="; src = fetchFromGitHub { owner = "GraphiteEditor"; @@ -59,64 +59,6 @@ let hash = brandingHash; }; - resources = stdenv.mkDerivation (finalAttrs: { - pname = "graphite-resources"; - inherit version src; - - cargoDeps = rustPlatform.fetchCargoVendor { - src = finalAttrs.src; - sourceRoot = finalAttrs.src.name; - hash = cargoHash; - }; - - npmDeps = fetchNpmDeps { - inherit (finalAttrs) pname version; - src = "${finalAttrs.src}/frontend"; - hash = npmHash; - }; - - npmRoot = "frontend"; - npmConfigScript = "setup"; - makeCacheWritable = true; - - nativeBuildInputs = [ - rustPlatform.cargoSetupHook - rustc - cargo - npmHooks.npmConfigHook - lld - writableTmpDirAsHomeHook - binaryen - wasm-pack - nodejs - pkg-config - wasm-bindgen-cli_0_2_100 - cargo-about - makeWrapper - ]; - - prePatch = '' - mkdir branding - cp -r ${branding}/* branding - cp $src/.branding branding/.branding - ''; - - buildPhase = '' - runHook preBuild - pushd frontend - npm run native:build-production - popd - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out - cp -r frontend/dist/* $out/ - runHook postInstall - ''; - }); - libraries = [ stdenv.cc.cc.lib stdenv.cc.libc.out @@ -129,59 +71,95 @@ let libxcb libx11 ]; - cef = cef-binary.overrideAttrs { - postFixup = '' - strip $out/Release/*.so* - ''; - }; - cefPath = symlinkJoin { - name = "cef-path"; - paths = [ - "${cef}/Release" - "${cef}/Resources" - ]; - postBuild = '' - ln -s ${cef}/include $out/include + cefPath = cef-binary.overrideAttrs (finalAttrs: { + pname = "cef-path"; + postInstall = '' + find $out -mindepth 1 -delete + strip ./Release/*.so* + mv ./Release/* $out/ + find "./Resources/locales" -maxdepth 1 -type f ! -name 'en-US.pak' -delete + mv ./Resources/* $out/ + mv ./include $out/ + + cat ./CREDITS.html | ${xz}/bin/xz -9 -e -c > $out/CREDITS.html.xz + echo '${ builtins.toJSON { type = "minimal"; - name = builtins.baseNameOf cef.src.url; + name = builtins.baseNameOf finalAttrs.src.url; sha1 = ""; } }' > $out/archive.json ''; - }; + }); in -rustPlatform.buildRustPackage { +stdenv.mkDerivation (finalAttrs: { pname = "graphite"; - inherit version src cargoHash; + inherit version src; nativeBuildInputs = [ + rustPlatform.cargoSetupHook + rustc + cargo + lld pkg-config - makeWrapper + npmHooks.npmConfigHook + binaryen + wasm-bindgen-cli_0_2_100 + wasm-pack + nodejs + cargo-about + removeReferencesTo ]; buildInputs = libraries; - env.CEF_PATH = cefPath; - env.RASTER_NODES_SHADER_PATH = shaders; - env.EMBEDDED_RESOURCES = resources; - cargoBuildFlags = [ - "-p" - "graphite-desktop" - ]; + cargoDeps = rustPlatform.fetchCargoVendor { + src = finalAttrs.src; + hash = cargoHash; + }; - postUnpack = '' - mkdir ./branding - cp -r ${branding}/* ./branding + npmDeps = fetchNpmDeps { + inherit (finalAttrs) pname version; + src = "${finalAttrs.src}/frontend"; + hash = npmHash; + }; + npmRoot = "frontend"; + + postPatch = '' + mkdir branding + cp -r ${branding}/* branding + cp $src/.branding branding/.branding ''; - postInstall = '' + postConfigure = '' + # Prevent `package-installer.js` from trying to update npm dependencies + touch -r frontend/package-lock.json -d '+1 year' frontend/node_modules/.install-timestamp + ''; + + env.CEF_PATH = cefPath; + env.RASTER_NODES_SHADER_PATH = shaders; + env.GRAPHITE_GIT_COMMIT_HASH = finalAttrs.src.rev; + + buildPhase = '' + runHook preBuild + cargo run build desktop + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp ./target/release/graphite $out/bin/ + mkdir -p $out/share/applications cp $src/desktop/assets/*.desktop $out/share/applications/ mkdir -p $out/share/icons/hicolor/scalable/apps cp ${branding}/app-icons/graphite.svg $out/share/icons/hicolor/scalable/apps/art.graphite.Graphite.svg + + runHook postInstall ''; postFixup = '' @@ -189,10 +167,18 @@ rustPlatform.buildRustPackage { --set-rpath "${lib.makeLibraryPath libraries}:${cefPath}" \ --add-needed libGL.so \ $out/bin/graphite + + remove-references-to -t ${rustc} $out/bin/graphite ''; - # There are currently no tests for the desktop application - doCheck = false; + disallowedReferences = [ rustc ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version=branch" + "--version-regex=(0-unstable-.*)" + ]; + }; meta = { description = "Open source vector graphics editor and procedural design engine"; @@ -219,4 +205,4 @@ rustPlatform.buildRustPackage { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ timon ]; }; -} +}) diff --git a/pkgs/by-name/gs/gsl/package.nix b/pkgs/by-name/gs/gsl/package.nix index 1c9d9dbd0608..947d90bf686d 100644 --- a/pkgs/by-name/gs/gsl/package.nix +++ b/pkgs/by-name/gs/gsl/package.nix @@ -44,8 +44,12 @@ stdenv.mkDerivation (finalAttrs: { # do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html) env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isx86_64 "-mno-fma"; - # https://lists.gnu.org/archive/html/bug-gsl/2015-11/msg00012.html - doCheck = stdenv.hostPlatform.system != "i686-linux"; + doCheck = + # https://lists.gnu.org/archive/html/bug-gsl/2015-11/msg00012.html + stdenv.hostPlatform.system != "i686-linux" + # https://lists.gnu.org/archive/html/bug-gsl/2021-10/msg00001.html + # https://lists.gnu.org/archive/html/bug-gsl/2025-03/msg00010.html + && !stdenv.hostPlatform.isBigEndian; meta = { description = "GNU Scientific Library, a large numerical library"; diff --git a/pkgs/by-name/gv/gvm-libs/package.nix b/pkgs/by-name/gv/gvm-libs/package.nix index 85a60b639539..ec61300e2a18 100644 --- a/pkgs/by-name/gv/gvm-libs/package.nix +++ b/pkgs/by-name/gv/gvm-libs/package.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gvm-libs"; - version = "22.36.0"; + version = "22.38.0"; src = fetchFromGitHub { owner = "greenbone"; repo = "gvm-libs"; tag = "v${finalAttrs.version}"; - hash = "sha256-W8wJS3nI4UYDJV+cOermR02SNmskNpGNQ8E5Yz0X/ws="; + hash = "sha256-4G1h5rZ9G6NMSkNMPySZxn/yiroYKrdr7X/vtcCvEcE="; }; postPatch = '' diff --git a/pkgs/by-name/ki/kiro/package.nix b/pkgs/by-name/ki/kiro/package.nix index 6a4c76c1dc59..41a149c6a912 100644 --- a/pkgs/by-name/ki/kiro/package.nix +++ b/pkgs/by-name/ki/kiro/package.nix @@ -14,7 +14,7 @@ in inherit useVSCodeRipgrep; commandLineArgs = extraCommandLineArgs; - version = "0.10.78"; + version = "0.11.34"; pname = "kiro"; # You can find the current VSCode version in the About dialog: diff --git a/pkgs/by-name/ki/kiro/sources.json b/pkgs/by-name/ki/kiro/sources.json index a0e040a9139d..859fd4a41710 100644 --- a/pkgs/by-name/ki/kiro/sources.json +++ b/pkgs/by-name/ki/kiro/sources.json @@ -1,14 +1,14 @@ { "x86_64-linux": { - "url": "https://prod.download.desktop.kiro.dev/releases/stable/linux-x64/signed/0.10.78/tar/kiro-ide-0.10.78-stable-linux-x64.tar.gz", - "hash": "sha256-mnZy+FeN4PSUKBcopr/0NxrRd+DxFuJofm19gEZT+pI=" + "url": "https://prod.download.desktop.kiro.dev/releases/stable/linux-x64/signed/0.11.34/tar/kiro-ide-0.11.34-stable-linux-x64.tar.gz", + "hash": "sha256-tEtHJcYBxesddFE1+HCkLVNwVA7EwKf/u88IYiPPvWA=" }, "x86_64-darwin": { - "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-x64/signed/0.10.78/kiro-ide-0.10.78-stable-darwin-x64.dmg", - "hash": "sha256-8SU3Y6Bs/Igb6dByBE2KPRm5txfgag0oAYMuaWnW/V8=" + "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-x64/signed/0.11.34/kiro-ide-0.11.34-stable-darwin-x64.dmg", + "hash": "sha256-zApLaKhVuxhtjiYCYiRETr5PnUB3Eo4EpMfiDOxyeMA=" }, "aarch64-darwin": { - "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-arm64/signed/0.10.78/kiro-ide-0.10.78-stable-darwin-arm64.dmg", - "hash": "sha256-KBYs1Kw+HB1mTSZ1L4ZxXiSUH+fNm6o75Iui68UfOMM=" + "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-arm64/signed/0.11.34/kiro-ide-0.11.34-stable-darwin-arm64.dmg", + "hash": "sha256-vWXhS6w8bji0oWW+OACcpgVEfinQIVrIuw4g80enB1c=" } } diff --git a/pkgs/by-name/ku/kubazip/package.nix b/pkgs/by-name/ku/kubazip/package.nix index dda10d66fed5..aa6b0253fe37 100644 --- a/pkgs/by-name/ku/kubazip/package.nix +++ b/pkgs/by-name/ku/kubazip/package.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "kubazip"; - version = "0.3.6"; + version = "0.3.7"; src = fetchFromGitHub { owner = "kuba--"; repo = "zip"; tag = "v${finalAttrs.version}"; - hash = "sha256-MDRLAfTwjxYTLgg0qsYjyll3TA+jNaUhEPGVOisIsC0="; + hash = "sha256-KZy3d1eQQVssZ2aQToOZ+A//bdyl9Wt0krfMM7ibc5o="; }; postPatch = '' diff --git a/pkgs/by-name/la/lazydocker/package.nix b/pkgs/by-name/la/lazydocker/package.nix index 20dcf226278b..430c35e411e2 100644 --- a/pkgs/by-name/la/lazydocker/package.nix +++ b/pkgs/by-name/la/lazydocker/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "lazydocker"; - version = "0.24.4"; + version = "0.25.0"; src = fetchFromGitHub { owner = "jesseduffield"; repo = "lazydocker"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-cW90/yblSLBkcR4ZdtcSI9MXFjOUxyEectjRn9vZwvg="; + sha256 = "sha256-ZZl0gt0gNjEI3JC96Xc29SZAyKh15jCuGHyEanIwNwY="; }; vendorHash = null; diff --git a/pkgs/by-name/li/libation/package.nix b/pkgs/by-name/li/libation/package.nix index c426bea3ddda..240b3fce189b 100644 --- a/pkgs/by-name/li/libation/package.nix +++ b/pkgs/by-name/li/libation/package.nix @@ -16,13 +16,13 @@ buildDotnetModule rec { pname = "libation"; - version = "13.2.1"; + version = "13.3.0"; src = fetchFromGitHub { owner = "rmcrackan"; repo = "Libation"; tag = "v${version}"; - hash = "sha256-Zcl90RrcbRclUo/zUFOKVCe/q44urZhi3m4Lq2WnYSk="; + hash = "sha256-sq3P1naACfZjvgNxNwSK+6ljkqVnVRKHvCgO0Dre1dc="; }; sourceRoot = "${src.name}/Source"; diff --git a/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix b/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix index 9ec657637745..3e5bf3c43321 100644 --- a/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix +++ b/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix @@ -36,7 +36,7 @@ let pname = "librewolf-bin-unwrapped"; - version = "148.0-1"; + version = "148.0.2-2"; in stdenv.mkDerivation { @@ -46,8 +46,8 @@ stdenv.mkDerivation { url = "https://codeberg.org/api/packages/librewolf/generic/librewolf/${version}/librewolf-${version}-${arch}-package.tar.xz"; hash = { - x86_64-linux = "sha256-UV9laKmAvyafNXXcCGrEr51dlyO1DaV3iHJy981OR9M="; - aarch64-linux = "sha256-EZFNcshCdx3xje3/RWXJVYf3IFxeNXbZSoWjoQhoa7I="; + x86_64-linux = "sha256-4FigAIvksbwJ46XqH225woK+inQHUnvyxvQBP/yyagU="; + aarch64-linux = "sha256-wp31BZLUgH+pXkaDnlUtXMNuacWEgQbnkxMYt2vhKZY="; } .${stdenv.hostPlatform.system} or throwSystem; }; diff --git a/pkgs/by-name/lu/lucky-cli/package.nix b/pkgs/by-name/lu/lucky-cli/package.nix index 9777b4580515..d87181ceccc8 100644 --- a/pkgs/by-name/lu/lucky-cli/package.nix +++ b/pkgs/by-name/lu/lucky-cli/package.nix @@ -8,13 +8,13 @@ crystal.buildCrystalPackage rec { pname = "lucky-cli"; - version = "1.1.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "luckyframework"; repo = "lucky_cli"; - rev = "v${version}"; - hash = "sha256-mDUx9cQoYpU9kSAls36kzNVYZ8a4aqHEMIWfzS41NBk="; + tag = "v${version}"; + hash = "sha256-68As7PSRYwhJGcQwI4FgM9aN0nhNrEjcv+10jKnlXeA="; }; # the integration tests will try to clone a remote repos @@ -22,6 +22,11 @@ crystal.buildCrystalPackage rec { rm -rf spec/integration ''; + preConfigure = '' + substituteInPlace "./src/lucky_cli/version.cr" \ + --replace-fail '`shards version #{__DIR__}`' '"${version}"' + ''; + format = "crystal"; lockFile = ./shard.lock; diff --git a/pkgs/by-name/lu/lucky-cli/shard.lock b/pkgs/by-name/lu/lucky-cli/shard.lock index b9956fd780df..53a87a6f7eed 100644 --- a/pkgs/by-name/lu/lucky-cli/shard.lock +++ b/pkgs/by-name/lu/lucky-cli/shard.lock @@ -1,9 +1,5 @@ version: 2.0 shards: - ameba: - git: https://github.com/crystal-ameba/ameba.git - version: 1.5.0 - lucky_task: git: https://github.com/luckyframework/lucky_task.git version: 0.3.0 @@ -14,5 +10,5 @@ shards: nox: git: https://github.com/crystal-loot/nox.git - version: 0.2.2 + version: 0.2.3 diff --git a/pkgs/by-name/lu/lucky-cli/shards.nix b/pkgs/by-name/lu/lucky-cli/shards.nix index a06b87c5029a..d0ff378cfec4 100644 --- a/pkgs/by-name/lu/lucky-cli/shards.nix +++ b/pkgs/by-name/lu/lucky-cli/shards.nix @@ -1,22 +1,17 @@ { - ameba = { - url = "https://github.com/crystal-ameba/ameba.git"; - rev = "v1.5.0"; - sha256 = "1idivsbpmi40aqvs82fsv37nrgikirprxrj3ls9chsb876fq9p2d"; - }; - lucky_task = { + "lucky_task" = { url = "https://github.com/luckyframework/lucky_task.git"; rev = "v0.3.0"; sha256 = "0lp2wv01wdcfr3h43n3dqgaymvypy0i6kbffb4mg4l30lijgpfb6"; }; - lucky_template = { + "lucky_template" = { url = "https://github.com/luckyframework/lucky_template.git"; rev = "v0.2.0"; sha256 = "1xix82d0xanq4xkcv83hm56nj5f2rsbrqhk70j5zr37d3kydfypl"; }; - nox = { + "nox" = { url = "https://github.com/crystal-loot/nox.git"; - rev = "v0.2.2"; - sha256 = "1dfq0aknrxwp9wc0glri4w5j8pfbc6b1xrsxkahci109p6dhcna5"; + rev = "v0.2.3"; + sha256 = "0393v0lrk58i68nd96gqsb89w9a4ykbcyqvmrvp1c32nspqynyaz"; }; } diff --git a/pkgs/by-name/ma/martin/dont-build-webui.patch b/pkgs/by-name/ma/martin/dont-build-webui.patch new file mode 100644 index 000000000000..a0f1f40feee7 --- /dev/null +++ b/pkgs/by-name/ma/martin/dont-build-webui.patch @@ -0,0 +1,21 @@ +diff --git i/martin/build.rs w/martin/build.rs +index b463a8c..775a94d 100644 +--- i/martin/build.rs ++++ w/martin/build.rs +@@ -75,15 +75,11 @@ fn webui() { + copy_file_tree( + &martin_ui_dir, + &out_martin_ui_dir, +- &["dist", "node_modules"], ++ &["node_modules"], + ); + + println!("installing and building in {}", out_martin_ui_dir.display()); + static_files::NpmBuild::new(&out_martin_ui_dir) +- .install() +- .expect("npm install failed") +- .run("build") +- .expect("npm run build failed") + .target(out_martin_ui_dir.join("dist")) + .to_resource_dir() + .build() diff --git a/pkgs/by-name/ma/martin/package.nix b/pkgs/by-name/ma/martin/package.nix index dd2596a01ffe..ddee160c3a13 100644 --- a/pkgs/by-name/ma/martin/package.nix +++ b/pkgs/by-name/ma/martin/package.nix @@ -1,67 +1,96 @@ { lib, - rustPlatform, + stdenv, fetchFromGitHub, + buildNpmPackage, + rustPlatform, pkg-config, openssl, + postgresql, + postgresqlTestHook, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "martin"; - version = "0.9.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "maplibre"; repo = "martin"; - rev = "v${version}"; - hash = "sha256-Jq72aEwM5bIaVywmS3HetR6nnBZnr3oa9a/4ZbgeL9E="; + tag = "martin-v${finalAttrs.version}"; + hash = "sha256-wThCAR3SL454HyHAqbfGfUESPVTiOUMQDq37O/bjJbI="; }; - cargoHash = "sha256-595VKHLajoNinyv12J9qUi55hOcOFRgUeLlzvSdjESs="; + patches = [ ./dont-build-webui.patch ]; + + cargoHash = "sha256-6hPZ3Db6ezPmtBT4XClERiV+MCFZgNLTnZTOeCgRln8="; + + webui = buildNpmPackage { + pname = "martin-ui"; + inherit (finalAttrs) version doCheck; + + src = "${finalAttrs.src}/martin/martin-ui"; + + postPatch = '' + substituteInPlace src/App.tsx \ + --replace-warn "./assets" "$src/src/assets" + ln -sf ${finalAttrs.src}/demo/frontend/public/favicon.ico public/_/assets/favicon.ico + ''; + + npmDepsHash = "sha256-ay8r+gvUVzza0GeJvrmtaEvppIc4wWjrqPGrK8oT+lA="; + + buildPhase = '' + runHook preBuild + npm exec vite build + runHook postBuild + ''; + + checkPhase = '' + runHook preCheck + npm run test + runHook postCheck + ''; + + installPhase = '' + cp -r dist $out + ''; + }; + + preBuild = '' + rm -rf martin/martin-ui/dist + cp -r ${finalAttrs.webui} martin/martin-ui/dist + ''; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; - checkFlags = [ - "--skip=function_source_schemas" - "--skip=function_source_tile" - "--skip=function_source_tilejson" - "--skip=pg_get_function_tiles" - "--skip=pg_get_function_source_ok_rewrite" - "--skip=pg_get_function_source_ok" - "--skip=pg_get_composite_source_tile_minmax_zoom_ok" - "--skip=pg_get_function_source_query_params_ok" - "--skip=pg_get_composite_source_tile_ok" - "--skip=pg_get_catalog" - "--skip=pg_get_composite_source_ok" - "--skip=pg_get_health_returns_ok" - "--skip=pg_get_table_source_ok" - "--skip=pg_get_table_source_rewrite" - "--skip=pg_null_functions" - "--skip=utils::test_utils::tests::test_bad_os_str" - "--skip=utils::test_utils::tests::test_get_env_str" - "--skip=pg_get_table_source_multiple_geom_tile_ok" - "--skip=pg_get_table_source_tile_minmax_zoom_ok" - "--skip=pg_tables_feature_id" - "--skip=pg_get_table_source_tile_ok" - "--skip=table_source_schemas" - "--skip=tables_srid_ok" - "--skip=tables_tile_ok" - "--skip=table_source" - "--skip=tables_tilejson" - "--skip=tables_multiple_geom_ok" + nativeCheckInputs = [ + postgresql + postgresqlTestHook ]; + # Tests are time-consuming and moved to passthru.tests.withCheck. + doCheck = false; + + checkFlags = [ + # Requires docker + "--skip=test_nonexistent_tables_functions_generate_warning" + ]; + + passthru.tests = lib.optionalAttrs (!postgresqlTestHook.meta.broken) { + withCheck = finalAttrs.finalPackage.overrideAttrs { + doCheck = true; + }; + }; + meta = { - # Marked broken 2025-11-28 because it has failed on Hydra for at least one year. - broken = true; description = "Blazing fast and lightweight PostGIS vector tiles server"; homepage = "https://martin.maplibre.org/"; license = with lib.licenses; [ mit # or asl20 ]; - maintainers = with lib.maintainers; [ sikmir ]; + teams = [ lib.teams.geospatial ]; }; -} +}) diff --git a/pkgs/by-name/mo/mongodb-compass/package.nix b/pkgs/by-name/mo/mongodb-compass/package.nix index dfc41e5b9d01..8fbe6ae691ba 100644 --- a/pkgs/by-name/mo/mongodb-compass/package.nix +++ b/pkgs/by-name/mo/mongodb-compass/package.nix @@ -52,7 +52,7 @@ let pname = "mongodb-compass"; - version = "1.49.2"; + version = "1.49.4"; selectSystem = attrs: @@ -67,9 +67,9 @@ let } }"; hash = selectSystem { - x86_64-linux = "sha256-O3GD06eqONIE13vY+6s1CfZ1+9c88/YeGS5wVtRdNxo="; - x86_64-darwin = "sha256-UOrSYKLaUByOQXhhsKrgelvS3XlHSFW34KwjGfZyW6k="; - aarch64-darwin = "sha256-Zcq9DZFTmfTmroNWToxUYpipZzBDe8Ph8xy4j3OiCa8="; + x86_64-linux = "sha256-TsALgtCUIHjv6auOIOJjng/B23gcSJMG7x1wBOfOZn4="; + x86_64-darwin = "sha256-AaZOxMIG8QL5ee8A5pDXtt7w0LWTA1Y6oItCdZyN9Us="; + aarch64-darwin = "sha256-J4yxRvZr9xcIRYmIIE+InB8cH51if+bpUbt/hniGovU="; }; }; diff --git a/pkgs/by-name/nh/nh-unwrapped/package.nix b/pkgs/by-name/nh/nh-unwrapped/package.nix index 4ad83883df25..f3509e816370 100644 --- a/pkgs/by-name/nh/nh-unwrapped/package.nix +++ b/pkgs/by-name/nh/nh-unwrapped/package.nix @@ -100,7 +100,7 @@ rustPlatform.buildRustPackage (finalAttrs: { env.NH_REV = finalAttrs.src.tag; meta = { - changelog = "https://github.com/nix-community/nh/blob/${finalAttrs.version}/CHANGELOG.md"; + changelog = "https://github.com/nix-community/nh/blob/${finalAttrs.src.tag}/CHANGELOG.md"; description = "Yet another nix cli helper"; homepage = "https://github.com/nix-community/nh"; license = lib.licenses.eupl12; diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index dd1ec691bb1f..167dbb8970c1 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -14,12 +14,12 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencode"; - version = "1.2.25"; + version = "1.2.26"; src = fetchFromGitHub { owner = "anomalyco"; repo = "opencode"; tag = "v${finalAttrs.version}"; - hash = "sha256-gWJUkrskRYAZX29F+p5z5QnxMjD54nId9i/7jbSQV8s="; + hash = "sha256-+bQEfrqv9tAmXUMcvyUM0hJGpXgt09IWoKYt8I/jBlU="; }; node_modules = stdenvNoCC.mkDerivation { diff --git a/pkgs/by-name/op/openscreen/electron-avoid-phantomjs.patch b/pkgs/by-name/op/openscreen/electron-avoid-phantomjs.patch deleted file mode 100644 index bf93a7887a68..000000000000 --- a/pkgs/by-name/op/openscreen/electron-avoid-phantomjs.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/package.json -+++ b/package.json -@@ -63,7 +63,6 @@ - "autoprefixer": "^10.4.21", - "electron": "^39.2.7", - "electron-builder": "^24.13.3", -- "electron-icon-builder": "^2.0.1", - "electron-rebuild": "^3.2.9", - "eslint": "^8.57.0", - "eslint-plugin-react-hooks": "^4.6.0", \ No newline at end of file diff --git a/pkgs/by-name/op/openscreen/package.nix b/pkgs/by-name/op/openscreen/package.nix index 9f61647ad701..958c102d1365 100644 --- a/pkgs/by-name/op/openscreen/package.nix +++ b/pkgs/by-name/op/openscreen/package.nix @@ -17,16 +17,16 @@ buildNpmPackage (finalAttrs: { inherit nodejs; pname = "openscreen"; - version = "1.1.2"; + version = "1.2.0"; src = fetchFromGitHub { owner = "siddharthvaddem"; repo = "openscreen"; tag = "v${finalAttrs.version}"; - hash = "sha256-NW6GrmWgdLgobYGAoxlSF/ne17A0IzAQBi4LJk2awpw="; + hash = "sha256-9vtX6rEwRADbi8bSXOi995UvO6wI3z8ai580nhsXJEM="; }; - npmDepsHash = "sha256-IaYSejp4sXEN0KlK7+bmzufGs8D60ZjmFWjO2zMkFrM="; + npmDepsHash = "sha256-wYKw8fNuRVJOzR+KMa3DVN3bcT3R5GhKe/xWEH+nt0U="; npmRebuildFlags = [ "--ignore-scripts" ]; # Prevent running `node-gyp build` @@ -37,12 +37,6 @@ buildNpmPackage (finalAttrs: { env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; - patches = [ - # Avoid downloading `phantomjs` within the build sandbox - # by completely removing `electron-icon-builder` - ./electron-avoid-phantomjs.patch - ]; - buildPhase = '' runHook preBuild @@ -53,19 +47,22 @@ buildNpmPackage (finalAttrs: { # electronDist needs to be modifiable on Darwin cp -r ${electron.dist} electron-dist chmod -R u+w electron-dist + # Disable code signing during build on macOS. - # https://github.com/electron-userland/electron-builder/blob/fa6fc16/docs/code-signing.md#how-to-disable-code-signing-during-the-build-process-on-macos - export CSC_IDENTITY_AUTO_DISCOVERY=false + # https://www.electron.build/code-signing-mac.html#how-to-disable-code-signing-during-the-build-process-on-macos + npm exec electron-builder -- \ + --dir \ + -c.electronDist=electron-dist \ + -c.electronVersion=${electron.version} \ + -c.mac.identity=null ''} ${lib.optionalString stdenv.hostPlatform.isLinux '' - ln -s ${electron.dist} electron-dist + npm exec electron-builder -- \ + --dir \ + -c.electronDist=${electron.dist} \ + -c.electronVersion=${electron.version} ''} - npm exec electron-builder -- \ - --dir \ - -c.electronDist=electron-dist \ - -c.electronVersion=${electron.version} - runHook postBuild ''; diff --git a/pkgs/by-name/pi/pizauth/package.nix b/pkgs/by-name/pi/pizauth/package.nix index ca462bb26a71..f6af2ba969ba 100644 --- a/pkgs/by-name/pi/pizauth/package.nix +++ b/pkgs/by-name/pi/pizauth/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "pizauth"; - version = "1.0.10"; + version = "1.0.11"; src = fetchFromGitHub { owner = "ltratt"; repo = "pizauth"; tag = "pizauth-${finalAttrs.version}"; - hash = "sha256-wdR/7gV/2U+MsncbQ6Gy2na5YuBp4F2H8ohij+Dfvcs="; + hash = "sha256-e9YBeYMC9tfxZoXZi/QBW3FO5V6BAe7RSvVWs7rv0PI="; }; - cargoHash = "sha256-AvUaeevnV5fIeEKXQAY1IGHcV3l3lTwFmFKsaEPbr+4="; + cargoHash = "sha256-9cDVbDCb8vY6KxreyiMX3gp13bXZpxTQOwYbk6TEVpc="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ra/rattler-build/package.nix b/pkgs/by-name/ra/rattler-build/package.nix index a6b4cdbf67c8..f35d9ea45d95 100644 --- a/pkgs/by-name/ra/rattler-build/package.nix +++ b/pkgs/by-name/ra/rattler-build/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rattler-build"; - version = "0.58.0"; + version = "0.59.0"; src = fetchFromGitHub { owner = "prefix-dev"; repo = "rattler-build"; tag = "v${finalAttrs.version}"; - hash = "sha256-PQXPAovUYOzPdMzK1Pu2TcQT+8LTXtJrlSII7uwORLI="; + hash = "sha256-IpFoK8TA/QhdAjp3jNlNrlSHwxbEFYNujGdtpMmMWkI="; }; - cargoHash = "sha256-h/0zlZj4+GD8tYcr9Ta1g6JAILK4LbM5an448+VrVHE="; + cargoHash = "sha256-MKVVWQS78IbZ6eABj/MLMqxmjhN6IeXIUHjr83sdulI="; doCheck = false; # test requires network access diff --git a/pkgs/by-name/se/session-desktop/package.nix b/pkgs/by-name/se/session-desktop/package.nix index cd9197cd5abd..521f8a7727b8 100644 --- a/pkgs/by-name/se/session-desktop/package.nix +++ b/pkgs/by-name/se/session-desktop/package.nix @@ -109,7 +109,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "session-desktop"; - version = "1.17.12"; + version = "1.17.14"; src = (fetchFromGitHub { owner = "session-foundation"; @@ -123,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: { rm -rf .git popd ''; - hash = "sha256-+ZLTIBXXjqX1TAGboXU4OYQPBDXMm7epfY3tsi3zOfk="; + hash = "sha256-SrXlAOl6X5/4Vqrow+VONIiXPBC53Nm6M+xpcUTwjhk="; }).overrideAttrs (oldAttrs: { # https://github.com/NixOS/nixpkgs/issues/195117#issuecomment-1410398050 @@ -169,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version src; inherit pnpm; fetcherVersion = 3; - hash = "sha256-rusUkqokhhmbqTgzIQIbqFCNbI1pmIxO5USy7mmOzxs="; + hash = "sha256-nIBMPw0laFDQWlY05x0YsSmYHLyAxKOD4ArbZ6wLZ7Y="; }; buildPhase = '' diff --git a/pkgs/by-name/xo/xonsh/unwrapped.nix b/pkgs/by-name/xo/xonsh/unwrapped.nix index 60f17285ce35..ca779c16bea7 100644 --- a/pkgs/by-name/xo/xonsh/unwrapped.nix +++ b/pkgs/by-name/xo/xonsh/unwrapped.nix @@ -130,7 +130,7 @@ buildPythonPackage rec { meta = { homepage = "https://xon.sh/"; description = "Python-ish, BASHwards-compatible shell"; - changelog = "https://github.com/xonsh/xonsh/raw/main/CHANGELOG.rst"; + changelog = "https://github.com/xonsh/xonsh/blob/${version}/CHANGELOG.md"; license = with lib.licenses; [ bsd3 ]; mainProgram = "xonsh"; maintainers = with lib.maintainers; [ samlukeyes123 ]; diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 4bc90e463d7c..e7eba7011a5e 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -77,11 +77,11 @@ in hash = "sha256-gAt7btULc8jueETuXy98xhL6p4daCqfEUp6O1YZqUDA="; }; php84 = mkPhp { - version = "8.4.18"; - hash = "sha256-WGsy2Szrz7yklcX2rRozZAVT0KnAv9LmcVM02VnPmFg="; + version = "8.4.19"; + hash = "sha256-vOt3mO03tEL+Ujrn7zRczCIx2wsCLTBzXC43jTJUoNQ="; }; php85 = mkPhp { - version = "8.5.3"; - hash = "sha256-/F7KvBg862TZ/KPc04e9KbK2dEgyavmY/eADEkkWgjs="; + version = "8.5.4"; + hash = "sha256-KskpopprfvS4rOyYGkF7kb339Uj1l99mXMVqueqV/HU="; }; } diff --git a/pkgs/development/php-packages/gnupg/default.nix b/pkgs/development/php-packages/gnupg/default.nix index 9cfa7e0eaafb..4476f7a88ea6 100644 --- a/pkgs/development/php-packages/gnupg/default.nix +++ b/pkgs/development/php-packages/gnupg/default.nix @@ -6,6 +6,7 @@ gnupg, php, fetchFromGitHub, + fetchpatch, }: let @@ -41,11 +42,24 @@ buildPecl { substituteInPlace tests/gnupg_oo_init_file_name.phpt \ --replace-fail '/usr/bin/gpg' '${gnupg}/bin/gpg' \ --replace-fail 'string(12)' 'string(${toString (lib.stringLength "${gnupg}/bin/gpg")})' + # Suppress warnings from unlinking socket files that gpg-agent may have + # already removed during shutdown (TOCTOU race in cleanup code). + substituteInPlace tests/gnupgt.inc \ + --replace-fail 'unlink(' '@unlink(' ''; patches = [ # https://github.com/php-gnupg/php-gnupg/issues/62 - ./missing-new-line-test.patch + (fetchpatch { + name = "fix-test-typos.patch"; + url = "https://github.com/php-gnupg/php-gnupg/commit/4b9160b94df1d831d7bcc4f980cb8969d9ab5c11.patch"; + hash = "sha256-fJ/H1tbwMuLUpdWe0+oPyzhBFAsjG2QzmZSiuIsMekY="; + }) + (fetchpatch { + name = "fix-clearsign-newline-test.patch"; + url = "https://github.com/php-gnupg/php-gnupg/commit/6eda368b55044343349a8e76f6beda3ad54660dc.patch"; + hash = "sha256-/c+cxfAj3Cg7m2+sFiHWQr4R9atPypQuAUVyAOI8ZeM="; + }) ]; doCheck = true; diff --git a/pkgs/development/php-packages/gnupg/missing-new-line-test.patch b/pkgs/development/php-packages/gnupg/missing-new-line-test.patch deleted file mode 100644 index 5a31f7c931d5..000000000000 --- a/pkgs/development/php-packages/gnupg/missing-new-line-test.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/tests/gnupg_oo_sign_clear.phpt b/tests/gnupg_oo_sign_clear.phpt -index 4f9b79c..05fda25 100644 ---- a/tests/gnupg_oo_sign_clear.phpt -+++ b/tests/gnupg_oo_sign_clear.phpt -@@ -38,8 +38,7 @@ array(1) { - int(0) - } - } --string(8) "foo bar --" -+string(7) "foo bar" - --CLEAN-- -