Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
+28
@@ -0,0 +1,28 @@
|
||||
{
|
||||
lib,
|
||||
melpaBuild,
|
||||
fetchFromSourcehut,
|
||||
unstableGitUpdater,
|
||||
}:
|
||||
|
||||
melpaBuild {
|
||||
pname = "org-publish-rss";
|
||||
version = "0-unstable-2026-01-09";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
vc = "git";
|
||||
owner = "~taingram";
|
||||
repo = "org-publish-rss";
|
||||
rev = "92aa98cb41635f7dd577295223a64ae44b80c99d";
|
||||
hash = "sha256-OPAyTLcYSKYqCcO6DP0yfoNYsIZzOwhZ0u9YcE4+TFU=";
|
||||
};
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = {
|
||||
description = "Automatically generate RSS feeds for org-publish projects";
|
||||
homepage = "https://git.sr.ht/~taingram/org-publish-rss";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ tetov ];
|
||||
};
|
||||
}
|
||||
@@ -1,138 +1,138 @@
|
||||
{
|
||||
"images-calico-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.0%2Brke2r3/rke2-images-calico.linux-amd64.tar.gz",
|
||||
"sha256": "72640113934fcea0ce39457b44ec5ac3b017e3b4b10e08e7fa889bc0acf12c9b"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz",
|
||||
"sha256": "dd8bbc665a554e628302d1a9f0dafdb2e594f695404c15a1ea3481d86c7bc6af"
|
||||
},
|
||||
"images-calico-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.0%2Brke2r3/rke2-images-calico.linux-amd64.tar.zst",
|
||||
"sha256": "d191314d5d979cd63020d3a891ea9594922ffa580e1f1168e475e5889d2fdf1d"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst",
|
||||
"sha256": "0d50c9781b49166446832f21765485ab72760c3d4ce6c32b70c59c2203392aec"
|
||||
},
|
||||
"images-calico-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.0%2Brke2r3/rke2-images-calico.linux-arm64.tar.gz",
|
||||
"sha256": "94f6294585471180d460ff25095df96223895f78356bca86cdb6b9ed120a27bd"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz",
|
||||
"sha256": "d56322d1aa89bf44c70e8b57ed5ed38d54c863551dfe512ee76f8038886c679e"
|
||||
},
|
||||
"images-calico-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.0%2Brke2r3/rke2-images-calico.linux-arm64.tar.zst",
|
||||
"sha256": "475ce43ee4cc09973cd6d7f00b84251525aa124d87732743015179b3ae79a403"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst",
|
||||
"sha256": "b43a3cfdde3426a5854ba6a67cdb24288a43e89001b819a7dc15930aa76f2085"
|
||||
},
|
||||
"images-canal-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.0%2Brke2r3/rke2-images-canal.linux-amd64.tar.gz",
|
||||
"sha256": "dda02fecf29c0eee551822250f8b1aa6b5493515e8894889c16befefa49cea70"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz",
|
||||
"sha256": "065c514b2c9e7be954494bd8dd84a09562b259e54ab4ff79c5b9dbd56e5cf013"
|
||||
},
|
||||
"images-canal-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.0%2Brke2r3/rke2-images-canal.linux-amd64.tar.zst",
|
||||
"sha256": "ff61e91a44633b7d67b67ea9bd75f13a5388536f93c80897c2bcca2f7030bda3"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.1%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.0%2Brke2r3/rke2-images-canal.linux-arm64.tar.gz",
|
||||
"sha256": "d0494bc8e7c1efcc1035b1527eae3b9a7bc4e23f1a2a3b944fa0134f5585ebce"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz",
|
||||
"sha256": "33429e35c4f0d0fc653e5e42bedf9a3fd0d0696998dbdfeadd78a238763fe1b4"
|
||||
},
|
||||
"images-canal-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.0%2Brke2r3/rke2-images-canal.linux-arm64.tar.zst",
|
||||
"sha256": "d5977242482fbb89c52622813443f46fa44cd171695f53dedf8aa798cd861b6c"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.1%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.35.0%2Brke2r3/rke2-images-cilium.linux-amd64.tar.gz",
|
||||
"sha256": "3f894c35461be717ddf06f3b41b7ac07ecaf81de71d838b680ef9663b4c50324"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz",
|
||||
"sha256": "58d47e765f61d528ebd16f4c5d264bf0a126fce060394fc60438c9bed1cad47e"
|
||||
},
|
||||
"images-cilium-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.0%2Brke2r3/rke2-images-cilium.linux-amd64.tar.zst",
|
||||
"sha256": "545690b3ff07522ae22fbdd522157cc81ef2e9f832feb18622be61e3470d0a18"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst",
|
||||
"sha256": "808f6a9c4104b71e7bfff5e501a3a6996c26e7366fb0144075bbef0c2944ecf8"
|
||||
},
|
||||
"images-cilium-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.0%2Brke2r3/rke2-images-cilium.linux-arm64.tar.gz",
|
||||
"sha256": "0c0819fedd53c077d349697c433d9c36005c9a9c3d286214d52d464684c1e439"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz",
|
||||
"sha256": "47954f7372a156a9f1bf4c9e7e94dcff36b51abfc43d0af4d96066633ef6ae64"
|
||||
},
|
||||
"images-cilium-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.0%2Brke2r3/rke2-images-cilium.linux-arm64.tar.zst",
|
||||
"sha256": "ee74ed3c7e0c69221153e378b5ed1034929a7836003210270586a59cb19b7c59"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst",
|
||||
"sha256": "41e2150756c2012a591206a29b37d538dcd46b690fb9517c272b71cb8f238b0c"
|
||||
},
|
||||
"images-core-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.0%2Brke2r3/rke2-images-core.linux-amd64.tar.gz",
|
||||
"sha256": "7f607ff9cc6a4b1c35db3cbdd1facf4057b3f7a55ee15fec69df5683652b72d8"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-core.linux-amd64.tar.gz",
|
||||
"sha256": "fcfb92a39fb46f1ae7f4be8a46ad1d29588187d837b36c4a2dc33ea42cf720ca"
|
||||
},
|
||||
"images-core-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.0%2Brke2r3/rke2-images-core.linux-amd64.tar.zst",
|
||||
"sha256": "7d12406770bc492304150df89d554ad92b3c522231567735c503f05ce5d14269"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-core.linux-amd64.tar.zst",
|
||||
"sha256": "28ab86616f0d1d23fc3d89c4e9fac6e36116d340001921d9f5af2e6deabde45a"
|
||||
},
|
||||
"images-core-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.0%2Brke2r3/rke2-images-core.linux-arm64.tar.gz",
|
||||
"sha256": "15e975a74fe89678df8e2825224a21aecdd2c8764e7f6a0a3f29ba3b5df06ad9"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-core.linux-arm64.tar.gz",
|
||||
"sha256": "0a7a40d0ba3732e40ca8c661dfc64d5f41af40c014a24692d91e6620bfeefe50"
|
||||
},
|
||||
"images-core-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.0%2Brke2r3/rke2-images-core.linux-arm64.tar.zst",
|
||||
"sha256": "74632fdb18512edf08f9369b7e1329436befd0833c7417ae77e7814265458a5e"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-core.linux-arm64.tar.zst",
|
||||
"sha256": "1655e472a01c55497b70408a814f0e052aa56d60e789ceb9c515657167af0874"
|
||||
},
|
||||
"images-flannel-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.0%2Brke2r3/rke2-images-flannel.linux-amd64.tar.gz",
|
||||
"sha256": "f5966228ce3e52a3e7fbfc59d450885a3ee3c98a7219589771fbbabb62292ba7"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz",
|
||||
"sha256": "49d83fb9d6c62fb5f1c9f486c599e26fd2cd8cab9f7bf08e9c5ea6602288374b"
|
||||
},
|
||||
"images-flannel-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.0%2Brke2r3/rke2-images-flannel.linux-amd64.tar.zst",
|
||||
"sha256": "e4dc998d92eaf65d64bc2a5d6e0de6aaa681e5472d299d24ae0839b62f76d0be"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.1%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.0%2Brke2r3/rke2-images-flannel.linux-arm64.tar.gz",
|
||||
"sha256": "f37509fde855af55bbb2054ce5c849f0c2411a612933aff51e330715bb646f5e"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz",
|
||||
"sha256": "a1f62b2c4b99ad00954aa6044e2223a70d6f0393e4acfac1382bdac19b268d05"
|
||||
},
|
||||
"images-flannel-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.0%2Brke2r3/rke2-images-flannel.linux-arm64.tar.zst",
|
||||
"sha256": "3e613cdb185cff68b8cb657cbe89f29858828cb5fec4763b25b0450f617f54ac"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.1%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.35.0%2Brke2r3/rke2-images-harvester.linux-amd64.tar.gz",
|
||||
"sha256": "f3a6cb427ac9687ba81bdcfd77268ff96265e5b679c5b9d857e26bdb4f5f3593"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz",
|
||||
"sha256": "96773b86966f9c09d72a9cba2b33fb316a11a1b0e85c2f8c930ad87e47ac3e78"
|
||||
},
|
||||
"images-harvester-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.0%2Brke2r3/rke2-images-harvester.linux-amd64.tar.zst",
|
||||
"sha256": "abd5217c43cf1315054e900a3f326a301ba5e87579c1771ff649b6f5edd94d5e"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst",
|
||||
"sha256": "ed3514a87eef87925e8d70b122353a60db8226c4eaf4dc27c679c67a05a9708c"
|
||||
},
|
||||
"images-harvester-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.0%2Brke2r3/rke2-images-harvester.linux-arm64.tar.gz",
|
||||
"sha256": "9ee5f7b09fe5b6646b969f4fcfd89479e3405457c86fc5bf74d30079712a0bb3"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz",
|
||||
"sha256": "a5e79cfba57d529399161a33dd63367700a100aec84f9a41c311dfbf1d9c53b4"
|
||||
},
|
||||
"images-harvester-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.0%2Brke2r3/rke2-images-harvester.linux-arm64.tar.zst",
|
||||
"sha256": "53c468f8e56251ba7ff3f44e0ed00a4c4fe021d0cc8623ba8725addee066bd0b"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst",
|
||||
"sha256": "92e492ec64673e47cba058fdca15d7075adbe457989c09e8df2aceb0e43c3ea3"
|
||||
},
|
||||
"images-multus-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.0%2Brke2r3/rke2-images-multus.linux-amd64.tar.gz",
|
||||
"sha256": "16b8fef66fd39eb87f8b071fde864d2b81f903d3681ac831c9394b3327cc4cc1"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz",
|
||||
"sha256": "176bfe68227e19d598f539ab242615c85a3335005097225d55dfeed72f2a4e88"
|
||||
},
|
||||
"images-multus-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.0%2Brke2r3/rke2-images-multus.linux-amd64.tar.zst",
|
||||
"sha256": "11b14a77520d4a2d4576d29726a48df6099efbd3698acb9f21539f4aecd8cb07"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.1%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.0%2Brke2r3/rke2-images-multus.linux-arm64.tar.gz",
|
||||
"sha256": "d64d856bb555ef4a11df92a23eaa441db98c8f412feb412047da6d76fae76898"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz",
|
||||
"sha256": "b5595ba40f9895b3f70a175bcad74d66a99e767e3d354236457bc3cf36c2e2a5"
|
||||
},
|
||||
"images-multus-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.0%2Brke2r3/rke2-images-multus.linux-arm64.tar.zst",
|
||||
"sha256": "1c37eeadd82d49406ae3d554ac37b05e93a4648e82ffaedf7d43ae2e3ea5ea96"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.1%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.35.0%2Brke2r3/rke2-images-traefik.linux-amd64.tar.gz",
|
||||
"sha256": "937eae561cef4f2a084268d02984393f6c963bbe6effb5b407ba73ee715d38df"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz",
|
||||
"sha256": "466a56cfb0dc31746b9ff9a36c19a6691c334d6670cbc5b20fc17b6a30abff5c"
|
||||
},
|
||||
"images-traefik-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.0%2Brke2r3/rke2-images-traefik.linux-amd64.tar.zst",
|
||||
"sha256": "83fb940a35c030c0ada591b30929f891f313496759a3aa0bd5956d2fb5352d81"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst",
|
||||
"sha256": "ffdcdf38e2b9d7ceaa9d158f55294ea350015fa69e9b1a18587e8eb6bff7847e"
|
||||
},
|
||||
"images-traefik-linux-arm64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.0%2Brke2r3/rke2-images-traefik.linux-arm64.tar.gz",
|
||||
"sha256": "63cafab564b813e7275acfccf0da6e39520541900c59c43a25c3c128a5a739fd"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz",
|
||||
"sha256": "004e3bd43a13bee43745cb7ebae8c57d19f1f842e3e8cb4483fe26e0485bfc26"
|
||||
},
|
||||
"images-traefik-linux-arm64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.0%2Brke2r3/rke2-images-traefik.linux-arm64.tar.zst",
|
||||
"sha256": "10d15dfa11d37bfa6818f50e143ee9747667412d87546c48c213d1f3ea592e94"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst",
|
||||
"sha256": "9b19e64407a5e12c73d9c00a121e1d78481ef2fa2e7597a9e20a201a6c527013"
|
||||
},
|
||||
"images-vsphere-linux-amd64-tar-gz": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.0%2Brke2r3/rke2-images-vsphere.linux-amd64.tar.gz",
|
||||
"sha256": "9c1d892ff927f82c5b403b0ef8f8e113dbd2515040fd24ea0556fc75de68bff7"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz",
|
||||
"sha256": "be4c117dd855175a7447f4d3b91136aa13e57d0c7609ad459c0305a1f1db005a"
|
||||
},
|
||||
"images-vsphere-linux-amd64-tar-zst": {
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.0%2Brke2r3/rke2-images-vsphere.linux-amd64.tar.zst",
|
||||
"sha256": "49cc7202498496512f5320a70d544519bfbfe45e4893a678aebb2ab76a2dda6f"
|
||||
"url": "https://github.com/rancher/rke2/releases/download/v1.35.1%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst",
|
||||
"sha256": "9fa9e5c74da801d1988cf9b86e92bf48c49334b07b684208a0bc18f04751c868"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
{
|
||||
rke2Version = "1.35.0+rke2r3";
|
||||
rke2Commit = "25ce2b8aa70af95611e0cd762079bbd1ee0006df";
|
||||
rke2TarballHash = "sha256-HCdUc15OIQy+UBSXnaXift8KGbD2PfQCBuCacGKWjKw=";
|
||||
rke2VendorHash = "sha256-gWb2rTpyAxhnl/OSzApsk/Ryo9tQud65a4TJC4d1eU4=";
|
||||
k8sImageTag = "v1.35.0-rke2r3-build20260127";
|
||||
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";
|
||||
pauseVersion = "3.6";
|
||||
ccmVersion = "v1.35.0-rc1.0.20251218152248-a6c6cd15c0c4-build20251219";
|
||||
dockerizedVersion = "v1.35.0-rke2r3";
|
||||
helmJobVersion = "v0.9.12-build20251215";
|
||||
ccmVersion = "v1.35.1-0.20260211145923-50fa2d70c239-build20260211";
|
||||
dockerizedVersion = "v1.35.1-rke2r1";
|
||||
helmJobVersion = "v0.9.14-build20260210";
|
||||
imagesVersions = with builtins; fromJSON (readFile ./images-versions.json);
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
fetchurl,
|
||||
lib,
|
||||
stdenv,
|
||||
jre,
|
||||
coreutils,
|
||||
makeWrapper,
|
||||
gitUpdater,
|
||||
}:
|
||||
@@ -11,8 +11,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ant";
|
||||
version = "1.10.15";
|
||||
|
||||
buildInputs = [ jre ];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
src = fetchurl {
|
||||
@@ -21,23 +19,60 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/ant
|
||||
mkdir -p $out/bin $out/share/ant
|
||||
mv * $out/share/ant/
|
||||
|
||||
# Get rid of the manual (35 MiB). Maybe we should put this in a
|
||||
# separate output.
|
||||
rm -rf $out/share/ant/{manual,WHATSNEW}
|
||||
# separate output. Keep the antRun script since it's vanilla sh
|
||||
# and needed for the <exec/> task (but since we set ANT_HOME to
|
||||
# a weird value, we have to move antRun to a weird location).
|
||||
# Get rid of the other Ant scripts since we provide our own.
|
||||
mv $out/share/ant/bin/antRun $out/bin/
|
||||
rm -rf $out/share/ant/{manual,bin,WHATSNEW}
|
||||
mkdir $out/share/ant/bin
|
||||
mv $out/bin/antRun $out/share/ant/bin/
|
||||
|
||||
# Link Ant's special $ANT_HOME/bin to the standard /bin location
|
||||
ln -s $out/share/ant/bin $out
|
||||
cat >> $out/bin/ant <<EOF
|
||||
#! ${stdenv.shell} -e
|
||||
|
||||
# Wrap the wrappers.
|
||||
for wrapper in ant runant.py runant.pl; do
|
||||
wrapProgram "$out/share/ant/bin/$wrapper" \
|
||||
--set-default JAVA_HOME "${jre.home}" \
|
||||
--set-default ANT_HOME "$out/share/ant" \
|
||||
--prefix CLASSPATH : "$out/share/ant/lib"
|
||||
done
|
||||
ANT_HOME=$out/share/ant
|
||||
|
||||
# Find the JDK by looking for javac. As a fall-back, find the
|
||||
# JRE by looking for java. The latter allows just the JRE to be
|
||||
# used with (say) ECJ as the compiler. Finally, allow the GNU
|
||||
# JVM.
|
||||
if [ -z "\''${JAVA_HOME-}" ]; then
|
||||
for i in javac java gij; do
|
||||
if p="\$(type -p \$i)"; then
|
||||
export JAVA_HOME="\$(${coreutils}/bin/dirname \$(${coreutils}/bin/dirname \$(${coreutils}/bin/readlink -f \$p)))"
|
||||
break
|
||||
fi
|
||||
done
|
||||
if [ -z "\''${JAVA_HOME-}" ]; then
|
||||
echo "\$0: cannot find the JDK or JRE" >&2
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -z \$NIX_JVM ]; then
|
||||
if [ -e \$JAVA_HOME/bin/java ]; then
|
||||
NIX_JVM=\$JAVA_HOME/bin/java
|
||||
elif [ -e \$JAVA_HOME/bin/gij ]; then
|
||||
NIX_JVM=\$JAVA_HOME/bin/gij
|
||||
else
|
||||
NIX_JVM=java
|
||||
fi
|
||||
fi
|
||||
|
||||
LOCALCLASSPATH="\$ANT_HOME/lib/ant-launcher.jar\''${LOCALCLASSPATH:+:}\$LOCALCLASSPATH"
|
||||
|
||||
exec \$NIX_JVM \$NIX_ANT_OPTS \$ANT_OPTS -classpath "\$LOCALCLASSPATH" \
|
||||
-Dant.home=\$ANT_HOME -Dant.library.dir="\$ANT_LIB" \
|
||||
org.apache.tools.ant.launch.Launcher \$NIX_ANT_ARGS \$ANT_ARGS \
|
||||
-cp "\$CLASSPATH" "\$@"
|
||||
EOF
|
||||
|
||||
chmod +x $out/bin/ant
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
installFonts,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
@@ -18,13 +19,7 @@ stdenvNoCC.mkDerivation {
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm644 -t $out/share/fonts/truetype *.ttf
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
nativeBuildInputs = [ installFonts ];
|
||||
|
||||
meta = {
|
||||
description = "APL font based on Adrian Smith's IBM Selectric APL2741 golf-ball font";
|
||||
|
||||
@@ -14,19 +14,19 @@ let
|
||||
registry = fetchFromGitHub {
|
||||
owner = "bazelbuild";
|
||||
repo = "bazel-central-registry";
|
||||
rev = "1f55d91e1be0e4863a698b9d7582cf097ad456ee";
|
||||
hash = "sha256-ESHF5FhLvn4u4j//6AFiSJRJYSKrI4EKr4oDwvsrcPM=";
|
||||
rev = "dc643526b97838ffe421b833dd8b9c95e71702e8";
|
||||
hash = "sha256-SLtrNU5uEt8rRJDUdV/IaI37CujsTHLlE31l2zYoRss=";
|
||||
};
|
||||
in
|
||||
buildBazelPackage rec {
|
||||
pname = "bant";
|
||||
version = "0.2.4";
|
||||
version = "0.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hzeller";
|
||||
repo = "bant";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-A+qaFTfAAU2k4AnFB+0ahw1udmJ+BIOK8Af0OQ+4LMY=";
|
||||
hash = "sha256-qS2oKQ9/vNX58PftEjHD+3ApXtWL90YVBHnifLtDTcU=";
|
||||
};
|
||||
|
||||
bazelFlags = [
|
||||
@@ -47,8 +47,8 @@ buildBazelPackage rec {
|
||||
fetchAttrs = {
|
||||
hash =
|
||||
{
|
||||
aarch64-linux = "sha256-aGfFbeosrWhNqiHV9ng59DeMZSGjaylPRfolxatauJE";
|
||||
x86_64-linux = "sha256-nbHHkgN4O8bWZzrpQUMZbm4+iRffqdfu7C1kkLJ3GDQ=";
|
||||
aarch64-linux = "sha256-vg2U7v68Tn6cxPakeWir8TpHL3oMxZ2AzJ68TMR1+/E=";
|
||||
x86_64-linux = "sha256-jIffzBTO+5VMX73vV4XPlGv7/26oMLXpYdb0vzFgulc=";
|
||||
}
|
||||
.${system} or (throw "No hash for system: ${system}");
|
||||
};
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "bulletty";
|
||||
version = "0.2.1";
|
||||
version = "0.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CrociDB";
|
||||
repo = "bulletty";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-J4ljTQuEWwGvxDbwBaP7z0TPqpLKQCmd4YSaIpcVYvg=";
|
||||
hash = "sha256-Keo7Xl8dU5ZnUxXilf93qVv0tjx5O2JfWU1obzrprxo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
./remove-rustfmt-exec.patch
|
||||
];
|
||||
|
||||
cargoHash = "sha256-yL7qYE60TBtEoj+0/ykhbEv6XBfk9JA0y8JLvRzaAHI=";
|
||||
cargoHash = "sha256-bwQcmA0/wQmwEobhDkDCi5s3MgxxCi0I4m2yuQ2/XZo=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "feishu-cli";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "riba2534";
|
||||
repo = "feishu-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-MO9RpMEJcWIrOoJ+O4IpF7wmnhYNNYpLJC/2IhkrQeg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-j2X9sPUYLqOdHzXJCXP2s4uL6rerjZboEwKHofIE1sE=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
ldflags = [ "-X main.Version=${finalAttrs.src.tag}" ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "CLI for Feishu (Lark) Open Platform";
|
||||
homepage = "https://github.com/riba2534/feishu-cli";
|
||||
changelog = "https://github.com/riba2534/feishu-cli/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ chillcicada ];
|
||||
mainProgram = "feishu-cli";
|
||||
};
|
||||
})
|
||||
@@ -5,7 +5,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.43.4";
|
||||
version = "0.43.5";
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "geesefs";
|
||||
@@ -15,7 +15,7 @@ buildGoModule {
|
||||
owner = "yandex-cloud";
|
||||
repo = "geesefs";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-mel9gvmlMzA9WEst7Xx49O4LqmzVXzPJU45ddfO4GkI=";
|
||||
hash = "sha256-cfeL7fnxS+UFUlRVLiO09GHuEOvkiH5PkKcoH+jNRhY=";
|
||||
};
|
||||
|
||||
# hashes differ per architecture otherwise.
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
fetchFromGitHub,
|
||||
dotnetCorePackages,
|
||||
wrapGAppsHook3,
|
||||
glib,
|
||||
glew,
|
||||
gtk3,
|
||||
libxrandr,
|
||||
@@ -56,6 +57,8 @@ buildDotnetModule rec {
|
||||
libxcursor
|
||||
# For file dialogs
|
||||
gtk3
|
||||
# For web view (login dialog); loaded via P/Invoke at runtime
|
||||
glib
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
pam,
|
||||
bison,
|
||||
flex,
|
||||
enablePam ? lib.meta.availableOn stdenv.hostPlatform pam,
|
||||
enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdLibs,
|
||||
systemdLibs,
|
||||
musl-fts,
|
||||
@@ -24,6 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
(lib.enableFeature enablePam "pam")
|
||||
(lib.enableFeature enableSystemd "systemd")
|
||||
]
|
||||
# implicit declaration of function 'rpl_malloc', ; did you mean 'realloc'
|
||||
@@ -40,11 +42,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
bison
|
||||
flex
|
||||
];
|
||||
buildInputs = [
|
||||
pam
|
||||
]
|
||||
++ lib.optional enableSystemd systemdLibs
|
||||
++ lib.optional stdenv.hostPlatform.isMusl musl-fts;
|
||||
buildInputs =
|
||||
lib.optional enablePam pam
|
||||
++ lib.optional enableSystemd systemdLibs
|
||||
++ lib.optional stdenv.hostPlatform.isMusl musl-fts;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/tools/Makefile.am \
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "libretro-shaders-slang";
|
||||
version = "0-unstable-2026-02-20";
|
||||
version = "0-unstable-2026-02-27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "slang-shaders";
|
||||
rev = "ff3bd235e1c59e73da2b878aa12dfce8b79f3dbf";
|
||||
hash = "sha256-yIIUPDzHit4K/5guZ3lNY5NJhcqZx/z8P9XG+HP5sLs=";
|
||||
rev = "b8a7e9e8eaf1a40210b62e6f967d25d81b37d0c8";
|
||||
hash = "sha256-t+M49noCVkYsk2T4yq6tbRgF9XoP8ptcxch9Sq69L88=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
ocamlPackages.buildDunePackage (finalAttrs: {
|
||||
pname = "nixtamal";
|
||||
version = "1.1.2";
|
||||
version = "1.1.3";
|
||||
release_year = 2026;
|
||||
|
||||
minimalOCamlVersion = "5.3";
|
||||
@@ -26,7 +26,7 @@ ocamlPackages.buildDunePackage (finalAttrs: {
|
||||
url = "https://darcs.toastal.in.th/nixtamal/stable/";
|
||||
mirrors = [ "https://smeder.ee/~toastal/nixtamal.darcs" ];
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-Sgr3FGMjo/eETc6DA+rnBHKIQ3yUPkFKRRbf4O1Ns/o=";
|
||||
hash = "sha256-jqPdtgdfQC28QgGPvLkjFMrC470vOAkLGo3EEKCs8hQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "palemoon-bin";
|
||||
version = "34.0.1";
|
||||
version = "34.1.0";
|
||||
|
||||
src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}";
|
||||
|
||||
@@ -173,11 +173,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
{
|
||||
gtk3 = fetchzip {
|
||||
urls = urlRegionVariants "gtk3";
|
||||
hash = "sha256-kZ0MCMtAzSzGZomoB/dtNgSsPfFLZXitGSZ9aB1K/9g=";
|
||||
hash = "sha256-TMqk3XsNMAKfKvV1R/O2R+9bd2vnTM1qDhkVoohVCUU=";
|
||||
};
|
||||
gtk2 = fetchzip {
|
||||
urls = urlRegionVariants "gtk2";
|
||||
hash = "sha256-yhnQuRtyl5nLn1ggG6zjUTXM0ym7510QXMe+jvwG9GM=";
|
||||
hash = "sha256-IDIJNQ3jAI0PW03mqXU9vc8xUBbNn+zCIQlJGEJp+Mk=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -26,14 +26,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "s7";
|
||||
version = "11.7-unstable-2026-02-27";
|
||||
version = "11.7-unstable-2026-03-07";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "cm-gitlab.stanford.edu";
|
||||
owner = "bil";
|
||||
repo = "s7";
|
||||
rev = "762eed4ddfc1134f8b18b74a0cc39434a65bc64c";
|
||||
hash = "sha256-3ww14LOWres0HA/4TRNMmNFkaFVqXBOrpsJgFv6qaYY=";
|
||||
rev = "5dfb990344f8edb463591e2e444daa1e004eb25f";
|
||||
hash = "sha256-XFzhMWfzQXrA87zioes+MzHjLnu+wseQTWJCPORkoU8=";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
nix-update-script,
|
||||
|
||||
isDesktopVariant, # set in all-packages.nix
|
||||
isDesktopVariant ? false,
|
||||
buildWithFrontend ? !isDesktopVariant,
|
||||
}:
|
||||
|
||||
|
||||
@@ -9,23 +9,27 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "talosctl";
|
||||
version = "1.12.3";
|
||||
version = "1.12.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "siderolabs";
|
||||
repo = "talos";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-REQ1JAmqZLdoUMuydu4SCq0OsjWRba7s1pWabRbzB0I=";
|
||||
hash = "sha256-shXNd8Vz5YXpA9J6m4IDsRx8cTR7ZDPDfjm8kVssBqg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Ni7DWXNinC+eZSajFqA5w6XJim23Yd5dhzWkZL6r4rg=";
|
||||
vendorHash = "sha256-74zQzCiqH9jCdPzgXIQqPHCslcKuD+kLxfiH/CjzhAY=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
];
|
||||
|
||||
env.GOWORK = "off";
|
||||
overrideModAttrs = _: {
|
||||
buildPhase = ''
|
||||
go work vendor
|
||||
'';
|
||||
};
|
||||
|
||||
subPackages = [ "cmd/talosctl" ];
|
||||
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
{ lib, fetchFromGitHub }:
|
||||
rec {
|
||||
version = "2.3.6";
|
||||
version = "2.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TandoorRecipes";
|
||||
repo = "recipes";
|
||||
tag = version;
|
||||
hash = "sha256-DWPy4wse9sAr/xmZuNRXy4kYTD5elGx9QiXmJKrw860=";
|
||||
hash = "sha256-R8G6cuepHSrbB5rtyl6CunxD6dGI7kxEliLggIfPKlM=";
|
||||
};
|
||||
|
||||
yarnHash = "sha256-++Si9U9Ouz9LpeemtqzIiQIpuhbSJkruKlVR1WSgQfo=";
|
||||
yarnHash = "sha256-gwATGCCd1Am7gOcQiLlelwiZYyC3PKs8CGEFxQOePMo=";
|
||||
|
||||
meta = {
|
||||
homepage = "https://tandoor.dev/";
|
||||
|
||||
@@ -96,6 +96,8 @@ python.pkgs.buildPythonPackage {
|
||||
# Tests
|
||||
fido2
|
||||
litellm
|
||||
requests-hardened
|
||||
thefuzz
|
||||
];
|
||||
|
||||
configurePhase = ''
|
||||
|
||||
@@ -6,17 +6,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "taschenrechner";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.fem-net.de";
|
||||
owner = "mabl";
|
||||
repo = "taschenrechner";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-ZkyZpCOSo30XEjfh6bLiTLQs/efSFtwdlpIu9bO5Sdc=";
|
||||
hash = "sha256-lUQmgC3GcLJ2BxE+UOHPBfl8XMclgMrk+rClZI06giE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-29gqkJe/8ghAgAeioQ2r+AYgOI6lzMnDut4WF0Q59Xg=";
|
||||
cargoHash = "sha256-1DNEsVwrGekCuQTgBNAe+j/4JKk0EFgkSklTXAjwFXU=";
|
||||
|
||||
meta = {
|
||||
description = "Cli-calculator written in Rust";
|
||||
|
||||
@@ -30,18 +30,18 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "typesetter";
|
||||
version = "0.11.1";
|
||||
version = "0.11.2";
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
owner = "haydn";
|
||||
repo = "typesetter";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-sBcCO/OTM7/0gFcWsC0cO4dwVdHT5kxAHGWYANdF5IA=";
|
||||
hash = "sha256-aZhtynRB/zL3i6LRnm2OXPJt1ERUXxnRXmHYvfLZyWU=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-BzVlJ2T4XilUyOHtaE1jiGoqnbOc8uCwIR0UqSVzo1Q=";
|
||||
hash = "sha256-cQWKj2vQHaz9vx6UvukxLaV6qZlLXvvVbmIeKSMpAns=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -0,0 +1,315 @@
|
||||
A shameless merge of many patches floating around; indeed it was made by reading
|
||||
and applying them manually.
|
||||
|
||||
This patch will work on ventoy 1.1.10+ despite the directory names; unless a
|
||||
change has been made to the scripts meant to be patched.
|
||||
|
||||
If you're updating the patch, ventoy-x.x.xx-old and new are based on the ventoy repo
|
||||
INSTALL directory.
|
||||
|
||||
diff -Naur ventoy-1.1.10-old/CreatePersistentImg.sh ventoy-1.1.10-new/CreatePersistentImg.sh
|
||||
--- ventoy-1.1.10-old/CreatePersistentImg.sh 2026-03-03 16:17:02.368587084 +0000
|
||||
+++ ventoy-1.1.10-new/CreatePersistentImg.sh 2026-03-03 16:21:52.272094662 +0000
|
||||
@@ -119,17 +119,13 @@
|
||||
sync
|
||||
|
||||
if [ -n "$config" ]; then
|
||||
- if [ -d ./persist_tmp_mnt ]; then
|
||||
- rm -rf ./persist_tmp_mnt
|
||||
- fi
|
||||
-
|
||||
- mkdir ./persist_tmp_mnt
|
||||
- if mount $freeloop ./persist_tmp_mnt; then
|
||||
- echo '/ union' > ./persist_tmp_mnt/$config
|
||||
+ path_to_persist_mnt="`mktemp -d`"
|
||||
+ if mount $freeloop "$path_to_persist_mnt"; then
|
||||
+ echo '/ union' > "$path_to_persist_mnt"/$config
|
||||
sync
|
||||
- umount ./persist_tmp_mnt
|
||||
+ umount "$path_to_persist_mnt"
|
||||
fi
|
||||
- rm -rf ./persist_tmp_mnt
|
||||
+ rm -rf "$path_to_persist_mnt"
|
||||
fi
|
||||
|
||||
if [ ! -z "$passphrase" ]; then
|
||||
diff -Naur ventoy-1.1.10-old/tool/ventoy_lib.sh ventoy-1.1.10-new/tool/ventoy_lib.sh
|
||||
--- ventoy-1.1.10-old/tool/ventoy_lib.sh 2026-03-03 16:17:02.423110021 +0000
|
||||
+++ ventoy-1.1.10-new/tool/ventoy_lib.sh 2026-03-03 16:42:27.917098949 +0000
|
||||
@@ -6,6 +6,8 @@
|
||||
VENTOY_SECTOR_SIZE=512
|
||||
VENTOY_SECTOR_NUM=65536
|
||||
|
||||
+LOGFILE="/var/log/ventoy.log"
|
||||
+
|
||||
ventoy_false() {
|
||||
[ "1" = "2" ]
|
||||
}
|
||||
@@ -29,7 +31,7 @@
|
||||
}
|
||||
|
||||
vtdebug() {
|
||||
- echo "$*" >> ./log.txt
|
||||
+ echo "$*" >> $LOGFILE
|
||||
}
|
||||
|
||||
vtoy_gen_uuid() {
|
||||
@@ -51,31 +53,7 @@
|
||||
}
|
||||
|
||||
check_tool_work_ok() {
|
||||
-
|
||||
- if echo 1 | hexdump > /dev/null; then
|
||||
- vtdebug "hexdump test ok ..."
|
||||
- else
|
||||
- vtdebug "hexdump test fail ..."
|
||||
- ventoy_false
|
||||
- return
|
||||
- fi
|
||||
-
|
||||
- if mkexfatfs -V > /dev/null; then
|
||||
- vtdebug "mkexfatfs test ok ..."
|
||||
- else
|
||||
- vtdebug "mkexfatfs test fail ..."
|
||||
- ventoy_false
|
||||
- return
|
||||
- fi
|
||||
-
|
||||
- if vtoycli fat -T; then
|
||||
- vtdebug "vtoycli fat test ok ..."
|
||||
- else
|
||||
- vtdebug "vtoycli fat test fail ..."
|
||||
- ventoy_false
|
||||
- return
|
||||
- fi
|
||||
-
|
||||
+
|
||||
vtdebug "tool check success ..."
|
||||
ventoy_true
|
||||
}
|
||||
@@ -315,7 +293,7 @@
|
||||
else
|
||||
vtdebug "format disk by fdisk ..."
|
||||
|
||||
-fdisk $DISK >>./log.txt 2>&1 <<EOF
|
||||
+fdisk $DISK >>$LOGFILE 2>&1 <<EOF
|
||||
o
|
||||
n
|
||||
p
|
||||
diff -Naur ventoy-1.1.10-old/tool/VentoyWorker.sh ventoy-1.1.10-new/tool/VentoyWorker.sh
|
||||
--- ventoy-1.1.10-old/tool/VentoyWorker.sh 2026-03-03 16:17:02.419287102 +0000
|
||||
+++ ventoy-1.1.10-new/tool/VentoyWorker.sh 2026-03-03 16:33:54.178992873 +0000
|
||||
@@ -106,7 +106,7 @@
|
||||
if check_tool_work_ok; then
|
||||
vtdebug "check tool work ok"
|
||||
else
|
||||
- vterr "Some tools can not run on current system. Please check log.txt for details."
|
||||
+ vterr "Some tools can not run on current system. Please check $LOGFILE for details."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@@ -159,19 +159,6 @@
|
||||
exit 1
|
||||
fi
|
||||
|
||||
-
|
||||
-#check tmp_mnt directory
|
||||
-if [ -d ./tmp_mnt ]; then
|
||||
- vtdebug "There is a tmp_mnt directory, now delete it."
|
||||
- umount ./tmp_mnt >/dev/null 2>&1
|
||||
- rm -rf ./tmp_mnt
|
||||
- if [ -d ./tmp_mnt ]; then
|
||||
- vterr "tmp_mnt directory exists, please delete it first."
|
||||
- exit 1
|
||||
- fi
|
||||
-fi
|
||||
-
|
||||
-
|
||||
if [ "$MODE" = "install" -a -z "$NONDESTRUCTIVE" ]; then
|
||||
vtdebug "install Ventoy ..."
|
||||
|
||||
@@ -580,16 +567,16 @@
|
||||
PART1_TYPE=$(dd if=$DISK bs=1 count=1 skip=450 status=none | hexdump -n1 -e '1/1 "%02X"')
|
||||
|
||||
#reserve disk uuid
|
||||
- rm -f ./diskuuid.bin
|
||||
- dd status=none conv=fsync if=${DISK} skip=384 bs=1 count=16 of=./diskuuid.bin
|
||||
+ path_to_diskuuid="`mktemp`"
|
||||
+ dd status=none conv=fsync if=${DISK} skip=384 bs=1 count=16 of="$path_to_diskuuid"
|
||||
|
||||
dd status=none conv=fsync if=./boot/boot.img of=$DISK bs=1 count=440
|
||||
- dd status=none conv=fsync if=./diskuuid.bin of=$DISK bs=1 count=16 seek=384
|
||||
- rm -f ./diskuuid.bin
|
||||
+ dd status=none conv=fsync if="$path_to_diskuuid" of=$DISK bs=1 count=16 seek=384
|
||||
+ rm -f "$path_to_diskuuid"
|
||||
|
||||
#reserve data
|
||||
- rm -f ./rsvdata.bin
|
||||
- dd status=none conv=fsync if=${DISK} skip=2040 bs=512 count=8 of=./rsvdata.bin
|
||||
+ path_to_rsvdata="`mktemp`"
|
||||
+ dd status=none conv=fsync if=${DISK} skip=2040 bs=512 count=8 of="$path_to_rsvdata"
|
||||
|
||||
if [ "$PART1_TYPE" = "EE" ]; then
|
||||
vtdebug "This is GPT partition style ..."
|
||||
@@ -611,8 +598,8 @@
|
||||
xzcat ./boot/core.img.xz | dd status=none conv=fsync of=$DISK bs=512 count=2047 seek=1
|
||||
fi
|
||||
|
||||
- dd status=none conv=fsync if=./rsvdata.bin seek=2040 bs=512 count=8 of=${DISK}
|
||||
- rm -f ./rsvdata.bin
|
||||
+ dd status=none conv=fsync if="$path_to_rsvdata" seek=2040 bs=512 count=8 of=${DISK}
|
||||
+ rm -f "$path_to_rsvdata"
|
||||
|
||||
check_umount_disk "$DISK"
|
||||
|
||||
diff -Naur ventoy-1.1.10-old/Ventoy2Disk.sh ventoy-1.1.10-new/Ventoy2Disk.sh
|
||||
--- ventoy-1.1.10-old/Ventoy2Disk.sh 2026-03-03 16:17:02.373290887 +0000
|
||||
+++ ventoy-1.1.10-new/Ventoy2Disk.sh 2026-03-03 16:35:41.510486932 +0000
|
||||
@@ -32,56 +32,4 @@
|
||||
echo '**********************************************'
|
||||
echo ''
|
||||
|
||||
-
|
||||
-if ! [ -f ./boot/boot.img ]; then
|
||||
- if [ -d ./grub ]; then
|
||||
- echo "Don't run Ventoy2Disk.sh here, please download the released install package, and run the script in it."
|
||||
- else
|
||||
- echo "Please run under the correct directory!"
|
||||
- fi
|
||||
- exit 1
|
||||
-fi
|
||||
-
|
||||
-echo "############# Ventoy2Disk $* [$TOOLDIR] ################" >> ./log.txt
|
||||
-date >> ./log.txt
|
||||
-
|
||||
-#decompress tool
|
||||
-echo "decompress tools" >> ./log.txt
|
||||
-cd ./tool/$TOOLDIR
|
||||
-
|
||||
-ls *.xz > /dev/null 2>&1
|
||||
-if [ $? -eq 0 ]; then
|
||||
- [ -f ./xzcat ] && chmod +x ./xzcat
|
||||
-
|
||||
- for file in $(ls *.xz); do
|
||||
- echo "decompress $file" >> ./log.txt
|
||||
- xzcat $file > ${file%.xz}
|
||||
- [ -f ./${file%.xz} ] && chmod +x ./${file%.xz}
|
||||
- [ -f ./$file ] && rm -f ./$file
|
||||
- done
|
||||
-fi
|
||||
-
|
||||
-#use static linked mkexfatfs for musl-libc environment
|
||||
-if [ -f mkexfatfs_static ]; then
|
||||
- if ldd --version 2>&1 | grep -qi musl; then
|
||||
- mv mkexfatfs mkexfatfs_shared
|
||||
- mv mkexfatfs_static mkexfatfs
|
||||
- fi
|
||||
-fi
|
||||
-
|
||||
-cd ../../
|
||||
-chmod +x -R ./tool/$TOOLDIR
|
||||
-
|
||||
-
|
||||
-if [ -f /bin/bash ]; then
|
||||
- /bin/bash ./tool/VentoyWorker.sh $*
|
||||
-else
|
||||
- ash ./tool/VentoyWorker.sh $*
|
||||
-fi
|
||||
-
|
||||
-if [ -n "$OLDDIR" ]; then
|
||||
- CURDIR=$(pwd)
|
||||
- if [ "$CURDIR" != "$OLDDIR" ]; then
|
||||
- cd "$OLDDIR"
|
||||
- fi
|
||||
-fi
|
||||
+./tool/VentoyWorker.sh $*
|
||||
diff -Naur ventoy-1.1.10-old/VentoyPlugson.sh ventoy-1.1.10-new/VentoyPlugson.sh
|
||||
--- ventoy-1.1.10-old/VentoyPlugson.sh 2026-03-03 16:17:02.374195975 +0000
|
||||
+++ ventoy-1.1.10-new/VentoyPlugson.sh 2026-03-03 16:37:42.662416899 +0000
|
||||
@@ -43,39 +43,6 @@
|
||||
exit 1
|
||||
fi
|
||||
|
||||
-
|
||||
-if ! [ -f "$OLDDIR/tool/plugson.tar.xz" ]; then
|
||||
- echo "Please run under the correct directory!"
|
||||
- exit 1
|
||||
-fi
|
||||
-
|
||||
-echo "############# VentoyPlugson $* [$TOOLDIR] ################" >> ./VentoyPlugson.log
|
||||
-date >> ./VentoyPlugson.log
|
||||
-
|
||||
-echo "decompress tools" >> ./VentoyPlugson.log
|
||||
-cd ./tool/$TOOLDIR
|
||||
-
|
||||
-ls *.xz > /dev/null 2>&1
|
||||
-if [ $? -eq 0 ]; then
|
||||
- [ -f ./xzcat ] && chmod +x ./xzcat
|
||||
-
|
||||
- for file in $(ls *.xz); do
|
||||
- echo "decompress $file" >> ./VentoyPlugson.log
|
||||
- xzcat $file > ${file%.xz}
|
||||
- [ -f ./${file%.xz} ] && chmod +x ./${file%.xz}
|
||||
- [ -f ./$file ] && rm -f ./$file
|
||||
- done
|
||||
-fi
|
||||
-
|
||||
-cd ../../
|
||||
-chmod +x -R ./tool/$TOOLDIR
|
||||
-
|
||||
-if ! [ -f "$OLDDIR/tool/$TOOLDIR/Plugson" ]; then
|
||||
- echo "$OLDDIR/tool/$TOOLDIR/Plugson does not exist!"
|
||||
- exit 1
|
||||
-fi
|
||||
-
|
||||
-
|
||||
PATH=./tool/$TOOLDIR:$PATH
|
||||
|
||||
HOST="127.0.0.1"
|
||||
@@ -217,11 +184,3 @@
|
||||
|
||||
wait $wID
|
||||
fi
|
||||
-
|
||||
-
|
||||
-if [ -n "$OLDDIR" ]; then
|
||||
- CURDIR=$(pwd)
|
||||
- if [ "$CURDIR" != "$OLDDIR" ]; then
|
||||
- cd "$OLDDIR"
|
||||
- fi
|
||||
-fi
|
||||
diff -Naur ventoy-1.1.10-old/VentoyWeb.sh ventoy-1.1.10-new/VentoyWeb.sh
|
||||
--- ventoy-1.1.10-old/VentoyWeb.sh 2026-03-03 16:17:02.374230398 +0000
|
||||
+++ ventoy-1.1.10-new/VentoyWeb.sh 2026-03-03 16:39:37.047028579 +0000
|
||||
@@ -15,12 +15,6 @@
|
||||
echo ""
|
||||
}
|
||||
|
||||
-uid=$(id -u)
|
||||
-if [ $uid -ne 0 ]; then
|
||||
- print_err "Please use sudo or run the script as root."
|
||||
- exit 1
|
||||
-fi
|
||||
-
|
||||
OLDDIR=$(pwd)
|
||||
|
||||
if uname -m | grep -E -q 'aarch64|arm64'; then
|
||||
@@ -85,8 +79,8 @@
|
||||
exit 1
|
||||
fi
|
||||
|
||||
-LOGFILE=log.txt
|
||||
-#delete the log.txt if it's more than 8MB
|
||||
+LOGFILE=/var/log/ventoy.log
|
||||
+#delete the logfile if it's more than 8MB
|
||||
if [ -f $LOGFILE ]; then
|
||||
logsize=$(stat -c '%s' $LOGFILE)
|
||||
if [ $logsize -gt 8388608 ]; then
|
||||
@@ -94,7 +88,6 @@
|
||||
fi
|
||||
fi
|
||||
|
||||
-
|
||||
if [ -f ./tool/$TOOLDIR/V2DServer.xz ]; then
|
||||
xz -d ./tool/$TOOLDIR/V2DServer.xz
|
||||
chmod +x ./tool/$TOOLDIR/V2DServer
|
||||
@@ -66,6 +66,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-EROr5uG7cSg0/ldKlmYhqRKFgAT0/v1wFmbsl8W+sgg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./000-nixos-sanitization.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Fix permissions.
|
||||
find -type f -name \*.sh -exec chmod a+x '{}' \;
|
||||
|
||||
@@ -25,11 +25,11 @@ let
|
||||
in
|
||||
appimageTools.wrapType2 rec {
|
||||
pname = "xnviewmp";
|
||||
version = "1.9.10";
|
||||
version = "1.10.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.xnview.com/old_versions/XnView_MP/XnView_MP-${version}.glibc2.17-x86_64.AppImage";
|
||||
hash = "sha256-FscZbwuuVv+TPSUg+xgojfeXp+FscKoaQ7nLZHSlfSc=";
|
||||
hash = "sha256-hAy0mFChLdCxco+0l7gWFuNQbpiEIPp+AOBoQlOeB4I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -107,7 +107,7 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "zed-editor";
|
||||
version = "0.226.4";
|
||||
version = "0.226.5";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -120,7 +120,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "zed-industries";
|
||||
repo = "zed";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-vF/vvEJKl1mUcF6TMif5G9rQPjt+2RWImWy1f7RxgfE=";
|
||||
hash = "sha256-ZfYwlHTWirUb2RjEIQyonIHMneCi7ZGD2kPYOfe5HiI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -140,7 +140,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
rm -r $out/git/*/candle-book/
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-IH/FEC52VudtXsSHiju6T7H9E2kblJ0RyiUoQR391cc=";
|
||||
cargoHash = "sha256-kdGHSNfvB/GUQ/7iqzXcCF4sbyaMiLYq+/zogg9N/aU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "compressed-tensors";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
pyproject = true;
|
||||
|
||||
# Release on PyPI is missing the `utils` directory, which `setup.py` wants to import
|
||||
@@ -33,12 +33,9 @@ buildPythonPackage (finalAttrs: {
|
||||
owner = "neuralmagic";
|
||||
repo = "compressed-tensors";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-XsQRP186ISarMMES3P+ov4t/1KKJdl0tXBrfpjyM3XA=";
|
||||
hash = "sha256-auiVCTL4WpfaD2cwdG3kt08+nW77T/txWZP4SAW00mk=";
|
||||
};
|
||||
|
||||
# RuntimeError("torch.compile is not supported on Python 3.14+")
|
||||
disabled = pythonAtLeast "3.14";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "setuptools_scm==8.2.0" "setuptools_scm"
|
||||
@@ -59,6 +56,8 @@ buildPythonPackage (finalAttrs: {
|
||||
transformers
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [ "transformers" ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
pythonImportsCheck = [ "compressed_tensors" ];
|
||||
@@ -83,6 +82,13 @@ buildPythonPackage (finalAttrs: {
|
||||
"test_save_compressed_model"
|
||||
"test_target_prioritization"
|
||||
"test_expand_targets_with_llama_stories"
|
||||
|
||||
# AssertionError: Torch not compiled with CUDA enabled
|
||||
"test_register_parameter"
|
||||
"test_register_parameter_invalidates"
|
||||
"test_set_item"
|
||||
"test_set_item_buffers"
|
||||
"test_update_offload_parameter_with_grad"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
@@ -93,6 +99,16 @@ buildPythonPackage (finalAttrs: {
|
||||
"tests/test_transform/factory/test_serialization.py::test_serialization[True-random-hadamard]"
|
||||
"tests/test_transform/factory/test_serialization.py::test_serialization[False-hadamard]"
|
||||
"tests/test_transform/factory/test_serialization.py::test_serialization[False-random-hadamard]"
|
||||
"tests/test_transform/factory/test_serialization.py::test_serialization[False-True-hadamard]"
|
||||
"tests/test_transform/factory/test_serialization.py::test_serialization[False-True-random-hadamard]"
|
||||
"tests/test_transform/factory/test_serialization.py::test_serialization[False-False-hadamard]"
|
||||
"tests/test_transform/factory/test_serialization.py::test_serialization[False-False-random-hadamard]"
|
||||
|
||||
# AssertionError: Torch not compiled with CUDA enabled
|
||||
"tests/test_transform/factory/test_serialization.py::test_serialization[True-True-hadamard]"
|
||||
"tests/test_transform/factory/test_serialization.py::test_serialization[True-True-random-hadamard]"
|
||||
"tests/test_transform/factory/test_serialization.py::test_serialization[True-False-hadamard]"
|
||||
"tests/test_transform/factory/test_serialization.py::test_serialization[True-False-random-hadamard]"
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
+43
-43
@@ -4,9 +4,9 @@ version = 4
|
||||
|
||||
[[package]]
|
||||
name = "arc-swap"
|
||||
version = "1.8.1"
|
||||
version = "1.8.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9ded5f9a03ac8f24d1b8a25101ee812cd32cdc8c50a4c50237de2c4915850e73"
|
||||
checksum = "f9f3647c145568cec02c42054e07bdf9a5a698e15b466fb2341bfc393cd24aa5"
|
||||
dependencies = [
|
||||
"rustversion",
|
||||
]
|
||||
@@ -35,15 +35,15 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "2.10.0"
|
||||
version = "2.11.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
|
||||
checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af"
|
||||
|
||||
[[package]]
|
||||
name = "bumpalo"
|
||||
version = "3.19.1"
|
||||
version = "3.20.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510"
|
||||
checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb"
|
||||
|
||||
[[package]]
|
||||
name = "cfg-if"
|
||||
@@ -143,9 +143,9 @@ checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"
|
||||
|
||||
[[package]]
|
||||
name = "js-sys"
|
||||
version = "0.3.85"
|
||||
version = "0.3.91"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8c942ebf8e95485ca0d52d97da7c5a2c387d0e7f0ba4c35e93bfcaee045955b3"
|
||||
checksum = "b49715b7073f385ba4bc528e5747d02e66cb39c6146efb66b781f131f0fb399c"
|
||||
dependencies = [
|
||||
"once_cell",
|
||||
"wasm-bindgen",
|
||||
@@ -153,9 +153,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.180"
|
||||
version = "0.2.183"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc"
|
||||
checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d"
|
||||
|
||||
[[package]]
|
||||
name = "lock_api"
|
||||
@@ -168,9 +168,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "memchr"
|
||||
version = "2.7.6"
|
||||
version = "2.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
|
||||
checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
|
||||
|
||||
[[package]]
|
||||
name = "once_cell"
|
||||
@@ -199,9 +199,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pin-project-lite"
|
||||
version = "0.2.16"
|
||||
version = "0.2.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
|
||||
checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
|
||||
|
||||
[[package]]
|
||||
name = "portable-atomic"
|
||||
@@ -220,7 +220,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pycrdt"
|
||||
version = "0.12.46"
|
||||
version = "0.12.47"
|
||||
dependencies = [
|
||||
"pyo3",
|
||||
"serde_json",
|
||||
@@ -229,9 +229,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pyo3"
|
||||
version = "0.28.0"
|
||||
version = "0.28.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fcf3ccafdf54c050be48a3a086d372f77ba6615f5057211607cd30e5ac5cec6d"
|
||||
checksum = "cf85e27e86080aafd5a22eae58a162e133a589551542b3e5cee4beb27e54f8e1"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"once_cell",
|
||||
@@ -243,18 +243,18 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pyo3-build-config"
|
||||
version = "0.28.0"
|
||||
version = "0.28.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "972720a441c91fd9c49f212a1d2d74c6e3803b231ebc8d66c51efbd7ccab11c8"
|
||||
checksum = "8bf94ee265674bf76c09fa430b0e99c26e319c945d96ca0d5a8215f31bf81cf7"
|
||||
dependencies = [
|
||||
"target-lexicon",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pyo3-ffi"
|
||||
version = "0.28.0"
|
||||
version = "0.28.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5994456d9dab8934d600d3867571b6410f24fbd6002570ad56356733eb54859b"
|
||||
checksum = "491aa5fc66d8059dd44a75f4580a2962c1862a1c2945359db36f6c2818b748dc"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"pyo3-build-config",
|
||||
@@ -262,9 +262,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pyo3-macros"
|
||||
version = "0.28.0"
|
||||
version = "0.28.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "11ce9cc8d81b3c4969748807604d92b4eef363c5bb82b1a1bdb34ec6f1093a18"
|
||||
checksum = "f5d671734e9d7a43449f8480f8b38115df67bef8d21f76837fa75ee7aaa5e52e"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"pyo3-macros-backend",
|
||||
@@ -274,9 +274,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pyo3-macros-backend"
|
||||
version = "0.28.0"
|
||||
version = "0.28.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "eaf4b60036a154d23282679b658e3cc7d88d3b8c9a40b43824785f232d2e1b98"
|
||||
checksum = "22faaa1ce6c430a1f71658760497291065e6450d7b5dc2bcf254d49f66ee700a"
|
||||
dependencies = [
|
||||
"heck",
|
||||
"proc-macro2",
|
||||
@@ -287,9 +287,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.44"
|
||||
version = "1.0.45"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4"
|
||||
checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
@@ -375,9 +375,9 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.114"
|
||||
version = "2.0.117"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a"
|
||||
checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@@ -386,9 +386,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "target-lexicon"
|
||||
version = "0.13.4"
|
||||
version = "0.13.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b1dd07eb858a2067e2f3c7155d54e929265c264e6f37efe3ee7a8d1b5a1dd0ba"
|
||||
checksum = "adb6935a6f5c20170eeceb1a3835a49e12e19d792f6dd344ccc76a985ca5a6ca"
|
||||
|
||||
[[package]]
|
||||
name = "thiserror"
|
||||
@@ -412,9 +412,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "unicode-ident"
|
||||
version = "1.0.22"
|
||||
version = "1.0.24"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
|
||||
checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
|
||||
|
||||
[[package]]
|
||||
name = "wasi"
|
||||
@@ -424,9 +424,9 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen"
|
||||
version = "0.2.108"
|
||||
version = "0.2.114"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "64024a30ec1e37399cf85a7ffefebdb72205ca1c972291c51512360d90bd8566"
|
||||
checksum = "6532f9a5c1ece3798cb1c2cfdba640b9b3ba884f5db45973a6f442510a87d38e"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"once_cell",
|
||||
@@ -437,9 +437,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-macro"
|
||||
version = "0.2.108"
|
||||
version = "0.2.114"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "008b239d9c740232e71bd39e8ef6429d27097518b6b30bdf9086833bd5b6d608"
|
||||
checksum = "18a2d50fcf105fb33bb15f00e7a77b772945a2ee45dcf454961fd843e74c18e6"
|
||||
dependencies = [
|
||||
"quote",
|
||||
"wasm-bindgen-macro-support",
|
||||
@@ -447,9 +447,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-macro-support"
|
||||
version = "0.2.108"
|
||||
version = "0.2.114"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5256bae2d58f54820e6490f9839c49780dff84c65aeab9e772f15d5f0e913a55"
|
||||
checksum = "03ce4caeaac547cdf713d280eda22a730824dd11e6b8c3ca9e42247b25c631e3"
|
||||
dependencies = [
|
||||
"bumpalo",
|
||||
"proc-macro2",
|
||||
@@ -460,9 +460,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-shared"
|
||||
version = "0.2.108"
|
||||
version = "0.2.114"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1f01b580c9ac74c8d8f0c0e4afb04eeef2acf145458e52c03845ee9cd23e3d12"
|
||||
checksum = "75a326b8c223ee17883a4251907455a2431acc2791c98c26279376490c378c16"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
@@ -493,6 +493,6 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "zmij"
|
||||
version = "1.0.19"
|
||||
version = "1.0.21"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3ff05f8caa9038894637571ae6b9e29466c1f4f829d26c9b28f869a29cbe3445"
|
||||
checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
|
||||
|
||||
@@ -20,14 +20,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pycrdt";
|
||||
version = "0.12.46";
|
||||
version = "0.12.47";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "y-crdt";
|
||||
repo = "pycrdt";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-rL6heeHg5uhLFt3qY+NKIEA4FLIR/MtwEqleq29DPA8=";
|
||||
hash = "sha256-+LFORG9j3pkkPJ7IoF+yQ5AMssXmvQENzwpz6+ztLxM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
|
||||
# dependencies
|
||||
beautifulsoup4,
|
||||
requests,
|
||||
rsa,
|
||||
|
||||
# tests
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "steampy";
|
||||
version = "1.2.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bukson";
|
||||
repo = "steampy";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-dGcqJGRQ88vXy+x2U+ykutP4RnzTUqJlmhXmcr+4maE=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
beautifulsoup4
|
||||
requests
|
||||
rsa
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "steampy" ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Require Steam credentials
|
||||
"test/test_client.py"
|
||||
"test/test_guard.py"
|
||||
"test/test_market.py"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Steam trading library";
|
||||
homepage = "https://github.com/bukson/steampy";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ artur-sannikov ];
|
||||
};
|
||||
})
|
||||
@@ -335,14 +335,14 @@ in
|
||||
|
||||
buildPythonPackage.override { stdenv = torch.stdenv; } (finalAttrs: {
|
||||
pname = "vllm";
|
||||
version = "0.15.1";
|
||||
version = "0.16.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vllm-project";
|
||||
repo = "vllm";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-qsAvcOB8ugGlBqBrLfNHqaIUcxLwaXBTg8xWRnGyd94=";
|
||||
hash = "sha256-7E67xVRlKmm+Hbp5nphhwH8SQC9LpCFNBfF2ZAOt79k=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -367,7 +367,8 @@ buildPythonPackage.override { stdenv = torch.stdenv; } (finalAttrs: {
|
||||
# pythonRelaxDeps does not cover build-system
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "torch ==" "torch >=" \
|
||||
--replace-fail "setuptools>=77.0.3,<81.0.0" "setuptools"
|
||||
--replace-fail "setuptools>=77.0.3,<81.0.0" "setuptools" \
|
||||
--replace-fail "grpcio-tools==1.78.0" "grpcio"
|
||||
|
||||
# Ignore the python version check because it hard-codes minor versions and
|
||||
# lags behind `ray`'s python interpreter support
|
||||
|
||||
@@ -3394,10 +3394,6 @@ with pkgs;
|
||||
|
||||
spoof-mac = python3Packages.callPackage ../tools/networking/spoof-mac { };
|
||||
|
||||
stirling-pdf = callPackage ../by-name/st/stirling-pdf/package.nix {
|
||||
isDesktopVariant = false;
|
||||
};
|
||||
|
||||
stirling-pdf-desktop = callPackage ../by-name/st/stirling-pdf/package.nix {
|
||||
isDesktopVariant = true;
|
||||
};
|
||||
|
||||
@@ -18459,6 +18459,8 @@ self: super: with self; {
|
||||
|
||||
steamodd = callPackage ../development/python-modules/steamodd { };
|
||||
|
||||
steampy = callPackage ../development/python-modules/steampy { };
|
||||
|
||||
steamship = callPackage ../development/python-modules/steamship { };
|
||||
|
||||
steamworkspy = callPackage ../development/python-modules/steamworkspy { };
|
||||
|
||||
Reference in New Issue
Block a user