From 634ceb1fbc230ea1561a617bce5e4251f0a8fdf1 Mon Sep 17 00:00:00 2001 From: nix Date: Mon, 16 Oct 2023 20:33:04 -0400 Subject: [PATCH 001/338] rosie: 1.3.0 -> 1.4.0 https://gitlab.com/rosie-pattern-language/rosie/-/blob/master/CHANGELOG --- pkgs/tools/text/rosie/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/text/rosie/default.nix b/pkgs/tools/text/rosie/default.nix index 190fd4944d15..9b6cdef575fd 100644 --- a/pkgs/tools/text/rosie/default.nix +++ b/pkgs/tools/text/rosie/default.nix @@ -3,16 +3,16 @@ , fetchgit , libbsd , readline +, }: - stdenv.mkDerivation rec { pname = "rosie"; - version = "1.3.0"; + version = "1.4.0"; src = fetchgit { url = "https://gitlab.com/rosie-pattern-language/rosie"; - rev = "9303e04ae2cffabdda6ccc4e2a351a47218615ff"; - sha256 = "1smh760baf43hr56p6rh4khz3shyzda5lqva4ffxwchl7yy7r82j"; + rev = "79605830e32dff33544f9ebe7d7be752c29424b5"; + sha256 = "sha256-n7Tem/4ZjizfCPT21teYK2wZ/gVpgjHUim9s7soEwbM="; fetchSubmodules = true; }; From 8b3833de283d71ac31d820ae07823ae7cc8e1bde Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 18 Jul 2024 15:38:53 +0200 Subject: [PATCH 002/338] paru: init at 2.0.3 --- pkgs/by-name/pa/paru/Cargo.lock | 2593 ++++++++++++++++++++++++++++++ pkgs/by-name/pa/paru/package.nix | 80 + 2 files changed, 2673 insertions(+) create mode 100644 pkgs/by-name/pa/paru/Cargo.lock create mode 100644 pkgs/by-name/pa/paru/package.nix diff --git a/pkgs/by-name/pa/paru/Cargo.lock b/pkgs/by-name/pa/paru/Cargo.lock new file mode 100644 index 000000000000..21d35fc90c51 --- /dev/null +++ b/pkgs/by-name/pa/paru/Cargo.lock @@ -0,0 +1,2593 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "getrandom", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "alpm" +version = "3.0.4" +source = "git+https://github.com/archlinux/alpm.rs?rev=306342#306342efc6f24739c92de64c432f962a22891e63" +dependencies = [ + "alpm-sys", + "bitflags 2.4.2", +] + +[[package]] +name = "alpm-sys" +version = "3.0.0" +source = "git+https://github.com/archlinux/alpm.rs?rev=306342#306342efc6f24739c92de64c432f962a22891e63" +dependencies = [ + "bindgen", + "pkg-config", +] + +[[package]] +name = "alpm-utils" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1a65e48b9a950d1297b865a436733d496b6cdd966133a02fdadc6127dfe37e7" +dependencies = [ + "alpm", + "pacmanconf", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "ansi_term" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi", +] + +[[package]] +name = "anstream" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" + +[[package]] +name = "anstyle-parse" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "anyhow" +version = "1.0.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" +dependencies = [ + "backtrace", +] + +[[package]] +name = "async-compression" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a116f46a969224200a0a97f29cfd4c50e7534e4b4826bd23ea2c3c533039c82c" +dependencies = [ + "flate2", + "futures-core", + "memchr", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "async-trait" +version = "0.1.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "aur-depends" +version = "3.0.0" +source = "git+https://github.com/Morganamilo/aur-depends?rev=30c2c1#30c2c15019f8dd80e803c9deefce3279079806af" +dependencies = [ + "alpm", + "alpm-utils", + "bitflags 2.4.2", + "log", + "raur", + "srcinfo", +] + +[[package]] +name = "aur-fetch" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3a34f46003cfac97808c0200c3338152275029ffc59e296611eef27de61074e" +dependencies = [ + "crossbeam", + "log", + "url", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "bindgen" +version = "0.66.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7" +dependencies = [ + "bitflags 2.4.2", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "peeking_take_while", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.52", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "bstr" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "bumpalo" +version = "3.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "cc" +version = "1.0.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "chrono" +version = "0.4.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "num-traits", + "windows-targets 0.52.4", +] + +[[package]] +name = "cini" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8628d1f5b9a7b1196ce1aa660e3ba7e2559d350649cbe94993519c127df667f2" + +[[package]] +name = "clang-sys" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "console" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "unicode-width", + "windows-sys 0.52.0", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "crc32fast" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" + +[[package]] +name = "cssparser" +version = "0.31.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b3df4f93e5fbbe73ec01ec8d3f68bba73107993a5b1e7519273c32db9b0d5be" +dependencies = [ + "cssparser-macros", + "dtoa-short", + "itoa", + "phf 0.11.2", + "smallvec", +] + +[[package]] +name = "cssparser-macros" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" +dependencies = [ + "quote", + "syn 2.0.52", +] + +[[package]] +name = "derive_more" +version = "0.99.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "dtoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" + +[[package]] +name = "dtoa-short" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbaceec3c6e4211c79e7b1800fb9680527106beb2f9c51904a3210c03a448c74" +dependencies = [ + "dtoa", +] + +[[package]] +name = "ego-tree" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a68a4904193147e0a8dec3314640e6db742afd5f6e634f428a6af230d9b3591" + +[[package]] +name = "either" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "encoding_rs" +version = "0.8.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "env_filter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +dependencies = [ + "log", + "regex", +] + +[[package]] +name = "env_logger" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "humantime", + "log", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "flate2" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futf" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" +dependencies = [ + "mac", + "new_debug_unreachable", +] + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + +[[package]] +name = "getopts" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "getrandom" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gettext-rs" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364" +dependencies = [ + "gettext-sys", + "locale_config", +] + +[[package]] +name = "gettext-sys" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d" +dependencies = [ + "cc", + "temp-dir", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "globset" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +dependencies = [ + "aho-corasick", + "bstr", + "log", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "h2" +version = "0.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "html5ever" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" +dependencies = [ + "log", + "mac", + "markup5ever", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "htmlescape" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9025058dae765dee5070ec375f591e2ba14638c63feff74f13805a72e523163" + +[[package]] +name = "http" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyper" +version = "0.14.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "2.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "indicatif" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" +dependencies = [ + "console", + "instant", + "number_prefix", + "portable-atomic", + "unicode-width", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "itoa" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" + +[[package]] +name = "js-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "libc" +version = "0.2.153" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" + +[[package]] +name = "libloading" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +dependencies = [ + "cfg-if", + "windows-targets 0.52.4", +] + +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.2", + "libc", + "redox_syscall", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + +[[package]] +name = "locale_config" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" +dependencies = [ + "lazy_static", + "objc", + "objc-foundation", + "regex", + "winapi", +] + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + +[[package]] +name = "mac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "markup5ever" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" +dependencies = [ + "log", + "phf 0.10.1", + "phf_codegen", + "string_cache", + "string_cache_codegen", + "tendril", +] + +[[package]] +name = "memchr" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +dependencies = [ + "libc", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "native-tls" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "new_debug_unreachable" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" + +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags 2.4.2", + "cfg-if", + "cfg_aliases", + "libc", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "num-traits" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "openssl" +version = "0.10.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +dependencies = [ + "bitflags 2.4.2", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.101" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "pacmanconf" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31d9811f947c6ffc56eeafb789dfad44a7ea7cc383ac3bc6c9b23cd27100bbb1" +dependencies = [ + "cini", +] + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "paru" +version = "2.0.3" +dependencies = [ + "alpm", + "alpm-utils", + "ansi_term", + "anyhow", + "async-trait", + "aur-depends", + "aur-fetch", + "bitflags 2.4.2", + "chrono", + "cini", + "dirs", + "env_logger", + "futures", + "globset", + "htmlescape", + "indicatif", + "log", + "nix", + "once_cell", + "pacmanconf", + "raur", + "regex", + "reqwest", + "rss", + "scraper", + "serde", + "serde_json", + "signal-hook", + "smart-default", + "srcinfo", + "tempfile", + "terminal_size", + "tokio", + "toml", + "tr", + "unicode-width", + "url", +] + +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "phf" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" +dependencies = [ + "phf_shared 0.10.0", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros", + "phf_shared 0.11.2", +] + +[[package]] +name = "phf_codegen" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", +] + +[[package]] +name = "phf_generator" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +dependencies = [ + "phf_shared 0.10.0", + "rand", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared 0.11.2", + "rand", +] + +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator 0.11.2", + "phf_shared 0.11.2", + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "portable-atomic" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "precomputed-hash" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + +[[package]] +name = "proc-macro2" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quick-xml" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +dependencies = [ + "encoding_rs", + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "raur" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dafb3f375eedbb68b8c57a79cb220171ad1b716196fa35d4ab059f5fda21cc17" +dependencies = [ + "async-trait", + "reqwest", + "serde", + "serde_derive", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_users" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +dependencies = [ + "getrandom", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "reqwest" +version = "0.11.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78bf93c4af7a8bb7d879d51cebe797356ff10ae8516ace542b5182d9dcac10b2" +dependencies = [ + "async-compression", + "base64", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "system-configuration", + "tokio", + "tokio-native-tls", + "tokio-socks", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg", +] + +[[package]] +name = "rss" +version = "2.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7b2c77eb4450d7d5f98df52c381cd6c4e19b75dad9209a9530b85a44510219a" +dependencies = [ + "quick-xml", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustix" +version = "0.38.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +dependencies = [ + "bitflags 2.4.2", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64", +] + +[[package]] +name = "ryu" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" + +[[package]] +name = "schannel" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "scraper" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b80b33679ff7a0ea53d37f3b39de77ea0c75b12c5805ac43ec0c33b3051af1b" +dependencies = [ + "ahash", + "cssparser", + "ego-tree", + "getopts", + "html5ever", + "once_cell", + "selectors", + "tendril", +] + +[[package]] +name = "security-framework" +version = "2.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "selectors" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4eb30575f3638fc8f6815f448d50cb1a2e255b0897985c8c59f4d37b72a07b06" +dependencies = [ + "bitflags 2.4.2", + "cssparser", + "derive_more", + "fxhash", + "log", + "new_debug_unreachable", + "phf 0.10.1", + "phf_codegen", + "precomputed-hash", + "servo_arc", + "smallvec", +] + +[[package]] +name = "serde" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "serde_json" +version = "1.0.114" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "servo_arc" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d036d71a959e00c77a63538b90a6c2390969f9772b096ea837205c6bd0491a44" +dependencies = [ + "stable_deref_trait", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" + +[[package]] +name = "smart-default" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eb01866308440fc64d6c44d9e86c5cc17adfe33c4d6eed55da9145044d0ffc1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "socket2" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "srcinfo" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ceaee0d48949e3aa5365945de3e467e797b30b4f8636c2e580121a293fd77519" + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "string_cache" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" +dependencies = [ + "new_debug_unreachable", + "once_cell", + "parking_lot", + "phf_shared 0.10.0", + "precomputed-hash", + "serde", +] + +[[package]] +name = "string_cache_codegen" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", + "proc-macro2", + "quote", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.52" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "temp-dir" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd16aa9ffe15fe021c6ee3766772132c6e98dfa395a167e16864f61a9cfb71d6" + +[[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if", + "fastrand", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "tendril" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" +dependencies = [ + "futf", + "mac", + "utf-8", +] + +[[package]] +name = "terminal_size" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" +dependencies = [ + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "thiserror" +version = "1.0.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-socks" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0" +dependencies = [ + "either", + "futures-util", + "thiserror", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "toml" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af06656561d28735e9c1cd63dfd57132c8155426aa6af24f36a00a351f88c48e" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.22.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18769cd1cec395d70860ceb4d932812a0b4d06b1a4bb336745a4d21b9496e992" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tr" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21111d9e56891e526f1acf8edc6d69a8a0434240319419d33911c182f1897a76" +dependencies = [ + "gettext-rs", + "lazy_static", +] + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "url" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.52", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" + +[[package]] +name = "web-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.4", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.4", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +dependencies = [ + "windows_aarch64_gnullvm 0.52.4", + "windows_aarch64_msvc 0.52.4", + "windows_i686_gnu 0.52.4", + "windows_i686_msvc 0.52.4", + "windows_x86_64_gnu 0.52.4", + "windows_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" + +[[package]] +name = "winnow" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] diff --git a/pkgs/by-name/pa/paru/package.nix b/pkgs/by-name/pa/paru/package.nix new file mode 100644 index 000000000000..b8c457f8b58c --- /dev/null +++ b/pkgs/by-name/pa/paru/package.nix @@ -0,0 +1,80 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + gettext, + installShellFiles, + pkg-config, + libarchive, + openssl, + pacman, + stdenv, +}: + +let + # only libalpm v14.x.x is supported + pacman_6 = pacman.overrideAttrs (previousAttrs: { + version = "6.1.0"; + src = previousAttrs.src.overrideAttrs { + outputHash = "sha256-uHBq1A//YSqFATlyqjC5ZgmvPkNKqp7sVew+nbmLH78="; + }; + hardeningDisable = [ "fortify3" ]; + }); +in +rustPlatform.buildRustPackage rec { + pname = "paru"; + version = "2.0.3"; + + src = fetchFromGitHub { + owner = "Morganamilo"; + repo = "paru"; + rev = "v${version}"; + hash = "sha256-0+N1WkjHd2DREoS1pImXXvlJ3wXoXEBxFBtupjXqyP8="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "alpm-3.0.4" = "sha256-cfIOCUyb+kDAT3Bn50oKuJzIyMyeFyOPBFQMkAgMocI="; + "aur-depends-3.0.0" = "sha256-Z/vCd4g3ic29vC0DXFHTT167xFAXYxzO2YQc0XQOerE="; + }; + }; + + nativeBuildInputs = [ + gettext + installShellFiles + pkg-config + rustPlatform.bindgenHook + ]; + + buildInputs = [ + libarchive + openssl + pacman_6 + ]; + + # https://aur.archlinux.org/packages/paru#comment-961914 + buildFeatures = lib.optionals stdenv.isAarch64 [ "generate" ]; + + postBuild = '' + sh ./scripts/mkmo locale/ + ''; + + postInstall = '' + installManPage man/paru.8 man/paru.conf.5 + installShellCompletion --bash completions/bash + installShellCompletion --fish completions/fish + installShellCompletion --zsh completions/zsh + cp -r locale "$out/share/" + ''; + + meta = { + description = "Feature packed AUR helper"; + homepage = "https://github.com/Morganamilo/paru"; + changelog = "https://github.com/Morganamilo/paru/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ wegank ]; + mainProgram = "paru"; + platforms = lib.platforms.linux; + }; +} From e2514012631946c9e6723dae89dfcb3699af928f Mon Sep 17 00:00:00 2001 From: ppenguin Date: Fri, 12 Jan 2024 11:51:14 +0100 Subject: [PATCH 003/338] freecad: add freecad-wayland that runs on wayland natively freecad: add freecad-wayland that runs on wayland natively (no xwayland) reformat all-packages fix freecad --- pkgs/by-name/fr/freecad/package.nix | 120 +++++++++++++++------------- pkgs/top-level/all-packages.nix | 2 + 2 files changed, 67 insertions(+), 55 deletions(-) diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix index b0146582b1a3..bfcb940e0c8b 100644 --- a/pkgs/by-name/fr/freecad/package.nix +++ b/pkgs/by-name/fr/freecad/package.nix @@ -5,7 +5,7 @@ , eigen , fetchFromGitHub , fmt -, freecad # for passthru.tests +, freecad , gfortran , gts , hdf5 @@ -30,11 +30,10 @@ , wrapGAppsHook3 , xercesc , zlib +, withWayland ? false }: - let opencascade-occt = opencascade-occt_7_6; - boost = python311Packages.boost; inherit (libsForQt5) qtbase qttools @@ -42,8 +41,11 @@ let qtx11extras qtxmlpatterns soqt - wrapQtAppsHook; + wrapQtAppsHook + ; + inherit (libsForQt5.qt5) qtwayland; inherit (python311Packages) + boost gitpython matplotlib pivy @@ -54,7 +56,8 @@ let python pyyaml scipy - shiboken2; + shiboken2 + ; in stdenv.mkDerivation (finalAttrs: { pname = "freecad"; @@ -77,45 +80,48 @@ stdenv.mkDerivation (finalAttrs: { wrapGAppsHook3 ]; - buildInputs = [ - gitpython # for addon manager - boost - coin3d - doxygen - eigen - fmt - gts - hdf5 - libGLU - libXmu - libf2c - matplotlib - medfile - mpi - ode - opencascade-occt - pivy - ply # for openSCAD file support - pycollada - pyside2 - pyside2-tools - python - pyyaml # (at least for) PyrateWorkbench - qtbase - qttools - qtwebengine - qtxmlpatterns - scipy - shiboken2 - soqt - swig - vtk - xercesc - zlib - ] ++ lib.optionals spaceNavSupport [ - libspnav - qtx11extras - ]; + buildInputs = + [ + gitpython # for addon manager + boost + coin3d + doxygen + eigen + fmt + gts + hdf5 + libGLU + libXmu + libf2c + matplotlib + medfile + mpi + ode + opencascade-occt + pivy + ply # for openSCAD file support + pycollada + pyside2 + pyside2-tools + python + pyyaml # (at least for) PyrateWorkbench + qtbase + qttools + qtwayland + qtwebengine + qtxmlpatterns + scipy + shiboken2 + soqt + swig + vtk + xercesc + zlib + ] + ++ lib.optionals spaceNavSupport [ + libspnav + qtx11extras + ]; patches = [ ./0001-NIXOS-don-t-ignore-PYTHONPATH.patch @@ -127,7 +133,8 @@ stdenv.mkDerivation (finalAttrs: { "-DBUILD_QT5=ON" "-DSHIBOKEN_INCLUDE_DIR=${shiboken2}/include" "-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken" - ("-DPYSIDE_INCLUDE_DIR=${pyside2}/include" + ( + "-DPYSIDE_INCLUDE_DIR=${pyside2}/include" + ";${pyside2}/include/PySide2/QtCore" + ";${pyside2}/include/PySide2/QtWidgets" + ";${pyside2}/include/PySide2/QtGui" @@ -144,11 +151,12 @@ stdenv.mkDerivation (finalAttrs: { qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH") ''; - qtWrapperArgs = [ - "--set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1" - "--prefix PATH : ${libredwg}/bin" - "--set QT_QPA_PLATFORM xcb" - ]; + qtWrapperArgs = + [ + "--set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1" + "--prefix PATH : ${libredwg}/bin" + ] + ++ lib.optionals (!withWayland) [ "--set QT_QPA_PLATFORM xcb" ]; postFixup = '' mv $out/share/doc $out @@ -164,11 +172,13 @@ stdenv.mkDerivation (finalAttrs: { # parse argv. This should catch if that ever regresses and also ensures # that PYTHONPATH is still respected enough for the FreeCAD console to # successfully run and check that it was included in `sys.path`. - python-path = runCommand "freecad-test-console" { - nativeBuildInputs = [ freecad ]; - } '' - HOME="$(mktemp -d)" PYTHONPATH="$(pwd)/test" FreeCADCmd --log-file $out -c "if not '$(pwd)/test' in sys.path: sys.exit(1)" Date: Mon, 29 Jul 2024 15:37:31 +0200 Subject: [PATCH 004/338] python312packages.paramz: drop nose dependency --- .../python-modules/paramz/default.nix | 33 +++++++++++++++---- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/paramz/default.nix b/pkgs/development/python-modules/paramz/default.nix index c2c817a58d71..712cce60a5e6 100644 --- a/pkgs/development/python-modules/paramz/default.nix +++ b/pkgs/development/python-modules/paramz/default.nix @@ -3,17 +3,18 @@ buildPythonPackage, fetchpatch, fetchPypi, + setuptools, numpy, scipy, six, decorator, - nose, + pytestCheckHook, }: buildPythonPackage rec { pname = "paramz"; version = "0.9.5"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -33,20 +34,38 @@ buildPythonPackage rec { }) ]; + build-system = [ setuptools ]; + propagatedBuildInputs = [ numpy scipy six decorator ]; - nativeCheckInputs = [ nose ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + preCheck = '' + substituteInPlace paramz/tests/parameterized_tests.py \ + --replace-fail "assertRaisesRegexp" "assertRaisesRegex" + ''; + + pytestFlagsArray = [ + "paramz/tests/array_core_tests.py" + "paramz/tests/cacher_tests.py" + "paramz/tests/examples_tests.py" + "paramz/tests/index_operations_tests.py" + "paramz/tests/init_tests.py" + "paramz/tests/lists_and_dicts_tests.py" + "paramz/tests/model_tests.py" + "paramz/tests/observable_tests.py" + "paramz/tests/parameterized_tests.py" + "paramz/tests/pickle_tests.py" + "paramz/tests/verbose_optimize_tests.py" + ]; pythonImportsCheck = [ "paramz" ]; - checkPhase = '' - nosetests -v paramz/tests - ''; - meta = with lib; { description = "Parameterization framework for parameterized model creation and handling"; homepage = "https://github.com/sods/paramz"; From c336215d593891f72364b2746c673b5297bfb250 Mon Sep 17 00:00:00 2001 From: John Hollowell Date: Mon, 5 Aug 2024 04:12:11 +0000 Subject: [PATCH 005/338] maintainers: add jhollowe --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 60e8041c62ab..39c2072f1065 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8824,6 +8824,12 @@ githubId = 2502736; name = "James Hillyerd"; }; + jhollowe = { + email = "jhollowe@johnhollowell.com"; + github = "jhollowe"; + githubId = 2881268; + name = "John Hollowell"; + }; j-hui = { email = "j-hui@cs.columbia.edu"; github = "j-hui"; From 28819016efe604ef8d93fddcdf49a4630ac84b9d Mon Sep 17 00:00:00 2001 From: John Hollowell Date: Mon, 5 Aug 2024 04:15:34 +0000 Subject: [PATCH 006/338] hamrs: init at 1.0.7 --- pkgs/by-name/ha/hamrs/package.nix | 56 +++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 pkgs/by-name/ha/hamrs/package.nix diff --git a/pkgs/by-name/ha/hamrs/package.nix b/pkgs/by-name/ha/hamrs/package.nix new file mode 100644 index 000000000000..45937658d4bb --- /dev/null +++ b/pkgs/by-name/ha/hamrs/package.nix @@ -0,0 +1,56 @@ +{ + appimageTools, + lib, + fetchurl, + stdenv, +}: + +let + suffix = + { + aarch64-linux = "linux-armv7l"; + x86_64-linux = "linux-x86_64"; + i686-linux = "linux-i386"; + } + .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); +in +appimageTools.wrapType2 rec { + pname = "hamrs"; + version = "1.0.7"; + + src = fetchurl { + url = "https://hamrs-releases.s3.us-east-2.amazonaws.com/${version}/hamrs-${version}-${suffix}.AppImage"; + hash = + { + aarch64-linux = "sha256-nBW8q7LVWQz93LkTc+c36H+2ymLLwLKfxePUwEm3D2E="; + x86_64-linux = "sha256-tplp7TADvbxkk5qBb4c4zm4mrzrVtW/WVUjiolBBJHc="; + i686-linux = "sha256-PllxLMBsPCedKU7OUN0nqi4qtQ57l2Z+huLfkfaBfT4="; + } + .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + }; + + extraInstallCommands = + let + contents = appimageTools.extract { inherit pname version src; }; + in + '' + install -m 444 -D ${contents}/${pname}.desktop -t $out/share/applications + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace-fail 'Exec=AppRun' 'Exec=${pname}' + cp -r ${contents}/usr/share/icons $out/share + ''; + + meta = with lib; { + description = "A simple, portable logger tailored for activities like Parks on the Air, Field Day, and more."; + homepage = "https://hamrs.app/"; + license = licenses.unfree; + maintainers = [ maintainers.jhollowe ]; + platforms = [ + "aarch64-linux" + "x86_64-linux" + "i686-linux" + ]; + mainProgram = "hamrs"; + sourceProvenance = [ sourceTypes.binaryNativeCode ]; + }; +} From 111b49d11c032e6026671c87dbbe9c1562d98c1e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 6 Aug 2024 06:18:01 +0000 Subject: [PATCH 007/338] zoraxy: 3.0.7 -> 3.1.0 --- pkgs/by-name/zo/zoraxy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/zo/zoraxy/package.nix b/pkgs/by-name/zo/zoraxy/package.nix index 949984dd661a..24a001aed60a 100644 --- a/pkgs/by-name/zo/zoraxy/package.nix +++ b/pkgs/by-name/zo/zoraxy/package.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "zoraxy"; - version = "3.0.7"; + version = "3.1.0"; src = fetchFromGitHub { owner = "tobychui"; repo = "zoraxy"; rev = "refs/tags/${version}"; - sha256 = "sha256-fyhnP+MtX5dYR9yzIp7vpahJKbkuvopZSSTwt7JnaMI="; + sha256 = "sha256-96puPBMrJ2o6jO41KOr2+NnCgq0TEejLoAKRiXsPbEE="; }; sourceRoot = "${src.name}/src"; - vendorHash = "sha256-FiE7j2XB6QcJBu1wtTpBCkfi0ac8pzx6RSOcVrsaOwQ="; + vendorHash = "sha256-p2nczUMT3FfYX32yvbR0H5FyHV2v9I18yvn0lwUwy+A="; checkFlags = let From 8da82625e7b1d618c94cce34e965d45dbe35a1f4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 6 Aug 2024 10:28:53 +0000 Subject: [PATCH 008/338] amarok: 3.0.1 -> 3.1.0 --- pkgs/applications/audio/amarok/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index 38cee35313fd..69ae6a41c78a 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "amarok"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { url = "mirror://kde/stable/amarok/${finalAttrs.version}/amarok-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-S+zyrp3cvoYRA+ZCFDaireIvU4yxw2ANTmZ/cb6ljys="; + sha256 = "sha256-yXuZZ/qPFbjp9N+2YYTKxqfsncZloQW8UWjY5yD+Fus="; }; outputs = [ "out" "doc" ]; From 4529bd57273eafaa1dd78db0a8666f12b2ceca28 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 6 Aug 2024 17:50:12 +0000 Subject: [PATCH 009/338] seq66: 0.99.12 -> 0.99.13 --- pkgs/applications/audio/seq66/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/seq66/default.nix b/pkgs/applications/audio/seq66/default.nix index 51d40f962a88..898373cb1320 100644 --- a/pkgs/applications/audio/seq66/default.nix +++ b/pkgs/applications/audio/seq66/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "seq66"; - version = "0.99.12"; + version = "0.99.13"; src = fetchFromGitHub { owner = "ahlstromcj"; repo = "seq66"; rev = version; - hash = "sha256-+EU0UdmZaDnhN142yR/r0tK1FKBbuFPmde6iSS26Tjo="; + hash = "sha256-hR8kEt3tKnH96JmmkMuY0WWxxp9YTcSvsJvICKNjvyQ="; }; nativeBuildInputs = [ autoreconfHook pkg-config qttools which wrapQtAppsHook ]; From 6938e9d22fe8781d61fcb10c502b560e056f7cc3 Mon Sep 17 00:00:00 2001 From: Hollow Man Date: Tue, 6 Aug 2024 10:52:45 +0300 Subject: [PATCH 010/338] mdbook-pdf: 0.1.8 -> 0.1.10 Signed-off-by: Hollow Man --- pkgs/tools/text/mdbook-pdf/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/text/mdbook-pdf/default.nix b/pkgs/tools/text/mdbook-pdf/default.nix index 472f5e3b8629..8bed07bd33b8 100644 --- a/pkgs/tools/text/mdbook-pdf/default.nix +++ b/pkgs/tools/text/mdbook-pdf/default.nix @@ -3,25 +3,23 @@ , fetchCrate , rustPlatform , pkg-config -, rustfmt , openssl , CoreServices }: rustPlatform.buildRustPackage rec { pname = "mdbook-pdf"; - version = "0.1.8"; + version = "0.1.10"; src = fetchCrate { inherit pname version; - hash = "sha256-UPSh0/8HFaLvnU95Gyd+uQaRvWeXlp+HViVUKX0I1jI="; + hash = "sha256-zRoO84ij7zF1I8ijXS/oApMKfS3e04+5/CgahAemqCA="; }; - cargoHash = "sha256-WYG2EkfEqjOOelxwivk5srtTNLxEPGX1ztwntvgft1I="; + cargoHash = "sha256-eay3tl4edeM05D+0iIu8Zw4L1N2Bk1csLo0AwNdyCdA="; nativeBuildInputs = [ pkg-config - rustfmt ]; buildInputs = [ @@ -32,12 +30,10 @@ rustPlatform.buildRustPackage rec { # Stop downloading from the Internet to # generate the Chrome Devtools Protocol - DOCS_RS=true; + env.DOCS_RS = true; - # # Stop formating with rustfmt, pending version update for - # # https://github.com/mdrokz/auto_generate_cdp/pull/8 - # # to remove rustfmt dependency - # DO_NOT_FORMAT=true; + # Stop formatting with rustfmt + env.DO_NOT_FORMAT = true; # No test. doCheck = false; From ce8459b7bf7a089d1bd641996924f18205b50c38 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 Aug 2024 06:07:24 +0000 Subject: [PATCH 011/338] ananicy-rules-cachyos: 0-unstable-2024-07-23 -> 0-unstable-2024-07-27 --- pkgs/by-name/an/ananicy-rules-cachyos/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix index f23a32daa4c3..2b70ec07aed7 100644 --- a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix +++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "ananicy-rules-cachyos"; - version = "0-unstable-2024-07-23"; + version = "0-unstable-2024-07-27"; src = fetchFromGitHub { owner = "CachyOS"; repo = "ananicy-rules"; - rev = "2453e457d44422164c616b548114ffc5c13bc11b"; - hash = "sha256-aILzlb/sZy3UuYlnaqYEj93hzuzCx1ZwDjU5iC5Mjpc="; + rev = "c6153c9e909475bbb08b4e56af152179ff7f171f"; + hash = "sha256-sAWHm3PK9mM+AtHdDhq3RIQBo58eEZtD1l7QfCTpl0s="; }; dontConfigure = true; From ec6b205b5ae905e487967604028381bc822076cc Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Tue, 6 Aug 2024 22:15:53 +0200 Subject: [PATCH 012/338] usbguard: 1.1.2 -> 1.1.3 Drop patch, because it is included in the new release. --- pkgs/os-specific/linux/usbguard/default.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/os-specific/linux/usbguard/default.nix b/pkgs/os-specific/linux/usbguard/default.nix index 755ea603e2a5..dfa31dd3a97c 100644 --- a/pkgs/os-specific/linux/usbguard/default.nix +++ b/pkgs/os-specific/linux/usbguard/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , autoreconfHook , installShellFiles , nixosTests @@ -22,27 +21,17 @@ }: stdenv.mkDerivation rec { - version = "1.1.2"; + version = "1.1.3"; pname = "usbguard"; src = fetchFromGitHub { owner = "USBGuard"; repo = pname; rev = "usbguard-${version}"; - hash = "sha256-uwNoKczmVOMpkU4KcKTOtbcTHiYVGXjk/rVbqMl5pGk="; + hash = "sha256-8y8zaKJfoIXc9AvG1wi3EzZA7BR2wVFLuOyD+zpBY0s="; fetchSubmodules = true; }; - patches = [ - # Pull upstream fix for gcc-13: - # https://github.com/USBGuard/usbguard/pull/586 - (fetchpatch { - name = "gcc-13.patch"; - url = "https://github.com/USBGuard/usbguard/commit/22b1e0897af977cc96af926c730ff948bd120bb5.patch"; - hash = "sha256-yw0ZHcn6naHcsfsqdBB/aTgCwvEHecew/6HDmjyY2ZA="; - }) - ]; - nativeBuildInputs = [ autoreconfHook installShellFiles @@ -94,6 +83,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://usbguard.github.io/"; license = licenses.gpl2Plus; + platforms = platforms.linux; maintainers = [ maintainers.tnias ]; }; } From bfb9d1825d545d96278db84d43e0b2a529775089 Mon Sep 17 00:00:00 2001 From: Ivan Trubach Date: Fri, 3 May 2024 06:22:23 +0300 Subject: [PATCH 013/338] nixos/pgbouncer: add services.pgbouncer.settings option This change adds services.pgbouncer.settings option as per [RFC 0042] and deprecates other options that were previously used to generate configuration file. In addition to that, we also place the configuration file under environment.etc to allow reloading configuration without service restart. [RFC 0042]: https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md --- .../manual/release-notes/rl-2411.section.md | 2 + .../modules/services/databases/pgbouncer.nix | 699 ++++-------------- nixos/tests/pgbouncer.nix | 40 +- 3 files changed, 168 insertions(+), 573 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 0587cd1a295e..fd4a9175d10e 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -156,6 +156,8 @@ - `services.ddclient.use` has been deprecated: `ddclient` now supports separate IPv4 and IPv6 configuration. Use `services.ddclient.usev4` and `services.ddclient.usev6` instead. +- `services.pgbouncer` systemd service is configured with `Type=notify-reload` and allows reloading configuration without process restart. PgBouncer configuration options were moved to the free-form type option named [`services.pgbouncer.settings`](#opt-services.pgbouncer.settings) according to the NixOS RFC 0042. + - `teleport` has been upgraded from major version 15 to major version 16. Refer to upstream [upgrade instructions](https://goteleport.com/docs/management/operations/upgrading/) and [release notes for v16](https://goteleport.com/docs/changelog/#1600-061324). diff --git a/nixos/modules/services/databases/pgbouncer.nix b/nixos/modules/services/databases/pgbouncer.nix index 32538789fb17..7eafa502eb0c 100644 --- a/nixos/modules/services/databases/pgbouncer.nix +++ b/nixos/modules/services/databases/pgbouncer.nix @@ -1,543 +1,138 @@ -{ lib, pkgs, config, ... } : - -with lib; - +{ config, lib, utils, pkgs, ... }: let cfg = config.services.pgbouncer; - confFile = pkgs.writeTextFile { - name = "pgbouncer.ini"; - text = '' - [databases] - ${concatStringsSep "\n" - (mapAttrsToList (dbname : settings : "${dbname} = ${settings}") cfg.databases)} - - [users] - ${concatStringsSep "\n" - (mapAttrsToList (username : settings : "${username} = ${settings}") cfg.users)} - - [peers] - ${concatStringsSep "\n" - (mapAttrsToList (peerid : settings : "${peerid} = ${settings}") cfg.peers)} - - [pgbouncer] - # general - ${optionalString (cfg.ignoreStartupParameters != null) "ignore_startup_parameters = ${cfg.ignoreStartupParameters}"} - listen_port = ${toString cfg.listenPort} - ${optionalString (cfg.listenAddress != null) "listen_addr = ${cfg.listenAddress}"} - pool_mode = ${cfg.poolMode} - max_client_conn = ${toString cfg.maxClientConn} - default_pool_size = ${toString cfg.defaultPoolSize} - max_user_connections = ${toString cfg.maxUserConnections} - max_db_connections = ${toString cfg.maxDbConnections} - - #auth - auth_type = ${cfg.authType} - ${optionalString (cfg.authHbaFile != null) "auth_hba_file = ${cfg.authHbaFile}"} - ${optionalString (cfg.authFile != null) "auth_file = ${cfg.authFile}"} - ${optionalString (cfg.authUser != null) "auth_user = ${cfg.authUser}"} - ${optionalString (cfg.authQuery != null) "auth_query = ${cfg.authQuery}"} - ${optionalString (cfg.authDbname != null) "auth_dbname = ${cfg.authDbname}"} - - # TLS - ${optionalString (cfg.tls.client != null) '' - client_tls_sslmode = ${cfg.tls.client.sslmode} - client_tls_key_file = ${cfg.tls.client.keyFile} - client_tls_cert_file = ${cfg.tls.client.certFile} - client_tls_ca_file = ${cfg.tls.client.caFile} - ''} - ${optionalString (cfg.tls.server != null) '' - server_tls_sslmode = ${cfg.tls.server.sslmode} - server_tls_key_file = ${cfg.tls.server.keyFile} - server_tls_cert_file = ${cfg.tls.server.certFile} - server_tls_ca_file = ${cfg.tls.server.caFile} - ''} - - # log - ${optionalString (cfg.logFile != null) "logfile = ${cfg.homeDir}/${cfg.logFile}"} - ${optionalString (cfg.syslog != null) '' - syslog = ${if cfg.syslog.enable then "1" else "0"} - syslog_ident = ${cfg.syslog.syslogIdent} - syslog_facility = ${cfg.syslog.syslogFacility} - ''} - ${optionalString (cfg.verbose != null) "verbose = ${toString cfg.verbose}"} - - # console access - ${optionalString (cfg.adminUsers != null) "admin_users = ${cfg.adminUsers}"} - ${optionalString (cfg.statsUsers != null) "stats_users = ${cfg.statsUsers}"} - - # extra - ${cfg.extraConfig} - ''; - }; - -in { + settingsFormat = pkgs.formats.ini { }; + configFile = settingsFormat.generate "pgbouncer.ini" cfg.settings; + configPath = "pgbouncer/pgbouncer.ini"; +in +{ + imports = [ + (lib.mkRenamedOptionModule + [ "services" "pgbouncer" "logFile" ] + [ "services" "pgbouncer" "settings" "pgbouncer" "log_file" ]) + (lib.mkRenamedOptionModule + [ "services" "pgbouncer" "listenAddress" ] + [ "services" "pgbouncer" "settings" "pgbouncer" "listen_addr" ]) + (lib.mkRenamedOptionModule + [ "services" "pgbouncer" "listenPort" ] + [ "services" "pgbouncer" "settings" "pgbouncer" "listen_port" ]) + (lib.mkRenamedOptionModule + [ "services" "pgbouncer" "poolMode" ] + [ "services" "pgbouncer" "settings" "pgbouncer" "pool_mode" ]) + (lib.mkRenamedOptionModule + [ "services" "pgbouncer" "maxClientConn" ] + [ "services" "pgbouncer" "settings" "pgbouncer" "max_client_conn" ]) + (lib.mkRenamedOptionModule + [ "services" "pgbouncer" "defaultPoolSize" ] + [ "services" "pgbouncer" "settings" "pgbouncer" "default_pool_size" ]) + (lib.mkRenamedOptionModule + [ "services" "pgbouncer" "maxDbConnections" ] + [ "services" "pgbouncer" "settings" "pgbouncer" "max_db_connections" ]) + (lib.mkRenamedOptionModule + [ "services" "pgbouncer" "maxUserConnections" ] + [ "services" "pgbouncer" "settings" "pgbouncer" "max_user_connections" ]) + (lib.mkRenamedOptionModule + [ "services" "pgbouncer" "ignoreStartupParameters" ] + [ "services" "pgbouncer" "settings" "pgbouncer" "ignore_startup_parameters" ]) + (lib.mkRenamedOptionModule + [ "services" "pgbouncer" "databases" ] + [ "services" "pgbouncer" "settings" "databases" ]) + (lib.mkRenamedOptionModule + [ "services" "pgbouncer" "users" ] + [ "services" "pgbouncer" "settings" "users" ]) + (lib.mkRenamedOptionModule + [ "services" "pgbouncer" "peers" ] + [ "services" "pgbouncer" "settings" "peers" ]) + (lib.mkRenamedOptionModule + [ "services" "pgbouncer" "authType" ] + [ "services" "pgbouncer" "settings" "pgbouncer" "auth_type" ]) + (lib.mkRenamedOptionModule + [ "services" "pgbouncer" "authHbaFile" ] + [ "services" "pgbouncer" "settings" "pgbouncer" "auth_hba_file" ]) + (lib.mkRenamedOptionModule + [ "services" "pgbouncer" "authFile" ] + [ "services" "pgbouncer" "settings" "pgbouncer" "auth_file" ]) + (lib.mkRenamedOptionModule + [ "services" "pgbouncer" "authUser" ] + [ "services" "pgbouncer" "settings" "pgbouncer" "auth_user" ]) + (lib.mkRenamedOptionModule + [ "services" "pgbouncer" "authQuery" ] + [ "services" "pgbouncer" "settings" "pgbouncer" "auth_query" ]) + (lib.mkRenamedOptionModule + [ "services" "pgbouncer" "authDbname" ] + [ "services" "pgbouncer" "settings" "pgbouncer" "auth_dbname" ]) + (lib.mkRenamedOptionModule + [ "services" "pgbouncer" "adminUsers" ] + [ "services" "pgbouncer" "settings" "pgbouncer" "admin_users" ]) + (lib.mkRenamedOptionModule + [ "services" "pgbouncer" "statsUsers" ] + [ "services" "pgbouncer" "settings" "pgbouncer" "stats_users" ]) + (lib.mkRenamedOptionModule + [ "services" "pgbouncer" "verbose" ] + [ "services" "pgbouncer" "settings" "pgbouncer" "verbose" ]) + (lib.mkChangedOptionModule + [ "services" "pgbouncer" "syslog" "enable" ] + [ "services" "pgbouncer" "settings" "pgbouncer" "syslog" ] + (config: + let + enable = lib.getAttrFromPath + [ "services" "pgbouncer" "syslog" "enable" ] + config; + in + if enable then 1 else 0)) + (lib.mkRenamedOptionModule + [ "services" "pgbouncer" "syslog" "syslogIdent" ] + [ "services" "pgbouncer" "settings" "pgbouncer" "syslog_ident" ]) + (lib.mkRenamedOptionModule + [ "services" "pgbouncer" "syslog" "syslogFacility" ] + [ "services" "pgbouncer" "settings" "pgbouncer" "syslog_facility" ]) + (lib.mkRenamedOptionModule + [ "services" "pgbouncer" "tls" "client" "sslmode" ] + [ "services" "pgbouncer" "settings" "pgbouncer" "client_tls_sslmode" ]) + (lib.mkRenamedOptionModule + [ "services" "pgbouncer" "tls" "client" "keyFile" ] + [ "services" "pgbouncer" "settings" "pgbouncer" "client_tls_key_file" ]) + (lib.mkRenamedOptionModule + [ "services" "pgbouncer" "tls" "client" "certFile" ] + [ "services" "pgbouncer" "settings" "pgbouncer" "client_tls_cert_file" ]) + (lib.mkRenamedOptionModule + [ "services" "pgbouncer" "tls" "client" "caFile" ] + [ "services" "pgbouncer" "settings" "pgbouncer" "client_tls_ca_file" ]) + (lib.mkRenamedOptionModule + [ "services" "pgbouncer" "tls" "server" "sslmode" ] + [ "services" "pgbouncer" "settings" "pgbouncer" "server_tls_sslmode" ]) + (lib.mkRenamedOptionModule + [ "services" "pgbouncer" "tls" "server" "keyFile" ] + [ "services" "pgbouncer" "settings" "pgbouncer" "server_tls_key_file" ]) + (lib.mkRenamedOptionModule + [ "services" "pgbouncer" "tls" "server" "certFile" ] + [ "services" "pgbouncer" "settings" "pgbouncer" "server_tls_cert_file" ]) + (lib.mkRenamedOptionModule + [ "services" "pgbouncer" "tls" "server" "caFile" ] + [ "services" "pgbouncer" "settings" "pgbouncer" "server_tls_ca_file" ]) + (lib.mkRemovedOptionModule [ "services" "pgbouncer" "extraConfig" ] "Use services.pgbouncer.settings instead.") + ]; options.services.pgbouncer = { + enable = lib.mkEnableOption "PostgreSQL connection pooler"; - # NixOS settings + package = lib.mkPackageOption pkgs "pgbouncer" { }; - enable = mkEnableOption "PostgreSQL connection pooler"; - - package = mkPackageOption pkgs "pgbouncer" { }; - - openFirewall = mkOption { - type = types.bool; + openFirewall = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to automatically open the specified TCP port in the firewall. ''; }; - # Generic settings - - logFile = mkOption { - type = types.nullOr types.str; - default = null; + settings = lib.mkOption { + type = settingsFormat.type; + default = { }; description = '' - Specifies a log file in addition to journald. - ''; - }; - - listenAddress = mkOption { - type = types.nullOr types.commas; - example = "*"; - default = null; - description = '' - Specifies a list (comma-separated) of addresses where to listen for TCP connections. - You may also use * meaning “listen on all addresses”. - When not set, only Unix socket connections are accepted. - - Addresses can be specified numerically (IPv4/IPv6) or by name. - ''; - }; - - listenPort = mkOption { - type = types.port; - default = 6432; - description = '' - Which port to listen on. Applies to both TCP and Unix sockets. - ''; - }; - - poolMode = mkOption { - type = types.enum [ "session" "transaction" "statement" ]; - default = "session"; - description = '' - Specifies when a server connection can be reused by other clients. - - session - Server is released back to pool after client disconnects. Default. - transaction - Server is released back to pool after transaction finishes. - statement - Server is released back to pool after query finishes. - Transactions spanning multiple statements are disallowed in this mode. - ''; - }; - - maxClientConn = mkOption { - type = types.int; - default = 100; - description = '' - Maximum number of client connections allowed. - - When this setting is increased, then the file descriptor limits in the operating system - might also have to be increased. Note that the number of file descriptors potentially - used is more than maxClientConn. If each user connects under its own user name to the server, - the theoretical maximum used is: - maxClientConn + (max pool_size * total databases * total users) - - If a database user is specified in the connection string (all users connect under the same user name), - the theoretical maximum is: - maxClientConn + (max pool_size * total databases) - - The theoretical maximum should never be reached, unless somebody deliberately crafts a special load for it. - Still, it means you should set the number of file descriptors to a safely high number. - ''; - }; - - defaultPoolSize = mkOption { - type = types.int; - default = 20; - description = '' - How many server connections to allow per user/database pair. - Can be overridden in the per-database configuration. - ''; - }; - - maxDbConnections = mkOption { - type = types.int; - default = 0; - description = '' - Do not allow more than this many server connections per database (regardless of user). - This considers the PgBouncer database that the client has connected to, - not the PostgreSQL database of the outgoing connection. - - This can also be set per database in the [databases] section. - - Note that when you hit the limit, closing a client connection to one pool will - not immediately allow a server connection to be established for another pool, - because the server connection for the first pool is still open. - Once the server connection closes (due to idle timeout), - a new server connection will immediately be opened for the waiting pool. - - 0 = unlimited - ''; - }; - - maxUserConnections = mkOption { - type = types.int; - default = 0; - description = '' - Do not allow more than this many server connections per user (regardless of database). - This considers the PgBouncer user that is associated with a pool, - which is either the user specified for the server connection - or in absence of that the user the client has connected as. - - This can also be set per user in the [users] section. - - Note that when you hit the limit, closing a client connection to one pool - will not immediately allow a server connection to be established for another pool, - because the server connection for the first pool is still open. - Once the server connection closes (due to idle timeout), a new server connection - will immediately be opened for the waiting pool. - - 0 = unlimited - ''; - }; - - ignoreStartupParameters = mkOption { - type = types.nullOr types.commas; - example = "extra_float_digits"; - default = null; - description = '' - By default, PgBouncer allows only parameters it can keep track of in startup packets: - client_encoding, datestyle, timezone and standard_conforming_strings. - - All others parameters will raise an error. - To allow others parameters, they can be specified here, so that PgBouncer knows that - they are handled by the admin and it can ignore them. - - If you need to specify multiple values, use a comma-separated list. - - IMPORTANT: When using prometheus-pgbouncer-exporter, you need: - extra_float_digits - - ''; - }; - - # Section [databases] - databases = mkOption { - type = types.attrsOf types.str; - default = {}; - example = { - exampledb = "host=/run/postgresql/ port=5432 auth_user=exampleuser dbname=exampledb sslmode=require"; - bardb = "host=localhost dbname=bazdb"; - foodb = "host=host1.example.com port=5432"; - }; - description = '' - Detailed information about PostgreSQL database definitions: - - ''; - }; - - # Section [users] - users = mkOption { - type = types.attrsOf types.str; - default = {}; - example = { - user1 = "pool_mode=session"; - }; - description = '' - Optional. - - Detailed information about PostgreSQL user definitions: - - ''; - }; - - # Section [peers] - peers = mkOption { - type = types.attrsOf types.str; - default = {}; - example = { - "1" = "host=host1.example.com"; - "2" = "host=/tmp/pgbouncer-2 port=5555"; - }; - description = '' - Optional. - - Detailed information about PostgreSQL database definitions: - - ''; - }; - - # Authentication settings - authType = mkOption { - type = types.enum [ "cert" "md5" "scram-sha-256" "plain" "trust" "any" "hba" "pam" ]; - default = "md5"; - description = '' - How to authenticate users. - - cert - Client must connect over TLS connection with a valid client certificate. - The user name is then taken from the CommonName field from the certificate. - md5 - Use MD5-based password check. This is the default authentication method. - authFile may contain both MD5-encrypted and plain-text passwords. - If md5 is configured and a user has a SCRAM secret, then SCRAM authentication is used automatically instead. - scram-sha-256 - Use password check with SCRAM-SHA-256. authFile has to contain SCRAM secrets or plain-text passwords. - plain - The clear-text password is sent over the wire. Deprecated. - trust - No authentication is done. The user name must still exist in authFile. - any - Like the trust method, but the user name given is ignored. - Requires that all databases are configured to log in as a specific user. - Additionally, the console database allows any user to log in as admin. - hba - The actual authentication type is loaded from authHbaFile. - This allows different authentication methods for different access paths, - for example: connections over Unix socket use the peer auth method, connections over TCP must use TLS. - pam - PAM is used to authenticate users, authFile is ignored. - This method is not compatible with databases using the authUser option. - The service name reported to PAM is “pgbouncer”. pam is not supported in the HBA configuration file. - ''; - }; - - authHbaFile = mkOption { - type = types.nullOr types.path; - default = null; - example = "/secrets/pgbouncer_hba"; - description = '' - HBA configuration file to use when authType is hba. - - See HBA file format details: - - ''; - }; - - authFile = mkOption { - type = types.nullOr types.path; - default = null; - example = "/secrets/pgbouncer_authfile"; - description = '' - The name of the file to load user names and passwords from. - - See section Authentication file format details: - - - Most authentication types require that either authFile or authUser be set; - otherwise there would be no users defined. - ''; - }; - - authUser = mkOption { - type = types.nullOr types.str; - default = null; - example = "pgbouncer"; - description = '' - If authUser is set, then any user not specified in authFile will be queried - through the authQuery query from pg_shadow in the database, using authUser. - The password of authUser will be taken from authFile. - (If the authUser does not require a password then it does not need to be defined in authFile.) - - Direct access to pg_shadow requires admin rights. - It's preferable to use a non-superuser that calls a SECURITY DEFINER function instead. - ''; - }; - - authQuery = mkOption { - type = types.nullOr types.str; - default = null; - example = "SELECT usename, passwd FROM pg_shadow WHERE usename=$1"; - description = '' - Query to load user's password from database. - - Direct access to pg_shadow requires admin rights. - It's preferable to use a non-superuser that calls a SECURITY DEFINER function instead. - - Note that the query is run inside the target database. - So if a function is used, it needs to be installed into each database. - ''; - }; - - authDbname = mkOption { - type = types.nullOr types.str; - default = null; - example = "authdb"; - description = '' - Database name in the [database] section to be used for authentication purposes. - This option can be either global or overriden in the connection string if this parameter is specified. - ''; - }; - - # TLS settings - tls.client = mkOption { - type = types.nullOr (types.submodule { - options = { - sslmode = mkOption { - type = types.enum [ "disable" "allow" "prefer" "require" "verify-ca" "verify-full" ]; - default = "disable"; - description = '' - TLS mode to use for connections from clients. - TLS connections are disabled by default. - - When enabled, tls.client.keyFile and tls.client.certFile - must be also configured to set up the key and certificate - PgBouncer uses to accept client connections. - - disable - Plain TCP. If client requests TLS, it's ignored. Default. - allow - If client requests TLS, it is used. If not, plain TCP is used. - If the client presents a client certificate, it is not validated. - prefer - Same as allow. - require - Client must use TLS. If not, the client connection is rejected. - If the client presents a client certificate, it is not validated. - verify-ca - Client must use TLS with valid client certificate. - verify-full - Same as verify-ca - ''; - }; - certFile = mkOption { - type = types.path; - example = "/secrets/pgbouncer.key"; - description = "Path to certificate for private key. Clients can validate it"; - }; - keyFile = mkOption { - type = types.path; - example = "/secrets/pgbouncer.crt"; - description = "Path to private key for PgBouncer to accept client connections"; - }; - caFile = mkOption { - type = types.path; - example = "/secrets/pgbouncer.crt"; - description = "Path to root certificate file to validate client certificates"; - }; - }; - }); - default = null; - description = '' - - ''; - }; - - tls.server = mkOption { - type = types.nullOr (types.submodule { - options = { - sslmode = mkOption { - type = types.enum [ "disable" "allow" "prefer" "require" "verify-ca" "verify-full" ]; - default = "disable"; - description = '' - TLS mode to use for connections to PostgreSQL servers. - TLS connections are disabled by default. - - disable - Plain TCP. TLS is not even requested from the server. Default. - allow - FIXME: if server rejects plain, try TLS? - prefer - TLS connection is always requested first from PostgreSQL. - If refused, the connection will be established over plain TCP. - Server certificate is not validated. - require - Connection must go over TLS. If server rejects it, plain TCP is not attempted. - Server certificate is not validated. - verify-ca - Connection must go over TLS and server certificate must be valid according to tls.server.caFile. - Server host name is not checked against certificate. - verify-full - Connection must go over TLS and server certificate must be valid according to tls.server.caFile. - Server host name must match certificate information. - ''; - }; - certFile = mkOption { - type = types.path; - example = "/secrets/pgbouncer_server.key"; - description = "Certificate for private key. PostgreSQL server can validate it."; - }; - keyFile = mkOption { - type = types.path; - example = "/secrets/pgbouncer_server.crt"; - description = "Private key for PgBouncer to authenticate against PostgreSQL server."; - }; - caFile = mkOption { - type = types.path; - example = "/secrets/pgbouncer_server.crt"; - description = "Root certificate file to validate PostgreSQL server certificates."; - }; - }; - }); - default = null; - description = '' - - ''; - }; - - # Log settings - syslog = mkOption { - type = types.nullOr (types.submodule { - options = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Toggles syslog on/off. - ''; - }; - syslogIdent = mkOption { - type = types.str; - default = "pgbouncer"; - description = '' - Under what name to send logs to syslog. - ''; - }; - syslogFacility = mkOption { - type = types.enum [ "auth" "authpriv" "daemon" "user" "local0" "local1" "local2" "local3" "local4" "local5" "local6" "local7" ]; - default = "daemon"; - description = '' - Under what facility to send logs to syslog. - ''; - }; - }; - }); - default = null; - description = '' - - ''; - }; - - verbose = lib.mkOption { - type = lib.types.int; - default = 0; - description = '' - Increase verbosity. Mirrors the “-v” switch on the command line. - ''; - }; - - # Console access control - adminUsers = mkOption { - type = types.nullOr types.commas; - default = null; - description = '' - Comma-separated list of database users that are allowed to connect and run all commands on the console. - Ignored when authType is any, in which case any user name is allowed in as admin. - ''; - }; - - statsUsers = mkOption { - type = types.nullOr types.commas; - default = null; - description = '' - Comma-separated list of database users that are allowed to connect and run read-only queries on the console. - That means all SHOW commands except SHOW FDS. + Configuration for PgBouncer, see + for supported values. ''; }; @@ -550,42 +145,32 @@ in { ''; }; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; default = "pgbouncer"; description = '' The user pgbouncer is run as. ''; }; - group = mkOption { - type = types.str; + group = lib.mkOption { + type = lib.types.str; default = "pgbouncer"; description = '' The group pgbouncer is run as. ''; }; - homeDir = mkOption { - type = types.path; + homeDir = lib.mkOption { + type = lib.types.path; default = "/var/lib/pgbouncer"; description = '' Specifies the home directory. ''; }; - - # Extra settings - extraConfig = mkOption { - type = types.lines; - description = '' - Any additional text to be appended to config.ini - . - ''; - default = ""; - }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { users.groups.${cfg.group} = { }; users.users.${cfg.user} = { description = "PgBouncer service user"; @@ -595,26 +180,36 @@ in { isSystemUser = true; }; + environment.etc.${configPath}.source = configFile; + + # Default to RuntimeDirectory instead of /tmp. + services.pgbouncer.settings.pgbouncer.unix_socket_dir = lib.mkDefault "/run/pgbouncer"; + systemd.services.pgbouncer = { description = "PgBouncer - PostgreSQL connection pooler"; - wants = [ "network-online.target" ] ++ lib.optional config.services.postgresql.enable "postgresql.service"; - after = [ "network-online.target" ] ++ lib.optional config.services.postgresql.enable "postgresql.service"; + wants = [ "network-online.target" ]; + after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; + reloadTriggers = [ configFile ]; serviceConfig = { - Type = "notify"; + Type = "notify-reload"; User = cfg.user; Group = cfg.group; - ExecStart = "${lib.getExe pkgs.pgbouncer} ${confFile}"; - ExecReload = "${pkgs.coreutils}/bin/kill -SIGHUP $MAINPID"; + ExecStart = utils.escapeSystemdExecArgs [ + (lib.getExe pkgs.pgbouncer) + "/etc/${configPath}" + ]; RuntimeDirectory = "pgbouncer"; LimitNOFILE = cfg.openFilesLimit; }; }; - networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.listenPort; - + networking.firewall = lib.mkIf cfg.openFirewall { + allowedTCPPorts = [ + (cfg.settings.pgbouncer.listen_port or 6432) + ]; + }; }; - meta.maintainers = [ maintainers._1000101 ]; - + meta.maintainers = [ lib.maintainers._1000101 ]; } diff --git a/nixos/tests/pgbouncer.nix b/nixos/tests/pgbouncer.nix index bb5afd35ee28..8d11c4b3f4bf 100644 --- a/nixos/tests/pgbouncer.nix +++ b/nixos/tests/pgbouncer.nix @@ -1,20 +1,12 @@ -import ./make-test-python.nix ({ pkgs, ... } : -let - testAuthFile = pkgs.writeTextFile { - name = "authFile"; - text = '' - "testuser" "testpass" - ''; - }; -in -{ +import ./make-test-python.nix ({ lib, pkgs, ... }: { name = "pgbouncer"; - meta = with pkgs.lib.maintainers; { + + meta = with lib.maintainers; { maintainers = [ _1000101 ]; }; - nodes = { - one = { config, pkgs, ... }: { + nodes = { + one = { pkgs, ... }: { systemd.services.postgresql = { postStart = '' ${pkgs.postgresql}/bin/psql -U postgres -c "ALTER ROLE testuser WITH LOGIN PASSWORD 'testpass'"; @@ -26,10 +18,7 @@ in postgresql = { enable = true; ensureDatabases = [ "testdb" ]; - ensureUsers = [ - { - name = "testuser"; - }]; + ensureUsers = [{ name = "testuser"; }]; authentication = '' local testdb testuser scram-sha-256 ''; @@ -37,10 +26,19 @@ in pgbouncer = { enable = true; - listenAddress = "localhost"; - databases = { test = "host=/run/postgresql/ port=5432 auth_user=testuser dbname=testdb"; }; - authType = "scram-sha-256"; - authFile = testAuthFile; + openFirewall = true; + settings = { + pgbouncer = { + listen_addr = "localhost"; + auth_type = "scram-sha-256"; + auth_file = builtins.toFile "pgbouncer-users.txt" '' + "testuser" "testpass" + ''; + }; + databases = { + test = "host=/run/postgresql port=5432 auth_user=testuser dbname=testdb"; + }; + }; }; }; }; From 6008ed89f6163f0f58a80dbaf79ab6edf795d250 Mon Sep 17 00:00:00 2001 From: Ivan Trubach Date: Tue, 14 May 2024 14:41:28 +0300 Subject: [PATCH 014/338] nixos/prometheus.exporters.pgbouncer: do not assume that pgbouncer runs on localhost PgBouncer instance running on localhost may not be the on being monitored in connectionString. Remove checks that forbid valid configuration from being used and instead document requirements for PgBouncer configuration when used with the exporter. --- .../monitoring/prometheus/exporters.nix | 17 -------------- .../prometheus/exporters/pgbouncer.nix | 12 ++++++---- nixos/tests/prometheus-exporters.nix | 23 ++++++++++++++----- 3 files changed, 25 insertions(+), 27 deletions(-) diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index 723116d2547b..7b02e815cdbb 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -367,18 +367,6 @@ in message = '' PgBouncer exporter needs either connectionStringFile or connectionString configured" ''; - } { - assertion = cfg.pgbouncer.enable -> ( - config.services.pgbouncer.ignoreStartupParameters != null && builtins.match ".*extra_float_digits.*" config.services.pgbouncer.ignoreStartupParameters != null - ); - message = '' - Prometheus PgBouncer exporter requires including `extra_float_digits` in services.pgbouncer.ignoreStartupParameters - - Example: - services.pgbouncer.ignoreStartupParameters = extra_float_digits; - - See https://github.com/prometheus-community/pgbouncer_exporter#pgbouncer-configuration - ''; } { assertion = cfg.sql.enable -> ( (cfg.sql.configFile == null) != (cfg.sql.configuration == null) @@ -437,11 +425,6 @@ in config.services.prometheus.exporters.pgbouncer.connectionString is insecure. Use connectionStringFile instead. '' ) - (mkIf - (cfg.pgbouncer.enable && config.services.pgbouncer.authType != "any") '' - Admin user (with password or passwordless) MUST exist in the services.pgbouncer.authFile if authType other than any is used. - '' - ) ] ++ config.services.prometheus.exporters.warnings; }] ++ [(mkIf config.services.prometheus.exporters.rtl_433.enable { hardware.rtl-sdr.enable = mkDefault true; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix b/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix index 71b602638632..2176cf2dee55 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix @@ -31,8 +31,10 @@ in NOTE: You MUST keep pgbouncer as database name (special internal db)!!! - NOTE: Admin user (with password or passwordless) MUST exist - in the services.pgbouncer.authFile if authType other than any is used. + NOTE: ignore_startup_parameters MUST contain "extra_float_digits". + + NOTE: Admin user (with password or passwordless) MUST exist in the + auth_file if auth_type other than "any" is used. WARNING: this secret is stored in the world-readable Nix store! Use {option}`connectionStringFile` instead. @@ -49,8 +51,10 @@ in NOTE: You MUST keep pgbouncer as database name (special internal db)!!! - NOTE: Admin user (with password or passwordless) MUST exist - in the services.pgbouncer.authFile if authType other than any is used. + NOTE: ignore_startup_parameters MUST contain "extra_float_digits". + + NOTE: Admin user (with password or passwordless) MUST exist in the + auth_file if auth_type other than "any" is used. {option}`connectionStringFile` takes precedence over {option}`connectionString` ''; diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index fba6bd57d9c4..6a4abab7cc12 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -1001,13 +1001,24 @@ let metricProvider = { services.postgresql.enable = true; services.pgbouncer = { - # https://github.com/prometheus-community/pgbouncer_exporter#pgbouncer-configuration - ignoreStartupParameters = "extra_float_digits"; enable = true; - listenAddress = "*"; - databases = { postgres = "host=/run/postgresql/ port=5432 auth_user=postgres dbname=postgres"; }; - authType = "any"; - maxClientConn = 99; + settings = { + pgbouncer = { + listen_addr = "*"; + auth_type = "any"; + max_client_conn = 99; + # https://github.com/prometheus-community/pgbouncer_exporter#pgbouncer-configuration + ignore_startup_parameters = "extra_float_digits"; + }; + databases = { + postgres = concatStringsSep " " [ + "host=/run/postgresql" + "port=5432" + "auth_user=postgres" + "dbname=postgres" + ]; + }; + }; }; }; exporterTest = '' From 63caf38e3378b444399180647233abb6e97d20f1 Mon Sep 17 00:00:00 2001 From: Ivan Trubach Date: Tue, 14 May 2024 15:13:33 +0300 Subject: [PATCH 015/338] nixos/prometheus.exporters.pgbouncer: fix escaping connectionStringFile in shell arguments --- .../prometheus/exporters/pgbouncer.nix | 65 ++++++++++--------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix b/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix index 2176cf2dee55..9cd261099a95 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix @@ -4,15 +4,21 @@ let cfg = config.services.prometheus.exporters.pgbouncer; inherit (lib) mkOption + mkPackageOption types optionals + optionalString + getExe + getExe' escapeShellArg + escapeShellArgs concatStringsSep ; in { port = 9127; extraOpts = { + package = mkPackageOption pkgs "prometheus-pgbouncer-exporter" { }; telemetryPath = mkOption { type = types.str; @@ -85,7 +91,7 @@ in }; logLevel = mkOption { - type = types.enum ["debug" "info" "warn" "error" ]; + type = types.enum [ "debug" "info" "warn" "error" ]; default = "info"; description = '' Only log messages with the given severity or above. @@ -93,7 +99,7 @@ in }; logFormat = mkOption { - type = types.enum ["logfmt" "json"]; + type = types.enum [ "logfmt" "json" ]; default = "logfmt"; description = '' Output format of log messages. One of: [logfmt, json] @@ -120,35 +126,30 @@ in serviceOpts = { after = [ "pgbouncer.service" ]; - serviceConfig = let - startScript = pkgs.writeShellScriptBin "pgbouncer-start" "${concatStringsSep " " ([ - "${pkgs.prometheus-pgbouncer-exporter}/bin/pgbouncer_exporter" - "--web.listen-address ${cfg.listenAddress}:${toString cfg.port}" - "--pgBouncer.connectionString ${if cfg.connectionStringFile != null then - "$(head -n1 ${cfg.connectionStringFile})" else "${escapeShellArg cfg.connectionString}"}" - ] - ++ optionals (cfg.telemetryPath != null) [ - "--web.telemetry-path ${escapeShellArg cfg.telemetryPath}" - ] - ++ optionals (cfg.pidFile != null) [ - "--pgBouncer.pid-file= ${escapeShellArg cfg.pidFile}" - ] - ++ optionals (cfg.logLevel != null) [ - "--log.level ${escapeShellArg cfg.logLevel}" - ] - ++ optionals (cfg.logFormat != null) [ - "--log.format ${escapeShellArg cfg.logFormat}" - ] - ++ optionals (cfg.webSystemdSocket != false) [ - "--web.systemd-socket ${escapeShellArg cfg.webSystemdSocket}" - ] - ++ optionals (cfg.webConfigFile != null) [ - "--web.config.file ${escapeShellArg cfg.webConfigFile}" - ] - ++ cfg.extraFlags)}"; - in - { - ExecStart = "${startScript}/bin/pgbouncer-start"; - }; + script = optionalString (cfg.connectionStringFile != null) '' + connectionString=$(${escapeShellArgs [ + (getExe' pkgs.coreutils "cat") "--" cfg.connectionStringFile + ]}) + '' + concatStringsSep " " ([ + "exec -- ${escapeShellArg (getExe cfg.package)}" + "--web.listen-address ${cfg.listenAddress}:${toString cfg.port}" + "--pgBouncer.connectionString ${if cfg.connectionStringFile != null + then "\"$connectionString\"" + else "${escapeShellArg cfg.connectionString}"}" + ] ++ optionals (cfg.telemetryPath != null) [ + "--web.telemetry-path ${escapeShellArg cfg.telemetryPath}" + ] ++ optionals (cfg.pidFile != null) [ + "--pgBouncer.pid-file ${escapeShellArg cfg.pidFile}" + ] ++ optionals (cfg.logLevel != null) [ + "--log.level ${escapeShellArg cfg.logLevel}" + ] ++ optionals (cfg.logFormat != null) [ + "--log.format ${escapeShellArg cfg.logFormat}" + ] ++ optionals (cfg.webSystemdSocket != false) [ + "--web.systemd-socket ${escapeShellArg cfg.webSystemdSocket}" + ] ++ optionals (cfg.webConfigFile != null) [ + "--web.config.file ${escapeShellArg cfg.webConfigFile}" + ] ++ cfg.extraFlags); + + serviceConfig.RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ]; }; } From 4be8e799dba7abfbfa902bf90ad5dab4c9f203f5 Mon Sep 17 00:00:00 2001 From: Patrick Date: Sat, 15 Jun 2024 15:09:11 +0200 Subject: [PATCH 016/338] homebox: init at 0.13.0 --- pkgs/by-name/ho/homebox/package.nix | 83 +++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 pkgs/by-name/ho/homebox/package.nix diff --git a/pkgs/by-name/ho/homebox/package.nix b/pkgs/by-name/ho/homebox/package.nix new file mode 100644 index 000000000000..74a7309df9d1 --- /dev/null +++ b/pkgs/by-name/ho/homebox/package.nix @@ -0,0 +1,83 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + pnpm, + nodejs, + go, + git, + cacert, +}: +let + pname = "homebox"; + version = "0.13.0"; + src = fetchFromGitHub { + owner = "sysadminsmedia"; + repo = "homebox"; + rev = "v${version}"; + hash = "sha256-mhb4q0ja94TjvOzl28WVb3uzkR9MKlqifFJgUo6hfrA="; + }; +in +buildGoModule { + inherit pname version src; + + vendorHash = "sha256-QRmP6ichKjwDWEx13sEs1oetc4nojGyJnKafAATTNTA="; + modRoot = "backend"; + # the goModules derivation inherits our buildInputs and buildPhases + # Since we do pnpm thing in those it fails if we don't explicitely remove them + overrideModAttrs = _: { + nativeBuildInputs = [ + go + git + cacert + ]; + preBuild = ""; + }; + + pnpmDeps = pnpm.fetchDeps { + inherit pname version; + src = "${src}/frontend"; + hash = "sha256-MdTZJ/Ichpwc54r7jZjiFD12YOdRzHSuzRZ/PnDk2mY="; + }; + pnpmRoot = "../frontend"; + + env.NUXT_TELEMETRY_DISABLED = 1; + + preBuild = '' + pushd ../frontend + + pnpm build + + popd + + mkdir -p ./app/api/static/public + cp -r ../frontend/.output/public/* ./app/api/static/public + ''; + + nativeBuildInputs = [ + pnpm + pnpm.configHook + nodejs + ]; + + CGO_ENABLED = 0; + GOOS = "linux"; + doCheck = false; + + ldflags = [ + "-s" + "-w" + "-extldflags=-static" + "-X main.version=${version}" + "-X main.commit=${version}" + ]; + + meta = { + mainProgram = "api"; + homepage = "https://hay-kot.github.io/homebox/"; + description = "Inventory and organization system built for the Home User"; + maintainers = with lib.maintainers; [ patrickdag ]; + license = lib.licenses.agpl3Only; + platforms = lib.platforms.linux; + }; +} From f8639ea08de70e6dbfd859c8d84bde871f4b84db Mon Sep 17 00:00:00 2001 From: Patrick Date: Sat, 15 Jun 2024 15:19:11 +0200 Subject: [PATCH 017/338] nixos/homebox: init --- .../manual/release-notes/rl-2411.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/web-apps/homebox.nix | 98 +++++++++++++++++++ 3 files changed, 101 insertions(+) create mode 100644 nixos/modules/services/web-apps/homebox.nix diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 0587cd1a295e..352bf0c77727 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -49,6 +49,8 @@ - [Immersed VR](https://immersed.com/), a closed-source coworking platform. Available as [programs.immersed-vr](#opt-programs.immersed-vr.enable). +- [HomeBox](https://github.com/hay-kot/homebox/): the inventory and organization system built for the Home User. Available as [services.homebox](#opt-services.homebox.enable). + - [Renovate](https://github.com/renovatebot/renovate), a dependency updating tool for various git forges and language ecosystems. Available as [services.renovate](#opt-services.renovate.enable). - [Music Assistant](https://music-assistant.io/), a music library manager for your offline and online music sources which can easily stream your favourite music to a wide range of supported players. Available as [services.music-assistant](#opt-services.music-assistant.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 11b0b2dbb9be..5fd288cdfce5 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1414,6 +1414,7 @@ ./services/web-apps/healthchecks.nix ./services/web-apps/hedgedoc.nix ./services/web-apps/hledger-web.nix + ./services/web-apps/homebox.nix ./services/web-apps/honk.nix ./services/web-apps/icingaweb2/icingaweb2.nix ./services/web-apps/icingaweb2/module-monitoring.nix diff --git a/nixos/modules/services/web-apps/homebox.nix b/nixos/modules/services/web-apps/homebox.nix new file mode 100644 index 000000000000..ab5a927f6191 --- /dev/null +++ b/nixos/modules/services/web-apps/homebox.nix @@ -0,0 +1,98 @@ +{ + lib, + config, + pkgs, + ... +}: +let + cfg = config.services.homebox; + inherit (lib) + mkEnableOption + mkPackageOption + mkDefault + types + mkIf + ; +in +{ + options.services.homebox = { + enable = mkEnableOption "homebox"; + package = mkPackageOption pkgs "homebox" { }; + settings = lib.mkOption { + type = types.attrsOf types.str; + defaultText = '' + HBOX_STORAGE_DATA = "/var/lib/homebox/data"; + HBOX_STORAGE_SQLITE_URL = "/var/lib/homebox/data/homebox.db?_pragma=busy_timeout=999&_pragma=journal_mode=WAL&_fk=1"; + HBOX_OPTIONS_ALLOW_REGISTRATION = "false"; + HBOX_MODE = "production"; + ''; + description = '' + The homebox configuration as Environment variables. For definitions and available options see the upstream + [documentation](https://hay-kot.github.io/homebox/quick-start/#env-variables-configuration). + ''; + }; + }; + + config = mkIf cfg.enable { + users.users.homebox = { + isSystemUser = true; + group = "homebox"; + }; + users.groups.homebox = { }; + services.homebox.settings = { + HBOX_STORAGE_DATA = mkDefault "/var/lib/homebox/data"; + HBOX_STORAGE_SQLITE_URL = mkDefault "/var/lib/homebox/data/homebox.db?_pragma=busy_timeout=999&_pragma=journal_mode=WAL&_fk=1"; + HBOX_OPTIONS_ALLOW_REGISTRATION = mkDefault "false"; + HBOX_MODE = mkDefault "production"; + }; + systemd.services.homebox = { + after = [ "network.target" ]; + environment = cfg.settings; + serviceConfig = { + User = "homebox"; + Group = "homebox"; + ExecStart = lib.getExe cfg.package; + StateDirectory = "homebox"; + WorkingDirectory = "/var/lib/homebox"; + LimitNOFILE = "1048576"; + PrivateTmp = true; + PrivateDevices = true; + StateDirectoryMode = "0700"; + Restart = "always"; + + # Hardening + CapabilityBoundingSet = ""; + LockPersonality = true; + MemoryDenyWriteExecute = true; + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProcSubset = "pid"; + ProtectSystem = "strict"; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_NETLINK" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "@pkey" + ]; + RestrictSUIDSGID = true; + PrivateMounts = true; + UMask = "0077"; + }; + wantedBy = [ "multi-user.target" ]; + }; + }; + meta.maintainers = with lib.maintainers; [ patrickdag ]; +} From ea4107aba089d07208e97390c478496e60ed2787 Mon Sep 17 00:00:00 2001 From: Patrick Date: Sat, 15 Jun 2024 15:25:40 +0200 Subject: [PATCH 018/338] nixosTest.homebox: init --- nixos/tests/all-tests.nix | 1 + nixos/tests/homebox.nix | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 nixos/tests/homebox.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 8286164aea9b..d63e33ce9a60 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -420,6 +420,7 @@ in { hddfancontrol = handleTest ./hddfancontrol.nix {}; hedgedoc = handleTest ./hedgedoc.nix {}; herbstluftwm = handleTest ./herbstluftwm.nix {}; + homebox = handleTest ./homebox.nix {}; homepage-dashboard = handleTest ./homepage-dashboard.nix {}; honk = runTest ./honk.nix; installed-tests = pkgs.recurseIntoAttrs (handleTest ./installed-tests {}); diff --git a/nixos/tests/homebox.nix b/nixos/tests/homebox.nix new file mode 100644 index 000000000000..2d14a153c976 --- /dev/null +++ b/nixos/tests/homebox.nix @@ -0,0 +1,26 @@ +import ./make-test-python.nix ( + { pkgs, ... }: + let + port = "7745"; + in + { + name = "homebox"; + meta = with pkgs.lib.maintainers; { + maintainers = [ patrickdag ]; + }; + nodes.machine = { + services.homebox = { + enable = true; + settings.HBOX_WEB_PORT = port; + }; + }; + testScript = '' + machine.wait_for_unit("homebox.service") + machine.wait_for_open_port(${port}) + + machine.succeed("curl --fail -X GET 'http://localhost:${port}/'") + out = machine.succeed("curl --fail 'http://localhost:${port}/api/v1/status'") + assert '"health":true' in out + ''; + } +) From ce2cf87cb38a4d45674cf7e8125dca60fb85b954 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 11 Aug 2024 02:21:12 +0000 Subject: [PATCH 019/338] python312Packages.glcontext: 2.5.0 -> 3.0.0 --- pkgs/development/python-modules/glcontext/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/glcontext/default.nix b/pkgs/development/python-modules/glcontext/default.nix index a62e403fc260..fa0194872f45 100644 --- a/pkgs/development/python-modules/glcontext/default.nix +++ b/pkgs/development/python-modules/glcontext/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "glcontext"; - version = "2.5.0"; + version = "3.0.0"; format = "setuptools"; src = fetchFromGitHub { owner = "moderngl"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ld+INKIGDZA2Y+sTxDPY7MI1nru6x+FeixngaJQzKkg="; + hash = "sha256-GC2sb6xQjg99xLcXSynLOOyyqNwCHZwZqrs9RZh99pY="; }; disabled = !isPy3k; From c12ad36c0716b5bb563f9eca78ede709dbc886e6 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 11 Aug 2024 18:15:48 +1200 Subject: [PATCH 020/338] python3.pkgs.ezdxf: 0.18.1 -> 1.3.2 --- .../python-modules/ezdxf/default.nix | 54 +++++++++++++------ 1 file changed, 38 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/ezdxf/default.nix b/pkgs/development/python-modules/ezdxf/default.nix index a25d4c865ec3..74e051910777 100644 --- a/pkgs/development/python-modules/ezdxf/default.nix +++ b/pkgs/development/python-modules/ezdxf/default.nix @@ -6,12 +6,22 @@ pyparsing, typing-extensions, pytestCheckHook, + setuptools, + cython, + numpy, + fonttools, + pillow, + pyside6, + matplotlib, + pymupdf, + pyqt5, }: buildPythonPackage rec { - version = "0.18.1"; + version = "1.3.2"; pname = "ezdxf"; - format = "setuptools"; + + pyproject = true; disabled = pythonOlder "3.5"; @@ -19,28 +29,40 @@ buildPythonPackage rec { owner = "mozman"; repo = "ezdxf"; rev = "refs/tags/v${version}"; - hash = "sha256-x1p9dWrbDtDreXdBuzOA4Za+ZC40y4xdEU7MGb9uUec="; + hash = "sha256-BzdLl2GjLh2ABJzJ6bhdbic9jlSABIVR3XGrYiLJHa0="; }; - propagatedBuildInputs = [ + dependencies = [ pyparsing typing-extensions + numpy + fonttools ]; + optional-dependencies = { + draw = [ + pyside6 + matplotlib + pymupdf + pillow + ]; + draw5 = [ + pyqt5 + matplotlib + pymupdf + pillow + ]; + }; + + build-system = [ + setuptools + cython + ]; + + checkInputs = [ pillow ]; + nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = [ - # requires geomdl dependency - "TestNurbsPythonCorrectness" - "test_rational_spline_curve_points_by_nurbs_python" - "test_rational_spline_derivatives_by_nurbs_python" - "test_from_nurbs_python_curve_to_ezdxf_bspline" - "test_from_ezdxf_bspline_to_nurbs_python_curve_non_rational" - "test_from_ezdxf_bspline_to_nurbs_python_curve_rational" - # AssertionError: assert 44.99999999999999 == 45 - "test_dimension_transform_interface" - ]; - pythonImportsCheck = [ "ezdxf" "ezdxf.addons" From 167c21d3906a5e715732e821ebd31d993a8a7281 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Aug 2024 05:18:32 +0000 Subject: [PATCH 021/338] vivaldi: 6.8.3381.48 -> 6.8.3381.53 --- pkgs/applications/networking/browsers/vivaldi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 33ef7b519618..5e4f1f9a774a 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -24,7 +24,7 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "6.8.3381.48"; + version = "6.8.3381.53"; suffix = { aarch64-linux = "arm64"; @@ -34,8 +34,8 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb"; hash = { - aarch64-linux = "sha256-VLX2nWcpwWqI5QtBFyXRieaO+kLXMeeyWwFIVgz8XIo="; - x86_64-linux = "sha256-ZlrL4eOQnQjIBzOiLLDHZFjf6nr9KiyapZmqJFkDqX8="; + aarch64-linux = "sha256-wcfEaUcl/FUhhrp977/xg5+dE+93vy8wn5x6m8qX1EU="; + x86_64-linux = "sha256-6WLGvd9Kp6fRG1HxMOjK4MhK4eoYjwEgYGJROI7lM2Y="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; From 826006153a2098c5b3e0fd0557ca6a63f578148a Mon Sep 17 00:00:00 2001 From: Pratham Patel Date: Mon, 12 Aug 2024 13:40:25 +0530 Subject: [PATCH 022/338] ubootNanoPCT6: include the SPI binary --- pkgs/misc/uboot/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 8c2fcb2eba53..295cb525a646 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -303,7 +303,7 @@ in { extraMeta.platforms = ["aarch64-linux"]; BL31 = "${armTrustedFirmwareRK3588}/bl31.elf"; ROCKCHIP_TPL = rkbin.TPL_RK3588; - filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" ]; + filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" "u-boot-rockchip-spi.bin" ]; }; ubootNovena = buildUBoot { From 8fb4a5eb334c11944443e5c704c00b1b39232079 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Aug 2024 12:59:53 +0000 Subject: [PATCH 023/338] anilibria-winmaclinux: 1.2.17 -> 2.2.18 --- pkgs/applications/video/anilibria-winmaclinux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/anilibria-winmaclinux/default.nix b/pkgs/applications/video/anilibria-winmaclinux/default.nix index b9679d1fd49f..336931662171 100644 --- a/pkgs/applications/video/anilibria-winmaclinux/default.nix +++ b/pkgs/applications/video/anilibria-winmaclinux/default.nix @@ -18,13 +18,13 @@ mkDerivation rec { pname = "anilibria-winmaclinux"; - version = "1.2.17"; + version = "2.2.18"; src = fetchFromGitHub { owner = "anilibria"; repo = "anilibria-winmaclinux"; rev = version; - hash = "sha256-Ij4F5UCt1YOB4MLTlUTAiTt2zN4TkJuf5v6sWb9pJ6k="; + hash = "sha256-gFIz2tkuBaC4DoN/oVNra5pQi23MAuhFJRGxEcZgvAo="; }; sourceRoot = "${src.name}/src"; From 6fd55442d257c9b06a3193f30f2c6beca0486197 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Aug 2024 14:44:15 +0000 Subject: [PATCH 024/338] python312Packages.labgrid: 23.0.6 -> 24.0 --- pkgs/development/python-modules/labgrid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/labgrid/default.nix b/pkgs/development/python-modules/labgrid/default.nix index b283a72b09ed..57e1a751cd52 100644 --- a/pkgs/development/python-modules/labgrid/default.nix +++ b/pkgs/development/python-modules/labgrid/default.nix @@ -27,13 +27,13 @@ buildPythonPackage rec { pname = "labgrid"; - version = "23.0.6"; + version = "24.0"; src = fetchFromGitHub { owner = "labgrid-project"; repo = "labgrid"; rev = "refs/tags/v${version}"; - hash = "sha256-UAfBzQZeFNs2UJSFb5fH5wHXQoVU/dOTFciR0/UB7vc="; + hash = "sha256-XlndAmLkDjb4S2BD85noTMJCeqa5srZocjgg1x6Ry/g="; }; nativeBuildInputs = [ From 962de89f360b3de31810fdda68a55d5eeb9ee91b Mon Sep 17 00:00:00 2001 From: nebunebu Date: Mon, 12 Aug 2024 15:38:24 -0400 Subject: [PATCH 025/338] vimPlugins.fortune-nvim: init at 2024-08-12 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 5962c50c411f..48148add1a69 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -3923,6 +3923,18 @@ final: prev: meta.homepage = "https://github.com/megaannum/forms/"; }; + fortune-nvim = buildVimPlugin { + pname = "fortune.nvim"; + version = "2024-07-18"; + src = fetchFromGitHub { + owner = "rubiin"; + repo = "fortune.nvim"; + rev = "29a99fbf887a2d48693f1eaa1893f84cde60af54"; + sha256 = "0kyi2pl5d1h7ycxsdvqdyg5zmjfxj7jpx7lk3bf2d14wvnvcwpb4"; + }; + meta.homepage = "https://github.com/rubiin/fortune.nvim/"; + }; + friendly-snippets = buildVimPlugin { pname = "friendly-snippets"; version = "2024-07-15"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 4240139d51b2..f2fd41dd8e43 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -326,6 +326,7 @@ https://github.com/akinsho/flutter-tools.nvim/,HEAD, https://github.com/anuvyklack/fold-preview.nvim/,HEAD, https://github.com/mhartington/formatter.nvim/,, https://github.com/megaannum/forms/,, +https://github.com/rubiin/fortune.nvim/,HEAD, https://github.com/rafamadriz/friendly-snippets/,, https://github.com/raghur/fruzzy/,, https://github.com/shumphrey/fugitive-gitlab.vim/,, From 44680ad88a52153d8c7523e0e02360f3d53fac3a Mon Sep 17 00:00:00 2001 From: nebunebu Date: Mon, 12 Aug 2024 16:18:20 -0400 Subject: [PATCH 026/338] vimPlugins.img-clip-nvim: init at 2024-08-12 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 5962c50c411f..3ea806dba5f5 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -4905,6 +4905,18 @@ final: prev: meta.homepage = "https://github.com/3rd/image.nvim/"; }; + img-clip-nvim = buildVimPlugin { + pname = "img-clip.nvim"; + version = "2024-06-05"; + src = fetchFromGitHub { + owner = "HakonHarnes"; + repo = "img-clip.nvim"; + rev = "1924e20ab19afec9779109d083b6e5f8bee8fb17"; + sha256 = "0q4bv6bca8bhkc98gc4lmlp3b2nrh6bj7yyb99bk3lnccr0jmj6g"; + }; + meta.homepage = "https://github.com/HakonHarnes/img-clip.nvim/"; + }; + impatient-nvim = buildVimPlugin { pname = "impatient.nvim"; version = "2023-05-05"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 4240139d51b2..cf7205fb53da 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -411,6 +411,7 @@ https://github.com/ShinKage/idris2-nvim/,, https://github.com/edwinb/idris2-vim/,, https://github.com/3rd/image.nvim/,HEAD, https://github.com/samodostal/image.nvim/,HEAD,samodostal-image-nvim +https://github.com/HakonHarnes/img-clip.nvim/,HEAD, https://github.com/lewis6991/impatient.nvim/,, https://github.com/backdround/improved-search.nvim/,HEAD, https://github.com/smjonas/inc-rename.nvim/,HEAD, From 34acc85ab7a245cee8fdf57d17c4fb750dc25146 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Aug 2024 00:32:43 +0000 Subject: [PATCH 027/338] clusterctl: 1.7.4 -> 1.8.0 --- pkgs/applications/networking/cluster/clusterctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix index 03188bd6eeca..6b144b683d0e 100644 --- a/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.7.4"; + version = "1.8.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - hash = "sha256-ziW+ROuUmrgsIWHXKL2Yw+9gC6VgE/7Ri3zc3sveyU8="; + hash = "sha256-x82ek6KsfmVjG9P9EaGlvbncGaORqMB2lMxannZT4YE="; }; - vendorHash = "sha256-ALRnccGjPGuAITtuz79Cao95NhvSczAzspSMXytlw+A="; + vendorHash = "sha256-z859ZjuvY53HqHXNo8zZkK9XAtMOxh57FeXgGfno3G0="; subPackages = [ "cmd/clusterctl" ]; From 6861b55933c1267c1cbccf1ad20cbe27d40ec57b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Aug 2024 02:23:44 +0000 Subject: [PATCH 028/338] git-town: 15.0.0 -> 15.1.0 --- pkgs/applications/version-management/git-town/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-town/default.nix b/pkgs/applications/version-management/git-town/default.nix index c1927d61e026..3654aadaf156 100644 --- a/pkgs/applications/version-management/git-town/default.nix +++ b/pkgs/applications/version-management/git-town/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-town"; - version = "15.0.0"; + version = "15.1.0"; src = fetchFromGitHub { owner = "git-town"; repo = "git-town"; rev = "v${version}"; - hash = "sha256-Gp2X9DCnueSVbeqFBNxLfvlXh4PzlybVdh8xKjaFICQ="; + hash = "sha256-e4lOyYQHsVOmOYKQ+3B2EdneWL8NEzboTlRKtO8Wdjg="; }; vendorHash = null; From 1eb9a41b76e6c7b72d7d8088b5d62ebcaa662251 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Aug 2024 03:28:19 +0000 Subject: [PATCH 029/338] python312Packages.db-dtypes: 1.2.0 -> 1.3.0 --- pkgs/development/python-modules/db-dtypes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/db-dtypes/default.nix b/pkgs/development/python-modules/db-dtypes/default.nix index 4f7eff5b9a73..efd3e6f7bb76 100644 --- a/pkgs/development/python-modules/db-dtypes/default.nix +++ b/pkgs/development/python-modules/db-dtypes/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "db-dtypes"; - version = "1.2.0"; + version = "1.3.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "googleapis"; repo = "python-db-dtypes-pandas"; rev = "refs/tags/v${version}"; - hash = "sha256-FVRqh30mYVfC8zuhPteuvqGYGTp3PW+pi1bquUjYFAg="; + hash = "sha256-DjLgzJ/OivrhHJQGBkIiRNJyi5xWLFp9nBEetD8H0YY="; }; nativeBuildInputs = [ setuptools ]; From 21ba6aa081b580224e019ced03071918469122a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Aug 2024 04:06:37 +0000 Subject: [PATCH 030/338] seclists: 2024.2 -> 2024.3 --- pkgs/by-name/se/seclists/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/se/seclists/package.nix b/pkgs/by-name/se/seclists/package.nix index cb2341796cc0..8ed7f7b15b47 100644 --- a/pkgs/by-name/se/seclists/package.nix +++ b/pkgs/by-name/se/seclists/package.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation { pname = "seclists"; - version = "2024.2"; + version = "2024.3"; src = fetchFromGitHub { owner = "danielmiessler"; repo = "SecLists"; - rev = "2024.2"; - hash = "sha256-qqXOLuZOj+mF7kXrdO62HZTrGsyepOSWr5v6j4WFGcc="; + rev = "2024.3"; + hash = "sha256-Ffd4jpV8F6rtMQVqsu+8X/QU5rwbKXv0zkOCmUuhP8I="; }; installPhase = '' From 3aee854b9f1129100640861ed78e76fb02f252b8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 13 Aug 2024 08:27:20 +0200 Subject: [PATCH 031/338] python312Packages.db-dtypes: refactor --- pkgs/development/python-modules/db-dtypes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/db-dtypes/default.nix b/pkgs/development/python-modules/db-dtypes/default.nix index efd3e6f7bb76..c082433f9f3c 100644 --- a/pkgs/development/python-modules/db-dtypes/default.nix +++ b/pkgs/development/python-modules/db-dtypes/default.nix @@ -25,9 +25,9 @@ buildPythonPackage rec { hash = "sha256-DjLgzJ/OivrhHJQGBkIiRNJyi5xWLFp9nBEetD8H0YY="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ numpy packaging pandas From 683b48c4ab14eb2c3a0fbd3dc8d8b2aec3ffd099 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 13 Aug 2024 16:26:20 +0200 Subject: [PATCH 032/338] ssh-tools: 1.7 -> 1.8-unstable-2024-03-18 --- pkgs/applications/misc/ssh-tools/default.nix | 36 +++++++++++++------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/ssh-tools/default.nix b/pkgs/applications/misc/ssh-tools/default.nix index 2e79f69656f9..3e0b7e50d93e 100644 --- a/pkgs/applications/misc/ssh-tools/default.nix +++ b/pkgs/applications/misc/ssh-tools/default.nix @@ -1,24 +1,36 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitea, installShellFiles, perl }: -stdenv.mkDerivation rec { +buildGoModule rec { pname = "ssh-tools"; - version = "1.7"; + version = "1.8-unstable-2024-03-18"; - src = fetchFromGitHub { + src = fetchFromGitea { + domain = "codeberg.org"; owner = "vaporup"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-PDoljR/e/qraPhG9RRjHx1gBIMtTJ815TZDJws8Qg6o="; + repo = "ssh-tools"; + rev = "69c73844b2498c46f1293b129808bfdce8822c28"; + hash = "sha256-cG75Jn331G0HZZyrE+JWC05f6DgYBz6sx8MTCxsG/vw="; }; - installPhase = '' - mkdir -p $out/bin - cp ssh-* $out/bin/ + vendorHash = "sha256-GSFhz3cIRl4XUA18HUeUkrw+AJyOkU3ZrZKYTGsWbug="; + + subPackages = [ + "cmd/go/ssh-authorized-keys" + "cmd/go/ssh-sig" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + buildInputs = [ perl ]; + + postInstall = '' + install cmd/{bash,perl}/ssh-*/ssh-* -t $out/bin + installManPage man/*.1 ''; meta = with lib; { - description = "Collection of various tools using ssh"; - homepage = "https://github.com/vaporup/ssh-tools/"; + description = "Making SSH more convenient"; + homepage = "https://codeberg.org/vaporup/ssh-tools"; license = licenses.gpl3Only; maintainers = with maintainers; [ SuperSandro2000 ]; }; From a2e091225efa65785aa833bf67cda7516909635e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Aug 2024 21:56:41 +0000 Subject: [PATCH 033/338] python312Packages.gtts: 2.5.2 -> 2.5.3 --- pkgs/development/python-modules/gtts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gtts/default.nix b/pkgs/development/python-modules/gtts/default.nix index a2533376cc5f..d4d724c4b8c5 100644 --- a/pkgs/development/python-modules/gtts/default.nix +++ b/pkgs/development/python-modules/gtts/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "gtts"; - version = "2.5.2"; + version = "2.5.3"; pyproject = true; src = fetchFromGitHub { owner = "pndurette"; repo = "gTTS"; rev = "refs/tags/v${version}"; - hash = "sha256-4GIrj5pIk27euo2gzSKpRQaXNyI6aH0E6HNAivJthCE="; + hash = "sha256-8FPKAMVXqw/4X050tAnOAx/wGboZPPJs72VwwaOEamE="; }; build-system = [ setuptools ]; From 7e83ec1606a27b3a2b00e8aaa839d18921fca5c2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 14 Aug 2024 08:30:57 +0000 Subject: [PATCH 034/338] tlaplus: 1.7.3 -> 1.7.4 --- pkgs/applications/science/logic/tlaplus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/tlaplus/default.nix b/pkgs/applications/science/logic/tlaplus/default.nix index f478bf204d4f..f53da73e1e63 100644 --- a/pkgs/applications/science/logic/tlaplus/default.nix +++ b/pkgs/applications/science/logic/tlaplus/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tlaplus"; - version = "1.7.3"; + version = "1.7.4"; src = fetchurl { url = "https://github.com/tlaplus/tlaplus/releases/download/v${version}/tla2tools.jar"; - sha256 = "sha256-5P8V6oH05voSXAgwBDclSxdxdMalrfaNpElkar4IUZ0="; + sha256 = "sha256-k2omIGHJFGlN/WaaVDviRXPEXVqg/yCouWsj0B4FDog="; }; nativeBuildInputs = [ makeWrapper ]; From ed2ade73c5ca68bf40fa98272b104475c6c8eb69 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 14 Aug 2024 13:01:27 +0000 Subject: [PATCH 035/338] gauge-unwrapped: 1.6.7 -> 1.6.8 --- pkgs/development/tools/gauge/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix index 456e5f8ad721..7a46966e90e7 100644 --- a/pkgs/development/tools/gauge/default.nix +++ b/pkgs/development/tools/gauge/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "gauge"; - version = "1.6.7"; + version = "1.6.8"; patches = [ # adds a check which adds an error message when trying to @@ -14,10 +14,10 @@ buildGoModule rec { owner = "getgauge"; repo = "gauge"; rev = "v${version}"; - hash = "sha256-+6b34nCuoBGd9v9eoAgthxYboGWDM8rCU56VXpVKdQc="; + hash = "sha256-ifE+6lwBYVZl0eAOCUTrqqTwVnKvCB44AHXTyLhsMX8="; }; - vendorHash = "sha256-VVHsldLfLrdufSBLbgSlniYK1+64651DL8gzw5VHans="; + vendorHash = "sha256-yh7hAKmt2qn2jmPKGF+ATvZd4miNHuHsKlFNaWibTJQ="; excludedPackages = [ "build" "man" ]; From a1553e1c2753c418ccbfde68c969510e43056675 Mon Sep 17 00:00:00 2001 From: RoyDubnium <72664566+RoyDubnium@users.noreply.github.com> Date: Wed, 31 Jul 2024 14:10:22 +0100 Subject: [PATCH 036/338] qdiskinfo: init at 0.2 --- pkgs/by-name/qd/qdiskinfo/package.nix | 50 +++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 pkgs/by-name/qd/qdiskinfo/package.nix diff --git a/pkgs/by-name/qd/qdiskinfo/package.nix b/pkgs/by-name/qd/qdiskinfo/package.nix new file mode 100644 index 000000000000..bc51e1880b74 --- /dev/null +++ b/pkgs/by-name/qd/qdiskinfo/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + smartmontools, + fetchFromGitHub, + cmake, + qt6, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "QDiskInfo"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "edisionnano"; + repo = "QDiskInfo"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-YLNpQOmh/exBJDuYRUEvzNv/El4x+PttEoj+aCur9wg="; + }; + + nativeBuildInputs = [ + cmake + qt6.wrapQtAppsHook + ]; + + buildInputs = [ + qt6.qtbase + qt6.qtwayland + smartmontools + ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE:STRING=MinSizeRel" + "-DQT_VERSION_MAJOR=6" + ]; + + postInstall = '' + wrapProgram $out/bin/QDiskInfo \ + --prefix PATH : ${smartmontools}/bin + ''; + + meta = { + description = "CrystalDiskInfo alternative for Linux"; + homepage = "https://github.com/edisionnano/QDiskInfo"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ roydubnium ]; + platforms = lib.platforms.linux; + mainProgram = "QDiskInfo"; + }; +}) From 18a3efa4dda58e9292a91b9c111afd35c99aa829 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 14 Aug 2024 18:44:40 +0000 Subject: [PATCH 037/338] uxn: 1.0-unstable-2024-08-05 -> 1.0-unstable-2024-08-12 --- pkgs/by-name/ux/uxn/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ux/uxn/package.nix b/pkgs/by-name/ux/uxn/package.nix index 19be29bf14f1..12d0ce05bca7 100644 --- a/pkgs/by-name/ux/uxn/package.nix +++ b/pkgs/by-name/ux/uxn/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "uxn"; - version = "1.0-unstable-2024-08-05"; + version = "1.0-unstable-2024-08-12"; src = fetchFromSourcehut { owner = "~rabbits"; repo = "uxn"; - rev = "a9d7ff23a533ee354fcbc5a1260296a6b0ecfefa"; - hash = "sha256-VPIgS127ewX5yTZEZZgUZYAXqbCfSa+AMtFMufdQMWo="; + rev = "3a901ed0beeaf5e3268a40779f2944ef99f93774"; + hash = "sha256-JlDNiKcaZG2OYeiVlIovEIDN/h7ET5d0M83vlHMQQK4="; }; outputs = [ "out" "projects" ]; From 3e2c2e9bd4502a52425b776e4b5bba5cc8316e5b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Aug 2024 00:03:22 +0000 Subject: [PATCH 038/338] crun: 1.16 -> 1.16.1 --- pkgs/applications/virtualization/crun/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index 81a6a5bceedb..8b375e1e4c42 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -39,13 +39,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "1.16"; + version = "1.16.1"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - hash = "sha256-/dGnmZAFQ/e6EEfz8g75Eiefi2uz94moirWMLZRumdg="; + hash = "sha256-OhDzScs8xGs7kRn/xZRPwyqIszD0OuuY4ymrJ9QVDvM="; fetchSubmodules = true; }; From 0ce104e9b6eb474937ed9d9080ebf1227e4f3717 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Aug 2024 00:26:48 +0000 Subject: [PATCH 039/338] atmos: 1.85.0 -> 1.86.0 --- pkgs/applications/networking/cluster/atmos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/atmos/default.nix b/pkgs/applications/networking/cluster/atmos/default.nix index ab481ba74cb3..82bbd7b202bb 100644 --- a/pkgs/applications/networking/cluster/atmos/default.nix +++ b/pkgs/applications/networking/cluster/atmos/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "atmos"; - version = "1.85.0"; + version = "1.86.0"; src = fetchFromGitHub { owner = "cloudposse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nIW7Wt4mThxjnHHF+rD6q9vZ7KsB//nSpkWtkiTo16Y="; + sha256 = "sha256-IlvIZMfsANw6+BrVObn0pBcoEcSKXVcN1V3B0f4BDno="; }; - vendorHash = "sha256-swQN0WjVfLo/LjZrvjX46CnfBGnrVzLj8Cv4IP0eL7Y="; + vendorHash = "sha256-87C3MPKlYVnpNJvPJY9eCrSy8qfP8Kj36a9vi+kiP44="; ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ]; From 5d09f6ef7f2e73caffd83bd88f9b13987338952d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Aug 2024 01:03:42 +0000 Subject: [PATCH 040/338] glider: 0.16.3 -> 0.16.4 --- pkgs/by-name/gl/glider/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gl/glider/package.nix b/pkgs/by-name/gl/glider/package.nix index 55304ada4c98..67eecb21c7b8 100644 --- a/pkgs/by-name/gl/glider/package.nix +++ b/pkgs/by-name/gl/glider/package.nix @@ -4,16 +4,16 @@ }: buildGoModule rec { pname = "glider"; - version = "0.16.3"; + version = "0.16.4"; src = fetchFromGitHub { owner = "nadoo"; repo = "glider"; rev = "v${version}"; - hash = "sha256-nM6jKFqyaxZbn0wyEt0xy9uTu9JyLRfGTNsGPTQOXQw="; + hash = "sha256-LrIHdI1/55llENjDgFJxh2KKsJf/tLT3P9L9jhLhfS0="; }; - vendorHash = "sha256-PGIBBop/waZDeQvW7iSi/AzLye/4t7nNXjX8zJsS2eo="; + vendorHash = "sha256-v/HJUah+QC34hcf9y5yRSFO8OTkqD2wzdOH/wIXrKoA="; ldflags = [ "-s" From b7e9d5d6fd95789ce35e2970413ced5a118f1ffe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Aug 2024 02:46:31 +0000 Subject: [PATCH 041/338] python312Packages.i-pi: 2.6.1 -> 3.0 --- pkgs/development/python-modules/i-pi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/i-pi/default.nix b/pkgs/development/python-modules/i-pi/default.nix index 03e1f5dd4613..41a9ba22fd46 100644 --- a/pkgs/development/python-modules/i-pi/default.nix +++ b/pkgs/development/python-modules/i-pi/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "i-pi"; - version = "2.6.1"; + version = "3.0"; format = "setuptools"; src = fetchFromGitHub { owner = "i-pi"; repo = "i-pi"; rev = "refs/tags/v${version}"; - sha256 = "sha256-c1bs8ZI/dfDwKx5Df8ndtsDxESQrdbMkvrjfI6b9JTg="; + sha256 = "sha256-SJ0qTwwdIOR1nXs9MV6O1oxJPR6/6H86wscDy/sLc/g="; }; nativeBuildInputs = [ From 6ddeb4fca5e571c2b286b9347e2924e156894cf0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Aug 2024 04:20:29 +0000 Subject: [PATCH 042/338] klipper: 0.12.0-unstable-2024-08-03 -> 0.12.0-unstable-2024-08-14 --- pkgs/servers/klipper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index 65f018e0b0d4..5bca109ec16c 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "klipper"; - version = "0.12.0-unstable-2024-08-03"; + version = "0.12.0-unstable-2024-08-14"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "d7d9092a920b3bd2bede4b570c66ddaa52df3f19"; - sha256 = "sha256-ZCrAy3Il8kCCBvEGF29Uoo/HpZRZE8CNUaveozYwA1c="; + rev = "d81eb557d7f2aad5e22e3633fbcd53a4d60ac5d1"; + sha256 = "sha256-O6W2xiG5rZzD/40ytIFo4HovKq0ml0oCV6amcAQhoUs="; }; sourceRoot = "${src.name}/klippy"; From 3ba1a4af4cc3cfa49a9d5715bb4efe7689d8578d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Aug 2024 06:14:36 +0000 Subject: [PATCH 043/338] pocketbase: 0.22.18 -> 0.22.19 --- pkgs/servers/pocketbase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix index 80188ec6637f..009c9b42ed98 100644 --- a/pkgs/servers/pocketbase/default.nix +++ b/pkgs/servers/pocketbase/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.22.18"; + version = "0.22.19"; src = fetchFromGitHub { owner = "pocketbase"; repo = "pocketbase"; rev = "v${version}"; - hash = "sha256-XR1A4ViYeguXg9qynUWpjRkfgm4vaHR6mZGWSbx89Bs="; + hash = "sha256-FQEQrXOUo/EtMc5Jy8yAxwxSFnLgwfv5muksId5m4AY="; }; vendorHash = "sha256-9i4ieAlrhtnFhCJvIJyS+9GJfq1bX4BE45vV2SvhY2s="; From a926749e1998166afc024376013a976f545c7834 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Aug 2024 10:54:01 +0000 Subject: [PATCH 044/338] eigenlayer: 0.9.3 -> 0.10.0 --- pkgs/by-name/ei/eigenlayer/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ei/eigenlayer/package.nix b/pkgs/by-name/ei/eigenlayer/package.nix index 92f1ed47cf39..9ee5fe949590 100644 --- a/pkgs/by-name/ei/eigenlayer/package.nix +++ b/pkgs/by-name/ei/eigenlayer/package.nix @@ -6,16 +6,16 @@ }: buildGoModule rec { pname = "eigenlayer"; - version = "0.9.3"; + version = "0.10.0"; src = fetchFromGitHub { owner = "Layr-Labs"; repo = "eigenlayer-cli"; rev = "v${version}"; - hash = "sha256-NUO6WgiBljd4mbz7K5XX/z27L0j5ZYcOvt97ERFYZts="; + hash = "sha256-bn61E2oKkeQTLeckAdQcX7h8rYLJZF+Cd4AtVbsH/KA="; }; - vendorHash = "sha256-nQcUyxrdGbwqaFeEEfoc15zffrQG6WuEhF7YZkpGADs="; + vendorHash = "sha256-Yrj+UkZL+8yHQdzIS8fI6fPLcdAHpcL9PV9Ql8P0Pfo="; ldflags = ["-s" "-w"]; subPackages = ["cmd/eigenlayer"]; From 236429aa49e9ccfd6407da5f6b9cb092a49a8273 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Aug 2024 11:13:12 +0000 Subject: [PATCH 045/338] supabase-cli: 1.188.0 -> 1.190.0 --- pkgs/development/tools/supabase-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/supabase-cli/default.nix b/pkgs/development/tools/supabase-cli/default.nix index 6b351f69cef3..f60be0c287f1 100644 --- a/pkgs/development/tools/supabase-cli/default.nix +++ b/pkgs/development/tools/supabase-cli/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "supabase-cli"; - version = "1.188.0"; + version = "1.190.0"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - hash = "sha256-egkph143V0WDxJTvB7fBj7F7+8fHVGAhJohCkIeDfz4="; + hash = "sha256-n5fIvt6eeSZBStFR/GE9YG8s56ZyCBGzFCpjuyMpujY="; }; - vendorHash = "sha256-VhNGdax43GYtsZxsHqJWgwWa9/r+IWPg0WiA3jl3NN0="; + vendorHash = "sha256-RiSZaNbMwOmKGzgFpeLmAjsiNg1ADMNAtMH7wHj/vlw="; ldflags = [ "-s" From 598f10afeb70ae61475c55b7f872d7f4cfb40726 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Aug 2024 03:06:07 +0200 Subject: [PATCH 046/338] microcodeIntel: 20240531 -> 20240813 https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases/tag/microcode-20240813 --- pkgs/os-specific/linux/microcode/intel.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index eea619f78356..8e807b990d3e 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "microcode-intel"; - version = "20240531"; + version = "20240813"; src = fetchFromGitHub { owner = "intel"; repo = "Intel-Linux-Processor-Microcode-Data-Files"; rev = "microcode-${version}"; - hash = "sha256-64vcEc3UiiV5Rg4Eh3Wsi/WSCj5DbjvZBzKLr7EgNOU="; + hash = "sha256-O2UWa04MnU9ndzvWy8fruOTm85PexEd+i1McQNz6uFE="; }; nativeBuildInputs = [ iucode-tool libarchive ]; From c8f2aa25e89d5f79a9cfd39c7412879bc400380f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Aug 2024 12:06:11 +0000 Subject: [PATCH 047/338] circt: 1.80.1 -> 1.81.1 --- pkgs/development/compilers/circt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/circt/default.nix b/pkgs/development/compilers/circt/default.nix index 2cf630ceae19..e8be6989a771 100644 --- a/pkgs/development/compilers/circt/default.nix +++ b/pkgs/development/compilers/circt/default.nix @@ -18,12 +18,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.80.1"; + version = "1.81.1"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - hash = "sha256-Vqucix0hil9isi4/+DLC4tq8XLVeiFUEMBeJfkZMEpI="; + hash = "sha256-MDmCsDXc4ohqz+btqbWhhq0PoTNqE6MfVpzrjIoS4rU="; fetchSubmodules = true; }; From 3824af8bc4c978b2c37ab3cc111af2d328ade81b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Aug 2024 14:18:55 +0000 Subject: [PATCH 048/338] licensure: 0.4.1 -> 0.5.0 --- pkgs/by-name/li/licensure/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/licensure/package.nix b/pkgs/by-name/li/licensure/package.nix index 9798bc0d8f36..2d5f3aba27ee 100644 --- a/pkgs/by-name/li/licensure/package.nix +++ b/pkgs/by-name/li/licensure/package.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage rec { pname = "licensure"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "chasinglogic"; repo = "licensure"; rev = version; - hash = "sha256-1ncQjg/loYX9rAGP4FzI0ttd+GMPLkNPlJ6Xzb7umr0="; + hash = "sha256-y7pay64bM1FTjjtJg4hGC45BDbyXUBXBLFUDe0q2k0U="; }; - cargoHash = "sha256-449p+y7qUcTxBOttyQPt+nRtK+s9HJBoVKGdMQaszLQ="; + cargoHash = "sha256-ukNMlz6FnI6otPGiKLphZDEFXujAHb1P5PAt8dgSJ+U="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl git gitls ] ++ lib.optionals stdenv.isDarwin [ From 1e0c73b25b4976c340f29c8541b732d353f8b608 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Aug 2024 14:48:13 +0000 Subject: [PATCH 049/338] lxgw-neoxihei: 1.124 -> 1.200 --- pkgs/by-name/lx/lxgw-neoxihei/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lx/lxgw-neoxihei/package.nix b/pkgs/by-name/lx/lxgw-neoxihei/package.nix index f1f4b5a5e587..a96569c04bd0 100644 --- a/pkgs/by-name/lx/lxgw-neoxihei/package.nix +++ b/pkgs/by-name/lx/lxgw-neoxihei/package.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-neoxihei"; - version = "1.124"; + version = "1.200"; src = fetchurl { url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf"; - hash = "sha256-dvdzbUYFOuqBww03Dh8t3ocTJBzvZPlcAjwdFbDm9Ys="; + hash = "sha256-8m+19lJNdg+mBvvHAig8NyZ4AOC2NE3k7rll7u32cuw="; }; dontUnpack = true; From e461289e1424e6c1dae5878db7a5f065bf452506 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Aug 2024 14:54:51 +0000 Subject: [PATCH 050/338] python312Packages.asgi-csrf: 0.9 -> 0.10 --- pkgs/development/python-modules/asgi-csrf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/asgi-csrf/default.nix b/pkgs/development/python-modules/asgi-csrf/default.nix index d7b7a4c03fd2..6d2692ca243e 100644 --- a/pkgs/development/python-modules/asgi-csrf/default.nix +++ b/pkgs/development/python-modules/asgi-csrf/default.nix @@ -12,7 +12,7 @@ }: buildPythonPackage rec { - version = "0.9"; + version = "0.10"; format = "setuptools"; pname = "asgi-csrf"; disabled = isPy27; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "simonw"; repo = pname; - rev = version; - hash = "sha256-mmOsN2mW6eGtapq3xLqHK8hhSD0Gjzp3DsY5AGUlI8g="; + rev = "refs/tags/${version}"; + hash = "sha256-VclgePMQh60xXofrquI3sCyPUPlkV4maZ5yybt+4HCs="; }; propagatedBuildInputs = [ From a46766ea9190681670e65823a2176ab8359247d4 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 15 Aug 2024 19:53:39 +0200 Subject: [PATCH 051/338] nginx: 1.26.1 -> 1.26.2 Fixes CVE-2024-7347 Changes: https://nginx.org/en/CHANGES-1.26 --- pkgs/servers/http/nginx/stable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/stable.nix b/pkgs/servers/http/nginx/stable.nix index 3a6a049c1206..48c1f99b240c 100644 --- a/pkgs/servers/http/nginx/stable.nix +++ b/pkgs/servers/http/nginx/stable.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix args { - version = "1.26.1"; - hash = "sha256-+Rh0aP8usVkmC/1Thnwl/44zRyYjes8ie56HDlPT42s="; + version = "1.26.2"; + hash = "sha256-Yn/ghiCbuoCihToK3Z2VjX673/oahGeleEyaa08D1zg="; } From 694024f07d492b091ec83d87c93cd2a744296220 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 15 Aug 2024 19:55:22 +0200 Subject: [PATCH 052/338] nginxMainline: 1.27.0 -> 1.27.1 Fixes CVE-2024-7347 Changes: https://nginx.org/en/CHANGES --- pkgs/servers/http/nginx/mainline.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 669eb6532364..a50ffca6f09a 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix args { - version = "1.27.0"; - hash = "sha256-tyMOPPh+qi1LC8VqrckgqWDHhzuZkaG2b/zAj8ZQEpw="; + version = "1.27.1"; + hash = "sha256-vXumimzh6jdot3HH4qtJVaWfsbGujVVP7bbCMEEEvfw="; } From 58b29b2328a224bef2eb2f76ef58bfa36847d840 Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Thu, 15 Aug 2024 21:38:56 +0200 Subject: [PATCH 053/338] pacemaker: fix build failure --- pkgs/misc/logging/pacemaker/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/logging/pacemaker/default.nix b/pkgs/misc/logging/pacemaker/default.nix index 2c3fd76b1dfd..87ab12ee29c8 100644 --- a/pkgs/misc/logging/pacemaker/default.nix +++ b/pkgs/misc/logging/pacemaker/default.nix @@ -78,6 +78,7 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ "-Wno-error=strict-prototypes" + "-Wno-error=deprecated-declarations" ]); enableParallelBuilding = true; From 33df80f8d24f355b62ecb2a83f4087a2644d3ae0 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Fri, 16 Aug 2024 00:39:53 +0200 Subject: [PATCH 054/338] dyalog: 19.0.48958 -> 19.0.49960 --- pkgs/by-name/dy/dyalog/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/dy/dyalog/package.nix b/pkgs/by-name/dy/dyalog/package.nix index 9bca553b0d94..a4acb275e221 100644 --- a/pkgs/by-name/dy/dyalog/package.nix +++ b/pkgs/by-name/dy/dyalog/package.nix @@ -51,14 +51,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "dyalog"; - version = "19.0.48958"; + version = "19.0.49960"; shortVersion = lib.versions.majorMinor finalAttrs.version; src = assert !acceptLicense -> throw licenseDisclaimer; fetchurl { url = "https://download.dyalog.com/download.php?file=${finalAttrs.shortVersion}/linux_64_${finalAttrs.version}_unicode.x86_64.deb"; - hash = "sha256-+L9XI7Knt91sG/0E3GFSeqjD9Zs+1n72MDfvsXnr77M="; + hash = "sha256-WeIrwF6msiQGS6ltYWn6TN+v+aXK1cbJ1e11B6f0+2A="; }; outputs = [ "out" ] ++ lib.optional enableDocs "doc"; From d22d611a08a340c8033f1acda5230e2d31641063 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sat, 1 Jun 2024 21:27:26 +0200 Subject: [PATCH 055/338] dyalog: also apply patchelf to dyalog.rt --- pkgs/by-name/dy/dyalog/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/dy/dyalog/package.nix b/pkgs/by-name/dy/dyalog/package.nix index a4acb275e221..2655e5b95c7c 100644 --- a/pkgs/by-name/dy/dyalog/package.nix +++ b/pkgs/by-name/dy/dyalog/package.nix @@ -143,8 +143,11 @@ stdenv.mkDerivation (finalAttrs: { ''; # Register some undeclared runtime dependencies to be patched in by autoPatchelfHook + # Note: dyalog.rt is used internally to run child APL processes in preFixup = '' - patchelf ${dyalogHome}/dyalog --add-needed libncurses.so + for exec in "dyalog" "dyalog.rt"; do + patchelf ${dyalogHome}/$exec --add-needed libncurses.so + done '' + lib.optionalString htmlRendererSupport '' patchelf ${dyalogHome}/libcef.so --add-needed libudev.so --add-needed libGL.so From e7d35a6cf92068bdceb1f584c94720655531e41b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Aug 2024 23:22:05 +0000 Subject: [PATCH 056/338] rpcs3: 0.0.32-16784-03a612487 -> 0.0.32-16833-981a1c56f --- pkgs/by-name/rp/rpcs3/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix index e09bc22de78a..a485423ad1fb 100644 --- a/pkgs/by-name/rp/rpcs3/package.nix +++ b/pkgs/by-name/rp/rpcs3/package.nix @@ -33,10 +33,10 @@ let # Keep these separate so the update script can regex them - rpcs3GitVersion = "16784-03a612487"; - rpcs3Version = "0.0.32-16784-03a612487"; - rpcs3Revision = "03a612487d5b840c858c900e33ce2e3bfb03d0b8"; - rpcs3Hash = "sha256-WMXRxxIHbTYlYDtzdM2YO5B58WGq6Pt2TaEhLcflpns="; + rpcs3GitVersion = "16833-981a1c56f"; + rpcs3Version = "0.0.32-16833-981a1c56f"; + rpcs3Revision = "981a1c56fbfb6056e5496bba9b8678a9dc755405"; + rpcs3Hash = "sha256-yRJ7RBRWm/HcdT/lw4t5AElsxujxFk0bA/keURCyQac="; inherit (qt6Packages) qtbase qtmultimedia wrapQtAppsHook qtwayland; in From 892386df1f8c66c123dcc254fee924f61dd7a1c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 00:05:23 +0000 Subject: [PATCH 057/338] stevenblack-blocklist: 3.14.95 -> 3.14.96 --- pkgs/by-name/st/stevenblack-blocklist/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix index 68713f166bad..6f36d87421d0 100644 --- a/pkgs/by-name/st/stevenblack-blocklist/package.nix +++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "stevenblack-blocklist"; - version = "3.14.95"; + version = "3.14.96"; src = fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-AEwBEWem50+NhMhHRoPLAxrN5N85RLIW+7iFXugn2Ek="; + hash = "sha256-gv40Hfe8Lk/flQp+SPwGws4eZ0umjF1qwX0HdHF9Xe4="; }; outputs = [ From b61c56886e84c95038a290284934c4477121d4a1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 01:01:57 +0000 Subject: [PATCH 058/338] credhub-cli: 2.9.35 -> 2.9.36 --- pkgs/tools/admin/credhub-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/credhub-cli/default.nix b/pkgs/tools/admin/credhub-cli/default.nix index 85dc04de5c7b..72a80938ca84 100644 --- a/pkgs/tools/admin/credhub-cli/default.nix +++ b/pkgs/tools/admin/credhub-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "credhub-cli"; - version = "2.9.35"; + version = "2.9.36"; src = fetchFromGitHub { owner = "cloudfoundry-incubator"; repo = "credhub-cli"; rev = version; - sha256 = "sha256-MkiWvystndUVeMKQtpjg7FbLI7X4TdgSs4/uM3MkjcM="; + sha256 = "sha256-5jrVN0mFRLieKg92pWrBK89SiPr9A2Z8Rtzou4dRdOQ="; }; # these tests require network access that we're not going to give them From e01163e1ddcf90ecd57a5ea271979c6a68890d61 Mon Sep 17 00:00:00 2001 From: Reno Dakota <170618376+paparodeo@users.noreply.github.com> Date: Fri, 16 Aug 2024 03:21:07 +0000 Subject: [PATCH 059/338] cemu: move glslang to buildInputs fix build perhaps after change 9b7f1a3913168bc9b9c070dbc9720dad1d06b49c --- pkgs/by-name/ce/cemu/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ce/cemu/package.nix b/pkgs/by-name/ce/cemu/package.nix index ad70bc9c79f9..a9808577c9c0 100644 --- a/pkgs/by-name/ce/cemu/package.nix +++ b/pkgs/by-name/ce/cemu/package.nix @@ -69,7 +69,6 @@ in stdenv.mkDerivation (finalAttrs: { addDriverRunpath wrapGAppsHook3 cmake - glslang nasm ninja pkg-config @@ -83,6 +82,7 @@ in stdenv.mkDerivation (finalAttrs: { curl fmt_9 glm + glslang gtk3 hidapi imgui' From 78e1f38ef0280d0661d5c1d0e2c879b1f82d8cc8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 03:22:49 +0000 Subject: [PATCH 060/338] cargo-dist: 0.19.1 -> 0.21.0 --- pkgs/development/tools/rust/cargo-dist/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-dist/default.nix b/pkgs/development/tools/rust/cargo-dist/default.nix index 9da50e4ac64a..5fb72fe9ed78 100644 --- a/pkgs/development/tools/rust/cargo-dist/default.nix +++ b/pkgs/development/tools/rust/cargo-dist/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-dist"; - version = "0.19.1"; + version = "0.21.0"; src = fetchFromGitHub { owner = "axodotdev"; repo = "cargo-dist"; rev = "v${version}"; - hash = "sha256-7+z9TVeSwyYwdP+qlvm5CIiDcRGXsM+AyyZnugd3Xk8="; + hash = "sha256-b9LmL+NBsIpUugyVL19gY8sMfTVXIqRw9hL8tXT/cGc="; }; - cargoHash = "sha256-BgU99C0SJuxEOmIYRX/iy4243tiMeKCvCwc0AvKMhsk="; + cargoHash = "sha256-MGGRQpcEv2uxGNfOBd0+rx+CCJ0sqdyZIRMvbvCZF1Y="; nativeBuildInputs = [ pkg-config From afee1d56ad8488296afb2785b4b0b9590de686cf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 04:19:27 +0000 Subject: [PATCH 061/338] xlsxgrep: 0.0.23 -> 0.0.29 --- pkgs/applications/search/xlsxgrep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/search/xlsxgrep/default.nix b/pkgs/applications/search/xlsxgrep/default.nix index 454e9210db6a..5c6ea6c54d60 100644 --- a/pkgs/applications/search/xlsxgrep/default.nix +++ b/pkgs/applications/search/xlsxgrep/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "xlsxgrep"; - version = "0.0.23"; + version = "0.0.29"; src = fetchPypi { inherit pname version; - sha256 = "014i1nifx67mxi0k9sch00j6bjykb6krzl2q3ara9s1g75inl4rm"; + sha256 = "sha256-vgHNu7MVDjULoBiTkk74W8ZLJ02eds60XshTX3iLJGI="; }; pythonPath = with python3Packages; [ xlrd ]; From 56b7e58fccad1e5f2da45ff7b97ce9af326c4c9f Mon Sep 17 00:00:00 2001 From: liam-murphy14 Date: Thu, 15 Aug 2024 21:58:50 -0700 Subject: [PATCH 062/338] python3Packages.nodriver 0.34 -> 0.36 --- pkgs/development/python-modules/nodriver/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/nodriver/default.nix b/pkgs/development/python-modules/nodriver/default.nix index 77a28354203a..3d17b64b4772 100644 --- a/pkgs/development/python-modules/nodriver/default.nix +++ b/pkgs/development/python-modules/nodriver/default.nix @@ -11,14 +11,14 @@ buildPythonPackage { pname = "nodriver"; - version = "0.34"; + version = "0.36"; pyproject = true; src = fetchFromGitHub { owner = "ultrafunkamsterdam"; repo = "nodriver"; - rev = "082815916900450485bd14cf1c7a83593e51825d"; - hash = "sha256-MaOCC7yVLDqkpk8YiTov9WZKlYhME2CXHIrllmU0yLg="; + rev = "e630abfc5dce2023966a61cec739348b18bd465d"; + hash = "sha256-pUWvHcsEPbRob5DDXBFOzqonSWigNPnPUHIu9omzYII="; }; disabled = pythonOlder "3.9"; From 7a0052be3c0e237ef79398fae12b2c7238ce2d87 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 05:11:37 +0000 Subject: [PATCH 063/338] dolibarr: 19.0.2 -> 19.0.3 --- pkgs/servers/web-apps/dolibarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/dolibarr/default.nix b/pkgs/servers/web-apps/dolibarr/default.nix index b1292c9bd66a..014a4a015e80 100644 --- a/pkgs/servers/web-apps/dolibarr/default.nix +++ b/pkgs/servers/web-apps/dolibarr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dolibarr"; - version = "19.0.2"; + version = "19.0.3"; src = fetchFromGitHub { owner = "Dolibarr"; repo = "dolibarr"; rev = version; - hash = "sha256-HPAcDgJSh3oIrr0vI9C80NR6oDS1KbAiiYR1tL5qrrI="; + hash = "sha256-7LLlmJ5h8EmxPvRl+PJxAtjGRS44Zg8RQzwtoAsm6Kg="; }; dontBuild = true; From 97bff0278b362d63707ad8a9f64ccbdbbc775a11 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 11:24:55 +0000 Subject: [PATCH 064/338] ab-av1: 0.7.16 -> 0.7.17 --- pkgs/by-name/ab/ab-av1/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ab/ab-av1/package.nix b/pkgs/by-name/ab/ab-av1/package.nix index aa057f69e06b..a7a745764710 100644 --- a/pkgs/by-name/ab/ab-av1/package.nix +++ b/pkgs/by-name/ab/ab-av1/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "ab-av1"; - version = "0.7.16"; + version = "0.7.17"; src = fetchFromGitHub { owner = "alexheretic"; repo = "ab-av1"; rev = "v${version}"; - hash = "sha256-gZdlitOu0Tyur2xdPBYLZg/N2eL6oT6BasVzmx0lHE4="; + hash = "sha256-QPelXqJT3zbVP+lNiczrCR+JD4icimSyCravlIwTAyw="; }; - cargoHash = "sha256-aws8miz+HWdfL33c+BmBo01ooXJMKB9Ekdji+Uh58AQ="; + cargoHash = "sha256-7h1Hbtsk0pnoPXX5sFfzcZoH/sqcb0YTpmJp6yCzTG0="; nativeBuildInputs = [ installShellFiles ]; From fc16df80de5332d8cc3d6a9ebd1cfffb772358f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 15:02:33 +0000 Subject: [PATCH 065/338] gdal: 3.9.1 -> 3.9.2 --- pkgs/development/libraries/gdal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 812eb8663732..cf2ff67acf41 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -79,13 +79,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdal" + lib.optionalString useMinimalFeatures "-minimal"; - version = "3.9.1"; + version = "3.9.2"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; rev = "v${finalAttrs.version}"; - hash = "sha256-WCTQHUU2WYYiliwCJ4PsbvJIOar9LmvXn/i5jJzTCtM="; + hash = "sha256-BXnpNfi9tUd6nnwYdstuOfGsFVif8kkmkW97X1UAgt8="; }; nativeBuildInputs = [ From 30edbd5bea759ae26b1f81e446a0dc2ea6f8ca05 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 16:07:25 +0000 Subject: [PATCH 066/338] screego: 1.10.3 -> 1.10.4 --- pkgs/by-name/sc/screego/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sc/screego/package.nix b/pkgs/by-name/sc/screego/package.nix index 923b6e58a509..6b532cc2fe85 100644 --- a/pkgs/by-name/sc/screego/package.nix +++ b/pkgs/by-name/sc/screego/package.nix @@ -10,13 +10,13 @@ }: let - version = "1.10.3"; + version = "1.10.4"; src = fetchFromGitHub { owner = "screego"; repo = "server"; rev = "v${version}"; - hash = "sha256-X8KZAUh1cO8qNYH6nc9zZ+mnfItgef8N948ErJLlZII="; + hash = "sha256-/GtlMLm2swmLV6bC7OWkcQUeB6WauRm7IOs0UhyocO0="; }; ui = stdenv.mkDerivation { From ed69a27320f7fd1253bdffd580d02bc5035a03ac Mon Sep 17 00:00:00 2001 From: Colin Date: Tue, 13 Aug 2024 06:00:00 +0000 Subject: [PATCH 067/338] flatpak: support cross compilation --- pkgs/by-name/fl/flatpak/package.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fl/flatpak/package.nix b/pkgs/by-name/fl/flatpak/package.nix index 226ea755e184..73de30ad7eea 100644 --- a/pkgs/by-name/fl/flatpak/package.nix +++ b/pkgs/by-name/fl/flatpak/package.nix @@ -54,6 +54,7 @@ xorg, xz, zstd, + withGtkDoc ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, }: stdenv.mkDerivation (finalAttrs: { @@ -147,6 +148,7 @@ stdenv.mkDerivation (finalAttrs: { libarchive libcap libseccomp + libxml2 xz zstd polkit @@ -157,7 +159,7 @@ stdenv.mkDerivation (finalAttrs: { gsettings-desktop-schemas glib-networking librsvg # for flatpak-validate-icon - ]; + ] ++ lib.optionals withGtkDoc [ gtk-doc ]; # Required by flatpak.pc propagatedBuildInputs = [ @@ -169,6 +171,7 @@ stdenv.mkDerivation (finalAttrs: { # TODO: some issues with temporary files doCheck = false; + strictDeps = true; NIX_LDFLAGS = "-lpthread"; @@ -182,8 +185,9 @@ stdenv.mkDerivation (finalAttrs: { "--with-profile-dir=${placeholder "out"}/etc/profile.d" "--localstatedir=/var" "--sysconfdir=/etc" - "--enable-gtk-doc" + "--enable-gtk-doc=${if withGtkDoc then "yes" else "no"}" "--enable-installed-tests" + "--enable-selinux-module=no" ]; makeFlags = [ @@ -193,12 +197,16 @@ stdenv.mkDerivation (finalAttrs: { postPatch = let - vsc-py = python3.withPackages (pp: [ pp.pyparsing ]); + vsc-py = python3.pythonOnBuildForHost.withPackages (pp: [ pp.pyparsing ]); in '' patchShebangs buildutil patchShebangs tests PATH=${lib.makeBinPath [ vsc-py ]}:$PATH patchShebangs --build subprojects/variant-schema-compiler/variant-schema-compiler + + substituteInPlace configure.ac \ + --replace-fail '$BWRAP --version' 'echo ${bubblewrap.version}' \ + --replace-fail '$DBUS_PROXY --version' 'echo ${xdg-dbus-proxy.version}' ''; passthru = { From 68c296621868c7df78683187d95f56d04e6b177c Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 17 Aug 2024 00:45:52 +0200 Subject: [PATCH 068/338] openssh_gssapi: 9.7p1 -> 9.8p1 https://www.openssh.com/txt/release-9.8 --- pkgs/tools/networking/openssh/default.nix | 8 +++----- .../openssh-9.6_p1-CVE-2024-6387.patch | 19 ------------------- .../openssh/openssh-9.6_p1-chaff-logic.patch | 16 ---------------- 3 files changed, 3 insertions(+), 40 deletions(-) delete mode 100644 pkgs/tools/networking/openssh/openssh-9.6_p1-CVE-2024-6387.patch delete mode 100644 pkgs/tools/networking/openssh/openssh-9.6_p1-chaff-logic.patch diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 2ec09d61394d..049726dcebf7 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -58,23 +58,21 @@ in openssh_gssapi = common rec { pname = "openssh-with-gssapi"; - version = "9.7p1"; + version = "9.8p1"; extraDesc = " with GSSAPI support"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; - hash = "sha256-SQQm92bYKidj/KzY2D6j1weYdQx70q/y5X3FZg93P/0="; + hash = "sha256-3YvQAqN5tdSZ37BQ3R+pr4Ap6ARh9LtsUjxJlz9aOfM="; }; extraPatches = [ ./ssh-keysign-8.5.patch - ./openssh-9.6_p1-CVE-2024-6387.patch - ./openssh-9.6_p1-chaff-logic.patch (fetchpatch { name = "openssh-gssapi.patch"; url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%25${version}-3/debian/patches/gssapi.patch"; - hash = "sha256-/lEbH5sIS+o+DStEDAghFy43nZlvcIXSFJrnvp+fDdY="; + hash = "sha256-BnmEZ5pMIbbysesMSm54ykdweH4JudM9D4Pn5uWf3EY="; }) ]; diff --git a/pkgs/tools/networking/openssh/openssh-9.6_p1-CVE-2024-6387.patch b/pkgs/tools/networking/openssh/openssh-9.6_p1-CVE-2024-6387.patch deleted file mode 100644 index 7b7fb70380d9..000000000000 --- a/pkgs/tools/networking/openssh/openssh-9.6_p1-CVE-2024-6387.patch +++ /dev/null @@ -1,19 +0,0 @@ -https://bugs.gentoo.org/935271 -Backport proposed by upstream at https://marc.info/?l=oss-security&m=171982317624594&w=2. ---- a/log.c -+++ b/log.c -@@ -451,12 +451,14 @@ void - sshsigdie(const char *file, const char *func, int line, int showfunc, - LogLevel level, const char *suffix, const char *fmt, ...) - { -+#ifdef SYSLOG_R_SAFE_IN_SIGHAND - va_list args; - - va_start(args, fmt); - sshlogv(file, func, line, showfunc, SYSLOG_LEVEL_FATAL, - suffix, fmt, args); - va_end(args); -+#endif - _exit(1); - } - diff --git a/pkgs/tools/networking/openssh/openssh-9.6_p1-chaff-logic.patch b/pkgs/tools/networking/openssh/openssh-9.6_p1-chaff-logic.patch deleted file mode 100644 index 90544d1a457e..000000000000 --- a/pkgs/tools/networking/openssh/openssh-9.6_p1-chaff-logic.patch +++ /dev/null @@ -1,16 +0,0 @@ -"Minor logic error in ObscureKeystrokeTiming" -https://marc.info/?l=oss-security&m=171982317624594&w=2 ---- a/clientloop.c -+++ b/clientloop.c -@@ -608,8 +608,9 @@ obfuscate_keystroke_timing(struct ssh *ssh, struct timespec *timeout, - if (timespeccmp(&now, &chaff_until, >=)) { - /* Stop if there have been no keystrokes for a while */ - stop_reason = "chaff time expired"; -- } else if (timespeccmp(&now, &next_interval, >=)) { -- /* Otherwise if we were due to send, then send chaff */ -+ } else if (timespeccmp(&now, &next_interval, >=) && -+ !ssh_packet_have_data_to_write(ssh)) { -+ /* If due to send but have no data, then send chaff */ - if (send_chaff(ssh)) - nchaff++; - } From def4dee7a5c44597de27b73a47207a926d293b19 Mon Sep 17 00:00:00 2001 From: tahanonu Date: Sat, 13 Jul 2024 08:57:53 +0100 Subject: [PATCH 069/338] mybbscan: init at 3.2.0 Release: https://github.com/0xB9/MyBBscan/releases/tag/v3.2.0 --- pkgs/by-name/my/mybbscan/package.nix | 46 ++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100755 pkgs/by-name/my/mybbscan/package.nix diff --git a/pkgs/by-name/my/mybbscan/package.nix b/pkgs/by-name/my/mybbscan/package.nix new file mode 100755 index 000000000000..c85d0d20bc68 --- /dev/null +++ b/pkgs/by-name/my/mybbscan/package.nix @@ -0,0 +1,46 @@ +{ + fetchFromGitHub, + lib, + makeWrapper, + python3, + python3Packages, +}: + +python3Packages.buildPythonPackage rec { + pname = "my-b-bscan"; + version = "3.2.0"; + pyproject = false; + + src = fetchFromGitHub { + owner = "0xB9"; + repo = "MyBBscan"; + rev = "refs/tags/v${version}"; + hash = "sha256-cX1483JK+bejQWua9d7V3GDw6cPPvlnLX5w2XQjqMOQ="; + }; + + build-system = [ makeWrapper ]; + + dependencies = with python3Packages; [ + huepy + requests + ]; + + installPhase = '' + mkdir -p $out/{bin,share/mybbscan} + cp -R * $out/share/mybbscan + makeWrapper ${python3.interpreter} $out/bin/mybbscan \ + --set PYTHONPATH "$PYTHONPATH:$out/share/mybbscan/scan.py" \ + --add-flags "$out/share/mybbscan/scan.py" + ''; + + meta = { + description = "Scans plugins directory for possible vulnerable plugins"; + homepage = "https://github.com/0xB9/MyBBscan"; + # https://github.com/0xB9/MyBBscan/issues/12 + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ tochiaha ]; + mainProgram = "mybbscan"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + platforms = lib.platforms.all; + }; +} From d24af771e28416d171dc187fb82163e0ea43f93b Mon Sep 17 00:00:00 2001 From: rewine Date: Sat, 17 Aug 2024 18:07:03 +0800 Subject: [PATCH 070/338] qtcreator: 14.0.0 -> 14.0.1 --- pkgs/development/tools/qtcreator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index 5a097393d639..2f29a32e87ef 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "qtcreator"; - version = "14.0.0"; + version = "14.0.1"; src = fetchurl { url = "https://download.qt.io/official_releases/${pname}/${lib.versions.majorMinor version}/${version}/qt-creator-opensource-src-${version}.tar.xz"; - hash = "sha256-8v3P+cuO1/1csfx3k1LHp6lCkieIygAN6F2229eo1FQ="; + hash = "sha256-lZXS5sZbuRjng3YxQ0HcK+9JHDIApcbVzm8wVQmwsos="; }; nativeBuildInputs = [ From 35788edf45944ae5a8e6a92745b8e361ed03163a Mon Sep 17 00:00:00 2001 From: linsui <36977733+linsui@users.noreply.github.com> Date: Sat, 17 Aug 2024 21:48:45 +0800 Subject: [PATCH 071/338] cargo-tauri: 2.0.0-rc.2 -> 1.7.1-unstable-2024-08-16 --- pkgs/development/tools/rust/cargo-tauri/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-tauri/default.nix b/pkgs/development/tools/rust/cargo-tauri/default.nix index d178fc51aafa..1dcc79fb4b75 100644 --- a/pkgs/development/tools/rust/cargo-tauri/default.nix +++ b/pkgs/development/tools/rust/cargo-tauri/default.nix @@ -18,20 +18,20 @@ let in rustPlatform.buildRustPackage rec { pname = "tauri"; - version = "2.0.0-rc.2"; + version = "1.7.1-unstable-2024-08-16"; src = fetchFromGitHub { owner = "tauri-apps"; repo = "tauri"; - rev = "tauri-v${version}"; - hash = "sha256-V3Lck5RzEAxXRHPAy0M2elRk9geF8qHWoi01N6wcHc4="; + rev = "2b61447dfc167ec11724f99671bf9e2de0bf6768"; + hash = "sha256-gKG7olZuTCkW+SKI3FVZqgS6Pp5hFemRJshdma8rpyg="; }; # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 sourceRoot = "${src.name}/tooling/cli"; - cargoHash = "sha256-fGnre+vPzWtpp9NLLQtb/Feh06pBQipkCQ2kFCDTC+Y="; + cargoHash = "sha256-VXg/dAhwPTSrLwJm8HNzAi/sVF9RqgpHIF3PZe1LjSA="; buildInputs = [ openssl ] From 83ad01ca03c7d8166bf8250b866e2f54f4cbcc3c Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sat, 17 Aug 2024 10:21:16 -0400 Subject: [PATCH 072/338] kodi: 21.0 -> 21.1 --- pkgs/applications/video/kodi/unwrapped.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index d3fdd0d054b2..661f08c576b6 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -87,14 +87,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "kodi"; - version = "21.0"; + version = "21.1"; kodiReleaseName = "Omega"; src = fetchFromGitHub { owner = "xbmc"; repo = "xbmc"; rev = "${finalAttrs.version}-${finalAttrs.kodiReleaseName}"; - hash = "sha256-xrFWqgwTkurEwt3/+/e4SCM6Uk9nxuW62SrCFWWqZO0="; + hash = "sha256-NjId1T1cw9dl0Fx1QDsijiN1VUpuQ/EFl1kxWSESCR4="; }; patches = [ From 97444575c30db7b92b0a76f0a6581e6d145b6181 Mon Sep 17 00:00:00 2001 From: Steven Kou Date: Sat, 11 May 2024 01:58:11 +0800 Subject: [PATCH 073/338] anytype: minor fixes Add meta.mainProgram alongside removing an invalid move and set the pname properly. --- pkgs/by-name/an/anytype/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix index 1f315abd6461..fceb6911fdbe 100644 --- a/pkgs/by-name/an/anytype/package.nix +++ b/pkgs/by-name/an/anytype/package.nix @@ -6,17 +6,15 @@ let name = "Anytype-${version}"; src = fetchurl { url = "https://github.com/anyproto/anytype-ts/releases/download/v${version}/${name}.AppImage"; - name = "Anytype-${version}.AppImage"; hash = "sha256-4Tz080lNQXqTq+LEax4fYV27/DDSRUalpkO46KZ1ay8="; }; - appimageContents = appimageTools.extractType2 { inherit name src; }; + appimageContents = appimageTools.extractType2 { inherit pname version src; }; in appimageTools.wrapType2 { - inherit name src; + inherit pname version src; extraPkgs = pkgs: [ pkgs.libsecret ]; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/${pname} \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" @@ -33,6 +31,7 @@ in appimageTools.wrapType2 { description = "P2P note-taking tool"; homepage = "https://anytype.io/"; license = licenses.unfree; + mainProgram = "anytype"; maintainers = with maintainers; [ running-grass ]; platforms = [ "x86_64-linux" ]; }; From 43ac742526c65a6da6b2039bca169ecca9caf524 Mon Sep 17 00:00:00 2001 From: Steven Kou Date: Sat, 17 Aug 2024 22:31:29 +0800 Subject: [PATCH 074/338] anytype: 0.42.3 -> 0.42.4 --- pkgs/by-name/an/anytype/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix index fceb6911fdbe..ea4619b2ba4e 100644 --- a/pkgs/by-name/an/anytype/package.nix +++ b/pkgs/by-name/an/anytype/package.nix @@ -2,11 +2,11 @@ let pname = "anytype"; - version = "0.42.3"; + version = "0.42.4"; name = "Anytype-${version}"; src = fetchurl { url = "https://github.com/anyproto/anytype-ts/releases/download/v${version}/${name}.AppImage"; - hash = "sha256-4Tz080lNQXqTq+LEax4fYV27/DDSRUalpkO46KZ1ay8="; + hash = "sha256-SFLjjr+L7eTqaZ2teug7mzXhIU+eVebBqrE4q5aasLk="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in appimageTools.wrapType2 { From b08afbf6e820550e86a66677cc42a52bb83def7b Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 17 Aug 2024 23:33:42 +0900 Subject: [PATCH 075/338] python312Packages.i-pi: adopt pypa build --- pkgs/development/python-modules/i-pi/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/i-pi/default.nix b/pkgs/development/python-modules/i-pi/default.nix index 41a9ba22fd46..1cb4cca97b19 100644 --- a/pkgs/development/python-modules/i-pi/default.nix +++ b/pkgs/development/python-modules/i-pi/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, gfortran, makeWrapper, + setuptools, numpy, pytest, mock, @@ -13,21 +14,23 @@ buildPythonPackage rec { pname = "i-pi"; version = "3.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "i-pi"; repo = "i-pi"; rev = "refs/tags/v${version}"; - sha256 = "sha256-SJ0qTwwdIOR1nXs9MV6O1oxJPR6/6H86wscDy/sLc/g="; + hash = "sha256-SJ0qTwwdIOR1nXs9MV6O1oxJPR6/6H86wscDy/sLc/g="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ gfortran makeWrapper ]; - propagatedBuildInputs = [ numpy ]; + dependencies = [ numpy ]; nativeCheckInputs = [ pytest From 64f4dfaf9ae9f5d42970db62c1243823936a4d9a Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 17 Aug 2024 23:51:31 +0900 Subject: [PATCH 076/338] python312Packages.i-pi: enable tests --- pkgs/development/python-modules/i-pi/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/i-pi/default.nix b/pkgs/development/python-modules/i-pi/default.nix index 1cb4cca97b19..8f62f52f6536 100644 --- a/pkgs/development/python-modules/i-pi/default.nix +++ b/pkgs/development/python-modules/i-pi/default.nix @@ -6,9 +6,11 @@ makeWrapper, setuptools, numpy, - pytest, + distutils, + pytestCheckHook, mock, pytest-mock, + pythonAtLeast, }: buildPythonPackage rec { @@ -33,10 +35,12 @@ buildPythonPackage rec { dependencies = [ numpy ]; nativeCheckInputs = [ - pytest + pytestCheckHook mock pytest-mock - ]; + ] ++ lib.optional (pythonAtLeast "3.12") distutils; + + pytestFlagsArray = [ "ipi_tests/unit_tests" ]; postFixup = '' wrapProgram $out/bin/i-pi \ From f4c87544cb4beb00b84e3c4db42e4f4aa7823c81 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 17 Aug 2024 23:57:52 +0900 Subject: [PATCH 077/338] python312Packages.langsmith: 0.1.85 -> 0.1.99 Diff: https://github.com/langchain-ai/langsmith-sdk/compare/refs/tags/v0.1.85...v0.1.99 Changelog: https://github.com/langchain-ai/langsmith-sdk/releases/tag/v0.1.99 --- pkgs/development/python-modules/langsmith/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index 8c68c36105ef..16e3b19f71b3 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.1.85"; + version = "0.1.99"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langsmith-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-IPbamCfaurikFAqKnvMp8+x5ULCeQ61d5oZFO9+s4SQ="; + hash = "sha256-aN5HiQAXX7ZlVBzkit4DAw+7KQHI3ck1DLvBPDSKVhM="; }; sourceRoot = "${src.name}/python"; @@ -78,6 +78,7 @@ buildPythonPackage rec { disabledTestPaths = [ # due to circular import "tests/integration_tests/test_client.py" + "tests/integration_tests/test_prompts.py" "tests/unit_tests/test_client.py" # Tests require a Langsmith API key "tests/evaluation/test_evaluation.py" From 5736a4996d4f5c63d8bc06d4d76dd268b0e7885c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 17 Aug 2024 17:12:52 +0200 Subject: [PATCH 078/338] python312Packages.dask: 2024.8.0 -> 2024.8.1 Diff: https://github.com/dask/dask/compare/refs/tags/2024.8.0...2024.8.1 Changelog: https://docs.dask.org/en/latest/changelog.html --- pkgs/development/python-modules/dask/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 69d4f119b6eb..0aa358b334af 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -40,16 +40,16 @@ let self = buildPythonPackage rec { pname = "dask"; - version = "2024.8.0"; + version = "2024.8.1"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "dask"; repo = "dask"; rev = "refs/tags/${version}"; - hash = "sha256-u8rkay2c4gr3IVShGD6z0FfHkIiUvQwDpl8U6B0JsEM="; + hash = "sha256-ztB5T8VFc1WoQB7lWQlonAyq7duqft9OE5FYvmjZd48="; }; build-system = [ setuptools ]; From 5fec55ba3045492c3149a9947c7e1e1073a94f26 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 17 Aug 2024 17:14:29 +0200 Subject: [PATCH 079/338] python312Packages.dask-expr: 1.1.10 -> 1.1.11 Diff: https://github.com/dask/dask-expr/compare/refs/tags/v1.1.10...v1.1.11 --- pkgs/development/python-modules/dask-expr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dask-expr/default.nix b/pkgs/development/python-modules/dask-expr/default.nix index 14364c864281..750ef7613197 100644 --- a/pkgs/development/python-modules/dask-expr/default.nix +++ b/pkgs/development/python-modules/dask-expr/default.nix @@ -21,16 +21,16 @@ buildPythonPackage rec { pname = "dask-expr"; - version = "1.1.10"; + version = "1.1.11"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "dask"; repo = "dask-expr"; rev = "refs/tags/v${version}"; - hash = "sha256-z/+0d/mcC51rXfSCkVosc2iJ9SKHuKlPO+n/+SisQBg="; + hash = "sha256-D26b8HkcRqsMuzSTZdmDmS59dlAbj4F93kfY27UAhKw="; }; postPatch = '' From 42e92b1d77d6c0d28b8ac8bcf6b22f47ebb5dfc2 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 18 Aug 2024 00:34:31 +0800 Subject: [PATCH 080/338] emacsPackages.session-management-for-emacs: mkDerivation -> melpaBuild --- .../session-management-for-emacs/package.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix index 0238bb6127bd..ab2dfb7212c3 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix @@ -1,21 +1,15 @@ -{ stdenv, fetchurl, emacs, lib }: +{ melpaBuild, fetchzip, lib }: -stdenv.mkDerivation rec { +melpaBuild rec { pname = "session-management-for-emacs"; + ename = "session"; version = "2.2a"; - src = fetchurl { + src = fetchzip { url = "mirror://sourceforge/emacs-session/session-${version}.tar.gz"; - sha256 = "37dfba7420b5164eab90dafa9e8bf9a2c8f76505fe2fefa14a64e81fa76d0144"; + hash = "sha256-lc6NIX+lx97qCs5JqG7x0iVE6ki09Gy7DEQuPW2c+7s="; }; - buildInputs = [ emacs ]; - - installPhase = '' - mkdir -p "$out/share/emacs/site-lisp" - cp lisp/*.el "$out/share/emacs/site-lisp/" - ''; - meta = with lib; { /* installation: add to your ~/.emacs (require 'session) From 60d07073580b24f289369f0b8f5eb0cf8e377826 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 18 Aug 2024 00:35:53 +0800 Subject: [PATCH 081/338] emacsPackages.session-management-for-emacs: format with nixfmt-rfc-style --- .../session-management-for-emacs/package.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix index ab2dfb7212c3..5d6b413434dc 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix @@ -1,4 +1,8 @@ -{ melpaBuild, fetchzip, lib }: +{ + melpaBuild, + fetchzip, + lib, +}: melpaBuild rec { pname = "session-management-for-emacs"; @@ -11,7 +15,8 @@ melpaBuild rec { }; meta = with lib; { - /* installation: add to your ~/.emacs + /* + installation: add to your ~/.emacs (require 'session) (add-hook 'after-init-hook 'session-initialize) */ From 68f829224e1c82a7c34ff3fe65453f46bce6fccd Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 17 Aug 2024 00:19:38 +0200 Subject: [PATCH 082/338] python312Packages.tensordict: 0.4.0 -> 0.5.0 Diff: https://github.com/pytorch/tensordict/compare/refs/tags/v0.4.0...v0.5.0 Changelog: https://github.com/pytorch/tensordict/releases/tag/v0.5.0 --- .../python-modules/tensordict/default.nix | 49 ++++++++++++++----- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/tensordict/default.nix b/pkgs/development/python-modules/tensordict/default.nix index bd35eff65707..fff726f5beeb 100644 --- a/pkgs/development/python-modules/tensordict/default.nix +++ b/pkgs/development/python-modules/tensordict/default.nix @@ -3,21 +3,27 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + + # build-system setuptools, torch, - wheel, which, + + # dependencies cloudpickle, numpy, + orjson, + + # checks h5py, pytestCheckHook, + stdenv, - pythonAtLeast, }: buildPythonPackage rec { pname = "tensordict"; - version = "0.4.0"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,19 +32,19 @@ buildPythonPackage rec { owner = "pytorch"; repo = "tensordict"; rev = "refs/tags/v${version}"; - hash = "sha256-wKEzNaaazGEkoElzp93RIlq/r5uRUdM7UyDy/DygIEc="; + hash = "sha256-jnRlN9gefR77pioIXf0qM1CP6EtpeQkBvVIecGkb/pw="; }; build-system = [ setuptools torch - wheel which ]; dependencies = [ cloudpickle numpy + orjson torch ]; @@ -55,8 +61,22 @@ buildPythonPackage rec { ]; disabledTests = - # Hangs forever - [ "test_copy_onto" ] + [ + # Hangs forever + "test_copy_onto" + + # EOFError (MPI related) + # AssertionError: assert tensor(False) + # + where tensor(False) = () + "test_mp" + + # torch._dynamo.exc.BackendCompilerFailed + # Requires a more recent version of triton + # Re-enable when https://github.com/NixOS/nixpkgs/pull/328247 is merged + "test_linear" + "test_seq" + "test_seq_lmbda" + ] ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ # RuntimeError: internal error "test_add_scale_sequence" @@ -65,10 +85,19 @@ buildPythonPackage rec { # _queue.Empty errors in multiprocessing tests "test_isend" + + # hangs forever + "test_map_iter_interrupt_early" ]; - # ModuleNotFoundError: No module named 'torch._C._distributed_c10d'; 'torch._C' is not a package - disabledTestPaths = lib.optionals stdenv.isDarwin [ "test/test_distributed.py" ]; + disabledTestPaths = lib.optionals stdenv.isDarwin [ + # torch._dynamo.exc.BackendCompilerFailed: backend='inductor' raised: + # OpenMP support not found. + "test/test_compile.py" + + # ModuleNotFoundError: No module named 'torch._C._distributed_c10d'; 'torch._C' is not a package + "test/test_distributed.py" + ]; meta = { description = "Pytorch dedicated tensor container"; @@ -76,7 +105,5 @@ buildPythonPackage rec { homepage = "https://github.com/pytorch/tensordict"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; - # No python 3.12 support yet: https://github.com/pytorch/rl/issues/2035 - broken = pythonAtLeast "3.12"; }; } From 3e784edeed34c0b3467737d9520b7fcfbfec4440 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 18 Aug 2024 00:46:15 +0800 Subject: [PATCH 083/338] emacsPackages.session-management-for-emacs: clean - remove with lib; - remove empty meta.maintainers --- .../manual-packages/session-management-for-emacs/package.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix index 5d6b413434dc..b020d158f3e3 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix @@ -14,7 +14,7 @@ melpaBuild rec { hash = "sha256-lc6NIX+lx97qCs5JqG7x0iVE6ki09Gy7DEQuPW2c+7s="; }; - meta = with lib; { + meta = { /* installation: add to your ~/.emacs (require 'session) @@ -22,7 +22,6 @@ melpaBuild rec { */ description = "Small session management for emacs"; homepage = "https://emacs-session.sourceforge.net/"; - license = licenses.gpl2; - maintainers = [ ]; + license = lib.licenses.gpl2; }; } From b48a3a89fad3674dfe4f0264fd6d72ff1e953da0 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 18 Aug 2024 00:10:58 +0800 Subject: [PATCH 084/338] emacsPackages.consult-gh: use the correct gh There is also a MELPA package called gh. --- .../editors/emacs/elisp-packages/manual-packages.nix | 4 ++++ .../manual-packages/consult-gh/{package.nix => default.nix} | 0 2 files changed, 4 insertions(+) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/{package.nix => default.nix} (100%) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 34469eb19628..b6ac04e44502 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -15,6 +15,10 @@ lib.packagesFromDirectoryRecursive { inherit (pkgs) codeium; }; + consult-gh = callPackage ./manual-packages/consult-gh { + inherit (pkgs) gh; + }; + lsp-bridge = callPackage ./manual-packages/lsp-bridge { inherit (pkgs) basedpyright git go gopls python3; }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/package.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/default.nix From c1fba2e31bd61fb67f26fd52769524ffcb55349a Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Wed, 7 Aug 2024 19:52:01 -0700 Subject: [PATCH 085/338] dwfv: move to pkgs/by-name --- .../dwfv/default.nix => by-name/dw/dwfv/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/science/electronics/dwfv/default.nix => by-name/dw/dwfv/package.nix} (100%) diff --git a/pkgs/applications/science/electronics/dwfv/default.nix b/pkgs/by-name/dw/dwfv/package.nix similarity index 100% rename from pkgs/applications/science/electronics/dwfv/default.nix rename to pkgs/by-name/dw/dwfv/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac8289c8191b..eaa1a518320e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18024,8 +18024,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - dwfv = callPackage ../applications/science/electronics/dwfv { }; - dwz = callPackage ../development/tools/misc/dwz { }; easypdkprog = callPackage ../development/embedded/easypdkprog { }; From 02ac59f1b2c9627152160a16e2a48841a222d2a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Aug 2024 18:54:30 +0000 Subject: [PATCH 086/338] python312Packages.mypy-boto3-builder: 7.25.3 -> 7.26.0 --- .../development/python-modules/mypy-boto3-builder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix index 409ea350ad24..196279a5622a 100644 --- a/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "7.25.3"; + version = "7.26.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "youtype"; repo = "mypy_boto3_builder"; rev = "refs/tags/${version}"; - hash = "sha256-DHGeljGY8NRndlcDqvK1Noud90wUQrkaS54489b/6RQ="; + hash = "sha256-gEIh5uHoInuGE1avR2giyq59pm/Avu5NYr3DttvqQp8="; }; build-system = [ poetry-core ]; From b759a91a12a958d007f231cd39cdb7f54dee3811 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Aug 2024 19:06:30 +0000 Subject: [PATCH 087/338] signalbackup-tools: 20240805-1 -> 20240816 --- .../instant-messengers/signalbackup-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index bac57e416685..85d91aba6858 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20240805-1"; + version = "20240816"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-n1mFIyrZ8d9h2m6rUzIVSt9Xdw1VlBLlXY15JLoIaVA="; + hash = "sha256-8r3XpKqCR2ElfQnRuuBaDDIUwAASTTfGSihOounIVZQ="; }; postPatch = '' From bafbee132dbe4d2dfc92cb62d9708e4dd28607d3 Mon Sep 17 00:00:00 2001 From: Yusuf Date: Sun, 17 Mar 2024 11:41:21 +0100 Subject: [PATCH 088/338] maintainers: add yusuf-duran --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4e3ac4dd33a4..4989d726111b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -22779,6 +22779,11 @@ name = "Yusuf Bera Ertan"; keys = [ { fingerprint = "9270 66BD 8125 A45B 4AC4 0326 6180 7181 F60E FCB2"; } ]; }; + yusuf-duran = { + github = "yusuf-duran"; + githubId = 37774475; + name = "Yusuf Duran"; + }; yuu = { email = "yuunix@grrlz.net"; matrix = "@yuu:matrix.org"; From b523a839fd5c6891c9aa38fecc58dead1ddc66bb Mon Sep 17 00:00:00 2001 From: Yusuf Date: Wed, 20 Mar 2024 23:31:43 +0100 Subject: [PATCH 089/338] iio-hyprland: init at 0-unstable-2024-07-24 --- pkgs/by-name/ii/iio-hyprland/package.nix | 42 ++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 pkgs/by-name/ii/iio-hyprland/package.nix diff --git a/pkgs/by-name/ii/iio-hyprland/package.nix b/pkgs/by-name/ii/iio-hyprland/package.nix new file mode 100644 index 000000000000..ac04d12a5778 --- /dev/null +++ b/pkgs/by-name/ii/iio-hyprland/package.nix @@ -0,0 +1,42 @@ +{ + lib, + stdenv, + fetchFromGitHub, + unstableGitUpdater, + meson, + cmake, + pkg-config, + dbus, + ninja, +}: + +stdenv.mkDerivation { + pname = "iio-hyprland"; + version = "0-unstable-2024-07-24"; + + src = fetchFromGitHub { + owner = "JeanSchoeller"; + repo = "iio-hyprland"; + rev = "bbf59e10cbf293e64b765864a324e971fcc06125"; + hash = "sha256-9tB29tP3ZQ2tU2c+FrWrGqSm70ZrJP8H9WZKzHx55zI="; + }; + + buildInputs = [ dbus ]; + nativeBuildInputs = [ + meson + cmake + pkg-config + ninja + ]; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "Listens to iio-sensor-proxy and automatically changes Hyprland output orientation"; + homepage = "https://github.com/JeanSchoeller/iio-hyprland/tree/master"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ yusuf-duran ]; + platforms = lib.platforms.linux; + mainProgram = "iio-hyprland"; + }; +} From 228660743ac105b587bfa63579f11b5edf26165c Mon Sep 17 00:00:00 2001 From: Yusuf Date: Wed, 20 Mar 2024 23:31:56 +0100 Subject: [PATCH 090/338] nixos/iio-hyprland: init module --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/iio-hyprland.nix | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 nixos/modules/programs/iio-hyprland.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 210ca98e2f27..f10682ed12c6 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -214,6 +214,7 @@ ./programs/iay.nix ./programs/iftop.nix ./programs/i3lock.nix + ./programs/iio-hyprland.nix ./programs/immersed-vr.nix ./programs/iotop.nix ./programs/java.nix diff --git a/nixos/modules/programs/iio-hyprland.nix b/nixos/modules/programs/iio-hyprland.nix new file mode 100644 index 000000000000..f83098ec8aad --- /dev/null +++ b/nixos/modules/programs/iio-hyprland.nix @@ -0,0 +1,24 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.programs.iio-hyprland; +in +{ + options = { + programs.iio-hyprland = { + enable = lib.mkEnableOption "iio-hyprland and iio-sensor-proxy"; + package = lib.mkPackageOption pkgs "iio-hyprland" { }; + }; + }; + + config = lib.mkIf cfg.enable { + hardware.sensor.iio.enable = lib.mkDefault true; + + environment.systemPackages = [ cfg.package ]; + }; + meta.maintainers = with lib.maintainers; [ yusuf-duran ]; +} From 5dc6d7af8aaa94bfd0c31c534c2fb139af8397d8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Aug 2024 22:18:11 +0200 Subject: [PATCH 091/338] python312Packages.losant-rest: 1.19.8 -> 1.19.9 Diff: https://github.com/Losant/losant-rest-python/compare/refs/tags/v1.19.8...v1.19.9 --- pkgs/development/python-modules/losant-rest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/losant-rest/default.nix b/pkgs/development/python-modules/losant-rest/default.nix index 09321eb17d67..205c33f28fe4 100644 --- a/pkgs/development/python-modules/losant-rest/default.nix +++ b/pkgs/development/python-modules/losant-rest/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "losant-rest"; - version = "1.19.8"; + version = "1.19.9"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Losant"; repo = "losant-rest-python"; rev = "refs/tags/v${version}"; - hash = "sha256-CErC2Pwdw8CzV423uToysGaz92cBNyO3tLLuLozc0MU="; + hash = "sha256-rokoecBjBrk0iYbsGFkpSVZK5UcEw62TRGwLl8uaSAw="; }; build-system = [ setuptools ]; From 759bbdca01176f59025e689447a597320f1cc509 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Aug 2024 20:19:23 +0000 Subject: [PATCH 092/338] simdutf: 5.3.4 -> 5.3.7 --- pkgs/by-name/si/simdutf/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/simdutf/package.nix b/pkgs/by-name/si/simdutf/package.nix index 8e5c0cf9efb4..e64b70155a8e 100644 --- a/pkgs/by-name/si/simdutf/package.nix +++ b/pkgs/by-name/si/simdutf/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "simdutf"; - version = "5.3.4"; + version = "5.3.7"; src = fetchFromGitHub { owner = "simdutf"; repo = "simdutf"; rev = "v${finalAttrs.version}"; - hash = "sha256-zttqfzTF9P1czM2+HECcDC2j2XPfsJn0r+qpnNDfLWw="; + hash = "sha256-n99lt0OYK6OyLArdgPRabQ80ohQgHklpt9saDzKhvJw="; }; # Fix build on darwin From 94727cdb4084563f672198407db62c2089a27fbe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Aug 2024 20:26:37 +0000 Subject: [PATCH 093/338] grype: 0.79.5 -> 0.79.6 --- pkgs/by-name/gr/grype/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gr/grype/package.nix b/pkgs/by-name/gr/grype/package.nix index 835fbeedca72..2f3b81b2ad3d 100644 --- a/pkgs/by-name/gr/grype/package.nix +++ b/pkgs/by-name/gr/grype/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "grype"; - version = "0.79.5"; + version = "0.79.6"; src = fetchFromGitHub { owner = "anchore"; repo = "grype"; rev = "refs/tags/v${version}"; - hash = "sha256-JgCEiMETervYPI1XI25kAmleOMEs+w3atxKrwuGPxKc="; + hash = "sha256-4DvtZDDr1m+2kd0uEEQwW2KrTXa7ShF4jRFjSNMjJiM="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; From 3c9a6abb81fb558a51e21afe706564e6c7017eaa Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 17 Aug 2024 00:22:04 +0200 Subject: [PATCH 094/338] python312Packages.torchrl: 0.4.0 -> 0.5.0 Diff: https://github.com/pytorch/rl/compare/refs/tags/v0.4.0...v0.5.0 Changelog: https://github.com/pytorch/rl/releases/tag/v0.5.0 --- .../python-modules/torchrl/default.nix | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/torchrl/default.nix b/pkgs/development/python-modules/torchrl/default.nix index 638f1844eaba..3023380920c7 100644 --- a/pkgs/development/python-modules/torchrl/default.nix +++ b/pkgs/development/python-modules/torchrl/default.nix @@ -3,13 +3,20 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + + # build-system ninja, setuptools, - wheel, which, + + # dependencies cloudpickle, numpy, + packaging, + tensordict, torch, + + # optional-dependencies ale-py, gym, pygame, @@ -30,19 +37,20 @@ hydra-core, tensorboard, wandb, - packaging, - tensordict, + + # checks imageio, pytest-rerunfailures, pytestCheckHook, pyyaml, scipy, + stdenv, }: buildPythonPackage rec { pname = "torchrl"; - version = "0.4.0"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -51,13 +59,12 @@ buildPythonPackage rec { owner = "pytorch"; repo = "rl"; rev = "refs/tags/v${version}"; - hash = "sha256-8wSyyErqveP9zZS/UGvWVBYyylu9BuA447GEjXIzBIk="; + hash = "sha256-uDpOdOuHTqKFKspHOpl84kD9adEKZjvO2GnYuL27H5c="; }; build-system = [ ninja setuptools - wheel which ]; @@ -69,7 +76,7 @@ buildPythonPackage rec { torch ]; - passthru.optional-dependencies = { + optional-dependencies = { atari = [ ale-py gym @@ -117,6 +124,7 @@ buildPythonPackage rec { nativeCheckInputs = [ + h5py gymnasium imageio pytest-rerunfailures @@ -125,9 +133,9 @@ buildPythonPackage rec { scipy torchvision ] - ++ passthru.optional-dependencies.atari - ++ passthru.optional-dependencies.gym-continuous - ++ passthru.optional-dependencies.rendering; + ++ optional-dependencies.atari + ++ optional-dependencies.gym-continuous + ++ optional-dependencies.rendering; disabledTests = [ # mujoco.FatalError: an OpenGL platform library has not been loaded into this process, this most likely means that a valid OpenGL context has not been created before mjr_makeContext was called @@ -155,7 +163,7 @@ buildPythonPackage rec { "test_distributed_collector_updatepolicy" "test_timeit" - # On a 24 + # On a 24 threads system # assert torch.get_num_threads() == max(1, init_threads - 3) # AssertionError: assert 23 == 21 "test_auto_num_threads" @@ -168,6 +176,5 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; # ~3k tests fail with: RuntimeError: internal error - broken = stdenv.isLinux && stdenv.isAarch64; }; } From 6d4786b8c3df53bc70bd202fc18bd0014dc4ea07 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Aug 2024 20:38:49 +0000 Subject: [PATCH 095/338] cloudflared: 2024.7.3 -> 2024.8.2 --- pkgs/applications/networking/cloudflared/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index fb7c2ccc997c..898c26b11d68 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2024.7.3"; + version = "2024.8.2"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = "refs/tags/${version}"; - hash = "sha256-zz8xwIgGnMJjSv2XXUgsaUKXvHtXVuc2jyahrZ/yxmE="; + hash = "sha256-CAg5mBDcwIFstp8YrWpqwLSzK46+u35ZcaifV8Zk+rE="; }; vendorHash = null; From 104d3f214c1ccb128af746150474464dadeef588 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 18 Aug 2024 04:49:48 +0800 Subject: [PATCH 096/338] emacsPackages.lspce: simplify module renaming Actually, there is only one module on darwin systems. So the loop is removed. In addition, the bash magic is replaced with nix's stdenv.hostPlatform.extensions.sharedLibrary. --- .../elisp-packages/manual-packages/lspce/module.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix index 1a1f8612f64e..198f1d9b69af 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix @@ -2,8 +2,12 @@ lib, fetchFromGitHub, rustPlatform, + stdenv, }: +let + libExt = stdenv.hostPlatform.extensions.sharedLibrary; +in rustPlatform.buildRustPackage { pname = "lspce-module"; version = "1.1.0-unstable-2024-07-14"; @@ -22,13 +26,8 @@ rustPlatform.buildRustPackage { "--skip=msg::tests::serialize_request_with_null_params" ]; - # rename module without changing either suffix or location - # use for loop because there seems to be two modules on darwin systems - # https://github.com/zbelial/lspce/issues/7#issue-1783708570 postInstall = '' - for f in $out/lib/*; do - mv --verbose $f $out/lib/lspce-module.''${f##*.} - done + mv --verbose $out/lib/liblspce_module${libExt} $out/lib/lspce-module${libExt} ''; meta = { From 69aab1eff89dc896f08a567dcca16b9a1200d676 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Fri, 16 Aug 2024 01:35:37 -0400 Subject: [PATCH 097/338] python3Packages.apsw: fix build on Darwin --- pkgs/development/python-modules/apsw/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix index 2f1b76c1c2ab..aec388af308a 100644 --- a/pkgs/development/python-modules/apsw/default.nix +++ b/pkgs/development/python-modules/apsw/default.nix @@ -1,4 +1,5 @@ { + stdenv, lib, buildPythonPackage, fetchFromGitHub, @@ -38,7 +39,7 @@ buildPythonPackage rec { "testVFSWithWAL" # no lines in errout.txt "testWriteUnraisable" - ]; + ] ++ lib.optionals stdenv.isDarwin [ "testzzForkChecker" ]; pythonImportsCheck = [ "apsw" ]; From 658406b7eb57c0b226cb5bc2eb6491fd2b68e9a6 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 17 Aug 2024 22:10:21 +0100 Subject: [PATCH 098/338] wget: add patch for CVE-2024-38428 --- pkgs/tools/networking/wget/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index 0bdb6fab692a..0fbdd80332be 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gettext, pkg-config, perlPackages +{ lib, stdenv, fetchurl, fetchpatch, gettext, pkg-config, perlPackages , libidn2, zlib, pcre, libuuid, libiconv, libintl , python3, lzip, darwin , withLibpsl ? false, libpsl @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { patches = [ ./remove-runtime-dep-on-openssl-headers.patch + (fetchpatch { + name = "CVE-2024-38428.patch"; + url = "https://git.savannah.gnu.org/cgit/wget.git/patch/?id=ed0c7c7e0e8f7298352646b2fd6e06a11e242ace"; + hash = "sha256-4ZVPufgG/h0UkxF9hQBAtF6QAG4GEz9hHeqEsD47q4U="; + }) ]; preConfigure = '' From 57507a521a6ed57ec0161a2ec03f9d131bda2115 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 16 Aug 2024 15:09:49 +0200 Subject: [PATCH 099/338] nixos/graphical-desktop: add enable option --- nixos/modules/services/misc/graphical-desktop.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/graphical-desktop.nix b/nixos/modules/services/misc/graphical-desktop.nix index 246310195edc..0b5ef033e38b 100644 --- a/nixos/modules/services/misc/graphical-desktop.nix +++ b/nixos/modules/services/misc/graphical-desktop.nix @@ -5,11 +5,22 @@ ... }: let + cfg = config.services.graphical-desktop; xcfg = config.services.xserver; dmcfg = config.services.displayManager; in { - config = lib.mkIf (xcfg.enable || dmcfg.enable) { + options = { + services.graphical-desktop.enable = + lib.mkEnableOption "bits and pieces required for a graphical desktop session" + // { + default = xcfg.enable || dmcfg.enable; + defaultText = lib.literalExpression "(config.services.xserver.enable || config.services.displayManager.enable)"; + internal = true; + }; + }; + + config = lib.mkIf cfg.enable { # The default max inotify watches is 8192. # Nowadays most apps require a good number of inotify watches, # the value below is used by default on several other distros. From 4f34325b2b289d6382a66e43087456b4dc3e5a6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 16 Aug 2024 15:11:13 +0200 Subject: [PATCH 100/338] nixos/wayland-session: use graphical-desktop option and remove implicit defaults --- nixos/modules/programs/wayland/cardboard.nix | 2 +- nixos/modules/programs/wayland/hyprland.nix | 2 +- nixos/modules/programs/wayland/labwc.nix | 2 +- nixos/modules/programs/wayland/miracle-wm.nix | 2 +- nixos/modules/programs/wayland/river.nix | 2 +- nixos/modules/programs/wayland/sway.nix | 4 +--- nixos/modules/programs/wayland/wayfire.nix | 4 +--- nixos/modules/programs/wayland/wayland-session.nix | 6 +----- 8 files changed, 8 insertions(+), 16 deletions(-) diff --git a/nixos/modules/programs/wayland/cardboard.nix b/nixos/modules/programs/wayland/cardboard.nix index 96089bdf94ed..5a25b5359c24 100644 --- a/nixos/modules/programs/wayland/cardboard.nix +++ b/nixos/modules/programs/wayland/cardboard.nix @@ -19,6 +19,6 @@ in # To make a cardboard session available for certain DMs like SDDM services.displayManager.sessionPackages = [ cfg.package ]; } - (import ./wayland-session.nix { inherit lib pkgs; }) + (import ./wayland-session.nix { inherit lib; }) ]); } diff --git a/nixos/modules/programs/wayland/hyprland.nix b/nixos/modules/programs/wayland/hyprland.nix index 6e69c1730e57..f8b70af40600 100644 --- a/nixos/modules/programs/wayland/hyprland.nix +++ b/nixos/modules/programs/wayland/hyprland.nix @@ -70,7 +70,7 @@ in } (import ./wayland-session.nix { - inherit lib pkgs; + inherit lib; enableXWayland = cfg.xwayland.enable; enableWlrPortal = lib.mkDefault false; # Hyprland has its own portal, wlr is not needed }) diff --git a/nixos/modules/programs/wayland/labwc.nix b/nixos/modules/programs/wayland/labwc.nix index c09ab8240d9f..4c74b45bb4a3 100644 --- a/nixos/modules/programs/wayland/labwc.nix +++ b/nixos/modules/programs/wayland/labwc.nix @@ -20,6 +20,6 @@ in # To make a labwc session available for certain DMs like SDDM services.displayManager.sessionPackages = [ cfg.package ]; } - (import ./wayland-session.nix { inherit lib pkgs; }) + (import ./wayland-session.nix { inherit lib; }) ]); } diff --git a/nixos/modules/programs/wayland/miracle-wm.nix b/nixos/modules/programs/wayland/miracle-wm.nix index a4c843523dc4..e20b62acb462 100644 --- a/nixos/modules/programs/wayland/miracle-wm.nix +++ b/nixos/modules/programs/wayland/miracle-wm.nix @@ -30,7 +30,7 @@ in } (import ./wayland-session.nix { - inherit lib pkgs; + inherit lib; # Hardcoded path in Mir, not really possible to disable enableXWayland = true; # No portal support yet: https://github.com/mattkae/miracle-wm/issues/164 diff --git a/nixos/modules/programs/wayland/river.nix b/nixos/modules/programs/wayland/river.nix index 6391f00e2f62..da793a9ff344 100644 --- a/nixos/modules/programs/wayland/river.nix +++ b/nixos/modules/programs/wayland/river.nix @@ -56,7 +56,7 @@ in } (import ./wayland-session.nix { - inherit lib pkgs; + inherit lib; enableXWayland = cfg.xwayland.enable; }) ]); diff --git a/nixos/modules/programs/wayland/sway.nix b/nixos/modules/programs/wayland/sway.nix index e3e32aa7a56a..8d43a3329f41 100644 --- a/nixos/modules/programs/wayland/sway.nix +++ b/nixos/modules/programs/wayland/sway.nix @@ -129,8 +129,6 @@ in }; }; - programs.gnupg.agent.pinentryPackage = lib.mkDefault pkgs.pinentry-gnome3; - # To make a Sway session available if a display manager like SDDM is enabled: services.displayManager.sessionPackages = lib.optional (cfg.package != null) cfg.package; @@ -139,7 +137,7 @@ in } (import ./wayland-session.nix { - inherit lib pkgs; + inherit lib; enableXWayland = cfg.xwayland.enable; }) ]); diff --git a/nixos/modules/programs/wayland/wayfire.nix b/nixos/modules/programs/wayland/wayfire.nix index 381d14fb8e21..726300ce5381 100644 --- a/nixos/modules/programs/wayland/wayfire.nix +++ b/nixos/modules/programs/wayland/wayfire.nix @@ -52,8 +52,6 @@ in services.displayManager.sessionPackages = [ finalPackage ]; - xdg.icons.enable = true; - xdg.portal = { enable = lib.mkDefault true; wlr.enable = lib.mkDefault true; @@ -65,7 +63,7 @@ in }; } (import ./wayland-session.nix { - inherit lib pkgs; + inherit lib; enableXWayland = cfg.xwayland.enable; }) ] diff --git a/nixos/modules/programs/wayland/wayland-session.nix b/nixos/modules/programs/wayland/wayland-session.nix index 18c252794563..b3d6cc368b20 100644 --- a/nixos/modules/programs/wayland/wayland-session.nix +++ b/nixos/modules/programs/wayland/wayland-session.nix @@ -1,6 +1,5 @@ { lib, - pkgs, enableXWayland ? true, enableWlrPortal ? true, }: @@ -11,15 +10,12 @@ pam.services.swaylock = {}; }; - hardware.graphics.enable = lib.mkDefault true; - fonts.enableDefaultPackages = lib.mkDefault true; - programs = { dconf.enable = lib.mkDefault true; xwayland.enable = lib.mkDefault enableXWayland; }; - xdg.icons.enable = true; + services.graphical-desktop.enable = true; xdg.portal.wlr.enable = enableWlrPortal; From aae95f64662c70f9fa4c7bcf9809dc6953db3bcc Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 18 Aug 2024 05:11:51 +0800 Subject: [PATCH 101/338] emacsPackages.ada-mode: respect old nativeBuildInputs and buildInputs --- .../editors/emacs/elisp-packages/elpa-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 8bffb346dedd..3a1a5c97a94f 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -72,14 +72,14 @@ self: let sourceRoot = "ada-mode-${self.ada-mode.version}"; - nativeBuildInputs = [ + nativeBuildInputs = old.nativeBuildInputs ++ [ buildPackages.gnat buildPackages.gprbuild buildPackages.dos2unix buildPackages.re2c ]; - buildInputs = [ + buildInputs = old.buildInputs ++ [ pkgs.gnatPackages.gnatcoll-xref ]; From 4810747bb97c35b6c74686a419695d8b8cd319c6 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 18 Aug 2024 05:13:39 +0800 Subject: [PATCH 102/338] emacsPackages.telega: respect old nativeBuildInputs Fixes https://hydra.nixos.org/build/269115773 --- .../editors/emacs/elisp-packages/melpa-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 25dd378f03f6..0a2e620c1833 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -545,7 +545,7 @@ let # Telega has a server portion for it's network protocol telega = super.telega.overrideAttrs (old: { buildInputs = old.buildInputs ++ [ pkgs.tdlib ]; - nativeBuildInputs = [ pkgs.pkg-config ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; postPatch = '' substituteInPlace telega-customize.el \ From f56dd545bb2ce3ae2234ec7c4e9b049e0b0687ce Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 18 Aug 2024 05:14:19 +0800 Subject: [PATCH 103/338] emacsPackages.zmq: respect old nativeBuildInputs Fixes https://hydra.nixos.org/build/268777545 --- .../editors/emacs/elisp-packages/melpa-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 0a2e620c1833..871402905ee5 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -601,7 +601,7 @@ let export EZMQ_LIBDIR=$(mktemp -d) make ''; - nativeBuildInputs = [ + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.autoconf pkgs.automake pkgs.pkg-config From dda19805c2ece3d2f9b487c39dc21456f4f7e9e9 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 18 Aug 2024 05:15:17 +0800 Subject: [PATCH 104/338] emacsPackages.vterm: respect old nativeBuildInputs --- .../editors/emacs/elisp-packages/melpa-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 871402905ee5..8f5f1dc45a26 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -687,7 +687,7 @@ let }; vterm = super.vterm.overrideAttrs (old: { - nativeBuildInputs = [ pkgs.cmake ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.cmake ]; buildInputs = old.buildInputs ++ [ self.emacs pkgs.libvterm-neovim ]; cmakeFlags = [ "-DEMACS_SOURCE=${self.emacs.src}" From 3eea10fdb7b1a8f925cd167defdf059e5cc371eb Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 18 Aug 2024 05:17:49 +0800 Subject: [PATCH 105/338] emacsPackages.irony: respect old nativeBuildInputs and buildInputs --- .../editors/emacs/elisp-packages/melpa-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 8f5f1dc45a26..3c697763a5ff 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -322,8 +322,8 @@ let dontUseCmakeBuildDir = true; doCheck = pkgs.stdenv.isLinux; packageRequires = [ self.emacs ]; - buildInputs = [ pkgs.llvmPackages.libclang self.emacs ]; - nativeBuildInputs = [ pkgs.cmake pkgs.llvmPackages.llvm ]; + buildInputs = old.buildInputs ++ [ pkgs.llvmPackages.libclang self.emacs ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.cmake pkgs.llvmPackages.llvm ]; }); # tries to write a log file to $HOME From 1717bb5e36eedb28c4e36749b1cb24926c935a2b Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 18 Aug 2024 05:18:15 +0800 Subject: [PATCH 106/338] emacsPackages.irony: remove unneeded emacs --- .../editors/emacs/elisp-packages/melpa-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 3c697763a5ff..42234dd93c0a 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -321,8 +321,7 @@ let ''; dontUseCmakeBuildDir = true; doCheck = pkgs.stdenv.isLinux; - packageRequires = [ self.emacs ]; - buildInputs = old.buildInputs ++ [ pkgs.llvmPackages.libclang self.emacs ]; + buildInputs = old.buildInputs ++ [ pkgs.llvmPackages.libclang ]; nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.cmake pkgs.llvmPackages.llvm ]; }); From 062f810112efede2b678b846910d22b458dab756 Mon Sep 17 00:00:00 2001 From: networkException Date: Sat, 17 Aug 2024 23:25:43 +0200 Subject: [PATCH 107/338] ungoogled-chromium: 127.0.6533.119-1 -> 127.0.6533.119-2 --- .../networking/browsers/chromium/upstream-info.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 7f7fe28096f4..ddf2331132ee 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -27,8 +27,8 @@ version = "2024-06-06"; }; ungoogled-patches = { - hash = "sha256-m1H/7JsSF7Akm5eBlPB/F4mAdFjUPtOQIUoXup09w40="; - rev = "127.0.6533.119-1"; + hash = "sha256-m7x7tPrJfddPER9uiSp983xGn3YSH+Bq01l14vOlwrU="; + rev = "127.0.6533.119-2"; }; }; hash = "sha256-LuUDEpYCJLR/X+zjsF26aum4/Wfu2MNowofPu8iRVxI="; From ff1e3b197725bd3beb9266e68bd35bc60890fca8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Aug 2024 21:59:39 +0000 Subject: [PATCH 108/338] rio: 0.1.1 -> 0.1.7 --- pkgs/applications/terminal-emulators/rio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/terminal-emulators/rio/default.nix b/pkgs/applications/terminal-emulators/rio/default.nix index 178677af6011..879ed6facd20 100644 --- a/pkgs/applications/terminal-emulators/rio/default.nix +++ b/pkgs/applications/terminal-emulators/rio/default.nix @@ -55,16 +55,16 @@ let in rustPlatform.buildRustPackage rec { pname = "rio"; - version = "0.1.1"; + version = "0.1.7"; src = fetchFromGitHub { owner = "raphamorim"; repo = "rio"; rev = "refs/tags/v${version}"; - hash = "sha256-Hll9QpCN0/NDJ3tgJFnmNjfIotppGg5/BrHMxGmxOTo="; + hash = "sha256-3isj4FvzJpheUi12oQRNBvOxR8daL/J4RUOGgYLeBXQ="; }; - cargoHash = "sha256-yyxJi0kK2d2I+9GncYHcRKbdngYSltDjsTuChqaDG/U="; + cargoHash = "sha256-T+lXgNsMmq6cvsNe96R3F13SbboRAdd11UHumksqx4A="; nativeBuildInputs = [ ncurses From 5ae45fd67603e947a8d86b9ba411fc68a12e5385 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 18 Aug 2024 05:59:33 +0800 Subject: [PATCH 109/338] emacsPackages.emacsql-sqlite: fix override for new versions Since "20240808.2016"[1], emacsql-sqlite is just a stub so there is no need to override it. Fixes https://hydra.nix-community.org/build/490589 [1]: https://github.com/magit/emacsql/blob/c786ea159facf5892e9c4e5b7bdda44da95cd62e/emacsql-sqlite.el#L13 --- .../editors/emacs/elisp-packages/melpa-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 25dd378f03f6..51d554992558 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -199,7 +199,7 @@ let stripDebugList = [ "share" ]; }); - emacsql-sqlite = super.emacsql-sqlite.overrideAttrs (old: { + emacsql-sqlite = super.emacsql-sqlite.overrideAttrs (old: lib.optionalAttrs (lib.versionOlder old.version "20240808.2016") { buildInputs = old.buildInputs ++ [ pkgs.sqlite ]; postBuild = '' From 8f295e4d422130d9beba34564f37d42e33e93811 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 18 Aug 2024 06:39:22 +0800 Subject: [PATCH 110/338] emacsPackages.p4-16-mode: fix build https://hydra.nixos.org/build/269588786 --- .../elisp-packages/nongnu-devel-packages.nix | 18 +++++++++++++++++- .../emacs/elisp-packages/nongnu-packages.nix | 15 +++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-packages.nix index 01bca0ff1f8a..7b156aeaaa49 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-packages.nix @@ -35,7 +35,23 @@ let super = imported; - overrides = { }; + overrides = { + p4-16-mode = super.p4-16-mode.overrideAttrs { + # workaround https://github.com/NixOS/nixpkgs/issues/301795 + prePatch = '' + mkdir tmp-untar-dir + pushd tmp-untar-dir + + tar --extract --verbose --file=$src + content_directory=$(echo p4-16-mode-*) + cp --verbose $content_directory/p4-16-mode-pkg.el $content_directory/p4-pkg.el + src=$PWD/$content_directory.tar + tar --create --verbose --file=$src $content_directory + + popd + ''; + }; + }; in super // overrides diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix index cd32a8bd3975..ce13179ca1ea 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix @@ -30,6 +30,21 @@ self: let super = imported; overrides = { + p4-16-mode = super.p4-16-mode.overrideAttrs { + # workaround https://github.com/NixOS/nixpkgs/issues/301795 + prePatch = '' + mkdir tmp-untar-dir + pushd tmp-untar-dir + + tar --extract --verbose --file=$src + content_directory=$(echo p4-16-mode-*) + cp --verbose $content_directory/p4-16-mode-pkg.el $content_directory/p4-pkg.el + src=$PWD/$content_directory.tar + tar --create --verbose --file=$src $content_directory + + popd + ''; + }; }; in super // overrides); From b7b0f06c6592b08a948724a394c1251431cbec17 Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Sat, 17 Aug 2024 16:00:00 -0700 Subject: [PATCH 111/338] avr-libc: 2.2.0 -> 2.2.1 --- pkgs/development/misc/avr/libc/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/misc/avr/libc/default.nix b/pkgs/development/misc/avr/libc/default.nix index c2b35ed72204..0d856a44878b 100644 --- a/pkgs/development/misc/avr/libc/default.nix +++ b/pkgs/development/misc/avr/libc/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, automake, autoconf }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "avr-libc"; - version = "2.2.0"; + version = "2.2.1"; - tag_version = builtins.replaceStrings ["."] ["_"] version; + tag_version = builtins.replaceStrings ["."] ["_"] finalAttrs.version; src = fetchurl { - url = "https://github.com/avrdudes/avr-libc/releases/download/avr-libc-${tag_version}-release/avr-libc-${version}.tar.bz2"; - hash = "sha256-Bxjv1PVCeId9ploLIDtAIHOzDgTf6piObyqINa0HHTU="; + url = "https://github.com/avrdudes/avr-libc/releases/download/avr-libc-${finalAttrs.tag_version}-release/avr-libc-${finalAttrs.version}.tar.bz2"; + hash = "sha256-AGpjBsu8k4w721g6xU+T/n18jPl/nN6R+RxvsCc6tGU="; }; nativeBuildInputs = [ automake autoconf ]; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { platforms = [ "avr-none" ]; maintainers = with maintainers; [ mguentner emilytrau ]; }; -} +}) From be32c3603e91efee7234efc301460422aee2511b Mon Sep 17 00:00:00 2001 From: Nydragon Date: Sat, 17 Aug 2024 11:49:48 +0200 Subject: [PATCH 112/338] microfetch: 0.3.3 -> 0.4.0 https://github.com/NotAShelf/microfetch/compare/v0.3.3...v0.4.0 --- pkgs/by-name/mi/microfetch/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/microfetch/package.nix b/pkgs/by-name/mi/microfetch/package.nix index 6f7695073c5c..20115dca3697 100644 --- a/pkgs/by-name/mi/microfetch/package.nix +++ b/pkgs/by-name/mi/microfetch/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "microfetch"; - version = "0.3.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = "NotAShelf"; repo = "microfetch"; rev = "refs/tags/v${version}"; - hash = "sha256-iBfnui7xrx31euYnQxoJf1xXFYFiJnDMadLRAiRCN04="; + hash = "sha256-bRN16Iq9m6HaeT+KWCpeukTu1tnMOvtM6lDHO5OiIS4="; }; - cargoHash = "sha256-J+S6XIMUcWj4jXABQinEDx6dRG5Byc2UxJoKj2y1tQU="; + cargoHash = "sha256-dGlAiPrOWFI8ogo/1S2ZK/ZPBtKGCyA72B+6B4bp5Mg="; meta = { description = "Microscopic fetch script in Rust, for NixOS systems"; From f4e5df01cce6349e6037918ed5053dcff5e7061d Mon Sep 17 00:00:00 2001 From: Nydragon Date: Sat, 17 Aug 2024 11:50:16 +0200 Subject: [PATCH 113/338] microfetch: add update script --- pkgs/by-name/mi/microfetch/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/mi/microfetch/package.nix b/pkgs/by-name/mi/microfetch/package.nix index 20115dca3697..32f3b142c319 100644 --- a/pkgs/by-name/mi/microfetch/package.nix +++ b/pkgs/by-name/mi/microfetch/package.nix @@ -2,6 +2,7 @@ lib, rustPlatform, fetchFromGitHub, + nix-update-script, }: rustPlatform.buildRustPackage rec { @@ -17,6 +18,8 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-dGlAiPrOWFI8ogo/1S2ZK/ZPBtKGCyA72B+6B4bp5Mg="; + passthru.updateScript = nix-update-script { }; + meta = { description = "Microscopic fetch script in Rust, for NixOS systems"; homepage = "https://github.com/NotAShelf/microfetch"; From 6d0458f91678ea5bf5faa1c10de8809635dbc50e Mon Sep 17 00:00:00 2001 From: Nydragon Date: Sat, 17 Aug 2024 11:50:28 +0200 Subject: [PATCH 114/338] microfetch: add notashelf as maintainer --- pkgs/by-name/mi/microfetch/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/mi/microfetch/package.nix b/pkgs/by-name/mi/microfetch/package.nix index 32f3b142c319..18e8e2546d93 100644 --- a/pkgs/by-name/mi/microfetch/package.nix +++ b/pkgs/by-name/mi/microfetch/package.nix @@ -24,7 +24,10 @@ rustPlatform.buildRustPackage rec { description = "Microscopic fetch script in Rust, for NixOS systems"; homepage = "https://github.com/NotAShelf/microfetch"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ nydragon ]; + maintainers = with lib.maintainers; [ + nydragon + NotAShelf + ]; mainProgram = "microfetch"; platforms = lib.platforms.linux; }; From 118ab33e1dafdf01ae0075727f8b5c2e4b68a2a2 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 18 Aug 2024 01:37:56 +0200 Subject: [PATCH 115/338] llama-cpp: update description Closes https://github.com/NixOS/nixpkgs/pull/334451 --- pkgs/by-name/ll/llama-cpp/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index 1d2e171c3025..bb651b3e4a27 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -156,7 +156,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - description = "Port of Facebook's LLaMA model in C/C++"; + description = "Inference of Meta's LLaMA model (and others) in pure C/C++"; homepage = "https://github.com/ggerganov/llama.cpp/"; license = licenses.mit; mainProgram = "llama"; From 2ac7beeaceda3a70e692e4a4128f372ad7e55be7 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 18 Aug 2024 09:14:57 +0900 Subject: [PATCH 116/338] python312Packages.glcontext: refactor --- .../python-modules/glcontext/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/glcontext/default.nix b/pkgs/development/python-modules/glcontext/default.nix index fa0194872f45..900441f57bee 100644 --- a/pkgs/development/python-modules/glcontext/default.nix +++ b/pkgs/development/python-modules/glcontext/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - isPy3k, + setuptools, libGL, libX11, }: @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "glcontext"; version = "3.0.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "moderngl"; - repo = pname; + repo = "glcontext"; rev = "refs/tags/${version}"; hash = "sha256-GC2sb6xQjg99xLcXSynLOOyyqNwCHZwZqrs9RZh99pY="; }; - disabled = !isPy3k; + build-system = [ setuptools ]; buildInputs = [ libGL @@ -28,11 +28,11 @@ buildPythonPackage rec { postPatch = '' substituteInPlace glcontext/x11.cpp \ - --replace '"libGL.so"' '"${libGL}/lib/libGL.so"' \ - --replace '"libX11.so"' '"${libX11}/lib/libX11.so"' + --replace-fail '"libGL.so"' '"${libGL}/lib/libGL.so"' \ + --replace-fail '"libX11.so"' '"${libX11}/lib/libX11.so"' substituteInPlace glcontext/egl.cpp \ - --replace '"libGL.so"' '"${libGL}/lib/libGL.so"' \ - --replace '"libEGL.so"' '"${libGL}/lib/libEGL.so"' + --replace-fail '"libGL.so"' '"${libGL}/lib/libGL.so"' \ + --replace-fail '"libEGL.so"' '"${libGL}/lib/libEGL.so"' ''; # Tests fail because they try to open display. See From fc6ea8c412ba8ac1216641bd0d4127e3b12e1981 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 18 Aug 2024 09:44:56 +0900 Subject: [PATCH 117/338] python312Packages.labgrid: update meta.homepage --- pkgs/development/python-modules/labgrid/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/labgrid/default.nix b/pkgs/development/python-modules/labgrid/default.nix index 57e1a751cd52..f81fe0c2305a 100644 --- a/pkgs/development/python-modules/labgrid/default.nix +++ b/pkgs/development/python-modules/labgrid/default.nix @@ -89,7 +89,7 @@ buildPythonPackage rec { meta = with lib; { description = "Embedded control & testing library"; - homepage = "https://labgrid.org"; + homepage = "https://github.com/labgrid-project/labgrid"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ emantor ]; platforms = with platforms; linux; From ac8470c1ce70cb66aeac851f9f9675545e1a5efe Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 18 Aug 2024 09:48:21 +0900 Subject: [PATCH 118/338] python312Packages.labgrid: refactor --- .../python-modules/labgrid/default.nix | 25 ++++--------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/labgrid/default.nix b/pkgs/development/python-modules/labgrid/default.nix index f81fe0c2305a..955f62b568d8 100644 --- a/pkgs/development/python-modules/labgrid/default.nix +++ b/pkgs/development/python-modules/labgrid/default.nix @@ -8,7 +8,6 @@ lib, mock, openssh, - packaging, pexpect, psutil, pyserial, @@ -21,13 +20,13 @@ requests, setuptools, setuptools-scm, - wheel, xmodem, }: buildPythonPackage rec { pname = "labgrid"; version = "24.0"; + pyproject = true; src = fetchFromGitHub { owner = "labgrid-project"; @@ -36,20 +35,16 @@ buildPythonPackage rec { hash = "sha256-XlndAmLkDjb4S2BD85noTMJCeqa5srZocjgg1x6Ry/g="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm - wheel ]; - pyproject = true; - - propagatedBuildInputs = [ + dependencies = [ ansicolors attrs autobahn jinja2 - packaging pexpect pyserial pyudev @@ -59,20 +54,10 @@ buildPythonPackage rec { xmodem ]; - pythonRelaxDeps = [ - "attrs" - "autobahn" - "jinja2" - "packaging" - "pexpect" - "pytest" - "pyudev" - "requests" - "xmodem" - ]; - pythonRemoveDeps = [ "pyserial-labgrid" ]; + pythonImportsCheck = [ "labgrid" ]; + nativeCheckInputs = [ mock openssh From 1e2d5727a7d8e282747ccc961d0eb39996e7db14 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 02:33:37 +0000 Subject: [PATCH 119/338] python312Packages.aioopenexchangerates: 0.6.0 -> 0.6.1 --- .../python-modules/aioopenexchangerates/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioopenexchangerates/default.nix b/pkgs/development/python-modules/aioopenexchangerates/default.nix index 2f32df9c72b9..b851a4f70fb0 100644 --- a/pkgs/development/python-modules/aioopenexchangerates/default.nix +++ b/pkgs/development/python-modules/aioopenexchangerates/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aioopenexchangerates"; - version = "0.6.0"; + version = "0.6.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aioopenexchangerates"; rev = "refs/tags/v${version}"; - hash = "sha256-XvpSHxPCsfxgHdPVf8NGKPpCYbeZhVLwRtj6koAt/Rk="; + hash = "sha256-4MKx2wbveuT8YwQKo4HsFUaTpt2KInLtIvMWFxZCFmE="; }; pythonRelaxDeps = [ "pydantic" ]; From 4686df5d269fe7868bc270e66cb4dc7761156b74 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 02:33:43 +0000 Subject: [PATCH 120/338] process-compose: 1.18.0 -> 1.24.0 --- pkgs/applications/misc/process-compose/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/process-compose/default.nix b/pkgs/applications/misc/process-compose/default.nix index cac2f47c25bb..ebaa888baf9c 100644 --- a/pkgs/applications/misc/process-compose/default.nix +++ b/pkgs/applications/misc/process-compose/default.nix @@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config"; in buildGoModule rec { pname = "process-compose"; - version = "1.18.0"; + version = "1.24.0"; src = fetchFromGitHub { owner = "F1bonacc1"; repo = pname; rev = "v${version}"; - hash = "sha256-S4MmE1LeX23dBceWoOPpd5xp+A0IxACzb9RSxtkf5tg="; + hash = "sha256-CrirbzsPAoS6eNMCzQilWlLvZGm05ojkVYUiYVY/uHo="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; From 51e2b64eee8bf5ec35c1af3fb6622fe21dbc964d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 02:34:12 +0000 Subject: [PATCH 121/338] cowsay: 3.8.1 -> 3.8.2 --- pkgs/by-name/co/cowsay/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/cowsay/package.nix b/pkgs/by-name/co/cowsay/package.nix index b3a4cd87cb1c..4e277a0b64a0 100644 --- a/pkgs/by-name/co/cowsay/package.nix +++ b/pkgs/by-name/co/cowsay/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "cowsay"; - version = "3.8.1"; + version = "3.8.2"; outputs = [ "out" @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "cowsay-org"; repo = "cowsay"; rev = "v${finalAttrs.version}"; - hash = "sha256-4y+k1CzgTFq48g9gCzPTHdQFf3zgGTBm6tZTEXb7uTU="; + hash = "sha256-IvodIoPrXI0D9pB95JPUBAIfxxnGDWl30P+WRf8VXIw="; }; nativeBuildInputs = [ makeWrapper ]; From 912fce04942ccfb1057a1d19e1d26245031e6295 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 02:46:50 +0000 Subject: [PATCH 122/338] python312Packages.lib4sbom: 0.7.2 -> 0.7.3 --- pkgs/development/python-modules/lib4sbom/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/lib4sbom/default.nix b/pkgs/development/python-modules/lib4sbom/default.nix index 6cdbefeb65da..8960c7a54fd9 100644 --- a/pkgs/development/python-modules/lib4sbom/default.nix +++ b/pkgs/development/python-modules/lib4sbom/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "lib4sbom"; - version = "0.7.2"; + version = "0.7.3"; format = "setuptools"; src = fetchFromGitHub { owner = "anthonyharrison"; repo = pname; - rev = "v${version}"; - hash = "sha256-sjfOCG1E5Of+HPcfRsBwEKmGkhUOIkAARWja81FL2PY="; + rev = "refs/tags/v${version}"; + hash = "sha256-RuIvhlLnWf/ayU6tjpHYKvBFqU8ojPwJK/pDIdLrD2s="; }; dependencies = [ From 8daa0d0653c2a1b8574f56fc9fa35b44799780e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 02:57:19 +0000 Subject: [PATCH 123/338] textlint: 14.0.5 -> 14.1.0 --- pkgs/by-name/te/textlint/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/textlint/package.nix b/pkgs/by-name/te/textlint/package.nix index 0254d850633f..aca6801769ba 100644 --- a/pkgs/by-name/te/textlint/package.nix +++ b/pkgs/by-name/te/textlint/package.nix @@ -26,13 +26,13 @@ buildNpmPackage rec { pname = "textlint"; - version = "14.0.5"; + version = "14.1.0"; src = fetchFromGitHub { owner = "textlint"; repo = "textlint"; rev = "refs/tags/v${version}"; - hash = "sha256-W2ySdd1ADqEpEBFgwRvzAzAivL//pj2PSlg7Kfcbspg="; + hash = "sha256-/pXUqpQ3cRjcwZAfBVpf9K9JsPmxB9iX8p64iE/n/68="; }; patches = [ @@ -42,7 +42,7 @@ buildNpmPackage rec { ./remove-workspaces.patch ]; - npmDepsHash = "sha256-IMXcdR9WqSvBwk3/0qihVr3OraJAwrsCMUVnTbx9z+Q="; + npmDepsHash = "sha256-FnDKPLhf9OxwRrrBJgejp4X13FGEI317yTgI3tA5cX8="; nativeBuildInputs = [ autoconf From fa478694a4b506a78459c4d74b61ab83453c3167 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 03:02:10 +0000 Subject: [PATCH 124/338] twitch-tui: 2.6.14 -> 2.6.15 --- .../networking/instant-messengers/twitch-tui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix index 43ba3e72ad41..9e25012697af 100644 --- a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix +++ b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "twitch-tui"; - version = "2.6.14"; + version = "2.6.15"; src = fetchFromGitHub { owner = "Xithrius"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-a/tPRGqD6YBw1Ls28kJNxQYNMc8mUq8wLgSg0yiJR+U="; + hash = "sha256-nuGfdhwlT47gdTu1FbXKOnyBmkvATuL930U0AYgMEUY="; }; - cargoHash = "sha256-MRbwA/riOECCv2/AzNIma9sMAyRrEDb6HDOaGVDxr1Q="; + cargoHash = "sha256-C15d6XrqQYaVBklR+sfYGB974cPkSTcNRh50X4GEIzI="; nativeBuildInputs = [ pkg-config From 43064d95b8784d326c86067fc808a2ceae7d1818 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 03:16:38 +0000 Subject: [PATCH 125/338] github-runner: 2.319.0 -> 2.319.1 --- pkgs/by-name/gi/github-runner/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/github-runner/package.nix b/pkgs/by-name/gi/github-runner/package.nix index 0d0cca441db0..ff69321e65bd 100644 --- a/pkgs/by-name/gi/github-runner/package.nix +++ b/pkgs/by-name/gi/github-runner/package.nix @@ -22,13 +22,13 @@ assert builtins.all (x: builtins.elem x [ "node20" ]) nodeRuntimes; buildDotnetModule rec { pname = "github-runner"; - version = "2.319.0"; + version = "2.319.1"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; rev = "v${version}"; - hash = "sha256-02vIMuaeU5CsdwmJzUdfa6BFKewsKGFsEWKza3CqRtQ="; + hash = "sha256-cXOYW4py2RRJVUKrQBGf6LHNyc1sJ/bMR4hJxtDv3PU="; leaveDotGit = true; postFetch = '' git -C $out rev-parse --short HEAD > $out/.git-revision From b74e7a74498f63ffac3153df86d8be73d8936f0e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 03:31:25 +0000 Subject: [PATCH 126/338] androidStudioPackages.canary: 2024.2.1.1 -> 2024.2.1.3 --- pkgs/applications/editors/android-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 5f1b2822f5c7..8e06f7a07d1b 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -17,8 +17,8 @@ let sha256Hash = "sha256-Qn5NNW2Rt6f9QiEUamIumme45uUVeTiMJ/9niAC6ilM="; }; latestVersion = { - version = "2024.2.1.1"; # "Android Studio Ladybug | 2024.2.1 Canary 5" - sha256Hash = "sha256-yfb23cYwRghUA04Ckf4I2yfqmdED9sf//0FSeWL+ze4="; + version = "2024.2.1.3"; # "Android Studio Ladybug | 2024.2.1 Canary 7" + sha256Hash = "sha256-HECowgJ7b6PjYHb+lRuFLzl9wWwWfFWNI0cSijwG7LA="; }; in { # Attributes are named by their corresponding release channels From 38e1362d4a532a161a94f53e4e418ce59af31aa5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 04:02:42 +0000 Subject: [PATCH 127/338] python312Packages.sanic: 23.12.1 -> 24.6.0 --- pkgs/development/python-modules/sanic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 8885c4951dd3..94cc8ba3f38d 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { pname = "sanic"; - version = "23.12.1"; + version = "24.6.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -47,7 +47,7 @@ buildPythonPackage rec { owner = "sanic-org"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-TizjibqoLNMX0m5oPyncKgFnltXOLZUIPSzVIeKU25w="; + hash = "sha256-AviYqdr+r5ya4mFJKGUatBsaMMmCQGqE3YtDJwTuaY0="; }; nativeBuildInputs = [ From 8db41acb41ff81d431170111a05673a5c16cb2e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 04:29:34 +0000 Subject: [PATCH 128/338] moon: 1.27.5 -> 1.27.6 --- pkgs/development/tools/build-managers/moon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/moon/default.nix b/pkgs/development/tools/build-managers/moon/default.nix index 87804dd7f720..849724b80148 100644 --- a/pkgs/development/tools/build-managers/moon/default.nix +++ b/pkgs/development/tools/build-managers/moon/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "moon"; - version = "1.27.5"; + version = "1.27.6"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-FckWn8tHSuowhVSq1B/KqzXB4KlWMOWfmuVfKr/y7Hk="; + hash = "sha256-oadbF1bXDaJPp6R7C6Ozm5NgFPmvPwgiPIDuRiNrWg8="; }; - cargoHash = "sha256-rES9cHwOH/Zw0fYhYplQb8FJ/iOndFgskg5zRTMeMDI="; + cargoHash = "sha256-p3CBjdWOutEWIQMWS5nAYAsE9BQf2MViyoLIOD1OE/s="; env = { RUSTFLAGS = "-C strip=symbols"; From d36baf57d5db12fb38ab2d45fd1c2ecd7d58b3c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 04:43:29 +0000 Subject: [PATCH 129/338] vtm: 0.9.99.04 -> 0.9.99.06 --- pkgs/tools/misc/vtm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/vtm/default.nix b/pkgs/tools/misc/vtm/default.nix index 70dec52f1df8..a485891e190e 100644 --- a/pkgs/tools/misc/vtm/default.nix +++ b/pkgs/tools/misc/vtm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vtm"; - version = "0.9.99.04"; + version = "0.9.99.06"; src = fetchFromGitHub { owner = "netxs-group"; repo = "vtm"; rev = "v${finalAttrs.version}"; - hash = "sha256-BMVen3TuU8IPWQSo1qx12VEWa19dBNpCBOYm5fWs5As="; + hash = "sha256-90dZzuSjFp9rbzR3ze/L9Kg9/Gb2bidVeqHBHiD4RM4="; }; nativeBuildInputs = [ From e1b49b3af69ed015ed47ffe3729d4c0448a5be5a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 04:44:22 +0000 Subject: [PATCH 130/338] v2ray-domain-list-community: 20240810010807 -> 20240817092737 --- pkgs/data/misc/v2ray-domain-list-community/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 12d00e5735c7..2c1d71a61644 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,12 +3,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20240810010807"; + version = "20240817092737"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-pxb29QO1K9e4CwAAdNUi6jxoiXhJYELqnu/A7DuB0zQ="; + hash = "sha256-RQl7tRY2eQcepthFXwzVMPQtFsVDih++VnMBHR4Tink="; }; vendorHash = "sha256-NLh14rXRci4hgDkBJVJDIDvobndB7KYRKAX7UjyqSsg="; meta = with lib; { From 651340662e56cc8dece1f6ea1bd2e56834e388f4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 04:46:18 +0000 Subject: [PATCH 131/338] cargo-mobile2: 0.13.1 -> 0.13.2 --- pkgs/development/tools/rust/cargo-mobile2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-mobile2/default.nix b/pkgs/development/tools/rust/cargo-mobile2/default.nix index c0a1c112acff..752d25c8ed7e 100644 --- a/pkgs/development/tools/rust/cargo-mobile2/default.nix +++ b/pkgs/development/tools/rust/cargo-mobile2/default.nix @@ -12,7 +12,7 @@ let inherit (darwin.apple_sdk.frameworks) CoreServices; pname = "cargo-mobile2"; - version = "0.13.1"; + version = "0.13.2"; in rustPlatform.buildRustPackage { inherit pname version; @@ -20,14 +20,14 @@ rustPlatform.buildRustPackage { owner = "tauri-apps"; repo = pname; rev = "cargo-mobile2-v${version}"; - hash = "sha256-MEq7NHoGQ8Qp7qXQXTyiV9vE+wXFMihrqPfj7q5AdxI="; + hash = "sha256-skGvWvfJRpoDjl8VMViFtyskzhpVsDZBksb7sr8ba7I="; }; # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 # sourceRoot = "${src.name}/tooling/cli"; - cargoHash = "sha256-6atMhn1DaItybJUT/NndRce//j+LdpuoBsY6z3DKxE0="; + cargoHash = "sha256-OoqTqMZ1qxnq4nfKR38oWfH238W7M8u+zFbh34aCxXk="; preBuild = '' mkdir -p $out/share/ From 7fc69e2c43bf32f3ffcee49e2480bd130cda8402 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 05:11:33 +0000 Subject: [PATCH 132/338] prometheus-pve-exporter: 3.4.3 -> 3.4.4 --- pkgs/servers/monitoring/prometheus/pve-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/pve-exporter.nix b/pkgs/servers/monitoring/prometheus/pve-exporter.nix index 7bc1d9280a64..5ecbc60140e6 100644 --- a/pkgs/servers/monitoring/prometheus/pve-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/pve-exporter.nix @@ -6,11 +6,11 @@ python3.pkgs.buildPythonApplication rec { pname = "prometheus_pve_exporter"; - version = "3.4.3"; + version = "3.4.4"; src = fetchPypi { inherit pname version; - hash = "sha256-5xvTUOwBj3N0hxLKfAlEq8y8snoDb92f7o7u7j0RdhY="; + hash = "sha256-kQo3NVrqsM78bFE9sZjubNdT6yj3Dza3BqF6DkYA6eI="; }; propagatedBuildInputs = with python3.pkgs; [ From bea2510828191721ce03d5eb9c01d3eb3c6248ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 05:14:26 +0000 Subject: [PATCH 133/338] exercism: 3.4.0 -> 3.4.1 --- pkgs/applications/misc/exercism/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix index 4473fbdbe78d..bcd611573aed 100644 --- a/pkgs/applications/misc/exercism/default.nix +++ b/pkgs/applications/misc/exercism/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "exercism"; - version = "3.4.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "exercism"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-+Tg9b7JZtriF5b+mnLgOeTTLiswH/dSGg3Mj1TBt4Wk="; + hash = "sha256-ohqfwK0RWSY7/GsUa/VTAD5pcuzQIkx8z3n5rKEb7hY="; }; vendorHash = "sha256-xY3C3emqtPIKyxIN9aEkrLXhTxWNmo0EJXNZVtbtIvs="; From 33a0e1e2bc9401c6a9dc254564d78ce77e8354ad Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 18 Aug 2024 08:25:31 +0300 Subject: [PATCH 134/338] path-of-building.data: 2.48.1 -> 2.48.2 Diff: https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.48.1...v2.48.2 --- pkgs/games/path-of-building/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/path-of-building/default.nix b/pkgs/games/path-of-building/default.nix index 5663dc50e85e..0fcd79b4b956 100644 --- a/pkgs/games/path-of-building/default.nix +++ b/pkgs/games/path-of-building/default.nix @@ -17,13 +17,13 @@ let data = stdenv.mkDerivation (finalAttrs: { pname = "path-of-building-data"; - version = "2.48.1"; + version = "2.48.2"; src = fetchFromGitHub { owner = "PathOfBuildingCommunity"; repo = "PathOfBuilding"; rev = "v${finalAttrs.version}"; - hash = "sha256-b6tHBlMFJqm0FaXj+5gY+ltd3J3N3IM9QZGd0i1iXLk="; + hash = "sha256-KMj+aS+xd96pt1NhqL3CBKj83ZfiX2npmJtwUFa00qU="; }; nativeBuildInputs = [ unzip ]; From 13b60a1ffcc42167eb8c1e48e1dc687f01c27e85 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 05:26:31 +0000 Subject: [PATCH 135/338] erigon: 2.60.5 -> 2.60.6 --- pkgs/applications/blockchains/erigon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/erigon/default.nix b/pkgs/applications/blockchains/erigon/default.nix index f91ffaeb0531..b5fa4dfe134d 100644 --- a/pkgs/applications/blockchains/erigon/default.nix +++ b/pkgs/applications/blockchains/erigon/default.nix @@ -2,7 +2,7 @@ let pname = "erigon"; - version = "2.60.5"; + version = "2.60.6"; in buildGoModule { inherit pname version; @@ -11,11 +11,11 @@ buildGoModule { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - hash = "sha256-sI5XlPoHjAN3QsNWJXhi+qHDPVpcLqgX1hMa6gN5Iwc="; + hash = "sha256-208gJTLaVEikH92ZDEULPtfnKJyZhZCRCDfCxewABK4="; fetchSubmodules = true; }; - vendorHash = "sha256-2Gx3ZUq1FDGEPW4qTwK916AGVMwoIDY97rkuEzRXP1U="; + vendorHash = "sha256-TUK7obI1wOXroI1NE1GfIP+NMW909+z92Wpy9B/soY0="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: From 93f8c17542bf32fbc34eb69985776c870f8e7a8c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 05:27:57 +0000 Subject: [PATCH 136/338] nzbhydra2: 7.4.0 -> 7.5.0 --- pkgs/by-name/nz/nzbhydra2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nz/nzbhydra2/package.nix b/pkgs/by-name/nz/nzbhydra2/package.nix index 2e6303c7a31b..d02bd629f952 100644 --- a/pkgs/by-name/nz/nzbhydra2/package.nix +++ b/pkgs/by-name/nz/nzbhydra2/package.nix @@ -10,11 +10,11 @@ }: stdenv.mkDerivation rec { pname = "nzbhydra2"; - version = "7.4.0"; + version = "7.5.0"; src = fetchzip { url = "https://github.com/theotherp/${pname}/releases/download/v${version}/${pname}-${version}-generic.zip"; - hash = "sha256-9ZGnY7ccByexQrBmJeuxEHN2OZeCGdJdSP0lvtKRHOE="; + hash = "sha256-jnClKsWSdRWCxNFO9RSnjdoDjOmtv9CrOL9KyaZ8PTc="; stripRoot = false; }; From 8a95029e8f654453ed9664c2b78e127b3a49e670 Mon Sep 17 00:00:00 2001 From: Jonathan Conder Date: Sun, 18 Aug 2024 17:36:55 +1200 Subject: [PATCH 137/338] neovim-gtk: fix build with rustc 1.80 --- pkgs/by-name/ne/neovim-gtk/collect-box.patch | 12 ++++++++++++ pkgs/by-name/ne/neovim-gtk/package.nix | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/by-name/ne/neovim-gtk/collect-box.patch diff --git a/pkgs/by-name/ne/neovim-gtk/collect-box.patch b/pkgs/by-name/ne/neovim-gtk/collect-box.patch new file mode 100644 index 000000000000..0264637e9bb1 --- /dev/null +++ b/pkgs/by-name/ne/neovim-gtk/collect-box.patch @@ -0,0 +1,12 @@ +diff -ru a/src/ui.rs b/src/ui.rs +--- a/src/ui.rs ++++ b/src/ui.rs +@@ -385,7 +386,7 @@ + files_list + .iter() + .map(|f| misc::escape_filename(f)) +- .collect::>() ++ .collect::>() + .join(" ") + )); + } else { diff --git a/pkgs/by-name/ne/neovim-gtk/package.nix b/pkgs/by-name/ne/neovim-gtk/package.nix index eebb980f85cb..7b8504ebe09a 100644 --- a/pkgs/by-name/ne/neovim-gtk/package.nix +++ b/pkgs/by-name/ne/neovim-gtk/package.nix @@ -26,6 +26,8 @@ rustPlatform.buildRustPackage rec { buildInputs = [ gdk-pixbuf gtk4 pango vte-gtk4 ]; + patches = [ ./collect-box.patch ]; + postInstall = '' make PREFIX=$out install-resources ''; From ced294694c5a745790e696a9743bad51c6a5bbba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 06:03:15 +0000 Subject: [PATCH 138/338] python312Packages.aiovlc: 0.4.0 -> 0.4.1 --- pkgs/development/python-modules/aiovlc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiovlc/default.nix b/pkgs/development/python-modules/aiovlc/default.nix index 7708b6806292..bb710c096fe5 100644 --- a/pkgs/development/python-modules/aiovlc/default.nix +++ b/pkgs/development/python-modules/aiovlc/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiovlc"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aiovlc"; rev = "refs/tags/v${version}"; - hash = "sha256-wUtoL3e22ufyzB7MJH0EuxE4WyxKQXEgThAOw23AwLM="; + hash = "sha256-6oAnij92lR/sbU80j4WIBCvScPvoVLTMRYlT5zHnVnk="; }; build-system = [ poetry-core ]; From 3b1ac17270fa0753617b42eded40f9785b033358 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 06:20:59 +0000 Subject: [PATCH 139/338] python312Packages.uv: 0.2.27 -> 0.2.37 --- pkgs/by-name/uv/uv/Cargo.lock | 720 +++++++++++++++++++-------------- pkgs/by-name/uv/uv/package.nix | 8 +- 2 files changed, 424 insertions(+), 304 deletions(-) diff --git a/pkgs/by-name/uv/uv/Cargo.lock b/pkgs/by-name/uv/uv/Cargo.lock index 93053576646e..ca443cb85ca1 100644 --- a/pkgs/by-name/uv/uv/Cargo.lock +++ b/pkgs/by-name/uv/uv/Cargo.lock @@ -75,9 +75,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.6.14" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", @@ -90,33 +90,33 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.3" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -136,9 +136,9 @@ checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" [[package]] name = "arrayvec" @@ -158,13 +158,14 @@ dependencies = [ [[package]] name = "assert_cmd" -version = "2.0.14" +version = "2.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed72493ac66d5804837f480ab3766c72bdfab91a65e565fc54fa9e42db0073a8" +checksum = "dc1835b7f27878de8525dc71410b5a31cdcc5f230aed5ba5df968e09c201b23d" dependencies = [ "anstyle", "bstr", "doc-comment", + "libc", "predicates", "predicates-core", "predicates-tree", @@ -173,9 +174,9 @@ dependencies = [ [[package]] name = "assert_fs" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cd762e110c8ed629b11b6cde59458cc1c71de78ebbcc30099fc8e0403a2a2ec" +checksum = "7efdb1fdb47602827a342857666feb372712cbc64b414172bd6b167a02927674" dependencies = [ "anstyle", "doc-comment", @@ -200,9 +201,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd066d0b4ef8ecb03a55319dc13aa6910616d0f44008a045bb1835af830abff5" +checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" dependencies = [ "brotli", "bzip2", @@ -212,6 +213,7 @@ dependencies = [ "memchr", "pin-project-lite", "tokio", + "xz2", "zstd", "zstd-safe", ] @@ -224,7 +226,7 @@ checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.74", ] [[package]] @@ -250,7 +252,7 @@ dependencies = [ [[package]] name = "async_zip" version = "0.0.17" -source = "git+https://github.com/charliermarsh/rs-async-zip?rev=1dcb40cfe1bf5325a6fd4bfcf9894db40241f585#1dcb40cfe1bf5325a6fd4bfcf9894db40241f585" +source = "git+https://github.com/charliermarsh/rs-async-zip?rev=011b24604fa7bc223daaad7712c0694bac8f0a87#011b24604fa7bc223daaad7712c0694bac8f0a87" dependencies = [ "async-compression", "crc32fast", @@ -315,9 +317,9 @@ dependencies = [ [[package]] name = "axoupdater" -version = "0.6.8" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51e87c9280d6f722419f783fdcef745dffd6b45d38d665380ae6b7f237d3b74" +checksum = "3adfac228780fcf162617739408bd8edeb1ae1d497c95082759c5e607cac1e71" dependencies = [ "axoasset", "axoprocess", @@ -347,9 +349,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.72" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -369,12 +371,6 @@ dependencies = [ "backtrace", ] -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - [[package]] name = "base64" version = "0.21.7" @@ -398,7 +394,7 @@ dependencies = [ "distribution-filename", "distribution-types", "install-wheel-rs", - "once_cell", + "pep440_rs", "pep508_rs", "platform-tags", "pypi-types", @@ -428,9 +424,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bitvec" @@ -453,6 +449,12 @@ dependencies = [ "generic-array", ] +[[package]] +name = "boxcar" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "510a90332002c1af3317ef6b712f0dab697f30bbe809b86965eac2923c0bca8e" + [[package]] name = "brotli" version = "6.0.0" @@ -476,12 +478,12 @@ dependencies = [ [[package]] name = "bstr" -version = "1.9.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" dependencies = [ "memchr", - "regex-automata 0.4.6", + "regex-automata 0.4.7", "serde", ] @@ -515,9 +517,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.16.0" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" +checksum = "102087e286b4677862ea56cf8fc58bb2cdfa8725c40ffb80fe3a008eb7f2fc83" [[package]] name = "byteorder" @@ -526,10 +528,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] -name = "bytes" -version = "1.6.0" +name = "byteorder-lite" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" + +[[package]] +name = "bytes" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] name = "bzip2" @@ -581,9 +589,9 @@ dependencies = [ [[package]] name = "cargo-util" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0ade8eec3675f2a0962c3b4c1e1d40f83a8005ed536091d98ed2440bba5254" +checksum = "14104698cb1694d43c2ff73492468ccf2bb0b047071a9838d999eeba9e984ffa" dependencies = [ "anyhow", "core-foundation", @@ -610,13 +618,12 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.98" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" +checksum = "504bdec147f2cc13c8b57ed9401fd8a147cc66b67ad5cb241394244f2c947549" dependencies = [ "jobserver", "libc", - "once_cell", ] [[package]] @@ -633,11 +640,11 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "charset" -version = "0.1.3" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18e9079d1a12a2cc2bffb5db039c43661836ead4082120d5844f02555aca2d46" +checksum = "f1f927b07c74ba84c7e5fe4db2baeb3e996ab2688992e39ac68ce3220a677c7e" dependencies = [ - "base64 0.13.1", + "base64 0.22.1", "encoding_rs", ] @@ -685,9 +692,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.9" +version = "4.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64acc1846d54c1fe936a78dc189c34e28d3f5afc348403f28ecf53660b9b8462" +checksum = "11d8838454fda655dafd3accb2b6e2bea645b9e4078abe84a22ceb947235c5cc" dependencies = [ "clap_builder", "clap_derive", @@ -695,9 +702,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.9" +version = "4.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8393d67ba2e7bfaf28a23458e4e2b543cc73a99595511eb207fdb8aede942" +checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" dependencies = [ "anstream", "anstyle", @@ -708,9 +715,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.2" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79504325bf38b10165b02e89b4347300f855f273c4cb30c4a3209e6583275e" +checksum = "aa3c596da3cf0983427b0df0dba359df9182c13bd5b519b585a482b0c351f4e8" dependencies = [ "clap", ] @@ -728,9 +735,9 @@ dependencies = [ [[package]] name = "clap_complete_nushell" -version = "4.5.2" +version = "4.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1accf1b463dee0d3ab2be72591dccdab8bef314958340447c882c4c72acfe2a3" +checksum = "5fe32110e006bccf720f8c9af3fee1ba7db290c724eab61544e1d3295be3a40e" dependencies = [ "clap", "clap_complete", @@ -738,21 +745,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.8" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.74", ] [[package]] name = "clap_lex" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "cmake" @@ -793,9 +800,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "colorchoice" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "colored" @@ -1098,7 +1105,6 @@ dependencies = [ "distribution-filename", "fs-err", "itertools 0.13.0", - "once_cell", "pep440_rs", "pep508_rs", "platform-tags", @@ -1124,9 +1130,9 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] name = "dunce" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" [[package]] name = "dyn-clone" @@ -1218,14 +1224,14 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", + "libredox", + "windows-sys 0.59.0", ] [[package]] @@ -1236,9 +1242,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920" dependencies = [ "crc32fast", "libz-ng-sys", @@ -1262,11 +1268,11 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fontconfig-parser" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d" +checksum = "c1fcfcd44ca6e90c921fee9fa665d530b21ef1327a4c1a6c5250ea44b776ada7" dependencies = [ - "roxmltree 0.19.0", + "roxmltree 0.20.0", ] [[package]] @@ -1385,7 +1391,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.74", ] [[package]] @@ -1472,8 +1478,8 @@ dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", ] [[package]] @@ -1482,7 +1488,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "ignore", "walkdir", ] @@ -1600,9 +1606,9 @@ dependencies = [ [[package]] name = "http-body" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", "http", @@ -1629,9 +1635,9 @@ checksum = "9f0d1a8ef218a86416107794b34cc446958d9203556c312bb41eab4c924c1d2e" [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -1681,9 +1687,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" dependencies = [ "bytes", "futures-channel", @@ -1742,7 +1748,7 @@ dependencies = [ "globset", "log", "memchr", - "regex-automata 0.4.6", + "regex-automata 0.4.7", "same-file", "walkdir", "winapi-util", @@ -1750,12 +1756,12 @@ dependencies = [ [[package]] name = "image" -version = "0.25.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" +checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" dependencies = [ "bytemuck", - "byteorder", + "byteorder-lite", "num-traits", ] @@ -1767,9 +1773,9 @@ checksum = "b72ad49b554c1728b1e83254a1b1565aea4161e28dabbfa171fc15fe62299caf" [[package]] name = "indexmap" -version = "2.2.6" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -1824,8 +1830,6 @@ dependencies = [ "distribution-filename", "fs-err", "indoc", - "mailparse", - "once_cell", "pathdiff", "pep440_rs", "platform-info", @@ -1885,9 +1889,9 @@ checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45" [[package]] name = "is_terminal_polyfill" -version = "1.70.0" +version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itertools" @@ -1924,9 +1928,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] @@ -1976,9 +1980,9 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" @@ -2002,8 +2006,9 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", + "redox_syscall 0.5.3", ] [[package]] @@ -2040,9 +2045,20 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "lzma-sys" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27" +dependencies = [ + "cc", + "libc", + "pkg-config", +] [[package]] name = "mailparse" @@ -2055,6 +2071,17 @@ dependencies = [ "quoted_printable", ] +[[package]] +name = "markdown" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef3aab6a1d529b112695f72beec5ee80e729cb45af58663ec902c8fac764ecdd" +dependencies = [ + "lazy_static", + "pipeline", + "regex", +] + [[package]] name = "matchers" version = "0.1.0" @@ -2144,7 +2171,7 @@ checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.74", ] [[package]] @@ -2164,9 +2191,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", "simd-adler32", @@ -2174,13 +2201,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.11" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" dependencies = [ + "hermit-abi", "libc", "wasi", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2220,7 +2248,7 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "cfg_aliases", "libc", @@ -2244,11 +2272,11 @@ dependencies = [ [[package]] name = "nu-ansi-term" -version = "0.50.0" +version = "0.50.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd2800e1520bdc966782168a627aa5d1ad92e33b984bf7c7615d31280c83ff14" +checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2278,9 +2306,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.35.0" +version = "0.36.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e" +checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" dependencies = [ "memchr", ] @@ -2302,9 +2330,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oorandom" -version = "11.1.3" +version = "11.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" +checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" [[package]] name = "openssl-probe" @@ -2379,7 +2407,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.1", + "redox_syscall 0.5.3", "smallvec", "windows-targets 0.52.6", ] @@ -2425,7 +2453,6 @@ name = "pep440_rs" version = "0.6.0" dependencies = [ "indoc", - "once_cell", "pyo3", "rkyv", "serde", @@ -2438,17 +2465,22 @@ dependencies = [ name = "pep508_rs" version = "0.6.0" dependencies = [ + "boxcar", "derivative", + "indexmap", "insta", + "itertools 0.13.0", "log", - "once_cell", "pep440_rs", + "pubgrub", "pyo3", "pyo3-log", "regex", + "rustc-hash 2.0.0", "schemars", "serde", "serde_json", + "smallvec", "testing_logger", "thiserror", "tracing", @@ -2456,6 +2488,7 @@ dependencies = [ "url", "uv-fs", "uv-normalize", + "uv-pubgrub", ] [[package]] @@ -2466,9 +2499,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.10" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" +checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" dependencies = [ "memchr", "thiserror", @@ -2477,9 +2510,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.10" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459" +checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a" dependencies = [ "pest", "pest_generator", @@ -2487,22 +2520,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.10" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687" +checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.74", ] [[package]] name = "pest_meta" -version = "2.7.10" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" +checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f" dependencies = [ "once_cell", "pest", @@ -2542,7 +2575,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.74", ] [[package]] @@ -2557,6 +2590,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pipeline" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d15b6607fa632996eb8a17c9041cb6071cb75ac057abd45dece578723ea8c7c0" + [[package]] name = "pkg-config" version = "0.3.30" @@ -2607,21 +2646,24 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "predicates" -version = "3.1.0" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8" +checksum = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97" dependencies = [ "anstyle", "difflib", @@ -2633,15 +2675,15 @@ dependencies = [ [[package]] name = "predicates-core" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" +checksum = "ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931" [[package]] name = "predicates-tree" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" +checksum = "41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13" dependencies = [ "predicates-core", "termtree", @@ -2700,12 +2742,12 @@ dependencies = [ [[package]] name = "pubgrub" version = "0.2.1" -source = "git+https://github.com/astral-sh/pubgrub?rev=3f0ba760951ab0deeac874b98bb18fc90103fcf7#3f0ba760951ab0deeac874b98bb18fc90103fcf7" +source = "git+https://github.com/astral-sh/pubgrub?rev=2fac39371a47e7cb821e510aaa4de25405413d29#2fac39371a47e7cb821e510aaa4de25405413d29" dependencies = [ "indexmap", "log", "priority-queue", - "rustc-hash 1.1.0", + "rustc-hash 2.0.0", "thiserror", ] @@ -2767,7 +2809,7 @@ dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.71", + "syn 2.0.74", ] [[package]] @@ -2780,7 +2822,7 @@ dependencies = [ "proc-macro2", "pyo3-build-config", "quote", - "syn 2.0.71", + "syn 2.0.74", ] [[package]] @@ -2789,10 +2831,10 @@ version = "0.0.1" dependencies = [ "anyhow", "chrono", + "distribution-filename", "indexmap", "itertools 0.13.0", "mailparse", - "once_cell", "pep440_rs", "pep508_rs", "regex", @@ -2802,22 +2844,24 @@ dependencies = [ "toml", "tracing", "url", + "uv-fs", "uv-git", "uv-normalize", ] [[package]] name = "quinn" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad" +checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156" dependencies = [ "bytes", "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash 1.1.0", + "rustc-hash 2.0.0", "rustls", + "socket2", "thiserror", "tokio", "tracing", @@ -2825,14 +2869,14 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.3" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddf517c03a109db8100448a4be38d498df8a210a99fe0e1b9eaf39e78c640efe" +checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd" dependencies = [ "bytes", "rand", "ring", - "rustc-hash 1.1.0", + "rustc-hash 2.0.0", "rustls", "slab", "thiserror", @@ -2842,9 +2886,9 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9096629c45860fc7fb143e125eb826b5e721e10be3263160c7d60ca832cf8c46" +checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285" dependencies = [ "libc", "once_cell", @@ -2864,9 +2908,9 @@ dependencies = [ [[package]] name = "quoted_printable" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79ec282e887b434b68c18fe5c121d38e72a5cf35119b59e54ec5b992ea9c8eb0" +checksum = "640c9bd8497b02465aeef5375144c26062e0dcd5939dfcbb0f5db76cb8c17c73" [[package]] name = "radium" @@ -2950,20 +2994,11 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" -dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -2990,14 +3025,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.5" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", ] [[package]] @@ -3011,13 +3046,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.3", + "regex-syntax 0.8.4", ] [[package]] @@ -3028,9 +3063,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "rend" @@ -3184,9 +3219,9 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.37" +version = "0.8.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +checksum = "0f86ae463694029097b846d8f99fd5536740602ae00022c0c50c5600720b2f71" dependencies = [ "bytemuck", ] @@ -3281,9 +3316,9 @@ dependencies = [ [[package]] name = "roxmltree" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" +checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" [[package]] name = "rust-netrc" @@ -3318,7 +3353,7 @@ version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -3327,9 +3362,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.10" +version = "0.23.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" dependencies = [ "once_cell", "ring", @@ -3341,9 +3376,9 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" +checksum = "a88d6d420651b496bdd98684116959239430022a115c1240e6c3993be0b15fba" dependencies = [ "openssl-probe", "rustls-pemfile", @@ -3354,9 +3389,9 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" dependencies = [ "base64 0.22.1", "rustls-pki-types", @@ -3364,15 +3399,15 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" [[package]] name = "rustls-webpki" -version = "0.102.4" +version = "0.102.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" dependencies = [ "ring", "rustls-pki-types", @@ -3441,7 +3476,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.71", + "syn 2.0.74", ] [[package]] @@ -3458,11 +3493,11 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "security-framework" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -3471,9 +3506,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -3487,22 +3522,22 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.204" +version = "1.0.206" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +checksum = "5b3e4cd94123dd520a128bcd11e34d9e9e423e7e3e50425cb1b4b1e3549d0284" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.204" +version = "1.0.206" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +checksum = "fabfb6138d2383ea8208cf98ccf69cdfb1aff4088460681d84189aa259762f97" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.74", ] [[package]] @@ -3513,25 +3548,26 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.74", ] [[package]] name = "serde_json" -version = "1.0.120" +version = "1.0.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" +checksum = "66ad62847a56b3dba58cc891acd13884b9c61138d330c0d7b6181713d4fce38d" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] [[package]] name = "serde_spanned" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -3597,9 +3633,9 @@ checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" [[package]] name = "similar" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" +checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e" [[package]] name = "simplecss" @@ -3670,9 +3706,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "supports-color" @@ -3744,9 +3780,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.71" +version = "2.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462" +checksum = "1fceb41e3d546d0bd83421d3409b1460cc7444cd389341a4c880fe7a042cb3d7" dependencies = [ "proc-macro2", "quote", @@ -3783,9 +3819,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "target-lexicon" -version = "0.12.15" +version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4873307b7c257eddcb50c9bedf158eb669578359fb28428bef438fec8e6ba7c2" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "temp-env" @@ -3798,14 +3834,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", "fastrand", + "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3842,7 +3879,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.74", ] [[package]] @@ -3853,7 +3890,7 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.74", "test-case-core", ] @@ -3875,7 +3912,7 @@ checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.74", ] [[package]] @@ -3900,22 +3937,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.62" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2675633b1499176c2dff06b0856a27976a8f9d436737b4cf4f312d4d91d8bbb" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.62" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d20468752b09f49e909e55a5d338caa8bedf615594e9d80bc4c565d30faf798c" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.74", ] [[package]] @@ -3985,9 +4022,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -4006,32 +4043,31 @@ checksum = "b130bd8a58c163224b44e217b4239ca7b927d82bf6cc2fea1fc561d15056e3f7" [[package]] name = "tokio" -version = "1.38.0" +version = "1.39.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" +checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", "parking_lot 0.12.3", "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.74", ] [[package]] @@ -4088,9 +4124,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.14" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", @@ -4100,18 +4136,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.22.15" +version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59a3a72298453f564e2b111fa896f8d07fabb36f51f06d7e875fc5e0b5a3ef1" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ "indexmap", "serde", @@ -4167,7 +4203,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.74", ] [[package]] @@ -4246,7 +4282,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f459ca79f1b0d5f71c54ddfde6debfc59c8b6eeb46808ae492077f739dc7b49c" dependencies = [ - "nu-ansi-term 0.50.0", + "nu-ansi-term 0.50.1", "tracing-core", "tracing-log", "tracing-subscriber", @@ -4416,19 +4452,19 @@ checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" [[package]] name = "utf8parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" [[package]] name = "uv" -version = "0.2.27" +version = "0.2.37" dependencies = [ "anstream", "anyhow", @@ -4498,7 +4534,9 @@ dependencies = [ "uv-types", "uv-virtualenv", "uv-warnings", + "uv-workspace", "which", + "zip", ] [[package]] @@ -4512,7 +4550,6 @@ dependencies = [ "http", "insta", "once-map", - "once_cell", "reqwest", "reqwest-middleware", "rust-netrc", @@ -4535,7 +4572,6 @@ dependencies = [ "indoc", "insta", "itertools 0.13.0", - "once_cell", "pep440_rs", "pep508_rs", "pypi-types", @@ -4669,6 +4705,7 @@ dependencies = [ "serde_json", "tracing", "uv-auth", + "uv-cache", "uv-normalize", ] @@ -4684,6 +4721,7 @@ dependencies = [ "fs-err", "install-wheel-rs", "itertools 0.13.0", + "markdown", "mimalloc", "owo-colors", "pep508_rs", @@ -4704,10 +4742,10 @@ dependencies = [ "tracing-subscriber", "uv-build", "uv-cache", + "uv-cli", "uv-client", "uv-configuration", "uv-dispatch", - "uv-distribution", "uv-git", "uv-installer", "uv-macros", @@ -4716,6 +4754,7 @@ dependencies = [ "uv-resolver", "uv-settings", "uv-types", + "uv-workspace", "walkdir", ] @@ -4750,34 +4789,26 @@ dependencies = [ "anyhow", "distribution-filename", "distribution-types", - "either", "fs-err", "futures", - "glob", "indoc", "insta", "install-wheel-rs", "nanoid", - "once_cell", "path-absolutize", - "path-slash", "pep440_rs", "pep508_rs", "platform-tags", "pypi-types", - "regex", "reqwest", "reqwest-middleware", "rmp-serde", "rustc-hash 2.0.0", - "schemars", "serde", "tempfile", "thiserror", "tokio", "tokio-util", - "toml", - "toml_edit", "tracing", "url", "uv-cache", @@ -4786,11 +4817,10 @@ dependencies = [ "uv-extract", "uv-fs", "uv-git", - "uv-macros", "uv-normalize", - "uv-options-metadata", "uv-types", "uv-warnings", + "uv-workspace", "zip", ] @@ -4800,6 +4830,7 @@ version = "0.0.1" dependencies = [ "async-compression", "async_zip", + "distribution-filename", "fs-err", "futures", "md-5", @@ -4813,6 +4844,7 @@ dependencies = [ "tokio-tar", "tokio-util", "tracing", + "xz2", "zip", ] @@ -4828,9 +4860,9 @@ dependencies = [ "fs-err", "fs2", "junction", - "once_cell", "path-absolutize", "path-slash", + "serde", "tempfile", "tracing", "urlencoding", @@ -4848,10 +4880,12 @@ dependencies = [ "fs-err", "reqwest", "reqwest-middleware", + "serde", "thiserror", "tokio", "tracing", "url", + "uv-auth", "uv-fs", ] @@ -4874,11 +4908,9 @@ dependencies = [ "rayon", "rustc-hash 2.0.0", "same-file", - "serde", "tempfile", "thiserror", "tokio", - "toml", "tracing", "url", "uv-cache", @@ -4900,7 +4932,7 @@ version = "0.0.1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.74", "textwrap", ] @@ -4920,6 +4952,16 @@ dependencies = [ "serde", ] +[[package]] +name = "uv-pubgrub" +version = "0.0.1" +dependencies = [ + "itertools 0.13.0", + "pep440_rs", + "pubgrub", + "thiserror", +] + [[package]] name = "uv-python" version = "0.0.1" @@ -4929,12 +4971,12 @@ dependencies = [ "cache-key", "clap", "configparser", + "distribution-filename", "fs-err", "futures", "indoc", "install-wheel-rs", "itertools 0.13.0", - "once_cell", "owo-colors", "pep440_rs", "pep508_rs", @@ -4966,8 +5008,8 @@ dependencies = [ "uv-state", "uv-warnings", "which", - "winapi", - "winsafe", + "windows-sys 0.52.0", + "winsafe 0.0.22", ] [[package]] @@ -5001,6 +5043,7 @@ dependencies = [ "uv-resolver", "uv-types", "uv-warnings", + "uv-workspace", ] [[package]] @@ -5023,7 +5066,6 @@ dependencies = [ "itertools 0.13.0", "once-map", "owo-colors", - "path-slash", "pep440_rs", "pep508_rs", "petgraph", @@ -5047,11 +5089,14 @@ dependencies = [ "uv-client", "uv-configuration", "uv-distribution", + "uv-fs", "uv-git", "uv-normalize", + "uv-pubgrub", "uv-python", "uv-types", "uv-warnings", + "uv-workspace", ] [[package]] @@ -5061,13 +5106,14 @@ dependencies = [ "fs-err", "indoc", "memchr", - "once_cell", "pep440_rs", "pep508_rs", "pypi-types", "serde", "thiserror", "toml", + "uv-settings", + "uv-workspace", ] [[package]] @@ -5083,6 +5129,7 @@ dependencies = [ "pypi-types", "schemars", "serde", + "textwrap", "thiserror", "toml", "tracing", @@ -5124,7 +5171,6 @@ dependencies = [ "dirs-sys", "fs-err", "install-wheel-rs", - "path-slash", "pathdiff", "pep440_rs", "pep508_rs", @@ -5138,6 +5184,7 @@ dependencies = [ "uv-fs", "uv-installer", "uv-python", + "uv-settings", "uv-state", "uv-virtualenv", ] @@ -5164,7 +5211,7 @@ dependencies = [ [[package]] name = "uv-version" -version = "0.2.27" +version = "0.2.37" [[package]] name = "uv-virtualenv" @@ -5187,11 +5234,39 @@ name = "uv-warnings" version = "0.0.1" dependencies = [ "anstream", - "once_cell", "owo-colors", "rustc-hash 2.0.0", ] +[[package]] +name = "uv-workspace" +version = "0.0.1" +dependencies = [ + "either", + "fs-err", + "glob", + "insta", + "pep440_rs", + "pep508_rs", + "pypi-types", + "regex", + "rustc-hash 2.0.0", + "schemars", + "serde", + "thiserror", + "tokio", + "toml", + "toml_edit", + "tracing", + "url", + "uv-fs", + "uv-git", + "uv-macros", + "uv-normalize", + "uv-options-metadata", + "uv-warnings", +] + [[package]] name = "valuable" version = "0.1.0" @@ -5200,9 +5275,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "wait-timeout" @@ -5259,7 +5334,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.74", "wasm-bindgen-shared", ] @@ -5293,7 +5368,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.74", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5344,9 +5419,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.1" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" dependencies = [ "rustls-pki-types", ] @@ -5359,15 +5434,15 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "which" -version = "6.0.1" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8211e4f58a2b2805adfbefbc07bab82958fc91e3836339b1ab7ae32465dce0d7" +checksum = "3d9c5ed668ee1f17edb3b627225343d210006a90bb1e3745ce1f30b1fb115075" dependencies = [ "either", "home", "regex", "rustix", - "winsafe", + "winsafe 0.0.19", ] [[package]] @@ -5394,11 +5469,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -5459,7 +5534,7 @@ checksum = "12168c33176773b86799be25e2a2ba07c7aab9968b37541f1094dbd7a60c8946" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.74", ] [[package]] @@ -5470,7 +5545,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.74", ] [[package]] @@ -5481,7 +5556,7 @@ checksum = "9d8dc32e0095a7eeccebd0e3f09e9509365ecb3fc6ac4d6f5f14a3f6392942d1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.74", ] [[package]] @@ -5492,7 +5567,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.74", ] [[package]] @@ -5532,6 +5607,15 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-targets" version = "0.48.5" @@ -5655,9 +5739,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.11" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c52728401e1dc672a56e81e593e912aa54c78f40246869f78359a2bf24d29d" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] @@ -5679,10 +5763,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" [[package]] -name = "wiremock" -version = "0.6.0" +name = "winsafe" +version = "0.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec874e1eef0df2dcac546057fe5e29186f09c378181cd7b635b4b7bcc98e9d81" +checksum = "7d6ad6cbd9c6e5144971e326303f0e453b61d82e4f72067fccf23106bccd8437" + +[[package]] +name = "wiremock" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a59f8ae78a4737fb724f20106fb35ccb7cfe61ff335665d3042b3aa98e34717" dependencies = [ "assert-json-diff", "async-trait", @@ -5742,12 +5832,42 @@ version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" +[[package]] +name = "xz2" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2" +dependencies = [ + "lzma-sys", +] + [[package]] name = "yansi" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + [[package]] name = "zeroize" version = "1.8.1" @@ -5768,27 +5888,27 @@ dependencies = [ [[package]] name = "zstd" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "7.1.0" +version = "7.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" +checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" dependencies = [ "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.10+zstd.1.5.6" +version = "2.0.13+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" +checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" dependencies = [ "cc", "pkg-config", diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 42f1fdadb831..32fc0847edc0 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -15,21 +15,21 @@ python3Packages.buildPythonApplication rec { pname = "uv"; - version = "0.2.27"; + version = "0.2.37"; pyproject = true; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; rev = "refs/tags/${version}"; - hash = "sha256-KYBHg0E06zeUpyIdPcMQijUorwX4QiiPwacR+UcDFJs="; + hash = "sha256-3FSA+JsAbLzS3ONoLciDzpyCsO6Em8lNVYR43WiK1xs="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "async_zip-0.0.17" = "sha256-Q5fMDJrQtob54CTII3+SXHeozy5S5s3iLOzntevdGOs="; - "pubgrub-0.2.1" = "sha256-4/Z/NA0MsHFaChu+sNzIQJgV0M62ZXOGQubzITIC4fI="; + "async_zip-0.0.17" = "sha256-3k9rc4yHWhqsCUJ17K55F8aQoCKdVamrWAn6IDWo3Ss="; + "pubgrub-0.2.1" = "sha256-yhZm35Dyl6gcBTxKvsxJXv1GTOuMCDknnSTgGgKD488="; "reqwest-middleware-0.3.2" = "sha256-OiC8Kg+F2eKy7YNuLtgYPi95DrbxLvsIKrKEeyuzQTo="; }; }; From 3753d69d824628fc5742e5dbd61e96ef3219487c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 18 Aug 2024 08:47:03 +0200 Subject: [PATCH 140/338] python312Packages.lib4sbom: add changelog to meta --- pkgs/development/python-modules/lib4sbom/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/lib4sbom/default.nix b/pkgs/development/python-modules/lib4sbom/default.nix index 8960c7a54fd9..8f414dce9914 100644 --- a/pkgs/development/python-modules/lib4sbom/default.nix +++ b/pkgs/development/python-modules/lib4sbom/default.nix @@ -54,6 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to ingest and generate SBOMs"; homepage = "https://github.com/anthonyharrison/lib4sbom"; + changelog = "https://github.com/anthonyharrison/lib4sbom/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ teatwig ]; }; From 1e7863e7e7fe15882ab634ff4b53ec53cf89c270 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 18 Aug 2024 08:50:11 +0200 Subject: [PATCH 141/338] python312Packages.lib4sbom: refactor --- .../python-modules/lib4sbom/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/lib4sbom/default.nix b/pkgs/development/python-modules/lib4sbom/default.nix index 8f414dce9914..3dc8f0c4c236 100644 --- a/pkgs/development/python-modules/lib4sbom/default.nix +++ b/pkgs/development/python-modules/lib4sbom/default.nix @@ -1,29 +1,35 @@ { lib, buildPythonPackage, + defusedxml, fetchFromGitHub, + pytestCheckHook, + pythonOlder, pyyaml, semantic-version, - defusedxml, - pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "lib4sbom"; version = "0.7.3"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "anthonyharrison"; - repo = pname; + repo = "lib4sbom"; rev = "refs/tags/v${version}"; hash = "sha256-RuIvhlLnWf/ayU6tjpHYKvBFqU8ojPwJK/pDIdLrD2s="; }; + build-system = [ setuptools ]; + dependencies = [ + defusedxml pyyaml semantic-version - defusedxml ]; nativeCheckInputs = [ pytestCheckHook ]; From 65e2041be9c57196b72b20d09c1de98cc8318348 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Aug 2024 11:48:18 +0200 Subject: [PATCH 142/338] python312Packages.instructor: 1.3.3 -> 1.3.7 Changelog: https://github.com/jxnl/instructor/releases/tag/v1.3.7 --- pkgs/development/python-modules/instructor/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/instructor/default.nix b/pkgs/development/python-modules/instructor/default.nix index 02cba2b3b9d6..31207450761f 100644 --- a/pkgs/development/python-modules/instructor/default.nix +++ b/pkgs/development/python-modules/instructor/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "instructor"; - version = "1.3.3"; + version = "1.3.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,13 +32,14 @@ buildPythonPackage rec { owner = "jxnl"; repo = "instructor"; rev = "refs/tags/${version}"; - hash = "sha256-ye6uNnwvJ3RXmKM8ix/sBiJgeCFQazNVgHZkBAnL0nw="; + hash = "sha256-XouTXv8wNPPBKVs2mCue1o4hfHlPlq6uXBuDXiZLIHI="; }; pythonRelaxDeps = [ "docstring-parser" - "pydantic" "jiter" + "pydantic" + "tenacity" ]; build-system = [ poetry-core ]; @@ -68,8 +69,9 @@ buildPythonPackage rec { disabledTests = [ # Tests require OpenAI API key - "test_partial" "successfully" + "test_mode_functions_deprecation_warning" + "test_partial" ]; disabledTestPaths = [ From a3c34eeaccf74d69fe3a3f69cc778c6b6f92db25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 17 Aug 2024 10:44:42 +0200 Subject: [PATCH 143/338] bandwhich: 0.22.2 -> 0.23.0 Diff: https://github.com/imsnif/bandwhich/compare/v0.22.2...0.23.0 Changelog: https://github.com/imsnif/bandwhich/blob/v0.23.0/CHANGELOG.md --- pkgs/tools/networking/bandwhich/Cargo.lock | 1027 ++++++++++++------- pkgs/tools/networking/bandwhich/default.nix | 4 +- 2 files changed, 641 insertions(+), 390 deletions(-) diff --git a/pkgs/tools/networking/bandwhich/Cargo.lock b/pkgs/tools/networking/bandwhich/Cargo.lock index feb4351cdb2a..564ac44af9b2 100644 --- a/pkgs/tools/networking/bandwhich/Cargo.lock +++ b/pkgs/tools/networking/bandwhich/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aes" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher", @@ -30,9 +30,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.7" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "once_cell", @@ -42,18 +42,18 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "android-tzdata" @@ -72,47 +72,48 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.11" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -120,35 +121,44 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.79" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" dependencies = [ "backtrace", ] [[package]] -name = "async-trait" -version = "0.1.77" +name = "arbitrary" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +dependencies = [ + "derive_arbitrary", +] + +[[package]] +name = "async-trait" +version = "0.1.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.68", ] [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -161,7 +171,7 @@ dependencies = [ [[package]] name = "bandwhich" -version = "0.22.2" +version = "0.23.0" dependencies = [ "anyhow", "async-trait", @@ -175,7 +185,7 @@ dependencies = [ "http_req", "insta", "ipnetwork", - "itertools", + "itertools 0.13.0", "log", "netstat2", "once_cell", @@ -198,12 +208,6 @@ dependencies = [ "zip", ] -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - [[package]] name = "bitflags" version = "1.3.2" @@ -212,9 +216,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "block-buffer" @@ -226,10 +230,21 @@ dependencies = [ ] [[package]] -name = "bumpalo" -version = "3.14.0" +name = "bstr" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" +dependencies = [ + "memchr", + "regex-automata", + "serde", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byteorder" @@ -239,9 +254,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "bzip2" @@ -271,13 +286,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" [[package]] -name = "cc" -version = "1.0.83" +name = "castaway" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "8a17ed5635fc8536268e5d4de1e22e81ac34419e5f052d4d51f4e01dcc263fcc" +dependencies = [ + "rustversion", +] + +[[package]] +name = "cc" +version = "1.0.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] @@ -288,16 +313,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.33" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "wasm-bindgen", - "windows-targets 0.52.0", + "windows-targets 0.52.6", ] [[package]] @@ -312,9 +337,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.18" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" +checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc" dependencies = [ "clap_builder", "clap_derive", @@ -322,9 +347,9 @@ dependencies = [ [[package]] name = "clap-verbosity-flag" -version = "2.1.2" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b57f73ca21b17a0352944b9bb61803b6007bd911b6cccfef7153f7f0600ac495" +checksum = "63d19864d6b68464c59f7162c9914a0b569ddc2926b4a2d71afe62a9738eff53" dependencies = [ "clap", "log", @@ -332,9 +357,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.18" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" +checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99" dependencies = [ "anstream", "anstyle", @@ -344,36 +369,36 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.4.9" +version = "4.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df631ae429f6613fcd3a7c1adbdb65f637271e561b03680adaa6573015dfb106" +checksum = "a8670053e87c316345e384ca1f3eba3006fc6355ed8b8a1140d104e109e3df34" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.68", ] [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" [[package]] name = "clap_mangen" -version = "0.2.17" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a7c2b01e5e779c19f46a94bbd398f33ae63b0f78c07108351fb4536845bb7fd" +checksum = "f17415fd4dfbea46e3274fcd8d368284519b358654772afb700dc2e8d2b24eeb" dependencies = [ "clap", "roff", @@ -381,9 +406,22 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" + +[[package]] +name = "compact_str" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f86b9c4c00838774a6d902ef931eff7470720c51d90c2e32cfe15dc304737b3f" +dependencies = [ + "castaway", + "cfg-if", + "itoa", + "ryu", + "static_assertions", +] [[package]] name = "console" @@ -399,9 +437,9 @@ dependencies = [ [[package]] name = "constant_time_eq" -version = "0.1.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "core-foundation" @@ -429,10 +467,25 @@ dependencies = [ ] [[package]] -name = "crc32fast" -version = "1.3.2" +name = "crc" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] @@ -458,9 +511,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crossterm" @@ -468,10 +521,10 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "crossterm_winapi", "libc", - "mio", + "mio 0.8.11", "parking_lot", "signal-hook", "signal-hook-mio", @@ -499,9 +552,15 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" + +[[package]] +name = "deflate64" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da692b8d1080ea3045efaab14434d40468c3d8657e42abddfffca87b428f4c1b" [[package]] name = "deranged" @@ -534,6 +593,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "derive_arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + [[package]] name = "digest" version = "0.10.7" @@ -546,10 +616,21 @@ dependencies = [ ] [[package]] -name = "either" -version = "1.9.0" +name = "displaydoc" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "encode_unicode" @@ -563,17 +644,23 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.68", ] [[package]] -name = "errno" -version = "0.3.8" +name = "equivalent" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -581,15 +668,15 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -675,7 +762,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.68", ] [[package]] @@ -692,9 +779,9 @@ checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-timer" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" [[package]] name = "futures-util" @@ -726,9 +813,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -737,9 +824,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "glob" @@ -749,9 +836,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", "allocator-api2", @@ -764,10 +851,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] -name = "hermit-abi" -version = "0.3.4" +name = "heck" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -797,9 +890,9 @@ dependencies = [ [[package]] name = "http_req" -version = "0.10.2" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90394b01e9de1f7eca6ca0664cc64bd92add9603c1aa4f961813f23789035e10" +checksum = "0122ab6637149482eb66b57288ac597bc7eb9859cbaa79dee62fa19a350df3d2" dependencies = [ "native-tls", "unicase", @@ -807,16 +900,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.59" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core", + "windows-core 0.52.0", ] [[package]] @@ -849,10 +942,14 @@ dependencies = [ ] [[package]] -name = "indoc" -version = "2.0.4" +name = "indexmap" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +dependencies = [ + "equivalent", + "hashbrown", +] [[package]] name = "inout" @@ -865,15 +962,14 @@ dependencies = [ [[package]] name = "insta" -version = "1.34.0" +version = "1.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc" +checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5" dependencies = [ "console", "lazy_static", "linked-hash-map", "similar", - "yaml-rust", ] [[package]] @@ -904,49 +1000,64 @@ dependencies = [ ] [[package]] -name = "itertools" -version = "0.12.0" +name = "is_terminal_polyfill" +version = "1.70.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.27" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.152" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "linked-hash-map" @@ -956,31 +1067,37 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", ] [[package]] -name = "log" -version = "0.4.20" +name = "lockfree-object-pool" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e" + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lru" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2994eeba8ed550fd9b47a0b38f0242bc3344e496483c6180b69139cc2fa5d1d7" +checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" dependencies = [ "hashbrown", ] @@ -994,6 +1111,16 @@ dependencies = [ "linked-hash-map", ] +[[package]] +name = "lzma-rs" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e" +dependencies = [ + "byteorder", + "crc", +] + [[package]] name = "match_cfg" version = "0.1.0" @@ -1002,24 +1129,24 @@ checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", @@ -1028,12 +1155,23 @@ dependencies = [ ] [[package]] -name = "native-tls" -version = "0.2.11" +name = "mio" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" +dependencies = [ + "hermit-abi", + "libc", + "wasi", + "windows-sys 0.52.0", +] + +[[package]] +name = "native-tls" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" dependencies = [ - "lazy_static", "libc", "log", "openssl", @@ -1093,37 +1231,27 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - [[package]] name = "num_threads" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" dependencies = [ "libc", ] [[package]] name = "object" -version = "0.32.2" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" dependencies = [ "memchr", ] @@ -1136,11 +1264,11 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "openssl" -version = "0.10.63" +version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "cfg-if", "foreign-types", "libc", @@ -1157,7 +1285,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.68", ] [[package]] @@ -1168,9 +1296,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.99" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", @@ -1191,9 +1319,9 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -1201,44 +1329,31 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "password-hash" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" -dependencies = [ - "base64ct", - "rand_core", - "subtle", + "windows-targets 0.52.6", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pbkdf2" -version = "0.11.0" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" dependencies = [ "digest", "hmac", - "password-hash", - "sha2", ] [[package]] @@ -1249,9 +1364,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -1261,9 +1376,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "pnet" @@ -1310,7 +1425,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.48", + "syn 2.0.68", ] [[package]] @@ -1369,10 +1484,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] -name = "proc-macro2" -version = "1.0.78" +name = "proc-macro-crate" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -1383,7 +1507,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "chrono", "flate2", "hex", @@ -1398,7 +1522,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "chrono", "hex", ] @@ -1411,9 +1535,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -1450,28 +1574,30 @@ dependencies = [ [[package]] name = "ratatui" -version = "0.25.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5659e52e4ba6e07b2dad9f1158f578ef84a73762625ddb51536019f34d180eb" +checksum = "d16546c5b5962abf8ce6e2881e722b4e0ae3b6f1a08a26ae3573c55853ca68d3" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "cassowary", + "compact_str", "crossterm", - "indoc", - "itertools", + "itertools 0.13.0", "lru", "paste", "stability", "strum", + "strum_macros", "unicode-segmentation", + "unicode-truncate", "unicode-width", ] [[package]] name = "rayon" -version = "1.8.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -1489,18 +1615,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", ] [[package]] name = "regex" -version = "1.10.3" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", @@ -1510,9 +1636,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.5" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", @@ -1521,15 +1647,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "relative-path" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e898588f33fdd5b9420719948f9f2a32c922a246964576f71ba7f24f80610fbc" +checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2" [[package]] name = "resolv-conf" @@ -1549,9 +1675,9 @@ checksum = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316" [[package]] name = "rstest" -version = "0.18.2" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97eeab2f3c0a199bc4be135c36c924b6590b88c377d416494288c14f2db30199" +checksum = "9afd55a67069d6e434a95161415f5beeada95a01c7b815508a82dcb0e1593682" dependencies = [ "futures", "futures-timer", @@ -1561,26 +1687,27 @@ dependencies = [ [[package]] name = "rstest_macros" -version = "0.18.2" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d428f8247852f894ee1be110b375111b586d4fa431f6c46e64ba5a0dcccbe605" +checksum = "4165dfae59a39dd41d8dec720d3cbfbc71f69744efb480a3920f5d4e0cc6798d" dependencies = [ "cfg-if", "glob", + "proc-macro-crate", "proc-macro2", "quote", "regex", "relative-path", "rustc_version", - "syn 2.0.48", + "syn 2.0.68", "unicode-ident", ] [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc_version" @@ -1593,11 +1720,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.30" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -1606,9 +1733,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "schannel" @@ -1627,11 +1760,11 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "security-framework" -version = "2.9.2" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -1640,9 +1773,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" dependencies = [ "core-foundation-sys", "libc", @@ -1650,28 +1783,28 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.196" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.196" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.68", ] [[package]] @@ -1685,17 +1818,6 @@ dependencies = [ "digest", ] -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - [[package]] name = "signal-hook" version = "0.3.17" @@ -1708,29 +1830,35 @@ dependencies = [ [[package]] name = "signal-hook-mio" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" +checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" dependencies = [ "libc", - "mio", + "mio 0.8.11", "signal-hook", ] [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] [[package]] -name = "similar" -version = "2.4.0" +name = "simd-adler32" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32fea41aca09ee824cc9724996433064c89f7777e60762749a4170a14abbfa21" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "similar" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" [[package]] name = "simplelog" @@ -1754,63 +1882,69 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "stability" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd1b177894da2a2d9120208c3386066af06a488255caabc5de8ddca22dbc3ce" +checksum = "2ff9eaf853dec4c8802325d8b6d3dffa86cc707fd7a1a4cdbf416e13b061787a" dependencies = [ "quote", - "syn 1.0.109", + "syn 2.0.68", ] [[package]] -name = "strsim" -version = "0.10.0" +name = "static_assertions" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" -version = "0.25.0" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.25.3" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", "rustversion", - "syn 2.0.48", + "syn 2.0.68", ] [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" @@ -1825,9 +1959,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" dependencies = [ "proc-macro2", "quote", @@ -1836,59 +1970,58 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.30.5" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb4f3438c8f6389c864e61221cbc97e9bca98b4daf39a5beb7bea660f528bb2" +checksum = "29a6b037e3af4ae9a9d6214198e4df53091363b2c96c88fc416a6c1bd92a2799" dependencies = [ - "cfg-if", + "bstr", "core-foundation-sys", "libc", + "memchr", "ntapi", - "once_cell", "rayon", "windows", ] [[package]] name = "tempfile" -version = "3.9.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand", - "redox_syscall", "rustix", "windows-sys 0.52.0", ] [[package]] name = "termcolor" -version = "1.1.3" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] [[package]] name = "thiserror" -version = "1.0.56" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.68", ] [[package]] @@ -1926,9 +2059,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" dependencies = [ "tinyvec_macros", ] @@ -1941,18 +2074,34 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.35.1" +version = "1.39.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" +checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" dependencies = [ "backtrace", "bytes", "libc", - "mio", - "num_cpus", + "mio 1.0.1", "pin-project-lite", "socket2", - "windows-sys 0.48.0", + "windows-sys 0.52.0", +] + +[[package]] +name = "toml_datetime" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", ] [[package]] @@ -1974,7 +2123,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.68", ] [[package]] @@ -2061,30 +2210,40 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "unicode-truncate" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5fbabedabe362c618c714dbefda9927b5afc8e2a8102f47f081089a9019226" +dependencies = [ + "itertools 0.12.1", + "unicode-width", +] [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna 0.5.0", @@ -2093,9 +2252,9 @@ dependencies = [ [[package]] name = "utf8parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "vcpkg" @@ -2117,9 +2276,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2127,24 +2286,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.68", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2152,28 +2311,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.68", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "widestring" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" [[package]] name = "winapi" @@ -2193,11 +2352,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -2208,12 +2367,12 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.52.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" dependencies = [ - "windows-core", - "windows-targets 0.52.0", + "windows-core 0.57.0", + "windows-targets 0.52.6", ] [[package]] @@ -2222,7 +2381,50 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-result", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-implement" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "windows-interface" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -2240,7 +2442,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.6", ] [[package]] @@ -2260,17 +2462,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "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]] @@ -2281,9 +2484,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -2293,9 +2496,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -2305,9 +2508,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[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_msvc" @@ -2317,9 +2526,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -2329,9 +2538,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -2341,9 +2550,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -2353,9 +2562,18 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] [[package]] name = "winreg" @@ -2367,79 +2585,112 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] - [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.68", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", ] [[package]] name = "zip" -version = "0.6.6" +version = "2.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +checksum = "40dd8c92efc296286ce1fbd16657c5dbefff44f1b4ca01cc5f517d8b7b3d3e2e" dependencies = [ "aes", - "byteorder", + "arbitrary", "bzip2", "constant_time_eq", "crc32fast", "crossbeam-utils", + "deflate64", + "displaydoc", "flate2", "hmac", + "indexmap", + "lzma-rs", + "memchr", "pbkdf2", + "rand", "sha1", + "thiserror", "time", + "zeroize", + "zopfli", "zstd", ] [[package]] -name = "zstd" -version = "0.11.2+zstd.1.5.2" +name = "zopfli" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946" +dependencies = [ + "bumpalo", + "crc32fast", + "lockfree-object-pool", + "log", + "once_cell", + "simd-adler32", +] + +[[package]] +name = "zstd" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" +version = "7.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" dependencies = [ - "libc", "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.9+zstd.1.5.5" +version = "2.0.11+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" +checksum = "75652c55c0b6f3e6f12eb786fe1bc960396bf05a1eb3bf1f3691c3610ac2e6d4" dependencies = [ "cc", "pkg-config", diff --git a/pkgs/tools/networking/bandwhich/default.nix b/pkgs/tools/networking/bandwhich/default.nix index eb361e1aac2d..550266b9da99 100644 --- a/pkgs/tools/networking/bandwhich/default.nix +++ b/pkgs/tools/networking/bandwhich/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "bandwhich"; - version = "0.22.2"; + version = "0.23.0"; src = fetchFromGitHub { owner = "imsnif"; repo = pname; rev = "v${version}"; - hash = "sha256-/uG1xjhxnIkS3rq7Tv1q1v8X7p1baDB8OiSEV9OLyfo="; + hash = "sha256-8PUtlhy8rsQw3TqgpxWiVettGhncHetWCZcrDXjsR5M="; }; cargoLock = { From 0c602ff9240a54c1d7afcaa7d9e3ba8ed41f4d1f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 07:14:39 +0000 Subject: [PATCH 144/338] python312Packages.plantuml-markdown: 3.10.2 -> 3.10.3 --- pkgs/development/python-modules/plantuml-markdown/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plantuml-markdown/default.nix b/pkgs/development/python-modules/plantuml-markdown/default.nix index 88ef8975b728..9fd818691610 100644 --- a/pkgs/development/python-modules/plantuml-markdown/default.nix +++ b/pkgs/development/python-modules/plantuml-markdown/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "plantuml-markdown"; - version = "3.10.2"; + version = "3.10.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mikitex70"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-DLpxT+t1EqF42SaVnhtjjONsXRsnTMAlx6YaTD8Zj7c="; + hash = "sha256-9G+llIojgNyxupvKLfJC4igjtNK1YjbEMxcape9xqmk="; }; propagatedBuildInputs = [ From 661665ae7f834d410f977d34e9ee9b9a915c04f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 07:15:02 +0000 Subject: [PATCH 145/338] ctlptl: 0.8.31 -> 0.8.32 --- pkgs/development/tools/ctlptl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ctlptl/default.nix b/pkgs/development/tools/ctlptl/default.nix index 682e9f52e35f..6bfd7a01fca5 100644 --- a/pkgs/development/tools/ctlptl/default.nix +++ b/pkgs/development/tools/ctlptl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ctlptl"; - version = "0.8.31"; + version = "0.8.32"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-UzQm5WrLU79Fiwnd5da0CwkoDQylZZAFqEhiF76FS40="; + hash = "sha256-ydwPnR5tazLeeHqsIMyZKeO0vvxtCSa5ulCw2/Hv8TA="; }; - vendorHash = "sha256-9NIswLwcfTQoHLGPhOaW2RT4jKR4Re3XVl0nNJ8cTKw="; + vendorHash = "sha256-BjZYHLwXyagm9JJv+f83RkrpLBTIZvXGUXZhSxhhlfc="; nativeBuildInputs = [ installShellFiles ]; From b9f2e97f41796858f665bfc812d4a11a854b40b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 15 Jul 2024 09:46:23 +0200 Subject: [PATCH 146/338] maui-shell: remove --- .../window-managers/maui-shell/default.nix | 88 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 90 deletions(-) delete mode 100644 pkgs/applications/window-managers/maui-shell/default.nix diff --git a/pkgs/applications/window-managers/maui-shell/default.nix b/pkgs/applications/window-managers/maui-shell/default.nix deleted file mode 100644 index 5a30b46e907e..000000000000 --- a/pkgs/applications/window-managers/maui-shell/default.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ lib -, mkDerivation -, fetchFromGitHub -, qtquickcontrols2 -, cmake -, extra-cmake-modules -, krunner -, prison -, knotifyconfig -, kidletime -, kpeople -, kdesu -, kactivities-stats -, ktexteditor -, kinit -, kunitconversion -, kitemmodels -, phonon -, polkit-qt -, polkit -, mauikit -, mauikit-filebrowsing -, bluedevil -, plasma-nm -, plasma-pa -, bluez-qt -, maui-core -, cask-server -, mauiman -, mauikit-calendar -, qtmultimedia -}: - -mkDerivation rec { - pname = "maui-shell"; - version = "0.6.6"; - - src = fetchFromGitHub { - owner = "Nitrux"; - repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "sha256-8D3rlYrqLfyDZQFRSaVlxLaEblbv8w787v8Np2aW3yc="; - }; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - bluedevil - bluez-qt - cask-server - kactivities-stats - kdesu - kidletime - kinit - kitemmodels - knotifyconfig - krunner - kunitconversion - kpeople - ktexteditor - mauikit - mauikit-calendar - mauikit-filebrowsing - mauiman - maui-core - phonon - plasma-nm - plasma-pa - polkit - polkit-qt - prison - qtmultimedia - qtquickcontrols2 - ]; - - meta = with lib; { - description = "Convergent shell for desktops, tablets, and phones"; - homepage = "https://github.com/Nitrux/maui-shell"; - license = licenses.lgpl3; - maintainers = with maintainers; [ onny ]; - platforms = platforms.linux; - # https://github.com/Nitrux/maui-shell/issues/56 - broken = true; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a6403e6792eb..09017b53b164 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -935,6 +935,7 @@ mapAliases ({ matrixcli = throw "'matrixcli' has been removed due to being unmaintained and broken functionality. Recommend 'matrix-commander' as an alternative"; # Added 2024-03-09 matrix-recorder = throw "matrix-recorder has been removed due to being unmaintained"; # Added 2023-05-21 maui-nota = libsForQt5.mauiPackages.nota; # added 2022-05-17 + maui-shell = throw "maui-shell has been removed from nixpkgs, it was broken"; # Added 2024-07-15 mbox = throw "'mbox' has been removed, as it was broken and unmaintained"; # Added 2023-12-21 mcomix3 = mcomix; # Added 2022-06-05 meme = meme-image-generator; # Added 2021-04-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6168070cc77e..734f96b295db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10250,8 +10250,6 @@ with pkgs; mars-mips = callPackage ../development/tools/mars-mips { }; - maui-shell = libsForQt5.callPackage ../applications/window-managers/maui-shell { }; - mawk = callPackage ../tools/text/mawk { }; mb2md = callPackage ../tools/text/mb2md { }; From 988bf19f2cae199f133475a403ab8b909bbae3d0 Mon Sep 17 00:00:00 2001 From: Dmitriy Kholkin Date: Mon, 29 Jul 2024 10:56:29 +0300 Subject: [PATCH 147/338] linux-packages: fix argsOverride --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 +- pkgs/os-specific/linux/kernel/update-zen.py | 12 ++--- .../linux/kernel/xanmod-kernels.nix | 28 +++++----- pkgs/os-specific/linux/kernel/zen-kernels.nix | 35 ++++++------ pkgs/top-level/linux-kernels.nix | 53 ++++++++++++------- 5 files changed, 71 insertions(+), 61 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index cc422ba5a59f..46b412c30226 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -5,7 +5,7 @@ sha256 = "0q3kg7dqvsiar3m70mvmn6bkkm4k1zn4fbh5r8ynib753wlhf504"; } , ... -}: +} @ args: let majorMinor = lib.versions.majorMinor linux.modDirVersion; @@ -45,4 +45,4 @@ in linux.override { maintainers = with lib.maintainers; [ qyliss ]; }; -} +} // (args.argsOverride or { }) diff --git a/pkgs/os-specific/linux/kernel/update-zen.py b/pkgs/os-specific/linux/kernel/update-zen.py index 3c51f806d8f8..a8a363761b10 100755 --- a/pkgs/os-specific/linux/kernel/update-zen.py +++ b/pkgs/os-specific/linux/kernel/update-zen.py @@ -64,16 +64,16 @@ def update_file(relpath, variant, version, suffix, sha256): for line in f: result = line result = re.sub( - fr'^ version = ".+"; #{variant}', - f' version = "{version}"; #{variant}', + fr'^ version = ".+"; #{variant}', + f' version = "{version}"; #{variant}', result) result = re.sub( - fr'^ suffix = ".+"; #{variant}', - f' suffix = "{suffix}"; #{variant}', + fr'^ suffix = ".+"; #{variant}', + f' suffix = "{suffix}"; #{variant}', result) result = re.sub( - fr'^ sha256 = ".+"; #{variant}', - f' sha256 = "{sha256}"; #{variant}', + fr'^ sha256 = ".+"; #{variant}', + f' sha256 = "{sha256}"; #{variant}', result) print(result, end='') diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index d0889e283d44..f2efaf762779 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -1,23 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, buildLinux, ... } @ args: +{ lib, stdenv, fetchFromGitHub, buildLinux, variant, ... } @ args: let # These names are how they are designated in https://xanmod.org. # NOTE: When updating these, please also take a look at the changes done to # kernel config in the xanmod version commit - ltsVariant = { - version = "6.6.46"; - hash = "sha256-ZtXFIHRM5YCb+5Ry3zcQt44OBqfhCI/Ig32jETUBrJo="; - variant = "lts"; + variants = { + lts = { + version = "6.6.46"; + hash = "sha256-ZtXFIHRM5YCb+5Ry3zcQt44OBqfhCI/Ig32jETUBrJo="; + }; + main = { + version = "6.10.5"; + hash = "sha256-tETGtCNNgYj1IUNuI/Am5kimFndUC4O+cZwZzlPitFA="; + }; }; - mainVariant = { - version = "6.10.5"; - hash = "sha256-tETGtCNNgYj1IUNuI/Am5kimFndUC4O+cZwZzlPitFA="; - variant = "main"; - }; - - xanmodKernelFor = { version, suffix ? "xanmod1", hash, variant }: buildLinux (args // rec { + xanmodKernelFor = { version, suffix ? "xanmod1", hash }: buildLinux (args // rec { inherit version; pname = "linux-xanmod"; modDirVersion = lib.versions.pad 3 "${version}-${suffix}"; @@ -64,7 +63,4 @@ let }; } // (args.argsOverride or { })); in -{ - lts = xanmodKernelFor ltsVariant; - main = xanmodKernelFor mainVariant; -} +xanmodKernelFor variants.${variant} diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 06fbfbd37d13..6c9d2da1e9db 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -1,20 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, buildLinux, ... } @ args: +{ lib, stdenv, fetchFromGitHub, buildLinux, variant, ... } @ args: let # comments with variant added for update script - # ./update-zen.py zen - zenVariant = { - version = "6.10.5"; #zen - suffix = "zen1"; #zen - sha256 = "08ibz7560xsmlnrm8j13hxf8hjjcxfmnjdrwffqc81g9g6rvpqra"; #zen - isLqx = false; - }; - # ./update-zen.py lqx - lqxVariant = { - version = "6.10.5"; #lqx - suffix = "lqx1"; #lqx - sha256 = "09rscj20j94qkmvk0hlpjm6v1n1ndnkv2vl035gsp5lwggws2jqm"; #lqx - isLqx = true; + variants = { + # ./update-zen.py zen + zen = { + version = "6.10.5"; #zen + suffix = "zen1"; #zen + sha256 = "08ibz7560xsmlnrm8j13hxf8hjjcxfmnjdrwffqc81g9g6rvpqra"; #zen + isLqx = false; + }; + # ./update-zen.py lqx + lqx = { + version = "6.10.5"; #lqx + suffix = "lqx1"; #lqx + sha256 = "09rscj20j94qkmvk0hlpjm6v1n1ndnkv2vl035gsp5lwggws2jqm"; #lqx + isLqx = true; + }; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { inherit version; @@ -123,7 +125,4 @@ let } // (args.argsOverride or { })); in -{ - zen = zenKernelsFor zenVariant; - lqx = zenKernelsFor lqxVariant; -} +zenKernelsFor variants.${variant} diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 4688e25586ac..d5bd0f19bac2 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -213,31 +213,46 @@ in { # https://github.com/NixOS/nixpkgs/pull/161773#discussion_r820134708 zenKernels = callPackage ../os-specific/linux/kernel/zen-kernels.nix; - linux_zen = (zenKernels { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }).zen; - - linux_lqx = (zenKernels { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }).lqx; - - # This contains the variants of the XanMod kernel - xanmodKernels = callPackage ../os-specific/linux/kernel/xanmod-kernels.nix { + linux_zen = zenKernels { + variant = "zen"; kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper ]; }; - linux_xanmod = xanmodKernels.lts; - linux_xanmod_stable = xanmodKernels.main; - linux_xanmod_latest = xanmodKernels.main; + linux_lqx = zenKernels { + variant = "lqx"; + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + + # This contains the variants of the XanMod kernel + xanmodKernels = callPackage ../os-specific/linux/kernel/xanmod-kernels.nix; + + linux_xanmod = xanmodKernels { + variant = "lts"; + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + linux_xanmod_stable = xanmodKernels { + variant = "main"; + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + linux_xanmod_latest = xanmodKernels { + variant = "main"; + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; linux_libre = deblobKernel packageAliases.linux_default.kernel; From 03605dfc818cdd9c91513e678db3693566e8c116 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sun, 18 Aug 2024 10:44:15 +0300 Subject: [PATCH 148/338] mesonlsp: 4.3.2 -> 4.3.3 --- pkgs/by-name/me/mesonlsp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/me/mesonlsp/package.nix b/pkgs/by-name/me/mesonlsp/package.nix index 54741170ef8f..b4661d096efb 100644 --- a/pkgs/by-name/me/mesonlsp/package.nix +++ b/pkgs/by-name/me/mesonlsp/package.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mesonlsp"; - version = "4.3.2"; + version = "4.3.3"; src = fetchFromGitHub { owner = "JCWasmx86"; repo = "mesonlsp"; rev = "v${finalAttrs.version}"; - hash = "sha256-hNQl6JhPC8/l/Y/gWWSFOXYM/s+Xzbs+JeWMN6CZVOw="; + hash = "sha256-6p+IufgUCZj21ylkZiYS8kVAdFgDZpOST5Lgb0mXDhQ="; }; patches = [ ./disable-tests-that-require-network-access.patch ]; From 62e6739e3f315ee90a4acb6ac616b6f911e0e0a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 07:45:36 +0000 Subject: [PATCH 149/338] iosevka: 31.2.0 -> 31.3.0 --- pkgs/data/fonts/iosevka/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index abdcf8a8e7a8..b2c11344cb14 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = "Iosevka${toString set}"; - version = "31.2.0"; + version = "31.3.0"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-G0+HuA9EQEc4AYH1PgS0UqaIbZBgYcmmF2/ZgrmD7Oo="; + hash = "sha256-WrRxVrBJeyUwv0/DYTIHLi52+k2PilC7ay0tc5yq3Pw="; }; - npmDepsHash = "sha256-gmVnUlZjrBbm/9H9Uv97A5H7TOtFGXHj9mRtmNplNgg="; + npmDepsHash = "sha256-xw0GA1aIA/J5hfLQBSE+GJzXfbfWQI2k2pYdenlM9NY="; nativeBuildInputs = [ remarshal From ed9274081836aaa3befac122e3ad6c84266354cf Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 18 Aug 2024 10:10:19 +0200 Subject: [PATCH 150/338] uv: format with nixfmt --- pkgs/by-name/uv/uv/package.nix | 49 +++++++++++++++++----------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 32fc0847edc0..711443c596af 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -1,16 +1,17 @@ -{ lib -, cmake -, darwin -, fetchFromGitHub -, installShellFiles -, libiconv -, pkg-config -, python3Packages -, rustPlatform -, stdenv -, testers -, uv -, nix-update-script +{ + lib, + cmake, + darwin, + fetchFromGitHub, + installShellFiles, + libiconv, + pkg-config, + python3Packages, + rustPlatform, + stdenv, + testers, + uv, + nix-update-script, }: python3Packages.buildPythonApplication rec { @@ -44,13 +45,14 @@ python3Packages.buildPythonApplication rec { buildInputs = [ libiconv - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; dontUseCmakeConfigure = true; - cargoBuildFlags = [ "--package" "uv" ]; + cargoBuildFlags = [ + "--package" + "uv" + ]; postInstall = '' export HOME=$TMPDIR @@ -60,14 +62,10 @@ python3Packages.buildPythonApplication rec { --zsh <($out/bin/uv --generate-shell-completion zsh) ''; - pythonImportsCheck = [ - "uv" - ]; + pythonImportsCheck = [ "uv" ]; passthru = { - tests.version = testers.testVersion { - package = uv; - }; + tests.version = testers.testVersion { package = uv; }; updateScript = nix-update-script { }; }; @@ -75,7 +73,10 @@ python3Packages.buildPythonApplication rec { description = "Extremely fast Python package installer and resolver, written in Rust"; homepage = "https://github.com/astral-sh/uv"; changelog = "https://github.com/astral-sh/uv/blob/${src.rev}/CHANGELOG.md"; - license = with lib.licenses; [ asl20 mit ]; + license = with lib.licenses; [ + asl20 + mit + ]; maintainers = with lib.maintainers; [ GaetanLepage ]; mainProgram = "uv"; }; From ed57c01589255f3474cb9195085e33806791b43d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Aug 2024 16:53:43 +0000 Subject: [PATCH 151/338] python312Packages.moderngl: 5.10.0 -> 5.11.1 --- pkgs/development/python-modules/moderngl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/moderngl/default.nix b/pkgs/development/python-modules/moderngl/default.nix index 77ccc8d1d59c..8666026439a8 100644 --- a/pkgs/development/python-modules/moderngl/default.nix +++ b/pkgs/development/python-modules/moderngl/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "moderngl"; - version = "5.10.0"; + version = "5.11.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-EZyNNk3ePNjRwJ8jftSRZhe6dZlUoZUt9GlOUe5PZRE="; + hash = "sha256-rEVNXqhDHy9/DJXijaIEPb0wNTjChH/uBXA55AfdGRE="; }; buildInputs = [ From e921b41e2a8f0f88c8fd936c4c9b3fe053321ae5 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 18 Aug 2024 09:11:13 +0900 Subject: [PATCH 152/338] python312Packages.moderngl: switch to pypa build --- pkgs/development/python-modules/moderngl/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/moderngl/default.nix b/pkgs/development/python-modules/moderngl/default.nix index 8666026439a8..1d0d915b9cba 100644 --- a/pkgs/development/python-modules/moderngl/default.nix +++ b/pkgs/development/python-modules/moderngl/default.nix @@ -4,6 +4,7 @@ fetchPypi, libGL, libX11, + setuptools, glcontext, pythonOlder, }: @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "moderngl"; version = "5.11.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -20,12 +21,14 @@ buildPythonPackage rec { hash = "sha256-rEVNXqhDHy9/DJXijaIEPb0wNTjChH/uBXA55AfdGRE="; }; + build-system = [ setuptools ]; + buildInputs = [ libGL libX11 ]; - propagatedBuildInputs = [ glcontext ]; + dependencies = [ glcontext ]; # Tests need a display to run. doCheck = false; From fe48e9d11bf36d9f7431269fd48078b10ac972f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 08:20:36 +0000 Subject: [PATCH 153/338] libretro.play: unstable-2024-08-09 -> unstable-2024-08-16 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 0231400254ca..21cc2e8697c1 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -652,11 +652,11 @@ "src": { "owner": "jpd002", "repo": "Play-", - "rev": "d1c28b63e0c684025886787c39c4b7f92014d79e", - "hash": "sha256-zNcrCIsRVP0AFzFs0S7i4Cuon0JIyFzPrK26hJFqijQ=", + "rev": "92a11bf45c192300415e14d95da7a442ffc1f71c", + "hash": "sha256-5bErkTiFIFkRqk+NLLujPgGLkPjX2hgHarO4K3fIrKM=", "fetchSubmodules": true }, - "version": "unstable-2024-08-09" + "version": "unstable-2024-08-16" }, "ppsspp": { "fetcher": "fetchFromGitHub", From 58fa3c0b06baa866ca260c793eebccba5b41082e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 18 Aug 2024 10:23:04 +0200 Subject: [PATCH 154/338] python312Packages.prance: refactor --- .../python-modules/prance/default.nix | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/prance/default.nix b/pkgs/development/python-modules/prance/default.nix index 36d40f0711d9..0017582e25cc 100644 --- a/pkgs/development/python-modules/prance/default.nix +++ b/pkgs/development/python-modules/prance/default.nix @@ -13,6 +13,7 @@ setuptools-scm, six, swagger-spec-validator, + pytest-cov-stub, pytestCheckHook, openapi-spec-validator, }: @@ -20,26 +21,21 @@ buildPythonPackage rec { pname = "prance"; version = "23.06.21.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "RonnyPfannschmidt"; - repo = pname; - rev = "v${version}"; + repo = "prance"; + rev = "refs/tags/v${version}"; fetchSubmodules = true; hash = "sha256-p+LZbQal4DPeMp+eJ2O83rCaL+QIUDcU34pZhYdN4bE="; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov=prance --cov-report=term-missing --cov-fail-under=90" "" - ''; + build-system = [ setuptools-scm ]; - nativeBuildInputs = [ setuptools-scm ]; - - propagatedBuildInputs = [ + dependencies = [ chardet packaging requests @@ -56,6 +52,7 @@ buildPythonPackage rec { }; nativeCheckInputs = [ + pytest-cov-stub pytestCheckHook ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); @@ -70,11 +67,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "prance" ]; meta = with lib; { - changelog = "https://github.com/RonnyPfannschmidt/prance/blob/${src.rev}/CHANGES.rst"; description = "Resolving Swagger/OpenAPI 2.0 and 3.0.0 Parser"; - mainProgram = "prance"; homepage = "https://github.com/RonnyPfannschmidt/prance"; + changelog = "https://github.com/RonnyPfannschmidt/prance/blob/${src.rev}/CHANGES.rst"; license = licenses.mit; maintainers = [ ]; + mainProgram = "prance"; }; } From 890f637ca685be08b49537457f59bcb9f2008c45 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 18 Aug 2024 10:26:35 +0200 Subject: [PATCH 155/338] wapiti: 3.1.8 -> 3.2.0 Changelog: https://github.com/wapiti-scanner/wapiti/blob/3.2.0/doc/ChangeLog_Wapiti --- pkgs/tools/security/wapiti/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/wapiti/default.nix b/pkgs/tools/security/wapiti/default.nix index 77be8d9d5358..c2e2e742ab04 100644 --- a/pkgs/tools/security/wapiti/default.nix +++ b/pkgs/tools/security/wapiti/default.nix @@ -6,27 +6,26 @@ python3.pkgs.buildPythonApplication rec { pname = "wapiti"; - version = "3.1.8"; + version = "3.2.0"; pyproject = true; src = fetchFromGitHub { owner = "wapiti-scanner"; repo = "wapiti"; rev = "refs/tags/${version}"; - hash = "sha256-2ssbczUa4pTA5Fai+sK1hES8skJMIHxa/R2hNIiEVLs="; + hash = "sha256-Ekh31MXqxY6iSyQRX0YZ0Tl7DFhYqGtOepYS/VObZc0="; }; postPatch = '' # Remove code coverage checking substituteInPlace pyproject.toml \ - --replace "--cov --cov-report=xml" "" + --replace-fail "--cov --cov-report=xml" "" ''; pythonRelaxDeps = true; build-system = with python3.pkgs; [ setuptools ]; - dependencies = with python3.pkgs; [ @@ -41,10 +40,12 @@ python3.pkgs.buildPythonApplication rec { httpcore httpx httpx-ntlm + humanize loguru mako markupsafe mitmproxy + prance pyasn1 six sqlalchemy @@ -52,7 +53,8 @@ python3.pkgs.buildPythonApplication rec { yaswfp ] ++ httpx.optional-dependencies.brotli - ++ httpx.optional-dependencies.socks; + ++ httpx.optional-dependencies.socks + ++ prance.optional-dependencies.osv; __darwinAllowLocalNetworking = true; @@ -103,6 +105,7 @@ python3.pkgs.buildPythonApplication rec { "test_save_and_restore_state" "test_script" "test_ssrf" + "test_swagger_parser" "test_tag_name_escape" "test_timeout" "test_title_false_positive" @@ -124,6 +127,7 @@ python3.pkgs.buildPythonApplication rec { "test_cookies" "test_fallback_to_html_injection" "test_loknop_lfi_to_rce" + "test_open_redirect" "test_redirect" "test_timesql" "test_xss_inside_href_link" From dfe7b7d8b036d58ef168ba0f172d0d0c723fb567 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 18 Aug 2024 10:22:19 +0200 Subject: [PATCH 156/338] python312Packages.cvxpy: 1.5.2 -> 1.5.3 Diff: https://github.com/cvxpy/cvxpy/compare/refs/tags/v1.5.2...v1.5.3 Changelog: https://github.com/cvxpy/cvxpy/releases/tag/v1.5.3 --- .../python-modules/cvxpy/default.nix | 37 +++++-------------- 1 file changed, 10 insertions(+), 27 deletions(-) diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index e75ad737db9c..7ed3c7563777 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - fetchpatch, # build-system numpy, @@ -27,28 +26,18 @@ buildPythonPackage rec { pname = "cvxpy"; - version = "1.5.2"; + version = "1.5.3"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "cvxpy"; repo = "cvxpy"; rev = "refs/tags/v${version}"; - hash = "sha256-g4JVgykGNFT4ZEi5f8hkVjd7eUVJ+LxvPvmiVa86r1Y="; + hash = "sha256-6RaEyFckvF3WhbfeffysMB/zt+aU1NU6B7Nm06znt9k="; }; - patches = [ - # Fix invalid uses of the scipy library - # https://github.com/cvxpy/cvxpy/pull/2508 - (fetchpatch { - name = "scipy-1-14-compat"; - url = "https://github.com/cvxpy/cvxpy/pull/2508/commits/c343f4381c69f7e6b51a86b3eee8b42fbdda9d6a.patch"; - hash = "sha256-SqIdPs9K+GuCLCEJMHUQ+QGWNH5B3tKuwr46tD9Ao2k="; - }) - ]; - # we need to patch out numpy version caps from upstream postPatch = '' substituteInPlace pyproject.toml \ @@ -81,19 +70,13 @@ buildPythonPackage rec { pytestFlagsArray = [ "cvxpy" ]; - disabledTests = - [ - # Disable the slowest benchmarking tests, cuts test time in half - "test_tv_inpainting" - "test_diffcp_sdp_example" - "test_huber" - "test_partial_problem" - # https://github.com/cvxpy/cvxpy/issues/2174 - "test_scipy_mi_time_limit_reached" - ] - ++ lib.optionals stdenv.isAarch64 [ - "test_ecos_bb_mi_lp_2" # https://github.com/cvxpy/cvxpy/issues/1241#issuecomment-780912155 - ]; + disabledTests = [ + # Disable the slowest benchmarking tests, cuts test time in half + "test_tv_inpainting" + "test_diffcp_sdp_example" + "test_huber" + "test_partial_problem" + ]; pythonImportsCheck = [ "cvxpy" ]; From 9674579019512975587820fea0ada9c8b30099e0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 08:32:13 +0000 Subject: [PATCH 157/338] libretro.mupen64plus: unstable-2024-07-19 -> unstable-2024-08-13 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 0231400254ca..74c99f95b5a3 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -540,10 +540,10 @@ "src": { "owner": "libretro", "repo": "mupen64plus-libretro-nx", - "rev": "c7cd8edcd015ddcbd4a2e984573c9c1d1ddd0b6e", - "hash": "sha256-QSGPfl29darzo5p8TiJbSMvezYkfRxon/XiObh5PULY=" + "rev": "af797557b0e6d339d047b43f73d0ade021da1637", + "hash": "sha256-P/AqgijQ8rHTMM3X/9ZjDG5/1NGS51dZYlLy4cEYbng=" }, - "version": "unstable-2024-07-19" + "version": "unstable-2024-08-13" }, "neocd": { "fetcher": "fetchFromGitHub", From 43ea7fe77270c246c65e493d62c2265a06ab559a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 18 Aug 2024 10:54:40 +0200 Subject: [PATCH 158/338] python312Packages.sanic: refactor --- .../python-modules/sanic/default.nix | 58 ++++++++----------- 1 file changed, 24 insertions(+), 34 deletions(-) diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 94cc8ba3f38d..04f00668ed92 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -1,61 +1,48 @@ { lib, stdenv, - buildPythonPackage, - fetchFromGitHub, - pythonAtLeast, - - # build-system - setuptools, - wheel, - - # propagates aiofiles, + aioquic, + beautifulsoup4, + buildPythonPackage, + doCheck ? !stdenv.isDarwin, # on Darwin, tests fail but pkg still works + fetchFromGitHub, + gunicorn, html5tagger, httptools, multidict, + pytest-asyncio, + pytestCheckHook, + pythonAtLeast, + pythonOlder, sanic-routing, + sanic-testing, + setuptools, tracerite, typing-extensions, ujson, + uvicorn, uvloop, websockets, - - # optionals - aioquic, - - # tests - doCheck ? !stdenv.isDarwin, # on Darwin, tests fail but pkg still works - - beautifulsoup4, - gunicorn, - pytest-asyncio, - pytestCheckHook, - pythonOlder, - sanic-testing, - uvicorn, }: buildPythonPackage rec { pname = "sanic"; version = "24.6.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "sanic-org"; - repo = pname; + repo = "sanic"; rev = "refs/tags/v${version}"; hash = "sha256-AviYqdr+r5ya4mFJKGUatBsaMMmCQGqE3YtDJwTuaY0="; }; - nativeBuildInputs = [ - setuptools - wheel - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiofiles httptools html5tagger @@ -115,16 +102,19 @@ buildPythonPackage rec { # Server mode mismatch (debug vs production) "test_num_workers" # Racy tests + "test_custom_cert_loader" "test_keep_alive_client_timeout" "test_keep_alive_server_timeout" + "test_logger_vhosts" + "test_ssl_in_multiprocess_mode" "test_zero_downtime" # sanic.exceptions.SanicException: Cannot setup Sanic Simple Server without a path to a directory "test_load_app_simple" - # create defunct python processes + # Tests create defunct Python processes "test_reloader_live" "test_reloader_live_with_dir" "test_reload_listeners" - # crash the python interpreter + # Tests crash the Python interpreter "test_host_port_localhost" "test_host_port" "test_server_run" @@ -156,7 +146,7 @@ buildPythonPackage rec { "test_multiprocessing.py" ]; - # avoid usage of nixpkgs-review in darwin since tests will compete usage + # Avoid usage of nixpkgs-review in darwin since tests will compete usage # for the same local port __darwinAllowLocalNetworking = true; @@ -164,10 +154,10 @@ buildPythonPackage rec { meta = with lib; { description = "Web server and web framework"; - mainProgram = "sanic"; homepage = "https://github.com/sanic-org/sanic/"; changelog = "https://github.com/sanic-org/sanic/releases/tag/v${version}"; license = licenses.mit; maintainers = [ ]; + mainProgram = "sanic"; }; } From 92dd99415769ead9d0407729c00d0517f15857f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 09:04:34 +0000 Subject: [PATCH 159/338] libretro.beetle-pce-fast: unstable-2024-08-09 -> unstable-2024-08-16 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 0231400254ca..fe90bac424ba 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -65,10 +65,10 @@ "src": { "owner": "libretro", "repo": "beetle-pce-fast-libretro", - "rev": "3f1c0a14b16802998f4f32ea27b0c8ad81d3b9e7", - "hash": "sha256-azdHkzMGDJYfZ3GrmLhJYhw9VGgdWBBXto3kqmpTdpQ=" + "rev": "1c7342061ec00bc9f4253f3bfa4d1d7cfd1be769", + "hash": "sha256-gXp3jBszow0pwkP1iIFyFuHIJa65IjxAxW16tF4s1bQ=" }, - "version": "unstable-2024-08-09" + "version": "unstable-2024-08-16" }, "beetle-pcfx": { "fetcher": "fetchFromGitHub", From 9437db7f9afe5218ef55e3a5d8b2b24b1e6a561c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 09:04:37 +0000 Subject: [PATCH 160/338] libretro.beetle-psx-hw: unstable-2024-08-09 -> unstable-2024-08-16 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 0231400254ca..e1af5750d1ef 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -85,10 +85,10 @@ "src": { "owner": "libretro", "repo": "beetle-psx-libretro", - "rev": "99a46bdb949a33ea1f827a1c6dfdd324e26486bf", - "hash": "sha256-DvHcT1SJdeVz7M5jRhiil9QaHRBs5cGve+9uNRbBbWI=" + "rev": "b47a157182ca02af988363f472446ee40f18597b", + "hash": "sha256-c49AARmoMxFI7RGPCAGLVyouyQ/E8mYqeWehs41uLmo=" }, - "version": "unstable-2024-08-09" + "version": "unstable-2024-08-16" }, "beetle-saturn": { "fetcher": "fetchFromGitHub", From 90bea0017c38b4bf160acdb8d87922ddaa6b49d1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 09:05:04 +0000 Subject: [PATCH 161/338] libretro.pcsx-rearmed: unstable-2024-07-24 -> unstable-2024-08-16 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 0231400254ca..268948271fc0 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -631,10 +631,10 @@ "src": { "owner": "libretro", "repo": "pcsx_rearmed", - "rev": "19f1a7d2de3a136810a84341db77d4f5eb8f3361", - "hash": "sha256-RnR6KuZa5cxw/Z+ZIZ2RhNrPRWlZupR9TDUhc2puBqQ=" + "rev": "89a8e88a616301c0cec4cbfebf96301ce9d5244c", + "hash": "sha256-Y+vR3a891qRsnY7A3UTF6LHle/3M/OAIU6N0VXinbkg=" }, - "version": "unstable-2024-07-24" + "version": "unstable-2024-08-16" }, "picodrive": { "fetcher": "fetchFromGitHub", From 8a86d1184ae47cff90846513a05d9e2bb0e93ac1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 09:05:25 +0000 Subject: [PATCH 162/338] libretro.stella: unstable-2024-08-10 -> unstable-2024-08-16 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 0231400254ca..430b0905fbeb 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -794,10 +794,10 @@ "src": { "owner": "stella-emu", "repo": "stella", - "rev": "8e9149a233fa66e894261bef18d20afb575902b1", - "hash": "sha256-agMd0/FiMQ3tvNg8imEz55a4AqjyRu085eYL42cNBfI=" + "rev": "d64ff2e5b7cb202155b2782b55c8d359c2a9c8ce", + "hash": "sha256-aKqOLmFpWLxHeXVq/YP/xinnpKhDPFlgA2FEnSZjftU=" }, - "version": "unstable-2024-08-10" + "version": "unstable-2024-08-16" }, "stella2014": { "fetcher": "fetchFromGitHub", From e4a1022d70fa5ce2979462b652a6871236af4ece Mon Sep 17 00:00:00 2001 From: isabel Date: Sun, 18 Aug 2024 10:13:13 +0100 Subject: [PATCH 163/338] vscode-langservers-extracted: fix build --- .../language-servers/vscode-langservers-extracted/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix b/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix index 063fa93c9646..4b7f571ead57 100644 --- a/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix +++ b/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix @@ -34,11 +34,8 @@ buildNpmPackage rec { --out-dir lib/html-language-server/node/ npx babel ${extensions}/json-language-features/server/dist/node \ --out-dir lib/json-language-server/node/ - npx babel ${extensions}/markdown-language-features/server/dist/node \ - --out-dir lib/markdown-language-server/node/ cp -r ${vscode-extensions.dbaeumer.vscode-eslint}/share/vscode/extensions/dbaeumer.vscode-eslint/server/out \ lib/eslint-language-server - mv lib/markdown-language-server/node/workerMain.js lib/markdown-language-server/node/main.js ''; meta = with lib; { From 02a1f8bf702a8f0f881d8ad63eb01f46fe6f342a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sun, 18 Aug 2024 09:15:35 +0000 Subject: [PATCH 164/338] python3Packages.xformers: enable parallel build `ninja` is needed for parallel builds. Also set `MAX_JOBS` to `NIX_BUILD_CORES`. --- .../python-modules/xformers/default.nix | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/xformers/default.nix b/pkgs/development/python-modules/xformers/default.nix index 530f00211086..69c7583c9eac 100644 --- a/pkgs/development/python-modules/xformers/default.nix +++ b/pkgs/development/python-modules/xformers/default.nix @@ -18,6 +18,7 @@ fairscale, scipy, cmake, + ninja, triton, networkx, #, apex @@ -47,13 +48,14 @@ buildPythonPackage { patches = [ ./0001-fix-allow-building-without-git.patch ]; - preBuild = - '' - cat << EOF > ./xformers/version.py - # noqa: C801 - __version__ = "${version}" - EOF - ''; + preBuild = '' + cat << EOF > ./xformers/version.py + # noqa: C801 + __version__ = "${version}" + EOF + + export MAX_JOBS=$NIX_BUILD_CORES + ''; env = lib.attrsets.optionalAttrs cudaSupport { TORCH_CUDA_ARCH_LIST = "${lib.concatStringsSep ";" torch.cudaCapabilities}"; @@ -74,9 +76,10 @@ buildPythonPackage { ] ); - nativeBuildInputs = [ which ] ++ lib.optionals cudaSupport (with cudaPackages; [ - cuda_nvcc - ]); + nativeBuildInputs = [ + ninja + which + ] ++ lib.optionals cudaSupport (with cudaPackages; [ cuda_nvcc ]); propagatedBuildInputs = [ numpy From 12f2a32fdefb24c4000f4635222bbe76dc688969 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 09:22:10 +0000 Subject: [PATCH 165/338] libretro.beetle-supergrafx: unstable-2024-08-09 -> unstable-2024-08-16 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 0231400254ca..955f51cbdcde 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -115,10 +115,10 @@ "src": { "owner": "libretro", "repo": "beetle-supergrafx-libretro", - "rev": "dfff1f9c032b9556a070ae6848d1e28df3023e4d", - "hash": "sha256-nMu+sXxTtMKA+OajEYa2/OMsLThRr7C3PEC5UwrtCzI=" + "rev": "2379eedc1d057e6b0ec465e4519e20c0fd66c5dc", + "hash": "sha256-zeKs0NcdZo3AY3Zv11nK4iLSq2l6jBZcAI4gbUg3gjQ=" }, - "version": "unstable-2024-08-09" + "version": "unstable-2024-08-16" }, "beetle-vb": { "fetcher": "fetchFromGitHub", From 88bdd6b316fda075c28b8174a9fee654a710ada7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 09:22:44 +0000 Subject: [PATCH 166/338] libretro.mame2003: unstable-2024-08-08 -> unstable-2024-08-18 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 0231400254ca..20c08c54ea0a 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -429,10 +429,10 @@ "src": { "owner": "libretro", "repo": "mame2003-libretro", - "rev": "f0d4ffbded87ead2cccd603a9d6f8b6c46c37b6f", - "hash": "sha256-rdOZLGoxB5cVOwhMwzoJiSum3gxPRkoNZXVz5QFvXf8=" + "rev": "ac11b67168c92caab5012d8d7365d36fe5c94b3e", + "hash": "sha256-SlEvXbqv4v51njU5QhpimJWnkvGEJlRLjsNg8s4fkBc=" }, - "version": "unstable-2024-08-08" + "version": "unstable-2024-08-18" }, "mame2003-plus": { "fetcher": "fetchFromGitHub", From 3f05ee4a177b031d553c0d996136638a0d80b836 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 18 Aug 2024 10:57:30 +0200 Subject: [PATCH 167/338] python312Packages.sanic-testing: 23.12.0 -> 24.6.0 Diff: https://github.com/sanic-org/sanic-testing/compare/refs/tags/v23.12.0...v24.6.0 Changelog: https://github.com/sanic-org/sanic-testing/releases/tag/v24.6.0 --- .../python-modules/sanic-testing/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/sanic-testing/default.nix b/pkgs/development/python-modules/sanic-testing/default.nix index 68b4ccc3d8f7..c326c76e0f5b 100644 --- a/pkgs/development/python-modules/sanic-testing/default.nix +++ b/pkgs/development/python-modules/sanic-testing/default.nix @@ -6,13 +6,14 @@ httpx, pythonOlder, sanic, + setuptools, websockets, }: buildPythonPackage rec { pname = "sanic-testing"; - version = "23.12.0"; - format = "setuptools"; + version = "24.6.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "sanic-org"; repo = "sanic-testing"; rev = "refs/tags/v${version}"; - hash = "sha256-pFsGB0QDeO/iliHOitHqBIQtDlwRgFg8nhgMLsopoec="; + hash = "sha256-biUgxa0sINHAYzyKimVD8+/mPUq2dlnCl2BN+UeUaEo="; }; outputs = [ @@ -28,7 +29,9 @@ buildPythonPackage rec { "testsout" ]; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ httpx sanic websockets From 2d51a4d3062f63a0c6f164e9772e98c4f1b99d20 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Sun, 4 Aug 2024 18:09:30 +0000 Subject: [PATCH 168/338] xen-guest-agent: move to by-name Signed-off-by: Fernando Rodrigues --- .../default.nix => by-name/xe/xen-guest-agent/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/virtualization/xen-guest-agent/default.nix => by-name/xe/xen-guest-agent/package.nix} (100%) diff --git a/pkgs/tools/virtualization/xen-guest-agent/default.nix b/pkgs/by-name/xe/xen-guest-agent/package.nix similarity index 100% rename from pkgs/tools/virtualization/xen-guest-agent/default.nix rename to pkgs/by-name/xe/xen-guest-agent/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6168070cc77e..25a9db99e50e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14333,8 +14333,6 @@ with pkgs; xe-guest-utilities = callPackage ../tools/virtualization/xe-guest-utilities { }; - xen-guest-agent = callPackage ../tools/virtualization/xen-guest-agent { }; - xflux = callPackage ../tools/misc/xflux { }; xflux-gui = python3Packages.callPackage ../tools/misc/xflux/gui.nix { }; From d50d09a74719b2fe2795198cd07f7453edb6e8d7 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Sun, 4 Aug 2024 18:10:51 +0000 Subject: [PATCH 169/338] xen-guest-agent: format with nixfmt-rfc-style Also adds myself as a maintainer. Signed-off-by: Fernando Rodrigues --- pkgs/by-name/xe/xen-guest-agent/package.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/xe/xen-guest-agent/package.nix b/pkgs/by-name/xe/xen-guest-agent/package.nix index 1b9f637bf61a..aa197665c70a 100644 --- a/pkgs/by-name/xe/xen-guest-agent/package.nix +++ b/pkgs/by-name/xe/xen-guest-agent/package.nix @@ -24,17 +24,23 @@ rustPlatform.buildRustPackage rec { RUSTFLAGS = "-L ${xen-slim.out}/lib"; }; - nativeBuildInputs = [llvmPackages.clang xen-slim.out]; + nativeBuildInputs = [ + llvmPackages.clang + xen-slim.out + ]; postFixup = '' patchelf $out/bin/xen-guest-agent --add-rpath ${xen-slim.out}/lib ''; - meta = with lib; { + meta = { description = "Xen agent running in Linux/BSDs (POSIX) VMs"; homepage = "https://gitlab.com/xen-project/xen-guest-agent"; - license = licenses.agpl3Only; - platforms = platforms.unix; - maintainers = with maintainers; [matdibu]; + license = lib.licenses.agpl3Only; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ + matdibu + sigmasquadron + ]; }; } From de2d1ba867af46fdf048fea72561de1579794cf8 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Sun, 4 Aug 2024 18:11:32 +0000 Subject: [PATCH 170/338] xen-guest-agent: 0.3.0 -> 0.4.0-unstable-2024-05-31 New dependency: pkg-config https://gitlab.com/xen-project/xen-guest-agent/-/releases/0.4.0 The 03aaadbe commit is required to fix compilation on Rust 1.80. Signed-off-by: Fernando Rodrigues --- pkgs/by-name/xe/xen-guest-agent/package.nix | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/xe/xen-guest-agent/package.nix b/pkgs/by-name/xe/xen-guest-agent/package.nix index aa197665c70a..855140f5200a 100644 --- a/pkgs/by-name/xe/xen-guest-agent/package.nix +++ b/pkgs/by-name/xe/xen-guest-agent/package.nix @@ -3,32 +3,31 @@ fetchFromGitLab, rustPlatform, llvmPackages, + pkg-config, xen-slim, }: rustPlatform.buildRustPackage rec { pname = "xen-guest-agent"; - version = "0.3.0"; + version = "0.4.0-unstable-2024-05-31"; src = fetchFromGitLab { owner = "xen-project"; repo = pname; - rev = version; - hash = "sha256-Csio24ofj+p0j/R0av/28P/KCNXhmcF+r8xGJEfoHjQ="; + rev = "03aaadbe030f303b1503e172ee2abb6d0cab7ac6"; + hash = "sha256-OhzRsRwDvt0Ov+nLxQSP87G3RDYSLREMz2w9pPtSUYg="; }; - cargoHash = "sha256-XWDDzSu88zCIwMuvkFjCb98DzXHvW2IP9u3EbpAMIgw="; - - env = { - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; - BINDGEN_EXTRA_CLANG_ARGS = "-isystem ${xen-slim.dev}/include"; - RUSTFLAGS = "-L ${xen-slim.out}/lib"; - }; + cargoHash = "sha256-E6QKh4FFr6sLAByU5n6sLppFwPHSKtKffhQ7FfdXAu4="; nativeBuildInputs = [ llvmPackages.clang - xen-slim.out + pkg-config ]; + buildInputs = [ xen-slim ]; + + env.LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + postFixup = '' patchelf $out/bin/xen-guest-agent --add-rpath ${xen-slim.out}/lib ''; From 36260d596afa6db2d7ba807a69b567fbddb51d31 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 09:53:17 +0000 Subject: [PATCH 171/338] libretro.mame2003-plus: unstable-2024-08-08 -> unstable-2024-08-18 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 0231400254ca..2fc9abe31494 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -439,10 +439,10 @@ "src": { "owner": "libretro", "repo": "mame2003-plus-libretro", - "rev": "444bc10c2ab1553b3ed59b7d6afb54da39b891de", - "hash": "sha256-dfnISpXAt5JE0i7s75t2MdweTVJ0KarsGxKNtmFViCc=" + "rev": "95806c35f7dcb7c88b07ff2ba15e6e0077e8e69f", + "hash": "sha256-Wt7Z1QNJXbbznqY0TICxJFjgBXIgBT4EHi06hPF+hBc=" }, - "version": "unstable-2024-08-08" + "version": "unstable-2024-08-18" }, "mame2010": { "fetcher": "fetchFromGitHub", From 745c7c0165048f8108543f619ce46b160754503c Mon Sep 17 00:00:00 2001 From: RoyDubnium <72664566+RoyDubnium@users.noreply.github.com> Date: Sun, 18 Aug 2024 10:58:40 +0100 Subject: [PATCH 172/338] qdiskinfo: suffix smartmontools Co-authored-by: Atemu --- pkgs/by-name/qd/qdiskinfo/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/qd/qdiskinfo/package.nix b/pkgs/by-name/qd/qdiskinfo/package.nix index bc51e1880b74..7c66fbd0a78a 100644 --- a/pkgs/by-name/qd/qdiskinfo/package.nix +++ b/pkgs/by-name/qd/qdiskinfo/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' wrapProgram $out/bin/QDiskInfo \ - --prefix PATH : ${smartmontools}/bin + --suffix PATH : ${smartmontools}/bin ''; meta = { From 6d86d4ac172a6becf88ec4c431a68b3a43e35ec6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 10:06:05 +0000 Subject: [PATCH 173/338] libretro.ppsspp: unstable-2024-08-09 -> unstable-2024-08-15 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 0231400254ca..fb3c45473a3d 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -663,11 +663,11 @@ "src": { "owner": "hrydgard", "repo": "ppsspp", - "rev": "169736dff64cb426d8eba559f76475d2f762e368", - "hash": "sha256-93rZl2vec6NSlJ2WGJvn/M1nsA+bJgfOxiPESYv6oK8=", + "rev": "8f300cf5bb715038489f91f371e06cefdd3e3cdc", + "hash": "sha256-bUj6Xa4k5EwjhFWOrHodLWgwLFrJcsHjsu3zdd/gqJQ=", "fetchSubmodules": true }, - "version": "unstable-2024-08-09" + "version": "unstable-2024-08-15" }, "prboom": { "fetcher": "fetchFromGitHub", From 380864c4389961fe2d874005eaeb359bf5ba44c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 10:06:13 +0000 Subject: [PATCH 174/338] libretro.fbneo: unstable-2024-08-09 -> unstable-2024-08-17 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 0231400254ca..e7cabb5e242e 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -287,10 +287,10 @@ "src": { "owner": "libretro", "repo": "fbneo", - "rev": "981bd35179e0b4dc4471bdd4c8f093b206ed578b", - "hash": "sha256-x1VdryO2GBIPWD72tMI3EHDD/a7uUTSMjDrdr4m4ovg=" + "rev": "a77738cbe9c75823f62a23e35bdfcf05e23d45b3", + "hash": "sha256-a4w9UO37iOTAkT0cj0p64HgxZHF7PFtIEo3CIKSe/NU=" }, - "version": "unstable-2024-08-09" + "version": "unstable-2024-08-17" }, "fceumm": { "fetcher": "fetchFromGitHub", From 27799a0844070136ad13741684f29d8920c48b6f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 10:06:15 +0000 Subject: [PATCH 175/338] platformsh: 5.0.18 -> 5.0.19 --- pkgs/by-name/pl/platformsh/versions.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/pl/platformsh/versions.json b/pkgs/by-name/pl/platformsh/versions.json index 56a6ed29289b..9fcf18623798 100644 --- a/pkgs/by-name/pl/platformsh/versions.json +++ b/pkgs/by-name/pl/platformsh/versions.json @@ -1,19 +1,19 @@ { - "version": "5.0.18", + "version": "5.0.19", "darwin-amd64": { - "hash": "sha256-hvkEd57DawG4K6uS/9uIzJWVECHuJNcu3V17BBpU3Ts=", - "url": "https://github.com/platformsh/cli/releases/download/5.0.18/platform_5.0.18_darwin_all.tar.gz" + "hash": "sha256-PGld4gvUnB5I++vPQjEFWp7XRowi4fRfLL6wSzdyaAY=", + "url": "https://github.com/platformsh/cli/releases/download/5.0.19/platform_5.0.19_darwin_all.tar.gz" }, "darwin-arm64": { - "hash": "sha256-hvkEd57DawG4K6uS/9uIzJWVECHuJNcu3V17BBpU3Ts=", - "url": "https://github.com/platformsh/cli/releases/download/5.0.18/platform_5.0.18_darwin_all.tar.gz" + "hash": "sha256-PGld4gvUnB5I++vPQjEFWp7XRowi4fRfLL6wSzdyaAY=", + "url": "https://github.com/platformsh/cli/releases/download/5.0.19/platform_5.0.19_darwin_all.tar.gz" }, "linux-amd64": { - "hash": "sha256-za57D3hWyDQCU0lHynAYAz6iWkkqqjqvbzwX4UlcS7o=", - "url": "https://github.com/platformsh/cli/releases/download/5.0.18/platform_5.0.18_linux_amd64.tar.gz" + "hash": "sha256-UtyN/0UolohIVtrxGcKieHZfoRDJhjRApq+Mm44LjSo=", + "url": "https://github.com/platformsh/cli/releases/download/5.0.19/platform_5.0.19_linux_amd64.tar.gz" }, "linux-arm64": { - "hash": "sha256-nBChIo0whl2QnLI9evcpsDdBJS5gIvN7bh13p2G0YjE=", - "url": "https://github.com/platformsh/cli/releases/download/5.0.18/platform_5.0.18_linux_arm64.tar.gz" + "hash": "sha256-upMEN/c3hxuFlocelC1hX/Nia02Jeg3+VWPsA48kjhs=", + "url": "https://github.com/platformsh/cli/releases/download/5.0.19/platform_5.0.19_linux_arm64.tar.gz" } } From a186a7c2c5dc7e0c11478b1d5bda8e4936ddcc79 Mon Sep 17 00:00:00 2001 From: Ryan Cao <70191398+ryanccn@users.noreply.github.com> Date: Wed, 14 Aug 2024 17:22:02 +0800 Subject: [PATCH 176/338] nrr: enable LTO by default --- pkgs/by-name/nr/nrr/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/nr/nrr/package.nix b/pkgs/by-name/nr/nrr/package.nix index e92704479ac7..0158e1063f4e 100644 --- a/pkgs/by-name/nr/nrr/package.nix +++ b/pkgs/by-name/nr/nrr/package.nix @@ -5,12 +5,14 @@ , darwin , pkg-config , libiconv +, enableLTO ? true , nrxAlias ? true }: rustPlatform.buildRustPackage rec { pname = "nrr"; version = "0.9.4"; + __structuredAttrs = true; src = fetchFromGitHub { owner = "ryanccn"; @@ -32,6 +34,11 @@ rustPlatform.buildRustPackage rec { pkg-config ]; + env = lib.optionalAttrs enableLTO { + CARGO_PROFILE_RELEASE_LTO = "fat"; + CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1"; + }; + postInstall = lib.optionalString nrxAlias "ln -s $out/bin/nr{r,x}"; meta = with lib; { From 1460e067737106a50a16597dcb9181b306c4d567 Mon Sep 17 00:00:00 2001 From: Ryan Cao <70191398+ryanccn@users.noreply.github.com> Date: Wed, 14 Aug 2024 17:22:57 +0800 Subject: [PATCH 177/338] nrr: add meta.homepage --- pkgs/by-name/nr/nrr/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/nr/nrr/package.nix b/pkgs/by-name/nr/nrr/package.nix index 0158e1063f4e..246e1006df0a 100644 --- a/pkgs/by-name/nr/nrr/package.nix +++ b/pkgs/by-name/nr/nrr/package.nix @@ -43,6 +43,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Minimal, blazing fast npm scripts runner"; + homepage = "https://github.com/ryanccn/nrr"; maintainers = with maintainers; [ ryanccn ]; license = licenses.gpl3Only; mainProgram = "nrr"; From cffc27daf06c77c0d76bc35d24b929cb9d68c3c9 Mon Sep 17 00:00:00 2001 From: Ryan Cao <70191398+ryanccn@users.noreply.github.com> Date: Wed, 14 Aug 2024 17:24:39 +0800 Subject: [PATCH 178/338] nrr: format with nixfmt-rfc-style --- pkgs/by-name/nr/nrr/package.nix | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/nr/nrr/package.nix b/pkgs/by-name/nr/nrr/package.nix index 246e1006df0a..e8347e154a3c 100644 --- a/pkgs/by-name/nr/nrr/package.nix +++ b/pkgs/by-name/nr/nrr/package.nix @@ -1,14 +1,14 @@ -{ lib -, stdenv -, fetchFromGitHub -, rustPlatform -, darwin -, pkg-config -, libiconv -, enableLTO ? true -, nrxAlias ? true +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + darwin, + pkg-config, + libiconv, + enableLTO ? true, + nrxAlias ? true, }: - rustPlatform.buildRustPackage rec { pname = "nrr"; version = "0.9.4"; @@ -30,9 +30,7 @@ rustPlatform.buildRustPackage rec { libiconv ]; - nativeBuildInputs = [ - pkg-config - ]; + nativeBuildInputs = [ pkg-config ]; env = lib.optionalAttrs enableLTO { CARGO_PROFILE_RELEASE_LTO = "fat"; From ff5ec08ff3e57e73ebbc15f97d479bc1d17799ab Mon Sep 17 00:00:00 2001 From: Ryan Cao <70191398+ryanccn@users.noreply.github.com> Date: Wed, 14 Aug 2024 17:26:32 +0800 Subject: [PATCH 179/338] nrr: update .git-blame-ignore-revs --- .git-blame-ignore-revs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 8fec6f3ce6ce..04f9ae0c7302 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -162,3 +162,6 @@ fc7a83f8b62e90de5679e993d4d49ca014ea013d # darwin.stdenv: format with nixfmt-rfc-style (#333962) 93c10ac9e561c6594d3baaeaff2341907390d9b8 + +# nrr: format with nixfmt-rfc-style (#334578) +cffc27daf06c77c0d76bc35d24b929cb9d68c3c9 From 7c87c474f1b4f020b1ab9d2b962fde094c2599cf Mon Sep 17 00:00:00 2001 From: Aaron Kaiser Date: Sat, 17 Aug 2024 13:20:05 +0200 Subject: [PATCH 180/338] avrdude: add libusb-compat-0_1 dependency For some programmers, avrdude displays the following error: avrdude error: avrdude was compiled without usb support. According to this StackOverflow question [1], this is due to libusb-0.1 being missing during compilation. This commit adds this missing library. [1] https://stackoverflow.com/questions/69636608/beyond-linux-from-scratch-avrdude-was-compiled-without-usb-support --- pkgs/development/embedded/avrdude/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/embedded/avrdude/default.nix b/pkgs/development/embedded/avrdude/default.nix index 41b6c5ffc940..1fb0741061a2 100644 --- a/pkgs/development/embedded/avrdude/default.nix +++ b/pkgs/development/embedded/avrdude/default.nix @@ -1,5 +1,5 @@ { lib, callPackage, stdenv, fetchFromGitHub, cmake, bison, flex, libusb1, elfutils -, libftdi1, readline, hidapi, libserialport +, libftdi1, readline, hidapi, libserialport, libusb-compat-0_1 # Documentation building doesn't work on Darwin. It fails with: # Undefined subroutine &Locale::Messages::dgettext called in ... texi2html # @@ -35,6 +35,7 @@ stdenv.mkDerivation (finalAttrs: { libftdi1 libserialport readline + libusb-compat-0_1 ]; postPatch = lib.optionalString (!useElfutils) '' From 296f1b59e456cfd1a08c62667a9e628984b5d859 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 10:21:23 +0000 Subject: [PATCH 181/338] powerpipe: 0.4.1 -> 0.4.2 --- pkgs/by-name/po/powerpipe/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/po/powerpipe/package.nix b/pkgs/by-name/po/powerpipe/package.nix index 3591f8b94f0b..352b8b6ddd60 100644 --- a/pkgs/by-name/po/powerpipe/package.nix +++ b/pkgs/by-name/po/powerpipe/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "powerpipe"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "turbot"; repo = "powerpipe"; rev = "refs/tags/v${version}"; - hash = "sha256-8gQ3+sXeWTiuFgj2XKh2ngo5qBBczoqnX3NiHflJGSU="; + hash = "sha256-wZav0MKnXEcIaO4WttCRJ+0sTabJeHHxL0vyb8qi4w8="; }; - vendorHash = "sha256-9SgGBkxPuelJrUpG8vnVPt0w5UdL4slxHJDSXDitaAQ="; + vendorHash = "sha256-2n1fImOLk1KIr2rqvbiw/Ze2LPeNlqaQ7mAdUuS/KQM="; proxyVendor = true; nativeBuildInputs = [ From 0031e07cd0a2e200640f58c859dacf09dfdc990b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Aug 2024 12:02:42 +0200 Subject: [PATCH 182/338] python312Packages.streamlit: 1.37.0 -> 1.37.1 Changelog: https://github.com/streamlit/streamlit/releases/tag/1.37.1 --- .../python-modules/streamlit/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix index 52f4a122bc04..899ee9edc698 100644 --- a/pkgs/development/python-modules/streamlit/default.nix +++ b/pkgs/development/python-modules/streamlit/default.nix @@ -33,23 +33,26 @@ buildPythonPackage rec { pname = "streamlit"; - version = "1.37.0"; + version = "1.37.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Rj73KLoh504FEi43BOivZEp727WCLigbja9KCkh2GHk="; + hash = "sha256-vH44E9lKOd2lbxVnhDfrN4MJc8YB6OV08iJae/GI6lo="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - pythonRelaxDeps = [ "packaging" ]; + pythonRelaxDeps = [ + "packaging" + "tenacity" + ]; - propagatedBuildInputs = [ + dependencies = [ altair blinker cachetools From 2bbe39ca86c03d39933c2949dde77f9d476c8922 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 10:27:07 +0000 Subject: [PATCH 183/338] libretro.bsnes: unstable-2024-08-09 -> unstable-2024-08-16 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 0231400254ca..b7b48595b956 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -165,10 +165,10 @@ "src": { "owner": "libretro", "repo": "bsnes-libretro", - "rev": "7e81fc46a7aa7a58030413ed0ae0707832c8d9e6", - "hash": "sha256-I6ZPqvN2EL/mCfS7yPgRTbgdLp57xd9+uFfkP1l9DOc=" + "rev": "4da6b84bf20c36f1a1d097b5f8431d6bf0e4bd48", + "hash": "sha256-Ic4EENOMzQAVW7QVSqrJ2ZZZnymbSvotDLQp9IF708k=" }, - "version": "unstable-2024-08-09" + "version": "unstable-2024-08-16" }, "bsnes-hd": { "fetcher": "fetchFromGitHub", From 7f14a848444378eb0d9a5fd0bad29313b9acac05 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 10:27:56 +0000 Subject: [PATCH 184/338] libretro.flycast: unstable-2024-07-29 -> unstable-2024-08-17 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 0231400254ca..6b79d2984ce9 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -307,11 +307,11 @@ "src": { "owner": "flyinghead", "repo": "flycast", - "rev": "45bf218df428123f739714ef4e65e1b96c0959b7", - "hash": "sha256-TB8cSwvwyfG3tNsMf2qXDZGMTuwnNeRlhyH8fzDnvQM=", + "rev": "6061d402bdbd1a07d0ba43fe6db272365a309e9f", + "hash": "sha256-2kLhb4biq4rokI44/PWr1jmMNSsUG+3aoBgQfZyyL+8=", "fetchSubmodules": true }, - "version": "unstable-2024-07-29" + "version": "unstable-2024-08-17" }, "fmsx": { "fetcher": "fetchFromGitHub", From 0bc77525f181cec63f45c7d22d16e16bf3e758c7 Mon Sep 17 00:00:00 2001 From: D3vil0p3r Date: Sat, 13 Jul 2024 02:18:44 +0200 Subject: [PATCH 185/338] nightfox-gtk-theme: 0-unstable-2024-06-27 -> 0-unstable-2024-07-22 --- .../by-name/ni/nightfox-gtk-theme/package.nix | 131 +++++++++++++----- 1 file changed, 96 insertions(+), 35 deletions(-) diff --git a/pkgs/by-name/ni/nightfox-gtk-theme/package.nix b/pkgs/by-name/ni/nightfox-gtk-theme/package.nix index 2ee91f9753b5..80107f2c0796 100644 --- a/pkgs/by-name/ni/nightfox-gtk-theme/package.nix +++ b/pkgs/by-name/ni/nightfox-gtk-theme/package.nix @@ -2,11 +2,15 @@ lib, stdenvNoCC, fetchFromGitHub, - gnome, sassc, gnome-themes-extra, gtk-engine-murrine, - colorVariants ? [] # default: install all icons + unstableGitUpdater, + colorVariants ? [ ], + sizeVariants ? [ ], + themeVariants ? [ ], + tweakVariants ? [ ], + iconVariants ? [ ], }: let @@ -15,45 +19,102 @@ let "dark" "light" ]; - + sizeVariantList = [ + "compact" + "standard" + ]; + themeVariantList = [ + "default" + "green" + "grey" + "orange" + "pink" + "purple" + "red" + "teal" + "yellow" + "all" + ]; + tweakVariantList = [ + "nord" + "carbon" + "black" + "float" + "outline" + "macos" + ]; + iconVariantList = [ + "Duskfox" + "Duskfox-Alt" + "Duskfox-Alt-2" + "Duskfox-Alt-3" + ]; in -lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants +lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib.checkListOfEnum + "${pname}: sizeVariants" + sizeVariantList + sizeVariants + lib.checkListOfEnum + "${pname}: themeVariants" + themeVariantList + themeVariants + lib.checkListOfEnum + "${pname}: tweakVariants" + tweakVariantList + tweakVariants + lib.checkListOfEnum + "${pname}: iconVariants" + iconVariantList + iconVariants -stdenvNoCC.mkDerivation { - inherit pname; - version = "0-unstable-2024-06-27"; + stdenvNoCC.mkDerivation + { + inherit pname; + version = "0-unstable-2024-07-22"; - src = fetchFromGitHub { - owner = "Fausto-Korpsvart"; - repo = "Nightfox-GTK-Theme"; - rev = "ef4e6e1fa3efe2a5d838d61191776abfe4d87766"; - hash = "sha256-RsDEHauz9jQs1rqsoKbL/s0Vst3GzJXyGsE3uFtLjCY="; - }; + src = fetchFromGitHub { + owner = "Fausto-Korpsvart"; + repo = "Nightfox-GTK-Theme"; + rev = "1ef2f7092526658a24312bde230a5746b49b7d95"; + hash = "sha256-Rnm0C8mmO54u5ntovIKnu2AdpdnjsQFABvlRPG5+cdo="; + }; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - nativeBuildInputs = [ gnome.gnome-shell sassc ]; - buildInputs = [ gnome-themes-extra ]; + nativeBuildInputs = [ sassc ]; + buildInputs = [ gnome-themes-extra ]; - dontBuild = true; + dontBuild = true; - postPatch = '' - patchShebangs themes/install.sh - ''; + passthru.updateScript = unstableGitUpdater { }; - installPhase = '' - runHook preInstall - mkdir -p $out/share/themes - cd themes - ./install.sh -n Nightfox -c ${lib.concatStringsSep " " (if colorVariants != [] then colorVariants else colorVariantList)} --tweaks macos -d "$out/share/themes" - runHook postInstall - ''; + postPatch = '' + patchShebangs themes/install.sh + ''; - meta = with lib; { - description = "GTK theme based on the Nightfox colour palette"; - homepage = "https://github.com/Fausto-Korpsvart/Nightfox-GTK-Theme"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ d3vil0p3r ]; - platforms = platforms.unix; - }; -} + installPhase = '' + runHook preInstall + mkdir -p $out/share/themes + cd themes + ./install.sh -n Nightfox \ + ${lib.optionalString (colorVariants != [ ]) "-c " + toString colorVariants} \ + ${lib.optionalString (sizeVariants != [ ]) "-s " + toString sizeVariants} \ + ${lib.optionalString (themeVariants != [ ]) "-t " + toString themeVariants} \ + ${lib.optionalString (tweakVariants != [ ]) "--tweaks " + toString tweakVariants} \ + -d "$out/share/themes" + cd ../icons + ${lib.optionalString (iconVariants != [ ]) '' + mkdir -p $out/share/icons + cp -a ${toString (map (v: "${v}") iconVariants)} $out/share/icons/ + ''} + runHook postInstall + ''; + + meta = { + description = "GTK theme based on the Nightfox colour palette"; + homepage = "https://github.com/Fausto-Korpsvart/Nightfox-GTK-Theme"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ d3vil0p3r ]; + }; + } From a996a246beb90099b47c579af7a596805263243a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 10:37:02 +0000 Subject: [PATCH 186/338] libretro.genesis-plus-gx: unstable-2024-08-09 -> unstable-2024-08-16 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 0231400254ca..d3faa93dd754 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -358,10 +358,10 @@ "src": { "owner": "libretro", "repo": "Genesis-Plus-GX", - "rev": "53a4af8fa4061fe7b60b9a1de5080dfa40617e57", - "hash": "sha256-Q5FtgIH0yIBUuZmPJ75k7LCon0wzlq+lzj3yo1BfCek=" + "rev": "9529e915074269cf67393fdf67166f0be9d14d97", + "hash": "sha256-wg1vmBUUrRAUCtHMD2HxjiQ5Y+PC9UMnskOVJ0Ix2QM=" }, - "version": "unstable-2024-08-09" + "version": "unstable-2024-08-16" }, "gpsp": { "fetcher": "fetchFromGitHub", From 8e14c8255e6348803495238dfd1a835b2cb0c9ab Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 18 Aug 2024 13:04:20 +0200 Subject: [PATCH 187/338] evcc: 0.129.0 -> 0.130.0 https://github.com/evcc-io/evcc/releases/tag/0.130.0 --- pkgs/servers/home-automation/evcc/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index cd44147138e4..a081451bfa32 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -1,11 +1,11 @@ { lib , stdenv -, buildGoModule +, buildGo123Module , fetchFromGitHub , fetchNpmDeps , cacert , git -, go +, go_1_23 , enumer , mockgen , nodejs @@ -14,22 +14,22 @@ , nixosTests }: -buildGoModule rec { +buildGo123Module rec { pname = "evcc"; - version = "0.129.0"; + version = "0.130.0"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; rev = version; - hash = "sha256-LoDY6mVV2iDWUo1fUPrOjTTaQudkxrBTkCeIGQWSN8M="; + hash = "sha256-+B2OQOf7BgYzJKvX9cu6SkIzfkD9z3Dk4pfVJmhTQzg="; }; - vendorHash = "sha256-AY1MXFgd6dK1w36iV0vur7ACGn5FTfPICEHXCnRfcb8="; + vendorHash = "sha256-Oj5+bmhlZHyOfcJf10EK8mvJauIWk88k0qj2NBkRvFQ="; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-XG9nefBefF2gdDWA9IYBI2dv6Lig2LqGgOnTjyni0fM="; + hash = "sha256-8DfLh6RhBI6GeTSIvmXCZ8Yudt5TYnimUoAdbOYfWfw="; }; nativeBuildInputs = [ @@ -40,7 +40,7 @@ buildGoModule rec { overrideModAttrs = _: { nativeBuildInputs = [ enumer - go + go_1_23 git cacert mockgen From 9e9bae2d0d3c64bb5d4ebc30931c9fae3559867e Mon Sep 17 00:00:00 2001 From: mesflit <84642884+mesflit@users.noreply.github.com> Date: Sun, 18 Aug 2024 12:10:15 +0300 Subject: [PATCH 188/338] unciv: 4.11.17 -> 4.13.0-patch1 --- pkgs/by-name/un/unciv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/un/unciv/package.nix b/pkgs/by-name/un/unciv/package.nix index 4944fbb65416..4b93afa1c5c7 100644 --- a/pkgs/by-name/un/unciv/package.nix +++ b/pkgs/by-name/un/unciv/package.nix @@ -20,7 +20,7 @@ let }; desktopIcon = fetchurl { - url = "https://github.com/yairm210/Unciv/blob/4.11.16/extraImages/Icons/Unciv%20icon%20v6.png?raw=true"; + url = "https://github.com/yairm210/Unciv/blob/4.13.0-patch1/extraImages/Icons/Unciv%20icon%20v6.png?raw=true"; hash = "sha256-Zuz+HGfxjGviGBKTiHdIFXF8UMRLEIfM8f+LIB/xonk="; }; @@ -33,11 +33,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "4.11.17"; + version = "4.13.0-patch1"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - hash = "sha256-qKLRn9QmB8lZv8vGGX8JS72IRLEDJV5Zj1MVsPr+iSI="; + hash = "sha256-bZXBgSjmW+fBdDfG7cqKkF4VLYw7Iq2mw5j6iDh2ZhY="; }; dontUnpack = true; From 0e45e7f3ceef91f7f38587de73bf762643f1288b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 11:32:07 +0000 Subject: [PATCH 189/338] libretro.gambatte: unstable-2024-08-09 -> unstable-2024-08-16 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 0231400254ca..eee0ccd8079c 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -348,10 +348,10 @@ "src": { "owner": "libretro", "repo": "gambatte-libretro", - "rev": "f122ffc63e3969e29b232de8700e57095c305a53", - "hash": "sha256-NqrH2ncfmPZRmldNboCDTCkznHokc6p2aKnDVmt0+Pc=" + "rev": "238a6b89461e821a4b0c0757166cec93fec0b6aa", + "hash": "sha256-VHly5E82WugUGsM7WLLtWF8vVEzU6X+g37AEx0Jlnvo=" }, - "version": "unstable-2024-08-09" + "version": "unstable-2024-08-16" }, "genesis-plus-gx": { "fetcher": "fetchFromGitHub", From c0c00e14164f85e7e8921aeef38df45c6df480f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 11:32:43 +0000 Subject: [PATCH 190/338] libretro.dosbox-pure: unstable-2024-08-10 -> unstable-2024-08-16 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 0231400254ca..b2f9e6596636 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -246,10 +246,10 @@ "src": { "owner": "schellingb", "repo": "dosbox-pure", - "rev": "16a5f9cb92653426e1586cd4b0e52663b394dbac", - "hash": "sha256-UivkKTMYETfLP9juYB42de4BxItq/fJVZvk4FrWr2Kc=" + "rev": "53dfb5b89d38c2a3315282494d614bf01006c225", + "hash": "sha256-8IgQsg3UaGOKCuDymA+cYfAK6HLwdxwkbU3pROBd82I=" }, - "version": "unstable-2024-08-10" + "version": "unstable-2024-08-16" }, "easyrpg": { "fetcher": "fetchFromGitHub", From c2d5ecc50497601e1e16eb3bf75f01d243af4f86 Mon Sep 17 00:00:00 2001 From: Sandro Date: Sun, 18 Aug 2024 13:47:01 +0200 Subject: [PATCH 191/338] nixos/displayManager: mention how to get a list of currently available desktop sessions (#335208) --- nixos/modules/services/display-managers/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/display-managers/default.nix b/nixos/modules/services/display-managers/default.nix index 894370199e79..81919923ded8 100644 --- a/nixos/modules/services/display-managers/default.nix +++ b/nixos/modules/services/display-managers/default.nix @@ -125,6 +125,8 @@ in Graphical session to pre-select in the session chooser (only effective for GDM, LightDM and SDDM). On GDM, LightDM and SDDM, it will also be used as a session for auto-login. + + Set this option to empty string to get an error with a list of currently available sessions. ''; }; From 65ea17f1a817629a1dbf3fb4167321c621bbe8d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 11:49:44 +0000 Subject: [PATCH 192/338] werf: 2.10.1 -> 2.10.3 --- pkgs/by-name/we/werf/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/we/werf/package.nix b/pkgs/by-name/we/werf/package.nix index 143489f74a88..8ecaf0bd9891 100644 --- a/pkgs/by-name/we/werf/package.nix +++ b/pkgs/by-name/we/werf/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "werf"; - version = "2.10.1"; + version = "2.10.3"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-oDtGuMUQ5Lfi2ap8G8ei1ZQyHA3oC+gTJvYlTrATEIY="; + hash = "sha256-/rgM6QQAQDkxYCOuRT3lbB/ojNGZnergCB5C+7Rn8SY="; }; - vendorHash = "sha256-HcxFqTzCkFv3Res3d7iPV3fkgshvuxOB0KNbHMjl6rQ="; + vendorHash = "sha256-OR2nIR2q3iRfaSQSQRKn+jbygETx2+WmkOIjOCIB9O8="; proxyVendor = true; From cc3dba1134fe83023ce99ca3a2e2ced75b194c25 Mon Sep 17 00:00:00 2001 From: a-kenji Date: Sun, 18 Aug 2024 13:56:56 +0200 Subject: [PATCH 193/338] gh-dash: 4.5.2 -> 4.5.4 --- pkgs/by-name/gh/gh-dash/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gh/gh-dash/package.nix b/pkgs/by-name/gh/gh-dash/package.nix index 178573509c40..c9043495bc4c 100644 --- a/pkgs/by-name/gh/gh-dash/package.nix +++ b/pkgs/by-name/gh/gh-dash/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gh-dash"; - version = "4.5.2"; + version = "4.5.4"; src = fetchFromGitHub { owner = "dlvhdr"; repo = "gh-dash"; rev = "v${version}"; - hash = "sha256-lOJN4wSxE3VX/Pb8Aa+ex6hkiPieFelmtn84+SmzOxE="; + hash = "sha256-RGl947fWoifw6+YHykL/k7uie5WqZqEAKWK7NZT+Upo="; }; - vendorHash = "sha256-JOd2czYWVgE1jBfeuoVRp+oE/asyk50o5Pf021jD5mY="; + vendorHash = "sha256-zrHDxMqIzMQ2En8/sZ0BZjKM8JZrDjrRq9eWisSY3N0="; ldflags = [ "-s" From 303f998cbb4c531fe16def584811554504d4ebaa Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Tue, 13 Aug 2024 21:55:06 +0200 Subject: [PATCH 194/338] tarsnapper: drop nose dependency --- pkgs/tools/backup/tarsnapper/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/backup/tarsnapper/default.nix b/pkgs/tools/backup/tarsnapper/default.nix index 58ab9640f5e6..204c1ffd7b47 100644 --- a/pkgs/tools/backup/tarsnapper/default.nix +++ b/pkgs/tools/backup/tarsnapper/default.nix @@ -23,6 +23,11 @@ python3Packages.buildPythonApplication rec { url = "https://github.com/miracle2k/tarsnapper/commit/2ee33ce748b9bb42d559cc2c0104115732cb4150.patch"; hash = "sha256-fEXGhzlfB+J5lw1pcsC5Ne7I8UMnDzwyyCx/zm15+fU="; }) + # Migrate to pytest, see: https://github.com/miracle2k/tarsnapper/pull/73 + (fetchpatch { + url = "https://github.com/miracle2k/tarsnapper/commit/eace01f3085fba8a6421d4f19110b814511e5170.patch?full_index=1"; + hash = "sha256-2YPb7iaAusT1DkISfOWs72jr/GBY/qG5qFyRlnVt0IY="; + }) ]; nativeBuildInputs = with python3Packages; [ @@ -35,10 +40,8 @@ python3Packages.buildPythonApplication rec { pexpect ]; - doCheck = python3Packages.pythonOlder "3.12"; - nativeCheckInputs = with python3Packages; [ - nose + pytestCheckHook ]; # Remove standard module argparse from requirements @@ -46,12 +49,6 @@ python3Packages.buildPythonApplication rec { makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ tarsnap ]}" ]; - checkPhase = '' - runHook preCheck - nosetests tests - runHook postCheck - ''; - pythonImportsCheck = [ "tarsnapper" ]; meta = with lib; { From d45aacd26b0cd8f2f6a06c9456f8b7175b45602d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 18 Aug 2024 15:16:03 +0200 Subject: [PATCH 195/338] Revert "erofs-utils: nixfmt" This reverts commit 4e1098967342a910900fa841f3a6ebc25c6ced7b. --- .../tools/filesystems/erofs-utils/default.nix | 51 +++++-------------- 1 file changed, 13 insertions(+), 38 deletions(-) diff --git a/pkgs/tools/filesystems/erofs-utils/default.nix b/pkgs/tools/filesystems/erofs-utils/default.nix index 3946523ccb10..9c9aa2d993f2 100644 --- a/pkgs/tools/filesystems/erofs-utils/default.nix +++ b/pkgs/tools/filesystems/erofs-utils/default.nix @@ -1,50 +1,29 @@ -{ - lib, - stdenv, - fetchurl, - autoreconfHook, - pkg-config, - fuse, - util-linux, - lz4, - xz, - zlib, - libselinux, - fuseSupport ? stdenv.isLinux, - selinuxSupport ? false, - lzmaSupport ? false, +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fuse, util-linux, lz4, xz, zlib, libselinux +, fuseSupport ? stdenv.isLinux +, selinuxSupport ? false +, lzmaSupport ? false }: stdenv.mkDerivation (finalAttrs: { pname = "erofs-utils"; version = "1.8.1"; - outputs = [ - "out" - "man" - ]; + outputs = [ "out" "man" ]; src = fetchurl { - url = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-${finalAttrs.version}.tar.gz"; + url = + "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-${finalAttrs.version}.tar.gz"; hash = "sha256-Xb97SS92gkYrl6dxIdQ8p2Cc2Q5l+MlpMa78ggpvDaM="; }; - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - buildInputs = - [ - util-linux - lz4 - zlib - ] + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ util-linux lz4 zlib ] ++ lib.optionals fuseSupport [ fuse ] ++ lib.optionals selinuxSupport [ libselinux ] ++ lib.optionals lzmaSupport [ xz ]; - configureFlags = - [ "MAX_BLOCK_SIZE=4096" ] - ++ lib.optional fuseSupport "--enable-fuse" + configureFlags = [ + "MAX_BLOCK_SIZE=4096" + ] ++ lib.optional fuseSupport "--enable-fuse" ++ lib.optional selinuxSupport "--with-selinux" ++ lib.optional lzmaSupport "--enable-lzma"; @@ -53,11 +32,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Userspace utilities for linux-erofs file system"; changelog = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/tree/ChangeLog?h=v${version}"; license = with licenses; [ gpl2Plus ]; - maintainers = with maintainers; [ - ehmry - nikstur - jmbaur - ]; + maintainers = with maintainers; [ ehmry nikstur jmbaur ]; platforms = platforms.unix; }; }) From 52ee4c79f6f502c1a4e90e910819da83340f2818 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 18 Aug 2024 15:16:03 +0200 Subject: [PATCH 196/338] Revert "erofs-utils: add jmbaur as maintainer" This reverts commit 3dd73bf8022999ae50df46cf2af9973d3bdec0cf. --- pkgs/tools/filesystems/erofs-utils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/erofs-utils/default.nix b/pkgs/tools/filesystems/erofs-utils/default.nix index 9c9aa2d993f2..5bfd77cb56ab 100644 --- a/pkgs/tools/filesystems/erofs-utils/default.nix +++ b/pkgs/tools/filesystems/erofs-utils/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Userspace utilities for linux-erofs file system"; changelog = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/tree/ChangeLog?h=v${version}"; license = with licenses; [ gpl2Plus ]; - maintainers = with maintainers; [ ehmry nikstur jmbaur ]; + maintainers = with maintainers; [ ehmry nikstur ]; platforms = platforms.unix; }; }) From 13c304eb480a7f3492ab9dc056ed5a90fad45f53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 18 Aug 2024 15:16:03 +0200 Subject: [PATCH 197/338] Revert "erofs-utils: 1.7.1 -> 1.8.1" This reverts commit ebdc6c7e130128fbd6f038786540e3ac4dcec6a8. --- pkgs/tools/filesystems/erofs-utils/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/filesystems/erofs-utils/default.nix b/pkgs/tools/filesystems/erofs-utils/default.nix index 5bfd77cb56ab..5346403fa0e0 100644 --- a/pkgs/tools/filesystems/erofs-utils/default.nix +++ b/pkgs/tools/filesystems/erofs-utils/default.nix @@ -4,15 +4,15 @@ , lzmaSupport ? false }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation rec { pname = "erofs-utils"; - version = "1.8.1"; + version = "1.7.1"; outputs = [ "out" "man" ]; src = fetchurl { url = - "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-${finalAttrs.version}.tar.gz"; - hash = "sha256-Xb97SS92gkYrl6dxIdQ8p2Cc2Q5l+MlpMa78ggpvDaM="; + "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-${version}.tar.gz"; + hash = "sha256-GWCD1j5eIx+1eZ586GqUS7ylZNqrzj3pIlqKyp3K/xU="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -35,4 +35,4 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ ehmry nikstur ]; platforms = platforms.unix; }; -}) +} From 67c8ac6bc60833e20d780aade4305bc3af81cd60 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 09:50:26 -0700 Subject: [PATCH 198/338] gpodder: remove with statements --- pkgs/applications/audio/gpodder/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 61e33cae9026..4ddbf4b6ef61 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -27,7 +27,7 @@ python311Packages.buildPythonApplication rec { ./disable-autoupdate.patch ]; - postPatch = with lib; '' + postPatch = '' sed -i -re 's,^( *gpodder_dir *= *).*,\1"'"$out"'",' bin/gpodder ''; From 9c61e1077606f384e8af13b6e80a5e692f6d426d Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 09:55:09 -0700 Subject: [PATCH 199/338] ly: remove with statements --- pkgs/applications/display-managers/ly/deps.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/display-managers/ly/deps.nix b/pkgs/applications/display-managers/ly/deps.nix index 0269a8e8190a..c1f733aebc99 100644 --- a/pkgs/applications/display-managers/ly/deps.nix +++ b/pkgs/applications/display-managers/ly/deps.nix @@ -10,8 +10,6 @@ name ? "zig-packages", }: -with lib; - let unpackZigArtifact = { name, artifact }: @@ -39,9 +37,9 @@ let hash, }: let - parts = splitString "#" url; - base = elemAt parts 0; - rev = elemAt parts 1; + parts = lib.splitString "#" url; + base = lib.elemAt parts 0; + rev = lib.elemAt parts 1; in fetchgit { inherit name rev hash; @@ -56,9 +54,9 @@ let hash, }: let - parts = splitString "://" url; - proto = elemAt parts 0; - path = elemAt parts 1; + parts = lib.splitString "://" url; + proto = lib.elemAt parts 0; + path = lib.elemAt parts 1; fetcher = { "git+http" = fetchGitZig { inherit name hash; From 44f5fc12643103991b4348cd25eea4f231ecfa07 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 10:06:15 -0700 Subject: [PATCH 200/338] eclipse: remove with statements --- pkgs/applications/editors/eclipse/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index c7b8b3dc0f5c..9c1963554c3f 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -210,9 +210,7 @@ in rec { # Gather up the desired plugins. pluginEnv = buildEnv { name = "eclipse-plugins"; - paths = - with lib; - filter (x: x ? isEclipsePlugin) (closePropagation plugins); + paths = lib.filter (x: x ? isEclipsePlugin) (lib.closePropagation plugins); }; # Prepare the JVM arguments to add to the ini file. We here also From f88f22d6b2e2dc703615ca7cb93ae5971361aeae Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 10:07:42 -0700 Subject: [PATCH 201/338] jupyter-kernels: remove with statements --- pkgs/applications/editors/jupyter/kernel.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/jupyter/kernel.nix b/pkgs/applications/editors/jupyter/kernel.nix index 3640de28e8ac..b036c7274d51 100644 --- a/pkgs/applications/editors/jupyter/kernel.nix +++ b/pkgs/applications/editors/jupyter/kernel.nix @@ -26,7 +26,7 @@ in # Definitions is an attribute set. - create = { definitions ? default }: with lib; stdenv.mkDerivation { + create = { definitions ? default }: stdenv.mkDerivation { name = "jupyter-kernels"; @@ -37,14 +37,14 @@ in installPhase = '' mkdir kernels - ${concatStringsSep "\n" (mapAttrsToList (kernelName: unfilteredKernel: + ${lib.concatStringsSep "\n" (lib.mapAttrsToList (kernelName: unfilteredKernel: let allowedKernelKeys = ["argv" "displayName" "language" "interruptMode" "env" "metadata" "logo32" "logo64" "extraPaths"]; - kernel = filterAttrs (n: v: (any (x: x == n) allowedKernelKeys)) unfilteredKernel; + kernel = lib.filterAttrs (n: v: (lib.any (x: x == n) allowedKernelKeys)) unfilteredKernel; config = builtins.toJSON ( kernel // {display_name = if (kernel.displayName != "") then kernel.displayName else kernelName;} - // (optionalAttrs (kernel ? interruptMode) { interrupt_mode = kernel.interruptMode; }) + // (lib.optionalAttrs (kernel ? interruptMode) { interrupt_mode = kernel.interruptMode; }) ); extraPaths = kernel.extraPaths or {} // lib.optionalAttrs (kernel.logo32 != null) { "logo-32x32.png" = kernel.logo32; } @@ -64,7 +64,7 @@ in meta = { description = "Wrapper to create jupyter notebook kernel definitions"; homepage = "https://jupyter.org/"; - maintainers = with maintainers; [ aborsu ]; + maintainers = with lib.maintainers; [ aborsu ]; }; }; } From 729237c1631481746ff4d3578dc2c963e50c3da1 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 10:07:47 -0700 Subject: [PATCH 202/338] kakounePlugins: remove with statements As I'm the maintainer, I also removed `with overridden`. --- .../editors/kakoune/plugins/aliases.nix | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/editors/kakoune/plugins/aliases.nix b/pkgs/applications/editors/kakoune/plugins/aliases.nix index 1d516f9b436f..392ee835d339 100644 --- a/pkgs/applications/editors/kakoune/plugins/aliases.nix +++ b/pkgs/applications/editors/kakoune/plugins/aliases.nix @@ -2,21 +2,19 @@ lib: overridden: -with overridden; - let # Removing recurseForDerivation prevents derivations of aliased attribute # set to appear while listing all the packages available. - removeRecurseForDerivations = alias: with lib; + removeRecurseForDerivations = alias: if alias.recurseForDerivations or false then - removeAttrs alias ["recurseForDerivations"] + lib.removeAttrs alias ["recurseForDerivations"] else alias; # Disabling distribution prevents top-level aliases for non-recursed package # sets from building on Hydra. - removeDistribute = alias: with lib; - if isDerivation alias then - dontDistribute alias + removeDistribute = alias: + if lib.isDerivation alias then + lib.dontDistribute alias else alias; # Make sure that we are not shadowing something from @@ -37,11 +35,11 @@ let in mapAliases ({ - kak-auto-pairs = auto-pairs-kak; # backwards compat, added 2021-01-04 - kak-buffers = kakoune-buffers; # backwards compat, added 2021-01-04 - kak-byline = byline-kak; # backwards compat, added 2023-10-22 - kak-fzf = fzf-kak; # backwards compat, added 2021-01-04 - kak-powerline = powerline-kak; # backwards compat, added 2021-01-04 - kak-prelude = prelude-kak; # backwards compat, added 2021-01-04 - kak-vertical-selection = kakoune-vertical-selection; # backwards compat, added 2021-01-04 + kak-auto-pairs = overridden.auto-pairs-kak; # backwards compat, added 2021-01-04 + kak-buffers = overridden.kakoune-buffers; # backwards compat, added 2021-01-04 + kak-byline = overridden.byline-kak; # backwards compat, added 2023-10-22 + kak-fzf = overridden.fzf-kak; # backwards compat, added 2021-01-04 + kak-powerline = overridden.powerline-kak; # backwards compat, added 2021-01-04 + kak-prelude = overridden.prelude-kak; # backwards compat, added 2021-01-04 + kak-vertical-selection = overridden.kakoune-vertical-selection; # backwards compat, added 2021-01-04 } // deprecations) From 167cc0bef41a4536a444c6de4078bdea6bed27bf Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 10:10:59 -0700 Subject: [PATCH 203/338] rstudio: remove with statements --- pkgs/applications/editors/rstudio/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 0521d3dce56a..4d606904e2f6 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -158,13 +158,13 @@ in --replace-fail '@quarto@' ${quarto} ''; - hunspellDictionaries = with lib; filter isDerivation (unique (attrValues hunspellDicts)); + hunspellDictionaries = lib.filter lib.isDerivation (lib.unique (lib.attrValues hunspellDicts)); # These dicts contain identically-named dict files, so we only keep the # -large versions in case of clashes - largeDicts = with lib; filter (d: hasInfix "-large-wordlist" d.name) hunspellDictionaries; - otherDicts = with lib; filter - (d: !(hasAttr "dictFileName" d && - elem d.dictFileName (map (d: d.dictFileName) largeDicts))) + largeDicts = lib.filter (d: lib.hasInfix "-large-wordlist" d.name) hunspellDictionaries; + otherDicts = lib.filter + (d: !(lib.hasAttr "dictFileName" d && + lib.elem d.dictFileName (map (d: d.dictFileName) largeDicts))) hunspellDictionaries; dictionaries = largeDicts ++ otherDicts; From 549dbd2a6b1e04dd59c70e4765fc6eecd516ab7f Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 10:12:13 -0700 Subject: [PATCH 204/338] vimPlugins: remove with statements in aliases --- pkgs/applications/editors/vim/plugins/aliases.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/aliases.nix b/pkgs/applications/editors/vim/plugins/aliases.nix index ff504416489e..e447c41a4666 100644 --- a/pkgs/applications/editors/vim/plugins/aliases.nix +++ b/pkgs/applications/editors/vim/plugins/aliases.nix @@ -6,16 +6,16 @@ final: prev: let # Removing recurseForDerivation prevents derivations of aliased attribute # set to appear while listing all the packages available. - removeRecurseForDerivations = alias: with lib; + removeRecurseForDerivations = alias: if alias.recurseForDerivations or false then - removeAttrs alias ["recurseForDerivations"] + lib.removeAttrs alias ["recurseForDerivations"] else alias; # Disabling distribution prevents top-level aliases for non-recursed package # sets from building on Hydra. - removeDistribute = alias: with lib; - if isDerivation alias then - dontDistribute alias + removeDistribute = alias: + if lib.isDerivation alias then + lib.dontDistribute alias else alias; # Make sure that we are not shadowing something from From c61702920fa9ebf257b0320b3f0d42b4ddf6d5f0 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 10:13:59 -0700 Subject: [PATCH 205/338] brscan4: remove with statements --- .../graphics/sane/backends/brscan4/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/applications/graphics/sane/backends/brscan4/default.nix index c15b3033a265..ece80ef18a5b 100644 --- a/pkgs/applications/graphics/sane/backends/brscan4/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan4/default.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, libusb-compat-0_1 }: let - myPatchElf = file: with lib; '' + myPatchElf = file: '' patchelf --set-interpreter \ - ${stdenv.cc.libc}/lib/ld-linux${optionalString stdenv.is64bit "-x86-64"}.so.2 \ + ${stdenv.cc.libc}/lib/ld-linux${lib.optionalString stdenv.is64bit "-x86-64"}.so.2 \ ${file} ''; @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { done ''; - installPhase = with lib; '' + installPhase = '' runHook preInstall PATH_TO_BRSCAN4="opt/brother/scanner/brscan4" mkdir -p $out/$PATH_TO_BRSCAN4 cp -rp $PATH_TO_BRSCAN4/* $out/$PATH_TO_BRSCAN4 mkdir -p $out/lib/sane - cp -rp usr/lib${optionalString stdenv.is64bit "64"}/sane/* $out/lib/sane + cp -rp usr/lib${lib.optionalString stdenv.is64bit "64"}/sane/* $out/lib/sane # Symbolic links were absolute. Fix them so that they point to $out. pushd "$out/lib/sane" > /dev/null From fe193f426266640805f4c73357c8f55b1a139b8e Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 10:18:08 -0700 Subject: [PATCH 206/338] brscan5: remove with statements --- .../applications/graphics/sane/backends/brscan5/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/sane/backends/brscan5/default.nix b/pkgs/applications/graphics/sane/backends/brscan5/default.nix index 9749ae5b658f..b816eb71d27c 100644 --- a/pkgs/applications/graphics/sane/backends/brscan5/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan5/default.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchurl, patchelf, makeWrapper, libusb1, avahi-compat, glib, libredirect, nixosTests }: let - myPatchElf = file: with lib; '' + myPatchElf = file: '' patchelf --set-interpreter \ - ${stdenv.cc.libc}/lib/ld-linux${optionalString stdenv.is64bit "-x86-64"}.so.2 \ + ${stdenv.cc.libc}/lib/ld-linux${lib.optionalString stdenv.is64bit "-x86-64"}.so.2 \ ${file} ''; system = stdenv.hostPlatform.system; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { printf '/etc/opt/brother/scanner/models\x00' | dd of=opt/brother/scanner/brscan5/libsane-brother5.so.1.0.7 bs=1 seek=${toString patchOffsetBytes} conv=notrunc ''; - installPhase = with lib; '' + installPhase = '' runHook preInstall PATH_TO_BRSCAN5="opt/brother/scanner/brscan5" mkdir -p $out/$PATH_TO_BRSCAN5 From a50bd73adf12a56eaff79a7f0a18586a1661afe6 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 10:18:13 -0700 Subject: [PATCH 207/338] apeClex: remove with statements --- pkgs/applications/misc/ape/apeclex.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/ape/apeclex.nix b/pkgs/applications/misc/ape/apeclex.nix index 81096d9877f7..7f0523270f28 100644 --- a/pkgs/applications/misc/ape/apeclex.nix +++ b/pkgs/applications/misc/ape/apeclex.nix @@ -4,5 +4,5 @@ callPackage ./. { pname = "ape-clex"; lexiconPath = "${attemptoClex}/clex_lexicon.pl"; description = "Parser for Attempto Controlled English (ACE) with a large lexicon (~100,000 entries)"; - license = with lib; [ licenses.lgpl3 licenses.gpl3 ]; + license = with lib.licenses; [ lgpl3 gpl3 ]; } From dc3c6727ed2b278a87dbb095a257215135dbfe06 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 10:20:05 -0700 Subject: [PATCH 208/338] ape: remove with statements --- pkgs/applications/misc/ape/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/ape/default.nix b/pkgs/applications/misc/ape/default.nix index e50d766a88b2..30911d6380fe 100644 --- a/pkgs/applications/misc/ape/default.nix +++ b/pkgs/applications/misc/ape/default.nix @@ -3,7 +3,7 @@ lexiconPath ? "prolog/lexicon/clex_lexicon.pl", pname ? "ape", description ? "Parser for Attempto Controlled English (ACE)", - license ? with lib; licenses.lgpl3 + license ? lib.licenses.lgpl3 }: stdenv.mkDerivation rec { From 36a37349fb570e096a30012575f4e1b78fc5f19c Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 10:20:10 -0700 Subject: [PATCH 209/338] bemenu: remove with statements --- pkgs/applications/misc/bemenu/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix index 1ddf73deb98f..7c4cd0f93542 100644 --- a/pkgs/applications/misc/bemenu/default.nix +++ b/pkgs/applications/misc/bemenu/default.nix @@ -20,15 +20,15 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config scdoc ] ++ lib.optionals waylandSupport [ wayland-scanner ]; - buildInputs = with lib; [ + buildInputs = [ cairo fribidi harfbuzz libxkbcommon pango - ] ++ optional ncursesSupport ncurses - ++ optionals waylandSupport [ wayland wayland-protocols ] - ++ optionals x11Support [ + ] ++ lib.optional ncursesSupport ncurses + ++ lib.optionals waylandSupport [ wayland wayland-protocols ] + ++ lib.optionals x11Support [ xorg.libX11 xorg.libXinerama xorg.libXft xorg.libXdmcp xorg.libpthreadstubs xorg.libxcb ]; From ae33a527a513f862161c28ed5f102d8b197e8506 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 10:20:13 -0700 Subject: [PATCH 210/338] clightd: remove with statements --- pkgs/applications/misc/clight/clightd.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/clight/clightd.nix b/pkgs/applications/misc/clight/clightd.nix index b6958d86bbd0..4d7ba199472f 100644 --- a/pkgs/applications/misc/clight/clightd.nix +++ b/pkgs/applications/misc/clight/clightd.nix @@ -29,16 +29,16 @@ stdenv.mkDerivation rec { sed -i "s@pkg_get_variable(POLKIT_ACTION_DIR.*@set(POLKIT_ACTION_DIR $POLKIT_ACTION_DIR)@" CMakeLists.txt ''; - cmakeFlags = with lib; + cmakeFlags = [ "-DSYSTEMD_SERVICE_DIR=${placeholder "out"}/lib/systemd/system" "-DDBUS_CONFIG_DIR=${placeholder "out"}/etc/dbus-1/system.d" # systemd.pc has prefix=${systemd.out} "-DMODULE_LOAD_DIR=${placeholder "out"}/lib/modules-load.d" - ] ++ optional enableDdc "-DENABLE_DDC=1" - ++ optional enableDpms "-DENABLE_DPMS=1" - ++ optional enableGamma "-DENABLE_GAMMA=1" - ++ optional enableScreen "-DENABLE_SCREEN=1" - ++ optional enableYoctolight "-DENABLE_YOCTOLIGHT=1"; + ] ++ lib.optional enableDdc "-DENABLE_DDC=1" + ++ lib.optional enableDpms "-DENABLE_DPMS=1" + ++ lib.optional enableGamma "-DENABLE_GAMMA=1" + ++ lib.optional enableScreen "-DENABLE_SCREEN=1" + ++ lib.optional enableYoctolight "-DENABLE_YOCTOLIGHT=1"; nativeBuildInputs = [ dbus @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { pkg-config ]; - buildInputs = with lib; [ + buildInputs = [ glib udev polkit @@ -58,10 +58,10 @@ stdenv.mkDerivation rec { libXdmcp util-linux libpthreadstubs - ] ++ optionals enableDdc [ ddcutil ] - ++ optionals enableDpms [ libXext ] - ++ optionals enableGamma [ libXrandr ] - ++ optionals (enableDpms || enableGamma || enableScreen) [ libdrm wayland ]; + ] ++ lib.optionals enableDdc [ ddcutil ] + ++ lib.optionals enableDpms [ libXext ] + ++ lib.optionals enableGamma [ libXrandr ] + ++ lib.optionals (enableDpms || enableGamma || enableScreen) [ libdrm wayland ]; postInstall = '' mkdir -p $out/bin From 7dbea2568fb7385b0ffb6d11827d6244cc188656 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 10:20:15 -0700 Subject: [PATCH 211/338] clight: remove with statements --- pkgs/applications/misc/clight/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/clight/default.nix b/pkgs/applications/misc/clight/default.nix index 882c29f4b36e..3f3ea2416d89 100644 --- a/pkgs/applications/misc/clight/default.nix +++ b/pkgs/applications/misc/clight/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { bash-completion ]; - buildInputs = with lib; [ + buildInputs = [ gsl popt upower @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { geoclue2 libconfig libmodule - ] ++ optional withGeoclue geoclue2 - ++ optional withUpower upower; + ] ++ lib.optional withGeoclue geoclue2 + ++ lib.optional withUpower upower; cmakeFlags = [ "-DSESSION_BUS_DIR=${placeholder "out"}/share/dbus-1/services" From b4eeedc00b523a5ba0f3d62be2c9895f46b7ff01 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 10:20:17 -0700 Subject: [PATCH 212/338] digitalbitbox: remove with statements --- pkgs/applications/misc/digitalbitbox/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix index 418c4996eb3b..93802ee8682c 100644 --- a/pkgs/applications/misc/digitalbitbox/default.nix +++ b/pkgs/applications/misc/digitalbitbox/default.nix @@ -58,7 +58,7 @@ in mkDerivation rec { sha256 = "ig3+TdYv277D9GVnkRSX6nc6D6qruUOw/IQdQCK6FoA="; }; - nativeBuildInputs = with lib; [ + nativeBuildInputs = [ autoreconfHook curl git From 6ecdcc651c4fdefd7f7778d4583859191ef87628 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 10:20:19 -0700 Subject: [PATCH 213/338] goldendict: remove with statements --- pkgs/applications/misc/goldendict/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix index 328f1f734320..6b1865509b72 100644 --- a/pkgs/applications/misc/goldendict/default.nix +++ b/pkgs/applications/misc/goldendict/default.nix @@ -44,15 +44,15 @@ stdenv.mkDerivation rec { ++ lib.optionals withFFmpeg [ libao ffmpeg ] ++ lib.optional withZim zstd; - qmakeFlags = with lib; [ + qmakeFlags = [ "goldendict.pro" - (optional withCC "CONFIG+=chinese_conversion_support") - (optional (!withCC) "CONFIG+=no_chinese_conversion_support") - (optional (!withEpwing) "CONFIG+=no_epwing_support") - (optional (!withExtraTiff) "CONFIG+=no_extra_tiff_handler") - (optional (!withFFmpeg) "CONFIG+=no_ffmpeg_player") - (optional (!withMultimedia)"CONFIG+=no_qtmultimedia_player") - (optional withZim "CONFIG+=zim_support") + (lib.optional withCC "CONFIG+=chinese_conversion_support") + (lib.optional (!withCC) "CONFIG+=no_chinese_conversion_support") + (lib.optional (!withEpwing) "CONFIG+=no_epwing_support") + (lib.optional (!withExtraTiff) "CONFIG+=no_extra_tiff_handler") + (lib.optional (!withFFmpeg) "CONFIG+=no_ffmpeg_player") + (lib.optional (!withMultimedia)"CONFIG+=no_qtmultimedia_player") + (lib.optional withZim "CONFIG+=zim_support") ]; postInstall = lib.optionalString stdenv.isDarwin '' From 141978912008dabb4d7a53a67361d12766210890 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 10:20:37 -0700 Subject: [PATCH 214/338] sweethome3d: remove with statements --- pkgs/applications/misc/sweethome3d/editors.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix index a426494b61f6..9d37423f568d 100644 --- a/pkgs/applications/misc/sweethome3d/editors.nix +++ b/pkgs/applications/misc/sweethome3d/editors.nix @@ -14,10 +14,7 @@ let - sweetExec = with lib; - m: "sweethome3d-" - + removeSuffix "libraryeditor" (toLower m) - + "-editor"; + sweetExec = m: "sweethome3d-" + lib.removeSuffix "libraryeditor" (lib.toLower m) + "-editor"; mkEditorProject = { pname, module, version, src, license, description, desktopName }: From 929615b55cecd4475ee12851f53faf6b896aaca9 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 10:22:22 -0700 Subject: [PATCH 215/338] workrave: remove with statements --- pkgs/applications/misc/workrave/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix index 1235b22b8aba..a0521d443937 100644 --- a/pkgs/applications/misc/workrave/default.nix +++ b/pkgs/applications/misc/workrave/default.nix @@ -40,8 +40,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { repo = "workrave"; owner = "rcaelers"; - rev = with lib; - "v" + concatStringsSep "_" (splitVersion version); + rev = "v" + lib.concatStringsSep "_" (lib.splitVersion version); sha256 = "sha256-U39zr8XGIDbyY480bla2yTaRQLP3wMrL8RLWjlTa5uY="; }; From b70b0ceb8ce816ece361a72f3c794a2b685420c6 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 10:22:26 -0700 Subject: [PATCH 216/338] brig: remove with statements --- pkgs/applications/networking/brig/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/brig/default.nix b/pkgs/applications/networking/brig/default.nix index e7204a68d14c..b20543c0c58a 100644 --- a/pkgs/applications/networking/brig/default.nix +++ b/pkgs/applications/networking/brig/default.nix @@ -21,16 +21,16 @@ buildGoModule rec { subPackages = [ "." ]; - ldflags = [ "-s" "-w" ] ++ (with lib; - mapAttrsToList (n: v: "-X github.com/sahib/brig/version.${n}=${v}") - (with versions; { - Major = major version; - Minor = minor version; - Patch = patch version; + ldflags = [ "-s" "-w" ] ++ + lib.mapAttrsToList (n: v: "-X github.com/sahib/brig/version.${n}=${v}") + { + Major = lib.versions.major version; + Minor = lib.versions.minor version; + Patch = lib.versions.patch version; ReleaseType = ""; BuildTime = "1970-01-01T00:00:00+0000"; GitRev = src.rev; - })); + }; postInstall = '' installShellCompletion --cmd brig \ From 642bfd678c06947fae185607c544f4bdb6bc6da5 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 10:22:28 -0700 Subject: [PATCH 217/338] chromium: remove with statements --- pkgs/applications/networking/browsers/chromium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 09b575811b83..bebb279f1a66 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -117,12 +117,12 @@ in stdenv.mkDerivation { browserBinary = "${chromiumWV}/libexec/chromium/chromium"; libPath = lib.makeLibraryPath [ libva pipewire wayland gtk3 gtk4 libkrb5 ]; - in with lib; '' + in '' mkdir -p "$out/bin" makeWrapper "${browserBinary}" "$out/bin/chromium" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ - --add-flags ${escapeShellArg commandLineArgs} + --add-flags ${lib.escapeShellArg commandLineArgs} ed -v -s "$out/bin/chromium" << EOF 2i From bc794b796b56ff2441e1fc873d905f3a0833ac94 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 10:23:21 -0700 Subject: [PATCH 218/338] links2: remove with statements --- pkgs/applications/networking/browsers/links2/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index cbf4f538c428..9fe4fe7e37f2 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-IqqWwLOOGm+PftnXpBZ6R/w3JGCXdZ72BZ7Pj56teZg="; }; - buildInputs = with lib; + buildInputs = [ libev librsvg libpng libjpeg libtiff libavif openssl xz bzip2 zlib ] - ++ optionals stdenv.isLinux [ gpm ] - ++ optionals enableX11 [ libX11 libXau libXt ] - ++ optionals enableDirectFB [ directfb ]; + ++ lib.optionals stdenv.isLinux [ gpm ] + ++ lib.optionals enableX11 [ libX11 libXau libXt ] + ++ lib.optionals enableDirectFB [ directfb ]; nativeBuildInputs = [ pkg-config bzip2 ]; From 19b0d701817bf344e18774cf299b3acd41e2710a Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 10:23:24 -0700 Subject: [PATCH 219/338] weechat: remove with statements --- .../networking/irc/weechat/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index f398b4a6b035..2d963bce3289 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -51,30 +51,28 @@ let outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; - cmakeFlags = with lib; [ + cmakeFlags = [ "-DENABLE_MAN=ON" "-DENABLE_DOC=ON" "-DENABLE_DOC_INCOMPLETE=ON" "-DENABLE_TESTS=${if enableTests then "ON" else "OFF"}" ] - ++ optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib"] + ++ lib.optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib"] ++ map (p: "-D${p.cmakeFlag}=" + (if p.enabled then "ON" else "OFF")) plugins ; nativeBuildInputs = [ cmake pkg-config asciidoctor ] ++ lib.optional enableTests cpputest; - buildInputs = with lib; [ - ncurses openssl aspell cjson gnutls gettext zlib curl - libgcrypt ] - ++ optionals stdenv.isDarwin [ libobjc libresolv ] - ++ concatMap (p: p.buildInputs) enabledPlugins + buildInputs = [ ncurses openssl aspell cjson gnutls gettext zlib curl libgcrypt ] + ++ lib.optionals stdenv.isDarwin [ libobjc libresolv ] + ++ lib.concatMap (p: p.buildInputs) enabledPlugins ++ extraBuildInputs; env.NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}" # Fix '_res_9_init: undefined symbol' error + (lib.optionalString stdenv.isDarwin "-DBIND_8_COMPAT=1 -lresolv"); - postInstall = with lib; '' - for p in ${concatMapStringsSep " " (p: p.name) enabledPlugins}; do + postInstall = '' + for p in ${lib.concatMapStringsSep " " (p: p.name) enabledPlugins}; do from=$out/lib/weechat/plugins/$p.so to=''${!p}/lib/weechat/plugins/$p.so mkdir -p $(dirname $to) From 926b6220cd423f600dcd3bc03dffd07d0fc49b79 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 10:23:27 -0700 Subject: [PATCH 220/338] ngadmin: remove with statements --- pkgs/applications/networking/ngadmin/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/ngadmin/default.nix b/pkgs/applications/networking/ngadmin/default.nix index f63fbfcf9503..fb36a0367c59 100644 --- a/pkgs/applications/networking/ngadmin/default.nix +++ b/pkgs/applications/networking/ngadmin/default.nix @@ -19,10 +19,10 @@ stdenv.mkDerivation { [ autoreconfHook ] ++ lib.optional withReadline readline; enableParallelBuilding = true; - configureFlags = with lib; - optional (!withReadline) "--without-readline" - ++ optional enableEmu "--enable-emu" - ++ optional enableSpy "--enable-spy"; + configureFlags = + lib.optional (!withReadline) "--without-readline" + ++ lib.optional enableEmu "--enable-emu" + ++ lib.optional enableSpy "--enable-spy"; meta = with lib; { description = "Netgear switch (NSDP) administration tool"; From 62cb4575a758e906d09f1c4121c719f907866dca Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 10:23:28 -0700 Subject: [PATCH 221/338] tremc: remove with statements --- pkgs/applications/networking/p2p/tremc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/p2p/tremc/default.nix b/pkgs/applications/networking/p2p/tremc/default.nix index 6a75a02d854b..8f3b2c6e35ef 100644 --- a/pkgs/applications/networking/p2p/tremc/default.nix +++ b/pkgs/applications/networking/p2p/tremc/default.nix @@ -5,9 +5,9 @@ , useGeoIP ? false # Require /var/lib/geoip-databases/GeoIP.dat }: let - wrapperPath = with lib; makeBinPath ( - optional x11Support xclip ++ - optional stdenv.isDarwin pbcopy + wrapperPath = lib.makeBinPath ( + lib.optional x11Support xclip ++ + lib.optional stdenv.isDarwin pbcopy ); in python3Packages.buildPythonApplication rec { From ecc748b3d1cc3ecacb1bd8eac601dc518c51c566 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 10:23:30 -0700 Subject: [PATCH 222/338] synology-drive-client: remove with statements --- pkgs/applications/networking/synology-drive-client/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/synology-drive-client/default.nix b/pkgs/applications/networking/synology-drive-client/default.nix index d4ab94315bf9..2fafbad3499e 100644 --- a/pkgs/applications/networking/synology-drive-client/default.nix +++ b/pkgs/applications/networking/synology-drive-client/default.nix @@ -3,7 +3,7 @@ let pname = "synology-drive-client"; baseUrl = "https://global.synologydownload.com/download/Utility/SynologyDriveClient"; version = "3.5.0-16084"; - buildNumber = with lib; last (splitString "-" version); + buildNumber = lib.last (lib.splitString "-" version); meta = with lib; { description = "Desktop application to synchronize files and folders between the computer and the Synology Drive server"; homepage = "https://www.synology.com/en-global/dsm/feature/drive"; From 0b74a12120d8ae332af1b8a5996553744eb8dd87 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 10:23:33 -0700 Subject: [PATCH 223/338] gwyddion: remove with statements --- .../science/chemistry/gwyddion/default.nix | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix index b7f06898504f..9e64ee7afe4d 100644 --- a/pkgs/applications/science/chemistry/gwyddion/default.nix +++ b/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -24,19 +24,18 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config file ]; - buildInputs = with lib; - [ gtk2 fftw ] ++ - optionals openglSupport [ gnome2.gtkglext libGL ] ++ - optional openexrSupport openexr ++ - optional libXmuSupport xorg.libXmu ++ - optional fitsSupport cfitsio ++ - optional libpngSupport libpng ++ - optional libxsltSupport libxslt ++ - optional libxml2Support libxml2 ++ - optional libwebpSupport libwebp ++ - optional zlibSupport zlib ++ - optional libuniqueSupport libunique ++ - optional libzipSupport libzip; + buildInputs = [ gtk2 fftw ] ++ + lib.optionals openglSupport [ gnome2.gtkglext libGL ] ++ + lib.optional openexrSupport openexr ++ + lib.optional libXmuSupport xorg.libXmu ++ + lib.optional fitsSupport cfitsio ++ + lib.optional libpngSupport libpng ++ + lib.optional libxsltSupport libxslt ++ + lib.optional libxml2Support libxml2 ++ + lib.optional libwebpSupport libwebp ++ + lib.optional zlibSupport zlib ++ + lib.optional libuniqueSupport libunique ++ + lib.optional libzipSupport libzip; # This patch corrects problems with python support, but should apply cleanly # regardless of whether python support is enabled, and have no effects if From 6b764605dc738238db0be382c6cbb8527e361ce5 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 10:23:34 -0700 Subject: [PATCH 224/338] picoscope: remove with statements --- .../science/electronics/picoscope/default.nix | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/science/electronics/picoscope/default.nix b/pkgs/applications/science/electronics/picoscope/default.nix index 3aa5cb22aa52..27e527a01d87 100644 --- a/pkgs/applications/science/electronics/picoscope/default.nix +++ b/pkgs/applications/science/electronics/picoscope/default.nix @@ -15,13 +15,12 @@ ] }: let - shared_meta = lib: - with lib; { - homepage = "https://www.picotech.com/downloads/linux"; - maintainers = with maintainers; [ expipiplus1 wirew0rm ] ++ teams.lumiguide.members; - platforms = [ "x86_64-linux" ]; - license = licenses.unfree; - }; + shared_meta = lib: { + homepage = "https://www.picotech.com/downloads/linux"; + maintainers = with lib.maintainers; [ expipiplus1 wirew0rm ] ++ lib.teams.lumiguide.members; + platforms = [ "x86_64-linux" ]; + license = lib.licenses.unfree; + }; libpicoipp = callPackage ({ stdenv, lib, fetchurl, autoPatchelfHook, dpkg }: stdenv.mkDerivation rec { @@ -39,11 +38,10 @@ let install -Dt $out/usr/share/doc/libpicoipp usr/share/doc/libpicoipp/copyright runHook postInstall ''; - meta = with lib; - shared_meta lib // { - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - description = "library for picotech oscilloscope software"; - }; + meta = shared_meta lib // { + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + description = "library for picotech oscilloscope software"; + }; }) { }; # If we don't have a platform available, put a dummy version here, so at From 66a0775dbe3cb29bc21f7647f358ce005d5caa3e Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 10:24:38 -0700 Subject: [PATCH 225/338] coq: remove with statements --- .../science/logic/coq/default.nix | 55 +++++++++---------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index d07ebd90ec7d..25531c6a33af 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -15,10 +15,9 @@ , csdp ? null , version, coq-version ? null }@args: -let lib' = lib; in -let lib = import ../../../../build-support/coq/extra-lib.nix {lib = lib';}; in -with builtins; with lib; let + lib = import ../../../../build-support/coq/extra-lib.nix { inherit (args) lib; }; + release = { "8.5pl1".sha256 = "1976ki5xjg2r907xj9p7gs0kpdinywbwcqlgxqw75dgp0hkgi00n"; "8.5pl2".sha256 = "109rrcrx7mz0fj7725kjjghfg5ydwb24hjsa5hspa27b4caah7rh"; @@ -67,29 +66,29 @@ let { inherit release releaseRev; location = { owner = "coq"; repo = "coq";}; } args.version; version = fetched.version; - coq-version = args.coq-version or (if version != "dev" then versions.majorMinor version else "dev"); - coqAtLeast = v: coq-version == "dev" || versionAtLeast coq-version v; + coq-version = args.coq-version or (if version != "dev" then lib.versions.majorMinor version else "dev"); + coqAtLeast = v: coq-version == "dev" || lib.versionAtLeast coq-version v; buildIde = args.buildIde or (!coqAtLeast "8.14"); - ideFlags = optionalString (buildIde && !coqAtLeast "8.10") + ideFlags = lib.optionalString (buildIde && !coqAtLeast "8.10") "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt"; csdpPatch = lib.optionalString (csdp != null) '' substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp" substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true" ''; ocamlPackages = if customOCamlPackages != null then customOCamlPackages - else with versions; switch coq-version [ - { case = range "8.16" "8.18"; out = ocamlPackages_4_14; } - { case = range "8.14" "8.15"; out = ocamlPackages_4_12; } - { case = range "8.11" "8.13"; out = ocamlPackages_4_10; } - { case = range "8.7" "8.10"; out = ocamlPackages_4_09; } - { case = range "8.5" "8.6"; out = ocamlPackages_4_05; } + else lib.switch coq-version [ + { case = lib.versions.range "8.16" "8.18"; out = ocamlPackages_4_14; } + { case = lib.versions.range "8.14" "8.15"; out = ocamlPackages_4_12; } + { case = lib.versions.range "8.11" "8.13"; out = ocamlPackages_4_10; } + { case = lib.versions.range "8.7" "8.10"; out = ocamlPackages_4_09; } + { case = lib.versions.range "8.5" "8.6"; out = ocamlPackages_4_05; } ] ocamlPackages_4_14; - ocamlNativeBuildInputs = with ocamlPackages; [ ocaml findlib ] - ++ optional (coqAtLeast "8.14") dune_3; + ocamlNativeBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib ] + ++ lib.optional (coqAtLeast "8.14") ocamlPackages.dune_3; ocamlPropagatedBuildInputs = [ ] - ++ optional (!coqAtLeast "8.10") ocamlPackages.camlp5 - ++ optional (!coqAtLeast "8.13") ocamlPackages.num - ++ optional (coqAtLeast "8.13") ocamlPackages.zarith; + ++ lib.optional (!coqAtLeast "8.10") ocamlPackages.camlp5 + ++ lib.optional (!coqAtLeast "8.13") ocamlPackages.num + ++ lib.optional (coqAtLeast "8.13") ocamlPackages.zarith; self = stdenv.mkDerivation { pname = "coq"; inherit (fetched) version src; @@ -111,7 +110,7 @@ self = stdenv.mkDerivation { (coq-prog-args)) (mapc (lambda (arg) (when (file-directory-p (concat arg "/lib/coq/${coq-version}/user-contrib")) - (setenv "COQPATH" (concat (getenv "COQPATH") ":" arg "/lib/coq/${coq-version}/user-contrib")))) '(${concatStringsSep " " (map (pkg: "\"${pkg}\"") pkgs)})) + (setenv "COQPATH" (concat (getenv "COQPATH") ":" arg "/lib/coq/${coq-version}/user-contrib")))) '(${lib.concatStringsSep " " (map (pkg: "\"${pkg}\"") pkgs)})) ; TODO Abstract this pattern from here and nixBufferBuilders.withPackages! (defvar nixpkgs--coq-buffer-count 0) (when (eq nixpkgs--coq-buffer-count 0) @@ -148,11 +147,11 @@ self = stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ] ++ ocamlNativeBuildInputs - ++ optional buildIde copyDesktopItems - ++ optional (buildIde && coqAtLeast "8.10") wrapGAppsHook3 - ++ optional (!coqAtLeast "8.6") gnumake42; + ++ lib.optional buildIde copyDesktopItems + ++ lib.optional (buildIde && coqAtLeast "8.10") wrapGAppsHook3 + ++ lib.optional (!coqAtLeast "8.6") gnumake42; buildInputs = [ ncurses ] - ++ optionals buildIde + ++ lib.optionals buildIde (if coqAtLeast "8.10" then [ ocamlPackages.lablgtk3-sourceview3 glib adwaita-icon-theme ] else [ ocamlPackages.lablgtk ]) @@ -188,12 +187,12 @@ self = stdenv.mkDerivation { prefixKey = "-prefix "; - buildFlags = [ "revision" "coq" ] ++ optional buildIde "coqide" ++ optional (!coqAtLeast "8.14") "bin/votour"; + buildFlags = [ "revision" "coq" ] ++ lib.optional buildIde "coqide" ++ lib.optional (!coqAtLeast "8.14") "bin/votour"; enableParallelBuilding = true; createFindlibDestdir = true; - desktopItems = optional buildIde (makeDesktopItem { + desktopItems = lib.optional buildIde (makeDesktopItem { name = "coqide"; exec = "coqide"; icon = "coq"; @@ -202,18 +201,18 @@ self = stdenv.mkDerivation { categories = [ "Development" "Science" "Math" "IDE" "GTK" ]; }); - postInstall = let suffix = optionalString (coqAtLeast "8.14") "-core"; in optionalString (!coqAtLeast "8.17") '' + postInstall = let suffix = lib.optionalString (coqAtLeast "8.14") "-core"; in lib.optionalString (!coqAtLeast "8.17") '' cp bin/votour $out/bin/ '' + '' ln -s $out/lib/coq${suffix} $OCAMLFIND_DESTDIR/coq${suffix} - '' + optionalString (coqAtLeast "8.14") '' + '' + lib.optionalString (coqAtLeast "8.14") '' ln -s $out/lib/coqide-server $OCAMLFIND_DESTDIR/coqide-server - '' + optionalString buildIde '' + '' + lib.optionalString buildIde '' mkdir -p "$out/share/pixmaps" ln -s "$out/share/coq/coq.png" "$out/share/pixmaps/" ''; - meta = { + meta = with lib; { description = "Coq proof assistant"; longDescription = '' Coq is a formal proof management system. It provides a formal language From 24395a180ddf126150ce4ce5a5752845b0240308 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 10:28:59 -0700 Subject: [PATCH 226/338] wolfram-engine: remove with statements --- pkgs/applications/science/math/wolfram-engine/l10ns.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/wolfram-engine/l10ns.nix b/pkgs/applications/science/math/wolfram-engine/l10ns.nix index 2682b6d71a1b..cfd296087d74 100644 --- a/pkgs/applications/science/math/wolfram-engine/l10ns.nix +++ b/pkgs/applications/science/math/wolfram-engine/l10ns.nix @@ -4,7 +4,7 @@ , majorVersion ? null }: -let allVersions = with lib; flip map +let allVersions = lib.flip map # N.B. Versions in this list should be ordered from newest to oldest. [ { From 75923e2640cdb6ad9a857f862f6e4b8c928cee9b Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 10:29:03 -0700 Subject: [PATCH 227/338] git-sync: remove with statements --- pkgs/applications/version-management/git-sync/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-sync/default.nix b/pkgs/applications/version-management/git-sync/default.nix index 3ff96da704e0..07fa41a72637 100644 --- a/pkgs/applications/version-management/git-sync/default.nix +++ b/pkgs/applications/version-management/git-sync/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cp -a contrib/git-* $out/bin/ ''; - wrapperPath = with lib; makeBinPath ([ + wrapperPath = lib.makeBinPath ([ coreutils git gnugrep From 48e8083013a577e18e0bc1f20194465c7df91410 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 10:29:06 -0700 Subject: [PATCH 228/338] mplayer: remove with statements --- pkgs/applications/video/mplayer/default.nix | 85 ++++++++++----------- 1 file changed, 40 insertions(+), 45 deletions(-) diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 47e5604eea5d..6b546b5111eb 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -86,38 +86,37 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkg-config yasm ]; - buildInputs = with lib; - [ freetype ffmpeg_6 ] - ++ optional aalibSupport aalib - ++ optional fontconfigSupport fontconfig - ++ optional fribidiSupport fribidi - ++ optionals x11Support [ libX11 libXext libGLU libGL ] - ++ optional alsaSupport alsa-lib - ++ optional xvSupport libXv - ++ optional theoraSupport libtheora - ++ optional cacaSupport libcaca - ++ optional xineramaSupport libXinerama - ++ optional dvdnavSupport libdvdnav - ++ optional dvdreadSupport libdvdread - ++ optional bluraySupport libbluray - ++ optional cddaSupport cdparanoia - ++ optional jackaudioSupport libjack2 - ++ optionals amrSupport [ amrnb amrwb ] - ++ optional x264Support x264 - ++ optional pulseSupport libpulseaudio - ++ optional screenSaverSupport libXScrnSaver - ++ optional lameSupport lame - ++ optional vdpauSupport libvdpau - ++ optional speexSupport speex - ++ optional libpngSupport libpng - ++ optional libjpegSupport libjpeg - ++ optional bs2bSupport libbs2b - ++ optional v4lSupport libv4l - ++ (with darwin.apple_sdk.frameworks; optionals stdenv.isDarwin [ Cocoa OpenGL ]) + buildInputs = [ freetype ffmpeg_6 ] + ++ lib.optional aalibSupport aalib + ++ lib.optional fontconfigSupport fontconfig + ++ lib.optional fribidiSupport fribidi + ++ lib.optionals x11Support [ libX11 libXext libGLU libGL ] + ++ lib.optional alsaSupport alsa-lib + ++ lib.optional xvSupport libXv + ++ lib.optional theoraSupport libtheora + ++ lib.optional cacaSupport libcaca + ++ lib.optional xineramaSupport libXinerama + ++ lib.optional dvdnavSupport libdvdnav + ++ lib.optional dvdreadSupport libdvdread + ++ lib.optional bluraySupport libbluray + ++ lib.optional cddaSupport cdparanoia + ++ lib.optional jackaudioSupport libjack2 + ++ lib.optionals amrSupport [ amrnb amrwb ] + ++ lib.optional x264Support x264 + ++ lib.optional pulseSupport libpulseaudio + ++ lib.optional screenSaverSupport libXScrnSaver + ++ lib.optional lameSupport lame + ++ lib.optional vdpauSupport libvdpau + ++ lib.optional speexSupport speex + ++ lib.optional libpngSupport libpng + ++ lib.optional libjpegSupport libjpeg + ++ lib.optional bs2bSupport libbs2b + ++ lib.optional v4lSupport libv4l + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.OpenGL ] ; configurePlatforms = [ ]; - configureFlags = with lib; [ + configureFlags = [ "--enable-freetype" (if fontconfigSupport then "--enable-fontconfig" else "--disable-fontconfig") (if x11Support then "--enable-x11 --enable-gl" else "--disable-x11 --disable-gl") @@ -143,18 +142,14 @@ stdenv.mkDerivation rec { "--disable-ossaudio" "--disable-ffmpeg_a" "--yasm=${buildPackages.yasm}/bin/yasm" - # Note, the `target` vs `host` confusion is intensional. + # Note, the `target` vs `host` confusion is intentional. "--target=${stdenv.hostPlatform.config}" - ] ++ optional - (useUnfreeCodecs && codecs != null && !crossBuild) - "--codecsdir=${codecs}" - ++ optional - (stdenv.hostPlatform.isx86 && !crossBuild) - "--enable-runtime-cpudetection" - ++ optional fribidiSupport "--enable-fribidi" - ++ optional (stdenv.isLinux && !stdenv.isAarch64) "--enable-vidix" - ++ optional stdenv.isLinux "--enable-fbdev" - ++ optionals (crossBuild) [ + ] ++ lib.optional (useUnfreeCodecs && codecs != null && !crossBuild) "--codecsdir=${codecs}" + ++ lib.optional (stdenv.hostPlatform.isx86 && !crossBuild) "--enable-runtime-cpudetection" + ++ lib.optional fribidiSupport "--enable-fribidi" + ++ lib.optional (stdenv.isLinux && !stdenv.isAarch64) "--enable-vidix" + ++ lib.optional stdenv.isLinux "--enable-fbdev" + ++ lib.optionals (crossBuild) [ "--enable-cross-compile" "--disable-vidix-pcidb" "--with-vidix-drivers=no" @@ -179,11 +174,11 @@ stdenv.mkDerivation rec { # Fixes compilation with newer versions of clang that make these warnings errors by default. NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-int-conversion -Wno-incompatible-function-pointer-types"; - NIX_LDFLAGS = with lib; toString ( - optional fontconfigSupport "-lfontconfig" - ++ optional fribidiSupport "-lfribidi" - ++ optionals x11Support [ "-lX11" "-lXext" ] - ++ optional x264Support "-lx264" + NIX_LDFLAGS = toString ( + lib.optional fontconfigSupport "-lfontconfig" + ++ lib.optional fribidiSupport "-lfribidi" + ++ lib.optionals x11Support [ "-lX11" "-lXext" ] + ++ lib.optional x264Support "-lx264" ++ [ "-lfreetype" ] ); From 2d7ef18297f24678fe736fc3e59cefad5daf4ee2 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 10:30:44 -0700 Subject: [PATCH 229/338] mpv: remove with statements --- .../video/mpv/scripts/default.nix | 62 +++++++++---------- 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/default.nix b/pkgs/applications/video/mpv/scripts/default.nix index 873010ca3f5a..de0ee95044ca 100644 --- a/pkgs/applications/video/mpv/scripts/default.nix +++ b/pkgs/applications/video/mpv/scripts/default.nix @@ -41,40 +41,38 @@ let } # can't check whether `fullScriptPath` is a directory, in pure-evaluation mode - ( - with lib; - optionalAttrs - ( - !any (s: hasSuffix s drv.passthru.scriptName) [ - ".js" - ".lua" - ".so" - ] - ) - { - single-main-in-script-dir = - runCommand "mpvScripts.${name}.passthru.tests.single-main-in-script-dir" - { - meta.maintainers = with lib.maintainers; [ nicoo ]; - preferLocalBuild = true; + (lib.optionalAttrs + ( + !lib.any (s: lib.hasSuffix s drv.passthru.scriptName) [ + ".js" + ".lua" + ".so" + ] + ) + { + single-main-in-script-dir = + runCommand "mpvScripts.${name}.passthru.tests.single-main-in-script-dir" + { + meta.maintainers = with lib.maintainers; [ nicoo ]; + preferLocalBuild = true; + } + '' + die() { + echo "$@" >&2 + exit 1 } - '' - die() { - echo "$@" >&2 - exit 1 - } - cd "${drv}/${scriptPath}" # so the glob expands to filenames only - mains=( main.* ) - if [ "''${#mains[*]}" -eq 1 ]; then - touch $out - elif [ "''${#mains[*]}" -eq 0 ]; then - die "'${scriptPath}' contains no 'main.*' file" - else - die "'${scriptPath}' contains multiple 'main.*' files:" "''${mains[*]}" - fi - ''; - } + cd "${drv}/${scriptPath}" # so the glob expands to filenames only + mains=( main.* ) + if [ "''${#mains[*]}" -eq 1 ]; then + touch $out + elif [ "''${#mains[*]}" -eq 0 ]; then + die "'${scriptPath}' contains no 'main.*' file" + else + die "'${scriptPath}' contains multiple 'main.*' files:" "''${mains[*]}" + fi + ''; + } ) ]; }; From e3c6d330177b0f49db6bdf691a778afcfaa64024 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 10:31:28 -0700 Subject: [PATCH 230/338] obs-studio: remove with statements --- pkgs/applications/video/obs-studio/wrapper.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/obs-studio/wrapper.nix b/pkgs/applications/video/obs-studio/wrapper.nix index 62bc80d26df3..0c972fc58d37 100644 --- a/pkgs/applications/video/obs-studio/wrapper.nix +++ b/pkgs/applications/video/obs-studio/wrapper.nix @@ -8,11 +8,11 @@ symlinkJoin { nativeBuildInputs = [ makeWrapper ]; paths = [ obs-studio ] ++ plugins; - postBuild = with lib; + postBuild = let # Some plugins needs extra environment, see obs-gstreamer for an example. pluginArguments = - lists.concatMap (plugin: plugin.obsWrapperArguments or []) plugins; + lib.lists.concatMap (plugin: plugin.obsWrapperArguments or []) plugins; pluginsJoined = symlinkJoin { name = "obs-studio-plugins"; @@ -24,9 +24,9 @@ symlinkJoin { "$out/bin/obs" ''--set OBS_PLUGINS_PATH "${pluginsJoined}/lib/obs-plugins"'' ''--set OBS_PLUGINS_DATA_PATH "${pluginsJoined}/share/obs/obs-plugins"'' - ] ++ lists.unique pluginArguments; + ] ++ lib.lists.unique pluginArguments; in '' - ${concatStringsSep " " wrapCommandLine} + ${lib.concatStringsSep " " wrapCommandLine} # Remove unused obs-plugins dir to not cause confusion rm -r $out/share/obs/obs-plugins From e1854c33b254da8ad38001b12f536735102273a4 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 10:32:10 -0700 Subject: [PATCH 231/338] singularity: remove with statements This is a generic meta, so it doesn't fall into the "simple" pattern as I see it. --- .../virtualization/singularity/generic.nix | 35 +++++++++---------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/virtualization/singularity/generic.nix b/pkgs/applications/virtualization/singularity/generic.nix index 1cac1d4f16c6..24e1b3b67b26 100644 --- a/pkgs/applications/virtualization/singularity/generic.nix +++ b/pkgs/applications/virtualization/singularity/generic.nix @@ -326,26 +326,23 @@ in ''} ''; - meta = - with lib; - { - description = "Application containers for linux" + extraDescription; - longDescription = '' - Singularity (the upstream) renamed themselves to Apptainer - to distinguish themselves from a fork made by Sylabs Inc.. See + meta = { + description = "Application containers for linux" + extraDescription; + longDescription = '' + Singularity (the upstream) renamed themselves to Apptainer + to distinguish themselves from a fork made by Sylabs Inc.. See - https://sylabs.io/2021/05/singularity-community-edition - https://apptainer.org/news/community-announcement-20211130 - ''; - license = licenses.bsd3; - platforms = platforms.linux; - maintainers = with maintainers; [ - jbedo - ShamrockLee - ]; - mainProgram = projectName; - } - // extraMeta; + https://sylabs.io/2021/05/singularity-community-edition + https://apptainer.org/news/community-announcement-20211130 + ''; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + jbedo + ShamrockLee + ]; + mainProgram = projectName; + } // extraMeta; }).overrideAttrs ( finalAttrs: prevAttrs: { From c406a6ed332e43bccb8fcf3ad6aae8a2653d8dfe Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 11:57:43 -0700 Subject: [PATCH 232/338] fetchsvn: remove with statements --- pkgs/build-support/fetchsvn/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/build-support/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix index 41752eb55a7a..203a145b6434 100644 --- a/pkgs/build-support/fetchsvn/default.nix +++ b/pkgs/build-support/fetchsvn/default.nix @@ -10,15 +10,15 @@ assert sshSupport -> openssh != null; let - repoName = with lib; + repoName = let - fst = head; - snd = l: head (tail l); - trd = l: head (tail (tail l)); + fst = lib.head; + snd = l: lib.head (lib.tail l); + trd = l: lib.head (lib.tail (lib.tail l)); path_ = - (p: if head p == "" then tail p else p) # ~ drop final slash if any - (reverseList (splitString "/" url)); - path = [ (removeSuffix "/" (head path_)) ] ++ (tail path_); + (p: if lib.head p == "" then lib.tail p else p) # ~ drop final slash if any + (lib.reverseList (lib.splitString "/" url)); + path = [ (lib.removeSuffix "/" (lib.head path_)) ] ++ (lib.tail path_); in # ../repo/trunk -> repo if fst path == "trunk" then snd path From 661aa513a13a93dc18cbf88daec4ca89bd12d6f2 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 11:58:09 -0700 Subject: [PATCH 233/338] writers: remove with statements from aliases --- pkgs/build-support/writers/aliases.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/build-support/writers/aliases.nix b/pkgs/build-support/writers/aliases.nix index fb108a6fd857..8441abf36ce5 100644 --- a/pkgs/build-support/writers/aliases.nix +++ b/pkgs/build-support/writers/aliases.nix @@ -3,16 +3,16 @@ lib: prev: let # Removing recurseForDerivation prevents derivations of aliased attribute # set to appear while listing all the packages available. - removeRecurseForDerivations = alias: with lib; + removeRecurseForDerivations = alias: if alias.recurseForDerivations or false then - removeAttrs alias ["recurseForDerivations"] + lib.removeAttrs alias ["recurseForDerivations"] else alias; # Disabling distribution prevents top-level aliases for non-recursed package # sets from building on Hydra. - removeDistribute = alias: with lib; - if isDerivation alias then - dontDistribute alias + removeDistribute = alias: + if lib.isDerivation alias then + lib.dontDistribute alias else alias; # Make sure that we are not shadowing something from From 9996e83d771c5ffb2bf4e02898c969ec3ff4f6f7 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 11:58:27 -0700 Subject: [PATCH 234/338] btrfs-auto-snapshot: remove with statements --- .../bt/btrfs-auto-snapshot/package.nix | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/bt/btrfs-auto-snapshot/package.nix b/pkgs/by-name/bt/btrfs-auto-snapshot/package.nix index 7392a0c5809d..7cd30f563bc4 100644 --- a/pkgs/by-name/bt/btrfs-auto-snapshot/package.nix +++ b/pkgs/by-name/bt/btrfs-auto-snapshot/package.nix @@ -32,19 +32,17 @@ stdenv.mkDerivation rec { install -Dm755 btrfs-auto-snapshot $out/bin/btrfs-auto-snapshot ''; - wrapperPath = - with lib; - makeBinPath ( - [ - coreutils - getopt - gnugrep - gnused - gawk - btrfs-progs - ] - ++ optional syslogSupport util-linux - ); + wrapperPath = lib.makeBinPath ( + [ + coreutils + getopt + gnugrep + gnused + gawk + btrfs-progs + ] + ++ lib.optional syslogSupport util-linux + ); postFixup = '' wrapProgram $out/bin/btrfs-auto-snapshot \ From e05d16a57aaf60682fd9c45dcad22c87a9b17956 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 11:58:33 -0700 Subject: [PATCH 235/338] labelife-label-printer: remove with statements --- pkgs/by-name/la/labelife-label-printer/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/la/labelife-label-printer/package.nix b/pkgs/by-name/la/labelife-label-printer/package.nix index fb73aa24d572..712d478e6a61 100644 --- a/pkgs/by-name/la/labelife-label-printer/package.nix +++ b/pkgs/by-name/la/labelife-label-printer/package.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { - Aimo ''; maintainers = with lib.maintainers; [ daniel-fahey ]; - platforms = with lib; [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; }) From c58fcdeb91f773f5893396a589d9fadd105bbe2c Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 12:06:52 -0700 Subject: [PATCH 236/338] libplacebo: remove with statements --- pkgs/by-name/li/libplacebo_5/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/li/libplacebo_5/package.nix b/pkgs/by-name/li/libplacebo_5/package.nix index 8dc6dbe1cea6..5bc799ddf860 100644 --- a/pkgs/by-name/li/libplacebo_5/package.nix +++ b/pkgs/by-name/li/libplacebo_5/package.nix @@ -46,13 +46,13 @@ stdenv.mkDerivation rec { libdovi ]; - mesonFlags = with lib; [ - (mesonOption "vulkan-registry" "${vulkan-headers}/share/vulkan/registry/vk.xml") - (mesonBool "demos" false) # Don't build and install the demo programs - (mesonEnable "d3d11" false) # Disable the Direct3D 11 based renderer - (mesonEnable "glslang" false) # rely on shaderc for GLSL compilation instead - ] ++ optionals stdenv.isDarwin [ - (mesonEnable "unwind" false) # libplacebo doesn’t build with `darwin.libunwind` + mesonFlags = [ + (lib.mesonOption "vulkan-registry" "${vulkan-headers}/share/vulkan/registry/vk.xml") + (lib.mesonBool "demos" false) # Don't build and install the demo programs + (lib.mesonEnable "d3d11" false) # Disable the Direct3D 11 based renderer + (lib.mesonEnable "glslang" false) # rely on shaderc for GLSL compilation instead + ] ++ lib.optionals stdenv.isDarwin [ + (lib.mesonEnable "unwind" false) # libplacebo doesn’t build with `darwin.libunwind` ]; postPatch = '' From aa20ccad78ec5752e68e87304f71c37a14c02291 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 12:06:55 -0700 Subject: [PATCH 237/338] modrinth-app-unwrapped: remove with statements --- pkgs/by-name/mo/modrinth-app-unwrapped/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix index 7814ec363dce..c9c5cbdc73f5 100644 --- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix +++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix @@ -187,7 +187,7 @@ rustPlatform.buildRustPackage { unfreeRedistributable ]; maintainers = with lib.maintainers; [ getchoo ]; - platforms = with lib; platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; # this builds on architectures like aarch64, but the launcher itself does not support them yet broken = !stdenv.isx86_64; }; From faa935f4728f0070e58e827a02dbddf4b298b3d1 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 12:07:19 -0700 Subject: [PATCH 238/338] mousecape: remove with statements --- pkgs/by-name/mo/mousecape/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/mo/mousecape/package.nix b/pkgs/by-name/mo/mousecape/package.nix index 3f29a0135827..7d45953a4e40 100644 --- a/pkgs/by-name/mo/mousecape/package.nix +++ b/pkgs/by-name/mo/mousecape/package.nix @@ -24,10 +24,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { description = "Cursor manager for macOS built using private, nonintrusive CoreGraphics APIs"; homepage = "https://github.com/alexzielenski/Mousecape"; - license = with lib; licenses.free; - maintainers = with lib; with maintainers; [ donteatoreo ]; - platforms = with lib; platforms.darwin; - sourceProvenance = with lib; with sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.free; + maintainers = with lib.maintainers; [ donteatoreo ]; + platforms = lib.platforms.darwin; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; }; }) From e659af6d2e4ab529438701f2516654e8066516cc Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 12:07:40 -0700 Subject: [PATCH 239/338] smartgithg: remove with statements --- pkgs/by-name/sm/smartgithg/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/sm/smartgithg/package.nix b/pkgs/by-name/sm/smartgithg/package.nix index d3bb1ed1b67d..d636c9d9b1ed 100644 --- a/pkgs/by-name/sm/smartgithg/package.nix +++ b/pkgs/by-name/sm/smartgithg/package.nix @@ -26,10 +26,10 @@ stdenv.mkDerivation rec { buildInputs = [ jre adwaita-icon-theme gtk3 ]; - preFixup = with lib; '' + preFixup = '' gappsWrapperArgs+=( \ - --prefix PATH : ${makeBinPath [ jre which ]} \ - --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ + --prefix PATH : ${lib.makeBinPath [ jre which ]} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gtk3 glib libXtst @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - desktopItem = with lib; makeDesktopItem rec { + desktopItem = makeDesktopItem rec { name = "smartgit"; exec = "smartgit"; comment = meta.description; From 63b05516687f10e84a7f605036bd25fdd1dd88d6 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 12:07:43 -0700 Subject: [PATCH 240/338] ats2: remove with statements --- pkgs/development/compilers/ats2/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index f9ba2e1ac417..2dad47c08abc 100644 --- a/pkgs/development/compilers/ats2/default.nix +++ b/pkgs/development/compilers/ats2/default.nix @@ -49,14 +49,12 @@ stdenv.mkDerivation rec { "CCOMP=${stdenv.cc.targetPrefix}cc" ]; - setupHook = with lib; + setupHook = let - hookFiles = - [ ./setup-hook.sh ] - ++ optional withContrib ./setup-contrib-hook.sh; + hookFiles = [ ./setup-hook.sh ] ++ lib.optional withContrib ./setup-contrib-hook.sh; in builtins.toFile "setupHook.sh" - (concatMapStringsSep "\n" builtins.readFile hookFiles); + (lib.concatMapStringsSep "\n" builtins.readFile hookFiles); postInstall = postInstallContrib + postInstallEmacs; From 418495c4f9d16c8bbba39d35667fef8f6c9345e6 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 13:46:23 -0700 Subject: [PATCH 241/338] dotnet: remove with statements --- pkgs/development/compilers/dotnet/build-dotnet.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/compilers/dotnet/build-dotnet.nix b/pkgs/development/compilers/dotnet/build-dotnet.nix index 246cc9ade717..0c9de3f05cab 100644 --- a/pkgs/development/compilers/dotnet/build-dotnet.nix +++ b/pkgs/development/compilers/dotnet/build-dotnet.nix @@ -161,9 +161,7 @@ mkCommon type rec { updateScript = let - majorVersion = - with lib; - concatStringsSep "." (take 2 (splitVersion version)); + majorVersion = lib.concatStringsSep "." (lib.take 2 (lib.splitVersion version)); in writeShellScript "update-dotnet-${majorVersion}" '' pushd pkgs/development/compilers/dotnet From bdc75c92355879a463c549a04716faa703cb00d5 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 13:47:11 -0700 Subject: [PATCH 242/338] elm.hs810Pkgs: remove with statements --- .../compilers/elm/packages/ghc8_10/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/elm/packages/ghc8_10/default.nix b/pkgs/development/compilers/elm/packages/ghc8_10/default.nix index f68e582b3d0b..ef6e5142b2f1 100644 --- a/pkgs/development/compilers/elm/packages/ghc8_10/default.nix +++ b/pkgs/development/compilers/elm/packages/ghc8_10/default.nix @@ -1,8 +1,9 @@ { pkgs, lib }: self: pkgs.haskell.packages.ghc810.override { - overrides = self: super: with pkgs.haskell.lib.compose; with lib; + overrides = self: super: let + inherit (pkgs.haskell.lib.compose) justStaticExecutables overrideCabal doJailbreak; elmPkgs = rec { elmi-to-json = justStaticExecutables (overrideCabal (drv: { @@ -22,8 +23,8 @@ self: pkgs.haskell.packages.ghc810.override { description = "Tool that reads .elmi files (Elm interface file) generated by the elm compiler"; homepage = "https://github.com/stoeffel/elmi-to-json"; - license = licenses.bsd3; - maintainers = [ maintainers.turbomack ]; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.turbomack ]; }) (self.callPackage ./elmi-to-json { })); @@ -55,8 +56,8 @@ self: pkgs.haskell.packages.ghc810.override { description = "Instrument Elm code as a preprocessing step for elm-coverage"; homepage = "https://github.com/zwilias/elm-instrument"; - license = licenses.bsd3; - maintainers = [ maintainers.turbomack ]; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.turbomack ]; }) (self.callPackage ./elm-instrument { })); }; From 344f63daef9bd2448cb1f3e120585e3296740db8 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 13:49:01 -0700 Subject: [PATCH 243/338] elm.hs92Pkgs: remove with statements --- pkgs/development/compilers/elm/packages/ghc9_2/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/elm/packages/ghc9_2/default.nix b/pkgs/development/compilers/elm/packages/ghc9_2/default.nix index 5ef5eff3bef1..6c3e23460c22 100644 --- a/pkgs/development/compilers/elm/packages/ghc9_2/default.nix +++ b/pkgs/development/compilers/elm/packages/ghc9_2/default.nix @@ -1,8 +1,9 @@ { pkgs, lib }: self: pkgs.haskell.packages.ghc92.override { - overrides = self: super: with pkgs.haskell.lib.compose; with lib; + overrides = self: super: let + inherit (pkgs.haskell.lib.compose) justStaticExecutables overrideCabal doJailbreak; elmPkgs = rec { /* The elm-format expression is updated via a script in the https://github.com/avh4/elm-format repo: @@ -23,8 +24,8 @@ self: pkgs.haskell.packages.ghc92.override { description = "Formats Elm source code according to a standard set of rules based on the official Elm Style Guide"; homepage = "https://github.com/avh4/elm-format"; - license = licenses.bsd3; - maintainers = with maintainers; [ avh4 turbomack ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ avh4 turbomack ]; }) (self.callPackage ./elm-format/elm-format.nix { })); }; From 37a0bd368a42b7f5806a8c5c27cbf5ae36da600c Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 13:49:34 -0700 Subject: [PATCH 244/338] elm.hs96Pkgs: remove with statements --- pkgs/development/compilers/elm/packages/ghc9_6/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/elm/packages/ghc9_6/default.nix b/pkgs/development/compilers/elm/packages/ghc9_6/default.nix index 0c30c9bea728..9fdc0e72f127 100644 --- a/pkgs/development/compilers/elm/packages/ghc9_6/default.nix +++ b/pkgs/development/compilers/elm/packages/ghc9_6/default.nix @@ -1,8 +1,9 @@ { pkgs, lib, makeWrapper, nodejs, fetchElmDeps }: self: pkgs.haskell.packages.ghc96.override { - overrides = self: super: with pkgs.haskell.lib.compose; with lib; + overrides = self: super: let + inherit (pkgs.haskell.lib.compose) overrideCabal; elmPkgs = rec { elm = overrideCabal (drv: { @@ -21,8 +22,8 @@ self: pkgs.haskell.packages.ghc96.override { description = "Delightful language for reliable webapps"; homepage = "https://elm-lang.org/"; - license = licenses.bsd3; - maintainers = with maintainers; [ domenkozar turbomack ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ domenkozar turbomack ]; }) (self.callPackage ./elm { }); From 99aabc6f9e98baf357f51672b1d8ac18abedf726 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 13:49:57 -0700 Subject: [PATCH 245/338] llvm: remove with statements from common.nix --- pkgs/development/compilers/llvm/common/llvm/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix index fdcd40201c0b..a995c83405e9 100644 --- a/pkgs/development/compilers/llvm/common/llvm/default.nix +++ b/pkgs/development/compilers/llvm/common/llvm/default.nix @@ -46,8 +46,7 @@ let inherit (lib) optional optionals optionalString; # Used when creating a version-suffixed symlink of libLLVM.dylib - shortVersion = with lib; - concatStringsSep "." (take 1 (splitString "." release_version)); + shortVersion = lib.concatStringsSep "." (lib.take 1 (lib.splitString "." release_version)); # Ordinarily we would just the `doCheck` and `checkDeps` functionality # `mkDerivation` gives us to manage our test dependencies (instead of breaking @@ -71,7 +70,7 @@ let # platform here; the splicing that would ordinarily take care of this for # us does not seem to work once we use `withPackages`. let - checkDeps = ps: with ps; [ psutil ]; + checkDeps = ps: [ ps.psutil ]; in pkgsBuildBuild.targetPackages.python3.withPackages checkDeps else python3; @@ -323,7 +322,7 @@ stdenv.mkDerivation (rec { cmakeBuildType = if debugVersion then "Debug" else "Release"; - cmakeFlags = with stdenv; let + cmakeFlags = let # These flags influence llvm-config's BuildVariables.inc in addition to the # general build. We need to make sure these are also passed via # CROSS_TOOLCHAIN_FLAGS_NATIVE when cross-compiling or llvm-config-native @@ -367,7 +366,7 @@ stdenv.mkDerivation (rec { "-DSPHINX_WARNINGS_AS_ERRORS=OFF" ] ++ optionals (enableGoldPlugin) [ "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" - ] ++ optionals isDarwin [ + ] ++ optionals stdenv.isDarwin [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" ] ++ optionals ((stdenv.hostPlatform != stdenv.buildPlatform) && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) [ From e9bf9df5e402035309ba3ffced78a77b687fba77 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 13:50:08 -0700 Subject: [PATCH 246/338] mezzo: remove with statements --- pkgs/development/compilers/mezzo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/mezzo/default.nix b/pkgs/development/compilers/mezzo/default.nix index 498743ee743e..a47228b1d0b1 100644 --- a/pkgs/development/compilers/mezzo/default.nix +++ b/pkgs/development/compilers/mezzo/default.nix @@ -7,7 +7,7 @@ then throw "mezzo is not available for OCaml ${ocaml.version}" else let - check-ocaml-version = with lib; versionAtLeast (getVersion ocaml); + check-ocaml-version = lib.versionAtLeast (lib.getVersion ocaml); in assert check-ocaml-version "4"; From 835804ea262ffa13497b0b8a597bface1dc4e7d8 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 13:50:18 -0700 Subject: [PATCH 247/338] sbcl: remove with statements --- pkgs/development/compilers/sbcl/default.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index f52393961665..86c0ddd52fab 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -159,17 +159,17 @@ stdenv.mkDerivation (self: { export HOME=$PWD/test-home ''; - enableFeatures = with lib; - assert assertMsg (self.markRegionGC -> self.threadSupport) "SBCL mark region GC requires thread support"; - optional self.threadSupport "sb-thread" ++ - optional self.linkableRuntime "sb-linkable-runtime" ++ - optional self.coreCompression "sb-core-compression" ++ - optional stdenv.isAarch32 "arm" ++ - optional self.markRegionGC "mark-region-gc"; + enableFeatures = + assert lib.assertMsg (self.markRegionGC -> self.threadSupport) "SBCL mark region GC requires thread support"; + lib.optional self.threadSupport "sb-thread" ++ + lib.optional self.linkableRuntime "sb-linkable-runtime" ++ + lib.optional self.coreCompression "sb-core-compression" ++ + lib.optional stdenv.isAarch32 "arm" ++ + lib.optional self.markRegionGC "mark-region-gc"; - disableFeatures = with lib; - optional (!self.threadSupport) "sb-thread" ++ - optionals self.disableImmobileSpace [ "immobile-space" "immobile-code" "compact-instance-header" ]; + disableFeatures = + lib.optional (!self.threadSupport) "sb-thread" ++ + lib.optionals self.disableImmobileSpace [ "immobile-space" "immobile-code" "compact-instance-header" ]; buildArgs = [ "--prefix=$out" From 58fe1a068fa363da32c51fcff904fab84ae44b95 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 13:50:22 -0700 Subject: [PATCH 248/338] coqPackages.QuickChick: remove with statements --- .../coq-modules/QuickChick/default.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index 629e752ca628..451353a34142 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -5,18 +5,18 @@ let recent = lib.versions.isGe "8.7" coq.coq-version || coq.coq-version == "dev" pname = "QuickChick"; owner = "QuickChick"; inherit version; - defaultVersion = with lib; with versions; lib.switch [ coq.coq-version ssreflect.version ] [ - { cases = [ (range "8.15" "8.19") pred.true ]; out = "2.0.2"; } - { cases = [ (range "8.13" "8.17") pred.true ]; out = "1.6.5"; } - { cases = [ "8.13" pred.true ]; out = "1.5.0"; } - { cases = [ "8.12" pred.true ]; out = "1.4.0"; } - { cases = [ "8.11" pred.true ]; out = "1.3.2"; } - { cases = [ "8.10" pred.true ]; out = "1.2.1"; } - { cases = [ "8.9" pred.true ]; out = "1.1.0"; } - { cases = [ "8.8" pred.true ]; out = "20190311"; } - { cases = [ "8.7" isLe "1.8" ]; out = "1.0.0"; } - { cases = [ "8.6" pred.true ]; out = "20171102"; } - { cases = [ "8.5" pred.true ]; out = "20170512"; } + defaultVersion = lib.switch [ coq.coq-version ssreflect.version ] [ + { cases = [ (lib.versions.range "8.15" "8.19") lib.pred.true ]; out = "2.0.2"; } + { cases = [ (lib.versions.range "8.13" "8.17") lib.pred.true ]; out = "1.6.5"; } + { cases = [ "8.13" lib.pred.true ]; out = "1.5.0"; } + { cases = [ "8.12" lib.pred.true ]; out = "1.4.0"; } + { cases = [ "8.11" lib.pred.true ]; out = "1.3.2"; } + { cases = [ "8.10" lib.pred.true ]; out = "1.2.1"; } + { cases = [ "8.9" lib.pred.true ]; out = "1.1.0"; } + { cases = [ "8.8" lib.pred.true ]; out = "20190311"; } + { cases = [ "8.7" lib.versions.isLe "1.8" ]; out = "1.0.0"; } + { cases = [ "8.6" lib.pred.true ]; out = "20171102"; } + { cases = [ "8.5" lib.pred.true ]; out = "20170512"; } ] null; release."2.0.2".sha256 = "sha256-xxKkwDRjB8nUiXNhein1Ppn0DP5FZ13J90xUPAnQBbs="; release."2.0.1".sha256 = "sha256-gJc+9Or6tbqE00920Il4pnEvokRoiADX6CxP/Q0QZaY="; From 4b1852399b68dfe3d7c1208b0df5c117177ada54 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 13:51:05 -0700 Subject: [PATCH 249/338] coqPackages_8_10.mathcomp-abel: remove with statements --- pkgs/development/coq-modules/mathcomp-abel/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/coq-modules/mathcomp-abel/default.nix b/pkgs/development/coq-modules/mathcomp-abel/default.nix index bae9266d4de1..c9d6a709d6a3 100644 --- a/pkgs/development/coq-modules/mathcomp-abel/default.nix +++ b/pkgs/development/coq-modules/mathcomp-abel/default.nix @@ -7,10 +7,10 @@ mkCoqDerivation { owner = "math-comp"; inherit version; - defaultVersion = with lib; with versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.10" "8.16") (range "1.12.0" "1.15.0") ]; out = "1.2.1"; } - { cases = [ (range "8.10" "8.15") (range "1.12.0" "1.14.0") ]; out = "1.2.0"; } - { cases = [ (range "8.10" "8.14") (range "1.11.0" "1.12.0") ]; out = "1.1.2"; } + defaultVersion = lib.switch [ coq.version mathcomp.version ] [ + { cases = [ (lib.versions.range "8.10" "8.16") (lib.versions.range "1.12.0" "1.15.0") ]; out = "1.2.1"; } + { cases = [ (lib.versions.range "8.10" "8.15") (lib.versions.range "1.12.0" "1.14.0") ]; out = "1.2.0"; } + { cases = [ (lib.versions.range "8.10" "8.14") (lib.versions.range "1.11.0" "1.12.0") ]; out = "1.1.2"; } ] null; release."1.2.1".sha256 = "sha256-M1q6WIPBsayHde2hwlTxylH169hcTs3OuFsEkM0e3yc="; From 1dbcead1d720190c58cf9579bb795ccfe74752ed Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 13:52:40 -0700 Subject: [PATCH 250/338] coqPackages.serapi: remove with statements --- .../coq-modules/serapi/default.nix | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/development/coq-modules/serapi/default.nix b/pkgs/development/coq-modules/serapi/default.nix index ac61e4eed018..d8077640d6e1 100644 --- a/pkgs/development/coq-modules/serapi/default.nix +++ b/pkgs/development/coq-modules/serapi/default.nix @@ -15,23 +15,22 @@ let }; in -(with lib; mkCoqDerivation { +(mkCoqDerivation { pname = "serapi"; repo = "coq-serapi"; inherit version release; - defaultVersion = with versions; - lib.switch coq.version [ - { case = isEq "8.19"; out = "8.19.0+0.19.3"; } - { case = isEq "8.18"; out = "8.18.0+0.18.3"; } - { case = isEq "8.17"; out = "8.17.0+0.17.3"; } - { case = isEq "8.16"; out = "8.16.0+0.16.3"; } - { case = isEq "8.15"; out = "8.15.0+0.15.0"; } - { case = isEq "8.14"; out = "8.14.0+0.14.0"; } - { case = isEq "8.13"; out = "8.13.0+0.13.0"; } - { case = isEq "8.12"; out = "8.12.0+0.12.1"; } - { case = isEq "8.11"; out = "8.11.0+0.11.1"; } - { case = isEq "8.10"; out = "8.10.0+0.7.2"; } + defaultVersion = lib.switch coq.version [ + { case = lib.versions.isEq "8.19"; out = "8.19.0+0.19.3"; } + { case = lib.versions.isEq "8.18"; out = "8.18.0+0.18.3"; } + { case = lib.versions.isEq "8.17"; out = "8.17.0+0.17.3"; } + { case = lib.versions.isEq "8.16"; out = "8.16.0+0.16.3"; } + { case = lib.versions.isEq "8.15"; out = "8.15.0+0.15.0"; } + { case = lib.versions.isEq "8.14"; out = "8.14.0+0.14.0"; } + { case = lib.versions.isEq "8.13"; out = "8.13.0+0.13.0"; } + { case = lib.versions.isEq "8.12"; out = "8.12.0+0.12.1"; } + { case = lib.versions.isEq "8.11"; out = "8.11.0+0.11.1"; } + { case = lib.versions.isEq "8.10"; out = "8.10.0+0.7.2"; } ] null; useDune = true; From 8e3651c954987c526435810e3bc992397c57a9d0 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 13:53:33 -0700 Subject: [PATCH 251/338] aeson: remove with statements --- pkgs/development/haskell-modules/lib/compose.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/lib/compose.nix b/pkgs/development/haskell-modules/lib/compose.nix index 8d09dcf5bea1..09de1d228d94 100644 --- a/pkgs/development/haskell-modules/lib/compose.nix +++ b/pkgs/development/haskell-modules/lib/compose.nix @@ -345,14 +345,14 @@ rec { , ignorePackages ? [] } : drv : overrideCabal (_drv: { - postBuild = with lib; - let args = concatStringsSep " " ( - optional ignoreEmptyImports "--ignore-empty-imports" ++ - optional ignoreMainModule "--ignore-main-module" ++ + postBuild = + let args = lib.concatStringsSep " " ( + lib.optional ignoreEmptyImports "--ignore-empty-imports" ++ + lib.optional ignoreMainModule "--ignore-main-module" ++ map (pkg: "--ignore-package ${pkg}") ignorePackages ); in "${pkgs.haskellPackages.packunused}/bin/packunused" + - optionalString (args != "") " ${args}"; + lib.optionalString (args != "") " ${args}"; }) (appendConfigureFlag "--ghc-option=-ddump-minimal-imports" drv); buildStackProject = pkgs.callPackage ../generic-stack-builder.nix { }; From 0abbed5dd5d9ff19165579639b6c31bd4a6b6c6d Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 13:56:37 -0700 Subject: [PATCH 252/338] haskellLib.checkUnusedPackages: remove with lib statement --- pkgs/development/interpreters/gnu-apl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix index d854643bb2fe..85e86de1d6b2 100644 --- a/pkgs/development/interpreters/gnu-apl/default.nix +++ b/pkgs/development/interpreters/gnu-apl/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ readline gettext ncurses ]; - env.NIX_CFLAGS_COMPILE = with lib; toString ((optionals stdenv.cc.isGNU [ + env.NIX_CFLAGS_COMPILE = toString ((lib.optionals stdenv.cc.isGNU [ # Needed with GCC 8 "-Wno-error=int-in-bool-context" "-Wno-error=class-memaccess" @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { "-Wno-error=nonnull" "-Wno-error=stringop-overflow" "-Wno-error=use-after-free" - ]) ++ optional stdenv.cc.isClang "-Wno-error=null-dereference"); + ]) ++ lib.optional stdenv.cc.isClang "-Wno-error=null-dereference"); patchPhase = lib.optionalString stdenv.isDarwin '' substituteInPlace src/LApack.cc --replace "malloc.h" "malloc/malloc.h" From ce3cb3730a5c9027754a6a113202ec9fd7bef20d Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 13:57:40 -0700 Subject: [PATCH 253/338] luajit_2_0: remove with lib statement --- pkgs/development/interpreters/luajit/2.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/luajit/2.0.nix b/pkgs/development/interpreters/luajit/2.0.nix index 9ad3099143c8..c70b6809d1df 100644 --- a/pkgs/development/interpreters/luajit/2.0.nix +++ b/pkgs/development/interpreters/luajit/2.0.nix @@ -14,8 +14,8 @@ callPackage ./default.nix { extraMeta = { # this isn't precise but it at least stops the useless Hydra build - platforms = with lib; filter (p: !hasPrefix "aarch64-" p) - (platforms.linux ++ platforms.darwin); + platforms = lib.filter (p: !lib.hasPrefix "aarch64-" p) + (lib.platforms.linux ++ lib.platforms.darwin); }; inherit self passthruFun; } From f8967b46f60d2864f83f7cf226b7634acd939356 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 13:57:57 -0700 Subject: [PATCH 254/338] luajit: remove with lib statement --- .../interpreters/luajit/default.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 25f3332b2602..f5e25b6261bc 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -40,18 +40,18 @@ let luaPackages = self.pkgs; - XCFLAGS = with lib; - optional (!enableFFI) "-DLUAJIT_DISABLE_FFI" - ++ optional (!enableJIT) "-DLUAJIT_DISABLE_JIT" - ++ optional enable52Compat "-DLUAJIT_ENABLE_LUA52COMPAT" - ++ optional (!enableGC64) "-DLUAJIT_DISABLE_GC64" - ++ optional useSystemMalloc "-DLUAJIT_USE_SYSMALLOC" - ++ optional enableValgrindSupport "-DLUAJIT_USE_VALGRIND" - ++ optional enableGDBJITSupport "-DLUAJIT_USE_GDBJIT" - ++ optional enableAPICheck "-DLUAJIT_USE_APICHECK" - ++ optional enableVMAssertions "-DLUAJIT_USE_ASSERT" - ++ optional enableRegisterAllocationRandomization "-DLUAJIT_RANDOM_RA" - ++ optional deterministicStringIds "-DLUAJIT_SECURITY_STRID=0" + XCFLAGS = + lib.optional (!enableFFI) "-DLUAJIT_DISABLE_FFI" + ++ lib.optional (!enableJIT) "-DLUAJIT_DISABLE_JIT" + ++ lib.optional enable52Compat "-DLUAJIT_ENABLE_LUA52COMPAT" + ++ lib.optional (!enableGC64) "-DLUAJIT_DISABLE_GC64" + ++ lib.optional useSystemMalloc "-DLUAJIT_USE_SYSMALLOC" + ++ lib.optional enableValgrindSupport "-DLUAJIT_USE_VALGRIND" + ++ lib.optional enableGDBJITSupport "-DLUAJIT_USE_GDBJIT" + ++ lib.optional enableAPICheck "-DLUAJIT_USE_APICHECK" + ++ lib.optional enableVMAssertions "-DLUAJIT_USE_ASSERT" + ++ lib.optional enableRegisterAllocationRandomization "-DLUAJIT_RANDOM_RA" + ++ lib.optional deterministicStringIds "-DLUAJIT_SECURITY_STRID=0" ; # LuaJIT requires build for 32bit architectures to be build on x86 not x86_64 From b77e53f5523018d46a7ba80471c6852781967315 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 13:58:09 -0700 Subject: [PATCH 255/338] getdns: remove with statements --- pkgs/development/libraries/getdns/default.nix | 69 +++++++++---------- 1 file changed, 33 insertions(+), 36 deletions(-) diff --git a/pkgs/development/libraries/getdns/default.nix b/pkgs/development/libraries/getdns/default.nix index 7fb641158460..69d7f17dafe7 100644 --- a/pkgs/development/libraries/getdns/default.nix +++ b/pkgs/development/libraries/getdns/default.nix @@ -3,10 +3,10 @@ { lib, stdenv, fetchurl, cmake, darwin, doxygen, libidn2, libyaml, openssl , systemd, unbound, yq }: let - metaCommon = with lib; { - maintainers = with maintainers; [ leenaars ehmry ]; - license = licenses.bsd3; - platforms = platforms.all; + metaCommon = { + maintainers = with lib.maintainers; [ leenaars ehmry ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.all; }; in rec { @@ -16,7 +16,7 @@ in rec { outputs = [ "out" "dev" "lib" "man" ]; src = fetchurl { - url = with lib; "https://getdnsapi.net/releases/${pname}-${concatStringsSep "-" (splitVersion version)}/${pname}-${version}.tar.gz"; + url = "https://getdnsapi.net/releases/${pname}-${lib.concatStringsSep "-" (lib.splitVersion version)}/${pname}-${version}.tar.gz"; # upstream publishes hashes in hex format sha256 = "f1404ca250f02e37a118aa00cf0ec2cbe11896e060c6d369c6761baea7d55a2c"; }; @@ -34,22 +34,21 @@ in rec { postInstall = "rm -r $out/share/doc"; - meta = with lib; - metaCommon // { - description = "Modern asynchronous DNS API"; - longDescription = '' - getdns is an implementation of a modern asynchronous DNS API; the - specification was originally edited by Paul Hoffman. It is intended to make all - types of DNS information easily available to application developers and non-DNS - experts. DNSSEC offers a unique global infrastructure for establishing and - enhancing cryptographic trust relations. With the development of this API the - developers intend to offer application developers a modern and flexible - interface that enables end-to-end trust in the DNS architecture, and which will - inspire application developers to implement innovative security solutions in - their applications. - ''; - homepage = "https://getdnsapi.net"; - }; + meta = metaCommon // { + description = "Modern asynchronous DNS API"; + longDescription = '' + getdns is an implementation of a modern asynchronous DNS API; the + specification was originally edited by Paul Hoffman. It is intended to make all + types of DNS information easily available to application developers and non-DNS + experts. DNSSEC offers a unique global infrastructure for establishing and + enhancing cryptographic trust relations. With the development of this API the + developers intend to offer application developers a modern and flexible + interface that enables end-to-end trust in the DNS architecture, and which will + inspire application developers to implement innovative security solutions in + their applications. + ''; + homepage = "https://getdnsapi.net"; + }; }; stubby = stdenv.mkDerivation rec { @@ -72,22 +71,20 @@ in rec { > $stubbyExampleJson ''; - passthru.settingsExample = with builtins; - fromJSON (readFile stubby.stubbyExampleJson); + passthru.settingsExample = builtins.fromJSON (builtins.readFile stubby.stubbyExampleJson); - meta = with lib; - metaCommon // { - description = "Local DNS Privacy stub resolver (using DNS-over-TLS)"; - mainProgram = "stubby"; - longDescription = '' - Stubby is an application that acts as a local DNS Privacy stub - resolver (using RFC 7858, aka DNS-over-TLS). Stubby encrypts DNS - queries sent from a client machine (desktop or laptop) to a DNS - Privacy resolver increasing end user privacy. Stubby is developed by - the getdns team. - ''; - homepage = "https://dnsprivacy.org/dns_privacy_daemon_-_stubby/"; - }; + meta = metaCommon // { + description = "Local DNS Privacy stub resolver (using DNS-over-TLS)"; + mainProgram = "stubby"; + longDescription = '' + Stubby is an application that acts as a local DNS Privacy stub + resolver (using RFC 7858, aka DNS-over-TLS). Stubby encrypts DNS + queries sent from a client machine (desktop or laptop) to a DNS + Privacy resolver increasing end user privacy. Stubby is developed by + the getdns team. + ''; + homepage = "https://dnsprivacy.org/dns_privacy_daemon_-_stubby/"; + }; }; } From 06198190ca3588528300d0721d370e67bd717d1d Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 13:58:18 -0700 Subject: [PATCH 256/338] libint: remove with statements --- pkgs/development/libraries/libint/default.nix | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/pkgs/development/libraries/libint/default.nix b/pkgs/development/libraries/libint/default.nix index a6ad9498afa3..73e400810f61 100644 --- a/pkgs/development/libraries/libint/default.nix +++ b/pkgs/development/libraries/libint/default.nix @@ -111,11 +111,11 @@ let pname = "libint"; version = "2.9.0"; - meta = with lib; { + meta = { description = "Library for the evaluation of molecular integrals of many-body operators over Gaussian functions"; homepage = "https://github.com/evaleev/libint"; - license = with licenses; [ lgpl3Only gpl3Only ]; - maintainers = with maintainers; [ markuskowa sheepforce ]; + license = with lib.licenses; [ lgpl3Only gpl3Only ]; + maintainers = with lib.maintainers; [ markuskowa sheepforce ]; platforms = [ "x86_64-linux" ]; }; @@ -155,31 +155,31 @@ let buildInputs = [ boost eigen ]; - configureFlags = with lib; [ + configureFlags = [ "--with-max-am=${builtins.toString maxAm}" - "--with-eri-max-am=${concatStringsSep "," (builtins.map builtins.toString eriAm)}" - "--with-eri3-max-am=${concatStringsSep "," (builtins.map builtins.toString eri3Am)}" - "--with-eri2-max-am=${concatStringsSep "," (builtins.map builtins.toString eri2Am)}" - "--with-eri-opt-am=${concatStringsSep "," (builtins.map builtins.toString eriOptAm)}" - "--with-eri3-opt-am=${concatStringsSep "," (builtins.map builtins.toString eri3OptAm)}" - "--with-eri2-opt-am=${concatStringsSep "," (builtins.map builtins.toString eri2OptAm)}" + "--with-eri-max-am=${lib.concatStringsSep "," (builtins.map builtins.toString eriAm)}" + "--with-eri3-max-am=${lib.concatStringsSep "," (builtins.map builtins.toString eri3Am)}" + "--with-eri2-max-am=${lib.concatStringsSep "," (builtins.map builtins.toString eri2Am)}" + "--with-eri-opt-am=${lib.concatStringsSep "," (builtins.map builtins.toString eriOptAm)}" + "--with-eri3-opt-am=${lib.concatStringsSep "," (builtins.map builtins.toString eri3OptAm)}" + "--with-eri2-opt-am=${lib.concatStringsSep "," (builtins.map builtins.toString eri2OptAm)}" "--with-cartgauss-ordering=${cartGaussOrd}" "--with-shgauss-ordering=${shGaussOrd}" "--with-shell-set=${shellSet}" ] - ++ optional enableFMA "--enable-fma" - ++ optional (eriDeriv > 0) "--enable-eri=${builtins.toString eriDeriv}" - ++ optional (eri2Deriv > 0) "--enable-eri2=${builtins.toString eri2Deriv}" - ++ optional (eri3Deriv > 0) "--enable-eri3=${builtins.toString eri3Deriv}" - ++ lists.optionals enableOneBody [ + ++ lib.optional enableFMA "--enable-fma" + ++ lib.optional (eriDeriv > 0) "--enable-eri=${builtins.toString eriDeriv}" + ++ lib.optional (eri2Deriv > 0) "--enable-eri2=${builtins.toString eri2Deriv}" + ++ lib.optional (eri3Deriv > 0) "--enable-eri3=${builtins.toString eri3Deriv}" + ++ lib.optionals enableOneBody [ "--enable-1body=${builtins.toString oneBodyDerivOrd}" "--enable-1body-property-derivs" ] - ++ optional (multipoleOrd > 0) "--with-multipole-max-order=${builtins.toString multipoleOrd}" - ++ optional enableGeneric "--enable-generic" - ++ optional enableContracted "--enable-contracted-ints" - ++ optional eri3PureSh "--enable-eri3-pure-sh" - ++ optional eri2PureSh "--enable-eri2-pure-sh" + ++ lib.optional (multipoleOrd > 0) "--with-multipole-max-order=${builtins.toString multipoleOrd}" + ++ lib.optional enableGeneric "--enable-generic" + ++ lib.optional enableContracted "--enable-contracted-ints" + ++ lib.optional eri3PureSh "--enable-eri3-pure-sh" + ++ lib.optional eri2PureSh "--enable-eri2-pure-sh" ; preConfigure = '' From ead2eecbb23f24cf16c2b607afe5cf8dd5e17dd3 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 13:58:21 -0700 Subject: [PATCH 257/338] libplacebo: remove with statements --- .../development/libraries/libplacebo/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libplacebo/default.nix b/pkgs/development/libraries/libplacebo/default.nix index b9bcd3cd08e2..0ffa7b2828f3 100644 --- a/pkgs/development/libraries/libplacebo/default.nix +++ b/pkgs/development/libraries/libplacebo/default.nix @@ -53,14 +53,14 @@ stdenv.mkDerivation rec { fast-float ]; - mesonFlags = with lib; [ - (mesonBool "demos" false) # Don't build and install the demo programs - (mesonEnable "d3d11" false) # Disable the Direct3D 11 based renderer - (mesonEnable "glslang" false) # rely on shaderc for GLSL compilation instead - (mesonEnable "vk-proc-addr" vulkanSupport) - (mesonOption "vulkan-registry" "${vulkan-headers}/share/vulkan/registry/vk.xml") - ] ++ optionals stdenv.isDarwin [ - (mesonEnable "unwind" false) # libplacebo doesn’t build with `darwin.libunwind` + mesonFlags = [ + (lib.mesonBool "demos" false) # Don't build and install the demo programs + (lib.mesonEnable "d3d11" false) # Disable the Direct3D 11 based renderer + (lib.mesonEnable "glslang" false) # rely on shaderc for GLSL compilation instead + (lib.mesonEnable "vk-proc-addr" vulkanSupport) + (lib.mesonOption "vulkan-registry" "${vulkan-headers}/share/vulkan/registry/vk.xml") + ] ++ lib.optionals stdenv.isDarwin [ + (lib.mesonEnable "unwind" false) # libplacebo doesn’t build with `darwin.libunwind` ]; postPatch = '' From 97070902ca4ec5e40ffddab6e470e3584a604786 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 13:58:22 -0700 Subject: [PATCH 258/338] libucl: remove with statements --- pkgs/development/libraries/libucl/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libucl/default.nix b/pkgs/development/libraries/libucl/default.nix index 6275a85e6ee2..0adb3a66465e 100644 --- a/pkgs/development/libraries/libucl/default.nix +++ b/pkgs/development/libraries/libucl/default.nix @@ -36,17 +36,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = with lib; - concatLists ( - mapAttrsToList (feat: enabled: - optionals enabled (featureDeps."${feat}" or []) + buildInputs = lib.concatLists ( + lib.mapAttrsToList (feat: enabled: + lib.optionals enabled (featureDeps."${feat}" or []) ) features ); enableParallelBuilding = true; - configureFlags = with lib; - mapAttrsToList (feat: enabled: strings.enableFeature enabled feat) features; + configureFlags = lib.mapAttrsToList (feat: enabled: lib.strings.enableFeature enabled feat) features; meta = with lib; { description = "Universal configuration library parser"; From 4d44b70c86a70a62eda3bf703ee96c79643e395d Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 13:58:24 -0700 Subject: [PATCH 259/338] mvapich: remove with statements --- pkgs/development/libraries/mvapich/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/mvapich/default.nix b/pkgs/development/libraries/mvapich/default.nix index 2182c4083376..1299d06d4687 100644 --- a/pkgs/development/libraries/mvapich/default.nix +++ b/pkgs/development/libraries/mvapich/default.nix @@ -25,17 +25,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config bison makeWrapper gfortran ]; propagatedBuildInputs = [ numactl rdma-core zlib opensm ]; - buildInputs = with lib; [ + buildInputs = [ numactl libxml2 perl openssh hwloc - ] ++ optionals (network == "infiniband") [ rdma-core opensm ] - ++ optionals (network == "omnipath") [ libpsm2 libfabric ] - ++ optional useSlurm slurm; + ] ++ lib.optionals (network == "infiniband") [ rdma-core opensm ] + ++ lib.optionals (network == "omnipath") [ libpsm2 libfabric ] + ++ lib.optional useSlurm slurm; - configureFlags = with lib; [ + configureFlags = [ "--with-pm=hydra" "--enable-fortran=all" "--enable-cxx" @@ -43,10 +43,10 @@ stdenv.mkDerivation rec { "--enable-hybrid" "--enable-shared" "FFLAGS=-fallow-argument-mismatch" # fix build with gfortran 10 - ] ++ optional useSlurm "--with-pm=slurm" - ++ optional (network == "ethernet") "--with-device=ch3:sock" - ++ optionals (network == "infiniband") [ "--with-device=ch3:mrail" "--with-rdma=gen2" "--disable-ibv-dlopen" ] - ++ optionals (network == "omnipath") ["--with-device=ch3:psm" "--with-psm2=${libpsm2}"]; + ] ++ lib.optional useSlurm "--with-pm=slurm" + ++ lib.optional (network == "ethernet") "--with-device=ch3:sock" + ++ lib.optionals (network == "infiniband") [ "--with-device=ch3:mrail" "--with-rdma=gen2" "--disable-ibv-dlopen" ] + ++ lib.optionals (network == "omnipath") ["--with-device=ch3:psm" "--with-psm2=${libpsm2}"]; doCheck = true; From 13deb3a2a1ad07779b7206ed4b25404556c9b774 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 13:58:26 -0700 Subject: [PATCH 260/338] opencv: remove with statements --- pkgs/development/libraries/opencv/3.x.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index adb6532bd682..01479f31116e 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -134,9 +134,9 @@ let }; # See opencv/cmake/OpenCVDownload.cmake - installExtraFiles = extra : with lib; '' + installExtraFiles = extra : '' mkdir -p "${extra.dst}" - '' + concatStrings (mapAttrsToList (name : md5 : '' + '' + lib.concatStrings (lib.mapAttrsToList (name : md5 : '' ln -s "${extra.src}/${name}" "${extra.dst}/${md5}-${name}" '') extra.files); @@ -197,7 +197,7 @@ stdenv.mkDerivation { ++ lib.optional enableFfmpeg ffmpeg ++ lib.optionals (enableFfmpeg && stdenv.isDarwin) [ VideoDecodeAcceleration bzip2 ] - ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) + ++ lib.optionals enableGStreamer [ gst_all_1.gstreamer gst_all_1.gst-plugins-base ] ++ lib.optional enableOvis ogre ++ lib.optional enableGPhoto2 libgphoto2 ++ lib.optional enableDC1394 libdc1394 @@ -292,13 +292,13 @@ stdenv.mkDerivation { }; }; - meta = with lib; { + meta = { description = "Open Computer Vision Library with more than 500 algorithms"; homepage = "https://opencv.org/"; # OpenCV 3 won't build with CUDA 12+ broken = enableCuda && cudaPackages.cudaAtLeast "12"; - license = with licenses; if enableUnfree then unfree else bsd3; - maintainers = with maintainers; [mdaiter basvandijk]; - platforms = with platforms; linux ++ darwin; + license = if enableUnfree then lib.licenses.unfree else lib.licenses.bsd3; + maintainers = with lib.maintainers; [mdaiter basvandijk]; + platforms = with lib.platforms; linux ++ darwin; }; } From e949a91d02555ced9029cc6ae16df91e0145b723 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 13:58:28 -0700 Subject: [PATCH 261/338] opencv: remove with statements --- pkgs/development/libraries/opencv/4.x.nix | 40 +++++++++++------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index e2509ca5199a..eb10bd6c4673 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -228,9 +228,9 @@ let }; # See opencv/cmake/OpenCVDownload.cmake - installExtraFiles = extra: with lib; '' + installExtraFiles = extra: '' mkdir -p "${extra.dst}" - '' + concatStrings (flip mapAttrsToList extra.files (name: md5: '' + '' + lib.concatStrings (lib.flip lib.mapAttrsToList extra.files (name: md5: '' ln -s "${extra.src}/${name}" "${extra.dst}/${md5}-${name}" '')); installExtraFile = extra: '' @@ -332,15 +332,15 @@ effectiveStdenv.mkDerivation { ] ++ lib.optionals (enableFfmpeg && effectiveStdenv.isDarwin) [ bzip2 VideoDecodeAcceleration - ] ++ lib.optionals (enableGStreamer && effectiveStdenv.isLinux) (with gst_all_1; [ + ] ++ lib.optionals (enableGStreamer && effectiveStdenv.isLinux) [ elfutils - gst-plugins-base - gst-plugins-good - gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gstreamer libunwind orc zstd - ]) ++ lib.optionals enableOvis [ + ] ++ lib.optionals enableOvis [ ogre ] ++ lib.optionals enableGPhoto2 [ libgphoto2 @@ -371,21 +371,21 @@ effectiveStdenv.mkDerivation { ] ++ lib.optionals enableDocs [ doxygen graphviz-nox - ] ++ lib.optionals enableCuda (with cudaPackages; [ - cuda_cudart - cuda_cccl # - libnpp # npp.h - nvidia-optical-flow-sdk + ] ++ lib.optionals enableCuda [ + cudaPackages.cuda_cudart + cudaPackages.cuda_cccl # + cudaPackages.libnpp # npp.h + cudaPackages.nvidia-optical-flow-sdk ] ++ lib.optionals enableCublas [ # May start using the default $out instead once # https://github.com/NixOS/nixpkgs/issues/271792 # has been addressed - libcublas # cublas_v2.h + cudaPackages.libcublas # cublas_v2.h ] ++ lib.optionals enableCudnn [ - cudnn # cudnn.h + cudaPackages.cudnn # cudnn.h ] ++ lib.optionals enableCufft [ - libcufft # cufft.h - ]); + cudaPackages.libcufft # cufft.h + ]; propagatedBuildInputs = lib.optionals enablePython [ pythonPackages.numpy ]; @@ -549,11 +549,11 @@ effectiveStdenv.mkDerivation { }; } // lib.optionalAttrs enablePython { pythonPath = [ ]; }; - meta = with lib; { + meta = { description = "Open Computer Vision Library with more than 500 algorithms"; homepage = "https://opencv.org/"; - license = with licenses; if enableUnfree then unfree else bsd3; - maintainers = with maintainers; [ basvandijk ]; - platforms = with platforms; linux ++ darwin; + license = if enableUnfree then lib.licenses.unfree else lib.licenses.bsd3; + maintainers = with lib.maintainers; [ basvandijk ]; + platforms = with lib.platforms; linux ++ darwin; }; } From 2429bed6928bdc19e08c75aed5e70e977a3c72e9 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 13:58:29 -0700 Subject: [PATCH 262/338] openssl: remove with statements --- .../development/libraries/openssl/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 94934c489e52..5ddb26798af5 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -227,19 +227,19 @@ let passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = with lib; { + meta = { homepage = "https://www.openssl.org/"; changelog = "https://github.com/openssl/openssl/blob/openssl-${version}/CHANGES.md"; description = "Cryptographic library that implements the SSL and TLS protocols"; - license = licenses.openssl; + license = lib.licenses.openssl; mainProgram = "openssl"; - maintainers = with maintainers; [ thillux ] ++ lib.teams.stridtech.members; + maintainers = with lib.maintainers; [ thillux ] ++ lib.teams.stridtech.members; pkgConfigModules = [ "libcrypto" "libssl" "openssl" ]; - platforms = platforms.all; + platforms = lib.platforms.all; } // extraMeta; }); @@ -295,8 +295,8 @@ in { withDocs = true; - extraMeta = with lib; { - license = licenses.asl20; + extraMeta = { + license = lib.licenses.asl20; }; }; @@ -320,8 +320,8 @@ in { withDocs = true; - extraMeta = with lib; { - license = licenses.asl20; + extraMeta = { + license = lib.licenses.asl20; }; }; @@ -345,8 +345,8 @@ in { withDocs = true; - extraMeta = with lib; { - license = licenses.asl20; + extraMeta = { + license = lib.licenses.asl20; }; }; } From 99219bdfbc1847e728c3649b9c29fca824d92320 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 13:59:09 -0700 Subject: [PATCH 263/338] tensorrt: remove with statements --- .../libraries/science/math/tensorrt/extension.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/science/math/tensorrt/extension.nix b/pkgs/development/libraries/science/math/tensorrt/extension.nix index ffd9b672684c..7db869a2c169 100644 --- a/pkgs/development/libraries/science/math/tensorrt/extension.nix +++ b/pkgs/development/libraries/science/math/tensorrt/extension.nix @@ -12,11 +12,11 @@ final: prev: let majorMinorPatch = str: lib.concatStringsSep "." (lib.take 3 (lib.splitVersion str)); - tensorRTPackages = with lib; let + tensorRTPackages = let # Check whether a file is supported for our cuda version - isSupported = fileData: elem cudaVersion fileData.supportedCudaVersions; + isSupported = fileData: lib.elem cudaVersion fileData.supportedCudaVersions; # Return the first file that is supported. In practice there should only ever be one anyway. - supportedFile = files: findFirst isSupported null files; + supportedFile = files: lib.findFirst isSupported null files; # Compute versioned attribute name to be used in this package set computeName = version: "tensorrt_${toUnderscore version}"; @@ -34,11 +34,11 @@ final: prev: let supportedCudaVersions = [ ]; }; } - (mapAttrs' (version: attrs: nameValuePair (computeName version) attrs) - (filterAttrs (version: file: file != null) (mapAttrs (version: files: supportedFile files) tensorRTVersions))); + (lib.mapAttrs' (version: attrs: lib.nameValuePair (computeName version) attrs) + (lib.filterAttrs (version: file: file != null) (lib.mapAttrs (version: files: supportedFile files) tensorRTVersions))); # Add all supported builds as attributes - allBuilds = mapAttrs (name: file: buildTensorRTPackage (removeAttrs file ["fileVersionCuda"])) supportedVersions; + allBuilds = lib.mapAttrs (name: file: buildTensorRTPackage (lib.removeAttrs file ["fileVersionCuda"])) supportedVersions; # Set the default attributes, e.g. tensorrt = tensorrt_8_4; defaultName = computeName tensorRTDefaultVersion; From 11cddcd4ad0eef35cac9465496a15d576e276e52 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 13:59:12 -0700 Subject: [PATCH 264/338] zeroc-mcpp: remove with statements --- pkgs/development/libraries/zeroc-ice/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix index b41ec7f51174..9c8db3159396 100644 --- a/pkgs/development/libraries/zeroc-ice/default.nix +++ b/pkgs/development/libraries/zeroc-ice/default.nix @@ -50,19 +50,19 @@ in stdenv.mkDerivation rec { doCheck = true; nativeCheckInputs = with python3.pkgs; [ passlib ]; - checkPhase = with lib; let + checkPhase = let # these tests require network access so we need to skip them. - brokenTests = map escapeRegex [ + brokenTests = map lib.escapeRegex [ "Ice/udp" "Glacier2" "IceGrid/simple" "IceStorm" "IceDiscovery/simple" # FIXME: certificate expired, remove for next release? "IceSSL/configuration" ]; # matches CONFIGS flag in makeFlagsArray - configFlag = optionalString cpp11 "--config=cpp11-shared"; + configFlag = lib.optionalString cpp11 "--config=cpp11-shared"; in '' runHook preCheck - ${python3.interpreter} ./cpp/allTests.py ${configFlag} --rfilter='${concatStringsSep "|" brokenTests}' + ${python3.interpreter} ./cpp/allTests.py ${configFlag} --rfilter='${lib.concatStringsSep "|" brokenTests}' runHook postCheck ''; From 8526be06d2717098c255d4723fca4d0b4c2abc64 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:00:10 -0700 Subject: [PATCH 265/338] luaPackages.requiredLuaModules: remove with lib statement --- pkgs/development/lua-modules/lib.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/lua-modules/lib.nix b/pkgs/development/lua-modules/lib.nix index a527b2e1189f..df5dbc5d3024 100644 --- a/pkgs/development/lua-modules/lib.nix +++ b/pkgs/development/lua-modules/lib.nix @@ -1,9 +1,9 @@ { pkgs, lib, lua }: let inherit (lib.generators) toLua; - requiredLuaModules = drvs: with lib; let - modules = filter hasLuaModule drvs; - in unique ([lua] ++ modules ++ concatLists (catAttrs "requiredLuaModules" modules)); + requiredLuaModules = drvs: let + modules = lib.filter hasLuaModule drvs; + in lib.unique ([lua] ++ modules ++ lib.concatLists (lib.catAttrs "requiredLuaModules" modules)); # Check whether a derivation provides a lua module. hasLuaModule = drv: drv ? luaModule; From eded5c3275d376db93a167795ad539aa5e07dedf Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:00:35 -0700 Subject: [PATCH 266/338] luaPackages: remove with sstatement in overrides --- pkgs/development/lua-modules/overrides.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index fa83ee0e57ff..819144c0ec59 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -108,11 +108,11 @@ in cqueues = prev.cqueues.overrideAttrs (oa: rec { # Parse out a version number without the Lua version inserted - version = with lib; let + version = let version' = prev.cqueues.version; - rel = splitVersion version'; - date = head rel; - rev = last (splitString "-" (last rel)); + rel = lib.splitVersion version'; + date = lib.head rel; + rev = lib.last (lib.splitString "-" (lib.last rel)); in "${date}-${rev}"; @@ -203,7 +203,7 @@ in ''; meta.broken = luaOlder "5.1" || luaAtLeast "5.3"; - propagatedBuildInputs = with lib; oa.propagatedBuildInputs ++ optional (!isLuaJIT) final.luaffi; + propagatedBuildInputs = oa.propagatedBuildInputs ++ lib.optional (!isLuaJIT) final.luaffi; }); lgi = prev.lgi.overrideAttrs (oa: { From 633c856885a635ee56fcbd162bcb3be64f59ba6c Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:01:08 -0700 Subject: [PATCH 267/338] nodePackage: remove with statements in aliases --- pkgs/development/node-packages/aliases.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 4439a8684901..2f3cbaddec61 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -9,16 +9,16 @@ pkgs: lib: self: super: let # Removing recurseForDerivation prevents derivations of aliased attribute # set to appear while listing all the packages available. - removeRecurseForDerivations = alias: with lib; + removeRecurseForDerivations = alias: if alias.recurseForDerivations or false - then removeAttrs alias ["recurseForDerivations"] + then lib.removeAttrs alias ["recurseForDerivations"] else alias; # Disabling distribution prevents top-level aliases for non-recursed package # sets from building on Hydra. - removeDistribute = alias: with lib; - if isDerivation alias then - dontDistribute alias + removeDistribute = alias: + if lib.isDerivation alias then + lib.dontDistribute alias else alias; # Make sure that we are not shadowing something from node-packages.nix. From 8d7117294ca9645b44ae10d6ad09b8766f85847a Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:01:17 -0700 Subject: [PATCH 268/338] gnupg: remove with statements --- pkgs/development/php-packages/gnupg/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/php-packages/gnupg/default.nix b/pkgs/development/php-packages/gnupg/default.nix index 6b5e7e326ec5..0efe23466840 100644 --- a/pkgs/development/php-packages/gnupg/default.nix +++ b/pkgs/development/php-packages/gnupg/default.nix @@ -32,25 +32,25 @@ buildPecl { --replace 'SEARCH_PATH="/usr/local /usr /opt"' 'SEARCH_PATH="${gpgme.dev}"' ''; - postConfigure = with lib; '' + postConfigure = '' substituteInPlace Makefile \ --replace 'run-tests.php' 'run-tests.php -q --offline' substituteInPlace tests/gnupg_res_init_file_name.phpt \ --replace '/usr/bin/gpg' '${gnupg}/bin/gpg' \ - --replace 'string(12)' 'string(${toString (stringLength "${gnupg}/bin/gpg")})' + --replace 'string(12)' 'string(${toString (lib.stringLength "${gnupg}/bin/gpg")})' substituteInPlace tests/gnupg_oo_init_file_name.phpt \ --replace '/usr/bin/gpg' '${gnupg}/bin/gpg' \ - --replace 'string(12)' 'string(${toString (stringLength "${gnupg}/bin/gpg")})' + --replace 'string(12)' 'string(${toString (lib.stringLength "${gnupg}/bin/gpg")})' ''; doCheck = true; - meta = with lib; { + meta = { changelog = "https://github.com/php-gnupg/php-gnupg/releases/tag/gnupg-${version}"; broken = lib.versionOlder php.version "8.1"; # Broken on PHP older than 8.1. description = "PHP wrapper for GpgME library that provides access to GnuPG"; - license = licenses.bsd3; + license = lib.licenses.bsd3; homepage = "https://pecl.php.net/package/gnupg"; - maintainers = with maintainers; [ taikx4 ] ++ teams.php.members; + maintainers = with lib.maintainers; [ taikx4 ] ++ lib.teams.php.members; }; } From b45066a87529fcde506422846d735b1c55a0a6b7 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:01:30 -0700 Subject: [PATCH 269/338] python-lsp-black: remove with statements --- pkgs/development/python-modules/python-lsp-black/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-lsp-black/default.nix b/pkgs/development/python-modules/python-lsp-black/default.nix index 6c3dcfbb6994..2a963148439a 100644 --- a/pkgs/development/python-modules/python-lsp-black/default.nix +++ b/pkgs/development/python-modules/python-lsp-black/default.nix @@ -36,11 +36,11 @@ buildPythonPackage rec { includes a series of patches fixing tests not yet released as 2.0.1+ version they are meant to keep up to date with black releases */ - lib.optional (with lib; versionAtLeast black.version "24.2.0") (fetchpatch { + lib.optional (lib.versionAtLeast black.version "24.2.0") (fetchpatch { url = "https://github.com/python-lsp/python-lsp-black/commit/d43b41431379f9c9bb05fab158c4d97e6d515f8f.patch"; hash = "sha256-38bYU27+xtA8Kq3appXTkNnkG5/XgrUJ2nQ5+yuSU2U="; }) - ++ lib.optional (with lib; versionAtLeast black.version "24.3.0") (fetchpatch { + ++ lib.optional (lib.versionAtLeast black.version "24.3.0") (fetchpatch { url = "https://github.com/python-lsp/python-lsp-black/commit/9298585a9d14d25920c33b188d79e820dc98d4a9.patch"; hash = "sha256-4u0VIS7eidVEiKRW2wc8lJVkJwhzJD/M+uuqmTtiZ7E="; }); From 8b61506fec468d408d042693d0f1418d5486edf8 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:02:31 -0700 Subject: [PATCH 270/338] python311Packages.spacy: remove with statements --- pkgs/development/python-modules/spacy/models.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/spacy/models.nix b/pkgs/development/python-modules/spacy/models.nix index bb795682a187..a8e99669b448 100644 --- a/pkgs/development/python-modules/spacy/models.nix +++ b/pkgs/development/python-modules/spacy/models.nix @@ -88,14 +88,14 @@ let popd || exit ''; - meta = with lib; { + meta = { description = "Models for the spaCy NLP library"; homepage = "https://github.com/explosion/spacy-models"; - license = licenses.${license}; + license = lib.licenses.${license}; }; }; makeModelSet = - models: with lib; listToAttrs (map (m: nameValuePair m.pname (buildModelPackage m)) models); + models: lib.listToAttrs (map (m: lib.nameValuePair m.pname (buildModelPackage m)) models); in makeModelSet (lib.importJSON ./models.json) From 4785eeeea3a1230875c4913d8379a4a9e6dcfe36 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:03:12 -0700 Subject: [PATCH 271/338] python311Packages.tensorflow: remove with statements --- pkgs/development/python-modules/tensorflow/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index b1a2dd0f9097..31639d48f934 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -589,15 +589,14 @@ let }; meta = - with lib; { badPlatforms = lib.optionals cudaSupport lib.platforms.darwin; changelog = "https://github.com/tensorflow/tensorflow/releases/tag/v${version}"; description = "Computation using data flow graphs for scalable machine learning"; homepage = "http://tensorflow.org"; - license = licenses.asl20; - maintainers = with maintainers; [ abbradar ]; - platforms = with platforms; linux ++ darwin; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ abbradar ]; + platforms = with lib.platforms; linux ++ darwin; broken = stdenv.isDarwin || !(xlaSupport -> cudaSupport) From c434f3c029b6bfa1f97cc6e1c1e1cf428c2368d5 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:03:47 -0700 Subject: [PATCH 272/338] python3Packages.tinyobjloader-py: remove with statements --- .../python-modules/tinyobjloader-py/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/tinyobjloader-py/default.nix b/pkgs/development/python-modules/tinyobjloader-py/default.nix index 1d0b621c482d..ea3d31342c25 100644 --- a/pkgs/development/python-modules/tinyobjloader-py/default.nix +++ b/pkgs/development/python-modules/tinyobjloader-py/default.nix @@ -21,10 +21,7 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "tinyobjloader" ]; - meta = - with lib; - tinyobjloader.meta - // { - description = "Python wrapper for the C++ wavefront .obj loader tinyobjloader"; - }; + meta = tinyobjloader.meta // { + description = "Python wrapper for the C++ wavefront .obj loader tinyobjloader"; + }; } From 49ddbfef6cffcf03fc0e5d3ce8b5600b65af0135 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:04:20 -0700 Subject: [PATCH 273/338] python3Packages.vega-datasets: remove with statements --- pkgs/development/python-modules/vega-datasets/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/vega-datasets/default.nix b/pkgs/development/python-modules/vega-datasets/default.nix index 09da2c1f0792..b7de5f6c1b65 100644 --- a/pkgs/development/python-modules/vega-datasets/default.nix +++ b/pkgs/development/python-modules/vega-datasets/default.nix @@ -29,14 +29,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "vega_datasets" ]; meta = - with lib; let - tag = removeSuffix ".0" "v${version}"; + tag = lib.removeSuffix ".0" "v${version}"; in { description = "Python package for offline access to vega datasets"; homepage = "https://github.com/altair-viz/vega_datasets"; changelog = "https://github.com/altair-viz/vega_datasets/blob/${tag}/CHANGES.md"; - license = licenses.mit; + license = lib.licenses.mit; }; } From 623a797295bc58026eed59c06e61affeb27516d1 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:04:32 -0700 Subject: [PATCH 274/338] azure-static-sites-client: remove with statements --- .../tools/azure-static-sites-client/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/azure-static-sites-client/default.nix b/pkgs/development/tools/azure-static-sites-client/default.nix index 452976b7282a..126eaf1ec68e 100644 --- a/pkgs/development/tools/azure-static-sites-client/default.nix +++ b/pkgs/development/tools/azure-static-sites-client/default.nix @@ -14,7 +14,7 @@ }: let versions = lib.importJSON ./versions.json; - flavor = with lib; head (filter (x: x.version == versionFlavor) versions); + flavor = lib.head (lib.filter (x: x.version == versionFlavor) versions); fetchBinary = runtimeId: fetchurl { url = flavor.files.${runtimeId}.url; sha256 = flavor.files.${runtimeId}.sha; @@ -53,7 +53,7 @@ stdenv.mkDerivation { install -m755 "$src" -D "$out/bin/StaticSitesClient" for icu_lib in 'icui18n' 'icuuc' 'icudata'; do - patchelf --add-needed "lib''${icu_lib}.so.${with lib; head (splitVersion (getVersion icu70.name))}" "$out/bin/StaticSitesClient" + patchelf --add-needed "lib''${icu_lib}.so.${lib.head (lib.splitVersion (lib.getVersion icu70.name))}" "$out/bin/StaticSitesClient" done patchelf --add-needed 'libgssapi_krb5.so' \ @@ -79,19 +79,19 @@ stdenv.mkDerivation { passthru = { # Create tests for all flavors - tests = with lib; genAttrs (map (x: x.version) versions) (versionFlavor: + tests = lib.genAttrs (map (x: x.version) versions) (versionFlavor: azure-static-sites-client.override { inherit versionFlavor; } ); updateScript = ./update.sh; }; - meta = with lib; { + meta = { description = "Azure static sites client"; homepage = "https://github.com/Azure/static-web-apps-cli"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; + license = lib.licenses.unfree; mainProgram = "StaticSitesClient"; - maintainers = with maintainers; [ veehaitch ]; + maintainers = with lib.maintainers; [ veehaitch ]; platforms = [ "x86_64-linux" ]; }; } From d3d5b2d2f56d1f02807904d4dcfd3cf6e1fa7d8b Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:05:05 -0700 Subject: [PATCH 275/338] gdb: remove with statements --- pkgs/development/tools/misc/gdb/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 7f97eebce157..da8167b3b16e 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { ''; configureScript = "../configure"; - configureFlags = with lib; [ + configureFlags = [ # Set the program prefix to the current targetPrefix. # This ensures that the prefix always conforms to # nixpkgs' expectations instead of relying on the build @@ -139,7 +139,7 @@ stdenv.mkDerivation rec { ''; }; - meta = with lib; { + meta = { mainProgram = "gdb"; description = "GNU Project debugger"; @@ -155,7 +155,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; # GDB upstream does not support ARM darwin - platforms = with platforms; linux ++ cygwin ++ freebsd ++ ["x86_64-darwin"]; - maintainers = with maintainers; [ pierron globin lsix ]; + platforms = with lib.platforms; linux ++ cygwin ++ freebsd ++ ["x86_64-darwin"]; + maintainers = with lib.maintainers; [ pierron globin lsix ]; }; } From 479dd4d050ba787a2074189c5f354415be7c9f5d Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:05:29 -0700 Subject: [PATCH 276/338] lsof: remove with statements --- pkgs/development/tools/misc/lsof/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index b43030594d3d..de1decee524f 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, buildPackages, perl, which, ncurses, nukeReferences }: let - dialect = with lib; last (splitString "-" stdenv.hostPlatform.system); + dialect = lib.last (lib.splitString "-" stdenv.hostPlatform.system); in stdenv.mkDerivation rec { @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { cp lsof $out/bin ''; - meta = with lib; { + meta = { homepage = "https://github.com/lsof-org/lsof"; description = "Tool to list open files"; mainProgram = "lsof"; @@ -62,8 +62,8 @@ stdenv.mkDerivation rec { socket (IPv6/IPv4/UNIX local), or partition (by opening a file from it). ''; - license = licenses.purdueBsd; - maintainers = with maintainers; [ dezgeg ]; - platforms = platforms.unix; + license = lib.licenses.purdueBsd; + maintainers = with lib.maintainers; [ dezgeg ]; + platforms = lib.platforms.unix; }; } From 979820ea65bfd00a8b43745633b292c703201507 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:05:32 -0700 Subject: [PATCH 277/338] ezquake: remove with statements --- pkgs/games/ezquake/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/games/ezquake/default.nix b/pkgs/games/ezquake/default.nix index 4cc6bd2258b5..579783af2ef8 100644 --- a/pkgs/games/ezquake/default.nix +++ b/pkgs/games/ezquake/default.nix @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { expat curl jansson libpng libjpeg libGLU libGL libsndfile libXxf86vm pcre SDL2 vim speex ]; - installPhase = with lib; let - sys = last (splitString "-" stdenv.hostPlatform.system); - arch = head (splitString "-" stdenv.hostPlatform.system); + installPhase = let + sys = lib.last (lib.splitString "-" stdenv.hostPlatform.system); + arch = lib.head (lib.splitString "-" stdenv.hostPlatform.system); in '' mkdir -p $out/bin find . @@ -31,12 +31,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { + meta = { homepage = "https://ezquake.com/"; description = "Modern QuakeWorld client focused on competitive online play"; mainProgram = "ezquake"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ edwtjo ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ edwtjo ]; }; } From 96d895f6a9eafa843c343090e953d4945ff20d61 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:05:34 -0700 Subject: [PATCH 278/338] mindustry: remove with statements --- pkgs/games/mindustry/default.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index 7e739b2a8c0f..789b2bca65a5 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -162,9 +162,9 @@ stdenv.mkDerivation { gradleFlags = [ "-Pbuildversion=${buildVersion}" "-Dorg.gradle.java.home=${jdk}" ]; - buildPhase = with lib; optionalString enableServer '' + buildPhase = lib.optionalString enableServer '' gradle server:dist - '' + optionalString enableClient '' + '' + lib.optionalString enableClient '' pushd ../Arc gradle jnigenBuild gradle jnigenJarNativesDesktop @@ -181,7 +181,7 @@ stdenv.mkDerivation { gradle desktop:dist ''; - installPhase = with lib; let + installPhase = let installClient = '' install -Dm644 desktop/build/libs/Mindustry.jar $out/share/mindustry.jar mkdir -p $out/bin @@ -189,7 +189,7 @@ stdenv.mkDerivation { --add-flags "-jar $out/share/mindustry.jar" \ ${lib.optionalString stdenv.isLinux "--suffix PATH : ${lib.makeBinPath [zenity]}"} \ --suffix LD_LIBRARY_PATH : ${lib.makeLibraryPath [libpulseaudio alsa-lib libjack2]} \ - --set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib/'' + optionalString enableWayland '' \ + --set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib/'' + lib.optionalString enableWayland '' \ --set SDL_VIDEODRIVER wayland \ --set SDL_VIDEO_WAYLAND_WMCLASS Mindustry '' + '' @@ -214,8 +214,8 @@ stdenv.mkDerivation { ''; in '' runHook preInstall - '' + optionalString enableClient installClient - + optionalString enableServer installServer + '' + lib.optionalString enableClient installClient + + lib.optionalString enableServer installServer + '' runHook postInstall ''; @@ -228,17 +228,17 @@ stdenv.mkDerivation { passthru.tests.nixosTest = nixosTests.mindustry; - meta = with lib; { + meta = { homepage = "https://mindustrygame.github.io/"; downloadPage = "https://github.com/Anuken/Mindustry/releases"; description = "Sandbox tower defense game"; - sourceProvenance = with sourceTypes; [ + sourceProvenance = with lib.sourceTypes; [ fromSource binaryBytecode # deps ]; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ chkno fgaz thekostins ]; - platforms = platforms.all; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ chkno fgaz thekostins ]; + platforms = lib.platforms.all; # TODO alsa-lib is linux-only, figure out what dependencies are required on Darwin broken = enableClient && stdenv.isDarwin; }; From 8910fea8d216e9aaab508da6996362263981a96b Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:05:35 -0700 Subject: [PATCH 279/338] simutrans: remove with statements --- pkgs/games/simutrans/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index 0a4ec4f326eb..6a48c5a2caeb 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -6,9 +6,9 @@ let # Choose your "paksets" of objects, images, text, music, etc. paksets = config.simutrans.paksets or "pak64 pak64.japan pak128 pak128.britain pak128.german"; - result = with lib; withPaks ( - if paksets == "*" then attrValues pakSpec # taking all - else map (name: pakSpec.${name}) (splitString " " paksets) + result = withPaks ( + if paksets == "*" then lib.attrValues pakSpec # taking all + else map (name: pakSpec.${name}) (lib.splitString " " paksets) ); ver1 = "121"; @@ -152,7 +152,7 @@ let mv build/default/sim $out/bin/simutrans ''; - meta = with lib; { + meta = { description = "Simulation game in which the player strives to run a successful transport system"; mainProgram = "simutrans"; longDescription = '' @@ -163,9 +163,9 @@ let ''; homepage = "http://www.simutrans.com/"; - license = with licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ ]; - platforms = with platforms; linux; # TODO: ++ darwin; + platforms = lib.platforms.linux; # TODO: ++ darwin; }; }; From 8ee773a28e8a953ee751c28f90b33d9d5d04a73f Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:05:37 -0700 Subject: [PATCH 280/338] ultrastardx: remove with statements --- pkgs/games/ultrastardx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix index 7708652d22b3..ed206fd582d3 100644 --- a/pkgs/games/ultrastardx/default.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -67,8 +67,8 @@ in stdenv.mkDerivation rec { -i src/lib/ffmpeg-4.0/swscale.pas ''; - preBuild = with lib; - let items = concatMapStringsSep " " (x: "-rpath ${getLib x}/lib") sharedLibs; + preBuild = + let items = lib.concatMapStringsSep " " (x: "-rpath ${lib.getLib x}/lib") sharedLibs; in '' export NIX_LDFLAGS="$NIX_LDFLAGS ${items}" ''; From 9062806b52286d8e223e6110f75c43b80336fbd9 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:05:39 -0700 Subject: [PATCH 281/338] brgenml1lpr: remove with statements --- pkgs/misc/cups/drivers/brgenml1lpr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix b/pkgs/misc/cups/drivers/brgenml1lpr/default.nix index 1e838db93263..d683e80b2893 100644 --- a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix +++ b/pkgs/misc/cups/drivers/brgenml1lpr/default.nix @@ -28,9 +28,9 @@ */ let - myPatchElf = file: with lib; '' + myPatchElf = file: '' patchelf --set-interpreter \ - ${stdenv.cc.libc}/lib/ld-linux${optionalString stdenv.is64bit "-x86-64"}.so.2 \ + ${stdenv.cc.libc}/lib/ld-linux${lib.optionalString stdenv.is64bit "-x86-64"}.so.2 \ ${file} ''; in From 7b3a3f3f8bdde57169a2ceb26fea1dc2432b2167 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:05:40 -0700 Subject: [PATCH 282/338] freebsd.mkDerivation: remove with statements --- .../bsd/freebsd/pkgs/mkDerivation.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix b/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix index aae852c48798..4c2fe571999f 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix @@ -73,17 +73,14 @@ lib.makeOverridable ( strictDeps = true; - meta = - with lib; - { - maintainers = with maintainers; [ - rhelmot - artemist - ]; - platforms = platforms.unix; - license = licenses.bsd2; - } - // attrs.meta or { }; + meta = { + maintainers = with lib.maintainers; [ + rhelmot + artemist + ]; + platforms = lib.platforms.unix; + license = lib.licenses.bsd2; + } // attrs.meta or { }; } // lib.optionalAttrs stdenv'.hasCC { # TODO should CC wrapper set this? From 17a74527b5d3a2dfe75c43d58edb3d425dcee91c Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:07:17 -0700 Subject: [PATCH 283/338] cryptsetup: remove with statements --- pkgs/os-specific/linux/cryptsetup/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index 39f03c475fda..044daf848467 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { # support, because the path still gets included in the binary even # though it isn't used. "--with-luks2-external-tokens-path=/" - ] ++ (with lib; mapAttrsToList (flip enableFeature)) programs; + ] ++ (lib.mapAttrsToList (lib.flip lib.enableFeature)) programs; nativeBuildInputs = [ pkg-config ] ++ lib.optionals rebuildMan [ asciidoctor ]; buildInputs = [ lvm2 json_c openssl libuuid popt ] ++ lib.optional (!withInternalArgon2) libargon2; From 9a6897925d997bf27389a3b9611fea2514361cce Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:07:49 -0700 Subject: [PATCH 284/338] deviceTree: remove with statements --- pkgs/os-specific/linux/device-tree/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/device-tree/default.nix b/pkgs/os-specific/linux/device-tree/default.nix index a15a9e32137c..87c9b84e1240 100644 --- a/pkgs/os-specific/linux/device-tree/default.nix +++ b/pkgs/os-specific/linux/device-tree/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, stdenvNoCC, dtc }: -with lib; { +{ # Compile single Device Tree overlay source # file (.dts) into its compiled variant (.dtb) compileDTS = ({ @@ -28,7 +28,7 @@ with lib; { name = "device-tree-overlays"; nativeBuildInputs = [ dtc ]; buildCommand = let - overlays = toList overlays'; + overlays = lib.toList overlays'; in '' mkdir -p $out cd "${base}" @@ -40,7 +40,7 @@ with lib; { # skip files without `compatible` string test -z "$dtbCompat" && continue - ${flip (concatMapStringsSep "\n") overlays (o: '' + ${lib.flip (lib.concatMapStringsSep "\n") overlays (o: '' overlayCompat="$(fdtget -t s "${o.dtboFile}" / compatible)" # skip incompatible and non-matching overlays From 460c91c5aecba5580f17c89e49677370b5dbfa55 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:08:03 -0700 Subject: [PATCH 285/338] nv-fabricmanager: remove with statements --- pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix b/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix index e70857ea356e..818d847f2196 100644 --- a/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix +++ b/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix @@ -3,7 +3,7 @@ nvidia_x11: sha256: { stdenv, lib, fetchurl, patchelf }: let - sys = with lib; concatStringsSep "-" (reverseList (splitString "-" stdenv.system)); + sys = lib.concatStringsSep "-" (lib.reverseList (lib.splitString "-" stdenv.system)); bsys = builtins.replaceStrings ["_"] ["-"] sys; fmver = nvidia_x11.version; in @@ -35,12 +35,12 @@ stdenv.mkDerivation rec { done ''; - meta = with lib; { + meta = { homepage = "https://www.nvidia.com/object/unix.html"; description = "Fabricmanager daemon for NVLink intialization and control"; - license = licenses.unfreeRedistributable; + license = lib.licenses.unfreeRedistributable; platforms = nvidia_x11.meta.platforms; mainProgram = "nv-fabricmanager"; - maintainers = with maintainers; [ edwtjo ]; + maintainers = with lib.maintainers; [ edwtjo ]; }; } From 1f6ce17b6d6e41e3a68cffe54442aff985fd49c9 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:09:02 -0700 Subject: [PATCH 286/338] formats: remove with statements --- pkgs/pkgs-lib/formats.nix | 52 +++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix index 8fc808b2646f..c99144d93519 100644 --- a/pkgs/pkgs-lib/formats.nix +++ b/pkgs/pkgs-lib/formats.nix @@ -45,9 +45,13 @@ rec { php = (import ./formats/php/default.nix { inherit lib pkgs; }).format; + inherit (lib) mkOptionType; + inherit (lib.types) nullOr oneOf coercedTo listOf nonEmptyListOf attrsOf either; + inherit (lib.types) bool int float str path; + json = {}: { - type = with lib.types; let + type = let valueType = nullOr (oneOf [ bool int @@ -83,7 +87,7 @@ rec { json2yaml "$valuePath" "$out" '') {}; - type = with lib.types; let + type = let valueType = nullOr (oneOf [ bool int @@ -102,10 +106,10 @@ rec { # the ini formats share a lot of code inherit ( let - singleIniAtom = with lib.types; nullOr (oneOf [ bool int float str ]) // { + singleIniAtom = nullOr (oneOf [ bool int float str ]) // { description = "INI atom (null, bool, int, float or string)"; }; - iniAtom = with lib.types; { listsAsDuplicateKeys, listToValue }: + iniAtom = { listsAsDuplicateKeys, listToValue }: if listsAsDuplicateKeys then coercedTo singleIniAtom lib.singleton (listOf singleIniAtom) // { description = singleIniAtom.description + " or a list of them for duplicate keys"; @@ -116,7 +120,7 @@ rec { } else singleIniAtom; - iniSection = with lib.types; { listsAsDuplicateKeys, listToValue }@args: + iniSection = { listsAsDuplicateKeys, listToValue }@args: attrsOf (iniAtom args) // { description = "section of an INI file (attrs of " + (iniAtom args).description + ")"; }; @@ -183,7 +187,7 @@ rec { listsAsDuplicateKeys = listsAsDuplicateKeys; listToValue = null; }; - in with lib.types; attrsOf (attrsOf (either atom (attrsOf atom))); + in attrsOf (attrsOf (either atom (attrsOf atom))); generate = name: value: pkgs.writeText name (lib.generators.toGitINI value); }; @@ -215,7 +219,7 @@ rec { assert listsAsDuplicateKeys -> listToValue == null; { - type = with lib.types; let + type = let singleAtom = nullOr (oneOf [ bool @@ -254,7 +258,7 @@ rec { }; toml = {}: json {} // { - type = with lib.types; let + type = let valueType = oneOf [ bool int @@ -312,18 +316,18 @@ rec { [Tuple]: */ elixirConf = { elixir ? pkgs.elixir }: - with lib; let - toElixir = value: with builtins; + let + toElixir = value: if value == null then "nil" else if value == true then "true" else if value == false then "false" else - if isInt value || isFloat value then toString value else - if isString value then string value else - if isAttrs value then attrs value else - if isList value then list value else + if lib.isInt value || lib.isFloat value then toString value else + if lib.isString value then string value else + if lib.isAttrs value then attrs value else + if lib.isList value then list value else abort "formats.elixirConf: should never happen (value = ${value})"; - escapeElixir = escape [ "\\" "#" "\"" ]; + escapeElixir = lib.escape [ "\\" "#" "\"" ]; string = value: "\"${escapeElixir value}\""; attrs = set: @@ -331,11 +335,11 @@ rec { else let toKeyword = name: value: "${name}: ${toElixir value}"; - keywordList = concatStringsSep ", " (mapAttrsToList toKeyword set); + keywordList = lib.concatStringsSep ", " (lib.mapAttrsToList toKeyword set); in "[" + keywordList + "]"; - listContent = values: concatStringsSep ", " (map toElixir values); + listContent = values: lib.concatStringsSep ", " (map toElixir values); list = values: "[" + (listContent values) + "]"; @@ -349,7 +353,7 @@ rec { elixirMap = set: let toEntry = name: value: "${toElixir name} => ${toElixir value}"; - entries = concatStringsSep ", " (mapAttrsToList toEntry set); + entries = lib.concatStringsSep ", " (lib.mapAttrsToList toEntry set); in "%{${entries}}"; @@ -359,17 +363,17 @@ rec { let keyConfig = rootKey: key: value: "config ${rootKey}, ${key}, ${toElixir value}"; - keyConfigs = rootKey: values: mapAttrsToList (keyConfig rootKey) values; - rootConfigs = flatten (mapAttrsToList keyConfigs values); + keyConfigs = rootKey: values: lib.mapAttrsToList (keyConfig rootKey) values; + rootConfigs = lib.flatten (lib.mapAttrsToList keyConfigs values); in '' import Config - ${concatStringsSep "\n" rootConfigs} + ${lib.concatStringsSep "\n" rootConfigs} ''; in { - type = with lib.types; let + type = let valueType = nullOr (oneOf [ bool @@ -429,7 +433,7 @@ rec { It also reexports standard types, wrapping them so that they can also be raw Elixir. */ - types = with lib.types; let + types = let isElixirType = type: x: (x._elixirType or "") == type; rawElixir = mkOptionType { @@ -480,7 +484,7 @@ rec { # Outputs a succession of Python variable assignments # Useful for many Django-based services pythonVars = {}: { - type = with lib.types; let + type = let valueType = nullOr(oneOf [ bool float From 6d77de48e2c1f4090ec0c6e03ef0d1410039dfda Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:09:11 -0700 Subject: [PATCH 287/338] apacheKafka: remove with statements --- pkgs/servers/apache-kafka/default.nix | 28 +++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index 815905f76edb..b69a9d62d81c 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -18,17 +18,17 @@ let }; }; - build = versionInfo: with versionInfo; stdenv.mkDerivation rec { - version = "${scalaVersion}-${kafkaVersion}"; + build = versionInfo: stdenv.mkDerivation rec { + version = "${versionInfo.scalaVersion}-${versionInfo.kafkaVersion}"; pname = "apache-kafka"; src = fetchurl { - url = "mirror://apache/kafka/${kafkaVersion}/kafka_${version}.tgz"; - inherit sha256; + url = "mirror://apache/kafka/${versionInfo.kafkaVersion}/kafka_${version}.tgz"; + inherit (versionInfo) sha256; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jre bash gnugrep gnused coreutils ps ]; + buildInputs = [ versionInfo.jre bash gnugrep gnused coreutils ps ]; installPhase = '' mkdir -p $out @@ -47,7 +47,7 @@ let for p in $out/bin\/*.sh; do wrapProgram $p \ - --set JAVA_HOME "${jre}" \ + --set JAVA_HOME "${versionInfo.jre}" \ --set KAFKA_LOG_DIR "/tmp/apache-kafka-logs" \ --prefix PATH : "${bash}/bin:${coreutils}/bin:${gnugrep}/bin:${gnused}/bin" done @@ -55,19 +55,19 @@ let ''; passthru = { - inherit jre; # Used by the NixOS module to select the supported jre + inherit (versionInfo) jre; # Used by the NixOS module to select the supported JRE tests.nixos = versionInfo.nixosTest; }; - meta = with lib; { + meta = { homepage = "https://kafka.apache.org"; description = "High-throughput distributed messaging system"; - license = licenses.asl20; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - maintainers = [ maintainers.ragge ]; - platforms = platforms.unix; + license = lib.licenses.asl20; + sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; + maintainers = [ lib.maintainers.ragge ]; + platforms = lib.platforms.unix; }; }; -in with lib; mapAttrs' - (majorVersion: versionInfo: nameValuePair "apacheKafka_${majorVersion}" (build versionInfo)) +in lib.mapAttrs' + (majorVersion: versionInfo: lib.nameValuePair "apacheKafka_${majorVersion}" (build versionInfo)) versionMap From d6236f244afa3e6dba0f8d1e00b393dd4e2dcefb Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:09:31 -0700 Subject: [PATCH 288/338] slurm: remove with statements --- pkgs/servers/computing/slurm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 0f7e144b0c15..2419ac8c6c71 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -64,8 +64,8 @@ stdenv.mkDerivation rec { ] ++ lib.optionals enableX11 [ xorg.xauth ] ++ lib.optionals enableGtk2 [ gtk2 ]; - configureFlags = with lib; - [ "--with-freeipmi=${freeipmi}" + configureFlags = [ + "--with-freeipmi=${freeipmi}" "--with-http-parser=${http-parser}" "--with-hwloc=${lib.getDev hwloc}" "--with-json=${lib.getDev json_c}" @@ -78,8 +78,8 @@ stdenv.mkDerivation rec { "--with-pmix=${lib.getDev pmix}" "--with-bpf=${libbpf}" "--without-rpath" # Required for configure to pick up the right dlopen path - ] ++ (optional enableGtk2 "--disable-gtktest") - ++ (optional (!enableX11) "--disable-x11"); + ] ++ (lib.optional enableGtk2 "--disable-gtktest") + ++ (lib.optional (!enableX11) "--disable-x11"); preConfigure = '' From 82929eb694f194cc359ba37f899c2de95640d1e5 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:09:33 -0700 Subject: [PATCH 289/338] public-inbox: remove with statements --- pkgs/servers/mail/public-inbox/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/servers/mail/public-inbox/default.nix b/pkgs/servers/mail/public-inbox/default.nix index 9918d075a733..05dc98b466d4 100644 --- a/pkgs/servers/mail/public-inbox/default.nix +++ b/pkgs/servers/mail/public-inbox/default.nix @@ -78,8 +78,7 @@ let "v2mirror" ]; - testConditions = with lib; - concatMapStringsSep " " (n: "! -name ${escapeShellArg n}.t") skippedTests; + testConditions = lib.concatMapStringsSep " " (n: "! -name ${lib.escapeShellArg n}.t") skippedTests; in From 07c453277e6484c7e97c41e2e0be65ead7155e8f Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:10:44 -0700 Subject: [PATCH 290/338] check-{mssql,nwc,ups}-health: remove with statements --- .../monitoring/plugins/labs_consol_de.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/monitoring/plugins/labs_consol_de.nix b/pkgs/servers/monitoring/plugins/labs_consol_de.nix index b30fd4b27577..255fd01f71f2 100644 --- a/pkgs/servers/monitoring/plugins/labs_consol_de.nix +++ b/pkgs/servers/monitoring/plugins/labs_consol_de.nix @@ -22,14 +22,14 @@ let nativeBuildInputs = [ autoreconfHook makeWrapper ]; - prePatch = with lib; '' + prePatch = '' rm -rf GLPlugin ln -s ${glplugin} GLPlugin substituteInPlace plugins-scripts/Makefile.am \ - --replace /bin/cat ${getBin coreutils}/bin/cat \ - --replace /bin/echo ${getBin coreutils}/bin/echo \ - --replace /bin/grep ${getBin gnugrep}/bin/grep \ - --replace /bin/sed ${getBin gnused}/bin/sed + --replace /bin/cat ${lib.getBin coreutils}/bin/cat \ + --replace /bin/echo ${lib.getBin coreutils}/bin/echo \ + --replace /bin/grep ${lib.getBin gnugrep}/bin/grep \ + --replace /bin/sed ${lib.getBin gnused}/bin/sed ''; postInstall = '' @@ -42,10 +42,10 @@ let done ''; - meta = with lib; { + meta = { homepage = "https://labs.consol.de/"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ peterhoeg ]; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ peterhoeg ]; inherit description; }; }; From 31d91e9af647d719115d8a161b1bb3e95016f61d Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:10:54 -0700 Subject: [PATCH 291/338] sphinxsearch: remove with statements --- pkgs/servers/search/sphinxsearch/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/servers/search/sphinxsearch/default.nix index 33725697d799..0b34c1f44a8f 100644 --- a/pkgs/servers/search/sphinxsearch/default.nix +++ b/pkgs/servers/search/sphinxsearch/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { expat ]; - CXXFLAGS = with lib; concatStringsSep " " (optionals stdenv.isDarwin [ + CXXFLAGS = lib.concatStringsSep " " (lib.optionals stdenv.isDarwin [ # see upstream bug: http://sphinxsearch.com/bugs/view.php?id=2578 # workaround for "error: invalid suffix on literal "-Wno-reserved-user-defined-literal" From 463a5e7c03ce739eca5217d3fa9f3a4309bbbb47 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:10:57 -0700 Subject: [PATCH 292/338] trickster: remove with statements --- pkgs/servers/trickster/trickster.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/trickster/trickster.nix b/pkgs/servers/trickster/trickster.nix index d11144a8359a..2f0a3b60f217 100644 --- a/pkgs/servers/trickster/trickster.nix +++ b/pkgs/servers/trickster/trickster.nix @@ -21,9 +21,9 @@ buildGoModule rec { subPackages = [ "cmd/trickster" ]; - ldflags = with lib; + ldflags = [ "-extldflags '-static'" "-s" "-w" ] ++ - (mapAttrsToList (n: v: "-X main.application${n}=${v}") { + (lib.mapAttrsToList (n: v: "-X main.application${n}=${v}") { BuildTime = "1970-01-01T00:00:00+0000"; GitCommitID = rev; GoVersion = "go${go.version}}"; From 2cc74f92a007b3b9b8b55bf78b4120062f2fb16f Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:11:28 -0700 Subject: [PATCH 293/338] xorg: remove with statements in overrides --- pkgs/servers/x11/xorg/overrides.nix | 53 ++++++++++++++--------------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index e9dd62f4168f..b3eb0e74dc68 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -365,13 +365,13 @@ self: super: libXres = super.libXres.overrideAttrs (attrs: { outputs = [ "out" "dev" "devdoc" ]; - buildInputs = with xorg; attrs.buildInputs ++ [ utilmacros ]; + buildInputs = attrs.buildInputs ++ [ xorg.utilmacros ]; configureFlags = attrs.configureFlags or [] ++ malloc0ReturnsNullCrossFlag; }); libXScrnSaver = super.libXScrnSaver.overrideAttrs (attrs: { - buildInputs = with xorg; attrs.buildInputs ++ [ utilmacros ]; + buildInputs = attrs.buildInputs ++ [ xorg.utilmacros ]; configureFlags = attrs.configureFlags or [] ++ malloc0ReturnsNullCrossFlag; }); @@ -401,7 +401,7 @@ self: super: }); libXpresent = super.libXpresent.overrideAttrs (attrs: { - buildInputs = with xorg; attrs.buildInputs ++ [ libXext libXfixes libXrandr ]; + buildInputs = attrs.buildInputs ++ [ xorg.libXext xorg.libXfixes xorg.libXrandr ]; propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ xorg.libXfixes ]; }); @@ -417,7 +417,7 @@ self: super: nativeBuildInputs = attrs.nativeBuildInputs ++ [ meson ninja ]; buildInputs = attrs.buildInputs ++ [ zlib ] - ++ lib.optionals stdenv.hostPlatform.isNetBSD (with netbsd; [ libarch libpci ]); + ++ lib.optionals stdenv.hostPlatform.isNetBSD [ netbsd.libarch netbsd.libpci ]; mesonFlags = [ (lib.mesonOption "pci-ids" "${hwdata}/share/hwdata") @@ -668,15 +668,13 @@ self: super: xkeyboardconfig_custom = { layouts ? { } }: let patchIn = name: layout: - with layout; - with lib; '' # install layout files - ${optionalString (compatFile != null) "cp '${compatFile}' 'compat/${name}'"} - ${optionalString (geometryFile != null) "cp '${geometryFile}' 'geometry/${name}'"} - ${optionalString (keycodesFile != null) "cp '${keycodesFile}' 'keycodes/${name}'"} - ${optionalString (symbolsFile != null) "cp '${symbolsFile}' 'symbols/${name}'"} - ${optionalString (typesFile != null) "cp '${typesFile}' 'types/${name}'"} + ${lib.optionalString (layout.compatFile != null) "cp '${layout.compatFile}' 'compat/${name}'"} + ${lib.optionalString (layout.geometryFile != null) "cp '${layout.geometryFile}' 'geometry/${name}'"} + ${lib.optionalString (layout.keycodesFile != null) "cp '${layout.keycodesFile}' 'keycodes/${name}'"} + ${lib.optionalString (layout.symbolsFile != null) "cp '${layout.symbolsFile}' 'symbols/${name}'"} + ${lib.optionalString (layout.typesFile != null) "cp '${layout.typesFile}' 'types/${name}'"} # add model description ${ed}/bin/ed -v rules/base.xml <${name} ${layout.description} - ${concatMapStrings (lang: "${lang}\n") layout.languages} + ${lib.concatMapStrings (lang: "${lang}\n") layout.languages} @@ -717,7 +715,7 @@ self: super: in xorg.xkeyboardconfig.overrideAttrs (old: { buildInputs = old.buildInputs ++ [ automake ]; - postPatch = with lib; concatStrings (mapAttrsToList patchIn layouts); + postPatch = lib.concatStrings (lib.mapAttrsToList patchIn layouts); }); xlsfonts = super.xlsfonts.overrideAttrs (attrs: { @@ -743,7 +741,7 @@ self: super: meta = attrs.meta // { platforms = lib.platforms.unix ++ lib.platforms.windows; }; }); - xorgserver = with xorg; super.xorgserver.overrideAttrs (attrs_passed: + xorgserver = super.xorgserver.overrideAttrs (attrs_passed: let attrs = attrs_passed // { buildInputs = attrs_passed.buildInputs ++ @@ -759,14 +757,14 @@ self: super: in attrs // (let version = lib.getVersion attrs; - commonBuildInputs = attrs.buildInputs ++ [ xtrans libxcvt ]; + commonBuildInputs = attrs.buildInputs ++ [ xorg.xtrans xorg.libxcvt ]; commonPropagatedBuildInputs = [ - dbus libGL libGLU libXext libXfont libXfont2 libepoxy libunwind - libxshmfence pixman xorgproto zlib + dbus libGL libGLU xorg.libXext xorg.libXfont xorg.libXfont2 libepoxy libunwind + xorg.libxshmfence xorg.pixman xorg.xorgproto zlib ]; # XQuartz requires two compilations: the first to get X / XQuartz, # and the second to get Xvfb, Xnest, etc. - darwinOtherX = xorgserver.overrideAttrs (oldAttrs: { + darwinOtherX = xorg.xorgserver.overrideAttrs (oldAttrs: { configureFlags = oldAttrs.configureFlags ++ [ "--disable-xquartz" "--enable-xorg" @@ -796,7 +794,7 @@ self: super: ./dont-create-logdir-during-build.patch ]; buildInputs = commonBuildInputs ++ [ libdrm mesa ]; - propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ libpciaccess ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ + propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ xorg.libpciaccess ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ udev ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -844,7 +842,7 @@ self: super: mesa ]; propagatedBuildInputs = commonPropagatedBuildInputs ++ [ - libAppleWM xorgproto + xorg.libAppleWM xorg.xorgproto ]; patches = [ @@ -932,12 +930,12 @@ self: super: "--without-dtrace" ]; - buildInputs = old.buildInputs ++ (with xorg; [ - pixman - libXfont2 - xtrans - libxcvt - ]) ++ lib.optional stdenv.isDarwin [ Xplugin ]; + buildInputs = old.buildInputs ++ [ + xorg.pixman + xorg.libXfont2 + xorg.xtrans + xorg.libxcvt + ] ++ lib.optional stdenv.isDarwin [ Xplugin ]; }); lndir = super.lndir.overrideAttrs (attrs: { @@ -1182,8 +1180,7 @@ self: super: super.${name}.overrideAttrs (attrs: { meta = attrs.meta // { inherit license; }; }); - mapNamesToAttrs = f: names: with lib; - listToAttrs (zipListsWith nameValuePair names (map f names)); + mapNamesToAttrs = f: names: lib.listToAttrs (lib.zipListsWith lib.nameValuePair names (map f names)); in mapNamesToAttrs (setLicense lib.licenses.unfreeRedistributable) redist // From 9ef28332db9b1127258f54329aca52bc4cd15a5a Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:11:30 -0700 Subject: [PATCH 294/338] fish: remove with statements --- pkgs/shells/fish/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 921e0fc6d7fe..73065cb380fd 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -249,7 +249,7 @@ let make test ''; - postInstall = with lib; '' + postInstall = '' sed -r "s|command grep|command ${gnugrep}/bin/grep|" \ -i "$out/share/fish/functions/grep.fish" sed -e "s|\|cut|\|${coreutils}/bin/cut|" \ @@ -262,7 +262,7 @@ let "$out/share/fish/functions/prompt_pwd.fish" sed -i "s|nroff|${groff}/bin/nroff|" \ "$out/share/fish/functions/__fish_print_help.fish" - sed -e "s|clear;|${getBin ncurses}/bin/clear;|" \ + sed -e "s|clear;|${lib.getBin ncurses}/bin/clear;|" \ -i "$out/share/fish/functions/fish_default_key_bindings.fish" sed -i "s|/usr/local/sbin /sbin /usr/sbin||" \ $out/share/fish/completions/{sudo.fish,doas.fish} @@ -270,7 +270,7 @@ let -i $out/share/fish/functions/{__fish_print_packages.fish,__fish_print_addresses.fish,__fish_describe_command.fish,__fish_complete_man.fish,__fish_complete_convert_options.fish} \ $out/share/fish/completions/{cwebp,adb,ezjail-admin,grunt,helm,heroku,lsusb,make,p4,psql,rmmod,vim-addons}.fish - '' + optionalString usePython '' + '' + lib.optionalString usePython '' cat > $out/share/fish/functions/__fish_anypython.fish < Date: Fri, 16 Aug 2024 14:11:32 -0700 Subject: [PATCH 295/338] stdenv: remove with statements --- pkgs/stdenv/linux/default.nix | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index a81ccfeb1188..c5e0498de66a 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -500,7 +500,7 @@ in assert isFromBootstrapFiles prevStage.coreutils; assert isFromBootstrapFiles prevStage.gnugrep; assert isBuiltByNixpkgsCompiler prevStage.patchelf; - assert lib.all isBuiltByNixpkgsCompiler (with prevStage; [ gmp isl_0_20 libmpc mpfr ]); + assert lib.all isBuiltByNixpkgsCompiler [ prevStage.gmp prevStage.isl_0_20 prevStage.libmpc prevStage.mpfr ]; stageFun prevStage { name = "bootstrap-stage3"; @@ -634,19 +634,24 @@ in disallowedRequisites = [ bootstrapTools.out ]; # Mainly avoid reference to bootstrap tools - allowedRequisites = with prevStage; with lib; + allowedRequisites = let + inherit (prevStage) gzip bzip2 xz zlib bash binutils coreutils diffutils findutils + gawk gmp gnumake gnused gnutar gnugrep gnupatch patchelf ed file glibc + attr acl libidn2 libunistring linuxHeaders gcc fortify-headers gcc-unwrapped + ; + in # Simple executable tools - concatMap (p: [ (getBin p) (getLib p) ]) [ + lib.concatMap (p: [ (lib.getBin p) (lib.getLib p) ]) [ gzip bzip2 xz bash binutils.bintools coreutils diffutils findutils gawk gmp gnumake gnused gnutar gnugrep gnupatch patchelf ed file ] # Library dependencies - ++ map getLib ( + ++ map lib.getLib ( [ attr acl zlib gnugrep.pcre2 libidn2 libunistring ] ++ lib.optional (gawk.libsigsegv != null) gawk.libsigsegv ) # More complicated cases - ++ (map (x: getOutput x (getLibc prevStage)) [ "out" "dev" "bin" ] ) + ++ (map (x: lib.getOutput x (getLibc prevStage)) [ "out" "dev" "bin" ] ) ++ [ linuxHeaders # propagated from .dev binutils gcc gcc.cc gcc.cc.lib gcc.expand-response-params # != (prevStage.)expand-response-params @@ -654,9 +659,9 @@ in ] ++ lib.optionals (localSystem.libc == "musl") [ fortify-headers ] ++ [ prevStage.updateAutotoolsGnuConfigScriptsHook prevStage.gnu-config ] - ++ (with gcc-unwrapped.passthru; [ - gmp libmpc mpfr isl - ]) + ++ [ + gcc-unwrapped.gmp gcc-unwrapped.libmpc gcc-unwrapped.mpfr gcc-unwrapped.isl + ] ; overrides = self: super: { From abcb8ef242d2812d14fd8d0b07e157ff34d87e39 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:15:23 -0700 Subject: [PATCH 296/338] tests.texlive: remove with statements --- pkgs/test/texlive/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/test/texlive/default.nix b/pkgs/test/texlive/default.nix index e363b5776e89..c142623233ac 100644 --- a/pkgs/test/texlive/default.nix +++ b/pkgs/test/texlive/default.nix @@ -190,7 +190,7 @@ rec { texdoc = runCommand "texlive-test-texdoc" { nativeBuildInputs = [ - (texlive.withPackages (ps: with ps; [ luatex ps.texdoc ps.texdoc.texdoc ])) + (texlive.withPackages (ps: [ ps.luatex ps.texdoc ps.texdoc.texdoc ])) ]; } '' texdoc --version @@ -668,14 +668,14 @@ rec { # verify that all fixed hashes are present # this is effectively an eval-time assertion, converted into a derivation for # ease of testing - fixedHashes = with lib; let + fixedHashes = let fods = lib.concatMap - (p: lib.optional (p ? tex && isDerivation p.tex) p.tex + (p: lib.optional (p ? tex && lib.isDerivation p.tex) p.tex ++ lib.optional (p ? texdoc) p.texdoc ++ lib.optional (p ? texsource) p.texsource ++ lib.optional (p ? tlpkg) p.tlpkg) - (attrValues texlive.pkgs); - errorText = concatMapStrings (p: optionalString (! p ? outputHash) "${p.pname}-${p.tlOutputName} does not have a fixed output hash\n") fods; + (lib.attrValues texlive.pkgs); + errorText = lib.concatMapStrings (p: lib.optionalString (! p ? outputHash) "${p.pname}-${p.tlOutputName} does not have a fixed output hash\n") fods; in runCommand "texlive-test-fixed-hashes" { inherit errorText; passAsFile = [ "errorText" ]; From 60f995275a179d2a3d71544b989c4bd42243b688 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:15:31 -0700 Subject: [PATCH 297/338] xnotify: remove with statements --- pkgs/tools/X11/xnotify/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/X11/xnotify/default.nix b/pkgs/tools/X11/xnotify/default.nix index 017835cbc4b6..8d2018e7a374 100644 --- a/pkgs/tools/X11/xnotify/default.nix +++ b/pkgs/tools/X11/xnotify/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { libXinerama ]; - postPatch = with lib; + postPatch = let configFile = - if isDerivation conf || builtins.isPath conf + if lib.isDerivation conf || builtins.isPath conf then conf else writeText "config.h" conf; in - optionalString (conf != null) "cp ${configFile} config.h"; + lib.optionalString (conf != null) "cp ${configFile} config.h"; makeFlags = [ "PREFIX=$(out)" ]; From fada673a227ccfd040396683636a4e9de3f2372a Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:15:34 -0700 Subject: [PATCH 298/338] xprompt: remove with statements --- pkgs/tools/X11/xprompt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/X11/xprompt/default.nix b/pkgs/tools/X11/xprompt/default.nix index 818f5cda362d..e62afb988d75 100644 --- a/pkgs/tools/X11/xprompt/default.nix +++ b/pkgs/tools/X11/xprompt/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { libXinerama ]; - postPatch = with lib; + postPatch = let configFile = - if isDerivation conf || builtins.isPath conf + if lib.isDerivation conf || builtins.isPath conf then conf else writeText "config.h" conf; in - optionalString (conf != null) "cp ${configFile} config.h"; + lib.optionalString (conf != null) "cp ${configFile} config.h"; makeFlags = [ "CC:=$(CC)" "PREFIX=$(out)" ]; From 6245f7868f5d19e562ea6f25746b16fc68025f41 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:15:36 -0700 Subject: [PATCH 299/338] ceph: remove with statements --- pkgs/tools/filesystems/ceph/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 22363fbabbd4..3a9c513e566d 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -138,11 +138,11 @@ let none = [ ]; }; - getMeta = description: with lib; { + getMeta = description: { homepage = "https://ceph.io/en/"; inherit description; - license = with licenses; [ lgpl21 gpl2Only bsd3 mit publicDomain ]; - maintainers = with maintainers; [ adev ak johanot krav ]; + license = with lib.licenses; [ lgpl21 gpl2Only bsd3 mit publicDomain ]; + maintainers = with lib.maintainers; [ adev ak johanot krav ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; }; From 31fa793eacbb08ca7136f8791cb9262da7a0cdf6 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:15:52 -0700 Subject: [PATCH 300/338] mergerfs-tools: remove with statements --- pkgs/tools/filesystems/mergerfs/tools.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/filesystems/mergerfs/tools.nix b/pkgs/tools/filesystems/mergerfs/tools.nix index f5235239103d..2708328bf4d6 100644 --- a/pkgs/tools/filesystems/mergerfs/tools.nix +++ b/pkgs/tools/filesystems/mergerfs/tools.nix @@ -20,10 +20,10 @@ stdenv.mkDerivation rec { "PREFIX=${placeholder "out"}" ]; - postInstall = with lib; '' - wrapProgram $out/bin/mergerfs.balance --prefix PATH : ${makeBinPath [ rsync ]} - wrapProgram $out/bin/mergerfs.dup --prefix PATH : ${makeBinPath [ rsync ]} - wrapProgram $out/bin/mergerfs.mktrash --prefix PATH : ${makeBinPath [ python3.pkgs.xattr ]} + postInstall = '' + wrapProgram $out/bin/mergerfs.balance --prefix PATH : ${lib.makeBinPath [ rsync ]} + wrapProgram $out/bin/mergerfs.dup --prefix PATH : ${lib.makeBinPath [ rsync ]} + wrapProgram $out/bin/mergerfs.mktrash --prefix PATH : ${lib.makeBinPath [ python3.pkgs.xattr ]} ''; meta = with lib; { From 092a9b8df196aa25caed532363d9fd977d5f42d3 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:15:54 -0700 Subject: [PATCH 301/338] mtdutils: remove with statements --- pkgs/tools/filesystems/mtdutils/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/mtdutils/default.nix b/pkgs/tools/filesystems/mtdutils/default.nix index 641b50d43506..80ce88836e34 100644 --- a/pkgs/tools/filesystems/mtdutils/default.nix +++ b/pkgs/tools/filesystems/mtdutils/default.nix @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - configureFlags = with lib; [ - (enableFeature doCheck "unit-tests") - (enableFeature doCheck "tests") + configureFlags = [ + (lib.enableFeature doCheck "unit-tests") + (lib.enableFeature doCheck "tests") ]; makeFlags = [ From ebdb16362ddfe44feac7d5456bdaebe14ef7e4da Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:16:33 -0700 Subject: [PATCH 302/338] diagrams-builder: remove with statements --- pkgs/tools/graphics/diagrams-builder/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/diagrams-builder/default.nix b/pkgs/tools/graphics/diagrams-builder/default.nix index b88e4e517364..d066657ff0eb 100644 --- a/pkgs/tools/graphics/diagrams-builder/default.nix +++ b/pkgs/tools/graphics/diagrams-builder/default.nix @@ -35,8 +35,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; - buildCommand = with lib; - concatStringsSep "\n" (map exeWrapper backends); + buildCommand = lib.concatStringsSep "\n" (map exeWrapper backends); # Will be faster to build the wrapper locally then to fetch it from a binary cache. preferLocalBuild = true; From 7173c946c744adb8763d41d3096c5c1b359da283 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:16:36 -0700 Subject: [PATCH 303/338] fim: remove with statements --- pkgs/tools/graphics/fim/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/graphics/fim/default.nix b/pkgs/tools/graphics/fim/default.nix index 45b03319fa2a..c61d5f832d95 100644 --- a/pkgs/tools/graphics/fim/default.nix +++ b/pkgs/tools/graphics/fim/default.nix @@ -25,15 +25,15 @@ gcc9Stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake pkg-config ]; - buildInputs = with lib; + buildInputs = [ perl flex bison readline libexif ] - ++ optional x11Support SDL - ++ optional svgSupport inkscape - ++ optional asciiArtSupport aalib - ++ optional gifSupport giflib - ++ optional tiffSupport libtiff - ++ optional jpegSupport libjpeg - ++ optional pngSupport libpng; + ++ lib.optional x11Support SDL + ++ lib.optional svgSupport inkscape + ++ lib.optional asciiArtSupport aalib + ++ lib.optional gifSupport giflib + ++ lib.optional tiffSupport libtiff + ++ lib.optional jpegSupport libjpeg + ++ lib.optional pngSupport libpng; env.NIX_CFLAGS_COMPILE = lib.optionalString x11Support "-lSDL"; From 6e44d53415f268f55c8402f5c8e1d72304143a90 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:16:38 -0700 Subject: [PATCH 304/338] coreboot-utils: remove with statements --- pkgs/tools/misc/coreboot-utils/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/coreboot-utils/default.nix b/pkgs/tools/misc/coreboot-utils/default.nix index 0410a23221ea..69be5edc3f64 100644 --- a/pkgs/tools/misc/coreboot-utils/default.nix +++ b/pkgs/tools/misc/coreboot-utils/default.nix @@ -3,12 +3,12 @@ let version = "24.05"; - commonMeta = with lib; { + commonMeta = { description = "Various coreboot-related tools"; homepage = "https://www.coreboot.org"; - license = with licenses; [ gpl2Only gpl2Plus ]; - maintainers = with maintainers; [ felixsinger jmbaur ]; - platforms = platforms.linux; + license = with lib.licenses; [ gpl2Only gpl2Plus ]; + maintainers = with lib.maintainers; [ felixsinger jmbaur ]; + platforms = lib.platforms.linux; }; generic = { pname, path ? "util/${pname}", ... }@args: stdenv.mkDerivation ({ From 85878e1127d26125d52c18fe7f6ac07d5f55fb9b Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:17:33 -0700 Subject: [PATCH 305/338] ultrastar-creator: remove with statements --- pkgs/tools/misc/ultrastar-creator/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/ultrastar-creator/default.nix b/pkgs/tools/misc/ultrastar-creator/default.nix index 547d0a86f957..bc39b7ed76c1 100644 --- a/pkgs/tools/misc/ultrastar-creator/default.nix +++ b/pkgs/tools/misc/ultrastar-creator/default.nix @@ -17,15 +17,15 @@ mkDerivation { sha256 = "1rzz04l7s7pxj74xam0cxlq569lfpgig35kpbsplq531d4007pc9"; }; - postPatch = with lib; '' + postPatch = '' # we don’t want prebuild binaries checked into version control! rm -rf lib include sed -e "s|DESTDIR =.*$|DESTDIR = $out/bin|" \ -e 's|-L".*unix"||' \ -e "/QMAKE_POST_LINK/d" \ - -e "s|../include/bass|${getLib libbass}/include|g" \ - -e "s|../include/bass_fx|${getLib libbass_fx}/include|g" \ - -e "s|../include/taglib|${getLib taglib}/include|g" \ + -e "s|../include/bass|${lib.getLib libbass}/include|g" \ + -e "s|../include/bass_fx|${lib.getLib libbass_fx}/include|g" \ + -e "s|../include/taglib|${lib.getLib taglib}/include|g" \ -i src/UltraStar-Creator.pro ''; From 5ac2cd5911836d88f5b270d30abff9b473ff0915 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:17:36 -0700 Subject: [PATCH 306/338] ultrastar-manager: remove with statements --- pkgs/tools/misc/ultrastar-manager/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/ultrastar-manager/default.nix b/pkgs/tools/misc/ultrastar-manager/default.nix index 4921c1de397e..d1d983bc10da 100644 --- a/pkgs/tools/misc/ultrastar-manager/default.nix +++ b/pkgs/tools/misc/ultrastar-manager/default.nix @@ -30,21 +30,21 @@ let dontInstall = true; - patchPhase = with lib; '' + patchPhase = '' # we don’t want prebuild binaries checked into version control! rm -rf lib include # fix up main project file sed -e 's|-L.*unix.*lbass.*$|-lbass|' \ -e "/QMAKE_POST_LINK/d" \ - -e "s|../include/bass|${getLib libbass}/include|g" \ - -e "s|../include/taglib|${getLib taglib}/include|g" \ - -e "s|../include/mediainfo|${getLib libmediainfo}/include|g" \ + -e "s|../include/bass|${lib.getLib libbass}/include|g" \ + -e "s|../include/taglib|${lib.getLib taglib}/include|g" \ + -e "s|../include/mediainfo|${lib.getLib libmediainfo}/include|g" \ -i src/UltraStar-Manager.pro # if more plugins start depending on ../../../include, # it should be abstracted out for all .pro files - sed -e "s|../../../include/taglib|${getLib taglib}/include/taglib|g" \ + sed -e "s|../../../include/taglib|${lib.getLib taglib}/include/taglib|g" \ -i src/plugins/audiotag/audiotag.pro mkdir $out From 6c28c49df23201c49d5e2a6fa487d37c3340741b Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:18:03 -0700 Subject: [PATCH 307/338] curl: remove with statements --- pkgs/tools/networking/curl/default.nix | 46 +++++++++++++------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 06130e8add34..1cf50ac79c43 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -78,25 +78,25 @@ stdenv.mkDerivation (finalAttrs: { # Zlib and OpenSSL must be propagated because `libcurl.la' contains # "-lz -lssl", which aren't necessary direct build inputs of # applications that use Curl. - propagatedBuildInputs = with lib; - optional brotliSupport brotli ++ - optional c-aresSupport c-aresMinimal ++ - optional gnutlsSupport gnutls ++ - optional gsaslSupport gsasl ++ - optional gssSupport libkrb5 ++ - optional http2Support nghttp2 ++ - optionals http3Support [ nghttp3 ngtcp2 ] ++ - optional idnSupport libidn2 ++ - optional ldapSupport openldap ++ - optional opensslSupport openssl ++ - optional pslSupport libpsl ++ - optional rtmpSupport rtmpdump ++ - optional scpSupport libssh2 ++ - optional wolfsslSupport wolfssl ++ - optional rustlsSupport rustls-ffi ++ - optional zlibSupport zlib ++ - optional zstdSupport zstd ++ - optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + propagatedBuildInputs = + lib.optional brotliSupport brotli ++ + lib.optional c-aresSupport c-aresMinimal ++ + lib.optional gnutlsSupport gnutls ++ + lib.optional gsaslSupport gsasl ++ + lib.optional gssSupport libkrb5 ++ + lib.optional http2Support nghttp2 ++ + lib.optionals http3Support [ nghttp3 ngtcp2 ] ++ + lib.optional idnSupport libidn2 ++ + lib.optional ldapSupport openldap ++ + lib.optional opensslSupport openssl ++ + lib.optional pslSupport libpsl ++ + lib.optional rtmpSupport rtmpdump ++ + lib.optional scpSupport libssh2 ++ + lib.optional wolfsslSupport wolfssl ++ + lib.optional rustlsSupport rustls-ffi ++ + lib.optional zlibSupport zlib ++ + lib.optional zstdSupport zstd ++ + lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices SystemConfiguration @@ -208,13 +208,13 @@ stdenv.mkDerivation (finalAttrs: { }; }; - meta = with lib; { + meta = { changelog = "https://curl.se/ch/${finalAttrs.version}.html"; description = "Command line tool for transferring files with URL syntax"; homepage = "https://curl.se/"; - license = licenses.curl; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.all; + license = lib.licenses.curl; + maintainers = with lib.maintainers; [ lovek323 ]; + platforms = lib.platforms.all; # Fails to link against static brotli or gss broken = stdenv.hostPlatform.isStatic && (brotliSupport || gssSupport || stdenv.hostPlatform.system == "x86_64-darwin"); pkgConfigModules = [ "libcurl" ]; From 4377a792d4ed629d24f9569df7c0af68dc517847 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:18:07 -0700 Subject: [PATCH 308/338] linux-router: remove with statements --- pkgs/tools/networking/linux-router/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/networking/linux-router/default.nix b/pkgs/tools/networking/linux-router/default.nix index b5cc9ef6f5dd..728954cf403e 100644 --- a/pkgs/tools/networking/linux-router/default.nix +++ b/pkgs/tools/networking/linux-router/default.nix @@ -55,15 +55,15 @@ stdenv.mkDerivation rec { dontBuild = true; - installPhase = with lib; let - binPath = makeBinPath ([ procps iproute2 getopt bash dnsmasq + installPhase = let + binPath = lib.makeBinPath ([ procps iproute2 getopt bash dnsmasq iptables coreutils which flock gnugrep gnused gawk ] - ++ optional useNetworkManager networkmanager - ++ optional useWifiDependencies hostapd - ++ optional useWifiDependencies iw - ++ optional (useWifiDependencies && useWirelessTools) wirelesstools - ++ optional (useWifiDependencies && useHaveged) haveged - ++ optional (useWifiDependencies && useQrencode) qrencode); + ++ lib.optional useNetworkManager networkmanager + ++ lib.optional useWifiDependencies hostapd + ++ lib.optional useWifiDependencies iw + ++ lib.optional (useWifiDependencies && useWirelessTools) wirelesstools + ++ lib.optional (useWifiDependencies && useHaveged) haveged + ++ lib.optional (useWifiDependencies && useQrencode) qrencode); in '' mkdir -p $out/bin/ $out/.bin-wrapped From a5d230f94227e972c796555d24e416536223e8bc Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:18:33 -0700 Subject: [PATCH 309/338] ghidra: remove with statements --- pkgs/tools/security/ghidra/build-extension.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/ghidra/build-extension.nix b/pkgs/tools/security/ghidra/build-extension.nix index b34f67d34b56..652b7bcdf8bf 100644 --- a/pkgs/tools/security/ghidra/build-extension.nix +++ b/pkgs/tools/security/ghidra/build-extension.nix @@ -11,10 +11,10 @@ let metaCommon = oldMeta: oldMeta - // (with lib; { - maintainers = (oldMeta.maintainers or [ ]) ++ (with maintainers; [ vringar ]); + // { + maintainers = (oldMeta.maintainers or [ ]) ++ (with lib.maintainers; [ vringar ]); platforms = oldMeta.platforms or ghidra.meta.platforms; - }); + }; buildGhidraExtension = { From 3eb82a79e45db61ec05622fe3e2880bcc4005ca1 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:18:42 -0700 Subject: [PATCH 310/338] pass: remove with statements --- pkgs/tools/security/pass/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 735d025e2ea6..748ec2ccf3bf 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { cp "contrib/dmenu/passmenu" "$out/bin/" ''; - wrapperPath = with lib; makeBinPath ([ + wrapperPath = lib.makeBinPath ([ coreutils findutils getopt @@ -89,11 +89,11 @@ stdenv.mkDerivation rec { openssh procps qrencode - ] ++ optional stdenv.isDarwin openssl - ++ optional x11Support xclip - ++ optional waylandSupport wl-clipboard - ++ optionals (waylandSupport && dmenuSupport) [ ydotool dmenu-wayland ] - ++ optionals (x11Support && dmenuSupport) [ xdotool dmenu ] + ] ++ lib.optional stdenv.isDarwin openssl + ++ lib.optional x11Support xclip + ++ lib.optional waylandSupport wl-clipboard + ++ lib.optionals (waylandSupport && dmenuSupport) [ ydotool dmenu-wayland ] + ++ lib.optionals (x11Support && dmenuSupport) [ xdotool dmenu ] ); postFixup = '' From 2e0ccc25d9c6fa9ce9b2a472e6fe7e706296fcd4 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:19:05 -0700 Subject: [PATCH 311/338] vaultwarden: remove with statements --- pkgs/tools/security/vaultwarden/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/vaultwarden/default.nix b/pkgs/tools/security/vaultwarden/default.nix index 0487f82e1876..137f9e6c9564 100644 --- a/pkgs/tools/security/vaultwarden/default.nix +++ b/pkgs/tools/security/vaultwarden/default.nix @@ -24,10 +24,10 @@ rustPlatform.buildRustPackage rec { env.VW_VERSION = version; nativeBuildInputs = [ pkg-config ]; - buildInputs = with lib; [ openssl ] - ++ optionals stdenv.isDarwin [ libiconv Security CoreServices SystemConfiguration ] - ++ optional (dbBackend == "mysql") libmysqlclient - ++ optional (dbBackend == "postgresql") postgresql; + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ libiconv Security CoreServices SystemConfiguration ] + ++ lib.optional (dbBackend == "mysql") libmysqlclient + ++ lib.optional (dbBackend == "postgresql") postgresql; buildFeatures = dbBackend; From 3fb954dd4feb19640ad6c443e1a3ecb61a7dd6b0 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:19:07 -0700 Subject: [PATCH 312/338] monit: remove with statements --- pkgs/tools/system/monit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix index 49db2fae93d9..ec7396ca3eb5 100644 --- a/pkgs/tools/system/monit/default.nix +++ b/pkgs/tools/system/monit/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { description = "Monitoring system"; license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ raskin wmertens ryantm ]; - platforms = with lib; platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "monit"; }; } From f1ab9757fd6761df995fed469f2a3d44b25085e1 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:19:09 -0700 Subject: [PATCH 313/338] nvtop: remove with statements --- pkgs/tools/system/nvtop/build-nvtop.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/nvtop/build-nvtop.nix b/pkgs/tools/system/nvtop/build-nvtop.nix index 0feada287d87..f1f855b25383 100644 --- a/pkgs/tools/system/nvtop/build-nvtop.nix +++ b/pkgs/tools/system/nvtop/build-nvtop.nix @@ -53,9 +53,9 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ cmake gtest ] ++ lib.optional nvidia addDriverRunpath; - buildInputs = with lib; [ ncurses udev ] - ++ optional nvidia cudatoolkit - ++ optional needDrm libdrm + buildInputs = [ ncurses udev ] + ++ lib.optional nvidia cudatoolkit + ++ lib.optional needDrm libdrm ; # this helps cmake to find From 8e8bfb1443184f41a6826086197de867a5981639 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:19:15 -0700 Subject: [PATCH 314/338] rofi-systemd: remove with statements --- pkgs/tools/system/rofi-systemd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/rofi-systemd/default.nix b/pkgs/tools/system/rofi-systemd/default.nix index b8be1adea984..9241a066e713 100644 --- a/pkgs/tools/system/rofi-systemd/default.nix +++ b/pkgs/tools/system/rofi-systemd/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cp -a rofi-systemd $out/bin/rofi-systemd ''; - wrapperPath = with lib; makeBinPath [ + wrapperPath = lib.makeBinPath [ coreutils gawk jq From 89bced95af9daacad013a333f334470e2722ff0d Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:19:17 -0700 Subject: [PATCH 315/338] rsyslog: remove with statements --- pkgs/tools/system/rsyslog/default.nix | 144 +++++++++++++------------- 1 file changed, 72 insertions(+), 72 deletions(-) diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 8479e6840a53..a14b1d38e428 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -104,91 +104,91 @@ stdenv.mkDerivation rec { ++ lib.optional withMysql libmysqlclient ++ lib.optional withSystemd systemd; - configureFlags = with lib; [ + configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" "--with-systemdsystemunitdir=\${out}/etc/systemd/system" - (enableFeature true "largefile") - (enableFeature true "regexp") - (enableFeature withKrb5 "gssapi-krb5") - (enableFeature true "klog") - (enableFeature true "kmsg") - (enableFeature withSystemd "imjournal") - (enableFeature true "inet") - (enableFeature withJemalloc "jemalloc") - (enableFeature true "unlimited-select") - (enableFeature withCurl "clickhouse") - (enableFeature false "debug") - (enableFeature false "debug-symbols") - (enableFeature true "debugless") - (enableFeature false "valgrind") - (enableFeature false "diagtools") - (enableFeature withCurl "fmhttp") - (enableFeature true "usertools") - (enableFeature withMysql "mysql") - (enableFeature withPostgres "pgsql") - (enableFeature withDbi "libdbi") - (enableFeature withNetSnmp "snmp") - (enableFeature withUuid "uuid") - (enableFeature withCurl "elasticsearch") - (enableFeature withGnutls "gnutls") - (enableFeature withGcrypt "libgcrypt") - (enableFeature true "rsyslogrt") - (enableFeature true "rsyslogd") - (enableFeature true "mail") - (enableFeature withLognorm "mmnormalize") - (enableFeature withMaxminddb "mmdblookup") - (enableFeature true "mmjsonparse") - (enableFeature true "mmaudit") - (enableFeature true "mmanon") - (enableFeature true "mmutf8fix") - (enableFeature true "mmcount") - (enableFeature true "mmsequence") - (enableFeature true "mmfields") - (enableFeature true "mmpstrucdata") - (enableFeature withOpenssl "mmrfc5424addhmac") - (enableFeature withRelp "relp") - (enableFeature withKsi "ksi-ls12") - (enableFeature withLogging "liblogging-stdlog") - (enableFeature withLogging "rfc3195") - (enableFeature true "imfile") - (enableFeature false "imsolaris") - (enableFeature true "imptcp") - (enableFeature true "impstats") - (enableFeature true "omprog") - (enableFeature withNet "omudpspoof") - (enableFeature true "omstdout") - (enableFeature withSystemd "omjournal") - (enableFeature true "pmlastmsg") - (enableFeature true "pmcisconames") - (enableFeature true "pmciscoios") - (enableFeature true "pmaixforwardedfrom") - (enableFeature true "pmsnare") - (enableFeature true "omruleset") - (enableFeature true "omuxsock") - (enableFeature true "mmsnmptrapd") - (enableFeature withHadoop "omhdfs") - (enableFeature withRdkafka "omkafka") - (enableFeature withMongo "ommongodb") - (enableFeature withCzmq "imczmq") - (enableFeature withCzmq "omczmq") - (enableFeature withRabbitmq "omrabbitmq") - (enableFeature withHiredis "omhiredis") - (enableFeature withCurl "omhttp") - (enableFeature true "generate-man-pages") + (lib.enableFeature true "largefile") + (lib.enableFeature true "regexp") + (lib.enableFeature withKrb5 "gssapi-krb5") + (lib.enableFeature true "klog") + (lib.enableFeature true "kmsg") + (lib.enableFeature withSystemd "imjournal") + (lib.enableFeature true "inet") + (lib.enableFeature withJemalloc "jemalloc") + (lib.enableFeature true "unlimited-select") + (lib.enableFeature withCurl "clickhouse") + (lib.enableFeature false "debug") + (lib.enableFeature false "debug-symbols") + (lib.enableFeature true "debugless") + (lib.enableFeature false "valgrind") + (lib.enableFeature false "diagtools") + (lib.enableFeature withCurl "fmhttp") + (lib.enableFeature true "usertools") + (lib.enableFeature withMysql "mysql") + (lib.enableFeature withPostgres "pgsql") + (lib.enableFeature withDbi "libdbi") + (lib.enableFeature withNetSnmp "snmp") + (lib.enableFeature withUuid "uuid") + (lib.enableFeature withCurl "elasticsearch") + (lib.enableFeature withGnutls "gnutls") + (lib.enableFeature withGcrypt "libgcrypt") + (lib.enableFeature true "rsyslogrt") + (lib.enableFeature true "rsyslogd") + (lib.enableFeature true "mail") + (lib.enableFeature withLognorm "mmnormalize") + (lib.enableFeature withMaxminddb "mmdblookup") + (lib.enableFeature true "mmjsonparse") + (lib.enableFeature true "mmaudit") + (lib.enableFeature true "mmanon") + (lib.enableFeature true "mmutf8fix") + (lib.enableFeature true "mmcount") + (lib.enableFeature true "mmsequence") + (lib.enableFeature true "mmfields") + (lib.enableFeature true "mmpstrucdata") + (lib.enableFeature withOpenssl "mmrfc5424addhmac") + (lib.enableFeature withRelp "relp") + (lib.enableFeature withKsi "ksi-ls12") + (lib.enableFeature withLogging "liblogging-stdlog") + (lib.enableFeature withLogging "rfc3195") + (lib.enableFeature true "imfile") + (lib.enableFeature false "imsolaris") + (lib.enableFeature true "imptcp") + (lib.enableFeature true "impstats") + (lib.enableFeature true "omprog") + (lib.enableFeature withNet "omudpspoof") + (lib.enableFeature true "omstdout") + (lib.enableFeature withSystemd "omjournal") + (lib.enableFeature true "pmlastmsg") + (lib.enableFeature true "pmcisconames") + (lib.enableFeature true "pmciscoios") + (lib.enableFeature true "pmaixforwardedfrom") + (lib.enableFeature true "pmsnare") + (lib.enableFeature true "omruleset") + (lib.enableFeature true "omuxsock") + (lib.enableFeature true "mmsnmptrapd") + (lib.enableFeature withHadoop "omhdfs") + (lib.enableFeature withRdkafka "omkafka") + (lib.enableFeature withMongo "ommongodb") + (lib.enableFeature withCzmq "imczmq") + (lib.enableFeature withCzmq "omczmq") + (lib.enableFeature withRabbitmq "omrabbitmq") + (lib.enableFeature withHiredis "omhiredis") + (lib.enableFeature withCurl "omhttp") + (lib.enableFeature true "generate-man-pages") ]; passthru.tests = { nixos-rsyslogd = nixosTests.rsyslogd; }; - meta = with lib; { + meta = { homepage = "https://www.rsyslog.com/"; description = "Enhanced syslog implementation"; mainProgram = "rsyslogd"; changelog = "https://raw.githubusercontent.com/rsyslog/rsyslog/v${version}/ChangeLog"; - license = licenses.gpl3Only; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; maintainers = [ ]; }; } From a77b1b3bc847da13f5c44219d400dc7d723be01a Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:19:18 -0700 Subject: [PATCH 316/338] asciidoc: remove with statements --- pkgs/tools/typesetting/asciidoc/default.nix | 33 ++++++++++----------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index 1a7fde588c75..24e1c6bc1a30 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -138,20 +138,20 @@ in python3.pkgs.buildPythonApplication rec { ]; # install filters early, so their shebangs are patched too - postPatch = with lib; '' + postPatch = '' mkdir -p "$out/etc/asciidoc/filters" mkdir -p "$out/etc/asciidoc/backends" - '' + optionalString _enableDitaaFilter '' + '' + lib.optionalString _enableDitaaFilter '' echo "Extracting ditaa filter" unzip -d "$out/etc/asciidoc/filters/ditaa" "${ditaaFilterSrc}" sed -i -e "s|java -jar|${jre}/bin/java -jar|" \ "$out/etc/asciidoc/filters/ditaa/ditaa2img.py" - '' + optionalString _enableMscgenFilter '' + '' + lib.optionalString _enableMscgenFilter '' echo "Extracting mscgen filter" unzip -d "$out/etc/asciidoc/filters/mscgen" "${mscgenFilterSrc}" sed -i -e "s|filter-wrapper.py mscgen|filter-wrapper.py ${mscgen}/bin/mscgen|" \ "$out/etc/asciidoc/filters/mscgen/mscgen-filter.conf" - '' + optionalString _enableDiagFilter '' + '' + lib.optionalString _enableDiagFilter '' echo "Extracting diag filter" unzip -d "$out/etc/asciidoc/filters/diag" "${diagFilterSrc}" sed -i \ @@ -161,12 +161,12 @@ in python3.pkgs.buildPythonApplication rec { -e "s|filter='nwdiag|filter=\'${nwdiag}/bin/nwdiag|" \ -e "s|filter='packetdiag|filter=\'${nwdiag}/bin/packetdiag|" \ "$out/etc/asciidoc/filters/diag/diag-filter.conf" - '' + optionalString _enableQrcodeFilter '' + '' + lib.optionalString _enableQrcodeFilter '' echo "Extracting qrcode filter" unzip -d "$out/etc/asciidoc/filters/qrcode" "${qrcodeFilterSrc}" sed -i -e "s|systemcmd('qrencode|systemcmd('${qrencode}/bin/qrencode|" \ "$out/etc/asciidoc/filters/qrcode/qrcode2img.py" - '' + optionalString _enableMatplotlibFilter '' + '' + lib.optionalString _enableMatplotlibFilter '' echo "Extracting mpl (matplotlib) filter" mkdir -p "$out/etc/asciidoc/filters/mpl" tar xvf "${matplotlibFilterSrc}" -C "$out/etc/asciidoc/filters/mpl" --strip-components=1 @@ -177,7 +177,7 @@ in python3.pkgs.buildPythonApplication rec { numpy_path="$(toPythonPath ${numpy})" sed -i "/^import.*sys/asys.path.append(\"$matplotlib_path\"); sys.path.append(\"$numpy_path\");" \ "$out/etc/asciidoc/filters/mpl/mplw.py" - '' + optionalString _enableAafigureFilter '' + '' + lib.optionalString _enableAafigureFilter '' echo "Extracting aafigure filter" unzip -d "$out/etc/asciidoc/filters/aafigure" "${aafigureFilterSrc}" # Add aafigure to sys.path (and it needs recursive-pth-loader) @@ -185,10 +185,10 @@ in python3.pkgs.buildPythonApplication rec { aafigure_path="$(toPythonPath ${aafigure})" sed -i "/^import.*sys/asys.path.append(\"$pth_loader_path\"); sys.path.append(\"$aafigure_path\"); import sitecustomize" \ "$out/etc/asciidoc/filters/aafigure/aafig2img.py" - '' + optionalString _enableDeckjsBackend '' + '' + lib.optionalString _enableDeckjsBackend '' echo "Extracting deckjs backend" unzip -d "$out/etc/asciidoc/backends/deckjs" "${deckjsBackendSrc}" - '' + optionalString _enableOdfBackend '' + '' + lib.optionalString _enableOdfBackend '' echo "Extracting odf backend (odt + odp)" unzip -d "$out/etc/asciidoc/backends/odt" "${odtBackendSrc}" unzip -d "$out/etc/asciidoc/backends/odp" "${odpBackendSrc}" @@ -228,7 +228,7 @@ in python3.pkgs.buildPythonApplication rec { -e "s|^ASCIIDOC =.*|ASCIIDOC = '$out/bin/asciidoc'|" \ -e "s|^XSLTPROC =.*|XSLTPROC = '${libxslt.bin}/bin/xsltproc'|" \ -e "s|^DBLATEX =.*|DBLATEX = '${dblatexFull}/bin/dblatex'|" \ - ${optionalString enableJava ''-e "s|^FOP =.*|FOP = '${fop}/bin/fop'|"''} \ + ${lib.optionalString enableJava ''-e "s|^FOP =.*|FOP = '${fop}/bin/fop'|"''} \ -e "s|^W3M =.*|W3M = '${w3m}/bin/w3m'|" \ -e "s|^LYNX =.*|LYNX = '${lynx}/bin/lynx'|" \ -e "s|^XMLLINT =.*|XMLLINT = '${libxml2.bin}/bin/xmllint'|" \ @@ -274,7 +274,7 @@ in python3.pkgs.buildPythonApplication rec { runHook postCheck ''; - meta = with lib; { + meta = { description = "Text-based document generation system"; longDescription = '' AsciiDoc is a text document format for writing notes, documentation, @@ -286,13 +286,12 @@ in python3.pkgs.buildPythonApplication rec { the backend output markups (which can be almost any type of SGML/XML markup) can be customized and extended by the user. ''; - sourceProvenance = with sourceTypes; [ - fromSource - ] ++ lib.optional _enableDitaaFilter binaryBytecode; + sourceProvenance = [ lib.sourceTypes.fromSource ] + ++ lib.optional _enableDitaaFilter lib.sourceTypes.binaryBytecode; homepage = "https://asciidoc-py.github.io/"; changelog = "https://github.com/asciidoc-py/asciidoc-py/blob/${version}/CHANGELOG.adoc"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ bjornfor dotlambda ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ bjornfor dotlambda ]; }; } From 65ec5b64ece70e4ac3a72a03c0a3e7aa6b0e68e0 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:19:38 -0700 Subject: [PATCH 317/338] texlive: remove with statements --- pkgs/tools/typesetting/tex/texlive/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index e84f89cdd6af..acb4a20314ed 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -57,11 +57,11 @@ let # need to be used instead. Ideally, for the release branches of NixOS we # should be switching to the tlnet-final versions # (https://tug.org/historic/). - mirrors = with version; lib.optionals final [ + mirrors = lib.optionals version.final [ # tlnet-final snapshot; used when texlive.tlpdb is frozen # the TeX Live yearly freeze typically happens in mid-March - "http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/${toString texliveYear}/tlnet-final" - "ftp://tug.org/texlive/historic/${toString texliveYear}/tlnet-final" + "http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/${toString version.texliveYear}/tlnet-final" + "ftp://tug.org/texlive/historic/${toString version.texliveYear}/tlnet-final" ] ++ [ # CTAN mirrors "https://mirror.ctan.org/systems/texlive/tlnet" @@ -71,7 +71,7 @@ let # please note that this server is not meant for large scale deployment # https://tug.org/pipermail/tex-live/2019-November/044456.html # https://texlive.info/ MUST appear last (see tlpdbxz) - "https://texlive.info/tlnet-archive/${year}/${month}/${day}/tlnet" + "https://texlive.info/tlnet-archive/${version.year}/${version.month}/${version.day}/tlnet" ]; tlpdbxz = fetchurl { @@ -148,9 +148,9 @@ let # now a legacy wrapper around buildTeXEnv combine = import ./combine-wrapper.nix { inherit buildTeXEnv lib toTLPkgList toTLPkgSets; }; - assertions = with lib; - assertMsg (tlpdbVersion.year == version.texliveYear) "TeX Live year in texlive does not match tlpdb.nix, refusing to evaluate" && - assertMsg (tlpdbVersion.frozen == version.final) "TeX Live final status in texlive does not match tlpdb.nix, refusing to evaluate"; + assertions = + lib.assertMsg (tlpdbVersion.year == version.texliveYear) "TeX Live year in texlive does not match tlpdb.nix, refusing to evaluate" && + lib.assertMsg (tlpdbVersion.frozen == version.final) "TeX Live final status in texlive does not match tlpdb.nix, refusing to evaluate"; # Pre-defined evironment packages for TeX Live schemes, # to make nix-env usage more comfortable and build selected on Hydra. @@ -191,7 +191,7 @@ let (pname: (buildTeXEnv { __extraName = "combined" + lib.removePrefix "scheme" pname; - __extraVersion = with version; if final then "-final" else ".${year}${month}${day}"; + __extraVersion = if version.final then "-final" else ".${version.year}${version.month}${version.day}"; requiredTeXPackages = ps: [ ps.${pname} ]; # to maintain full backward compatibility, enable texlive.combine behavior __combine = true; From ba93ec21612102f61dd3b19d1ff8efa84d707947 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:19:55 -0700 Subject: [PATCH 318/338] pkgs: remove with statements in aliases --- pkgs/top-level/aliases.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a6403e6792eb..694dd8bd6f88 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -22,16 +22,16 @@ with self; let # Removing recurseForDerivation prevents derivations of aliased attribute set # to appear while listing all the packages available. - removeRecurseForDerivations = alias: with lib; + removeRecurseForDerivations = alias: if alias.recurseForDerivations or false - then removeAttrs alias [ "recurseForDerivations" ] + then lib.removeAttrs alias [ "recurseForDerivations" ] else alias; # Disabling distribution prevents top-level aliases for non-recursed package # sets from building on Hydra. - removeDistribute = alias: with lib; - if isDerivation alias then - dontDistribute alias + removeDistribute = alias: + if lib.isDerivation alias then + lib.dontDistribute alias else alias; transmission3Warning = { prefix ? "", suffix ? "" }: let From 4363ce78b52fe40421e9da0545744e549f356dbc Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:20:31 -0700 Subject: [PATCH 319/338] theLoungePlugins: remove with statements --- pkgs/top-level/all-packages.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 25a9db99e50e..20cebb8c7b7e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13189,14 +13189,14 @@ with pkgs; thelounge = callPackage ../applications/networking/irc/thelounge { }; - theLoungePlugins = with lib; let - pkgs = filterAttrs (name: _: hasPrefix "thelounge-" name) nodePackages; - getPackagesWithPrefix = prefix: mapAttrs' (name: pkg: nameValuePair (removePrefix ("thelounge-" + prefix + "-") name) pkg) - (filterAttrs (name: _: hasPrefix ("thelounge-" + prefix + "-") name) pkgs); + theLoungePlugins = let + pkgs = lib.filterAttrs (name: _: lib.hasPrefix "thelounge-" name) nodePackages; + getPackagesWithPrefix = prefix: lib.mapAttrs' (name: pkg: lib.nameValuePair (lib.removePrefix ("thelounge-" + prefix + "-") name) pkg) + (lib.filterAttrs (name: _: lib.hasPrefix ("thelounge-" + prefix + "-") name) pkgs); in - recurseIntoAttrs { - plugins = recurseIntoAttrs (getPackagesWithPrefix "plugin"); - themes = recurseIntoAttrs (getPackagesWithPrefix "theme"); + lib.recurseIntoAttrs { + plugins = lib.recurseIntoAttrs (getPackagesWithPrefix "plugin"); + themes = lib.recurseIntoAttrs (getPackagesWithPrefix "theme"); }; theme-sh = callPackage ../tools/misc/theme-sh { }; From 086aa4f3a91c7ed2ba6dbaf8cbb808b3081d0b6d Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 14:20:50 -0700 Subject: [PATCH 320/338] python3Packages: remove with statements in aliases --- pkgs/top-level/python-aliases.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 65c3957f9504..cea0900e2e34 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -5,16 +5,16 @@ with self; let # Removing recurseForDerivation prevents derivations of aliased attribute # set to appear while listing all the packages available. - removeRecurseForDerivations = alias: with lib; + removeRecurseForDerivations = alias: if alias.recurseForDerivations or false then - removeAttrs alias ["recurseForDerivations"] + lib.removeAttrs alias ["recurseForDerivations"] else alias; # Disabling distribution prevents top-level aliases for non-recursed package # sets from building on Hydra. - removeDistribute = alias: with lib; - if isDerivation alias then - dontDistribute alias + removeDistribute = alias: + if lib.isDerivation alias then + lib.dontDistribute alias else alias; # Make sure that we are not shadowing something from From b4e3bdd7f91e83e81f5fd85361635a4998475248 Mon Sep 17 00:00:00 2001 From: Yohann Boniface Date: Sun, 18 Aug 2024 15:37:01 +0200 Subject: [PATCH 321/338] python312Packages.pyfunctional: init at 1.4.3 (#329947) * python312Packages.pyfunctional: init at 1.4.3 * Update pkgs/development/python-modules/pyfunctional/default.nix --------- Co-authored-by: Sandro --- .../python-modules/pyfunctional/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/pyfunctional/default.nix diff --git a/pkgs/development/python-modules/pyfunctional/default.nix b/pkgs/development/python-modules/pyfunctional/default.nix new file mode 100644 index 000000000000..843eebd17399 --- /dev/null +++ b/pkgs/development/python-modules/pyfunctional/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + pytestCheckHook, + dill, + tabulate, +}: + +buildPythonPackage rec { + pname = "pyfunctional"; + version = "1.4.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "EntilZha"; + repo = "PyFunctional"; + rev = "refs/tags/v${version}"; + hash = "sha256-utUmHQw7Y5pQJkwuy8CbPnCrAd/esaf0n1Exr/trcRg="; + }; + + build-system = [ poetry-core ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail poetry.masonry.api poetry.core.masonry.api \ + --replace-fail "poetry>=" "poetry-core>=" + ''; + + dependencies = [ + dill + tabulate + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + pythonImportCheck = "pyfunctional"; + + meta = { + description = "Python library for creating data pipelines with chain functional programming"; + homepage = "https://github.com/EntilZha/PyFunctional"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sigmanificient ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a2f6d1e2f34a..5134f53d3b4c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11474,6 +11474,8 @@ self: super: with self; { pyfume = callPackage ../development/python-modules/pyfume { }; + pyfunctional = callPackage ../development/python-modules/pyfunctional { }; + pyfuse3 = callPackage ../development/python-modules/pyfuse3 { }; pyfwup = callPackage ../development/python-modules/pyfwup { From 34445ddb2de798c51bb54ccb4fa87f89b2de48d8 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 13 Aug 2024 18:16:22 +0300 Subject: [PATCH 322/338] pkgs/README: recommend & redirect to pkgs/by-name in versioning section --- pkgs/README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/README.md b/pkgs/README.md index 76c5766d6c39..ab7cfd897f13 100644 --- a/pkgs/README.md +++ b/pkgs/README.md @@ -366,9 +366,7 @@ Example: Given a project that has no tags / released versions at all, or applies Because every version of a package in Nixpkgs creates a potential maintenance burden, old versions of a package should not be kept unless there is a good reason to do so. For instance, Nixpkgs contains several versions of GCC because other packages don’t build with the latest version of GCC. Other examples are having both the latest stable and latest pre-release version of a package, or to keep several major releases of an application that differ significantly in functionality. -If there is only one version of a package, its Nix expression should be named `e2fsprogs/default.nix`. If there are multiple versions, this should be reflected in the filename, e.g. `e2fsprogs/1.41.8.nix` and `e2fsprogs/1.41.9.nix`. The version in the filename should leave out unnecessary detail. For instance, if we keep the latest Firefox 2.0.x and 3.5.x versions in Nixpkgs, they should be named `firefox/2.0.nix` and `firefox/3.5.nix`, respectively (which, at a given point, might contain versions `2.0.0.20` and `3.5.4`). If a version requires many auxiliary files, you can use a subdirectory for each version, e.g. `firefox/2.0/default.nix` and `firefox/3.5/default.nix`. - -All versions of a package _must_ be included in `all-packages.nix` to make sure that they evaluate correctly. +If there is only one version of a package, its Nix expression should be named (e.g) `pkgs/by-name/xy/xyz/package.nix`. If there are multiple versions, this should be reflected in the attribute name. If you wish to share code between the Nix expressions of each version, you cannot rely upon `pkgs/by-name`'s automatic attribute creation, and must create the attributes yourself in `all-packages.nix`. See also [`pkgs/by-name/README.md`'s section on this topic](https://github.com/NixOS/nixpkgs/blob/master/pkgs/by-name/README.md#recommendation-for-new-packages-with-multiple-versions). ## Meta attributes From f0d2ac702bc8a783535931da11a4f333be288473 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 13:53:25 +0000 Subject: [PATCH 323/338] surrealdb-migrations: 1.5.0 -> 2.0.0-preview.1 --- .../tools/database/surrealdb-migrations/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/surrealdb-migrations/default.nix b/pkgs/development/tools/database/surrealdb-migrations/default.nix index 00d172072f08..f2db3fad5b00 100644 --- a/pkgs/development/tools/database/surrealdb-migrations/default.nix +++ b/pkgs/development/tools/database/surrealdb-migrations/default.nix @@ -10,7 +10,7 @@ let pname = "surrealdb-migrations"; - version = "1.5.0"; + version = "2.0.0-preview.1"; in rustPlatform.buildRustPackage rec { inherit pname version; @@ -19,10 +19,10 @@ rustPlatform.buildRustPackage rec { owner = "Odonno"; repo = pname; rev = "v${version}"; - hash = "sha256-x5WyaVHLVFCHWPqyEuaVSbeIaGXDB0o7h776udcC4DM="; + hash = "sha256-Ijuohu/KgHN5Ux2aWIGJQF9z6vmDPAyE7Sy66zX7nd8="; }; - cargoHash = "sha256-wANIaEvHtFzAAsly2aqHlYwiKnxHkqH3/0rYs05AkXI="; + cargoHash = "sha256-4YTcWKyVrlgGA1hpoRszB5qn0qa/lizvvGXdfQJoxlc="; buildInputs = [ ] ++ lib.optionals stdenv.isDarwin [ Security ]; From b7009ebd4811331baefe526b46ff0165b8a03246 Mon Sep 17 00:00:00 2001 From: Breland Miley Date: Wed, 14 Aug 2024 23:16:59 -0400 Subject: [PATCH 324/338] python3Packages.pid: remove nose dependency --- .../python-modules/pid/default.nix | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pid/default.nix b/pkgs/development/python-modules/pid/default.nix index 7c50878f92d6..b0bb834a302f 100644 --- a/pkgs/development/python-modules/pid/default.nix +++ b/pkgs/development/python-modules/pid/default.nix @@ -1,24 +1,35 @@ { lib, buildPythonPackage, + fetchpatch2, fetchPypi, - nose, + pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "pid"; version = "3.0.4"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "0e33670e83f6a33ebb0822e43a609c3247178d4a375ff50a4689e266d853eb66"; }; - buildInputs = [ nose ]; + patches = [ + # apply c9d1550ba2ee73231f8e984d75d808c8cc103748 to remove nose dependency. change is in repo, but hasn't been released on pypi. + (fetchpatch2 { + url = "https://github.com/trbs/pid/commit/c9d1550ba2ee73231f8e984d75d808c8cc103748.patch"; + hash = "sha256-2F31LlrJku1xzmI7P+QLyUZ8CzVHx25APp88qwWkZxw="; + }) + ]; - # No tests included - doCheck = false; + build-system = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + doCheck = true; meta = with lib; { description = "Pidfile featuring stale detection and file-locking"; From 1399e2551ace82f624d690b67162d4b4bb585ea9 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Sun, 18 Aug 2024 19:55:23 +0530 Subject: [PATCH 325/338] uwsm: 0.18.0 -> 0.18.2 https://github.com/Vladimir-csp/uwsm/compare/v0.18.0...v0.18.2 --- pkgs/by-name/uw/uwsm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/uw/uwsm/package.nix b/pkgs/by-name/uw/uwsm/package.nix index 9659dbdee0da..fa5ad6f3692b 100644 --- a/pkgs/by-name/uw/uwsm/package.nix +++ b/pkgs/by-name/uw/uwsm/package.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "uwsm"; - version = "0.18.0"; + version = "0.18.2"; src = fetchFromGitHub { owner = "Vladimir-csp"; repo = "uwsm"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-VGywdMRHJaQgWD9EurYdMTlbOo8Wu8NWiLuiY7xJh4M="; + hash = "sha256-/LmSc1AKNZ/VZ2rkUsOvwqpJmPgb6dThTtOu44BriQs="; }; nativeBuildInputs = [ From cafa5cebc48bb5cf52e7474469b60aab00fadc64 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 14:35:02 +0000 Subject: [PATCH 326/338] peazip: 9.8.0 -> 9.9.1 --- pkgs/tools/archivers/peazip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/archivers/peazip/default.nix b/pkgs/tools/archivers/peazip/default.nix index e99aa5f27495..d59ec376dadb 100644 --- a/pkgs/tools/archivers/peazip/default.nix +++ b/pkgs/tools/archivers/peazip/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "peazip"; - version = "9.8.0"; + version = "9.9.1"; src = fetchFromGitHub { owner = "peazip"; repo = pname; rev = version; - hash = "sha256-oHtxiunB409xwk4tYB336Bq51Fl7PFrXKwH7ySaYCEs="; + hash = "sha256-hn3EhePmBlj9Zdlij/GMxJPTP6suUm2oThaSKjoKeQQ="; }; sourceRoot = "${src.name}/peazip-sources"; From b55fb345574f1a069fd3453f310348846efc538a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 12:41:26 +0000 Subject: [PATCH 327/338] shotwell: 0.32.7 -> 0.32.8 --- pkgs/applications/graphics/shotwell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 803d298ddfd7..aaacfc329858 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -38,11 +38,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "shotwell"; - version = "0.32.7"; + version = "0.32.8"; src = fetchurl { url = "mirror://gnome/sources/shotwell/${lib.versions.majorMinor finalAttrs.version}/shotwell-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-EvMl4BnD5jjCuWFXG8IEd2dh6CYUZ+8btodViJM11fc="; + sha256 = "sha256-RwY8AXnl2A9TQ3PcVg4c6Ad6rdWE7u8GxSOkYOL5KcM="; }; nativeBuildInputs = [ From 804d240489efdb2ddafa3fdd33c2a4531e4fbd7d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 15:15:51 +0000 Subject: [PATCH 328/338] python312Packages.aiowithings: 3.0.2 -> 3.0.3 --- pkgs/development/python-modules/aiowithings/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiowithings/default.nix b/pkgs/development/python-modules/aiowithings/default.nix index 92e8c7f7a6ce..e2794d241193 100644 --- a/pkgs/development/python-modules/aiowithings/default.nix +++ b/pkgs/development/python-modules/aiowithings/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiowithings"; - version = "3.0.2"; + version = "3.0.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-withings"; rev = "refs/tags/v${version}"; - hash = "sha256-UKAfEBMybi9536QIDARATZYAs2CHQzFBIVorzwsnrQo="; + hash = "sha256-YM+7raD5Wp+pC+R4DV92QN5E+TlNoMnt5M+n6Ax0W9k="; }; postPatch = '' From 8c8e010a0d8c4e1f25905b0db2e6b1c97b9764e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 15:16:06 +0000 Subject: [PATCH 329/338] python312Packages.apkinspector: 1.3.0 -> 1.3.1 --- pkgs/development/python-modules/apkinspector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apkinspector/default.nix b/pkgs/development/python-modules/apkinspector/default.nix index 3481b3e3c1c3..0b5539795ec4 100644 --- a/pkgs/development/python-modules/apkinspector/default.nix +++ b/pkgs/development/python-modules/apkinspector/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "apkinspector"; - version = "1.3.0"; + version = "1.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "erev0s"; repo = "apkInspector"; rev = "refs/tags/v${version}"; - hash = "sha256-frcggMsDpPfIqL0J7FNOht+aXeg79xnZryZZwI4wWGw="; + hash = "sha256-zVMY1KMUCSqctAAHOEFXM9yT1X0PDC75ETshF+fc4pU="; }; build-system = [ poetry-core ]; From f1e0916d30089d9c35a0ae6d33711cf782521a69 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 26 Jul 2024 07:00:00 +0200 Subject: [PATCH 330/338] cavalcade: init at 0.8 --- pkgs/by-name/ca/cavalcade/package.nix | 74 +++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 pkgs/by-name/ca/cavalcade/package.nix diff --git a/pkgs/by-name/ca/cavalcade/package.nix b/pkgs/by-name/ca/cavalcade/package.nix new file mode 100644 index 000000000000..f5cf8e667152 --- /dev/null +++ b/pkgs/by-name/ca/cavalcade/package.nix @@ -0,0 +1,74 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + gtk3, + cava, + gst_all_1, + gobject-introspection, + wrapGAppsHook3, + copyDesktopItems, + makeDesktopItem, + fetchurl, +}: + +python3Packages.buildPythonApplication rec { + pname = "cavalcade"; + version = "0.8"; + pyproject = true; + + src = fetchFromGitHub { + owner = "worron"; + repo = "cavalcade"; + rev = "refs/tags/${version}"; + hash = "sha256-VyWOPNidN0+pfuxsgPWq6lI5gXQsiRpmYjQYjZW6i9w="; + }; + + postPatch = '' + substituteInPlace cavalcade/cava.py \ + --replace-fail '"cava"' '"${cava}/bin/cava"' + ''; + + build-system = [ python3Packages.setuptools ]; + + dependencies = with python3Packages; [ + pygobject3 + gst-python + pillow + ]; + + nativeBuildInputs = [ + wrapGAppsHook3 + copyDesktopItems + gobject-introspection + gst_all_1.gstreamer + ]; + + buildInputs = [ gtk3 ]; + + desktopItems = [ + (makeDesktopItem { + name = "Cavalcade"; + type = "Application"; + exec = "cavalcade"; + icon = fetchurl { + url = "https://raw.githubusercontent.com/worron/cavalcade/68ba5a2b2effd1c46b0568f4a27852689c2cdf32/desktop/cavalcade.svg"; + hash = "sha256-GJR5kUmSnFG6dE+o2UWKaHmiKPZNDGZZqXCIP8o883M="; + }; + comment = "CAVA GUI"; + categories = [ + "AudioVideo" + "Audio" + "GTK" + ]; + desktopName = "Cavalcade"; + }) + ]; + + meta = { + description = "Python wrapper for C.A.V.A. utility with a GUI"; + homepage = "https://github.com/worron/cavalcade"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ sigmanificient ]; + }; +} From 7020a1d89388f6dff07d365b8b80583d40b42028 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 18 Aug 2024 18:09:17 +0200 Subject: [PATCH 331/338] treewide: `default.nix` -> `package.nix` in pkgs/by-name We need to remember to go over all the update scripts once the mass-by-name migration has happened --- pkgs/by-name/az/azure-cli/README.md | 2 +- pkgs/by-name/fl/fluxcd/update.sh | 4 ++-- pkgs/by-name/lo/localsend/update.sh | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/README.md b/pkgs/by-name/az/azure-cli/README.md index 4d899ff52af0..e94b101fc5e5 100644 --- a/pkgs/by-name/az/azure-cli/README.md +++ b/pkgs/by-name/az/azure-cli/README.md @@ -2,7 +2,7 @@ ## Updating the CLI -- Update `version` and `src.hash` in default.nix +- Update `version` and `src.hash` in package.nix - Check out the changes made to the azure-cli [setup.py](https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/setup.py) since the last release - Try build the CLI, will likely fail with `ModuleNotFoundError`, for example ``` diff --git a/pkgs/by-name/fl/fluxcd/update.sh b/pkgs/by-name/fl/fluxcd/update.sh index 1763b37d3328..218eba0be91a 100755 --- a/pkgs/by-name/fl/fluxcd/update.sh +++ b/pkgs/by-name/fl/fluxcd/update.sh @@ -17,7 +17,7 @@ if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then SPEC_SHA256=$(nix hash to-sri --type sha256 $SPEC_SHA256) setKV () { - sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" "${FLUXCD_PATH}/default.nix" + sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" "${FLUXCD_PATH}/package.nix" } setKV version ${LATEST_VERSION} @@ -40,7 +40,7 @@ if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then # `git` flag here is to be used by local maintainers to speed up the bump process if [ $# -eq 1 ] && [ "$1" = "git" ]; then git switch -c "package-fluxcd-${LATEST_VERSION}" - git add "$FLUXCD_PATH"/default.nix + git add "$FLUXCD_PATH"/package.nix git commit -m "fluxcd: ${OLD_VERSION} -> ${LATEST_VERSION} Release: https://github.com/fluxcd/flux2/releases/tag/v${LATEST_VERSION}" diff --git a/pkgs/by-name/lo/localsend/update.sh b/pkgs/by-name/lo/localsend/update.sh index fa69be0ba995..1b8b3085b933 100755 --- a/pkgs/by-name/lo/localsend/update.sh +++ b/pkgs/by-name/lo/localsend/update.sh @@ -14,13 +14,13 @@ if [[ "$currentVersion" == "$latestVersion" ]]; then exit 0 fi -sed -i "s/version = \".*\"/version = \"${latestVersion}\"/" "$ROOT/default.nix" +sed -i "s/version = \".*\"/version = \"${latestVersion}\"/" "$ROOT/package.nix" DARWIN_x64_URL="https://github.com/localsend/localsend/releases/download/v${latestVersion}/LocalSend-${latestVersion}.dmg" DARWIN_X64_SHA=$(nix hash to-sri --type sha256 $(nix-prefetch-url ${DARWIN_x64_URL})) -sed -i "/darwin/,/hash/{s|hash = \".*\"|hash = \"${DARWIN_X64_SHA}\"|}" "$ROOT/default.nix" +sed -i "/darwin/,/hash/{s|hash = \".*\"|hash = \"${DARWIN_X64_SHA}\"|}" "$ROOT/package.nix" GIT_SRC_URL="https://github.com/localsend/localsend/archive/refs/tags/v${latestVersion}.tar.gz" GIT_SRC_SHA=$(nix hash to-sri --type sha256 $(nix-prefetch-url --unpack ${GIT_SRC_URL})) -sed -i "/linux/,/hash/{s|hash = \".*\"|hash = \"${GIT_SRC_SHA}\"|}" "$ROOT/default.nix" +sed -i "/linux/,/hash/{s|hash = \".*\"|hash = \"${GIT_SRC_SHA}\"|}" "$ROOT/package.nix" curl https://raw.githubusercontent.com/localsend/localsend/v${latestVersion}/app/pubspec.lock | yq . > $ROOT/pubspec.lock.json From 25cf4a8e2f14e7c4c27210f9a2fe8630d5409f75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 17 Aug 2024 22:32:53 +0200 Subject: [PATCH 332/338] nix-simple-deploy: remove --- .../nix-simple-deploy/default.nix | 31 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 pkgs/tools/package-management/nix-simple-deploy/default.nix diff --git a/pkgs/tools/package-management/nix-simple-deploy/default.nix b/pkgs/tools/package-management/nix-simple-deploy/default.nix deleted file mode 100644 index 3e119f9488bd..000000000000 --- a/pkgs/tools/package-management/nix-simple-deploy/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, fetchFromGitHub, rustPlatform, makeWrapper, openssh, nix-serve }: - -rustPlatform.buildRustPackage rec { - pname = "nix-simple-deploy"; - version = "0.2.2"; - - src = fetchFromGitHub { - owner = "misuzu"; - repo = pname; - rev = version; - sha256 = "1qq4fbsd2mvxblsggwbnh88mj18f3vrfzv1kgc7a92pfiwxznq8r"; - }; - - cargoHash = "sha256-HVVE9m+BOCa9NeoXvj8OL1gqubI+0dGY3N6vG/GhzeQ="; - - nativeBuildInputs = [ makeWrapper ]; - - postInstall = '' - wrapProgram "$out/bin/nix-simple-deploy" \ - --prefix PATH : "${lib.makeBinPath [ openssh nix-serve ]}" - ''; - - meta = with lib; { - description = "Deploy software or an entire NixOS system configuration to another NixOS system"; - homepage = "https://github.com/misuzu/nix-simple-deploy"; - platforms = platforms.unix; - license = with licenses; [ asl20 /* OR */ mit ]; - maintainers = with maintainers; [ misuzu ]; - mainProgram = "nix-simple-deploy"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 694dd8bd6f88..6b4ec29657f1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1019,6 +1019,7 @@ mapAliases ({ "use `nix repl` instead. Also see https://github.com/NixOS/nixpkgs/pull/44903" ); nix-review = throw "'nix-review' has been renamed to/replaced by 'nixpkgs-review'"; # Converted to throw 2023-09-10 + nix-simple-deploy = throw "'nix-simple-deploy' has been removed as it is broken and unmaintained"; # Added 2024-08-17 nix-template-rpm = throw "'nix-template-rpm' has been removed as it is broken and unmaintained"; # Added 2023-11-20 nix-universal-prefetch = throw "The nix-universal-prefetch package was dropped since it was unmaintained."; # Added 2024-06-21 nixFlakes = nixVersions.stable; # Added 2021-05-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 879a3f82cd38..04de2a5da617 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38731,8 +38731,6 @@ with pkgs; nix-serve-ng = haskell.lib.compose.justStaticExecutables haskellPackages.nix-serve-ng; - nix-simple-deploy = callPackage ../tools/package-management/nix-simple-deploy { }; - nix-visualize = python3.pkgs.callPackage ../tools/package-management/nix-visualize { }; alejandra = callPackage ../tools/nix/alejandra { }; From eaf78e10386a8cafb5e469f5e035e831ba18acdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 18 Aug 2024 10:54:58 -0700 Subject: [PATCH 333/338] signalbackup-tools: remove superfluous use of pname see https://github.com/NixOS/nixpkgs/issues/277994 --- .../instant-messengers/signalbackup-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 85d91aba6858..0b226e78d40b 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "bepaald"; - repo = pname; + repo = "signalbackup-tools"; rev = version; hash = "sha256-8r3XpKqCR2ElfQnRuuBaDDIUwAASTTfGSihOounIVZQ="; }; From 2c0944394ac8f99e1e096f88371145d4cb8af01b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 18 Aug 2024 20:10:55 +0200 Subject: [PATCH 334/338] tfsec: 1.28.9 -> 1.28.10 Diff: https://github.com/aquasecurity/tfsec/compare/refs/tags/v1.28.9...v1.28.10 Changelog: https://github.com/aquasecurity/tfsec/releases/tag/v1.28.10 --- pkgs/development/tools/analysis/tfsec/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 3a97b63216b5..0865a3b7ae79 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -6,7 +6,7 @@ buildGoModule rec { pname = "tfsec"; - version = "1.28.9"; + version = "1.28.10"; src = fetchFromGitHub { owner = "aquasecurity"; From 1bd350449a98cf4f85d717831f0df3a62aeb4873 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Sun, 18 Aug 2024 22:40:18 +0300 Subject: [PATCH 335/338] gitea: fix passthru.data-compressed Fixes two bugs: - pass a forgotten `{}` to `compressDrv`. - remove incorrect usage of `lndir` in `compressDrv`. I added a brief comment on why, see [this comment][1] for more details. Tested with: ``` $ nix build .#legacyPackages.x86_64-linux.gitea.passthru.data-compressed $ ls -lh result/public/assets/licenses.txt* lrwxrwxrwx 1 root root 90 Jan 1 1970 result/public/assets/licenses.txt -> /nix/store/p21irsr57hckd3x3ym18aa0cr9zmm3an-gitea-1.22.1-data/./public/assets/licenses.txt -r--r--r-- 1 root root 30K Jan 1 1970 result/public/assets/licenses.txt.br -r--r--r-- 1 root root 82K Jan 1 1970 result/public/assets/licenses.txt.gz ``` [1]: https://github.com/NixOS/nixpkgs/pull/332752#discussion_r1721043286 --- pkgs/build-support/compress-drv/default.nix | 12 ++++++------ pkgs/by-name/gi/gitea/package.nix | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/build-support/compress-drv/default.nix b/pkgs/build-support/compress-drv/default.nix index 47c76f4e100e..0773ab9e0554 100644 --- a/pkgs/build-support/compress-drv/default.nix +++ b/pkgs/build-support/compress-drv/default.nix @@ -1,8 +1,4 @@ -{ - lib, - xorg, - runCommand, -}: +{ lib, runCommand }: /** Compresses files of a given derivation, and returns a new derivation with compressed files @@ -72,7 +68,11 @@ let in runCommand "${drv.name}-compressed" { } '' mkdir $out - (cd $out; ${xorg.lndir}/bin/lndir ${drv}) + + # cannot use lndir here, because it also symlinks directories, + # which we do not need; we only need to symlink files. + (cd ${drv}; find -L -type d -exec mkdir -p $out/{} ';') + (cd ${drv}; find -L -type f -exec ln -s ${drv}/{} $out/{} ';') ${lib.concatStringsSep "\n\n" (lib.mapAttrsToList mkCmd compressors)} '' diff --git a/pkgs/by-name/gi/gitea/package.nix b/pkgs/by-name/gi/gitea/package.nix index 81625263a356..6c6bd91ad717 100644 --- a/pkgs/by-name/gi/gitea/package.nix +++ b/pkgs/by-name/gi/gitea/package.nix @@ -88,7 +88,7 @@ in buildGoModule rec { ''; passthru = { - data-compressed = lib.warn "gitea.passthru.data-compressed is deprecated. Use \"compressDrvWeb gitea.data\"." (compressDrvWeb gitea.data); + data-compressed = lib.warn "gitea.passthru.data-compressed is deprecated. Use \"compressDrvWeb gitea.data\"." (compressDrvWeb gitea.data {}); tests = nixosTests.gitea; }; From 2f67c13015d03382927e69a0b0b293d1d1b3e6f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sat, 17 Aug 2024 16:00:06 +0000 Subject: [PATCH 336/338] ceph: Add nh2 to maintainers --- pkgs/tools/filesystems/ceph/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 3a9c513e566d..af1ce33f73fc 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -142,7 +142,7 @@ let homepage = "https://ceph.io/en/"; inherit description; license = with lib.licenses; [ lgpl21 gpl2Only bsd3 mit publicDomain ]; - maintainers = with lib.maintainers; [ adev ak johanot krav ]; + maintainers = with lib.maintainers; [ adev ak johanot krav nh2 ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; }; From c81ad34e5974a0b81c8f8b7866af6de1bacea941 Mon Sep 17 00:00:00 2001 From: Ivan Babrou Date: Sun, 18 Aug 2024 14:01:21 -0700 Subject: [PATCH 337/338] cargo-whatfeatures: 0.9.12 -> 0.9.13 --- pkgs/development/tools/rust/cargo-whatfeatures/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-whatfeatures/default.nix b/pkgs/development/tools/rust/cargo-whatfeatures/default.nix index 62bb3dafd496..4e757c6402a3 100644 --- a/pkgs/development/tools/rust/cargo-whatfeatures/default.nix +++ b/pkgs/development/tools/rust/cargo-whatfeatures/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-whatfeatures"; - version = "0.9.12"; + version = "0.9.13"; src = fetchFromGitHub { owner = "museun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-62eEHxX+Gsz+Bif1ev0nTRituRkfqlGYZfa9cFkO26M="; + sha256 = "sha256-YJ08oBTn9OwovnTOuuc1OuVsQp+/TPO3vcY4ybJ26Ms="; }; - cargoHash = "sha256-bk/mbQu4lzhA9ct7cws70MYuj8oNEBgC+0EjHlaN1lc="; + cargoHash = "sha256-Zi9FCNBxQ9S4S9k6hoMUOixTs6PJyxmgTB+ArrX8oBE="; nativeBuildInputs = [ pkg-config ]; From 36459caf6823819ae9f453b48e61ad0103ac4e56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Tue, 13 Aug 2024 03:28:11 +0000 Subject: [PATCH 338/338] ceph: Fix build by fully vendoring old cryptography version nix files. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With cryptography 42 we can no longer just override the `src`, because the derivation for 42 can no longer build version 40. So revive the old version based on: git show d74195bc77c03b6b7aa7c3433205dd518f245ef2~:pkgs/development/python-modules/cryptography/default.nix > pkgs/development/python-modules/cryptography/40.nix git show d74195bc77c03b6b7aa7c3433205dd518f245ef2~:pkgs/development/python-modules/cryptography/vectors.nix > pkgs/development/python-modules/cryptography/vectors-40.nix │ Also: * Include a patch for CVE-2024-26130 * Run `nixfmt` on them. * `Securiy` -> `Security ? null` because in the local override it doesn't seem to pass that Darwin-specific package on Linux; avoids error: Function called without required argument "Security" --- pkgs/tools/filesystems/ceph/default.nix | 55 +++---- .../cryptography-vectors.nix | 36 +++++ .../ceph/old-python-packages/cryptography.nix | 135 ++++++++++++++++++ ...or-CVE-2023-49083-on-cryptography-40.patch | 0 4 files changed, 190 insertions(+), 36 deletions(-) create mode 100644 pkgs/tools/filesystems/ceph/old-python-packages/cryptography-vectors.nix create mode 100644 pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix rename pkgs/tools/filesystems/ceph/{ => old-python-packages}/python-cryptography-Cherry-pick-fix-for-CVE-2023-49083-on-cryptography-40.patch (100%) diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index af1ce33f73fc..a923f098f090 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -172,12 +172,18 @@ let python = python311.override { self = python; packageOverrides = self: super: let - cryptographyOverrideVersion = "40.0.1"; bcryptOverrideVersion = "4.0.1"; in { - # Ceph does not support `bcrypt` > 4.0 yet: + # Ceph does not support the following yet: + # * `bcrypt` > 4.0 + # * `cryptography` > 40 + # See: + # * https://github.com/NixOS/nixpkgs/pull/281858#issuecomment-1899358602 # * Upstream issue: https://tracker.ceph.com/issues/63529 # > Python Sub-Interpreter Model Used by ceph-mgr Incompatible With Python Modules Based on PyO3 + # * Moved to issue: https://tracker.ceph.com/issues/64213 + # > MGR modules incompatible with later PyO3 versions - PyO3 modules may only be initialized once per interpreter process + bcrypt = super.bcrypt.overridePythonAttrs (old: rec { pname = "bcrypt"; version = bcryptOverrideVersion; @@ -193,44 +199,12 @@ let hash = "sha256-lDWX69YENZFMu7pyBmavUZaalGvFqbHSHfkwkzmDQaY="; }; }); - # Ceph does not support `cryptography` > 40 yet: - # * https://github.com/NixOS/nixpkgs/pull/281858#issuecomment-1899358602 - # * Upstream issue: https://tracker.ceph.com/issues/63529 - # > Python Sub-Interpreter Model Used by ceph-mgr Incompatible With Python Modules Based on PyO3 - # + # We pin the older `cryptography` 40 here; # this also forces us to pin an older `pyopenssl` because the current one # is not compatible with older `cryptography`, see: # https://github.com/pyca/pyopenssl/blob/d9752e44127ba36041b045417af8a0bf16ec4f1e/CHANGELOG.rst#2320-2023-05-30 - cryptography = super.cryptography.overridePythonAttrs (old: rec { - version = cryptographyOverrideVersion; - - src = fetchPypi { - inherit (old) pname; - version = cryptographyOverrideVersion; - hash = "sha256-KAPy+LHpX2FEGZJsfm9V2CivxhTKXtYVQ4d65mjMNHI="; - }; - - cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - sourceRoot = let cargoRoot = "src/rust"; in "${old.pname}-${cryptographyOverrideVersion}/${cargoRoot}"; - name = "${old.pname}-${cryptographyOverrideVersion}"; - hash = "sha256-gFfDTc2QWBWHBCycVH1dYlCsWQMVcRZfOBIau+njtDU="; - }; - - # Not using the normal `(old.patches or []) ++` pattern here to use - # the overridden package's patches, because current nixpkgs's `cryptography` - # has patches that do not apply on this old version. - patches = [ - # Fix https://nvd.nist.gov/vuln/detail/CVE-2023-49083 which has no upstream backport. - # See https://github.com/pyca/cryptography/commit/f09c261ca10a31fe41b1262306db7f8f1da0e48a#diff-f5134bf8f3cf0a5cc8601df55e50697acc866c603a38caff98802bd8e17976c5R1893 - ./python-cryptography-Cherry-pick-fix-for-CVE-2023-49083-on-cryptography-40.patch - ]; - - # Tests would require overriding `cryptography-vectors`, which is not currently - # possible/desired, see: https://github.com/NixOS/nixpkgs/pull/281858#pullrequestreview-1841421866 - doCheck = false; - }); + cryptography = self.callPackage ./old-python-packages/cryptography.nix {}; # This is the most recent version of `pyopenssl` that's still compatible with `cryptography` 40. # See https://github.com/NixOS/nixpkgs/pull/281858#issuecomment-1899358602 @@ -249,6 +223,14 @@ let ]; }); + + fastapi = super.fastapi.overridePythonAttrs (old: rec { + # Flaky test: + # ResourceWarning: Unclosed + # Unclear whether it's flaky in general or only in this overridden package set. + doCheck = false; + }); + # Ceph does not support `kubernetes` >= 19, see: # https://github.com/NixOS/nixpkgs/pull/281858#issuecomment-1900324090 kubernetes = super.kubernetes.overridePythonAttrs (old: rec { @@ -500,6 +482,7 @@ in rec { passthru = { inherit version; + inherit python; # to be able to test our overridden packages above individually with `nix-build -A` tests = { inherit (nixosTests) ceph-multi-node diff --git a/pkgs/tools/filesystems/ceph/old-python-packages/cryptography-vectors.nix b/pkgs/tools/filesystems/ceph/old-python-packages/cryptography-vectors.nix new file mode 100644 index 000000000000..74fd8dd95676 --- /dev/null +++ b/pkgs/tools/filesystems/ceph/old-python-packages/cryptography-vectors.nix @@ -0,0 +1,36 @@ +# This older version only exists because `ceph` needs it, see `cryptography.nix`. +{ + buildPythonPackage, + fetchPypi, + lib, + cryptography, +}: + +buildPythonPackage rec { + pname = "cryptography-vectors"; + # The test vectors must have the same version as the cryptography package + inherit (cryptography) version; + format = "setuptools"; + + src = fetchPypi { + pname = "cryptography_vectors"; + inherit version; + hash = "sha256-hGBwa1tdDOSoVXHKM4nPiPcAu2oMYTPcn+D1ovW9oEE="; + }; + + # No tests included + doCheck = false; + + pythonImportsCheck = [ "cryptography_vectors" ]; + + meta = with lib; { + description = "Test vectors for the cryptography package"; + homepage = "https://cryptography.io/en/latest/development/test-vectors/"; + # Source: https://github.com/pyca/cryptography/tree/master/vectors; + license = with licenses; [ + asl20 + bsd3 + ]; + maintainers = with maintainers; [ nh2 ]; + }; +} diff --git a/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix b/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix new file mode 100644 index 000000000000..8583cce73dae --- /dev/null +++ b/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix @@ -0,0 +1,135 @@ +# This older version only exists because `ceph` needs it, see its package. +{ + lib, + stdenv, + callPackage, + buildPythonPackage, + fetchPypi, + fetchpatch, + rustPlatform, + cargo, + rustc, + setuptoolsRustBuildHook, + openssl, + Security ? null, + isPyPy, + cffi, + pkg-config, + pytestCheckHook, + pytest-subtests, + pythonOlder, + pretend, + libiconv, + libxcrypt, + iso8601, + py, + pytz, + hypothesis, +}: + +let + cryptography-vectors = callPackage ./cryptography-vectors.nix { }; +in +buildPythonPackage rec { + pname = "cryptography"; + version = "40.0.1"; # Also update the hash in vectors.nix + format = "setuptools"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-KAPy+LHpX2FEGZJsfm9V2CivxhTKXtYVQ4d65mjMNHI="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + sourceRoot = "${pname}-${version}/${cargoRoot}"; + name = "${pname}-${version}"; + hash = "sha256-gFfDTc2QWBWHBCycVH1dYlCsWQMVcRZfOBIau+njtDU="; + }; + + # Since Cryptography v40 is quite outdated, we need to backport + # security fixes that are only available in newer versions. + patches = [ + # Fix https://nvd.nist.gov/vuln/detail/CVE-2023-49083 which has no upstream backport. + # See https://github.com/pyca/cryptography/commit/f09c261ca10a31fe41b1262306db7f8f1da0e48a#diff-f5134bf8f3cf0a5cc8601df55e50697acc866c603a38caff98802bd8e17976c5R1893 + ./python-cryptography-Cherry-pick-fix-for-CVE-2023-49083-on-cryptography-40.patch + + # Fix https://nvd.nist.gov/vuln/detail/CVE-2024-26130 + # See https://github.com/pyca/cryptography/commit/97d231672763cdb5959a3b191e692a362f1b9e55 + (fetchpatch { + name = "python-cryptography-CVE-2024-26130-dont-crash-when-a-PKCS-12-key-and-cert-dont-match-mmap-mode.patch"; + url = "https://github.com/pyca/cryptography/commit/97d231672763cdb5959a3b191e692a362f1b9e55.patch"; + hash = "sha256-l45NOzOWhHW4nY4OIRpdjYQRvUW8BROGWdpkAtvVn0Y="; + }) + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "--benchmark-disable" "" + ''; + + cargoRoot = "src/rust"; + + nativeBuildInputs = [ + rustPlatform.cargoSetupHook + setuptoolsRustBuildHook + cargo + rustc + pkg-config + ] ++ lib.optionals (!isPyPy) [ cffi ]; + + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.isDarwin [ + Security + libiconv + ] + ++ lib.optionals (pythonOlder "3.9") [ libxcrypt ]; + + propagatedBuildInputs = lib.optionals (!isPyPy) [ cffi ]; + + nativeCheckInputs = [ + cryptography-vectors + hypothesis + iso8601 + pretend + py + pytestCheckHook + pytest-subtests + pytz + ]; + + pytestFlagsArray = [ "--disable-pytest-warnings" ]; + + disabledTestPaths = + [ + # save compute time by not running benchmarks + "tests/bench" + ] + ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # aarch64-darwin forbids W+X memory, but this tests depends on it: + # * https://cffi.readthedocs.io/en/latest/using.html#callbacks + "tests/hazmat/backends/test_openssl_memleak.py" + ]; + + meta = with lib; { + description = "A package which provides cryptographic recipes and primitives"; + longDescription = '' + Cryptography includes both high level recipes and low level interfaces to + common cryptographic algorithms such as symmetric ciphers, message + digests, and key derivation functions. + Our goal is for it to be your "cryptographic standard library". It + supports Python 2.7, Python 3.5+, and PyPy 5.4+. + ''; + homepage = "https://github.com/pyca/cryptography"; + changelog = + "https://cryptography.io/en/latest/changelog/#v" + replaceStrings [ "." ] [ "-" ] version; + license = with licenses; [ + asl20 + bsd3 + psfl + ]; + maintainers = with maintainers; [ nh2 ]; + }; +} diff --git a/pkgs/tools/filesystems/ceph/python-cryptography-Cherry-pick-fix-for-CVE-2023-49083-on-cryptography-40.patch b/pkgs/tools/filesystems/ceph/old-python-packages/python-cryptography-Cherry-pick-fix-for-CVE-2023-49083-on-cryptography-40.patch similarity index 100% rename from pkgs/tools/filesystems/ceph/python-cryptography-Cherry-pick-fix-for-CVE-2023-49083-on-cryptography-40.patch rename to pkgs/tools/filesystems/ceph/old-python-packages/python-cryptography-Cherry-pick-fix-for-CVE-2023-49083-on-cryptography-40.patch