diff --git a/pkgs/applications/networking/cluster/k3s/1_33/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_33/chart-versions.nix index 5ce71b5a5bb6..df7d8abdceac 100644 --- a/pkgs/applications/networking/cluster/k3s/1_33/chart-versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_33/chart-versions.nix @@ -1,10 +1,10 @@ { traefik-crd = { - url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-39.0.701+up39.0.7.tgz"; - sha256 = "1ii00d4r0lmzwi8n16m2fgi50j0s5cj1bm0jlsi3dbdbpq0savi3"; + url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-40.1.3+up40.1.0.tgz"; + sha256 = "0wrjc73w4h7bshm5lg6hb71h6s49wmxkmplrf6601zq400yr0m2y"; }; traefik = { - url = "https://k3s.io/k3s-charts/assets/traefik/traefik-39.0.701+up39.0.7.tgz"; - sha256 = "1ijrh3wr4k6ydcv0ylvy4i3swbj5byam0lkk51khfl9mmz4z8y0r"; + url = "https://k3s.io/k3s-charts/assets/traefik/traefik-40.1.3+up40.1.0.tgz"; + sha256 = "1sgc46xpc2vg5s5vbs7jk2y2bzylf34qcamx681jq0gfjaxs0cdz"; }; } diff --git a/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json index 8ba5e8386b80..5ac3317d21de 100644 --- a/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json @@ -1,26 +1,26 @@ { "airgap-images-amd64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.12%2Bk3s1/k3s-airgap-images-amd64.tar.gz", - "sha256": "6a29f795a718e0b7a11b81b4f8a342764a90b78a83a57ad6e1b90d81c3718290" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.13%2Bk3s1/k3s-airgap-images-amd64.tar.gz", + "sha256": "2e96b421314df12b5a4b2168ae0a8f097a63b9826bf93fbb86f7b69a48551cd7" }, "airgap-images-amd64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.12%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "1ec9755fbe791b710b176c12f66160e19b31605345c92f3b5916176976f813a8" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.13%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "b01d1c0b5eeff414a405a423851e13575317831eec3f87f22d6a7038f9a1fdb7" }, "airgap-images-arm-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.12%2Bk3s1/k3s-airgap-images-arm.tar.gz", - "sha256": "893e395bbee35745e32aaa4e421aaf0c88e685739edc5658f9bf573a95a86782" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.13%2Bk3s1/k3s-airgap-images-arm.tar.gz", + "sha256": "b0d3bbbb034fcb920124562ef115ede32c2269fa8f5c35342a7c801c1e3d8068" }, "airgap-images-arm-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.12%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "1613727aaa8ae55a1a597a2914faf9ab909a710e175a26b4652754b25ab01337" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.13%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "ce3ac7a19d4753d543063e8bc70425b289a4b0c5c1a9e5e23555f2c70c3053f8" }, "airgap-images-arm64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.12%2Bk3s1/k3s-airgap-images-arm64.tar.gz", - "sha256": "5fa48235a216c9dfcaefcd344597d221adf16aa583a0ca9d9b4094e4c9c1ef5f" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.13%2Bk3s1/k3s-airgap-images-arm64.tar.gz", + "sha256": "e483093a7cfa530445405faa7496ac6dedd7cb51312afc5e0cd8455923bd661e" }, "airgap-images-arm64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.12%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "ec56b324e405a3990b9ee16b5aa39bfb636ce88a127869685c042944caf38835" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.13%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "76103ee88986c05f858d3f0f92c5e42f6410e33a94b5ee528897c7d45e1bef74" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_33/versions.nix b/pkgs/applications/networking/cluster/k3s/1_33/versions.nix index 57f04c1c12c8..373d2b37a938 100644 --- a/pkgs/applications/networking/cluster/k3s/1_33/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_33/versions.nix @@ -1,21 +1,21 @@ { - k3sVersion = "1.33.12+k3s1"; - k3sCommit = "35e4874312bcfd643320c7f7cb225f7063cb9e4e"; - k3sRepoSha256 = "1md7w6n9iz3nk63rnf4ahs66d2vg3gfc5frksar2iw3kcv99bhmc"; - k3sVendorHash = "sha256-O0HIcCzrKGR8NkMoDfaD1wPbAttHt0kEpVjr/kOLMu8="; + k3sVersion = "1.33.13+k3s1"; + k3sCommit = "86c2c10c51e4340bb8252fff312d74dcafaf39d5"; + k3sRepoSha256 = "06m8rqarxii7ip4pjwyr25mskgnr00lp3xypr8ywq01akns8y2bg"; + k3sVendorHash = "sha256-oshDuY+I4sdXvjxyrp7meI9XzXo9DUr9wdD6pvUT3fg="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); - k3sRootVersion = "0.15.0"; - k3sRootSha256 = "008n8xx7x36y9y4r24hx39xagf1dxbp3pqq2j53s9zkaiqc62hd0"; + k3sRootVersion = "0.15.2"; + k3sRootSha256 = "0yxq2jqqb7flm4rs9dl7fqxba3mmwkmjbc8rx7pgai4qa1lzyigy"; k3sCNIVersion = "1.9.1-k3s1"; k3sCNISha256 = "1ggaz0p1c2k94car9d89a05smz3zx32sxn197b1l5kmjcnzdwadh"; - containerdVersion = "2.2.3-k3s1.33"; - containerdSha256 = "1zkbjwnhxxkc9lqk2i9wfi10ywd4rsky3sjs2dzlid91l6xgrwhv"; + containerdVersion = "2.2.5-k3s1.33"; + containerdSha256 = "1al4zsyh3pz379ia0awhrlz7nyl2abyy0ayw0gl4gr6xjp7jsp1s"; containerdPackage = "github.com/k3s-io/containerd/v2"; criCtlVersion = "1.33.0-k3s2"; flannelVersion = "v0.28.4"; flannelPluginVersion = "v1.9.0-flannel1"; kubeRouterVersion = "v2.6.3-k3s1"; criDockerdVersion = "v0.3.19-k3s2"; - helmJobVersion = "v0.10.0-build20260513"; + helmJobVersion = "v0.11.1-build20260615"; } diff --git a/pkgs/applications/networking/cluster/k3s/1_34/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_34/chart-versions.nix index 5ce71b5a5bb6..df7d8abdceac 100644 --- a/pkgs/applications/networking/cluster/k3s/1_34/chart-versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_34/chart-versions.nix @@ -1,10 +1,10 @@ { traefik-crd = { - url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-39.0.701+up39.0.7.tgz"; - sha256 = "1ii00d4r0lmzwi8n16m2fgi50j0s5cj1bm0jlsi3dbdbpq0savi3"; + url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-40.1.3+up40.1.0.tgz"; + sha256 = "0wrjc73w4h7bshm5lg6hb71h6s49wmxkmplrf6601zq400yr0m2y"; }; traefik = { - url = "https://k3s.io/k3s-charts/assets/traefik/traefik-39.0.701+up39.0.7.tgz"; - sha256 = "1ijrh3wr4k6ydcv0ylvy4i3swbj5byam0lkk51khfl9mmz4z8y0r"; + url = "https://k3s.io/k3s-charts/assets/traefik/traefik-40.1.3+up40.1.0.tgz"; + sha256 = "1sgc46xpc2vg5s5vbs7jk2y2bzylf34qcamx681jq0gfjaxs0cdz"; }; } diff --git a/pkgs/applications/networking/cluster/k3s/1_34/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_34/images-versions.json index 08b82fbac7a7..3c9c172d8786 100644 --- a/pkgs/applications/networking/cluster/k3s/1_34/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_34/images-versions.json @@ -1,26 +1,26 @@ { "airgap-images-amd64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.8%2Bk3s1/k3s-airgap-images-amd64.tar.gz", - "sha256": "2a5f910bb31b8674dff61f55a242b8dacb553894a50d66ea3c2dbf4ec8931345" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.9%2Bk3s1/k3s-airgap-images-amd64.tar.gz", + "sha256": "87a83fb2db2883e427e3c2351c2d3bff7bd6d3ad2ab703aec22e81e326bd63cf" }, "airgap-images-amd64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.8%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "c1a261f664a58664aab975ba5c861d872c825d4f8ccc391c649283bf2c1663cf" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.9%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "b01d1c0b5eeff414a405a423851e13575317831eec3f87f22d6a7038f9a1fdb7" }, "airgap-images-arm-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.8%2Bk3s1/k3s-airgap-images-arm.tar.gz", - "sha256": "a14b0421af4e4afe70010886cf66eb99b2cb48e1f810269bae47dad5c8bbc2c7" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.9%2Bk3s1/k3s-airgap-images-arm.tar.gz", + "sha256": "6063398406fca10cafb109a04967c42dfcfee7216e6c6ec49a2f8c3a3b51d80a" }, "airgap-images-arm-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.8%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "b6dba85a8470f95ab2a57658bb5ac2adfcf3e3c0634501e7b87d6904f32308d6" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.9%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "db42a4016d8ff1f98520613fd0f569723c7553063d1a3f9aa12f25bc68b19b2a" }, "airgap-images-arm64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.8%2Bk3s1/k3s-airgap-images-arm64.tar.gz", - "sha256": "dbb6f771024fbf07a85d57fb77d43a59a4cd712684e819dd31f9633088c3f99e" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.9%2Bk3s1/k3s-airgap-images-arm64.tar.gz", + "sha256": "eedeab95e4e1f7f11bdd08b45555c591d6b35a59be9f476b9ac95d9940ab720d" }, "airgap-images-arm64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.8%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "984dc4a2050e1bde1b57ac8a07ce6639a56151a3b57cee0616220bc680c65041" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.9%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "26a5528bb00c7beac8c88399af77c71123e74fedbba5b03c1c5ae003c838880f" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_34/versions.nix b/pkgs/applications/networking/cluster/k3s/1_34/versions.nix index 1d2e8503b87a..53e795b1bf52 100644 --- a/pkgs/applications/networking/cluster/k3s/1_34/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_34/versions.nix @@ -1,21 +1,21 @@ { - k3sVersion = "1.34.8+k3s1"; - k3sCommit = "fb21251ee14ffbec9a2ba5d8ff25a7aa1221fbe3"; - k3sRepoSha256 = "18f2mhhn7nz8lri1qbjja5nfjncsadra9wrqxxgprfg5lx7fi3a2"; - k3sVendorHash = "sha256-jikPQgyQ4ApWPF+iHYjL7H6ccWcC1x/JEABluJyzmfs="; + k3sVersion = "1.34.9+k3s1"; + k3sCommit = "5f72184f2d188f75171bbd21953b1c16268e425f"; + k3sRepoSha256 = "0z9c98f02ixvfjlm6yj3i93pvplnfc52l54lyfrb40d1b9wgrsdw"; + k3sVendorHash = "sha256-JAOi23vFIYoTxB7g5Fyr+91dEX0lqChJMHCNW3q8O/g="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); - k3sRootVersion = "0.15.0"; - k3sRootSha256 = "008n8xx7x36y9y4r24hx39xagf1dxbp3pqq2j53s9zkaiqc62hd0"; + k3sRootVersion = "0.15.2"; + k3sRootSha256 = "0yxq2jqqb7flm4rs9dl7fqxba3mmwkmjbc8rx7pgai4qa1lzyigy"; k3sCNIVersion = "1.9.1-k3s1"; k3sCNISha256 = "1ggaz0p1c2k94car9d89a05smz3zx32sxn197b1l5kmjcnzdwadh"; - containerdVersion = "2.2.3-k3s1"; - containerdSha256 = "0fn252icn082822r754i2bqd8rivhvjwkfk031a8g0vvw8rz46vj"; + containerdVersion = "2.2.5-k3s2"; + containerdSha256 = "1i9vkmf3gg34d9hjq15c00frhqxs9cba03zwg7qqq34gkb4qhjch"; containerdPackage = "github.com/k3s-io/containerd/v2"; criCtlVersion = "1.34.0-k3s2"; flannelVersion = "v0.28.4"; flannelPluginVersion = "v1.9.0-flannel1"; kubeRouterVersion = "v2.6.3-k3s1"; criDockerdVersion = "v0.3.19-k3s3"; - helmJobVersion = "v0.10.0-build20260513"; + helmJobVersion = "v0.11.1-build20260615"; } diff --git a/pkgs/applications/networking/cluster/k3s/1_35/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_35/chart-versions.nix index 5ce71b5a5bb6..df7d8abdceac 100644 --- a/pkgs/applications/networking/cluster/k3s/1_35/chart-versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_35/chart-versions.nix @@ -1,10 +1,10 @@ { traefik-crd = { - url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-39.0.701+up39.0.7.tgz"; - sha256 = "1ii00d4r0lmzwi8n16m2fgi50j0s5cj1bm0jlsi3dbdbpq0savi3"; + url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-40.1.3+up40.1.0.tgz"; + sha256 = "0wrjc73w4h7bshm5lg6hb71h6s49wmxkmplrf6601zq400yr0m2y"; }; traefik = { - url = "https://k3s.io/k3s-charts/assets/traefik/traefik-39.0.701+up39.0.7.tgz"; - sha256 = "1ijrh3wr4k6ydcv0ylvy4i3swbj5byam0lkk51khfl9mmz4z8y0r"; + url = "https://k3s.io/k3s-charts/assets/traefik/traefik-40.1.3+up40.1.0.tgz"; + sha256 = "1sgc46xpc2vg5s5vbs7jk2y2bzylf34qcamx681jq0gfjaxs0cdz"; }; } diff --git a/pkgs/applications/networking/cluster/k3s/1_35/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_35/images-versions.json index d2675277bd54..bc929fe914c9 100644 --- a/pkgs/applications/networking/cluster/k3s/1_35/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_35/images-versions.json @@ -1,26 +1,26 @@ { "airgap-images-amd64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.5%2Bk3s1/k3s-airgap-images-amd64.tar.gz", - "sha256": "b25863ba596e81ee773b462edc1b7ee26e80ff8e675c983115464372713237ac" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.6%2Bk3s1/k3s-airgap-images-amd64.tar.gz", + "sha256": "0ffcf255abd68eb4a321c9b13e1b596c1d32a59c5b9bbcaa4d415f213ba34cf1" }, "airgap-images-amd64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.5%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "c1a261f664a58664aab975ba5c861d872c825d4f8ccc391c649283bf2c1663cf" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.6%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "b3af3ad5f8faaaf5deb3e875815f0805f2abd31f8c2f4d566cc2d9e6bb7e688a" }, "airgap-images-arm-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.5%2Bk3s1/k3s-airgap-images-arm.tar.gz", - "sha256": "5b9fc436d67f0ca941084c512715f2ea21e6c66732144145788f1403ffd6c082" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.6%2Bk3s1/k3s-airgap-images-arm.tar.gz", + "sha256": "1e5747971cc382ef44b3f0b0aa640da45642c2bec330fd6daae28d61c90f0eca" }, "airgap-images-arm-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.5%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "1613727aaa8ae55a1a597a2914faf9ab909a710e175a26b4652754b25ab01337" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.6%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "29eae298befd23f13426443ccc049921874dd4e4987c4e5e15a1e63b816177fd" }, "airgap-images-arm64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.5%2Bk3s1/k3s-airgap-images-arm64.tar.gz", - "sha256": "bc085e02004382b15413e98457079e2a0a3d8f18b3c9a4a58917f1bc6064ea29" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.6%2Bk3s1/k3s-airgap-images-arm64.tar.gz", + "sha256": "14d4b33fd5dbc60c47d2c025b9a0cb1fa617e3ff351cc9c284ad9da3caf0263b" }, "airgap-images-arm64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.5%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "0bf33db3b0595166f1c36a6780ebd789343f50f23a4d61157519ada4d002919d" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.6%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "850056a90a804ae95977bed34bcaf7d0cbc9fcb794700a25f34454c2b2fd6b50" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_35/versions.nix b/pkgs/applications/networking/cluster/k3s/1_35/versions.nix index b9f0c59bf1ad..9e3e82739c1b 100644 --- a/pkgs/applications/networking/cluster/k3s/1_35/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_35/versions.nix @@ -1,21 +1,21 @@ { - k3sVersion = "1.35.5+k3s1"; - k3sCommit = "6a4781ad53ee5cad273bedcd9462ae36ac97d798"; - k3sRepoSha256 = "1m6sy7p5v3kkg66mzsna9c4d1f7ly843ii42zmb2a26vxa0dicx3"; - k3sVendorHash = "sha256-czE0ZJ9yWc3VSuPqjy4V+ViBGPriluMPmUK5aTk4DmY="; + k3sVersion = "1.35.6+k3s1"; + k3sCommit = "87243446a2c2fe958c31ad552fe38ebf96757b06"; + k3sRepoSha256 = "0hcd2pyd66isnii7x6nbw420n0sc7rwrbws4aayakas1xi0yrkzq"; + k3sVendorHash = "sha256-U8JM3CKLGUMWLntMyczrHCW+WMAeiDy2xwzR39InvCM="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); - k3sRootVersion = "0.15.0"; - k3sRootSha256 = "008n8xx7x36y9y4r24hx39xagf1dxbp3pqq2j53s9zkaiqc62hd0"; + k3sRootVersion = "0.15.2"; + k3sRootSha256 = "0yxq2jqqb7flm4rs9dl7fqxba3mmwkmjbc8rx7pgai4qa1lzyigy"; k3sCNIVersion = "1.9.1-k3s1"; k3sCNISha256 = "1ggaz0p1c2k94car9d89a05smz3zx32sxn197b1l5kmjcnzdwadh"; - containerdVersion = "2.2.3-k3s1"; - containerdSha256 = "0fn252icn082822r754i2bqd8rivhvjwkfk031a8g0vvw8rz46vj"; + containerdVersion = "2.2.5-k3s2"; + containerdSha256 = "1i9vkmf3gg34d9hjq15c00frhqxs9cba03zwg7qqq34gkb4qhjch"; containerdPackage = "github.com/k3s-io/containerd/v2"; criCtlVersion = "1.35.0-k3s2"; flannelVersion = "v0.28.4"; flannelPluginVersion = "v1.9.0-flannel1"; kubeRouterVersion = "v2.6.3-k3s1"; criDockerdVersion = "v0.3.19-k3s3"; - helmJobVersion = "v0.10.0-build20260513"; + helmJobVersion = "v0.11.1-build20260615"; } diff --git a/pkgs/applications/networking/cluster/k3s/1_36/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_36/chart-versions.nix index 5ce71b5a5bb6..df7d8abdceac 100644 --- a/pkgs/applications/networking/cluster/k3s/1_36/chart-versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_36/chart-versions.nix @@ -1,10 +1,10 @@ { traefik-crd = { - url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-39.0.701+up39.0.7.tgz"; - sha256 = "1ii00d4r0lmzwi8n16m2fgi50j0s5cj1bm0jlsi3dbdbpq0savi3"; + url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-40.1.3+up40.1.0.tgz"; + sha256 = "0wrjc73w4h7bshm5lg6hb71h6s49wmxkmplrf6601zq400yr0m2y"; }; traefik = { - url = "https://k3s.io/k3s-charts/assets/traefik/traefik-39.0.701+up39.0.7.tgz"; - sha256 = "1ijrh3wr4k6ydcv0ylvy4i3swbj5byam0lkk51khfl9mmz4z8y0r"; + url = "https://k3s.io/k3s-charts/assets/traefik/traefik-40.1.3+up40.1.0.tgz"; + sha256 = "1sgc46xpc2vg5s5vbs7jk2y2bzylf34qcamx681jq0gfjaxs0cdz"; }; } diff --git a/pkgs/applications/networking/cluster/k3s/1_36/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_36/images-versions.json index 28aed9e04b27..52d66c3f06bd 100644 --- a/pkgs/applications/networking/cluster/k3s/1_36/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_36/images-versions.json @@ -1,26 +1,26 @@ { "airgap-images-amd64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.36.1%2Bk3s1/k3s-airgap-images-amd64.tar.gz", - "sha256": "8aad05e71764f08eae8d4db9e5d42d892dce39c9eb79206514c4ee03f4293db1" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.36.2%2Bk3s1/k3s-airgap-images-amd64.tar.gz", + "sha256": "6065608edb70f061570fa15c4cce4eeb31e5218eadbacad65de4a75d1de4dad6" }, "airgap-images-amd64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.36.1%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "72cf836bfcf8f9af2de88102b69129d297b77a60243895a7ac4bc47d77a65079" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.36.2%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "da6a3b2dbd55cc368d930078ae8814ed22eb9c92247f7b9b46bf073445ff55b3" }, "airgap-images-arm-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.36.1%2Bk3s1/k3s-airgap-images-arm.tar.gz", - "sha256": "639f155016f956764b212a1671a6e090100016505b34d3f45e76513fdd93cb5f" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.36.2%2Bk3s1/k3s-airgap-images-arm.tar.gz", + "sha256": "aaa7e592ba0b83e4e70741fc963358b87d57bb20a6daa09ef102db14995285e4" }, "airgap-images-arm-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.36.1%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "4b16cc7a17bac0957db9df4ad937ce52792a696b0eb60944b52eb65447a0d1fa" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.36.2%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "9d1440d7fc88720f03b0e57d291e3a727a67a4f2e89bb5c4757d83a390635b2e" }, "airgap-images-arm64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.36.1%2Bk3s1/k3s-airgap-images-arm64.tar.gz", - "sha256": "bc84f7965ef5f3a7e45e9f79f1090ef066fdd9bdb96d476c5d37cb13d0c2935b" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.36.2%2Bk3s1/k3s-airgap-images-arm64.tar.gz", + "sha256": "07766de91ed2bfa240e12b1d0b9c3af2257c8296bfa4ce17fba776243a2790fb" }, "airgap-images-arm64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.36.1%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "174e1e7cf8493ea8fb2550231de3e93fc2f3cec27f977236fd7ab90a18680eed" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.36.2%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "26a5528bb00c7beac8c88399af77c71123e74fedbba5b03c1c5ae003c838880f" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_36/versions.nix b/pkgs/applications/networking/cluster/k3s/1_36/versions.nix index a0c220c4ca8c..3cdb98b851cb 100644 --- a/pkgs/applications/networking/cluster/k3s/1_36/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_36/versions.nix @@ -1,21 +1,21 @@ { - k3sVersion = "1.36.1+k3s1"; - k3sCommit = "a9663261a7ff40522542485a6b2f81916b6d72f9"; - k3sRepoSha256 = "0788034bw5pl8ikfb16fvdhl8a3dhhfasrbafir6s9fb8q9h3z4z"; - k3sVendorHash = "sha256-jX/qoRhVLZy/25fdhp5NOiRSGEatV/acBbSpjhutAzU="; + k3sVersion = "1.36.2+k3s1"; + k3sCommit = "01b6f04aaa69e8b09303f0393d4b4f1811da23aa"; + k3sRepoSha256 = "0iqh1hkqfgm9df3bnwi79zxcdk0a9621q451yibr19j58pb76pxv"; + k3sVendorHash = "sha256-rwFC0bzUacl5kiQrnpRqqIam+9ADqaPuxLxNBX0wWXY="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); - k3sRootVersion = "0.15.0"; - k3sRootSha256 = "008n8xx7x36y9y4r24hx39xagf1dxbp3pqq2j53s9zkaiqc62hd0"; + k3sRootVersion = "0.15.2"; + k3sRootSha256 = "0yxq2jqqb7flm4rs9dl7fqxba3mmwkmjbc8rx7pgai4qa1lzyigy"; k3sCNIVersion = "1.9.1-k3s1"; k3sCNISha256 = "1ggaz0p1c2k94car9d89a05smz3zx32sxn197b1l5kmjcnzdwadh"; - containerdVersion = "2.2.3-k3s1"; - containerdSha256 = "0fn252icn082822r754i2bqd8rivhvjwkfk031a8g0vvw8rz46vj"; + containerdVersion = "2.3.2-k3s2"; + containerdSha256 = "1jzhkh0zg1s2922fkr4r5v1680apafkjqba8ic6br8nc8bk7j4xq"; containerdPackage = "github.com/k3s-io/containerd/v2"; criCtlVersion = "1.36.0-k3s1"; flannelVersion = "v0.28.4"; flannelPluginVersion = "v1.9.0-flannel1"; kubeRouterVersion = "v2.6.3-k3s1"; criDockerdVersion = "v0.3.19-k3s5"; - helmJobVersion = "v0.10.0-build20260513"; + helmJobVersion = "v0.11.1-build20260615"; } diff --git a/pkgs/build-support/testers/hasPkgConfigModules/tester.nix b/pkgs/build-support/testers/hasPkgConfigModules/tester.nix index b0053820a3d2..b0b76f1e70d0 100644 --- a/pkgs/build-support/testers/hasPkgConfigModules/tester.nix +++ b/pkgs/build-support/testers/hasPkgConfigModules/tester.nix @@ -30,7 +30,7 @@ runCommand testName broken = throw "unused"; insecure = throw "unused"; license = throw "unused"; - maintainers = throw "unused"; + nonTeamMaintainers = throw "unused"; teams = throw "unused"; platforms = throw "unused"; unfree = throw "unused"; diff --git a/pkgs/by-name/ar/arping/package.nix b/pkgs/by-name/ar/arping/package.nix index ccd012595cdd..061f16a80645 100644 --- a/pkgs/by-name/ar/arping/package.nix +++ b/pkgs/by-name/ar/arping/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "arping"; - version = "2.28"; + version = "2.29"; src = fetchFromGitHub { owner = "ThomasHabets"; repo = "arping"; tag = "arping-${finalAttrs.version}"; - hash = "sha256-SS4z/aGu1qpTG1k4Cbj1TlC2kHRrP+7HRQyrIX2Xc/E="; + hash = "sha256-ClbSrV+TjdkvJ2KfchDkjG8c3KotqNkGnoRBy33Bx1o="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/dd/ddcutil-service/package.nix b/pkgs/by-name/dd/ddcutil-service/package.nix index 0eb2febe4aee..26f16b039fc9 100644 --- a/pkgs/by-name/dd/ddcutil-service/package.nix +++ b/pkgs/by-name/dd/ddcutil-service/package.nix @@ -31,6 +31,9 @@ stdenv.mkDerivation (finalAttrs: { ddcutil ]; + # Also installs ddcutil-client, which is built by default + installTargets = "install-all"; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/by-name/ge/gefyra/package.nix b/pkgs/by-name/ge/gefyra/package.nix index 14a29ca5908e..7176b2bb2bb9 100644 --- a/pkgs/by-name/ge/gefyra/package.nix +++ b/pkgs/by-name/ge/gefyra/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gefyra"; - version = "2.5.1"; + version = "2.5.2"; src = fetchzip { url = "https://github.com/gefyrahq/gefyra/releases/download/${finalAttrs.version}/gefyra-${finalAttrs.version}-linux-amd64.zip"; - hash = "sha256-RwosuoLT7lONDvUsWHQBHr52On4M5B8FoHEgUdPJwmI="; + hash = "sha256-GqM1BU4pmVp8XTQMqe3if7W1cJUPxnc7V06Z9WlZ9wE="; stripRoot = false; }; diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix index 0f81f3245505..969097925456 100644 --- a/pkgs/by-name/mo/models-dev/package.nix +++ b/pkgs/by-name/mo/models-dev/package.nix @@ -8,12 +8,12 @@ }: let pname = "models-dev"; - version = "0-unstable-2026-06-20"; + version = "0-unstable-2026-06-29"; src = fetchFromGitHub { owner = "anomalyco"; repo = "models.dev"; - rev = "363e0e6f3d8da90e04e6ef4a77725c74b87c49ef"; - hash = "sha256-cs3O5b4jqTmYH0yIVHoSQShA0Y7sqNj3AX9TOt8roYs="; + rev = "25e012fcdd12652969e37837863e3dba53bd5582"; + hash = "sha256-QOGlYaE4c1UVStlKPqvinBbmO6lfTAj4X1Q1fCtixwo="; }; node_modules = stdenvNoCC.mkDerivation { diff --git a/pkgs/by-name/mo/monkeys-audio/package.nix b/pkgs/by-name/mo/monkeys-audio/package.nix index 16bf1b087ea5..07684f55a6aa 100644 --- a/pkgs/by-name/mo/monkeys-audio/package.nix +++ b/pkgs/by-name/mo/monkeys-audio/package.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "13.06"; + version = "13.13"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - hash = "sha256-znR820+/ySNBqh7aRXA3WCiWe13r2SFhJqJ0TzVde7Q="; + hash = "sha256-guXXLK0wWbuaMh57IwA9mGdAmghlh4Xk1Pt7VA9iXQY="; stripRoot = false; }; diff --git a/pkgs/by-name/ox/oxlint/package.nix b/pkgs/by-name/ox/oxlint/package.nix index b8fe2d442217..8ef3d7d0422f 100644 --- a/pkgs/by-name/ox/oxlint/package.nix +++ b/pkgs/by-name/ox/oxlint/package.nix @@ -23,25 +23,25 @@ # runs without an external linter, which leaves `jsPlugins` configs inert. stdenv.mkDerivation (finalAttrs: { pname = "oxlint"; - version = "1.70.0"; + version = "1.71.0"; src = fetchFromGitHub { owner = "oxc-project"; repo = "oxc"; tag = "oxlint_v${finalAttrs.version}"; - hash = "sha256-+eP+Pawp2ZE5SqgOy9mReGn0CmXB0Ynm9aupbKLRjhk="; + hash = "sha256-6ED4/wSFOB22WN8lGnXTmfFKqZzklZKa/pfhUDIHF2Q="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-kdV7K1YkaiEKfTNpGUgRGAOAIzdgrupsG4Kg6ZBasrU="; + hash = "sha256-Q1NXa5dtYhVopRbBZoAlRLrOkDDmsObsG/xMlmTN4yY="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_10; fetcherVersion = 3; - hash = "sha256-njuEuAvM1DE24ueA4ZlyE/SpwdaKTWgXCV341miVoDI="; + hash = "sha256-KtKWThLwWSROr7JJXpGBK/MC/GlrrLhdkENq3orrMyI="; }; dontUseCmakeConfigure = true; diff --git a/pkgs/by-name/pa/par-lang/package.nix b/pkgs/by-name/pa/par-lang/package.nix index bcdb75397a71..3c69167e1598 100644 --- a/pkgs/by-name/pa/par-lang/package.nix +++ b/pkgs/by-name/pa/par-lang/package.nix @@ -19,13 +19,13 @@ rustPlatform.buildRustPackage { pname = "par-lang"; - version = "0-unstable-2026-06-11"; + version = "0-unstable-2026-06-24"; src = fetchFromGitHub { owner = "par-team"; repo = "par-lang"; - rev = "0d763e90deb6bdd7888686a944efa8e1f813ded6"; - hash = "sha256-7UJwbusV+F/KI8Xvau/thRY60xRDfBc6xUdo5QhVayE="; + rev = "fb93d7dd2c21a7825a57c74d6f22b250bb25d9bc"; + hash = "sha256-9NKBjOMyemgPX/r7ot/RLut1FqWl8RfuuHhXUnkv1IM="; }; cargoHash = "sha256-8lG+cKN3/W+LYWhmOfDwGiq6u3nlLJaD5uNABaY0zRY="; diff --git a/pkgs/by-name/se/sequoia-sqv/package.nix b/pkgs/by-name/se/sequoia-sqv/package.nix index 998bffde594d..a262364dd41f 100644 --- a/pkgs/by-name/se/sequoia-sqv/package.nix +++ b/pkgs/by-name/se/sequoia-sqv/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "sequoia-sqv"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitLab { owner = "sequoia-pgp"; repo = "sequoia-sqv"; rev = "v${finalAttrs.version}"; - hash = "sha256-xkvCEHVyRf1tQ/oo6Hg4Nri2WxdmH0fZFX24CPwJpZQ="; + hash = "sha256-wJI0nGjNwge6oVHo6wbxfJrWBPdxH2q4DfoJRup7OdE="; }; - cargoHash = "sha256-ZynvC4t9NBri5gc9lt2tHd/45V6QsKHbZb7HjHUQQUI="; + cargoHash = "sha256-BERor2oybs0nTR1zDszS+LbQi/cKj0ICR3GWSEU0kuk="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/wo/worldpainter/package.nix b/pkgs/by-name/wo/worldpainter/package.nix index 8211981cb1bf..eb800c8405bd 100644 --- a/pkgs/by-name/wo/worldpainter/package.nix +++ b/pkgs/by-name/wo/worldpainter/package.nix @@ -10,11 +10,11 @@ }: stdenv.mkDerivation rec { pname = "worldpainter"; - version = "2.26.2"; + version = "2.27.0"; src = fetchurl { url = "https://www.worldpainter.net/files/worldpainter_${version}.tar.gz"; - hash = "sha256-vYsIDzzt6VeeXXDDHDduH8jb/sGgviqVRMilk5dl0tU="; + hash = "sha256-UY2KB6IUlv35wEG9PNU5gWvV5L6KsEiUvJEpqWXSBSA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiointercept/default.nix b/pkgs/development/python-modules/aiointercept/default.nix index 6bb008ebb528..45389fa4c2b7 100644 --- a/pkgs/development/python-modules/aiointercept/default.nix +++ b/pkgs/development/python-modules/aiointercept/default.nix @@ -13,14 +13,14 @@ buildPythonPackage (finalAttrs: { pname = "aiointercept"; - version = "0.1.7"; + version = "0.1.8"; pyproject = true; src = fetchFromGitHub { owner = "Polandia94"; repo = "aiointercept"; tag = "v${finalAttrs.version}"; - hash = "sha256-+tl3Cb2Lkl40FdPNs5byCNoyfm9g6wEKtR0nT1jjrx0="; + hash = "sha256-DqrGQkk4mqvXZ8MgswfYXD/++6z8SupjN7rvDmPOGRs="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix index 44061fbc22ba..ece66bd6adc4 100644 --- a/pkgs/development/python-modules/boschshcpy/default.nix +++ b/pkgs/development/python-modules/boschshcpy/default.nix @@ -11,14 +11,14 @@ buildPythonPackage (finalAttrs: { pname = "boschshcpy"; - version = "0.2.122"; + version = "0.3.19"; pyproject = true; src = fetchFromGitHub { owner = "tschamm"; repo = "boschshcpy"; tag = "v${finalAttrs.version}"; - hash = "sha256-s88PETRRw503ncGmBpR1DSuCAJERwKtOOD/jGmzTB6s="; + hash = "sha256-VgARhj/RFwEgiP09eQBoCDpEggR6IQTF14klFUNAQ7U="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix index 6a34f80611a6..c941e3664e0c 100644 --- a/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/pkgs/development/python-modules/google-cloud-language/default.nix @@ -10,15 +10,15 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-language"; - version = "2.20.0"; + version = "2.21.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_language"; - inherit version; - hash = "sha256-MoROVi9/Fen4E2GGkTyBhRPh9Aw71oXd1Ew7WyhV3JM="; + inherit (finalAttrs) version; + hash = "sha256-MPDmkVDJckVeJUOaCA97VjDyC9QE3O+KVq5QP5Skvm0="; }; build-system = [ setuptools ]; @@ -48,8 +48,8 @@ buildPythonPackage rec { meta = { description = "Google Cloud Natural Language API client library"; homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-language"; - changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-language-v${version}/packages/google-cloud-language/CHANGELOG.md"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-language-v${finalAttrs.version}/packages/google-cloud-language/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index 6bedcafffc37..6040edc5e300 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "iamdata"; - version = "0.1.202606271"; + version = "0.1.202606281"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-EdU6fcNXufK/GK7tz43+SDox/Cms4uVT5DEzyIv93OQ="; + hash = "sha256-2RYqvBgUlCD28CDhcPWq2rm+D2DLUT3NDPOgnfaJxRk="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix index 3d8f40441ca8..8d4965a212df 100644 --- a/pkgs/development/python-modules/lacuscore/default.nix +++ b/pkgs/development/python-modules/lacuscore/default.nix @@ -13,16 +13,16 @@ ua-parser, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lacuscore"; - version = "1.24.7"; + version = "1.25.0"; pyproject = true; src = fetchFromGitHub { owner = "ail-project"; repo = "LacusCore"; - tag = "v${version}"; - hash = "sha256-3LI36/+Ib67IyG69ww3A295Mqjzi+t7RIT3DBBqLJok="; + tag = "v${finalAttrs.version}"; + hash = "sha256-gCNu0piYtyqXFIYhPhjrVk6qcPPVOsXDcFB3BG/g9G8="; }; pythonRelaxDeps = [ @@ -57,8 +57,8 @@ buildPythonPackage rec { meta = { description = "Modulable part of Lacus"; homepage = "https://github.com/ail-project/LacusCore"; - changelog = "https://github.com/ail-project/LacusCore/releases/tag/${src.tag}"; + changelog = "https://github.com/ail-project/LacusCore/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/lark-oapi/default.nix b/pkgs/development/python-modules/lark-oapi/default.nix index bad1da3feed1..51a9e2979184 100644 --- a/pkgs/development/python-modules/lark-oapi/default.nix +++ b/pkgs/development/python-modules/lark-oapi/default.nix @@ -14,14 +14,14 @@ buildPythonPackage (finalAttrs: { pname = "lark-oapi"; - version = "1.6.8"; + version = "1.6.9"; pyproject = true; src = fetchFromGitHub { owner = "larksuite"; repo = "oapi-sdk-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-dFfg24TyCaGX+nu/HuD+UjHibdPMccn/X4V6SVdvO60="; + hash = "sha256-W4eFhB9+XdqA/fX26XwULjvSlflL0ar/FDXWFqXsP8g="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/llama-index-workflows/default.nix b/pkgs/development/python-modules/llama-index-workflows/default.nix index f8dd1e82effa..179f5e1a03c5 100644 --- a/pkgs/development/python-modules/llama-index-workflows/default.nix +++ b/pkgs/development/python-modules/llama-index-workflows/default.nix @@ -10,13 +10,13 @@ buildPythonPackage (finalAttrs: { pname = "llama-index-workflows"; - version = "2.22.0"; + version = "2.22.1"; pyproject = true; src = fetchPypi { pname = "llama_index_workflows"; inherit (finalAttrs) version; - hash = "sha256-yMlxBaf8m0cnFuXfjP4jEAO7JOJa21EzFlLCbFl3Tx4="; + hash = "sha256-Y7JzEH9ZxOujMP0ftJL7knv9OIDqPZHfpt4ciYKHQ4U="; }; postPatch = '' diff --git a/pkgs/development/python-modules/plopp/default.nix b/pkgs/development/python-modules/plopp/default.nix index 3227e939b4a2..cfd7e8c72bd4 100644 --- a/pkgs/development/python-modules/plopp/default.nix +++ b/pkgs/development/python-modules/plopp/default.nix @@ -36,14 +36,14 @@ buildPythonPackage (finalAttrs: { pname = "plopp"; - version = "26.5.0"; + version = "26.6.0"; pyproject = true; src = fetchFromGitHub { owner = "scipp"; repo = "plopp"; tag = finalAttrs.version; - hash = "sha256-8rwF40aeJMyIcmMsSyea42B6poXHxHQlPIlw0ROeyzY="; + hash = "sha256-hM8Y5kusKUu54SYPjPwZ7YnxXFzX/IM28GFWcfkdnsA="; }; build-system = [ diff --git a/pkgs/development/python-modules/pythonqwt/default.nix b/pkgs/development/python-modules/pythonqwt/default.nix index 906185e01228..11fb25558dca 100644 --- a/pkgs/development/python-modules/pythonqwt/default.nix +++ b/pkgs/development/python-modules/pythonqwt/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "pythonqwt"; - version = "0.16.1"; + version = "0.16.2"; pyproject = true; src = fetchFromGitHub { owner = "PlotPyStack"; repo = "PythonQwt"; tag = "v${version}"; - hash = "sha256-MRvbKxAcZNZn6v4gXjDtZfdxG7tbUlbkcw9nSR7Qgn4="; + hash = "sha256-T8T76YKrgwZJVuthf4eYITP0zlguCE1B4kZ/gBdPB+c="; }; build-system = [ diff --git a/pkgs/development/rocq-modules/rocqnavi/default.nix b/pkgs/development/rocq-modules/rocqnavi/default.nix new file mode 100644 index 000000000000..1aa8484bd6ba --- /dev/null +++ b/pkgs/development/rocq-modules/rocqnavi/default.nix @@ -0,0 +1,47 @@ +{ + lib, + mkRocqDerivation, + rocq-core, + version ? null, +}: + +with lib; +mkRocqDerivation { + pname = "rocqnavi"; + owner = "affeldt-aist"; + + inherit version; + defaultVersion = + let + case = case: out: { inherit case out; }; + in + with versions; + switch rocq-core.rocq-version [ + (case (range "9.0" "9.2") "0.5.0") + ] null; + release = { + "0.5.0".hash = "sha256-pmK4gD5ccerjr2UVgwGIVbjH/RiXdYQq79/XFetiHZg="; + }; + releaseRev = v: "rocqnavi." + v; + + nativeBuildInputs = + let + ocamlpkgs = rocq-core.ocamlPackages; + in + [ + ocamlpkgs.yojson + ocamlpkgs.dune-glob + ]; + + ## Does the package contain OCaml code? + mlPlugin = true; + buildPhase = "make"; + preInstallPhase = "mkdir $(out)/bin"; + installFlags = [ "BINDIR=$(out)/bin" ]; + + meta = { + description = "Rocqnavi: an HTML documentation generator for Rocq prover"; + maintainers = with maintainers; [ cohencyril ]; + license = licenses.gpl2; + }; +} diff --git a/pkgs/top-level/rocq-packages.nix b/pkgs/top-level/rocq-packages.nix index ce62650f358a..28b980f6dbfc 100644 --- a/pkgs/top-level/rocq-packages.nix +++ b/pkgs/top-level/rocq-packages.nix @@ -62,6 +62,7 @@ let parseque = callPackage ../development/rocq-modules/parseque { }; relation-algebra = callPackage ../development/rocq-modules/relation-algebra { }; rocq-elpi = callPackage ../development/rocq-modules/rocq-elpi { }; + rocqnavi = callPackage ../development/rocq-modules/rocqnavi { }; stdlib = callPackage ../development/rocq-modules/stdlib { }; stdpp = callPackage ../development/rocq-modules/stdpp { }; vsrocq-language-server = callPackage ../development/rocq-modules/vsrocq-language-server { };