From 89f90ee3ceee028af7749b8c857040e0bf8260e0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Mar 2026 17:35:19 +0000 Subject: [PATCH 01/58] stripe-cli: 1.37.1 -> 1.37.2 --- pkgs/by-name/st/stripe-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stripe-cli/package.nix b/pkgs/by-name/st/stripe-cli/package.nix index efd9a32418ce..511b79a82398 100644 --- a/pkgs/by-name/st/stripe-cli/package.nix +++ b/pkgs/by-name/st/stripe-cli/package.nix @@ -12,7 +12,7 @@ buildGoModule (finalAttrs: { pname = "stripe-cli"; - version = "1.37.1"; + version = "1.37.2"; # required for tests __darwinAllowLocalNetworking = true; @@ -21,7 +21,7 @@ buildGoModule (finalAttrs: { owner = "stripe"; repo = "stripe-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-ItaJ+REOgOeJdeqJ3amZqNK38TssILOOp3ddxiEHS9c="; + hash = "sha256-Hsp90qmwy8D6SpDrgElB0Om6lumtkFjp2e///GEwkuE="; }; vendorHash = "sha256-EDdRgApJ7gv/4ma/IfaHi+jjpTPegsUfqHbvoFMn048="; From 623d2ed3a0650182c9058cd9613dc4a6d201264b Mon Sep 17 00:00:00 2001 From: poz Date: Fri, 20 Feb 2026 11:14:46 +0100 Subject: [PATCH 02/58] woomer: unbreak on aarch64-linux --- pkgs/by-name/wo/woomer/package.nix | 12 +- .../wo/woomer/unbreak-aarch64-linux.patch | 1657 +++++++++++++++++ 2 files changed, 1664 insertions(+), 5 deletions(-) create mode 100644 pkgs/by-name/wo/woomer/unbreak-aarch64-linux.patch diff --git a/pkgs/by-name/wo/woomer/package.nix b/pkgs/by-name/wo/woomer/package.nix index a2cd773dc4d5..dd86b5078b94 100644 --- a/pkgs/by-name/wo/woomer/package.nix +++ b/pkgs/by-name/wo/woomer/package.nix @@ -1,6 +1,5 @@ { lib, - stdenv, cmake, fetchFromGitHub, glfw3, @@ -22,7 +21,13 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-LcL43Wq+5d7HPsm2bEK0vZsjP/dixtNhMKywXMi4ODw="; }; - cargoHash = "sha256-xll/A0synEsXy9kPThA3bR8LRuAOQH0T6CAfIEoYJ0w="; + cargoPatches = [ + # fix compilation on aarch64 + # remove when https://github.com/coffeeispower/woomer/pull/30 is merged + ./unbreak-aarch64-linux.patch + ]; + + cargoHash = "sha256-mSyTQU/PtibkepFrYh6nrRtnsd1jONaPXt9Y5SiE3/U="; strictDeps = true; @@ -70,8 +75,5 @@ rustPlatform.buildRustPackage (finalAttrs: { # https://github.com/waycrate/wayshot/blob/cb6bd68dbbe6ab70a5d8fe3bd04cc154f0631cd8/libwayshot/src/screencopy.rs#L11 # https://github.com/nix-rust/nix/blob/0e4353a368abfcedea4ebe4345cf7604bb61d238/src/sys/mod.rs#L40-L44 platforms = lib.platforms.linux ++ lib.platforms.freebsd; - # TODO: Remove after upstream is no longer affected by - # https://github.com/raylib-rs/raylib-rs/issues/74 - broken = stdenv.hostPlatform.isAarch64; }; }) diff --git a/pkgs/by-name/wo/woomer/unbreak-aarch64-linux.patch b/pkgs/by-name/wo/woomer/unbreak-aarch64-linux.patch new file mode 100644 index 000000000000..de0a9d7df366 --- /dev/null +++ b/pkgs/by-name/wo/woomer/unbreak-aarch64-linux.patch @@ -0,0 +1,1657 @@ +diff --git a/Cargo.lock b/Cargo.lock +index fc7c39e..f8da508 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -4,24 +4,123 @@ version = 4 + + [[package]] + name = "adler2" +-version = "2.0.0" ++version = "2.0.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" ++checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" + + [[package]] + name = "aho-corasick" +-version = "1.1.3" ++version = "1.1.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" ++checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" + dependencies = [ + "memchr", + ] + + [[package]] +-name = "autocfg" +-version = "1.4.0" ++name = "aligned" ++version = "0.4.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" ++checksum = "ee4508988c62edf04abd8d92897fca0c2995d907ce1dfeaf369dac3716a40685" ++dependencies = [ ++ "as-slice", ++] ++ ++[[package]] ++name = "aligned-vec" ++version = "0.6.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dc890384c8602f339876ded803c97ad529f3842aba97f6392b3dba0dd171769b" ++dependencies = [ ++ "equator", ++] ++ ++[[package]] ++name = "anyhow" ++version = "1.0.100" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" ++ ++[[package]] ++name = "arbitrary" ++version = "1.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1" ++ ++[[package]] ++name = "arg_enum_proc_macro" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "arrayvec" ++version = "0.7.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" ++ ++[[package]] ++name = "as-slice" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "516b6b4f0e40d50dcda9365d53964ec74560ad4284da2e7fc97122cd83174516" ++dependencies = [ ++ "stable_deref_trait", ++] ++ ++[[package]] ++name = "autocfg" ++version = "1.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" ++ ++[[package]] ++name = "av-scenechange" ++version = "0.14.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0f321d77c20e19b92c39e7471cf986812cbb46659d2af674adc4331ef3f18394" ++dependencies = [ ++ "aligned", ++ "anyhow", ++ "arg_enum_proc_macro", ++ "arrayvec", ++ "log", ++ "num-rational", ++ "num-traits", ++ "pastey", ++ "rayon", ++ "thiserror 2.0.17", ++ "v_frame", ++ "y4m", ++] ++ ++[[package]] ++name = "av1-grain" ++version = "0.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8cfddb07216410377231960af4fcab838eaa12e013417781b78bd95ee22077f8" ++dependencies = [ ++ "anyhow", ++ "arrayvec", ++ "log", ++ "nom 8.0.0", ++ "num-rational", ++ "v_frame", ++] ++ ++[[package]] ++name = "avif-serialize" ++version = "0.8.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "47c8fbc0f831f4519fe8b810b6a7a91410ec83031b8233f730a0480029f6a23f" ++dependencies = [ ++ "arrayvec", ++] + + [[package]] + name = "bindgen" +@@ -29,10 +128,10 @@ version = "0.70.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" + dependencies = [ +- "bitflags 2.9.1", ++ "bitflags", + "cexpr", + "clang-sys", +- "itertools", ++ "itertools 0.13.0", + "log", + "prettyplease", + "proc-macro2", +@@ -45,36 +144,51 @@ dependencies = [ + + [[package]] + name = "bit_field" +-version = "0.10.2" ++version = "0.10.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" ++checksum = "1e4b40c7323adcfc0a41c4b88143ed58346ff65a288fc144329c5c45e05d70c6" + + [[package]] + name = "bitflags" +-version = "1.3.2" ++version = "2.10.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" ++checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" + + [[package]] +-name = "bitflags" +-version = "2.9.1" ++name = "bitstream-io" ++version = "4.9.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" ++checksum = "60d4bd9d1db2c6bdf285e223a7fa369d5ce98ec767dec949c6ca62863ce61757" ++dependencies = [ ++ "core2", ++] ++ ++[[package]] ++name = "built" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f4ad8f11f288f48ca24471bbd51ac257aaeaaa07adae295591266b792902ae64" ++ ++[[package]] ++name = "bumpalo" ++version = "3.19.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510" + + [[package]] + name = "bytemuck" +-version = "1.23.0" ++version = "1.24.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9134a6ef01ce4b366b50689c94f82c14bc72bc5d0386829828a2e2752ef7958c" ++checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4" + dependencies = [ + "bytemuck_derive", + ] + + [[package]] + name = "bytemuck_derive" +-version = "1.9.3" ++version = "1.10.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7ecc273b49b3205b83d648f0690daa588925572cc5063745bfe547fe7ec8e1a1" ++checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff" + dependencies = [ + "proc-macro2", + "quote", +@@ -88,11 +202,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + + [[package]] +-name = "cc" +-version = "1.2.23" ++name = "byteorder-lite" ++version = "0.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5f4ac86a9e5bc1e2b3449ab9d7d3a6a405e3d1bb28d7b9be8614f55846ae3766" ++checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" ++ ++[[package]] ++name = "cc" ++version = "1.2.51" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a0aeaff4ff1a90589618835a598e545176939b97874f7abc7851caa0618f203" + dependencies = [ ++ "find-msvc-tools", ++ "jobserver", ++ "libc", + "shlex", + ] + +@@ -102,14 +225,14 @@ version = "0.6.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" + dependencies = [ +- "nom", ++ "nom 7.1.3", + ] + + [[package]] + name = "cfg-if" +-version = "1.0.0" ++version = "1.0.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" ++checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" + + [[package]] + name = "clang-sys" +@@ -124,9 +247,9 @@ dependencies = [ + + [[package]] + name = "cmake" +-version = "0.1.54" ++version = "0.1.57" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0" ++checksum = "75443c44cd6b379beb8c5b45d85d0773baf31cce901fe7bb252f4eff3008ef7d" + dependencies = [ + "cc", + ] +@@ -138,10 +261,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + + [[package]] +-name = "crc32fast" +-version = "1.4.2" ++name = "core2" ++version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" ++checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "crc32fast" ++version = "1.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" + dependencies = [ + "cfg-if", + ] +@@ -173,9 +305,9 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" + + [[package]] + name = "crunchy" +-version = "0.2.3" ++version = "0.2.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929" ++checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" + + [[package]] + name = "dlib" +@@ -198,11 +330,11 @@ version = "0.12.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "98888c4bbd601524c11a7ed63f814b8825f420514f78e96f752c437ae9cbb5d1" + dependencies = [ +- "bitflags 2.9.1", ++ "bitflags", + "bytemuck", + "drm-ffi", + "drm-fourcc", +- "rustix", ++ "rustix 0.38.44", + ] + + [[package]] +@@ -212,7 +344,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "97c98727e48b7ccb4f4aea8cfe881e5b07f702d17b7875991881b41af7278d53" + dependencies = [ + "drm-sys", +- "rustix", ++ "rustix 0.38.44", + ] + + [[package]] +@@ -238,20 +370,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" + + [[package]] +-name = "errno" +-version = "0.3.12" ++name = "equator" ++version = "0.4.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18" ++checksum = "4711b213838dfee0117e3be6ac926007d7f433d7bbe33595975d4190cb07e6fc" ++dependencies = [ ++ "equator-macro", ++] ++ ++[[package]] ++name = "equator-macro" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "44f23cf4b44bfce11a86ace86f8a73ffdec849c9fd00a386a53d278bd9e81fb3" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "errno" ++version = "0.3.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" + dependencies = [ + "libc", +- "windows-sys", ++ "windows-sys 0.61.2", + ] + + [[package]] + name = "exr" +-version = "1.73.0" ++version = "1.74.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f83197f59927b46c04a183a619b7c29df34e63e63c7869320862268c0ef687e0" ++checksum = "4300e043a56aa2cb633c01af81ca8f699a321879a7854d3896a0ba89056363be" + dependencies = [ + "bit_field", + "half", +@@ -262,6 +414,26 @@ dependencies = [ + "zune-inflate", + ] + ++[[package]] ++name = "fax" ++version = "0.2.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f05de7d48f37cd6730705cbca900770cab77a89f413d23e100ad7fad7795a0ab" ++dependencies = [ ++ "fax_derive", ++] ++ ++[[package]] ++name = "fax_derive" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a0aca10fb742cb43f9e7bb8467c91aa9bcb8e3ffbc6a6f7389bb93ffc920577d" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ + [[package]] + name = "fdeflate" + version = "0.3.7" +@@ -272,10 +444,16 @@ dependencies = [ + ] + + [[package]] +-name = "flate2" +-version = "1.1.1" ++name = "find-msvc-tools" ++version = "0.1.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece" ++checksum = "645cbb3a84e60b7531617d5ae4e57f7e27308f6445f5abf653209ea76dec8dff" ++ ++[[package]] ++name = "flate2" ++version = "1.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb" + dependencies = [ + "crc32fast", + "miniz_oxide", +@@ -287,7 +465,7 @@ version = "0.15.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "45bf55ba6dd53ad0ac115046ff999c5324c283444ee6e0be82454c4e8eb2f36a" + dependencies = [ +- "bitflags 2.9.1", ++ "bitflags", + "drm", + "drm-fourcc", + "gbm-sys", +@@ -306,10 +484,22 @@ dependencies = [ + ] + + [[package]] +-name = "gif" +-version = "0.13.1" ++name = "getrandom" ++version = "0.3.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" ++checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "r-efi", ++ "wasip2", ++] ++ ++[[package]] ++name = "gif" ++version = "0.14.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f5df2ba84018d80c213569363bdcd0c64e6933c67fe4c1d60ecf822971a3c35e" + dependencies = [ + "color_quant", + "weezl", +@@ -337,18 +527,19 @@ dependencies = [ + + [[package]] + name = "glob" +-version = "0.3.2" ++version = "0.3.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" ++checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" + + [[package]] + name = "half" +-version = "2.6.0" ++version = "2.7.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9" ++checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b" + dependencies = [ + "cfg-if", + "crunchy", ++ "zerocopy", + ] + + [[package]] +@@ -360,13 +551,58 @@ dependencies = [ + "bytemuck", + "byteorder", + "color_quant", ++ "num-traits", ++] ++ ++[[package]] ++name = "image" ++version = "0.25.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e6506c6c10786659413faa717ceebcb8f70731c0a60cbae39795fdf114519c1a" ++dependencies = [ ++ "bytemuck", ++ "byteorder-lite", ++ "color_quant", + "exr", + "gif", +- "jpeg-decoder", ++ "image-webp", ++ "moxcms", + "num-traits", + "png", + "qoi", ++ "ravif", ++ "rayon", ++ "rgb", + "tiff", ++ "zune-core 0.5.0", ++ "zune-jpeg 0.5.8", ++] ++ ++[[package]] ++name = "image-webp" ++version = "0.2.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "525e9ff3e1a4be2fbea1fdf0e98686a6d98b4d8f937e1bf7402245af1909e8c3" ++dependencies = [ ++ "byteorder-lite", ++ "quick-error", ++] ++ ++[[package]] ++name = "imgref" ++version = "1.12.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e7c5cedc30da3a610cac6b4ba17597bdf7152cf974e8aab3afb3d54455e371c8" ++ ++[[package]] ++name = "interpolate_name" ++version = "0.2.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", + ] + + [[package]] +@@ -379,12 +615,22 @@ dependencies = [ + ] + + [[package]] +-name = "jpeg-decoder" +-version = "0.3.1" ++name = "itertools" ++version = "0.14.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" ++checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" + dependencies = [ +- "rayon", ++ "either", ++] ++ ++[[package]] ++name = "jobserver" ++version = "0.1.34" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" ++dependencies = [ ++ "getrandom", ++ "libc", + ] + + [[package]] +@@ -405,24 +651,34 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" + + [[package]] + name = "lebe" +-version = "0.5.2" ++version = "0.5.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" ++checksum = "7a79a3332a6609480d7d0c9eab957bca6b455b91bb84e66d19f5ff66294b85b8" + + [[package]] + name = "libc" +-version = "0.2.172" ++version = "0.2.178" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" ++checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091" ++ ++[[package]] ++name = "libfuzzer-sys" ++version = "0.4.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5037190e1f70cbeef565bd267599242926f724d3b8a9f510fd7e0b540cfa4404" ++dependencies = [ ++ "arbitrary", ++ "cc", ++] + + [[package]] + name = "libloading" +-version = "0.8.7" ++version = "0.8.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6a793df0d7afeac54f95b471d3af7f0d4fb975699f972341a4b76988d49cdf0c" ++checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55" + dependencies = [ + "cfg-if", +- "windows-targets 0.53.0", ++ "windows-link", + ] + + [[package]] +@@ -433,11 +689,11 @@ dependencies = [ + "drm", + "gbm", + "gl", +- "image", ++ "image 0.24.9", + "khronos-egl", + "memmap2", +- "rustix", +- "thiserror", ++ "rustix 0.38.44", ++ "thiserror 1.0.69", + "tracing", + "wayland-backend", + "wayland-client", +@@ -458,22 +714,47 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "2a385b1be4e5c3e362ad2ffa73c392e53f031eaa5b7d648e64cd87f27f6063d7" + + [[package]] +-name = "log" +-version = "0.4.27" ++name = "linux-raw-sys" ++version = "0.11.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" ++checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" ++ ++[[package]] ++name = "log" ++version = "0.4.29" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" ++ ++[[package]] ++name = "loop9" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062" ++dependencies = [ ++ "imgref", ++] ++ ++[[package]] ++name = "maybe-rayon" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" ++dependencies = [ ++ "cfg-if", ++ "rayon", ++] + + [[package]] + name = "memchr" +-version = "2.7.4" ++version = "2.7.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" ++checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" + + [[package]] + name = "memmap2" +-version = "0.9.5" ++version = "0.9.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" ++checksum = "744133e4a0e0a658e1374cf3bf8e415c4052a15a111acd372764c55b4177d490" + dependencies = [ + "libc", + ] +@@ -495,14 +776,30 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + + [[package]] + name = "miniz_oxide" +-version = "0.8.8" ++version = "0.8.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a" ++checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" + dependencies = [ + "adler2", + "simd-adler32", + ] + ++[[package]] ++name = "moxcms" ++version = "0.7.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac9557c559cd6fc9867e122e20d2cbefc9ca29d80d027a8e39310920ed2f0a97" ++dependencies = [ ++ "num-traits", ++ "pxfm", ++] ++ ++[[package]] ++name = "new_debug_unreachable" ++version = "1.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" ++ + [[package]] + name = "nom" + version = "7.1.3" +@@ -513,6 +810,62 @@ dependencies = [ + "minimal-lexical", + ] + ++[[package]] ++name = "nom" ++version = "8.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "noop_proc_macro" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" ++ ++[[package]] ++name = "num-bigint" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" ++dependencies = [ ++ "num-integer", ++ "num-traits", ++] ++ ++[[package]] ++name = "num-derive" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "num-integer" ++version = "0.1.46" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" ++dependencies = [ ++ "num-traits", ++] ++ ++[[package]] ++name = "num-rational" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" ++dependencies = [ ++ "num-bigint", ++ "num-integer", ++ "num-traits", ++] ++ + [[package]] + name = "num-traits" + version = "0.2.19" +@@ -534,6 +887,12 @@ version = "1.0.15" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + ++[[package]] ++name = "pastey" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "35fb2e5f958ec131621fdd531e9fc186ed768cbe395337403ae56c17a74c68ec" ++ + [[package]] + name = "pin-project-lite" + version = "0.2.16" +@@ -548,11 +907,11 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" + + [[package]] + name = "png" +-version = "0.17.16" ++version = "0.18.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "82151a2fc869e011c153adc57cf2789ccb8d9906ce52c0b39a6b5697749d7526" ++checksum = "97baced388464909d42d89643fe4361939af9b7ce7a31ee32a168f832a70f2a0" + dependencies = [ +- "bitflags 1.3.2", ++ "bitflags", + "crc32fast", + "fdeflate", + "flate2", +@@ -560,10 +919,19 @@ dependencies = [ + ] + + [[package]] +-name = "prettyplease" +-version = "0.2.32" ++name = "ppv-lite86" ++version = "0.2.21" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "664ec5419c51e34154eec046ebcba56312d5a2fc3b09a06da188e1ad21afadf6" ++checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" ++dependencies = [ ++ "zerocopy", ++] ++ ++[[package]] ++name = "prettyplease" ++version = "0.2.37" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" + dependencies = [ + "proc-macro2", + "syn", +@@ -571,13 +939,41 @@ dependencies = [ + + [[package]] + name = "proc-macro2" +-version = "1.0.95" ++version = "1.0.104" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" ++checksum = "9695f8df41bb4f3d222c95a67532365f569318332d03d5f3f67f37b20e6ebdf0" + dependencies = [ + "unicode-ident", + ] + ++[[package]] ++name = "profiling" ++version = "1.0.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3eb8486b569e12e2c32ad3e204dbaba5e4b5b216e9367044f25f1dba42341773" ++dependencies = [ ++ "profiling-procmacros", ++] ++ ++[[package]] ++name = "profiling-procmacros" ++version = "1.0.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "52717f9a02b6965224f95ca2a81e2e0c5c43baacd28ca057577988930b6c3d5b" ++dependencies = [ ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "pxfm" ++version = "0.1.27" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7186d3822593aa4393561d186d1393b3923e9d6163d3fbfd6e825e3e6cf3e6a8" ++dependencies = [ ++ "num-traits", ++] ++ + [[package]] + name = "qoi" + version = "0.4.1" +@@ -588,23 +984,114 @@ dependencies = [ + ] + + [[package]] +-name = "quick-xml" +-version = "0.37.5" ++name = "quick-error" ++version = "2.0.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb" ++checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" ++ ++[[package]] ++name = "quick-xml" ++version = "0.38.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b66c2058c55a409d601666cffe35f04333cf1013010882cec174a7467cd4e21c" + dependencies = [ + "memchr", + ] + + [[package]] + name = "quote" +-version = "1.0.40" ++version = "1.0.42" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" ++checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" + dependencies = [ + "proc-macro2", + ] + ++[[package]] ++name = "r-efi" ++version = "5.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" ++ ++[[package]] ++name = "rand" ++version = "0.9.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" ++dependencies = [ ++ "rand_chacha", ++ "rand_core", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" ++dependencies = [ ++ "ppv-lite86", ++ "rand_core", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.9.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" ++dependencies = [ ++ "getrandom", ++] ++ ++[[package]] ++name = "rav1e" ++version = "0.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "43b6dd56e85d9483277cde964fd1bdb0428de4fec5ebba7540995639a21cb32b" ++dependencies = [ ++ "aligned-vec", ++ "arbitrary", ++ "arg_enum_proc_macro", ++ "arrayvec", ++ "av-scenechange", ++ "av1-grain", ++ "bitstream-io", ++ "built", ++ "cfg-if", ++ "interpolate_name", ++ "itertools 0.14.0", ++ "libc", ++ "libfuzzer-sys", ++ "log", ++ "maybe-rayon", ++ "new_debug_unreachable", ++ "noop_proc_macro", ++ "num-derive", ++ "num-traits", ++ "paste", ++ "profiling", ++ "rand", ++ "rand_chacha", ++ "simd_helpers", ++ "thiserror 2.0.17", ++ "v_frame", ++ "wasm-bindgen", ++] ++ ++[[package]] ++name = "ravif" ++version = "0.12.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ef69c1990ceef18a116855938e74793a5f7496ee907562bd0857b6ac734ab285" ++dependencies = [ ++ "avif-serialize", ++ "imgref", ++ "loop9", ++ "quick-error", ++ "rav1e", ++ "rayon", ++ "rgb", ++] ++ + [[package]] + name = "raylib" + version = "5.5.1" +@@ -615,7 +1102,7 @@ dependencies = [ + "paste", + "raylib-sys", + "seq-macro", +- "thiserror", ++ "thiserror 1.0.69", + ] + + [[package]] +@@ -631,9 +1118,9 @@ dependencies = [ + + [[package]] + name = "rayon" +-version = "1.10.0" ++version = "1.11.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" ++checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" + dependencies = [ + "either", + "rayon-core", +@@ -641,9 +1128,9 @@ dependencies = [ + + [[package]] + name = "rayon-core" +-version = "1.12.1" ++version = "1.13.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" ++checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91" + dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +@@ -651,9 +1138,9 @@ dependencies = [ + + [[package]] + name = "regex" +-version = "1.11.1" ++version = "1.12.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" ++checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" + dependencies = [ + "aho-corasick", + "memchr", +@@ -663,9 +1150,9 @@ dependencies = [ + + [[package]] + name = "regex-automata" +-version = "0.4.9" ++version = "0.4.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" ++checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" + dependencies = [ + "aho-corasick", + "memchr", +@@ -674,9 +1161,15 @@ dependencies = [ + + [[package]] + name = "regex-syntax" +-version = "0.8.5" ++version = "0.8.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" ++checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" ++ ++[[package]] ++name = "rgb" ++version = "0.8.52" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0c6a884d2998352bb4daf0183589aec883f16a6da1f4dde84d8e2e9a5409a1ce" + + [[package]] + name = "rustc-hash" +@@ -690,13 +1183,32 @@ version = "0.38.44" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" + dependencies = [ +- "bitflags 2.9.1", ++ "bitflags", + "errno", + "libc", + "linux-raw-sys 0.4.15", +- "windows-sys", ++ "windows-sys 0.59.0", + ] + ++[[package]] ++name = "rustix" ++version = "1.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34" ++dependencies = [ ++ "bitflags", ++ "errno", ++ "libc", ++ "linux-raw-sys 0.11.0", ++ "windows-sys 0.61.2", ++] ++ ++[[package]] ++name = "rustversion" ++version = "1.0.22" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" ++ + [[package]] + name = "scoped-tls" + version = "1.0.1" +@@ -717,21 +1229,36 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + + [[package]] + name = "simd-adler32" +-version = "0.3.7" ++version = "0.3.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" ++checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2" ++ ++[[package]] ++name = "simd_helpers" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6" ++dependencies = [ ++ "quote", ++] + + [[package]] + name = "smallvec" +-version = "1.15.0" ++version = "1.15.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9" ++checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" ++ ++[[package]] ++name = "stable_deref_trait" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" + + [[package]] + name = "syn" +-version = "2.0.101" ++version = "2.0.112" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" ++checksum = "21f182278bf2d2bcb3c88b1b08a37df029d71ce3d3ae26168e3c653b213b99d4" + dependencies = [ + "proc-macro2", + "quote", +@@ -744,7 +1271,16 @@ version = "1.0.69" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" + dependencies = [ +- "thiserror-impl", ++ "thiserror-impl 1.0.69", ++] ++ ++[[package]] ++name = "thiserror" ++version = "2.0.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" ++dependencies = [ ++ "thiserror-impl 2.0.17", + ] + + [[package]] +@@ -759,21 +1295,35 @@ dependencies = [ + ] + + [[package]] +-name = "tiff" +-version = "0.9.1" ++name = "thiserror-impl" ++version = "2.0.17" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" ++checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" + dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "tiff" ++version = "0.10.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "af9605de7fee8d9551863fd692cce7637f548dbd9db9180fcc07ccc6d26c336f" ++dependencies = [ ++ "fax", + "flate2", +- "jpeg-decoder", ++ "half", ++ "quick-error", + "weezl", ++ "zune-jpeg 0.4.21", + ] + + [[package]] + name = "tracing" +-version = "0.1.41" ++version = "0.1.44" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" ++checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" + dependencies = [ + "pin-project-lite", + "tracing-attributes", +@@ -782,9 +1332,9 @@ dependencies = [ + + [[package]] + name = "tracing-attributes" +-version = "0.1.28" ++version = "0.1.31" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" ++checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" + dependencies = [ + "proc-macro2", + "quote", +@@ -793,28 +1343,93 @@ dependencies = [ + + [[package]] + name = "tracing-core" +-version = "0.1.33" ++version = "0.1.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" ++checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" + dependencies = [ + "once_cell", + ] + + [[package]] + name = "unicode-ident" +-version = "1.0.18" ++version = "1.0.22" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" ++checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" ++ ++[[package]] ++name = "v_frame" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "666b7727c8875d6ab5db9533418d7c764233ac9c0cff1d469aec8fa127597be2" ++dependencies = [ ++ "aligned-vec", ++ "num-traits", ++ "wasm-bindgen", ++] ++ ++[[package]] ++name = "wasip2" ++version = "1.0.1+wasi-0.2.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" ++dependencies = [ ++ "wit-bindgen", ++] ++ ++[[package]] ++name = "wasm-bindgen" ++version = "0.2.106" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd" ++dependencies = [ ++ "cfg-if", ++ "once_cell", ++ "rustversion", ++ "wasm-bindgen-macro", ++ "wasm-bindgen-shared", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro" ++version = "0.2.106" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3" ++dependencies = [ ++ "quote", ++ "wasm-bindgen-macro-support", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro-support" ++version = "0.2.106" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40" ++dependencies = [ ++ "bumpalo", ++ "proc-macro2", ++ "quote", ++ "syn", ++ "wasm-bindgen-shared", ++] ++ ++[[package]] ++name = "wasm-bindgen-shared" ++version = "0.2.106" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4" ++dependencies = [ ++ "unicode-ident", ++] + + [[package]] + name = "wayland-backend" +-version = "0.3.10" ++version = "0.3.12" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fe770181423e5fc79d3e2a7f4410b7799d5aab1de4372853de3c6aa13ca24121" ++checksum = "fee64194ccd96bf648f42a65a7e589547096dfa702f7cadef84347b66ad164f9" + dependencies = [ + "cc", + "downcast-rs", +- "rustix", ++ "rustix 1.1.3", + "scoped-tls", + "smallvec", + "wayland-sys", +@@ -822,12 +1437,12 @@ dependencies = [ + + [[package]] + name = "wayland-client" +-version = "0.31.10" ++version = "0.31.12" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "978fa7c67b0847dbd6a9f350ca2569174974cd4082737054dbb7fbb79d7d9a61" ++checksum = "b8e6faa537fbb6c186cb9f1d41f2f811a4120d1b57ec61f50da451a0c5122bec" + dependencies = [ +- "bitflags 2.9.1", +- "rustix", ++ "bitflags", ++ "rustix 1.1.3", + "wayland-backend", + "wayland-scanner", + ] +@@ -838,7 +1453,7 @@ version = "0.31.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" + dependencies = [ +- "bitflags 2.9.1", ++ "bitflags", + "wayland-backend", + "wayland-client", + "wayland-scanner", +@@ -850,7 +1465,7 @@ version = "0.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" + dependencies = [ +- "bitflags 2.9.1", ++ "bitflags", + "wayland-backend", + "wayland-client", + "wayland-protocols", +@@ -859,9 +1474,9 @@ dependencies = [ + + [[package]] + name = "wayland-scanner" +-version = "0.31.6" ++version = "0.31.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "896fdafd5d28145fce7958917d69f2fd44469b1d4e861cb5961bcbeebc6d1484" ++checksum = "5423e94b6a63e68e439803a3e153a9252d5ead12fd853334e2ad33997e3889e3" + dependencies = [ + "proc-macro2", + "quick-xml", +@@ -870,22 +1485,22 @@ dependencies = [ + + [[package]] + name = "wayland-server" +-version = "0.31.9" ++version = "0.31.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "485dfb8ccf0daa0d34625d34e6ac15f99e550a7999b6fd88a0835ccd37655785" ++checksum = "9297ab90f8d1f597711d36455c5b1b2290eca59b8134485e377a296b80b118c9" + dependencies = [ +- "bitflags 2.9.1", ++ "bitflags", + "downcast-rs", +- "rustix", ++ "rustix 1.1.3", + "wayland-backend", + "wayland-scanner", + ] + + [[package]] + name = "wayland-sys" +-version = "0.31.6" ++version = "0.31.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dbcebb399c77d5aa9fa5db874806ee7b4eba4e73650948e8f93963f128896615" ++checksum = "1e6dbfc3ac5ef974c92a2235805cc0114033018ae1290a72e474aa8b28cbbdfd" + dependencies = [ + "dlib", + "libc", +@@ -896,9 +1511,15 @@ dependencies = [ + + [[package]] + name = "weezl" +-version = "0.1.8" ++version = "0.1.12" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" ++checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88" ++ ++[[package]] ++name = "windows-link" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" + + [[package]] + name = "windows-sys" +@@ -906,7 +1527,16 @@ version = "0.59.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" + dependencies = [ +- "windows-targets 0.52.6", ++ "windows-targets", ++] ++ ++[[package]] ++name = "windows-sys" ++version = "0.61.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" ++dependencies = [ ++ "windows-link", + ] + + [[package]] +@@ -915,30 +1545,14 @@ version = "0.52.6" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" + dependencies = [ +- "windows_aarch64_gnullvm 0.52.6", +- "windows_aarch64_msvc 0.52.6", +- "windows_i686_gnu 0.52.6", +- "windows_i686_gnullvm 0.52.6", +- "windows_i686_msvc 0.52.6", +- "windows_x86_64_gnu 0.52.6", +- "windows_x86_64_gnullvm 0.52.6", +- "windows_x86_64_msvc 0.52.6", +-] +- +-[[package]] +-name = "windows-targets" +-version = "0.53.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b" +-dependencies = [ +- "windows_aarch64_gnullvm 0.53.0", +- "windows_aarch64_msvc 0.53.0", +- "windows_i686_gnu 0.53.0", +- "windows_i686_gnullvm 0.53.0", +- "windows_i686_msvc 0.53.0", +- "windows_x86_64_gnu 0.53.0", +- "windows_x86_64_gnullvm 0.53.0", +- "windows_x86_64_msvc 0.53.0", ++ "windows_aarch64_gnullvm", ++ "windows_aarch64_msvc", ++ "windows_i686_gnu", ++ "windows_i686_gnullvm", ++ "windows_i686_msvc", ++ "windows_x86_64_gnu", ++ "windows_x86_64_gnullvm", ++ "windows_x86_64_msvc", + ] + + [[package]] +@@ -947,84 +1561,42 @@ version = "0.52.6" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +-[[package]] +-name = "windows_aarch64_gnullvm" +-version = "0.53.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" +- + [[package]] + name = "windows_aarch64_msvc" + version = "0.52.6" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +-[[package]] +-name = "windows_aarch64_msvc" +-version = "0.53.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" +- + [[package]] + name = "windows_i686_gnu" + version = "0.52.6" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +-[[package]] +-name = "windows_i686_gnu" +-version = "0.53.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" +- + [[package]] + name = "windows_i686_gnullvm" + version = "0.52.6" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +-[[package]] +-name = "windows_i686_gnullvm" +-version = "0.53.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" +- + [[package]] + name = "windows_i686_msvc" + version = "0.52.6" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +-[[package]] +-name = "windows_i686_msvc" +-version = "0.53.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" +- + [[package]] + name = "windows_x86_64_gnu" + version = "0.52.6" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +-[[package]] +-name = "windows_x86_64_gnu" +-version = "0.53.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" +- + [[package]] + name = "windows_x86_64_gnullvm" + version = "0.52.6" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +-[[package]] +-name = "windows_x86_64_gnullvm" +-version = "0.53.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" +- + [[package]] + name = "windows_x86_64_msvc" + version = "0.52.6" +@@ -1032,25 +1604,63 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + + [[package]] +-name = "windows_x86_64_msvc" +-version = "0.53.0" ++name = "wit-bindgen" ++version = "0.46.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" ++checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" + + [[package]] + name = "woomer" + version = "0.2.0" + dependencies = [ +- "image", ++ "image 0.25.9", + "libwayshot", + "raylib", + ] + + [[package]] + name = "xml-rs" +-version = "0.8.26" ++version = "0.8.28" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a62ce76d9b56901b19a74f19431b0d8b3bc7ca4ad685a746dfd78ca8f4fc6bda" ++checksum = "3ae8337f8a065cfc972643663ea4279e04e7256de865aa66fe25cec5fb912d3f" ++ ++[[package]] ++name = "y4m" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a5a4b21e1a62b67a2970e6831bc091d7b87e119e7f9791aef9702e3bef04448" ++ ++[[package]] ++name = "zerocopy" ++version = "0.8.31" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fd74ec98b9250adb3ca554bdde269adf631549f51d8a8f8f0a10b50f1cb298c3" ++dependencies = [ ++ "zerocopy-derive", ++] ++ ++[[package]] ++name = "zerocopy-derive" ++version = "0.8.31" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d8a8d209fdf45cf5138cbb5a506f6b52522a25afccc534d1475dad8e31105c6a" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "zune-core" ++version = "0.4.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" ++ ++[[package]] ++name = "zune-core" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "111f7d9820f05fd715df3144e254d6fc02ee4088b0644c0ffd0efc9e6d9d2773" + + [[package]] + name = "zune-inflate" +@@ -1060,3 +1670,21 @@ checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" + dependencies = [ + "simd-adler32", + ] ++ ++[[package]] ++name = "zune-jpeg" ++version = "0.4.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "29ce2c8a9384ad323cf564b67da86e21d3cfdff87908bc1223ed5c99bc792713" ++dependencies = [ ++ "zune-core 0.4.12", ++] ++ ++[[package]] ++name = "zune-jpeg" ++version = "0.5.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e35aee689668bf9bd6f6f3a6c60bb29ba1244b3b43adfd50edd554a371da37d5" ++dependencies = [ ++ "zune-core 0.5.0", ++] +diff --git a/Cargo.toml b/Cargo.toml +index f322255..de0b5d4 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -6,8 +6,8 @@ edition = "2021" + # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + [dependencies] +-image = "0.24.9" ++image = "0.25.9" + libwayshot = { git = "https://github.com/waycrate/wayshot", branch = "freeze-feat-andreas" } +-raylib = { version = "5.0.1", features = ["wayland", "opengl_33"] } ++raylib = { version = "5.5.1", features = ["wayland", "opengl_33"] } + [features] +-dev = [] +\ No newline at end of file ++dev = [] From 98a66be2da1fda383c3b9241133cbdd8ea3d4651 Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Sat, 29 Mar 2025 13:02:53 +0100 Subject: [PATCH 03/58] nixos/openrazer: allow to configure packages --- nixos/modules/hardware/openrazer.nix | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/nixos/modules/hardware/openrazer.nix b/nixos/modules/hardware/openrazer.nix index 470d451439d4..6eb174db93f3 100644 --- a/nixos/modules/hardware/openrazer.nix +++ b/nixos/modules/hardware/openrazer.nix @@ -6,11 +6,10 @@ }: let cfg = config.hardware.openrazer; - kernelPackages = config.boot.kernelPackages; toPyBoolStr = b: if b then "True" else "False"; - daemonExe = "${pkgs.openrazer-daemon}/bin/openrazer-daemon --config ${daemonConfFile}"; + daemonExe = "${cfg.packages.daemon}/bin/openrazer-daemon --config ${daemonConfFile}"; daemonConfFile = pkgs.writeTextFile { name = "razer.conf"; @@ -134,6 +133,16 @@ in can start and interact with the OpenRazer userspace daemon. ''; }; + + packages = { + kernel = lib.mkPackageOption pkgs "openrazer kernel" { } // { + default = config.boot.kernelPackages.openrazer; + defaultText = lib.literalExpression '' + config.boot.kernelPackages.openrazer + ''; + }; + daemon = lib.mkPackageOption pkgs [ "python3Packages" "openrazer-daemon" ] { }; + }; }; }; @@ -145,14 +154,16 @@ in ]; config = lib.mkIf cfg.enable { - boot.extraModulePackages = [ kernelPackages.openrazer ]; + boot.extraModulePackages = [ cfg.packages.kernel ]; boot.kernelModules = drivers; # Makes the man pages available so you can successfully run # > systemctl --user help openrazer-daemon - environment.systemPackages = [ pkgs.python3Packages.openrazer-daemon.man ]; + environment.systemPackages = lib.mkIf (cfg.packages.daemon ? man) [ + cfg.packages.daemon.man + ]; - services.udev.packages = [ kernelPackages.openrazer ]; + services.udev.packages = [ cfg.packages.kernel ]; services.dbus.packages = [ dbusServiceFile ]; # A user must be a member of the openrazer group in order to start From 72f9688c53c1e12a390b47a1a552ada8d872bae9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Apr 2026 20:21:01 +0000 Subject: [PATCH 04/58] gh-gei: 1.27.0 -> 1.28.0 --- pkgs/by-name/gh/gh-gei/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gh/gh-gei/package.nix b/pkgs/by-name/gh/gh-gei/package.nix index 57c700cd4961..d54cb774a8b4 100644 --- a/pkgs/by-name/gh/gh-gei/package.nix +++ b/pkgs/by-name/gh/gh-gei/package.nix @@ -7,13 +7,13 @@ buildDotnetModule rec { pname = "gh-gei"; - version = "1.27.0"; + version = "1.28.0"; src = fetchFromGitHub { owner = "github"; repo = "gh-gei"; rev = "v${version}"; - hash = "sha256-28baWL19mF7QWMZ2UHad9PeA6in+V3FVJXdl3hzCecI="; + hash = "sha256-8KVEI6k3MWYYEJVi/fyXCDS6DpNwtEr1uz4JEz2R+WY="; }; dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx; From 976f5e2dd39c7b871e10b3b710c2e45be6d3735e Mon Sep 17 00:00:00 2001 From: Xiangyan Sun Date: Thu, 9 Apr 2026 14:16:02 -0700 Subject: [PATCH 05/58] gcal: 4.1 -> 4.2.0 --- .../by-name/gc/gcal/add-missing-include.patch | 9 ++++++ pkgs/by-name/gc/gcal/fix-gnulib-link.patch | 17 ++++++++++ pkgs/by-name/gc/gcal/package.nix | 32 +++++++++++++------ 3 files changed, 49 insertions(+), 9 deletions(-) create mode 100644 pkgs/by-name/gc/gcal/add-missing-include.patch create mode 100644 pkgs/by-name/gc/gcal/fix-gnulib-link.patch diff --git a/pkgs/by-name/gc/gcal/add-missing-include.patch b/pkgs/by-name/gc/gcal/add-missing-include.patch new file mode 100644 index 000000000000..fb9fb6d4a93e --- /dev/null +++ b/pkgs/by-name/gc/gcal/add-missing-include.patch @@ -0,0 +1,9 @@ +diff --git a/tests/check_utils.c b/tests/check_utils.c +index 7229e4b..a422af4 100644 +--- a/tests/check_utils.c ++++ b/tests/check_utils.c +@@ -1,3 +1,4 @@ ++#include "../config.h" + #include + + #include "../src/tailor.h" diff --git a/pkgs/by-name/gc/gcal/fix-gnulib-link.patch b/pkgs/by-name/gc/gcal/fix-gnulib-link.patch new file mode 100644 index 000000000000..aa1c379ca462 --- /dev/null +++ b/pkgs/by-name/gc/gcal/fix-gnulib-link.patch @@ -0,0 +1,17 @@ +diff --git a/tests/Makefile.in b/tests/Makefile.in +index c45abcc..01727ef 100644 +--- a/tests/Makefile.in ++++ b/tests/Makefile.in +@@ -2003,11 +2003,7 @@ GCAL_OBJS = \ + ../src/utils.o + + GCAL_GNULIB_OBJS = \ +- ../lib/fclose.o \ +- ../lib/fflush.o \ +- ../lib/fseeko.o \ +- ../lib/ioctl.o \ +- ../lib/tmpdir.o ++ ../lib/libgnu.a + + check_gcal_SOURCES = check_gcal.c \ + check_file-io.c \ diff --git a/pkgs/by-name/gc/gcal/package.nix b/pkgs/by-name/gc/gcal/package.nix index c00dc6778a0d..948806db441e 100644 --- a/pkgs/by-name/gc/gcal/package.nix +++ b/pkgs/by-name/gc/gcal/package.nix @@ -4,31 +4,45 @@ fetchurl, ncurses, gettext, - fetchpatch, + pkg-config, + check, + versionCheckHook, }: stdenv.mkDerivation (finalAttrs: { pname = "gcal"; - version = "4.1"; + version = "4.2.0"; src = fetchurl { - url = "mirror://gnu/gcal/gcal-${finalAttrs.version}.tar.xz"; - sha256 = "1av11zkfirbixn05hyq4xvilin0ncddfjqzc4zd9pviyp506rdci"; + url = "https://www.alteholz.dev/gnu/gcal-${finalAttrs.version}.tar.xz"; + hash = "sha256-2L0tdBHnglHWcGSqDxymClI7+FbuPm2J0H2FoSM0eNw="; }; patches = [ - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/gcal/raw/master/f/gcal-glibc-no-libio.patch"; - sha256 = "0l4nw9kgzsay32rsdwvs75pbp4fhx6pfm85paynfbd20cdm2n2kv"; - }) + ./add-missing-include.patch + ./fix-gnulib-link.patch ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-implicit-function-declaration"; + env = { + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-implicit-function-declaration"; + # For check_gcal + NIX_LDFLAGS = "-lm"; + }; enableParallelBuilding = true; buildInputs = [ ncurses ] ++ lib.optional stdenv.hostPlatform.isDarwin gettext; + nativeBuildInputs = [ + pkg-config + check + ]; + + doCheck = true; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + meta = { description = "Program for calculating and printing calendars"; longDescription = '' From 652cde4f8a8e02cdc57787d97ac506261fb0867d Mon Sep 17 00:00:00 2001 From: Perchun Pak Date: Fri, 10 Apr 2026 17:05:40 +0200 Subject: [PATCH 06/58] gh-cherry-pick: 1.2.0 -> 1.3.1 --- pkgs/by-name/gh/gh-cherry-pick/package.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/gh/gh-cherry-pick/package.nix b/pkgs/by-name/gh/gh-cherry-pick/package.nix index a85b93ce8d4e..3067b42553fa 100644 --- a/pkgs/by-name/gh/gh-cherry-pick/package.nix +++ b/pkgs/by-name/gh/gh-cherry-pick/package.nix @@ -5,14 +5,14 @@ }: python3Packages.buildPythonApplication (finalAttrs: { pname = "gh-cherry-pick"; - version = "1.2.0"; + version = "1.3.1"; pyproject = true; src = fetchFromGitHub { owner = "PerchunPak"; repo = "gh-cherry-pick"; tag = "v${finalAttrs.version}"; - hash = "sha256-EiXWgiCV99k3810nCWA+AnlLjG8VKRCPnns9KtfGxqY="; + hash = "sha256-plNxOYLfKWLjN5RR1g2VOJWgyrzXdgI0MDJYe05XcCk="; }; build-system = with python3Packages; [ @@ -20,18 +20,9 @@ python3Packages.buildPythonApplication (finalAttrs: { uv-dynamic-versioning ]; - pythonRelaxDeps = [ - "attrs" - "trio" - ]; - dependencies = with python3Packages; [ - attrs cyclopts httpx - loguru - trio - typing-extensions ]; nativeCheckInputs = with python3Packages; [ @@ -39,7 +30,6 @@ python3Packages.buildPythonApplication (finalAttrs: { pytest pytest-cov-stub pytest-mock - pytest-trio ]; pythonImportsCheck = [ "gh_cherry_pick" ]; From d6704e85c2c6d8954b4bc8a898d3305d1d8257f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Apr 2026 17:58:45 +0000 Subject: [PATCH 07/58] python3Packages.tftpy: 0.8.6 -> 0.8.7 --- pkgs/development/python-modules/tftpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tftpy/default.nix b/pkgs/development/python-modules/tftpy/default.nix index 9f7b7321d59e..ad4165d7f7ea 100644 --- a/pkgs/development/python-modules/tftpy/default.nix +++ b/pkgs/development/python-modules/tftpy/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "tftpy"; - version = "0.8.6"; + version = "0.8.7"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-9hb2pDo21IHCZlc2CFl7ndPHxjgYQV1yqgTx0XlUgOo="; + hash = "sha256-6KWqCS2rLhy7m5Q5IDaCe4CNw362zxsaszyBlXs/X+I="; }; nativeBuildInputs = [ setuptools ]; From 649701afc2cc5c34b88429fe15accec7780b09a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Apr 2026 00:34:53 +0000 Subject: [PATCH 08/58] caligula: 0.4.10 -> 0.4.11 --- pkgs/by-name/ca/caligula/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/caligula/package.nix b/pkgs/by-name/ca/caligula/package.nix index ef2dc653cf7d..556d5060d481 100644 --- a/pkgs/by-name/ca/caligula/package.nix +++ b/pkgs/by-name/ca/caligula/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "caligula"; - version = "0.4.10"; + version = "0.4.11"; src = fetchFromGitHub { owner = "ifd3f"; repo = "caligula"; rev = "v${finalAttrs.version}"; - hash = "sha256-oaSt6wzMzaGHPyuJ5NVcAJLblHQcHJA5a7o2wkJgZkU="; + hash = "sha256-2KCP7Utb785yIn8w/Ls19UPS9ylg1PtLRki87+BD+xw="; }; - cargoHash = "sha256-B09aKzNNhgXKg3PCYmlMz3/oOeeh1FQAL7+tywg/81Q="; + cargoHash = "sha256-C86wu2Pc9O7YM1TnnfotzzOQlnJXJe2zmsX04JyJsjA="; nativeBuildInputs = [ rustPlatform.bindgenHook From f0ec0e2c1b9af1be083e26753e989045763f7754 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Wed, 15 Apr 2026 16:29:04 +1000 Subject: [PATCH 09/58] ssimulacra2: fix build Pin older libhwy, because the app has strict requirements. --- pkgs/by-name/ss/ssimulacra2/package.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ss/ssimulacra2/package.nix b/pkgs/by-name/ss/ssimulacra2/package.nix index 7c40ee7d485e..9c7fb5839bdb 100644 --- a/pkgs/by-name/ss/ssimulacra2/package.nix +++ b/pkgs/by-name/ss/ssimulacra2/package.nix @@ -28,7 +28,16 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libpng - libhwy + (libhwy.overrideAttrs rec { + version = "0.15.0"; + src = fetchFromGitHub { + owner = "google"; + repo = "highway"; + rev = version; + hash = "sha256-v2HyyHtBydr7QiI83DW1yRv2kWjUOGxFT6mmdrN9XPo="; + }; + patches = [ ]; + }) lcms2 giflib ]; From 914212f8ebe5a888eafb7f1deceee404f0a98d32 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 15 Apr 2026 18:37:07 +0200 Subject: [PATCH 10/58] gimp: Mark broken on big-endian Has been reported upstream since 3.0 RC1, 2024-12-06. --- pkgs/applications/graphics/gimp/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 46bc75557ef2..26ab57b51e9e 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -370,6 +370,9 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ jtojnar ]; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; + # Build invokes built binary to convert assets, binary hangs during plugin loading on big-endian platforms (s390x, ppc64) + # https://gitlab.gnome.org/GNOME/gimp/-/issues/12522 + broken = stdenv.hostPlatform.isBigEndian; mainProgram = "gimp"; }; }) From 7063cb6a0405c601d0435815ed7826fa87a8a151 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 18 Apr 2026 15:14:17 +0200 Subject: [PATCH 11/58] lomiri.teleports: 1.21 -> 1.22 --- ...xt-Drop-explicit-dependency-on-rlottie.patch | 6 +++--- .../lomiri/applications/teleports/default.nix | 17 ++--------------- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/pkgs/desktops/lomiri/applications/teleports/1001-app-CMakeLists.txt-Drop-explicit-dependency-on-rlottie.patch b/pkgs/desktops/lomiri/applications/teleports/1001-app-CMakeLists.txt-Drop-explicit-dependency-on-rlottie.patch index 468612cb5c3a..f9ad57184238 100644 --- a/pkgs/desktops/lomiri/applications/teleports/1001-app-CMakeLists.txt-Drop-explicit-dependency-on-rlottie.patch +++ b/pkgs/desktops/lomiri/applications/teleports/1001-app-CMakeLists.txt-Drop-explicit-dependency-on-rlottie.patch @@ -1,4 +1,4 @@ -From f9dfacc4b92faa7b60ae37489aa58520b4da95d7 Mon Sep 17 00:00:00 2001 +From cb4a928db740de48d84d47c21705786bb141af02 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 5 Oct 2025 14:34:43 +0200 Subject: [PATCH] app/CMakeLists.txt: Drop explicit dependency on rlottie @@ -11,7 +11,7 @@ Subject: [PATCH] app/CMakeLists.txt: Drop explicit dependency on rlottie 1 file changed, 1 deletion(-) diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt -index c1f0b85..7a59db5 100644 +index c1f0b852..7a59db59 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -1,7 +1,6 @@ @@ -23,5 +23,5 @@ index c1f0b85..7a59db5 100644 #"qtdclient.cpp" "qtdthread.cpp" "qml.qrc" -- -2.51.0 +2.51.2 diff --git a/pkgs/desktops/lomiri/applications/teleports/default.nix b/pkgs/desktops/lomiri/applications/teleports/default.nix index 320f24c2e921..84effc86b26b 100644 --- a/pkgs/desktops/lomiri/applications/teleports/default.nix +++ b/pkgs/desktops/lomiri/applications/teleports/default.nix @@ -49,13 +49,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "teleports"; - version = "1.21"; + version = "1.22"; src = fetchFromGitLab { owner = "ubports"; repo = "development/apps/teleports"; rev = "v${finalAttrs.version}"; - hash = "sha256-V9yOQbVXtZGxdiieggPwHd17ilRZ0xMEI2yphgjx188="; + hash = "sha256-y0oXlhu2cvOGYZCEHfL6DcyStCQcIz7JtIpR4Tygm/4="; }; patches = [ @@ -66,19 +66,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-zxxFvoj6jluGPCA9GQsxuYYweaSOVrkD01hZwCtq52U="; }) - # Fix CMake 4 compatibility - # Remove when version > 1.21 - (fetchpatch { - name = "0002-teleports-CMakeLists.txt-Support-building-with-CMake-4.patch"; - url = "https://gitlab.com/ubports/development/apps/teleports/-/commit/ffb4e745889a473a208a86a29b7e439129930b01.patch"; - hash = "sha256-EdcCHH/0Zq8wcF6UPyvy16wntDeSqTV9LWQat91LNRo="; - }) - (fetchpatch { - name = "0003-teleports-libs-qtdlib-CMakeLists.txt-Support-building-with-CMake-4.patch"; - url = "https://gitlab.com/ubports/development/apps/teleports/-/commit/fe7f0cb304ddaefae9f97917d3edc89de5f21b1f.patch"; - hash = "sha256-yIc/l6iHb5qWI0QZOx8Hhd0lgEYyPozL+AjrmF2L89k="; - }) - # Remove when https://gitlab.com/ubports/development/apps/teleports/-/merge_requests/586 merged & in release ./1001-app-CMakeLists.txt-Drop-explicit-dependency-on-rlottie.patch ]; From ab7936238b252f30879be36d6fd6685124ea8308 Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Fri, 13 Mar 2026 17:33:48 +0100 Subject: [PATCH 12/58] boringssl: build shared library on non-static stdenv --- pkgs/by-name/bo/boringssl/package.nix | 11 ++++++++++- pkgs/by-name/li/libsignal-ffi/package.nix | 6 ++++++ pkgs/by-name/si/signal-desktop/libsignal-node.nix | 6 ++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/bo/boringssl/package.nix b/pkgs/by-name/bo/boringssl/package.nix index 032d11dca1e2..8c6504e6ab07 100644 --- a/pkgs/by-name/bo/boringssl/package.nix +++ b/pkgs/by-name/bo/boringssl/package.nix @@ -6,6 +6,8 @@ ninja, perl, gitUpdater, + + withShared ? !stdenv.hostPlatform.isStatic, }: # reference: https://boringssl.googlesource.com/boringssl/+/refs/tags/0.20250818.0/BUILDING.md @@ -30,6 +32,10 @@ stdenv.mkDerivation (finalAttrs: { perl ]; + cmakeFlags = [ + (lib.cmakeBool "BUILD_SHARED_LIBS" withShared) + ]; + env.NIX_CFLAGS_COMPILE = toString ( lib.optionals stdenv.cc.isGNU [ # Needed with GCC 12 but breaks on darwin (with clang) @@ -47,7 +53,10 @@ stdenv.mkDerivation (finalAttrs: { "dev" ]; - passthru.updateScript = gitUpdater { }; + passthru = { + updateScript = gitUpdater { }; + isShared = withShared; + }; meta = { description = "Free TLS/SSL implementation"; diff --git a/pkgs/by-name/li/libsignal-ffi/package.nix b/pkgs/by-name/li/libsignal-ffi/package.nix index f21357f2091e..39de36a8fb32 100644 --- a/pkgs/by-name/li/libsignal-ffi/package.nix +++ b/pkgs/by-name/li/libsignal-ffi/package.nix @@ -21,6 +21,12 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-xffBXvq1ikesIjw6cXfphnTIiyuMiUcY8h0pzSgfD8U="; }; + postPatch = lib.optionalString boringssl.passthru.isShared '' + substituteInPlace $cargoDepsCopy/boring-sys-*/build/main.rs \ + --replace-fail "cargo:rustc-link-lib=static=crypto" "cargo:rustc-link-lib=dylib=crypto" \ + --replace-fail "cargo:rustc-link-lib=static=ssl" "cargo:rustc-link-lib=dylib=ssl" + ''; + nativeBuildInputs = [ protobuf rustPlatform.bindgenHook diff --git a/pkgs/by-name/si/signal-desktop/libsignal-node.nix b/pkgs/by-name/si/signal-desktop/libsignal-node.nix index 1009f28ac4b3..95ef425ac970 100644 --- a/pkgs/by-name/si/signal-desktop/libsignal-node.nix +++ b/pkgs/by-name/si/signal-desktop/libsignal-node.nix @@ -1,4 +1,5 @@ { + lib, stdenv, rustPlatform, fetchNpmDeps, @@ -60,6 +61,11 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail "'prebuilds'" "'$out/lib'" \ --replace-fail "objcopy = shutil.which('%s-linux-gnu-objcopy' % cargo_target.split('-')[0]) or 'objcopy'" \ "objcopy = os.getenv('OBJCOPY', 'objcopy')" + '' + + lib.optionalString boringssl.passthru.isShared '' + substituteInPlace $cargoDepsCopy/*/boring-sys-*/build/main.rs \ + --replace-fail "cargo:rustc-link-lib=static=crypto" "cargo:rustc-link-lib=dylib=crypto" \ + --replace-fail "cargo:rustc-link-lib=static=ssl" "cargo:rustc-link-lib=dylib=ssl" ''; buildPhase = '' From 00ddb07a9d0a9376d92069a2f9f5b48801330a5c Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Fri, 17 Apr 2026 10:08:30 +0200 Subject: [PATCH 13/58] libsignal-ffi: build shared library on non-static stdenv --- pkgs/by-name/li/libsignal-ffi/package.nix | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/li/libsignal-ffi/package.nix b/pkgs/by-name/li/libsignal-ffi/package.nix index 39de36a8fb32..c3c1bf4dbf5e 100644 --- a/pkgs/by-name/li/libsignal-ffi/package.nix +++ b/pkgs/by-name/li/libsignal-ffi/package.nix @@ -6,6 +6,8 @@ xcodebuild, protobuf, boringssl, + + withShared ? !stdenv.hostPlatform.isStatic, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "libsignal-ffi"; @@ -21,11 +23,16 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-xffBXvq1ikesIjw6cXfphnTIiyuMiUcY8h0pzSgfD8U="; }; - postPatch = lib.optionalString boringssl.passthru.isShared '' - substituteInPlace $cargoDepsCopy/boring-sys-*/build/main.rs \ - --replace-fail "cargo:rustc-link-lib=static=crypto" "cargo:rustc-link-lib=dylib=crypto" \ - --replace-fail "cargo:rustc-link-lib=static=ssl" "cargo:rustc-link-lib=dylib=ssl" - ''; + postPatch = + lib.optionalString withShared '' + substituteInPlace rust/bridge/ffi/Cargo.toml \ + --replace-fail 'crate-type = ["staticlib"]' 'crate-type = ["cdylib"]' + '' + + lib.optionalString boringssl.passthru.isShared '' + substituteInPlace $cargoDepsCopy/*/boring-sys-*/build/main.rs \ + --replace-fail "cargo:rustc-link-lib=static=crypto" "cargo:rustc-link-lib=dylib=crypto" \ + --replace-fail "cargo:rustc-link-lib=static=ssl" "cargo:rustc-link-lib=dylib=ssl" + ''; nativeBuildInputs = [ protobuf @@ -46,6 +53,11 @@ rustPlatform.buildRustPackage (finalAttrs: { "libsignal-ffi" ]; + postFixup = lib.optionalString (withShared && stdenv.hostPlatform.isDarwin) '' + dylib="$out/lib/libsignal_ffi.dylib" + install_name_tool -id "$dylib" "$dylib" + ''; + meta = { description = "C ABI library which exposes Signal protocol logic"; homepage = "https://github.com/signalapp/libsignal"; From c946c99190d45787af51288de5e4d0213dfe60c9 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 19 Apr 2026 22:09:17 +0200 Subject: [PATCH 14/58] dnsmasq: apply patch for CVE-2026-6507 Fixes #511439 Vendored the patch, access to the upstream cgit is filtered. --- pkgs/by-name/dn/dnsmasq/CVE-2026-6507.patch | 28 +++++++++++++++++++++ pkgs/by-name/dn/dnsmasq/package.nix | 5 ++++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/by-name/dn/dnsmasq/CVE-2026-6507.patch diff --git a/pkgs/by-name/dn/dnsmasq/CVE-2026-6507.patch b/pkgs/by-name/dn/dnsmasq/CVE-2026-6507.patch new file mode 100644 index 000000000000..62249150aa3b --- /dev/null +++ b/pkgs/by-name/dn/dnsmasq/CVE-2026-6507.patch @@ -0,0 +1,28 @@ +From 9ad74926d4f7f34ff902e1db5235535aa813c33f Mon Sep 17 00:00:00 2001 +From: Simon Kelley +Date: Mon, 6 Apr 2026 22:22:43 +0100 +Subject: [PATCH] Fix 1-byte buffer overflow in relay_reply4() + +Potential SIGSEGV when using DHCPv4-relay. + +Thanks to Asim Viladi Oglu Manizada for finding this. +--- + src/rfc2131.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/rfc2131.c b/src/rfc2131.c +index 7bdfefd..55aad03 100644 +--- a/src/rfc2131.c ++++ b/src/rfc2131.c +@@ -3248,7 +3248,7 @@ unsigned int relay_reply4(struct dhcp_packet *mess, size_t sz, char *arrival_int + + /* delete agent info before return RFC 3046 para 2.1 */ + *opt = OPTION_END; +- memset(opt + 1, 0, option_len(opt) + 2); ++ memset(opt + 1, 0, option_len(opt) + 1); + } + } + else if (mess->giaddr.s_addr == relay->local.addr4.s_addr) +-- +2.20.1 + diff --git a/pkgs/by-name/dn/dnsmasq/package.nix b/pkgs/by-name/dn/dnsmasq/package.nix index e1f0c831c949..72f27c99a05f 100644 --- a/pkgs/by-name/dn/dnsmasq/package.nix +++ b/pkgs/by-name/dn/dnsmasq/package.nix @@ -37,6 +37,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-S/UMLBAY+fvCYDffUbkOzqDLc9RhYoRnY7kt8NbDpFg="; }; + patches = [ + # https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=patch;h=9ad74926d4f7f34ff902e1db5235535aa813c33f + ./CVE-2026-6507.patch + ]; + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' sed '1i#include ' -i src/dhcp.c ''; From 6f669c88073229194a1484a80b731134cea12003 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 20 Apr 2026 13:32:39 +0000 Subject: [PATCH 15/58] janus-gateway: 1.4.0 -> 1.4.1 --- pkgs/by-name/ja/janus-gateway/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ja/janus-gateway/package.nix b/pkgs/by-name/ja/janus-gateway/package.nix index d1233d98f734..66618388dbee 100644 --- a/pkgs/by-name/ja/janus-gateway/package.nix +++ b/pkgs/by-name/ja/janus-gateway/package.nix @@ -34,13 +34,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "janus-gateway"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "meetecho"; repo = "janus-gateway"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-Kt36rnBwmrf2/xDD4FR/T4Qlq4wx/Lq8fId6EgjBxkA="; + sha256 = "sha256-/201zFwahtN9cH+iHqeAi5FCTXUE3Z6J1G5Xh0xzc3Q="; }; nativeBuildInputs = [ From e6aab575a608d139087b3971be1f6c4bc12c038a Mon Sep 17 00:00:00 2001 From: "Burfeind, Jan-Niklas" Date: Thu, 12 Mar 2026 12:00:35 +0100 Subject: [PATCH 16/58] pdudaemon: init at 1.1.1 --- pkgs/by-name/pd/pdudaemon/package.nix | 62 +++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 pkgs/by-name/pd/pdudaemon/package.nix diff --git a/pkgs/by-name/pd/pdudaemon/package.nix b/pkgs/by-name/pd/pdudaemon/package.nix new file mode 100644 index 000000000000..b39539ab89a9 --- /dev/null +++ b/pkgs/by-name/pd/pdudaemon/package.nix @@ -0,0 +1,62 @@ +{ + lib, + fetchFromGitHub, + python3Packages, + nixosTests, +}: + +python3Packages.buildPythonApplication (finalAttrs: { + pname = "pdudaemon"; + version = "1.1.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pdudaemon"; + repo = "pdudaemon"; + tag = finalAttrs.version; + hash = "sha256-YjM1RmsdRfNyxCzK+PmSH8n7ZJ3qeIskTPxu2+EaupQ="; + }; + + build-system = with python3Packages; [ + setuptools + setuptools-scm + ]; + + dependencies = with python3Packages; [ + aiohttp + requests + pexpect + systemd-python + paramiko + pyserial + hidapi + pysnmp + pyasn1 + pyusb + pymodbus + ]; + + nativeCheckInputs = with python3Packages; [ + pytest-asyncio + pytest-mock + pytestCheckHook + ]; + + __structuredAttrs = true; + + passthru.tests = { + inherit (nixosTests) pdudaemon; + }; + + meta = { + changelog = "https://github.com/pdudaemon/pdudaemon/releases/tag/${finalAttrs.src.tag}"; + description = "Python Daemon for controlling/sequentially executing commands to PDUs (Power Distribution Units)"; + homepage = "https://github.com/pdudaemon/pdudaemon"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ + aiyion + emantor + ]; + mainProgram = "pdudaemon"; + }; +}) From c58471603897254dc470e67f7cc72f66a2ae583d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?= =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= Date: Sat, 28 Mar 2026 12:52:15 +0700 Subject: [PATCH 17/58] =?UTF-8?q?ejabberd:=2026.02=20=E2=86=92=2026.03?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/ej/ejabberd/package.nix | 5 +- pkgs/by-name/ej/ejabberd/rebar-deps.nix | 138 +++++++++--------------- 2 files changed, 55 insertions(+), 88 deletions(-) diff --git a/pkgs/by-name/ej/ejabberd/package.nix b/pkgs/by-name/ej/ejabberd/package.nix index 383bdcf4417d..bdec28abbf8a 100644 --- a/pkgs/by-name/ej/ejabberd/package.nix +++ b/pkgs/by-name/ej/ejabberd/package.nix @@ -76,7 +76,6 @@ let builder = lib.makeOverridable buildRebar3; overrides = final: prev: { - jiffy = prev.jiffy.override { buildPlugins = [ beamPackages.pc ]; }; cache_tab = prev.cache_tab.override { buildPlugins = [ beamPackages.pc ]; }; mqtree = prev.mqtree.override { buildPlugins = [ beamPackages.pc ]; }; stringprep = prev.stringprep.override { buildPlugins = [ beamPackages.pc ]; }; @@ -140,7 +139,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ejabberd"; - version = "26.02"; + version = "26.03"; nativeBuildInputs = [ makeWrapper @@ -170,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "processone"; repo = "ejabberd"; tag = finalAttrs.version; - hash = "sha256-izP7Rz65Lr4LDOCzZPdDWb3TyXDSTd/8gOPSfovVGM8="; + hash = "sha256-M38niXEW++SPAvqQ2cqEd23+w7lBDO5EPgu/QRdYbXo="; }; passthru.tests = { diff --git a/pkgs/by-name/ej/ejabberd/rebar-deps.nix b/pkgs/by-name/ej/ejabberd/rebar-deps.nix index f8cb854d44d6..8c09cf4bd54e 100644 --- a/pkgs/by-name/ej/ejabberd/rebar-deps.nix +++ b/pkgs/by-name/ej/ejabberd/rebar-deps.nix @@ -12,53 +12,23 @@ in let self = packages // (overrides self packages); packages = with self; { - unicode_util_compat = builder { - name = "unicode_util_compat"; - version = "0.7.1"; - src = fetchHex { - pkg = "unicode_util_compat"; - version = "0.7.1"; - sha256 = "sha256-s6kXhUzjriM2GXRK0eAQLgVnMTZ3b7L6diNPPgOyNkI="; - }; - beamDeps = [ ]; - }; - jiffy = builder { - name = "jiffy"; - version = "1.1.2"; - src = fetchHex { - pkg = "jiffy"; - version = "1.1.2"; - sha256 = "sha256-u2G8Qqcgu9M8sJpBDki7eaYQEsdMuLPnXybZiEhc84E="; - }; - beamDeps = [ ]; - }; - base64url = builder { - name = "base64url"; - version = "1.0.1"; - src = fetchHex { - pkg = "base64url"; - version = "1.0.1"; - sha256 = "sha256-+bOt1HMaAqmwQQOYtHWzPnVmppU2Ujemve4btEdxn1w="; - }; - beamDeps = [ ]; - }; yconf = builder { name = "yconf"; - version = "1.0.22"; + version = "1.0.23"; src = fetchHex { pkg = "yconf"; - version = "1.0.22"; - sha256 = "sha256-rKg0V86r5wdWSEtch7p7GVX1EdSZFoaH6uqnwwDoV/E="; + version = "1.0.23"; + sha256 = "sha256-JbTft1MoAmrKp3TPXG+4fUi1XuvOYw3aozYkQdrDFDc="; }; beamDeps = [ fast_yaml ]; }; xmpp = builder { name = "xmpp"; - version = "1.12.0"; + version = "1.13.1"; src = fetchHex { pkg = "xmpp"; - version = "1.12.0"; - sha256 = "sha256-AUuuc2WfuiVncesAe8U0hhiscn3R0QuasVqf74cWIsg="; + version = "1.13.1"; + sha256 = "sha256-oCTu98y094uftS431jhaV73RUL515Q1Ru8uvOamriD0="; }; beamDeps = [ ezlib @@ -71,11 +41,11 @@ let }; stun = builder { name = "stun"; - version = "1.2.21"; + version = "1.2.22"; src = fetchHex { pkg = "stun"; - version = "1.2.21"; - sha256 = "sha256-PX/o77nQWyQKaqmmv4uLe/8tgCiV0XBEPFiJh9weEtk="; + version = "1.2.22"; + sha256 = "sha256-NAi0sR1SN6CI9TsmCgaUDDCxb0pICUiS1qkgThZDGIo="; }; beamDeps = [ fast_tls @@ -84,11 +54,11 @@ let }; stringprep = builder { name = "stringprep"; - version = "1.0.33"; + version = "1.0.34"; src = fetchHex { pkg = "stringprep"; - version = "1.0.33"; - sha256 = "sha256-lvizC8UIh/YFsztGvKHSSMGah5MZuMSCeQ47TaXamMA="; + version = "1.0.34"; + sha256 = "sha256-J+eOo3GIF2TgVvvoRdOtMEdA/14xMbwfOKZvC6qMm0c="; }; beamDeps = [ p1_utils ]; }; @@ -114,23 +84,23 @@ let }; p1_utils = builder { name = "p1_utils"; - version = "1.0.28"; + version = "1.0.29"; src = fetchHex { pkg = "p1_utils"; - version = "1.0.28"; - sha256 = "sha256-xJvUS8SkCtmWaRr4Jt1+CqVtTQzXMIFxkKH4TRp/ADM="; + version = "1.0.29"; + sha256 = "sha256-IHFCHK21uP/xFOkdTZRPFIUcMyOR9uk/xQEarWSr4bk="; }; beamDeps = [ ]; }; p1_pgsql = builder { name = "p1_pgsql"; - version = "1.1.38"; + version = "1.1.41"; src = fetchHex { pkg = "p1_pgsql"; - version = "1.1.38"; - sha256 = "sha256-Bs9kQwCBeOujh7ou6STTYgBBuuTaGyyWloAoSgXMdZ4="; + version = "1.1.41"; + sha256 = "sha256-Ju4quj1FBGTt1LP/nassalP8ILv9Mwppc5grkGUEoXI="; }; - beamDeps = [ xmpp ]; + beamDeps = [ stringprep ]; }; p1_oauth2 = builder { name = "p1_oauth2"; @@ -144,37 +114,35 @@ let }; p1_mysql = builder { name = "p1_mysql"; - version = "1.0.27"; + version = "1.0.28"; src = fetchHex { pkg = "p1_mysql"; - version = "1.0.27"; - sha256 = "sha256-BmBR8kACenZzJUfmnZagl05w3BTe2UU77yYyIYQe2ps="; + version = "1.0.28"; + sha256 = "sha256-bk0A6OzlBbpQkcjas67+QVzy2Db/OVCDRMNSezZtmRk="; }; beamDeps = [ ]; }; p1_acme = builder { name = "p1_acme"; - version = "1.0.30"; + version = "1.0.31"; src = fetchHex { pkg = "p1_acme"; - version = "1.0.30"; - sha256 = "sha256-KTXiCRa4BtOxFmlTpNkKaQ/YB4EJYUD+XKH2XVnr1oo="; + version = "1.0.31"; + sha256 = "sha256-m1kiqQq5TaWInmTeXMrTrcbmim08P7cI3VA3V7Iy2xw="; }; beamDeps = [ - base64url idna - jiffy jose yconf ]; }; mqtree = builder { name = "mqtree"; - version = "1.0.19"; + version = "1.0.20"; src = fetchHex { pkg = "mqtree"; - version = "1.0.19"; - sha256 = "sha256-yBBlcVxJoYgoEvgKWuLYQugN0/LRMFMN81mQJIv4zjw="; + version = "1.0.20"; + sha256 = "sha256-XsDge5xIp4QGSWAL+W4UC0++nlAX4d3T6JjhXAo4PtA="; }; beamDeps = [ p1_utils ]; }; @@ -200,61 +168,61 @@ let }; idna = builder { name = "idna"; - version = "6.1.1"; + version = "7.1.0"; src = fetchHex { pkg = "idna"; - version = "6.1.1"; - sha256 = "sha256-kjdut4lEEu0ZrEdeSob3tBPBufu1vRbczVeTQVeUTOo="; + version = "7.1.0"; + sha256 = "sha256-aulZoCW/Nt9hqMq4UI2WVIkbVCaoTETYLer/1t34xx8="; }; - beamDeps = [ unicode_util_compat ]; + beamDeps = [ ]; }; fast_yaml = builder { name = "fast_yaml"; - version = "1.0.39"; + version = "1.0.40"; src = fetchHex { pkg = "fast_yaml"; - version = "1.0.39"; - sha256 = "sha256-JMe5q54rkmnWTkX0oqEoCWatsX0x5jNlz9PuJ3+wp40="; + version = "1.0.40"; + sha256 = "sha256-J3BcKZAsHG8yaLqb84fV+pKLLmVbUxEPpHuOR20ys4Y="; }; beamDeps = [ p1_utils ]; }; fast_xml = builder { name = "fast_xml"; - version = "1.1.57"; + version = "1.1.58"; src = fetchHex { pkg = "fast_xml"; - version = "1.1.57"; - sha256 = "sha256-7sNOkK2sr+Rn1d2rY1oBTe1zuYtAYVVLLRlyFz2SnDk="; + version = "1.1.58"; + sha256 = "sha256-o21uA6OYxTuhiekSv0x1WaNwSsY8UFDxJtR0FAGLTKA="; }; beamDeps = [ p1_utils ]; }; fast_tls = builder { name = "fast_tls"; - version = "1.1.25"; + version = "1.1.26"; src = fetchHex { pkg = "fast_tls"; - version = "1.1.25"; - sha256 = "sha256-WeGDtXQOZw4CuKpr5nO153eeX+W/zGef4tSZPRlJqCE="; + version = "1.1.26"; + sha256 = "sha256-aw1N0jCQN1Zeuqms858CgI9fghWjkQGh2jPCpbG1mz8="; }; beamDeps = [ p1_utils ]; }; ezlib = builder { name = "ezlib"; - version = "1.0.15"; + version = "1.0.16"; src = fetchHex { pkg = "ezlib"; - version = "1.0.15"; - sha256 = "sha256-3RS6bBJSGvXP5pI+c+PVRfSgiX3Ga/q1KH+7euOWLqs="; + version = "1.0.16"; + sha256 = "sha256-tIGVQEA9Hst+rmRf3/FCqNsrR22JMojTm6u5KSIlBAU="; }; beamDeps = [ p1_utils ]; }; esip = builder { name = "esip"; - version = "1.0.59"; + version = "1.0.60"; src = fetchHex { pkg = "esip"; - version = "1.0.59"; - sha256 = "sha256-C98uPDSdwLFE8XMVAynmdcalGsRz16Cy42IkX6rT++Y="; + version = "1.0.60"; + sha256 = "sha256-BgTL1LvI2hWSwAgwz+MGIM5PZlurEZnRSjtF+v0DFE8="; }; beamDeps = [ fast_tls @@ -294,21 +262,21 @@ let }; eimp = builder { name = "eimp"; - version = "1.0.26"; + version = "1.0.27"; src = fetchHex { pkg = "eimp"; - version = "1.0.26"; - sha256 = "sha256-2W1OhXK538QPJx5H8MsdiEk3O8mKISIyaHgXZe1SBEw="; + version = "1.0.27"; + sha256 = "sha256-PH6D4pO8+vUKG/BU/Etit7jEhKbkIY45dwmk0NhX8/w="; }; beamDeps = [ p1_utils ]; }; cache_tab = builder { name = "cache_tab"; - version = "1.0.33"; + version = "1.0.34"; src = fetchHex { pkg = "cache_tab"; - version = "1.0.33"; - sha256 = "sha256-QlgAnrBQsiqr4MhI4jC7pYQBpolcWML/dN+2NePDWQA="; + version = "1.0.34"; + sha256 = "sha256-DbnzF/OUHBfJ+OqBJeJe+ie77Uy/JKQsQm+tp0yCtpI="; }; beamDeps = [ p1_utils ]; }; From 289dbd83078373b2a54a1ea6b19829f8aeb06c43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?= =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= Date: Mon, 30 Mar 2026 22:28:37 +0700 Subject: [PATCH 18/58] ejabberd: withBootstrap flag for mod_invite MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Not ideal to pull in the npm toolchain just for getting some static files (this is upstream’s call), but is less maintenance than trying to track the versions ourselves. This also means now that if you don’t plan to use the built-in mod_invites page, you can opt out of the toolchain + dependency. --- pkgs/by-name/ej/ejabberd/package.nix | 40 ++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/pkgs/by-name/ej/ejabberd/package.nix b/pkgs/by-name/ej/ejabberd/package.nix index bdec28abbf8a..ac11b5094a1b 100644 --- a/pkgs/by-name/ej/ejabberd/package.nix +++ b/pkgs/by-name/ej/ejabberd/package.nix @@ -17,8 +17,11 @@ gd, autoreconfHook, gawk, + applyPatches, fetchFromGitHub, fetchgit, + fetchNpmDeps, + fetchpatch2, beamPackages, nixosTests, withMysql ? false, @@ -35,6 +38,9 @@ withRedis ? false, withImagemagick ? false, imagemagick, + withBootstrap ? true, # used for the built-in mod_invites page + nodejs, + npmHooks, }: let @@ -136,6 +142,7 @@ let "ezlib" ]; + npmToolingUsed = withBootstrap; in stdenv.mkDerivation (finalAttrs: { pname = "ejabberd"; @@ -150,6 +157,10 @@ stdenv.mkDerivation (finalAttrs: { rebar3_hex ]; }) + ] + ++ lib.optionals npmToolingUsed [ + nodejs + npmHooks.npmConfigHook ]; buildInputs = [ @@ -165,6 +176,21 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional withLua allBeamDeps.luerl ++ lib.optional withRedis allBeamDeps.eredis; + npmDeps = lib.optionalDrvAttr npmToolingUsed (fetchNpmDeps { + name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; + src = + if builtins.isNull finalAttrs.patches || builtins.length finalAttrs.patches <= 0 then + finalAttrs.src + else + # A bit of a hack, but if the package*.json files are patched, + # fetchNpmDeps will be out of sync + applyPatches { + inherit (finalAttrs) src patches; + name = "${finalAttrs.pname}-${finalAttrs.version}-patched"; + }; + hash = "sha256-MTyoc8ozrCi3W0CXmxyLpyU8v+vlUjcbLnv/1ev/Qqo="; + }); + src = fetchFromGitHub { owner = "processone"; repo = "ejabberd"; @@ -172,6 +198,15 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-M38niXEW++SPAvqQ2cqEd23+w7lBDO5EPgu/QRdYbXo="; }; + patches = [ + (fetchpatch2 { + # Makes Bootstrap optional, drops jQuery + # https://github.com/processone/ejabberd/pull/4558 + url = "https://patch-diff.githubusercontent.com/raw/processone/ejabberd/pull/4558.patch"; + hash = "sha256-ETl2Zf7O6roxtf7DthJqL+tj4RvEfW94735sGM8x/GM="; + }) + ]; + passthru.tests = { inherit (nixosTests) ejabberd; }; @@ -186,6 +221,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.enableFeature withLua "lua") (lib.enableFeature withTools "tools") (lib.enableFeature withRedis "redis") + (lib.enableFeature withBootstrap "bootstrap") ] ++ lib.optional withSqlite "--with-sqlite3=${sqlite.dev}"; @@ -198,6 +234,10 @@ stdenv.mkDerivation (finalAttrs: { touch _build/default/lib/.built ''; + preBuild = lib.optionalString npmToolingUsed /* sh */ '' + npm run postinstall + ''; + env.REBAR_IGNORE_DEPS = 1; postInstall = '' From f0595626ae670a5077546883f44be3adac0b9235 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?= =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= Date: Sat, 18 Apr 2026 20:37:13 +0700 Subject: [PATCH 19/58] =?UTF-8?q?ejabberd:=2026.03=20=E2=86=92=2026.04?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit as the patches are merged, the patch juggling can be removed --- pkgs/by-name/ej/ejabberd/package.nix | 26 +++---------------------- pkgs/by-name/ej/ejabberd/rebar-deps.nix | 12 ++++++------ 2 files changed, 9 insertions(+), 29 deletions(-) diff --git a/pkgs/by-name/ej/ejabberd/package.nix b/pkgs/by-name/ej/ejabberd/package.nix index ac11b5094a1b..636e7b8557a2 100644 --- a/pkgs/by-name/ej/ejabberd/package.nix +++ b/pkgs/by-name/ej/ejabberd/package.nix @@ -17,11 +17,9 @@ gd, autoreconfHook, gawk, - applyPatches, fetchFromGitHub, fetchgit, fetchNpmDeps, - fetchpatch2, beamPackages, nixosTests, withMysql ? false, @@ -146,7 +144,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ejabberd"; - version = "26.03"; + version = "26.04"; nativeBuildInputs = [ makeWrapper @@ -178,16 +176,7 @@ stdenv.mkDerivation (finalAttrs: { npmDeps = lib.optionalDrvAttr npmToolingUsed (fetchNpmDeps { name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; - src = - if builtins.isNull finalAttrs.patches || builtins.length finalAttrs.patches <= 0 then - finalAttrs.src - else - # A bit of a hack, but if the package*.json files are patched, - # fetchNpmDeps will be out of sync - applyPatches { - inherit (finalAttrs) src patches; - name = "${finalAttrs.pname}-${finalAttrs.version}-patched"; - }; + src = finalAttrs.src; hash = "sha256-MTyoc8ozrCi3W0CXmxyLpyU8v+vlUjcbLnv/1ev/Qqo="; }); @@ -195,18 +184,9 @@ stdenv.mkDerivation (finalAttrs: { owner = "processone"; repo = "ejabberd"; tag = finalAttrs.version; - hash = "sha256-M38niXEW++SPAvqQ2cqEd23+w7lBDO5EPgu/QRdYbXo="; + hash = "sha256-PF65TgHvKeSEudEqqJVEotu2zgiWgGtRuNvbiyE0nwc="; }; - patches = [ - (fetchpatch2 { - # Makes Bootstrap optional, drops jQuery - # https://github.com/processone/ejabberd/pull/4558 - url = "https://patch-diff.githubusercontent.com/raw/processone/ejabberd/pull/4558.patch"; - hash = "sha256-ETl2Zf7O6roxtf7DthJqL+tj4RvEfW94735sGM8x/GM="; - }) - ]; - passthru.tests = { inherit (nixosTests) ejabberd; }; diff --git a/pkgs/by-name/ej/ejabberd/rebar-deps.nix b/pkgs/by-name/ej/ejabberd/rebar-deps.nix index 8c09cf4bd54e..dde541668b75 100644 --- a/pkgs/by-name/ej/ejabberd/rebar-deps.nix +++ b/pkgs/by-name/ej/ejabberd/rebar-deps.nix @@ -24,11 +24,11 @@ let }; xmpp = builder { name = "xmpp"; - version = "1.13.1"; + version = "1.13.3"; src = fetchHex { pkg = "xmpp"; - version = "1.13.1"; - sha256 = "sha256-oCTu98y094uftS431jhaV73RUL515Q1Ru8uvOamriD0="; + version = "1.13.3"; + sha256 = "sha256-BWSKpNvM/uYqqnlLKSowWEY50DyR9cCGa+jDQ0tqb0g="; }; beamDeps = [ ezlib @@ -188,11 +188,11 @@ let }; fast_xml = builder { name = "fast_xml"; - version = "1.1.58"; + version = "1.1.60"; src = fetchHex { pkg = "fast_xml"; - version = "1.1.58"; - sha256 = "sha256-o21uA6OYxTuhiekSv0x1WaNwSsY8UFDxJtR0FAGLTKA="; + version = "1.1.60"; + sha256 = "sha256-z54nSd1HIEcCy3oEq1BFZC+gCW/fyc/y6cptPyq9N8U="; }; beamDeps = [ p1_utils ]; }; From 883f897588e016e06822d654447a57e75145aaf2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 20 Apr 2026 17:01:41 +0000 Subject: [PATCH 20/58] python3Packages.openrazer: 3.12.0 -> 3.12.2 --- pkgs/development/python-modules/openrazer/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openrazer/common.nix b/pkgs/development/python-modules/openrazer/common.nix index cb93df1f0d69..5e16e90cc7dc 100644 --- a/pkgs/development/python-modules/openrazer/common.nix +++ b/pkgs/development/python-modules/openrazer/common.nix @@ -1,13 +1,13 @@ { lib, fetchFromGitHub }: rec { - version = "3.12.0"; + version = "3.12.2"; pyproject = true; src = fetchFromGitHub { owner = "openrazer"; repo = "openrazer"; tag = "v${version}"; - hash = "sha256-Sgn+7DABsTnRTx/lh/++JPmfsQ7dM6frkyzG0F5k2gA="; + hash = "sha256-iXMN/wFe0IWr9kwGmuU+j/n2DHvxP37VqY/NVn8F690="; }; meta = { From e4964a7e106b31166b8bffe8e624beb195aa6bd9 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Mon, 20 Apr 2026 21:13:12 +0000 Subject: [PATCH 21/58] prometheus: Include TestFsType patch The upstream test TestFsType used a regexp to match filesystem magic constant names (e.g. EXT4_SUPER_MAGIC) against the string returned by FsType(). This fails in Nix sandbox builds where the filesystem type does not match that naming pattern. The patch (prometheus/prometheus#18519) relaxes the assertion to simply require a non-zero value for a valid path. --- pkgs/by-name/pr/prometheus/package.nix | 4 +++ .../prometheus-pr18519-fix-TestFsType.patch | 25 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/by-name/pr/prometheus/prometheus-pr18519-fix-TestFsType.patch diff --git a/pkgs/by-name/pr/prometheus/package.nix b/pkgs/by-name/pr/prometheus/package.nix index fae4e2500a89..703fbda70fd0 100644 --- a/pkgs/by-name/pr/prometheus/package.nix +++ b/pkgs/by-name/pr/prometheus/package.nix @@ -92,6 +92,10 @@ buildGoModule (finalAttrs: { proxyVendor = true; + patches = [ + ./prometheus-pr18519-fix-TestFsType.patch + ]; + outputs = [ "out" "doc" diff --git a/pkgs/by-name/pr/prometheus/prometheus-pr18519-fix-TestFsType.patch b/pkgs/by-name/pr/prometheus/prometheus-pr18519-fix-TestFsType.patch new file mode 100644 index 000000000000..a7ad2c20b32c --- /dev/null +++ b/pkgs/by-name/pr/prometheus/prometheus-pr18519-fix-TestFsType.patch @@ -0,0 +1,25 @@ +--- a/util/runtime/statfs_unix_test.go ++++ b/util/runtime/statfs_unix_test.go +@@ -19,20 +19,18 @@ import ( + "os" + "testing" + +- "github.com/grafana/regexp" + "github.com/stretchr/testify/require" + ) + +-var regexpFsType = regexp.MustCompile("^[A-Z][A-Z0-9_]*_MAGIC$") +- + func TestFsType(t *testing.T) { + var fsType string + + path, err := os.Getwd() + require.NoError(t, err) + ++ // A real path must yield a non-zero filesystem type. + fsType = FsType(path) +- require.Regexp(t, regexpFsType, fsType) ++ require.NotEqual(t, "0", fsType) + + fsType = FsType("/no/where/to/be/found") + require.Equal(t, "0", fsType) From 444fdee5efa8deb141c50c431208e8df29c853ae Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Mon, 20 Apr 2026 21:14:17 +0000 Subject: [PATCH 22/58] prometheus: Allow local networking on Darwin for assets build The npm test suite performs a localhost DNS lookup which fails in the Darwin sandbox without this. --- pkgs/by-name/pr/prometheus/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/pr/prometheus/package.nix b/pkgs/by-name/pr/prometheus/package.nix index 703fbda70fd0..40cfe2fec8f0 100644 --- a/pkgs/by-name/pr/prometheus/package.nix +++ b/pkgs/by-name/pr/prometheus/package.nix @@ -63,6 +63,8 @@ let env.CI = true; + __darwinAllowLocalNetworking = true; + doCheck = true; checkPhase = '' runHook preCheck From 0a3aa492cc2a49fc5db364800aa425777f20fa3d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Apr 2026 12:27:16 +0000 Subject: [PATCH 23/58] upnp-router-control: 0.3.5 -> 0.3.6 --- pkgs/by-name/up/upnp-router-control/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/up/upnp-router-control/package.nix b/pkgs/by-name/up/upnp-router-control/package.nix index 79cd8b8566f0..c6b06303f5e9 100644 --- a/pkgs/by-name/up/upnp-router-control/package.nix +++ b/pkgs/by-name/up/upnp-router-control/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "upnp-router-control"; - version = "0.3.5"; + version = "0.3.6"; src = fetchzip { url = "https://launchpad.net/upnp-router-control/trunk/${finalAttrs.version}/+download/upnp-router-control-${finalAttrs.version}.tar.xz"; - hash = "sha256-+yJzULNdzBkUw2EbHXoAbR9B/P0d6n8T7ojlYIrKgto="; + hash = "sha256-2vm6Rnn+V3V54W2xYDlMh7iFKNWfxxnDexlZdwS+8RA="; }; nativeBuildInputs = [ From f6b41e5411762505e72573424eab36ab2f229bd0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Apr 2026 04:53:33 +0000 Subject: [PATCH 24/58] obs-studio: 32.1.1 -> 32.1.2 --- pkgs/applications/video/obs-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index e1e9765ef1dc..b501927422c4 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -98,13 +98,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "obs-studio"; - version = "32.1.1"; + version = "32.1.2"; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; rev = finalAttrs.version; - hash = "sha256-p/fr5lO97jCl0HYA0x7ZAS7gAXvA+s7nn3XSj1UvtC4="; + hash = "sha256-9i7wLHpKqbcYzPlzSMF4xEpsTINQnVDPtneLJaSM+/I="; fetchSubmodules = true; }; From a5511bf8ca2333863b2f0a3aaf7506a7040d220a Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Wed, 22 Apr 2026 00:18:29 +0200 Subject: [PATCH 25/58] librewolf-unwrapped: 149.0.2-2 -> 150.0-1 diff: https://codeberg.org/librewolf/source/compare/149.0.2-2...150.0-1 mfsa: https://www.mozilla.org/en-US/security/advisories/mfsa2026-30 The temporary build fix is take from https://codeberg.org/librewolf/source/src/branch/main/scripts/librewolf-patches.py. --- pkgs/by-name/li/librewolf-unwrapped/librewolf.nix | 4 ++++ pkgs/by-name/li/librewolf-unwrapped/src.json | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/li/librewolf-unwrapped/librewolf.nix b/pkgs/by-name/li/librewolf-unwrapped/librewolf.nix index a1cd00a257d5..91e767db281e 100644 --- a/pkgs/by-name/li/librewolf-unwrapped/librewolf.nix +++ b/pkgs/by-name/li/librewolf-unwrapped/librewolf.nix @@ -32,6 +32,10 @@ rec { sed -i '/# This must remain last./i gkrust_features += ["glean_disable_upload"]\'$'\n' toolkit/library/rust/gkrust-features.mozbuild + # Temporary fix used with patches/rust-build.patch + sed -i 's/9456ca46168ef86c98399a2536f577ef7be3cdde90c0c51392d8ac48519d3fae/b9432f9ed39742015f4bb4c3e75c89a2b9a9eef943dd0fd7cd889fddd1e6d39c/g' third_party/rust/encoding_rs/.cargo-checksum.json + + cp ${source}/patches/pref-pane/category-librewolf.svg browser/themes/shared/preferences cp ${source}/patches/pref-pane/librewolf.css browser/themes/shared/preferences cp ${source}/patches/pref-pane/librewolf.inc.xhtml browser/components/preferences diff --git a/pkgs/by-name/li/librewolf-unwrapped/src.json b/pkgs/by-name/li/librewolf-unwrapped/src.json index ce93d8944f06..813b8a65ef5d 100644 --- a/pkgs/by-name/li/librewolf-unwrapped/src.json +++ b/pkgs/by-name/li/librewolf-unwrapped/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "149.0.2-2", + "packageVersion": "150.0-1", "source": { - "rev": "149.0.2-2", - "hash": "sha256-rnDL98f3vwpcRmWfNuTcp2SDk6CKiOPEZFYnNsVDUa0=" + "rev": "150.0-1", + "hash": "sha256-udoXrll3sQnG8Jp6AZtd9V2vela4Uej9SKy7wP7YiUc=" }, "firefox": { - "version": "149.0.2", - "hash": "sha512-hEpG7gaOzcZrcifQiaBXrT9JRRFP6iyygNXio4PQoCL8ZiitV8Bo6jTPFZRy9jxQ6n7RKLwRoLJ/Frt7Z9fzzw==" + "version": "150.0", + "hash": "sha512-d+jq6G57F8M5M/3qbTtfvnPmYTlJ5iwT2e0+WT57oLUHAfqX/H1WoniWHS4c2ykCJEwwoQIHkAkbCuLwyxtOcQ==" } } From 9508002438eb2b843baa092127df693b6d05b6a8 Mon Sep 17 00:00:00 2001 From: "Burfeind, Jan-Niklas" Date: Thu, 12 Mar 2026 18:11:31 +0100 Subject: [PATCH 26/58] nixos/pdudaemon: init module based on the example in share/ in the project repo. --- nixos/modules/module-list.nix | 1 + nixos/modules/services/hardware/pdudaemon.nix | 146 ++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/pdudaemon.nix | 50 ++++++ 4 files changed, 198 insertions(+) create mode 100644 nixos/modules/services/hardware/pdudaemon.nix create mode 100644 nixos/tests/pdudaemon.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 54ebc0b65767..238d7d74a954 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -686,6 +686,7 @@ ./services/hardware/nvidia-optimus.nix ./services/hardware/openrgb.nix ./services/hardware/pcscd.nix + ./services/hardware/pdudaemon.nix ./services/hardware/pid-fan-controller.nix ./services/hardware/pommed.nix ./services/hardware/power-profiles-daemon.nix diff --git a/nixos/modules/services/hardware/pdudaemon.nix b/nixos/modules/services/hardware/pdudaemon.nix new file mode 100644 index 000000000000..3f400848436e --- /dev/null +++ b/nixos/modules/services/hardware/pdudaemon.nix @@ -0,0 +1,146 @@ +{ + config, + pkgs, + lib, + ... +}: + +let + cfg = config.services.pdudaemon; + configFile = pkgs.writeText "pdudaemon.conf" ( + lib.generators.toJSON { } { + daemon = { + hostname = cfg.bindAddress; + port = cfg.port; + logging_level = cfg.logLevel; + listener = cfg.listener; + }; + pdus = cfg.pdus; + } + ); +in +{ + meta = { + maintainers = with lib.maintainers; [ + aiyion + emantor + ]; + }; + + options = { + services.pdudaemon = { + enable = lib.mkEnableOption "PDUDaemon"; + + package = lib.mkPackageOption pkgs "pdudaemon" { }; + + bindAddress = lib.mkOption { + default = "0.0.0.0"; + type = lib.types.str; + description = "Bind address for the PDUDaemon."; + }; + + port = lib.mkOption { + default = 16421; + type = lib.types.port; + description = "Port to bind to."; + }; + + openFirewall = lib.mkOption { + default = false; + type = lib.types.bool; + description = '' + Whether to automatically open the PDUDaemon listen port in the firewall. + ''; + }; + + listener = lib.mkOption { + default = "http"; + type = lib.types.enum [ + "http" + "tcp" + ]; + description = "Which kind of listener to provide."; + }; + + logLevel = lib.mkOption { + default = "error"; + type = lib.types.enum [ + "debug" + "info" + "warning" + "error" + ]; + description = "PDUDaemon log level."; + }; + + pdus = lib.mkOption { + type = with lib.types; attrsOf anything; + default = { }; + description = '' + Structural pdus section of PDUDaemon's pdudaemon.conf. + Refer to + for more examples. + ''; + example = lib.literalExpression '' + { + cbs350-poe-switch = { + driver = "snmpv1"; + community = "private"; + oid = ".1.3.6.1.2.1.105.1.1.1.3.1.*; + onsetting = 1; + offsetting = 2; + }; + energenie = { + driver = "EG-PMS"; + device = "aa:bb:cc:xx:yy"; + }; + local = { + driver = "localcmdline"; + }; + }; + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ cfg.port ]; + + systemd.services.pdudaemon = { + after = [ "network-online.target" ]; + description = "Control and Queueing daemon for PDUs"; + serviceConfig = { + ExecStart = "${lib.getExe cfg.package} --conf ${configFile}"; + Type = "simple"; + DynamicUser = "yes"; + StateDirectory = "pdudaemon"; + ProtectHome = true; + Restart = "on-failure"; + CapabilityBoundingSet = ""; + PrivateDevices = true; + ProtectClock = true; + ProtectKernelLogs = true; + ProtectControlGroups = true; + ProtectKernelModules = true; + SystemCallArchitectures = "native"; + MemoryDenyWriteExecute = true; + RestrictNamespaces = true; + ProtectHostname = true; + LockPersonality = true; + ProtectKernelTunables = true; + RestrictRealtime = true; + ProtectProc = "invisible"; + ProcSubset = "pid"; + PrivateUsers = true; + SystemCallFilter = [ + "@system-service" + "~@privileged" + "~@resources" + ]; + }; + + wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; + }; + }; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index a797d5466611..f958d2876438 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1259,6 +1259,7 @@ in inherit runTest; }; pdns-recursor = runTest ./pdns-recursor.nix; + pdudaemon = runTest ./pdudaemon.nix; peerflix = runTest ./peerflix.nix; peering-manager = runTest ./web-apps/peering-manager.nix; peertube = handleTestOn [ "x86_64-linux" ] ./web-apps/peertube.nix { }; diff --git a/nixos/tests/pdudaemon.nix b/nixos/tests/pdudaemon.nix new file mode 100644 index 000000000000..71fb798f886e --- /dev/null +++ b/nixos/tests/pdudaemon.nix @@ -0,0 +1,50 @@ +{ pkgs, ... }: +{ + name = "PDUDaemon"; + meta.maintainers = with pkgs.lib.maintainers; [ + aiyion + emantor + ]; + + nodes.pdudaemonhost = + { pkgs, ... }: + { + environment.systemPackages = [ pkgs.curl ]; + services.pdudaemon.enable = true; + services.pdudaemon.openFirewall = true; + services.pdudaemon.pdus = { + testpduhost = { + driver = "localcmdline"; + cmd_on = "echo '%s on' >> /tmp/pdu"; + cmd_off = "echo '%s off' >> /tmp/pdu"; + }; + }; + }; + + nodes.clienthost = + { pkgs, ... }: + { + environment.systemPackages = [ pkgs.curl ]; + }; + + testScript = + { nodes, ... }: + #python + '' + with subtest("Wait for pdudaemon startup"): + pdudaemonhost.start() + pdudaemonhost.wait_for_unit("pdudaemon.service") + pdudaemonhost.wait_for_open_port(16421) + print(pdudaemonhost.succeed("curl 'http://localhost:16421/power/control/on?hostname=testpduhost&port=1'")) + + with subtest("Connect from client"): + clienthost.start() + clienthost.wait_until_succeeds("curl 'http://pdudaemonhost:16421/power/control/off?hostname=testpduhost&port=1'") + + with subtest("Check systemd hardening does not degrade unnoticed"): + exact_threshold = 15 + service_name = "pdudaemon" + pdudaemonhost.fail(f"systemd-analyze security {service_name}.service --threshold={exact_threshold-1}") + pdudaemonhost.succeed(f"systemd-analyze security {service_name}.service --threshold={exact_threshold}") + ''; +} From 6e5fcac29b883c9f967006d3e73f755c35588b4f Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Fri, 10 Apr 2026 08:04:50 +0200 Subject: [PATCH 27/58] tclPackages.rl_json: 0.15.7 -> 0.16 --- .../by-name/rl/rl_json/package.nix | 24 +++++-------------- 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/pkgs/development/tcl-modules/by-name/rl/rl_json/package.nix b/pkgs/development/tcl-modules/by-name/rl/rl_json/package.nix index aefab7d88c6f..dfc56bc68fd1 100644 --- a/pkgs/development/tcl-modules/by-name/rl/rl_json/package.nix +++ b/pkgs/development/tcl-modules/by-name/rl/rl_json/package.nix @@ -4,40 +4,30 @@ fetchFromGitHub, autoreconfHook, tcl, + pandoc, }: stdenv.mkDerivation (finalAttrs: { pname = "rl_json"; - version = "0.15.7"; + version = "0.16"; src = fetchFromGitHub { owner = "RubyLane"; repo = "rl_json"; tag = finalAttrs.version; - hash = "sha256-6Y6bq/Lm6KCFFV3RF6v4fVPEN1LO+jE2xZV50a8zyng="; + hash = "sha256-rXr7x9Cr+gD938+NEPguvYVWH5s9bKccMobuZsb0IQY="; fetchSubmodules = true; }; - # The vendored libtommath conflicts with tclTomMath. - # Replacing it with tclTomMath fixes the issue. - # https://github.com/RubyLane/rl_json/issues/57 - # The switch to a vendored libtommath was done in 0.15.4 in commit - # https://github.com/RubyLane/rl_json/commit/9294d533f4d81288acf53045666b1587cf7fbf92 - # "for proper bignum handling", but the commit message doesn't explain what's wrong - # with tclTomMath's bignum handling and all tests pass anyway. postPatch = '' - rm -r deps/libtommath - substituteInPlace Makefile.in \ - --replace-fail 'deps: local/lib/libtommath.a' 'deps:' - substituteInPlace configure.ac \ - --replace-fail -ltommath "" - substituteInPlace generic/rl_jsonInt.h \ - --replace-fail '#include ' '#include ' + mkdir doc/.build + cp doc/json.md.in doc/.build/json.md.in ''; nativeBuildInputs = [ autoreconfHook tcl.tclPackageHook + pandoc ]; configureFlags = [ @@ -47,8 +37,6 @@ stdenv.mkDerivation (finalAttrs: { "--datarootdir=${placeholder "out"}/share" ]; - env.NIX_CFLAGS_COMPILE = "-Wno-error"; - doCheck = true; meta = { From f6255687742bea17e7c4d1a21f573b36b37335d7 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Fri, 10 Apr 2026 08:05:24 +0200 Subject: [PATCH 28/58] tclPackages.tkimg: 623 -> 2.1.1 Use actual version instead of svn revision --- .../tcl-modules/by-name/tk/tkimg/package.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tcl-modules/by-name/tk/tkimg/package.nix b/pkgs/development/tcl-modules/by-name/tk/tkimg/package.nix index 9eca47fedb46..1844af448d08 100644 --- a/pkgs/development/tcl-modules/by-name/tk/tkimg/package.nix +++ b/pkgs/development/tcl-modules/by-name/tk/tkimg/package.nix @@ -1,20 +1,20 @@ { lib, - fetchsvn, + fetchzip, tcl, tcllib, tk, libx11, + zlib, }: tcl.mkTclDerivation rec { pname = "tkimg"; - version = "623"; + version = "2.1.1"; - src = fetchsvn { - url = "svn://svn.code.sf.net/p/tkimg/code/trunk"; - rev = version; - sha256 = "sha256-6GlkqYxXmMGjiJTZS2fQNVSimcKc1BZ/lvzvtkhty+o="; + src = fetchzip { + url = "mirror://sourceforge/tkimg/tkimg/Img-${version}.tar.gz"; + hash = "sha256-TRtE2/BVrYgkdKtbF06UjLvokokgLGQ/EKDLxhz2Ckw="; }; configureFlags = [ @@ -26,6 +26,7 @@ tcl.mkTclDerivation rec { buildInputs = [ libx11 tcllib + zlib ]; meta = { From 7f0b064d1ee268c9567b739e41b8de2e8179a15b Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Fri, 10 Apr 2026 13:53:02 +0200 Subject: [PATCH 29/58] tcl9Packages: init Closes #507589 Closes #507575 --- pkgs/development/interpreters/tcl/generic.nix | 1 + pkgs/top-level/all-packages.nix | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix index 53d076f878d1..21702a4c74c6 100644 --- a/pkgs/development/interpreters/tcl/generic.nix +++ b/pkgs/development/interpreters/tcl/generic.nix @@ -130,6 +130,7 @@ let passthru = rec { inherit release version; + isTcl9 = lib.versions.major version == "9"; libPrefix = "tcl${release}"; libdir = "lib/${libPrefix}"; tclPackageHook = callPackage ( diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c436ed689420..617043707280 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5249,8 +5249,21 @@ with pkgs; tcl-8_6 = callPackage ../development/interpreters/tcl/8.6.nix { }; tcl-9_0 = callPackage ../development/interpreters/tcl/9.0.nix { }; - # We don't need versioned package sets thanks to the tcl stubs mechanism - tclPackages = recurseIntoAttrs (callPackage ./tcl-packages.nix { }); + tclPackages = dontRecurseIntoAttrs tcl8Packages; + # We don't need minor-versioned package sets thanks to the tcl stubs mechanism. + # Major versions have bigger incompatibilities and need package sets. + tcl8Packages = recurseIntoAttrs ( + callPackage ./tcl-packages.nix { + tcl = tcl-8_6; + tk = tk-8_6; + } + ); + tcl9Packages = recurseIntoAttrs ( + callPackage ./tcl-packages.nix { + tcl = tcl-9_0; + tk = tk-9_0; + } + ); tclreadline = tclPackages.tclreadline; From 3d39447275c9a83a850c1271937198940871ddc7 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Fri, 10 Apr 2026 13:53:55 +0200 Subject: [PATCH 30/58] tclPackages: mark packages that are broken on Tcl9 --- pkgs/development/tcl-modules/by-name/ex/expect/package.nix | 1 + pkgs/development/tcl-modules/by-name/in/incrtcl/package.nix | 1 + pkgs/development/tcl-modules/by-name/le/lexec/package.nix | 2 ++ pkgs/development/tcl-modules/by-name/tc/tcl-fcgi/package.nix | 2 ++ pkgs/development/tcl-modules/by-name/tc/tclcurl/package.nix | 2 ++ pkgs/development/tcl-modules/by-name/tc/tclmagick/package.nix | 2 ++ pkgs/development/tcl-modules/by-name/tc/tcltls/package.nix | 2 ++ pkgs/development/tcl-modules/by-name/tc/tcludp/package.nix | 2 ++ pkgs/development/tcl-modules/by-name/ti/tix/package.nix | 1 + pkgs/development/tcl-modules/by-name/ve/vectcl/package.nix | 2 ++ 10 files changed, 17 insertions(+) diff --git a/pkgs/development/tcl-modules/by-name/ex/expect/package.nix b/pkgs/development/tcl-modules/by-name/ex/expect/package.nix index fcb23f407da7..8e4b2b0caa54 100644 --- a/pkgs/development/tcl-modules/by-name/ex/expect/package.nix +++ b/pkgs/development/tcl-modules/by-name/ex/expect/package.nix @@ -81,5 +81,6 @@ tcl.mkTclDerivation rec { platforms = lib.platforms.unix; mainProgram = "expect"; maintainers = with lib.maintainers; [ SuperSandro2000 ]; + broken = tcl.isTcl9; }; } diff --git a/pkgs/development/tcl-modules/by-name/in/incrtcl/package.nix b/pkgs/development/tcl-modules/by-name/in/incrtcl/package.nix index 2aa3248f531d..9ea98c23381f 100644 --- a/pkgs/development/tcl-modules/by-name/in/incrtcl/package.nix +++ b/pkgs/development/tcl-modules/by-name/in/incrtcl/package.nix @@ -46,5 +46,6 @@ mkTclDerivation rec { license = lib.licenses.tcltk; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ thoughtpolice ]; + broken = tcl.isTcl9; }; } diff --git a/pkgs/development/tcl-modules/by-name/le/lexec/package.nix b/pkgs/development/tcl-modules/by-name/le/lexec/package.nix index 047676ba4cde..753ef8de6829 100644 --- a/pkgs/development/tcl-modules/by-name/le/lexec/package.nix +++ b/pkgs/development/tcl-modules/by-name/le/lexec/package.nix @@ -3,6 +3,7 @@ mkTclDerivation, fetchzip, autoreconfHook, + tcl, }: mkTclDerivation { @@ -24,5 +25,6 @@ mkTclDerivation { license = lib.licenses.tcltk; maintainers = with lib.maintainers; [ fgaz ]; platforms = lib.platforms.all; + broken = tcl.isTcl9; }; } diff --git a/pkgs/development/tcl-modules/by-name/tc/tcl-fcgi/package.nix b/pkgs/development/tcl-modules/by-name/tc/tcl-fcgi/package.nix index b53b6d1281f0..f3e7fd0a7157 100644 --- a/pkgs/development/tcl-modules/by-name/tc/tcl-fcgi/package.nix +++ b/pkgs/development/tcl-modules/by-name/tc/tcl-fcgi/package.nix @@ -3,6 +3,7 @@ fetchFromGitHub, mkTclDerivation, tclx, + tcl, }: mkTclDerivation { @@ -31,5 +32,6 @@ mkTclDerivation { license = lib.licenses.bsd2; platforms = tclx.meta.platforms; maintainers = with lib.maintainers; [ nat-418 ]; + broken = tcl.isTcl9; }; } diff --git a/pkgs/development/tcl-modules/by-name/tc/tclcurl/package.nix b/pkgs/development/tcl-modules/by-name/tc/tclcurl/package.nix index a843734b69b6..952c0201bb32 100644 --- a/pkgs/development/tcl-modules/by-name/tc/tclcurl/package.nix +++ b/pkgs/development/tcl-modules/by-name/tc/tclcurl/package.nix @@ -3,6 +3,7 @@ mkTclDerivation, fetchFromGitHub, curl, + tcl, }: mkTclDerivation rec { @@ -29,5 +30,6 @@ mkTclDerivation rec { changelog = "https://github.com/flightaware/tclcurl-fa/blob/master/ChangeLog.txt"; license = lib.licenses.tcltk; maintainers = with lib.maintainers; [ fgaz ]; + broken = tcl.isTcl9; }; } diff --git a/pkgs/development/tcl-modules/by-name/tc/tclmagick/package.nix b/pkgs/development/tcl-modules/by-name/tc/tclmagick/package.nix index ad688ec56de4..cbfe979ac79a 100644 --- a/pkgs/development/tcl-modules/by-name/tc/tclmagick/package.nix +++ b/pkgs/development/tcl-modules/by-name/tc/tclmagick/package.nix @@ -3,6 +3,7 @@ mkTclDerivation, fetchzip, graphicsmagick, + tcl, tk, }: @@ -34,5 +35,6 @@ mkTclDerivation rec { homepage = "http://www.graphicsmagick.org/TclMagick/doc/"; license = lib.licenses.tcltk; maintainers = with lib.maintainers; [ fgaz ]; + broken = tcl.isTcl9; }; } diff --git a/pkgs/development/tcl-modules/by-name/tc/tcltls/package.nix b/pkgs/development/tcl-modules/by-name/tc/tcltls/package.nix index 02621ea9a8c3..d927b037f0c4 100644 --- a/pkgs/development/tcl-modules/by-name/tc/tcltls/package.nix +++ b/pkgs/development/tcl-modules/by-name/tc/tcltls/package.nix @@ -3,6 +3,7 @@ fetchurl, mkTclDerivation, openssl, + tcl, }: mkTclDerivation rec { @@ -28,5 +29,6 @@ mkTclDerivation rec { maintainers = [ lib.maintainers.agbrooks ]; license = lib.licenses.tcltk; platforms = lib.platforms.unix; + broken = tcl.isTcl9; }; } diff --git a/pkgs/development/tcl-modules/by-name/tc/tcludp/package.nix b/pkgs/development/tcl-modules/by-name/tc/tcludp/package.nix index 073a93432fda..58052bf4079f 100644 --- a/pkgs/development/tcl-modules/by-name/tc/tcludp/package.nix +++ b/pkgs/development/tcl-modules/by-name/tc/tcludp/package.nix @@ -2,6 +2,7 @@ lib, mkTclDerivation, fetchfossil, + tcl, }: mkTclDerivation rec { @@ -35,5 +36,6 @@ mkTclDerivation rec { homepage = "https://core.tcl-lang.org/tcludp"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fgaz ]; + broken = tcl.isTcl9; }; } diff --git a/pkgs/development/tcl-modules/by-name/ti/tix/package.nix b/pkgs/development/tcl-modules/by-name/ti/tix/package.nix index a27e45a711aa..b972d2dbf594 100644 --- a/pkgs/development/tcl-modules/by-name/ti/tix/package.nix +++ b/pkgs/development/tcl-modules/by-name/ti/tix/package.nix @@ -60,5 +60,6 @@ tcl.mkTclDerivation { bsd2 # tix gpl2 # patches from portage ]; + broken = tcl.isTcl9; }; } diff --git a/pkgs/development/tcl-modules/by-name/ve/vectcl/package.nix b/pkgs/development/tcl-modules/by-name/ve/vectcl/package.nix index 9c4bdf2143d6..fbfde044f789 100644 --- a/pkgs/development/tcl-modules/by-name/ve/vectcl/package.nix +++ b/pkgs/development/tcl-modules/by-name/ve/vectcl/package.nix @@ -2,6 +2,7 @@ lib, mkTclDerivation, fetchFromGitHub, + tcl, }: mkTclDerivation rec { @@ -22,5 +23,6 @@ mkTclDerivation rec { description = "Numeric array and linear algebra extension for Tcl"; maintainers = with lib.maintainers; [ fgaz ]; license = lib.licenses.tcltk; + broken = tcl.isTcl9; }; } From d5f1e4cc05922106f921ceb3cd764921c5737dbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 22 Apr 2026 19:41:28 -0700 Subject: [PATCH 31/58] python3Packages.nbconvert: 7.16.6 -> 7.17.1 Changelog: https://github.com/jupyter/nbconvert/blob/v7.17.1/CHANGELOG.md --- pkgs/development/python-modules/nbconvert/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index e46dcae1ee8e..acae7431277d 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -32,12 +32,12 @@ let in buildPythonPackage rec { pname = "nbconvert"; - version = "7.16.6"; + version = "7.17.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-V2p+N8ZIDae4Rl7vpmwXhEJDgWzhzMNyYzxrccPA9YI="; + hash = "sha256-NNDQp+c848urbFquj09Gh5coCwH9i9LKdG2oVp7d19I="; }; # Add $out/share/jupyter to the list of paths that are used to search for From 814e47066891f8e36978709a954de359cf7770df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 22 Apr 2026 19:42:10 -0700 Subject: [PATCH 32/58] python3Packages.nbconvert: use upstream's style.css https://github.com/jupyter/nbconvert/issues/1896 has been fixed --- pkgs/development/python-modules/nbconvert/default.nix | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index acae7431277d..529fc3193fcd 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -1,6 +1,5 @@ { lib, - fetchurl, buildPythonPackage, fetchPypi, hatchling, @@ -23,13 +22,6 @@ pytestCheckHook, }: -let - # see https://github.com/jupyter/nbconvert/issues/1896 - style-css = fetchurl { - url = "https://cdn.jupyter.org/notebook/5.4.0/style/style.min.css"; - hash = "sha256-WGWmCfRDewRkvBIc1We2GQdOVAoFFaO4LyIvdk61HgE="; - }; -in buildPythonPackage rec { pname = "nbconvert"; version = "7.17.1"; @@ -46,9 +38,6 @@ buildPythonPackage rec { postPatch = '' substituteAllInPlace ./nbconvert/exporters/templateexporter.py - - mkdir -p share/templates/classic/static - cp ${style-css} share/templates/classic/static/style.css ''; build-system = [ hatchling ]; From 1e4e7754c7a77161b885876e8331644c3bc0633b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Apr 2026 06:57:02 +0000 Subject: [PATCH 33/58] deno: 2.7.12 -> 2.7.13 --- pkgs/by-name/de/deno/librusty_v8.nix | 6 +++--- pkgs/by-name/de/deno/package.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/de/deno/librusty_v8.nix b/pkgs/by-name/de/deno/librusty_v8.nix index 55d1e24088f7..bb03c5ff2090 100644 --- a/pkgs/by-name/de/deno/librusty_v8.nix +++ b/pkgs/by-name/de/deno/librusty_v8.nix @@ -70,14 +70,14 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "rusty-v8"; - version = "147.1.0"; + version = "147.2.1"; src = fetchFromGitHub { owner = "denoland"; repo = "rusty_v8"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-USCQtK5pJBpU1FTLMQ/bNwJXnVNkdX/EtCWqs2kVL50="; + hash = "sha256-HompYzilJ7AC+HXfJJcvPC3L0rQfdAOhMhir/7qDXG8="; }; patches = [ @@ -97,7 +97,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ./librusty_v8-darwin-fix-__rust_no_alloc_shim_is_unstable_v2.patch ]; - cargoHash = "sha256-FKwXdms9j+izRKsm5TKJ8Ct8lvBuG/tYXfNzVsbs8cM="; + cargoHash = "sha256-2h/zATsNngMg0Tvu5oSSveQNfaVbwFbzHndmSyP4Ddo="; nativeBuildInputs = [ llvmPackages.clang diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix index 08ac8a183296..ff974d7776e3 100644 --- a/pkgs/by-name/de/deno/package.nix +++ b/pkgs/by-name/de/deno/package.nix @@ -29,17 +29,17 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "deno"; - version = "2.7.12"; + version = "2.7.13"; src = fetchFromGitHub { owner = "denoland"; repo = "deno"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; # required for tests - hash = "sha256-e1G1y9aGWhFDhsvzmLFD6VIfxU8BseWOa8bBcCC255Y="; + hash = "sha256-LGTA2xwT939GlAaKfUU3XA0Jx0h1P+8eFgPLmddHxlo="; }; - cargoHash = "sha256-YahHLz4ykAcFNrh/GFVJ0fZtCNHKG9RzdCUprQDfOUo="; + cargoHash = "sha256-CLI54HSEOC/OVnIf0FmizVrS0adfzukFFBDl+EUP7BE="; patches = [ ./patches/0002-tests-replace-hardcoded-paths.patch From eac21f049ec363cde3421886b50916822e144dd7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Apr 2026 18:10:40 +0000 Subject: [PATCH 34/58] asccli: 1.2.2 -> 1.2.5 --- pkgs/by-name/as/asccli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/as/asccli/package.nix b/pkgs/by-name/as/asccli/package.nix index 005152770738..b0d25cb42703 100644 --- a/pkgs/by-name/as/asccli/package.nix +++ b/pkgs/by-name/as/asccli/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "asccli"; - version = "1.2.2"; + version = "1.2.5"; src = fetchFromGitHub { owner = "rudrankriyam"; repo = "App-Store-Connect-CLI"; tag = "${finalAttrs.version}"; - hash = "sha256-pwfsjVaZaYLLOaIRameDIDZPlwHS6IJrgnTtZqZFwio="; + hash = "sha256-9zGLR+lXxR0ku758wmNlglgUYLXa9p/fsZ4p7a7/+E4="; }; vendorHash = "sha256-712Q7KiFQyTDjX4Srhukv3eQ84MRjnQxrpgBfqK2xa4="; From c74e89eb28bba33febfb73b3ba514581c5ba4ccb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Apr 2026 19:12:29 +0000 Subject: [PATCH 35/58] rain: 1.24.3 -> 1.24.4 --- pkgs/by-name/ra/rain/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ra/rain/package.nix b/pkgs/by-name/ra/rain/package.nix index 6dd12706f084..57b4931bd2c8 100644 --- a/pkgs/by-name/ra/rain/package.nix +++ b/pkgs/by-name/ra/rain/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "rain"; - version = "1.24.3"; + version = "1.24.4"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = "rain"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-bLFElIc4bptxnKfboBU9r1jf1K9EV8f4iPQ7+7gEj4U="; + sha256 = "sha256-akckpNDlv9TuDVkFLEhsx61GYNMrjBE2cM/mXmVtrCA="; }; - vendorHash = "sha256-uFDgNoQxEQHENWj+zks0KNjb4inBx3KunJOqe78pGR8="; + vendorHash = "sha256-bREmqt9QDuPqhfTIIY1FBfOcNqGS8JXjlMqM99tBI9g="; subPackages = [ "cmd/rain" ]; From 7ca9381dec3e5d8223baee3982cba2bfd09ac317 Mon Sep 17 00:00:00 2001 From: SystematicError Date: Mon, 20 Apr 2026 10:49:27 +0530 Subject: [PATCH 36/58] python3Packages.pyschemes: unstable-2017-11-08 -> 0-unstable-2022-09-12 --- .../python-modules/pyschemes/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/pyschemes/default.nix b/pkgs/development/python-modules/pyschemes/default.nix index 327cb078b071..35376c727510 100644 --- a/pkgs/development/python-modules/pyschemes/default.nix +++ b/pkgs/development/python-modules/pyschemes/default.nix @@ -3,29 +3,20 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, - fetchpatch, }: buildPythonPackage { pname = "pyschemes"; - version = "unstable-2017-11-08"; + version = "0-unstable-2022-09-12"; format = "setuptools"; src = fetchFromGitHub { owner = "spy16"; repo = "pyschemes"; - rev = "ca6483d13159ba65ba6fc2f77b90421c40f2bbf2"; - hash = "sha256-PssucudvlE8mztwVme70+h+2hRW/ri9oV9IZayiZhdU="; + rev = "c8afdbc045c1ff2bd7cc5a963e7084fc096f5257"; + hash = "sha256-jv6dlZlLuJlTqw2V21BUEhCIc/UGvyjbhggw82eGMz0="; }; - patches = [ - # Fix python 3.10 compatibility. Tracked upstream in - # https://github.com/spy16/pyschemes/pull/6 - (fetchpatch { - url = "https://github.com/spy16/pyschemes/commit/23011128c6c22838d4fca9e00fd322a20bb566c4.patch"; - hash = "sha256-vDaWxMrn2aC2wmd035EWRZ3cd/XME81z/BWG0f2T9jc="; - }) - ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pyschemes" ]; From 106334a081b9495e9f03b84da852046d606266c8 Mon Sep 17 00:00:00 2001 From: SystematicError Date: Thu, 23 Apr 2026 20:42:28 +0100 Subject: [PATCH 37/58] python3Packages.pyschemes: use `pyproject = true` --- pkgs/development/python-modules/pyschemes/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyschemes/default.nix b/pkgs/development/python-modules/pyschemes/default.nix index 35376c727510..6b7a90dd2640 100644 --- a/pkgs/development/python-modules/pyschemes/default.nix +++ b/pkgs/development/python-modules/pyschemes/default.nix @@ -3,12 +3,13 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, + setuptools, }: buildPythonPackage { pname = "pyschemes"; version = "0-unstable-2022-09-12"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "spy16"; @@ -17,6 +18,8 @@ buildPythonPackage { hash = "sha256-jv6dlZlLuJlTqw2V21BUEhCIc/UGvyjbhggw82eGMz0="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pyschemes" ]; From 06a0fc09b0b11b1f9497ba310030c5ccdee11e1a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Apr 2026 20:36:12 +0000 Subject: [PATCH 38/58] python3Packages.xonsh: 0.23.0 -> 0.23.1 --- pkgs/by-name/xo/xonsh/unwrapped.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xo/xonsh/unwrapped.nix b/pkgs/by-name/xo/xonsh/unwrapped.nix index 6b7ded51582d..bfbc321b1579 100644 --- a/pkgs/by-name/xo/xonsh/unwrapped.nix +++ b/pkgs/by-name/xo/xonsh/unwrapped.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pname = "xonsh"; - version = "0.23.0"; + version = "0.23.1"; pyproject = true; # PyPI package ships incomplete tests @@ -43,7 +43,7 @@ buildPythonPackage rec { owner = "xonsh"; repo = "xonsh"; tag = version; - hash = "sha256-hZMA1GMyzo2297iTrgOdRuqjqR55KughPsaL0EZWLWM="; + hash = "sha256-/vxEJPPgDdrtSHSWhJY1HjtQv7B+4gNzPQmu/tbhX0k="; }; build-system = [ From a9e1a0c81e8b1b439ef53361b0e9fc30555a2a63 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Apr 2026 22:36:11 +0000 Subject: [PATCH 39/58] goreleaser: 2.15.2 -> 2.15.4 --- pkgs/by-name/go/goreleaser/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/goreleaser/package.nix b/pkgs/by-name/go/goreleaser/package.nix index c42e60715a49..d520eaedfb4e 100644 --- a/pkgs/by-name/go/goreleaser/package.nix +++ b/pkgs/by-name/go/goreleaser/package.nix @@ -10,16 +10,16 @@ }: buildGo126Module (finalAttrs: { pname = "goreleaser"; - version = "2.15.2"; + version = "2.15.4"; src = fetchFromGitHub { owner = "goreleaser"; repo = "goreleaser"; rev = "v${finalAttrs.version}"; - hash = "sha256-oRKOgqj5TKoD+BygDNjEc4vEN88WoTLAPJVxDfjWMPs="; + hash = "sha256-KpOttfnlVB+4YHg/SHqJHjQtK7DDO2yh6WH1kQFe/tE="; }; - vendorHash = "sha256-u0xZpajnTlGi8i/LfJ9JVHOKFs2SUA6RSrR4MlRhZv4="; + vendorHash = "sha256-I4y+0yT6/SFvJbJTByHn/EPQ3rNzpUEb4/7gtF+i80o="; ldflags = [ "-s" From af819c3944488206d5bf06011e27aee626b42bf5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Apr 2026 01:34:56 +0000 Subject: [PATCH 40/58] sherpa: 3.0.3 -> 3.0.4 --- pkgs/by-name/sh/sherpa/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sh/sherpa/package.nix b/pkgs/by-name/sh/sherpa/package.nix index 95b51148c39e..f931d5437d53 100644 --- a/pkgs/by-name/sh/sherpa/package.nix +++ b/pkgs/by-name/sh/sherpa/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sherpa"; - version = "3.0.3"; + version = "3.0.4"; src = fetchFromGitLab { owner = "sherpa-team"; repo = "sherpa"; tag = "v${finalAttrs.version}"; - hash = "sha256-bh5C0BYbuAkbPrp27P0oD0yoxd53ViRtmpUKfN7kZ90="; + hash = "sha256-iXVP0XwgEpBWZ3vHq+7F9RGx6akShSizBIGkPIOw/r0="; }; postPatch = lib.optionalString (stdenv.hostPlatform.libc == "glibc") '' From cd660492a98596eb0d826908626966f9b3cac1e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Apr 2026 01:58:35 +0000 Subject: [PATCH 41/58] crossplane-cli: 2.2.0 -> 2.2.1 --- pkgs/by-name/cr/crossplane-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cr/crossplane-cli/package.nix b/pkgs/by-name/cr/crossplane-cli/package.nix index a6455d8cbedc..042fdcc588e2 100644 --- a/pkgs/by-name/cr/crossplane-cli/package.nix +++ b/pkgs/by-name/cr/crossplane-cli/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "crossplane-cli"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "crossplane"; repo = "crossplane"; rev = "v${finalAttrs.version}"; - hash = "sha256-SRqZKr/MTdfDwN5/mqWT5AcQAjNiCcbLyuTJCOcruzE="; + hash = "sha256-sQ2sCgFDGogQIIWdNCAKVkorsVuNtUOcaALqE/PGwJ4="; }; - vendorHash = "sha256-vilm41nN7Qhyu9LfVk6Me9hA3YAipLYGjhSU/JZhfEM="; + vendorHash = "sha256-DD0I4XLcN3pHhJKc5wBaldQU7gndszqCExSW4jqLMKQ="; ldflags = [ "-s" From de72fdbbc1b672f2bed639d84afc358f8ba229d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 23 Apr 2026 20:13:07 -0700 Subject: [PATCH 42/58] aider-chat: use Python 3.13 According to https://github.com/Aider-AI/aider/issues/3037 only dependencies are an obstacle to Python 3.13 support, but our Python package set fully supports Python 3.13. The AUR package also uses Arch's default Python version. --- pkgs/by-name/ai/aider-chat/package.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/by-name/ai/aider-chat/package.nix b/pkgs/by-name/ai/aider-chat/package.nix index 4384666fb541..a769e9f1b9fb 100644 --- a/pkgs/by-name/ai/aider-chat/package.nix +++ b/pkgs/by-name/ai/aider-chat/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - python312Packages, + python3Packages, fetchFromGitHub, fetchpatch, replaceVars, @@ -12,9 +12,6 @@ }: let - # dont support python 3.13 (Aider-AI/aider#3037) - python3Packages = python312Packages; - aider-nltk-data = python3Packages.nltk.dataDir (d: [ d.punkt-tab d.stopwords From cbea5bb61087dd24b1813c6a833c11e9798e78b2 Mon Sep 17 00:00:00 2001 From: Defelo Date: Thu, 23 Apr 2026 14:00:36 +0200 Subject: [PATCH 43/58] treewide: update radicle domains https://radicle.dev/2026/04/23/domain-move generated using the following nushell script: ```nu rg -l radicle | lines | do { sd -F seed.radicle.xyz seed.radicle.dev ...$in sd -F iris.radicle.xyz iris.radicle.network ...$in sd -F seed.radicle.garden iris.radicle.network ...$in sd -F rosa.radicle.xyz rosa.radicle.network ...$in sd -F ash.radicle.garden rosa.radicle.network ...$in sd -F app.radicle.xyz radicle.network ...$in sd -F docs.radicle.xyz radicle.dev ...$in sd -F radicle.xyz radicle.dev ...$in } ``` --- doc/build-helpers/fetchers.chapter.md | 6 +++--- nixos/doc/manual/release-notes/rl-2411.section.md | 2 +- nixos/doc/manual/release-notes/rl-2511.section.md | 4 ++-- .../continuous-integration/radicle/adapters/native.nix | 2 +- .../services/continuous-integration/radicle/ci-broker.nix | 2 +- nixos/modules/services/misc/radicle.nix | 4 ++-- pkgs/by-name/ra/radicle-ci-broker/package.nix | 6 +++--- pkgs/by-name/ra/radicle-desktop/package.nix | 6 +++--- pkgs/by-name/ra/radicle-explorer/package.nix | 2 +- pkgs/by-name/ra/radicle-httpd/package.nix | 6 +++--- pkgs/by-name/ra/radicle-job/package.nix | 6 +++--- pkgs/by-name/ra/radicle-native-ci/package.nix | 6 +++--- pkgs/by-name/ra/radicle-node/package.nix | 6 +++--- pkgs/by-name/ra/radicle-tui/package.nix | 6 +++--- pkgs/by-name/se/selfci/package.nix | 2 +- 15 files changed, 33 insertions(+), 33 deletions(-) diff --git a/doc/build-helpers/fetchers.chapter.md b/doc/build-helpers/fetchers.chapter.md index 9e5f553a990f..894d52c4b6b6 100644 --- a/doc/build-helpers/fetchers.chapter.md +++ b/doc/build-helpers/fetchers.chapter.md @@ -920,14 +920,14 @@ respectively. Otherwise, the fetcher uses `fetchzip`. This is used with Radicle repositories. The arguments expected are similar to `fetchgit`. -Requires a `seed` argument (e.g. `seed.radicle.xyz` or `rosa.radicle.xyz`) and a `repo` argument +Requires a `seed` argument (e.g. `seed.radicle.dev` or `rosa.radicle.network`) and a `repo` argument (the repository id *without* the `rad:` prefix). Also accepts an optional `node` argument which contains the id of the node from which to fetch the specified ref. If `node` is `null` (the default), a canonical ref is fetched instead. ```nix fetchFromRadicle { - seed = "seed.radicle.xyz"; + seed = "seed.radicle.dev"; repo = "z3gqcJUoA1n9HaHKufZs5FCSGazv5"; # heartwood tag = "releases/1.3.0"; hash = "sha256-4o88BWKGGOjCIQy7anvzbA/kPOO+ZsLMzXJhE61odjw="; @@ -942,7 +942,7 @@ contains the full revision id of the Radicle patch to fetch. ```nix fetchRadiclePatch { - seed = "rosa.radicle.xyz"; + seed = "rosa.radicle.network"; repo = "z4V1sjrXqjvFdnCUbxPFqd5p4DtH5"; # radicle-explorer revision = "d97d872386c70607beda2fb3fc2e60449e0f4ce4"; # patch: d77e064 hash = "sha256-ttnNqj0lhlSP6BGzEhhUOejKkkPruM9yMwA5p9Di4bk="; diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 4780b1cbfe10..4b3044a950b6 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -139,7 +139,7 @@ - [`pay-respects`](https://codeberg.org/iff/pay-respects), a terminal command correction program, alternative to `thefuck`, written in Rust. Available as [programs.pay-respects](options.html#opt-programs.pay-respects). -- [Radicle](https://radicle.xyz), an open source, peer-to-peer code collaboration stack built on Git. Available as [services.radicle](#opt-services.radicle.enable). +- [Radicle](https://radicle.dev), an open source, peer-to-peer code collaboration stack built on Git. Available as [services.radicle](#opt-services.radicle.enable). - [Ordinal](https://github.com/snu-sf/Ordinal), A library for ordinal numbers in the Coq proof assistant. diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index 862b3e88ae86..d84ab817d727 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -149,9 +149,9 @@ - [qBittorrent](https://www.qbittorrent.org/), a bittorrent client programmed in C++ / Qt that uses libtorrent by Arvid Norberg. Available as [services.qbittorrent](#opt-services.qbittorrent.enable). -- [radicle-ci-broker](https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:zwTxygwuz5LDGBq255RA2CbNGrz8), a tool for running CI for repositories in the local [Radicle](https://radicle.xyz/) node. Available as [services.radicle.ci.broker.enable](#opt-services.radicle.ci.broker.enable). +- [radicle-ci-broker](https://radicle.network/nodes/seed.radicle.dev/rad:zwTxygwuz5LDGBq255RA2CbNGrz8), a tool for running CI for repositories in the local [Radicle](https://radicle.dev/) node. Available as [services.radicle.ci.broker.enable](#opt-services.radicle.ci.broker.enable). -- [radicle-native-ci](https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z3qg5TKmN83afz2fj9z3fQjU8vaYE), an adapter for the [Radicle CI broker](https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:zwTxygwuz5LDGBq255RA2CbNGrz8), for performing CI runs locally. Available as [services.radicle.ci.adapters.native](#opt-services.radicle.ci.adapters.native.instances). +- [radicle-native-ci](https://radicle.network/nodes/seed.radicle.dev/rad:z3qg5TKmN83afz2fj9z3fQjU8vaYE), an adapter for the [Radicle CI broker](https://radicle.network/nodes/seed.radicle.dev/rad:zwTxygwuz5LDGBq255RA2CbNGrz8), for performing CI runs locally. Available as [services.radicle.ci.adapters.native](#opt-services.radicle.ci.adapters.native.instances). - [rauc](https://rauc.io/) (the Robust Auto-Update Controller), a daemon that allows reliable and secure software updates in embedded Linux systems. Available at [services.rauc](#opt-services.rauc.enable). diff --git a/nixos/modules/services/continuous-integration/radicle/adapters/native.nix b/nixos/modules/services/continuous-integration/radicle/adapters/native.nix index 3cbc191a96d6..24604c54c9b8 100644 --- a/nixos/modules/services/continuous-integration/radicle/adapters/native.nix +++ b/nixos/modules/services/continuous-integration/radicle/adapters/native.nix @@ -81,7 +81,7 @@ in }; description = '' Configuration of radicle-native-ci. - See for more information. + See for more information. ''; default = { }; }; diff --git a/nixos/modules/services/continuous-integration/radicle/ci-broker.nix b/nixos/modules/services/continuous-integration/radicle/ci-broker.nix index 6c285ea656f7..1c287147ae91 100644 --- a/nixos/modules/services/continuous-integration/radicle/ci-broker.nix +++ b/nixos/modules/services/continuous-integration/radicle/ci-broker.nix @@ -135,7 +135,7 @@ in }; description = '' Configuration of radicle-ci-broker. - See for more information. + See for more information. ''; default = { }; example = lib.literalExpression '' diff --git a/nixos/modules/services/misc/radicle.nix b/nixos/modules/services/misc/radicle.nix index da174a6b5331..6a1956ed526e 100644 --- a/nixos/modules/services/misc/radicle.nix +++ b/nixos/modules/services/misc/radicle.nix @@ -41,7 +41,7 @@ let pkgs.gitMinimal ]; documentation = [ - "https://docs.radicle.xyz/guides/seeder" + "https://radicle.dev/guides/seeder" ]; after = [ "network.target" @@ -225,7 +225,7 @@ in }; settings = lib.mkOption { description = '' - See + See ''; default = { }; example = lib.literalExpression '' diff --git a/pkgs/by-name/ra/radicle-ci-broker/package.nix b/pkgs/by-name/ra/radicle-ci-broker/package.nix index 54a86ae40314..f678e5af7ffb 100644 --- a/pkgs/by-name/ra/radicle-ci-broker/package.nix +++ b/pkgs/by-name/ra/radicle-ci-broker/package.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: { version = "0.27.0"; src = fetchFromRadicle { - seed = "seed.radicle.xyz"; + seed = "seed.radicle.dev"; repo = "zwTxygwuz5LDGBq255RA2CbNGrz8"; node = "z6MkgEMYod7Hxfy9qCvDv5hYHkZ4ciWmLFgfvm3Wn1b2w2FV"; tag = "v${finalAttrs.version}"; @@ -66,8 +66,8 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Radicle CI broker"; - homepage = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:zwTxygwuz5LDGBq255RA2CbNGrz8"; - changelog = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:zwTxygwuz5LDGBq255RA2CbNGrz8/tree/NEWS.md"; + homepage = "https://radicle.network/nodes/seed.radicle.dev/rad:zwTxygwuz5LDGBq255RA2CbNGrz8"; + changelog = "https://radicle.network/nodes/seed.radicle.dev/rad:zwTxygwuz5LDGBq255RA2CbNGrz8/tree/NEWS.md"; license = with lib.licenses; [ mit asl20 diff --git a/pkgs/by-name/ra/radicle-desktop/package.nix b/pkgs/by-name/ra/radicle-desktop/package.nix index 74f145b4b6e8..b2d754d44046 100644 --- a/pkgs/by-name/ra/radicle-desktop/package.nix +++ b/pkgs/by-name/ra/radicle-desktop/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: { version = "0.9.0"; src = fetchFromRadicle { - seed = "seed.radicle.xyz"; + seed = "seed.radicle.dev"; repo = "z4D5UCArafTzTQpDZNQRuqswh3ury"; tag = "releases/${finalAttrs.version}"; hash = "sha256-ruBHhJ0JvbtXd0GonL5rNp733mulVSQJsVzkikQKCK0="; @@ -125,8 +125,8 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Radicle desktop app"; - homepage = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z4D5UCArafTzTQpDZNQRuqswh3ury"; - changelog = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z4D5UCArafTzTQpDZNQRuqswh3ury/tree/CHANGELOG.md"; + homepage = "https://radicle.network/nodes/seed.radicle.dev/rad:z4D5UCArafTzTQpDZNQRuqswh3ury"; + changelog = "https://radicle.network/nodes/seed.radicle.dev/rad:z4D5UCArafTzTQpDZNQRuqswh3ury/tree/CHANGELOG.md"; license = lib.licenses.gpl3Only; platforms = lib.platforms.unix; teams = [ lib.teams.radicle ]; diff --git a/pkgs/by-name/ra/radicle-explorer/package.nix b/pkgs/by-name/ra/radicle-explorer/package.nix index f11e26d9af52..453a142bbac7 100644 --- a/pkgs/by-name/ra/radicle-explorer/package.nix +++ b/pkgs/by-name/ra/radicle-explorer/package.nix @@ -108,7 +108,7 @@ lib.fix ( server. ''; - homepage = "https://radicle.xyz"; + homepage = "https://radicle.dev"; license = lib.licenses.gpl3; teams = [ lib.teams.radicle ]; diff --git a/pkgs/by-name/ra/radicle-httpd/package.nix b/pkgs/by-name/ra/radicle-httpd/package.nix index 852e76731b55..e280782d89b3 100644 --- a/pkgs/by-name/ra/radicle-httpd/package.nix +++ b/pkgs/by-name/ra/radicle-httpd/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: { # You must update the radicle-explorer source hash when changing this. src = fetchFromRadicle { - seed = "seed.radicle.xyz"; + seed = "seed.radicle.dev"; repo = "z4V1sjrXqjvFdnCUbxPFqd5p4DtH5"; tag = "releases/${finalAttrs.version}"; sparseCheckout = [ "radicle-httpd" ]; @@ -77,8 +77,8 @@ rustPlatform.buildRustPackage (finalAttrs: { A Radicle HTTP daemon exposing a JSON HTTP API that allows someone to browse local repositories on a Radicle node via their web browser. ''; - homepage = "https://radicle.xyz"; - changelog = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z4V1sjrXqjvFdnCUbxPFqd5p4DtH5/tree/radicle-httpd/CHANGELOG.md"; + homepage = "https://radicle.dev"; + changelog = "https://radicle.network/nodes/seed.radicle.dev/rad:z4V1sjrXqjvFdnCUbxPFqd5p4DtH5/tree/radicle-httpd/CHANGELOG.md"; # cargo.toml says MIT and asl20, LICENSE file says GPL3 license = with lib.licenses; [ gpl3Only diff --git a/pkgs/by-name/ra/radicle-job/package.nix b/pkgs/by-name/ra/radicle-job/package.nix index b84a56428ee5..7df15a219455 100644 --- a/pkgs/by-name/ra/radicle-job/package.nix +++ b/pkgs/by-name/ra/radicle-job/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: { version = "0.5.2"; src = fetchFromRadicle { - seed = "seed.radicle.xyz"; + seed = "seed.radicle.dev"; repo = "z2UcCU1LgMshWvXj6hXSDDrwB8q8M"; tag = "releases/v${finalAttrs.version}"; hash = "sha256-kFlSig0eiUdw6GHwacNHtuGkuW14CkHkc3okN2ZeTns="; @@ -32,8 +32,8 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Create, update, and query Radicle Job Collaborative Objects"; - homepage = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z2UcCU1LgMshWvXj6hXSDDrwB8q8M"; - changelog = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z2UcCU1LgMshWvXj6hXSDDrwB8q8M/tree/CHANGELOG.md"; + homepage = "https://radicle.network/nodes/seed.radicle.dev/rad:z2UcCU1LgMshWvXj6hXSDDrwB8q8M"; + changelog = "https://radicle.network/nodes/seed.radicle.dev/rad:z2UcCU1LgMshWvXj6hXSDDrwB8q8M/tree/CHANGELOG.md"; license = with lib.licenses; [ mit asl20 diff --git a/pkgs/by-name/ra/radicle-native-ci/package.nix b/pkgs/by-name/ra/radicle-native-ci/package.nix index 21d2f3b76f4f..70e6a05d22a9 100644 --- a/pkgs/by-name/ra/radicle-native-ci/package.nix +++ b/pkgs/by-name/ra/radicle-native-ci/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage (finalAttrs: { version = "0.14.0"; src = fetchFromRadicle { - seed = "seed.radicle.xyz"; + seed = "seed.radicle.dev"; repo = "z3qg5TKmN83afz2fj9z3fQjU8vaYE"; node = "z6MkgEMYod7Hxfy9qCvDv5hYHkZ4ciWmLFgfvm3Wn1b2w2FV"; tag = "v${finalAttrs.version}"; @@ -40,8 +40,8 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Radicle CI adapter for native CI"; - homepage = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z3qg5TKmN83afz2fj9z3fQjU8vaYE"; - changelog = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z3qg5TKmN83afz2fj9z3fQjU8vaYE/tree/NEWS.md"; + homepage = "https://radicle.network/nodes/seed.radicle.dev/rad:z3qg5TKmN83afz2fj9z3fQjU8vaYE"; + changelog = "https://radicle.network/nodes/seed.radicle.dev/rad:z3qg5TKmN83afz2fj9z3fQjU8vaYE/tree/NEWS.md"; license = with lib.licenses; [ mit asl20 diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix index 023e7fbea83e..0a149e8c4023 100644 --- a/pkgs/by-name/ra/radicle-node/package.nix +++ b/pkgs/by-name/ra/radicle-node/package.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "radicle-node"; src = fetchFromRadicle { - seed = "seed.radicle.xyz"; + seed = "seed.radicle.dev"; repo = "z3gqcJUoA1n9HaHKufZs5FCSGazv5"; tag = "releases/${finalAttrs.version}"; hash = srcHash; @@ -164,8 +164,8 @@ rustPlatform.buildRustPackage (finalAttrs: { Unlike centralized code hosting platforms, there is no single entity controlling the network. Repositories are replicated across peers in a decentralized manner, and users are in full control of their data and workflow. ''; - homepage = "https://radicle.xyz"; - changelog = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5/tree/CHANGELOG.md"; + homepage = "https://radicle.dev"; + changelog = "https://radicle.network/nodes/seed.radicle.dev/rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5/tree/CHANGELOG.md"; license = with lib.licenses; [ asl20 mit diff --git a/pkgs/by-name/ra/radicle-tui/package.nix b/pkgs/by-name/ra/radicle-tui/package.nix index 1e2d3564d3e1..ba24f457a295 100644 --- a/pkgs/by-name/ra/radicle-tui/package.nix +++ b/pkgs/by-name/ra/radicle-tui/package.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage (finalAttrs: { version = "0.7.0"; src = fetchFromRadicle { - seed = "seed.radicle.xyz"; + seed = "seed.radicle.dev"; repo = "z39mP9rQAaGmERfUMPULfPUi473tY"; tag = "releases/${finalAttrs.version}"; hash = "sha256-2/pLlhilJyrZl9eLFWIh4YxlJwBbzjmb1Cg1xFSSl5k="; @@ -66,8 +66,8 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Radicle terminal user interface"; - homepage = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z39mP9rQAaGmERfUMPULfPUi473tY"; - changelog = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z39mP9rQAaGmERfUMPULfPUi473tY/tree/CHANGELOG.md"; + homepage = "https://radicle.network/nodes/seed.radicle.dev/rad:z39mP9rQAaGmERfUMPULfPUi473tY"; + changelog = "https://radicle.network/nodes/seed.radicle.dev/rad:z39mP9rQAaGmERfUMPULfPUi473tY/tree/CHANGELOG.md"; license = with lib.licenses; [ asl20 # or mit diff --git a/pkgs/by-name/se/selfci/package.nix b/pkgs/by-name/se/selfci/package.nix index a5c4f3d33b83..05a17777fded 100644 --- a/pkgs/by-name/se/selfci/package.nix +++ b/pkgs/by-name/se/selfci/package.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Minimalistic local-first Unix-philosophy-abiding CI"; - homepage = "https://app.radicle.xyz/nodes/radicle.dpc.pw/rad%3Az2tDzYbAXxTQEKTGFVwiJPajkbeDU"; + homepage = "https://radicle.network/nodes/radicle.dpc.pw/rad%3Az2tDzYbAXxTQEKTGFVwiJPajkbeDU"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ dvn0 From 6b8ae4458e74de5edbd103647a103dc6037b08ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Apr 2026 09:27:17 +0000 Subject: [PATCH 44/58] gh-stack: 0.0.1 -> 0.0.2 --- pkgs/by-name/gh/gh-stack/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gh/gh-stack/package.nix b/pkgs/by-name/gh/gh-stack/package.nix index 88ff0cc5a838..255b77891d5b 100644 --- a/pkgs/by-name/gh/gh-stack/package.nix +++ b/pkgs/by-name/gh/gh-stack/package.nix @@ -8,7 +8,7 @@ buildGoModule (finalAttrs: { pname = "gh-stack"; - version = "0.0.1"; + version = "0.0.2"; __structuredAttrs = true; @@ -16,7 +16,7 @@ buildGoModule (finalAttrs: { owner = "github"; repo = "gh-stack"; tag = "v${finalAttrs.version}"; - hash = "sha256-om7ekHez08X1YjP0W+3p0PxmjU/za6+/gHX5GPakKAw="; + hash = "sha256-2mtQKrUvYkRQbxSaTCPt05Ld5jzdSrjckEiJlxalIUI="; }; vendorHash = "sha256-s85Lz6yfY1TiIFPolU1qESDyw8XoBORyuOMdiHj6Grc="; From a246074a85cd532b56804ffc46de7d4ad1bf9d8d Mon Sep 17 00:00:00 2001 From: secufoe <135814375+secufoe@users.noreply.github.com> Date: Fri, 24 Apr 2026 12:07:15 +0200 Subject: [PATCH 45/58] mstflint: fix cross shebangs --- pkgs/by-name/ms/mstflint/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ms/mstflint/package.nix b/pkgs/by-name/ms/mstflint/package.nix index 50dbc53f75b3..bcf9509948c3 100644 --- a/pkgs/by-name/ms/mstflint/package.nix +++ b/pkgs/by-name/ms/mstflint/package.nix @@ -7,6 +7,7 @@ zlib, xz, expat, + bashNonInteractive, boost, curl, pkg-config, @@ -51,6 +52,7 @@ stdenv.mkDerivation (finalAttrs: { openssl ] ++ lib.optionals (!onlyFirmwareUpdater) [ + bashNonInteractive boost curl expat From 145e75524241665b8a883bf8e7f6022493f02a85 Mon Sep 17 00:00:00 2001 From: pancho horrillo Date: Fri, 24 Apr 2026 13:07:04 +0200 Subject: [PATCH 46/58] =?UTF-8?q?emacs:=20remove=20native-comp-=E2=80=A6.p?= =?UTF-8?q?atch=20from=20Emacs<30?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Emacs 29 has been removed from Nixpkgs. This is a small cleanup. Sadly, the formatter had a field day with the edit, so the diff looks bigger than it is. --- .../applications/editors/emacs/make-emacs.nix | 52 ++++++++----------- .../emacs/native-comp-driver-options.patch | 19 ------- 2 files changed, 22 insertions(+), 49 deletions(-) delete mode 100644 pkgs/applications/editors/emacs/native-comp-driver-options.patch diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index 48474bc4b7cd..583ff9eb5f3b 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -166,37 +166,29 @@ stdenv.mkDerivation (finalAttrs: { patches = patches fetchpatch ++ lib.optionals withNativeCompilation [ - (replaceVars - ( - if lib.versionOlder finalAttrs.version "30" then - ./native-comp-driver-options.patch - else - ./native-comp-driver-options-30.patch - ) - { - backendPath = ( - lib.concatStringsSep " " ( - map (x: ''"-B${x}"'') ( - [ - # Paths necessary so the JIT compiler finds its libraries: - "${lib.getLib libgccjit}/lib" - ] - ++ libGccJitLibraryPaths - ++ [ - # Executable paths necessary for compilation (ld, as): - "${lib.getBin stdenv.cc.cc}/bin" - "${lib.getBin stdenv.cc.bintools}/bin" - "${lib.getBin stdenv.cc.bintools.bintools}/bin" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # The linker needs to know where to find libSystem on Darwin. - "${apple-sdk.sdkroot}/usr/lib" - ] - ) + (replaceVars ./native-comp-driver-options-30.patch { + backendPath = ( + lib.concatStringsSep " " ( + map (x: ''"-B${x}"'') ( + [ + # Paths necessary so the JIT compiler finds its libraries: + "${lib.getLib libgccjit}/lib" + ] + ++ libGccJitLibraryPaths + ++ [ + # Executable paths necessary for compilation (ld, as): + "${lib.getBin stdenv.cc.cc}/bin" + "${lib.getBin stdenv.cc.bintools}/bin" + "${lib.getBin stdenv.cc.bintools.bintools}/bin" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # The linker needs to know where to find libSystem on Darwin. + "${apple-sdk.sdkroot}/usr/lib" + ] ) - ); - } - ) + ) + ); + }) ]; postPatch = lib.concatStringsSep "\n" [ diff --git a/pkgs/applications/editors/emacs/native-comp-driver-options.patch b/pkgs/applications/editors/emacs/native-comp-driver-options.patch deleted file mode 100644 index 58eee35aed0a..000000000000 --- a/pkgs/applications/editors/emacs/native-comp-driver-options.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el -index 2c9b79334b..50c6b5ac85 100644 ---- a/lisp/emacs-lisp/comp.el -+++ b/lisp/emacs-lisp/comp.el -@@ -178,8 +178,9 @@ native-comp-compiler-options - :type '(repeat string) - :version "28.1") - --(defcustom native-comp-driver-options (when (eq system-type 'darwin) -- '("-Wl,-w")) -+(defcustom native-comp-driver-options (append (when (eq system-type 'darwin) -+ '("-Wl,-w")) -+ '(@backendPath@)) - "Options passed verbatim to the native compiler's back-end driver. - Note that not all options are meaningful; typically only the options - affecting the assembler and linker are likely to be useful. --- -2.37.3 - From c552f3dd37a552a273af78a7309356dbbf6d34f5 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 23 Apr 2026 23:35:40 -0500 Subject: [PATCH 47/58] neovim: handle plugins without pname --- pkgs/applications/editors/neovim/tests/default.nix | 13 +++++++++++++ .../editors/vim/plugins/utils/vim-utils.nix | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix index e4c429c759c2..c7d3bbb29d06 100644 --- a/pkgs/applications/editors/neovim/tests/default.nix +++ b/pkgs/applications/editors/neovim/tests/default.nix @@ -247,6 +247,15 @@ pkgs.lib.recurseIntoAttrs rec { }; }; + nvim_with_no_pname_plugin = neovim.override { + extraName = "-with-no-pname-plugin"; + configure.packages.plugins = { + start = [ + vimPlugins.corePlugins + ]; + }; + }; + # regression test that ftplugin files from plugins are loaded before the ftplugin # files from $VIMRUNTIME run_nvim_with_ftplugin = runTest nvim_with_ftplugin '' @@ -260,6 +269,10 @@ pkgs.lib.recurseIntoAttrs rec { [ "$result" = 0 ] ''; + run_nvim_with_no_pname_plugin = runTest nvim_with_no_pname_plugin '' + ${nvim_with_no_pname_plugin}/bin/nvim -i NONE -e --headless +quit + ''; + # Generate a neovim wrapper with only a init.lua and no init.vim file nvim_with_only_init_lua = wrapNeovim2 "-only-lua-init-file" { luaRcContent = "-- some text"; diff --git a/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix b/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix index ccc1f058105e..5f0290699007 100644 --- a/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix +++ b/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix @@ -218,7 +218,7 @@ let paths = allGrammars; }; - allAndOptPluginNames = map (plugin: plugin.pname) (allPlugins ++ opt); + allAndOptPluginNames = map (plugin: plugin.pname or null) (allPlugins ++ opt); packdirStart = vimFarm "pack/${packageName}/start" "packdir-start" ( if allGrammars != [ ] then allPlugins ++ [ allGrammarsSymlinked ] else allPlugins From c126268cb458f052d59a68d69dec30199823e573 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Apr 2026 13:20:22 +0000 Subject: [PATCH 48/58] gitoxide: 0.52.0 -> 0.52.1 --- pkgs/by-name/gi/gitoxide/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/gitoxide/package.nix b/pkgs/by-name/gi/gitoxide/package.nix index c92640cb6bcd..3ad33e30d2da 100644 --- a/pkgs/by-name/gi/gitoxide/package.nix +++ b/pkgs/by-name/gi/gitoxide/package.nix @@ -18,16 +18,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "gitoxide"; - version = "0.52.0"; + version = "0.52.1"; src = fetchFromGitHub { owner = "GitoxideLabs"; repo = "gitoxide"; tag = "v${finalAttrs.version}"; - hash = "sha256-nOpe+w0ILxS2f7EdDo1gg31eaESobKHdQ1F4pzpxsfE="; + hash = "sha256-PcRX5k4rqi61VnEpbKR2avChLBhPNSEsUjvul2myWOY="; }; - cargoHash = "sha256-z/aytFu8b23cVsZuIBcjbNUhsvoWi5saQKVgrCEq5+s="; + cargoHash = "sha256-zeT+2gIJbRqVtAiulccRoczd+xdYBkcWWYzbk/bRtXA="; nativeBuildInputs = [ cmake From 764d52d7bfa67371d9fb672de4b0e7731a676b27 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Apr 2026 13:48:34 +0000 Subject: [PATCH 49/58] packer: 1.15.1 -> 1.15.2 --- pkgs/by-name/pa/packer/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pa/packer/package.nix b/pkgs/by-name/pa/packer/package.nix index 556ea1dec537..c7ef7c664a5a 100644 --- a/pkgs/by-name/pa/packer/package.nix +++ b/pkgs/by-name/pa/packer/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "packer"; - version = "1.15.1"; + version = "1.15.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - hash = "sha256-16nHjD2begkWnqy4g2pN8IX//BxRd9DA/TJ6sgKJi5M="; + hash = "sha256-rTmAc/wWy+soFSGYKjySvcip7L2Gw6oKqYUBgyH12xs="; }; - vendorHash = "sha256-GOEdKMu41QjSl5iR07rXetq4YIdJ/Bf0zD32D5yayxc="; + vendorHash = "sha256-9aba6LnTjVmY3UgF9YyI9GoleCglTCU83QmHNPI3T2U="; subPackages = [ "." ]; From fb775f847740ad00cec02cc182cb18e999772a11 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Apr 2026 13:50:56 +0000 Subject: [PATCH 50/58] nixbit: 0.8.1 -> 0.9.0 --- pkgs/by-name/ni/nixbit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nixbit/package.nix b/pkgs/by-name/ni/nixbit/package.nix index ba6f519e66dc..d3a8517f7c2b 100644 --- a/pkgs/by-name/ni/nixbit/package.nix +++ b/pkgs/by-name/ni/nixbit/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nixbit"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "pbek"; repo = "nixbit"; tag = "v${finalAttrs.version}"; - hash = "sha256-jSvYqTBsFWZqk/v7Y+ONfPDJekxRFi1tIt1UIGdRcEs="; + hash = "sha256-7SM6GvNqg7vdoYjE7bpWrIQwyBrpOaez8IQeDDGw/qA="; }; nativeBuildInputs = [ From 5ca89189e88b45e022c94e44541923d5e8027d3c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Apr 2026 13:56:03 +0000 Subject: [PATCH 51/58] qmapshack: 1.20.1 -> 1.20.2 --- pkgs/by-name/qm/qmapshack/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qm/qmapshack/package.nix b/pkgs/by-name/qm/qmapshack/package.nix index fffb03b4044f..21c2213a1e9a 100644 --- a/pkgs/by-name/qm/qmapshack/package.nix +++ b/pkgs/by-name/qm/qmapshack/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qmapshack"; - version = "1.20.1"; + version = "1.20.2"; src = fetchFromGitHub { owner = "Maproom"; repo = "qmapshack"; tag = "V_${finalAttrs.version}"; - hash = "sha256-NqyouJGagVvyJGGetF8csA1byATaigBtGJIt5U3in+0="; + hash = "sha256-WLuD1qm1KoM5LtvanUrhV4ZsdvnXkanQVLT0p/fzRXg="; }; nativeBuildInputs = [ From d7b8a637773ad15ecfeca35cccf8325ab4f2a5dc Mon Sep 17 00:00:00 2001 From: Cheng Shao Date: Fri, 24 Apr 2026 16:16:39 +0200 Subject: [PATCH 52/58] Revert "promptfoo: fix build with nodejs_24" This reverts commit 324aa4ea21ca6d3bcbb7a421ad6e9250e9c9fe64. promptfoo now builds fine with nodejs_24. --- pkgs/by-name/pr/promptfoo/package.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/by-name/pr/promptfoo/package.nix b/pkgs/by-name/pr/promptfoo/package.nix index e59916cc03e5..d8e0ef7e37fa 100644 --- a/pkgs/by-name/pr/promptfoo/package.nix +++ b/pkgs/by-name/pr/promptfoo/package.nix @@ -1,6 +1,5 @@ { buildNpmPackage, - nodejs_22, fetchFromGitHub, lib, }: @@ -18,9 +17,6 @@ buildNpmPackage (finalAttrs: { npmDepsHash = "sha256-mpe00J5iRwaH7hJIDP3fDuJSUOKk01COpOOvF1YJMyg="; - # https://github.com/NixOS/nixpkgs/issues/474535 - nodejs = nodejs_22; - # don't fetch playwright binary env.PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "1"; From 669aba2da10a950455ca87d464f70a9325359cb6 Mon Sep 17 00:00:00 2001 From: Cheng Shao Date: Fri, 24 Apr 2026 16:17:54 +0200 Subject: [PATCH 53/58] Revert "sillytavern: fix build by pinning nodejs to v22" This reverts commit e29bd3cd9a719f4904fc475c2d982b5677d5885f. sillytavern now builds fine with nodejs_24. --- pkgs/by-name/si/sillytavern/package.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/by-name/si/sillytavern/package.nix b/pkgs/by-name/si/sillytavern/package.nix index 37d9e809db22..b2ddfa6af0ff 100644 --- a/pkgs/by-name/si/sillytavern/package.nix +++ b/pkgs/by-name/si/sillytavern/package.nix @@ -1,7 +1,6 @@ { buildNpmPackage, fetchFromGitHub, - nodejs_22, lib, }: buildNpmPackage (finalAttrs: { @@ -18,9 +17,6 @@ buildNpmPackage (finalAttrs: { dontNpmBuild = true; - # https://github.com/NixOS/nixpkgs/issues/474535 - nodejs = nodejs_22; - # These dirs are not installed automatically. # And if they were not in place, the app would try to create them at runtime, which is of course impossible to achieve. postInstall = '' From d2f8ddcb569044eeeabaf144981d07f09087f7c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Apr 2026 14:29:52 +0000 Subject: [PATCH 54/58] topgrade: 17.3.0 -> 17.4.0 --- pkgs/by-name/to/topgrade/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/to/topgrade/package.nix b/pkgs/by-name/to/topgrade/package.nix index db1378941d7c..14e68c0b26a1 100644 --- a/pkgs/by-name/to/topgrade/package.nix +++ b/pkgs/by-name/to/topgrade/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "topgrade"; - version = "17.3.0"; + version = "17.4.0"; src = fetchFromGitHub { owner = "topgrade-rs"; repo = "topgrade"; tag = "v${finalAttrs.version}"; - hash = "sha256-iMIXmGim/wolgUspVwnIy3hqv3RsxB3zL2t83SOe6uw="; + hash = "sha256-3nCt3Kmnd+ogzIkvb9pSwm99hBj/Ab0AMvg+6lUx7mc="; }; - cargoHash = "sha256-sgLbYuLNiAGMIBGrciKxYvvNepGIb0/z9/rRSJkYUdU="; + cargoHash = "sha256-VkAzAi3Ok2GZlpF4AVMzuYYU86WQeB9k/KaI1YvSgWw="; nativeBuildInputs = [ installShellFiles From 9e6862eadcd4cd330e66fc0d28e3cbb6151dbe97 Mon Sep 17 00:00:00 2001 From: Sandro Date: Fri, 24 Apr 2026 16:33:29 +0200 Subject: [PATCH 55/58] gh-cherry-pick: drop duplicated pytest --- pkgs/by-name/gh/gh-cherry-pick/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/gh/gh-cherry-pick/package.nix b/pkgs/by-name/gh/gh-cherry-pick/package.nix index 3067b42553fa..81935101e75c 100644 --- a/pkgs/by-name/gh/gh-cherry-pick/package.nix +++ b/pkgs/by-name/gh/gh-cherry-pick/package.nix @@ -27,7 +27,6 @@ python3Packages.buildPythonApplication (finalAttrs: { nativeCheckInputs = with python3Packages; [ pytestCheckHook - pytest pytest-cov-stub pytest-mock ]; From 17388102f5ad3f24121d530cefb396ffdcc51e96 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Apr 2026 14:49:37 +0000 Subject: [PATCH 56/58] esp-generate: 1.2.0 -> 1.3.0 --- pkgs/by-name/es/esp-generate/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/es/esp-generate/package.nix b/pkgs/by-name/es/esp-generate/package.nix index 6744a8d4ff86..717071741339 100644 --- a/pkgs/by-name/es/esp-generate/package.nix +++ b/pkgs/by-name/es/esp-generate/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "esp-generate"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "esp-rs"; repo = "esp-generate"; rev = "v${finalAttrs.version}"; - hash = "sha256-JNSz/HRO8qxVaRZLL4qgYF3BIYVkrzyRc3wAWd+dAMo="; + hash = "sha256-aD+FID/YRTsJ0PY5CLpwO0NDg2izNiWEPGKVbKdFy+8="; }; - cargoHash = "sha256-IZH6y7KXdrNO4mxkRPaWi79XQnlrxxaQNG2nahJ8TzY="; + cargoHash = "sha256-I3Yr81Txxp+gnBsP2OY1MWfYZo6O3Okg2YFUfhK8IJo="; meta = { description = "Template generation tool to create no_std applications targeting Espressif's chips"; From 9178d2ab4a5782c487040846f95a51c9a1433385 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Fri, 16 Jan 2026 16:21:31 +0100 Subject: [PATCH 57/58] gh-review-conductor: init at 1.3.0 --- .../gh/gh-review-conductor/package.nix | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 pkgs/by-name/gh/gh-review-conductor/package.nix diff --git a/pkgs/by-name/gh/gh-review-conductor/package.nix b/pkgs/by-name/gh/gh-review-conductor/package.nix new file mode 100644 index 000000000000..2efaa6c77a0d --- /dev/null +++ b/pkgs/by-name/gh/gh-review-conductor/package.nix @@ -0,0 +1,45 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "gh-review-conductor"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "gh-tui-tools"; + repo = "gh-review-conductor"; + tag = "v${finalAttrs.version}"; + hash = "sha256-gNQmO+Sa9n+hfy5CBSPqSXhHTzZz8D1sLrNqs+z9Rx4="; + }; + + vendorHash = "sha256-xAOTSdyNRZDKDPnCrvaepBOTDrnHLEA53K5TBxkqbDM="; + + ldflags = [ + "-s" + "-w" + "-X github.com/gh-tui-tools/gh-review-conductor/cmd.version=${finalAttrs.version}" + ]; + + # Tests require GitHub authentication and network access + doCheck = false; + + __structuredAttrs = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "GitHub CLI extension to apply PR review comments and suggestions directly to your local code"; + homepage = "https://github.com/gh-tui-tools/gh-review-conductor"; + changelog = "https://github.com/gh-tui-tools/gh-review-conductor/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + vdemeester + chmouel + ]; + mainProgram = "gh-prreview"; + }; +}) From 31ee0ef9843e636f27abfc2560c8b6f97f99860d Mon Sep 17 00:00:00 2001 From: Sandro Date: Fri, 24 Apr 2026 18:01:08 +0200 Subject: [PATCH 58/58] nixos/openrazer: remove extra new lines from defaultText --- nixos/modules/hardware/openrazer.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/modules/hardware/openrazer.nix b/nixos/modules/hardware/openrazer.nix index 6eb174db93f3..88c23a527e0e 100644 --- a/nixos/modules/hardware/openrazer.nix +++ b/nixos/modules/hardware/openrazer.nix @@ -137,9 +137,7 @@ in packages = { kernel = lib.mkPackageOption pkgs "openrazer kernel" { } // { default = config.boot.kernelPackages.openrazer; - defaultText = lib.literalExpression '' - config.boot.kernelPackages.openrazer - ''; + defaultText = lib.literalExpression "config.boot.kernelPackages.openrazer"; }; daemon = lib.mkPackageOption pkgs [ "python3Packages" "openrazer-daemon" ] { }; };