From 4621ec1ec77e4e17687d217f483bf316a12fbf82 Mon Sep 17 00:00:00 2001 From: Jonas Fierlings Date: Thu, 18 Apr 2024 09:16:08 +0200 Subject: [PATCH 01/63] maintainers: add pigeonf --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e957c6ece2e4..ad4e39d37249 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15734,6 +15734,12 @@ githubId = 1179566; name = "Nicolas B. Pierron"; }; + pigeonf = { + email = "fnoegip+nixpkgs@gmail.com"; + github = "PigeonF"; + githubId = 7536431; + name = "Jonas Fierlings"; + }; pimeys = { email = "julius@nauk.io"; github = "pimeys"; From b171ecfe9750ffa13ac297be48c6842f0e140848 Mon Sep 17 00:00:00 2001 From: Jonas Fierlings Date: Thu, 18 Apr 2024 09:31:39 +0200 Subject: [PATCH 02/63] committed: init at 1.0.20 --- pkgs/by-name/co/committed/package.nix | 43 +++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 pkgs/by-name/co/committed/package.nix diff --git a/pkgs/by-name/co/committed/package.nix b/pkgs/by-name/co/committed/package.nix new file mode 100644 index 000000000000..cd42172fde9f --- /dev/null +++ b/pkgs/by-name/co/committed/package.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, darwin +, testers +, nix-update-script +, committed +}: +let + version = "1.0.20"; +in +rustPlatform.buildRustPackage { + pname = "committed"; + inherit version; + + src = fetchFromGitHub { + owner = "crate-ci"; + repo = "committed"; + rev = "refs/tags/v${version}"; + hash = "sha256-HqZYxV2YjnK7Q3A7B6yVFXME0oc3DZ4RfMkDGa2IQxA="; + }; + cargoHash = "sha256-AmAEGVWq6KxLtiHDGIFVcoP1Wck8z+P9mnDy0SSSJNM="; + + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + + passthru = { + tests.version = testers.testVersion { package = committed; }; + updateScript = nix-update-script { }; + }; + + meta = { + homepage = "https://github.com/crate-ci/committed"; + changelog = "https://github.com/crate-ci/committed/blob/v${version}/CHANGELOG.md"; + description = "Nitpicking commit history since beabf39"; + mainProgram = "committed"; + license = [ + lib.licenses.asl20 # or + lib.licenses.mit + ]; + maintainers = [ lib.maintainers.pigeonf ]; + }; +} From 5bf1b868867f3e315e69a9d3faf86febffb48b30 Mon Sep 17 00:00:00 2001 From: Ethan Brierley Date: Thu, 18 Apr 2024 21:43:01 +0100 Subject: [PATCH 03/63] cargo-information: 0.4.2 -> 0.6.0 --- pkgs/by-name/ca/cargo-information/Cargo.lock | 382 ++++++++++-------- pkgs/by-name/ca/cargo-information/package.nix | 5 +- 2 files changed, 209 insertions(+), 178 deletions(-) diff --git a/pkgs/by-name/ca/cargo-information/Cargo.lock b/pkgs/by-name/ca/cargo-information/Cargo.lock index a292db70a694..edde6f5eaae2 100644 --- a/pkgs/by-name/ca/cargo-information/Cargo.lock +++ b/pkgs/by-name/ca/cargo-information/Cargo.lock @@ -36,10 +36,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" [[package]] -name = "anstream" -version = "0.6.11" +name = "annotate-snippets" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" +checksum = "6d9b665789884a7e8fb06c84b295e923b03ca51edbb7d08f91a6a50322ecbfe6" +dependencies = [ + "anstyle", + "unicode-width", +] + +[[package]] +name = "anstream" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" dependencies = [ "anstyle", "anstyle-parse", @@ -55,6 +65,15 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +[[package]] +name = "anstyle-lossy" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9a0444767dbd4aea9355cb47a370eb184dbfe918875e127eff52cb9d1638181" +dependencies = [ + "anstyle", +] + [[package]] name = "anstyle-parse" version = "0.2.3" @@ -73,6 +92,19 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "anstyle-svg" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6ddad447b448d6d5db36b31cbd3ff27c7af071619501998eeceab01968287a" +dependencies = [ + "anstream", + "anstyle", + "anstyle-lossy", + "html-escape", + "unicode-width", +] + [[package]] name = "anstyle-wincon" version = "3.0.2" @@ -85,9 +117,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.79" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" [[package]] name = "arc-swap" @@ -189,10 +221,11 @@ checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" [[package]] name = "cargo" -version = "0.77.0" +version = "0.78.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a399e5bde59d144aa2c7ba643765e2f8c6c3c601daa2da03202caf66f2552b3" +checksum = "d6305e39d08315644d79a5ae09a0745dfb3a43b5b5e318e55dbda3f12031c5dc" dependencies = [ + "annotate-snippets", "anstream", "anstyle", "anyhow", @@ -203,10 +236,11 @@ dependencies = [ "cargo-credential-macos-keychain", "cargo-credential-wincred", "cargo-platform", - "cargo-util 0.2.9", + "cargo-util 0.2.10", + "cargo-util-schemas", "clap", "color-print", - "crates-io 0.39.2", + "crates-io 0.40.0", "curl", "curl-sys", "filetime", @@ -214,7 +248,7 @@ dependencies = [ "git2", "git2-curl", "gix", - "gix-features 0.35.0", + "gix-features", "glob", "hex", "hmac", @@ -235,7 +269,6 @@ dependencies = [ "os_info", "pasetors", "pathdiff", - "pulldown-cmark", "rand", "regex", "rusqlite", @@ -243,23 +276,20 @@ dependencies = [ "semver", "serde", "serde-untagged", - "serde-value", "serde_ignored", "serde_json", "sha1", "shell-escape", "supports-hyperlinks", - "syn 2.0.46", "tar", "tempfile", "time", "toml", - "toml_edit 0.21.0", + "toml_edit 0.21.1", "tracing", "tracing-subscriber", "unicase", "unicode-width", - "unicode-xid", "url", "walkdir", "windows-sys 0.52.0", @@ -267,9 +297,9 @@ dependencies = [ [[package]] name = "cargo-credential" -version = "0.4.2" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec27ad011c37339b865c765fa28096cd63d5b25fab680c04d9e410cb586c327d" +checksum = "4e5c02daf38715e60a9f59155bc3154c3e0bf55ee7bf34ddc090e8818c8f75e3" dependencies = [ "anyhow", "libc", @@ -313,7 +343,7 @@ dependencies = [ [[package]] name = "cargo-information" -version = "0.4.2" +version = "0.6.0" dependencies = [ "anstyle", "anyhow", @@ -321,10 +351,10 @@ dependencies = [ "cargo-credential", "cargo-test-macro", "cargo-test-support", - "cargo-util 0.2.9", + "cargo-util 0.2.10", "clap", "color-print", - "crates-io 0.39.2", + "crates-io 0.40.0", "pathdiff", "semver", "snapbox", @@ -375,9 +405,9 @@ dependencies = [ [[package]] name = "cargo-util" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74862c3c6e53a1c1f8f0178f9d38ab41e49746cd3a7cafc239b3d0248fd4e342" +checksum = "9f2d9a9a8d3e0b61b1110c49ab8f6ed7a76ce4f2b1d53ae48a83152d3d5e8f5b" dependencies = [ "anyhow", "core-foundation", @@ -418,6 +448,22 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "cargo-util-schemas" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e63d2780ac94487eb9f1fea7b0d56300abc9eb488800854ca217f102f5caccca" +dependencies = [ + "semver", + "serde", + "serde-untagged", + "serde-value", + "thiserror", + "toml", + "unicode-xid", + "url", +] + [[package]] name = "cc" version = "1.0.83" @@ -436,18 +482,18 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.5.1" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.1" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstream", "anstyle", @@ -537,9 +583,9 @@ dependencies = [ [[package]] name = "crates-io" -version = "0.39.2" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6622f902c3c338eced1f000091f034846ae36aadaf35d0acd1ab0469a2d8ef1f" +checksum = "19958b4dfc8889cf78606e5e2fe64e7e0170a9ab853157192608f3a3253c8ef8" dependencies = [ "curl", "percent-encoding", @@ -811,9 +857,6 @@ name = "faster-hex" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183" -dependencies = [ - "serde", -] [[package]] name = "fastrand" @@ -937,9 +980,9 @@ dependencies = [ [[package]] name = "gix" -version = "0.56.0" +version = "0.57.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0dcdc9c60d66535897fa40a7ea2a635e72f99456b1d9ae86b7e170e80618cb" +checksum = "6dd025382892c7b500a9ce1582cd803f9c2ebfe44aff52e9c7f86feee7ced75e" dependencies = [ "gix-actor", "gix-attributes", @@ -950,7 +993,7 @@ dependencies = [ "gix-date", "gix-diff", "gix-discover", - "gix-features 0.36.1", + "gix-features", "gix-filter", "gix-fs", "gix-glob", @@ -992,9 +1035,9 @@ dependencies = [ [[package]] name = "gix-actor" -version = "0.28.1" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eadca029ef716b4378f7afb19f7ee101fde9e58ba1f1445971315ac866db417" +checksum = "da27b5ab4ab5c75ff891dccd48409f8cc53c28a79480f1efdd33184b2dc1d958" dependencies = [ "bstr", "btoi", @@ -1006,9 +1049,9 @@ dependencies = [ [[package]] name = "gix-attributes" -version = "0.20.1" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f395469d38c76ec47cd1a6c5a53fbc3f13f737b96eaf7535f4e6b367e643381" +checksum = "bd6de7603d6bcefcf9a1d87779c4812b14665f71bc870df7ce9ca4c4b309de18" dependencies = [ "bstr", "gix-glob", @@ -1023,18 +1066,18 @@ dependencies = [ [[package]] name = "gix-bitmap" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d49e1a13a30d3f88be4bceae184dd13a2d3fb9ffa7515f7ed7ae771b857f4916" +checksum = "a371db66cbd4e13f0ed9dc4c0fea712d7276805fccc877f77e96374d317e87ae" dependencies = [ "thiserror", ] [[package]] name = "gix-chunk" -version = "0.4.5" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d411ecd9b558b0c20b3252b7e409eec48eabc41d18324954fe526bac6e2db55f" +checksum = "45c8751169961ba7640b513c3b24af61aa962c967aaf04116734975cd5af0c52" dependencies = [ "thiserror", ] @@ -1053,13 +1096,13 @@ dependencies = [ [[package]] name = "gix-commitgraph" -version = "0.22.1" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85a7007ba021f059803afaf6f8a48872422abc20550ac12ede6ddea2936cec36" +checksum = "7e8dcbf434951fa477063e05fea59722615af70dc2567377e58c2f7853b010fc" dependencies = [ "bstr", "gix-chunk", - "gix-features 0.36.1", + "gix-features", "gix-hash", "memmap2", "thiserror", @@ -1067,13 +1110,13 @@ dependencies = [ [[package]] name = "gix-config" -version = "0.32.1" +version = "0.33.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0341471d55d8676e98b88e121d7065dfa4c9c5acea4b6d6ecdd2846e85cce0c3" +checksum = "367304855b369cadcac4ee5fb5a3a20da9378dd7905106141070b79f85241079" dependencies = [ "bstr", "gix-config-value", - "gix-features 0.36.1", + "gix-features", "gix-glob", "gix-path", "gix-ref", @@ -1101,9 +1144,9 @@ dependencies = [ [[package]] name = "gix-credentials" -version = "0.22.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "513dac42450b27946bd0a0535a3a5a88e473d6522e5e3439a129cab779c88f3d" +checksum = "380cf3a7c31763743ae6403ec473281d54bfa05628331d09518a350ad5a0971f" dependencies = [ "bstr", "gix-command", @@ -1118,9 +1161,9 @@ dependencies = [ [[package]] name = "gix-date" -version = "0.8.1" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "468dfbe411f335f01525a1352271727f8e7772075a93fa747260f502086b30be" +checksum = "180b130a4a41870edfbd36ce4169c7090bca70e195da783dea088dd973daa59c" dependencies = [ "bstr", "itoa", @@ -1130,9 +1173,9 @@ dependencies = [ [[package]] name = "gix-diff" -version = "0.38.0" +version = "0.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8119a985887cfe68f4bdf92e51bd64bc758a73882d82fcfc03ebcb164441c85d" +checksum = "fd6a0454f8c42d686f17e7f084057c717c082b7dbb8209729e4e8f26749eb93a" dependencies = [ "bstr", "gix-hash", @@ -1142,9 +1185,9 @@ dependencies = [ [[package]] name = "gix-discover" -version = "0.27.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fad89416ebe0b3b7df78464124e2a02417b6cd3743d48ad93df86f4d2929c07" +checksum = "b8d7b2896edc3d899d28a646ccc6df729827a6600e546570b2783466404a42d6" dependencies = [ "bstr", "dunce", @@ -1157,30 +1200,19 @@ dependencies = [ [[package]] name = "gix-features" -version = "0.35.0" +version = "0.37.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b9ff423ae4983f762659040d13dd7a5defbd54b6a04ac3cc7347741cec828cd" -dependencies = [ - "crossbeam-channel", - "gix-hash", - "gix-trace", - "libc", - "parking_lot", -] - -[[package]] -name = "gix-features" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d46a4a5c6bb5bebec9c0d18b65ada20e6517dbd7cf855b87dd4bbdce3a771b2" +checksum = "d50270e8dcc665f30ba0735b17984b9535bdf1e646c76e638e007846164d57af" dependencies = [ "bytes", "crc32fast", + "crossbeam-channel", "flate2", "gix-hash", "gix-trace", "libc", "once_cell", + "parking_lot", "prodash", "sha1_smol", "thiserror", @@ -1189,9 +1221,9 @@ dependencies = [ [[package]] name = "gix-filter" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d6a5c9d8e55c364e7c226919c19c9a28be1392d6208b5008059fa94ff7e2bf0" +checksum = "f598c1d688bf9d57f428ed7ee70c3e786d6f0cc7ed1aeb3c982135af41f6e516" dependencies = [ "bstr", "encoding_rs", @@ -1210,30 +1242,30 @@ dependencies = [ [[package]] name = "gix-fs" -version = "0.8.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20e86eb040f5776a5ade092282e51cdcad398adb77d948b88d17583c2ae4e107" +checksum = "7555c23a005537434bbfcb8939694e18cad42602961d0de617f8477cc2adecdd" dependencies = [ - "gix-features 0.36.1", + "gix-features", ] [[package]] name = "gix-glob" -version = "0.14.1" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db19298c5eeea2961e5b3bf190767a2d1f09b8802aeb5f258e42276350aff19" +checksum = "ae6232f18b262770e343dcdd461c0011c9b9ae27f0c805e115012aa2b902c1b8" dependencies = [ "bitflags 2.4.1", "bstr", - "gix-features 0.36.1", + "gix-features", "gix-path", ] [[package]] name = "gix-hash" -version = "0.13.3" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f8cf8c2266f63e582b7eb206799b63aa5fa68ee510ad349f637dfe2d0653de0" +checksum = "f93d7df7366121b5018f947a04d37f034717e113dcf9ccd85c34b58e57a74d5e" dependencies = [ "faster-hex", "thiserror", @@ -1241,9 +1273,9 @@ dependencies = [ [[package]] name = "gix-hashtable" -version = "0.4.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feb61880816d7ec4f0b20606b498147d480860ddd9133ba542628df2f548d3ca" +checksum = "7ddf80e16f3c19ac06ce415a38b8591993d3f73aede049cb561becb5b3a8e242" dependencies = [ "gix-hash", "hashbrown", @@ -1252,9 +1284,9 @@ dependencies = [ [[package]] name = "gix-ignore" -version = "0.9.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a215cc8cf21645bca131fcf6329d3ebd46299c47dbbe27df71bb1ca9e328b879" +checksum = "f356ce440c60aedb7e72f3447f352f9c5e64352135c8cf33e838f49760fd2643" dependencies = [ "bstr", "gix-glob", @@ -1264,16 +1296,16 @@ dependencies = [ [[package]] name = "gix-index" -version = "0.27.1" +version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3f308f5cd2992e96a274b0d1931e9a0e44fdcba87695ead3f6df30d8a697e9c" +checksum = "9e50e63df6c8d4137f7fb882f27643b3a9756c468a1a2cdbe1ce443010ca8778" dependencies = [ "bitflags 2.4.1", "bstr", "btoi", "filetime", "gix-bitmap", - "gix-features 0.36.1", + "gix-features", "gix-fs", "gix-hash", "gix-lock", @@ -1289,9 +1321,9 @@ dependencies = [ [[package]] name = "gix-lock" -version = "11.0.1" +version = "12.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e5c65e6a29830a435664891ced3f3c1af010f14900226019590ee0971a22f37" +checksum = "f40a439397f1e230b54cf85d52af87e5ea44cc1e7748379785d3f6d03d802b00" dependencies = [ "gix-tempfile", "gix-utils", @@ -1300,9 +1332,9 @@ dependencies = [ [[package]] name = "gix-macros" -version = "0.1.1" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02a5bcaf6704d9354a3071cede7e77d366a5980c7352e102e2c2f9b645b1d3ae" +checksum = "1dff438f14e67e7713ab9332f5fd18c8f20eb7eb249494f6c2bf170522224032" dependencies = [ "proc-macro2", "quote", @@ -1311,9 +1343,9 @@ dependencies = [ [[package]] name = "gix-negotiate" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "979f6accd9c051b3dd018b50adf29c0a2459edddf6105cc70b767976cd6f8014" +checksum = "e6820bb5e9e259f6ad052826037452ca023d4f248c5d710dce067d89685dd582" dependencies = [ "bitflags 2.4.1", "gix-commitgraph", @@ -1327,15 +1359,15 @@ dependencies = [ [[package]] name = "gix-object" -version = "0.39.0" +version = "0.40.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "febf79c5825720c1c63fe974c7bbe695d0cb54aabad73f45671c60ce0e501e33" +checksum = "0c89402e8faa41b49fde348665a8f38589e461036475af43b6b70615a6a313a2" dependencies = [ "bstr", "btoi", "gix-actor", "gix-date", - "gix-features 0.36.1", + "gix-features", "gix-hash", "gix-validate", "itoa", @@ -1346,13 +1378,13 @@ dependencies = [ [[package]] name = "gix-odb" -version = "0.55.0" +version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fae5f971540c99c6ecc8d4368ecc9d18a9dc8b9391025c68c4399747dc93bac" +checksum = "46ae6da873de41c6c2b73570e82c571b69df5154dcd8f46dfafc6687767c33b1" dependencies = [ "arc-swap", "gix-date", - "gix-features 0.36.1", + "gix-features", "gix-hash", "gix-object", "gix-pack", @@ -1365,13 +1397,13 @@ dependencies = [ [[package]] name = "gix-pack" -version = "0.45.0" +version = "0.46.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4569491c92446fddf373456ff360aff9a9effd627b40a70f2d7914dcd75a3205" +checksum = "782b4d42790a14072d5c400deda9851f5765f50fe72bca6dece0da1cd6f05a9a" dependencies = [ "clru", "gix-chunk", - "gix-features 0.36.1", + "gix-features", "gix-hash", "gix-hashtable", "gix-object", @@ -1409,9 +1441,9 @@ dependencies = [ [[package]] name = "gix-path" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97e9ad649bf5e109562d6acba657ca428661ec08e77eaf3a755d8fa55485be9c" +checksum = "69e0b521a5c345b7cd6a81e3e6f634407360a038c8b74ba14c621124304251b8" dependencies = [ "bstr", "gix-trace", @@ -1422,9 +1454,9 @@ dependencies = [ [[package]] name = "gix-pathspec" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dbbb92f75a38ef043c8bb830b339b38d0698d7f3746968b5fcbade7a880494d" +checksum = "0cdb0ee9517c04f89bcaf6366fe893a17154ecb02d88b5c8174f27f1091d1247" dependencies = [ "bitflags 2.4.1", "bstr", @@ -1450,15 +1482,15 @@ dependencies = [ [[package]] name = "gix-protocol" -version = "0.42.0" +version = "0.43.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95736ef407db0bd15a5bdea791fbfcf523b9f13b96c852c240cd86a9ee0ef817" +checksum = "eca52738435991105f3bbd7f3a3a42cdf84c9992a78b9b7b1de528b3c022cfdd" dependencies = [ "bstr", "btoi", "gix-credentials", "gix-date", - "gix-features 0.36.1", + "gix-features", "gix-hash", "gix-transport", "maybe-async", @@ -1468,24 +1500,24 @@ dependencies = [ [[package]] name = "gix-quote" -version = "0.4.8" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f84845efa535468bc79c5a87b9d29219f1da0313c8ecf0365a5daa7e72786f2" +checksum = "cbff4f9b9ea3fa7a25a70ee62f545143abef624ac6aa5884344e70c8b0a1d9ff" dependencies = [ "bstr", - "btoi", + "gix-utils", "thiserror", ] [[package]] name = "gix-ref" -version = "0.39.1" +version = "0.40.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b2069adc212cf7f3317ef55f6444abd06c50f28479dbbac5a86acf3b05cbbfe" +checksum = "64d9bd1984638d8f3511a2fcbe84fcedb8a5b5d64df677353620572383f42649" dependencies = [ "gix-actor", "gix-date", - "gix-features 0.36.1", + "gix-features", "gix-fs", "gix-hash", "gix-lock", @@ -1500,9 +1532,9 @@ dependencies = [ [[package]] name = "gix-refspec" -version = "0.20.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d9d3b82e1ee78fc0dc1c37ea5ea76c2dbc73f407db155f0dfcea285e583bee" +checksum = "be219df5092c1735abb2a53eccdf775e945eea6986ee1b6e7a5896dccc0be704" dependencies = [ "bstr", "gix-hash", @@ -1514,9 +1546,9 @@ dependencies = [ [[package]] name = "gix-revision" -version = "0.24.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe5dd51710ce5434bc315ea30394fab483c5377276494edd79222b321a5a9544" +checksum = "aa78e1df3633bc937d4db15f8dca2abdb1300ca971c0fabcf9fa97e38cf4cd9f" dependencies = [ "bstr", "gix-date", @@ -1530,9 +1562,9 @@ dependencies = [ [[package]] name = "gix-revwalk" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d4ed2493ca94a475fdf147138e1ef8bab3b6ebb56abf3d9bda1c05372ec1dd" +checksum = "702de5fe5c2bbdde80219f3a8b9723eb927466e7ecd187cfd1b45d986408e45f" dependencies = [ "gix-commitgraph", "gix-date", @@ -1545,21 +1577,21 @@ dependencies = [ [[package]] name = "gix-sec" -version = "0.10.1" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a36ea2c5907d64a9b4b5d3cc9f430e6c30f0509646b5e38eb275ca57c5bf29e2" +checksum = "022592a0334bdf77c18c06e12a7c0eaff28845c37e73c51a3e37d56dd495fb35" dependencies = [ "bitflags 2.4.1", "gix-path", "libc", - "windows", + "windows-sys 0.52.0", ] [[package]] name = "gix-submodule" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02a3d7f60a95bdcaeb8981663c99d1c9f4de42aab1169524c949e948989809f9" +checksum = "21d438409222de24dffcc9897f04a9f97903a19fe4835b598ab3bb9b6e0f5e35" dependencies = [ "bstr", "gix-config", @@ -1572,9 +1604,9 @@ dependencies = [ [[package]] name = "gix-tempfile" -version = "11.0.1" +version = "12.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388dd29114a86ec69b28d1e26d6d63a662300ecf61ab3f4cc578f7d7dc9e7e23" +checksum = "a8ef376d718b1f5f119b458e21b00fbf576bc9d4e26f8f383d29f5ffe3ba3eaa" dependencies = [ "gix-fs", "libc", @@ -1591,16 +1623,16 @@ checksum = "02b202d766a7fefc596e2cc6a89cda8ad8ad733aed82da635ac120691112a9b1" [[package]] name = "gix-transport" -version = "0.39.0" +version = "0.40.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f731cfefc4d62468c6dd2053f5c6707828256a6d2f5488c1811e3f42c178b144" +checksum = "be01a22053e9395a409fcaeed879d94f4fcffeb4f46de7143275fbf5e5b39770" dependencies = [ "base64", "bstr", "curl", "gix-command", "gix-credentials", - "gix-features 0.36.1", + "gix-features", "gix-packetline", "gix-quote", "gix-sec", @@ -1610,9 +1642,9 @@ dependencies = [ [[package]] name = "gix-traverse" -version = "0.35.0" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df2112088122a0206592c84fbd42020db63b2ccaed66a0293779f2e5fbf80474" +checksum = "65109e445ba7a409b48f34f570a4d7db72eade1dc1bcff81990a490e86c07161" dependencies = [ "gix-commitgraph", "gix-date", @@ -1626,12 +1658,12 @@ dependencies = [ [[package]] name = "gix-url" -version = "0.25.2" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c427a1a11ccfa53a4a2da47d9442c2241deee63a154bc15cc14b8312fbc4005" +checksum = "8f0f17cceb7552a231d1fec690bc2740c346554e3be6f5d2c41dfa809594dc44" dependencies = [ "bstr", - "gix-features 0.36.1", + "gix-features", "gix-path", "home", "thiserror", @@ -1640,18 +1672,19 @@ dependencies = [ [[package]] name = "gix-utils" -version = "0.1.6" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f82c41937f00e15a1f6cb0b55307f0ca1f77f4407ff2bf440be35aa688c6a3e" +checksum = "0066432d4c277f9877f091279a597ea5331f68ca410efc874f0bdfb1cd348f92" dependencies = [ "fastrand", + "unicode-normalization", ] [[package]] name = "gix-validate" -version = "0.8.1" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b7d8e4274be69f284bbc7e6bb2ccf7065dbcdeba22d8c549f2451ae426883f" +checksum = "e39fc6e06044985eac19dd34d474909e517307582e462b2eb4c8fa51b6241545" dependencies = [ "bstr", "thiserror", @@ -1659,13 +1692,13 @@ dependencies = [ [[package]] name = "gix-worktree" -version = "0.28.0" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f1d0ae01dee14abe8c8117d78d7518f9a507de2dc4522546fbf4c444e9860b4" +checksum = "53982f8abff0789a9599e644108a1914da61a4d0dede8e45037e744dcb008d52" dependencies = [ "bstr", "gix-attributes", - "gix-features 0.36.1", + "gix-features", "gix-fs", "gix-glob", "gix-hash", @@ -1763,6 +1796,15 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "html-escape" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476" +dependencies = [ + "utf8-width", +] + [[package]] name = "http-auth" version = "0.1.9" @@ -2363,24 +2405,13 @@ dependencies = [ [[package]] name = "prodash" -version = "26.2.2" +version = "28.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794b5bf8e2d19b53dcdcec3e4bba628e20f5b6062503ba89281fa7037dd7bbcf" +checksum = "744a264d26b88a6a7e37cbad97953fa233b94d585236310bcbc88474b4092d79" dependencies = [ "parking_lot", ] -[[package]] -name = "pulldown-cmark" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998" -dependencies = [ - "bitflags 1.3.2", - "memchr", - "unicase", -] - [[package]] name = "quote" version = "1.0.35" @@ -2528,9 +2559,9 @@ dependencies = [ [[package]] name = "rustfix" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ec10cbeb92a2e494ef354d66126882da8c0a244ad769e2a7193efc5de625175" +checksum = "81864b097046da5df3758fdc6e4822bbb70afa06317e8ca45ea1b51cb8c5e5a4" dependencies = [ "serde", "serde_json", @@ -2620,9 +2651,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.21" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" dependencies = [ "serde", ] @@ -2785,18 +2816,20 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "snapbox" -version = "0.5.1" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47d9a121ed3297bc4575fa774033a9f1084e0a0c8de8dff416df4eae834121b3" +checksum = "8ac441e1ecf678f68423d47f376d53fabce1afba92c8f68e31508eb27df8562a" dependencies = [ "anstream", "anstyle", + "anstyle-svg", "content_inspector", "dunce", "filetime", "libc", "normalize-line-endings", "os_pipe", + "serde_json", "similar", "snapbox-macros", "tempfile", @@ -3015,9 +3048,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.21.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ "indexmap", "serde", @@ -3102,9 +3135,9 @@ dependencies = [ [[package]] name = "trycmd" -version = "0.15.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "464edb3603a81a50b4c8f47b11dfade69ef48ffdc0af2f8b194ad87cbda75317" +checksum = "d14c6930faf7c6c4942ce17daa6f38d659d2ebf2b579a56b6926707038eb37b0" dependencies = [ "glob", "humantime", @@ -3181,6 +3214,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "utf8-width" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" + [[package]] name = "utf8parse" version = "0.2.1" @@ -3315,15 +3354,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.5", -] - [[package]] name = "windows-sys" version = "0.48.0" diff --git a/pkgs/by-name/ca/cargo-information/package.nix b/pkgs/by-name/ca/cargo-information/package.nix index 3801eadc868e..e1ad75f3f2e3 100644 --- a/pkgs/by-name/ca/cargo-information/package.nix +++ b/pkgs/by-name/ca/cargo-information/package.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-information"; - version = "0.4.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "hi-rustin"; repo = "cargo-information"; rev = "v${version}"; - hash = "sha256-k481iHQ1tVi9fF5/xYR99/1/oRv1nS3WH7W55aPSyfc="; + hash = "sha256-5F8O8M8cz7sdXtqGYuDIeTolovZjx2BLEBCZuBIb9YA="; }; cargoLock = { @@ -33,6 +33,7 @@ rustPlatform.buildRustPackage rec { "--skip=cargo_information::within_ws::case" "--skip=cargo_information::within_ws_with_alternative_registry::case" "--skip=cargo_information::within_ws_without_lockfile::case" + "--skip=cargo_information::transitive_dependency_within_ws::case" ]; nativeBuildInputs = [ From 98d8d1e58762be50fe96bf2757a661826518c9f9 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 5 May 2024 19:36:03 +0300 Subject: [PATCH 04/63] glib: enable introspection on cross --- pkgs/development/libraries/glib/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 5a7f49ce94ae..c543133ead6c 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -22,7 +22,8 @@ , makeHardcodeGsettingsPatch , testers , gobject-introspection -, withIntrospection ? stdenv.buildPlatform.canExecute stdenv.hostPlatform && lib.meta.availableOn stdenv.hostPlatform gobject-introspection +, mesonEmulatorHook +, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages && lib.meta.availableOn stdenv.hostPlatform gobject-introspection }: assert stdenv.isLinux -> util-linuxMinimal != null; @@ -150,6 +151,8 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals withIntrospection [ gi-docgen gobject-introspection' + ] ++ lib.optionals (withIntrospection && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; propagatedBuildInputs = [ zlib libffi gettext libiconv ]; From 90530e096036ef5f56c358da7a3c9b73be8d808a Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Sun, 5 May 2024 19:20:19 +0200 Subject: [PATCH 05/63] streamlink: add missing dependency exceptiongroup was propageted from trio-websocket before b0dc16ea572c --- pkgs/applications/video/streamlink/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index b6522aef2397..bef67278b3ad 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -42,6 +42,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ certifi + exceptiongroup isodate lxml pycountry @@ -55,7 +56,7 @@ python3Packages.buildPythonApplication rec { websocket-client ]; - meta = with lib; { + meta = { changelog = "https://github.com/streamlink/streamlink/raw/${version}/CHANGELOG.md"; description = "CLI for extracting streams from various websites to video player of your choosing"; homepage = "https://streamlink.github.io/"; @@ -66,8 +67,8 @@ python3Packages.buildPythonApplication rec { Streamlink is a fork of the livestreamer project. ''; - license = licenses.bsd2; + license = lib.licenses.bsd2; mainProgram = "streamlink"; - maintainers = with maintainers; [ dezgeg zraexy DeeUnderscore ]; + maintainers = with lib.maintainers; [ dezgeg zraexy DeeUnderscore ]; }; } From 3cbfe5c47b18883d0ff127c69dfe69bab19fd4ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20N=C3=BCtzi?= Date: Tue, 23 Apr 2024 01:10:18 +0200 Subject: [PATCH 06/63] githooks: init at 3.0.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add platform-independent Git hooks manager `Githooks` at version 3.0.1.Check the [Readme](https://github.com/gabyx/Githooks) for moreinformation. Signed-off-by: Gabriel Nützi --- pkgs/by-name/gi/githooks/package.nix | 85 ++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 pkgs/by-name/gi/githooks/package.nix diff --git a/pkgs/by-name/gi/githooks/package.nix b/pkgs/by-name/gi/githooks/package.nix new file mode 100644 index 000000000000..349e5db06445 --- /dev/null +++ b/pkgs/by-name/gi/githooks/package.nix @@ -0,0 +1,85 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + git, + testers, + makeWrapper, +}: +buildGoModule rec { + pname = "githooks"; + version = "3.0.1"; + + src = fetchFromGitHub { + owner = "gabyx"; + repo = "githooks"; + rev = "v${version}"; + hash = "sha256-qv0nl3EEYVo/s79r+yK3ZQCGPXM2bzGdWatPY24aOZg="; + }; + + modRoot = "./githooks"; + vendorHash = "sha256-ZcDD4Z/thtyCvXg6GzzKC/FSbh700QEaqXU8FaZaZc4="; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ git ]; + + strictDeps = true; + + ldflags = [ + "-s" # Disable symbole table. + "-w" # Disable DWARF generation. + ]; + + # We need to disable updates and other features: + # That is done with tag `package_manager_enabled`. + tags = [ "package_manager_enabled" ]; + + checkFlags = + let + skippedTests = [ + "TestGithooksCompliesWithGit" # Needs internet to download all hooks documentation. + "TestUpdateImages" # Needs docker/podman. + ]; + in + [ + "-v" + "-skip" + "(${builtins.concatStringsSep "|" skippedTests})" + ]; + + doCheck = true; + + # We need to generate some build files before building. + postConfigure = '' + GH_BUILD_VERSION="${version}" \ + GH_BUILD_TAG="v${version}" \ + go generate -mod=vendor ./... + ''; + + postInstall = '' + # Rename executable to proper names. + mv $out/bin/cli $out/bin/githooks-cli + mv $out/bin/runner $out/bin/githooks-runner + mv $out/bin/dialog $out/bin/githooks-dialog + ''; + + postFixup = '' + wrapProgram "$out/bin/githooks-cli" --prefix PATH : ${lib.makeBinPath [ git ]} + wrapProgram "$out/bin/githooks-runner" --prefix PATH : ${lib.makeBinPath [ git ]} + ''; + + passthru.tests.version = testers.testVersion { + package = "githooks-cli"; + command = "githooks-cli --version"; + inherit version; + }; + + meta = with lib; { + description = "A Git hooks manager with per-repo and shared Git hooks including version control"; + homepage = "https://github.com/gabyx/Githooks"; + license = licenses.mpl20; + maintainers = with maintainers; [ gabyx ]; + mainProgram = "githooks-cli"; + }; +} From 408b2344bbe3555e385b251508a6377b493201ed Mon Sep 17 00:00:00 2001 From: ProggerX Date: Sun, 5 May 2024 22:25:51 +0300 Subject: [PATCH 07/63] maintainers: add proggerx --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ff48ec64b1ed..92561b00e104 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16248,6 +16248,12 @@ githubId = 3153638; name = "Profpatsch"; }; + proggerx = { + email = "x@proggers.ru"; + github = "ProggerX"; + githubId = 88623613; + name = "ProggerX"; + }; proglodyte = { email = "proglodyte23@gmail.com"; github = "proglodyte"; From 80d00f1152c5b2780aeeda70b050ae98c9d20724 Mon Sep 17 00:00:00 2001 From: ProggerX Date: Sun, 5 May 2024 23:50:08 +0300 Subject: [PATCH 08/63] fasole: init at 1.2.3 --- pkgs/by-name/fa/fasole/package.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 pkgs/by-name/fa/fasole/package.nix diff --git a/pkgs/by-name/fa/fasole/package.nix b/pkgs/by-name/fa/fasole/package.nix new file mode 100644 index 000000000000..81df4e88d424 --- /dev/null +++ b/pkgs/by-name/fa/fasole/package.nix @@ -0,0 +1,23 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "fasole"; + version = "1.2.3"; + + src = fetchFromGitHub { + owner = "ProggerX"; + repo = "fasole"; + rev = "v${version}"; + hash = "sha256-qcCJgz/YXfd8+9ST1U4YFxLLd25D8HrfZzsDGpKgCdM="; + }; + + vendorHash = "sha256-V5jqsNy4Pu1AKikIZqEXERdggwBe3gXKMJVmgivVT6A="; + + meta = { + description = "Minimalist's todo-list"; + homepage = "https://github.com/ProggerX/fasole"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ proggerx ]; + mainProgram = "fasole"; + }; +} From 2c5381845d3bf12f230eefb247de19be141eef49 Mon Sep 17 00:00:00 2001 From: "Quinn X. J." Date: Wed, 1 May 2024 00:19:20 +1000 Subject: [PATCH 09/63] openrct2: 0.4.8 -> 0.4.11 https://github.com/OpenRCT2/OpenRCT2/releases/tag/v0.4.11 --- pkgs/games/openrct2/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix index 485b7104b20a..4a8a1c255e89 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -30,27 +30,27 @@ }: let - openrct2-version = "0.4.8"; + openrct2-version = "0.4.11"; # Those versions MUST match the pinned versions within the CMakeLists.txt # file. The REPLAYS repository from the CMakeLists.txt is not necessary. - objects-version = "1.3.13"; + objects-version = "1.4.4"; openmsx-version = "1.5"; - opensfx-version = "1.0.3"; + opensfx-version = "1.0.5"; title-sequences-version = "0.4.6"; openrct2-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "OpenRCT2"; rev = "v${openrct2-version}"; - hash = "sha256-jSKAgohNMHuyOu4gUHyyZf1I7UrsXGDV5XwwK1DQPyM="; + hash = "sha256-zaaVieU/hulc2G/F19diJug3xuj3ejn5ihnmKfkBDcQ="; }; objects-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "objects"; rev = "v${objects-version}"; - hash = "sha256-7RvRe7skXH5x8RbkQgtKs1YMBwq8dHInVo/4FAJwUD0="; + hash = "sha256-wKxWp/DSKkxCEI0lp4X8F9LxQsUKZfLk2CgajQ+y84k="; }; openmsx-src = fetchFromGitHub { @@ -64,7 +64,7 @@ let owner = "OpenRCT2"; repo = "OpenSoundEffects"; rev = "v${opensfx-version}"; - hash = "sha256-AMuCpq1Hszi2Vikto/cX9g81LwBDskaRMTLxNzU0/Gk="; + hash = "sha256-ucADnMLGm36eAo+NiioxEzeMqtu7YbGF9wsydK1mmoE="; }; title-sequences-src = fetchFromGitHub { From b21263b5044e1c5734fe7ca55e78afc08e24adcb Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Mon, 6 May 2024 05:46:13 -0400 Subject: [PATCH 10/63] webcord: 4.8.0 -> 4.9.1 --- pkgs/by-name/we/webcord/package.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/we/webcord/package.nix b/pkgs/by-name/we/webcord/package.nix index d38fd3570215..f3fb33f5dcc4 100644 --- a/pkgs/by-name/we/webcord/package.nix +++ b/pkgs/by-name/we/webcord/package.nix @@ -11,16 +11,16 @@ buildNpmPackage rec { pname = "webcord"; - version = "4.8.0"; + version = "4.9.1"; src = fetchFromGitHub { owner = "SpacingBat3"; repo = "WebCord"; rev = "refs/tags/v${version}"; - hash = "sha256-x9Ejb8yxgQhlEfUUfoqbgSffNNtOoFeAyb3OISR+Jz4="; + hash = "sha256-sYTMfqZokwJ3CFtArkUckCpQlnyJ1BVpewU92sNaKC8="; }; - npmDepsHash = "sha256-7H4I4vKygMgsPh+OvZZGhpkoQQu1a51yUTwEPJSBM18="; + npmDepsHash = "sha256-LxOqpUVl2hXZrfTQfMz1+fVGRuNwG6dX03fGQVYmqq0="; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0069567d1fb2..b7d73a78ec57 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35576,7 +35576,7 @@ with pkgs; webcamoid = libsForQt5.callPackage ../applications/video/webcamoid { }; - webcord = callPackage ../by-name/we/webcord/package.nix { electron = electron_29; }; + webcord = callPackage ../by-name/we/webcord/package.nix { electron = electron_30; }; webex = callPackage ../applications/networking/instant-messengers/webex { }; From a6bd31fa2c5f26fc37e255de36265e309698529e Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Mon, 6 May 2024 15:21:01 +0530 Subject: [PATCH 11/63] hyprlock: 0.3.0 -> 0.3.0-unstable-2024-04-24 this adds support for jpeg and webp wallpapers remove cmake.patch as it is no longer needed add dependencies as per https://github.com/hyprwm/hyprlock/commit/415262065fff0a04b229cd00165f346a86a0a73a --- pkgs/by-name/hy/hyprlock/cmake.patch | 15 --------------- pkgs/by-name/hy/hyprlock/package.nix | 18 ++++++++++-------- 2 files changed, 10 insertions(+), 23 deletions(-) delete mode 100644 pkgs/by-name/hy/hyprlock/cmake.patch diff --git a/pkgs/by-name/hy/hyprlock/cmake.patch b/pkgs/by-name/hy/hyprlock/cmake.patch deleted file mode 100644 index 92c21d643c0f..000000000000 --- a/pkgs/by-name/hy/hyprlock/cmake.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 07e2338..720810b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -83,9 +83,4 @@ protocol("unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml" "linux-dmabuf-unst - # Installation - install(TARGETS hyprlock) - --install(CODE " -- if (NOT EXISTS \"${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d/hyprlock\") -- install(FILES \"${CMAKE_SOURCE_DIR}/pam/hyprlock\" DESTINATION \"${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d\") -- endif() --") -- -+install(FILES "${CMAKE_SOURCE_DIR}/pam/hyprlock" DESTINATION "${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d") diff --git a/pkgs/by-name/hy/hyprlock/package.nix b/pkgs/by-name/hy/hyprlock/package.nix index fb59a96321a0..5bf1649b86c3 100644 --- a/pkgs/by-name/hy/hyprlock/package.nix +++ b/pkgs/by-name/hy/hyprlock/package.nix @@ -10,6 +10,9 @@ , wayland , wayland-protocols , cairo +, file +, libjpeg +, libwebp , pango , libdrm , mesa @@ -18,20 +21,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "hyprlock"; - version = "0.3.0"; + version = "0.3.0-unstable-2024-04-24"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprlock"; - rev = "v${finalAttrs.version}"; - hash = "sha256-rbzVe2WNdHynJrnyJsKOOrV8yuuJ7QIuah3ZHWERSnA="; + # FIXME: Change to a stable release once available + rev = "415262065fff0a04b229cd00165f346a86a0a73a"; + hash = "sha256-jla5Wo0Qt3NEnD0OjNj85BGw0pR4Zlz5uy8AqHH7tuE="; }; - patches = [ - # remove PAM file install check - ./cmake.patch - ]; - strictDeps = true; nativeBuildInputs = [ @@ -41,9 +40,12 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ cairo + file hyprlang libdrm libGL + libjpeg + libwebp libxkbcommon mesa pam From 66d13063df6449d492d7712e58512d494dc2f8da Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Mon, 6 May 2024 15:30:25 +0530 Subject: [PATCH 12/63] hyprlock: format using nixfmt-rfc-style --- pkgs/by-name/hy/hyprlock/package.nix | 44 +++++++++++++++------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/hy/hyprlock/package.nix b/pkgs/by-name/hy/hyprlock/package.nix index 5bf1649b86c3..0aea3a11e58c 100644 --- a/pkgs/by-name/hy/hyprlock/package.nix +++ b/pkgs/by-name/hy/hyprlock/package.nix @@ -1,22 +1,23 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, libGL -, libxkbcommon -, hyprlang -, pam -, wayland -, wayland-protocols -, cairo -, file -, libjpeg -, libwebp -, pango -, libdrm -, mesa -, nix-update-script +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + libGL, + libxkbcommon, + hyprlang, + pam, + wayland, + wayland-protocols, + cairo, + file, + libjpeg, + libwebp, + pango, + libdrm, + mesa, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -62,6 +63,9 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ eclairevoyant ]; mainProgram = "hyprlock"; - platforms = [ "aarch64-linux" "x86_64-linux" ]; + platforms = [ + "aarch64-linux" + "x86_64-linux" + ]; }; }) From 59d3022abed7d709c6ad585356d744397688aa52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Mon, 6 May 2024 07:19:27 -0400 Subject: [PATCH 13/63] python312Packages.scalene: fix build --- .../python-modules/scalene/default.nix | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/pkgs/development/python-modules/scalene/default.nix b/pkgs/development/python-modules/scalene/default.nix index 18eebe07cc19..f8684a16cbf2 100644 --- a/pkgs/development/python-modules/scalene/default.nix +++ b/pkgs/development/python-modules/scalene/default.nix @@ -27,15 +27,6 @@ buildPythonPackage rec { hash = "sha256-B4pDLP3+56toQZyvh6+6NimCKv0cpcO0ydcqV1tJZkg="; }; - patches = [ - # fix scalene_config import. remove on next update - (fetchpatch { - name = "scalene_config-import-fix.patch"; - url = "https://github.com/plasma-umass/scalene/commit/cd437be11f600ac0925ce77efa516e6d83934200.patch"; - hash = "sha256-YjFh+mu5jyIJYUQFhmGqLXhec6lgQAdj4tWxij3NkwU="; - }) - ]; - nativeBuildInputs = [ cython setuptools @@ -61,14 +52,6 @@ buildPythonPackage rec { numpy ]; - disabledTestPaths = [ - # remove on next update - # Failing Darwin-specific tests that were subsequently removed from the source repo. - "tests/test_coverup_35.py" - "tests/test_coverup_42.py" - "tests/test_coverup_43.py" - ]; - # remove scalene directory to prevent pytest import confusion preCheck = '' rm -rf scalene From 6dcbb99335ef23b98d3e0d0f1ab21d85d45281f4 Mon Sep 17 00:00:00 2001 From: Jiuyang Liu Date: Thu, 2 May 2024 20:13:51 +0800 Subject: [PATCH 14/63] circt: 1.73 -> 1.74 --- 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 58174f3fde0a..368aaab15a0d 100644 --- a/pkgs/development/compilers/circt/default.nix +++ b/pkgs/development/compilers/circt/default.nix @@ -17,12 +17,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.73.0"; + version = "1.74.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - hash = "sha256-C50PiToXrKf94Vg1yv++3xVhIuCW/KVPs0yLv5Fg0dY="; + hash = "sha256-RFvWUd98OiL2I3aFrP61LQRZr4FSKrrZ5YOblBKRCA4="; fetchSubmodules = true; }; From 0f7d6ee262bd1d323ac28fbd55bfa1408009c975 Mon Sep 17 00:00:00 2001 From: Shogo Takata Date: Mon, 6 May 2024 19:54:06 +0800 Subject: [PATCH 15/63] circt: add z3 to buildInputs --- pkgs/development/compilers/circt/circt-llvm.nix | 2 +- pkgs/development/compilers/circt/default.nix | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/circt/circt-llvm.nix b/pkgs/development/compilers/circt/circt-llvm.nix index a21b82d93376..efde87b0789c 100644 --- a/pkgs/development/compilers/circt/circt-llvm.nix +++ b/pkgs/development/compilers/circt/circt-llvm.nix @@ -23,7 +23,7 @@ "-DLLVM_BUILD_EXAMPLES=OFF" "-DLLVM_OPTIMIZED_TABLEGEN=ON" "-DLLVM_ENABLE_PROJECTS=mlir" - "-DLLVM_TARGETS_TO_BUILD=" + "-DLLVM_TARGETS_TO_BUILD=Native" # This option is needed to install llvm-config "-DLLVM_INSTALL_UTILS=ON" diff --git a/pkgs/development/compilers/circt/default.nix b/pkgs/development/compilers/circt/default.nix index 368aaab15a0d..2b9f64bb6b20 100644 --- a/pkgs/development/compilers/circt/default.nix +++ b/pkgs/development/compilers/circt/default.nix @@ -7,6 +7,7 @@ , fetchFromGitHub , ninja , lit +, z3 , gitUpdater , callPackage }: @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { requiredSystemFeatures = [ "big-parallel" ]; - nativeBuildInputs = [ cmake ninja git pythonEnv ]; + nativeBuildInputs = [ cmake ninja git pythonEnv z3 ]; buildInputs = [ circt-llvm ]; cmakeFlags = [ From 0144d1e56b575353ef62c940ed734296eebe8ff1 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Mon, 6 May 2024 13:24:40 +0100 Subject: [PATCH 16/63] homepage-dashboard: 0.8.12 -> 0.8.13 --- pkgs/servers/homepage-dashboard/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/homepage-dashboard/default.nix b/pkgs/servers/homepage-dashboard/default.nix index a3144a12866f..c32aa1b07593 100644 --- a/pkgs/servers/homepage-dashboard/default.nix +++ b/pkgs/servers/homepage-dashboard/default.nix @@ -27,16 +27,16 @@ let in buildNpmPackage rec { pname = "homepage-dashboard"; - version = "0.8.12"; + version = "0.8.13"; src = fetchFromGitHub { owner = "gethomepage"; repo = "homepage"; rev = "v${version}"; - hash = "sha256-71s7Hy5brYof9fgzYxq/HGruyzxFbOfKkOLnpUY0fp8="; + hash = "sha256-5AGtNfeFI5fkeXg1PK9ylifHzp9P6XW80XQQFY1YGj8="; }; - npmDepsHash = "sha256-w3Wmutru91Zt+kAZ0PBf2CdpgdpxFRoqUmE/0CAu/z4="; + npmDepsHash = "sha256-UrRpjbFGziPNN03Fj9T+K+kav0LhaAFp/o+SXja6Jxk="; preBuild = '' mkdir -p config From b3b44121d5d7753c6bc79065c07878c0041d2994 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Mon, 6 May 2024 12:41:05 -0400 Subject: [PATCH 17/63] greetd.tuigreet: 0.8.0 -> 0.9.0 https://github.com/apognu/tuigreet/releases/tag/0.9.0 Diff: https://github.com/apognu/tuigreet/compare/0.8.0...0.9.0 --- pkgs/applications/display-managers/greetd/tuigreet.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/display-managers/greetd/tuigreet.nix b/pkgs/applications/display-managers/greetd/tuigreet.nix index 2a6a4c6ef782..d0aebc5921b9 100644 --- a/pkgs/applications/display-managers/greetd/tuigreet.nix +++ b/pkgs/applications/display-managers/greetd/tuigreet.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "tuigreet"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "apognu"; repo = pname; rev = version; - sha256 = "sha256-8/2I6bk29/GqZ1ACuN9RgBiGAy7yt0iw2fagHfu4/BI="; + sha256 = "sha256-o1NPwZ2gvFxq988RhLz/6ucL4qb2dGtMdhNvAbQzIvg="; }; - cargoSha256 = "sha256-fOs9a0/1c8Kh4JA5up3XSQ+km/FwSYzl0w4UDL4yU4M="; + cargoSha256 = "sha256-dfzNRs3NOtHoWBq6tx3DjL2knNwsdxBmjqJbPzQJifQ="; meta = with lib; { description = "Graphical console greeter for greetd"; From ff11d19a5180659a9eb681244fccab58ce504e8e Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 6 May 2024 22:08:58 +0300 Subject: [PATCH 18/63] Update discord packages discord: 0.0.52 -> 0.0.53 discord-ptb: 0.0.81 -> 0.0.84 discord-canary: 0.0.369 -> 0.0.382 discord-development: 0.0.17 -> 0.0.18 pkgsCross.aarch64-darwin.discord: 0.0.302 -> 0.0.303 pkgsCross.aarch64-darwin.discord-ptb: 0.0.110 -> 0.0.113 pkgsCross.aarch64-darwin.discord-canary: 0.0.486 -> 0.0.492 pkgsCross.aarch64-darwin.discord-development: 0.0.39 -> 0.0.40 --- .../instant-messengers/discord/default.nix | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 920e02f6f47a..e1ffaf1df858 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -2,52 +2,52 @@ let versions = if stdenv.isLinux then { - stable = "0.0.52"; - ptb = "0.0.81"; - canary = "0.0.369"; - development = "0.0.17"; + stable = "0.0.53"; + ptb = "0.0.84"; + canary = "0.0.382"; + development = "0.0.18"; } else { - stable = "0.0.302"; - ptb = "0.0.110"; - canary = "0.0.486"; - development = "0.0.39"; + stable = "0.0.303"; + ptb = "0.0.113"; + canary = "0.0.492"; + development = "0.0.40"; }; version = versions.${branch}; srcs = rec { x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-5cJzedEuxdGizgUenB+DjFf+MwYk8uTH4tjiWzur+q8="; + hash = "sha256-HD8bDFUV3YGk/t3Rbm26nXWDvUjjIf4ykdO6YGDtvTU="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-/kM23y4Hx/0HwIOQvd+4Y429s/6Q+coa27hgI2U3EcU="; + hash = "sha256-0bOsmy2ldZT7S4tVOkihE5eLiujXC/ugF8CKXfBXHNU="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-Ohfp5ypvdmjr5rYR1usdVoEuVwOALRozysIjT/v75Qs="; + hash = "sha256-MXMq4V+21KPHoCUs5x1rNRbkfw6+3cF7xSSNguiqOfc="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - hash = "sha256-AmbaMVi/or+9QLuQO5u5btgKeKdrfo7bzZgGLILwgqo="; + hash = "sha256-SoJ4/jXl0axQyeqv8CPSzM+lBsYq/QelHctRAeoscdA="; }; }; x86_64-darwin = { stable = fetchurl { url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-Xt0ef+ogGlPA4ebxuAsGQKeMVDoTB58jCRcyM1fHjYE="; + hash = "sha256-B4r0W//d3761ufQr4PAt4ZuPMrOC7Zfo8Q3lHqKxkJ0="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-hkRO/4YD1j4gsp+r3+md3ND/xtNmdutJiXlY3UIecIY="; + hash = "sha256-hdT33jK0nHvY3rIh9i1eDq5j46xS9xInRxzGCUP/hi8="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-c7KNWsV+pultD+HqRNonSOW9PCGx1AajCfnc94Dokwc="; + hash = "sha256-74XQu4PGW3eW4wPICGsAVlR4SQkDXJWZ1p/G7Bwq950="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; - hash = "sha256-nZV9LK3eGpXK/2wQKJBn3K2Ud6uBk8aammkeE00rWx0="; + hash = "sha256-uPz3uWPAqp3JeL9E+coMrb2Hc+Zn0YGF9Jw3BTKYRlw="; }; }; aarch64-darwin = x86_64-darwin; From 42e86750ddd5d7c9f29611a0ba8ed0f91a8bb8a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 May 2024 23:29:43 +0000 Subject: [PATCH 19/63] python311Packages.scooby: 0.9.2 -> 0.10.0 --- pkgs/development/python-modules/scooby/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scooby/default.nix b/pkgs/development/python-modules/scooby/default.nix index 869a1a589501..229ba0526a97 100644 --- a/pkgs/development/python-modules/scooby/default.nix +++ b/pkgs/development/python-modules/scooby/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "scooby"; - version = "0.9.2"; + version = "0.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "banesullivan"; repo = "scooby"; rev = "refs/tags/v${version}"; - hash = "sha256-x6GPRo0OuXJtN41urviY0joZKzq0SQjUdRBpIylgcXY="; + hash = "sha256-KXhLN8KPz61l+4v88+kVSvodT6OXDJ3Pw9A9aFWSqYE="; }; nativeBuildInputs = [ From e2ee6a595d7b4fb25210ba89f80767f5876531f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 May 2024 23:58:51 +0000 Subject: [PATCH 20/63] clickhouse-backup: 2.5.4 -> 2.5.6 --- .../tools/database/clickhouse-backup/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/clickhouse-backup/default.nix b/pkgs/development/tools/database/clickhouse-backup/default.nix index bf9ffa48e439..1f4764920ca4 100644 --- a/pkgs/development/tools/database/clickhouse-backup/default.nix +++ b/pkgs/development/tools/database/clickhouse-backup/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "clickhouse-backup"; - version = "2.5.4"; + version = "2.5.6"; src = fetchFromGitHub { owner = "AlexAkulov"; repo = "clickhouse-backup"; rev = "v${version}"; - hash = "sha256-uFQm7VRxFozV/I1tywey5ljWqzt08aShVjlwUT3oz5w="; + hash = "sha256-tX/ttOud6tSsuKhvfwFP3bav+VzSdfVvAdowomQ1YcY="; }; - vendorHash = "sha256-T4afeclCWldFJTzk08Ku8VPnXr/Gz0Fpb7G9YrK/iro="; + vendorHash = "sha256-ybKCD8mZ8MumKsWicS09E/BW0laAPy1iqA6q8lfczHA="; ldflags = [ "-X main.version=${version}" From 91ba60a4bd2b62153412692e2fd3e1769bb49eda Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 00:27:23 +0000 Subject: [PATCH 21/63] cargo-llvm-lines: 0.4.37 -> 0.4.38 --- pkgs/development/tools/rust/cargo-llvm-lines/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-llvm-lines/default.nix b/pkgs/development/tools/rust/cargo-llvm-lines/default.nix index f3fa51fb21b0..e2ef8df3534e 100644 --- a/pkgs/development/tools/rust/cargo-llvm-lines/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-lines/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-llvm-lines"; - version = "0.4.37"; + version = "0.4.38"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - hash = "sha256-9l6WkPVcc1BTRjmHa3+2Y1buLdHC5VIvpGys0fDwldY="; + hash = "sha256-9Uxhgm884gguoUJ7TCXFbKB3qBaLTnsIimMKaucpqiM="; }; - cargoHash = "sha256-MbjV3O9yDC8GHWdhWh4/sO+QfAd3kw3K5wLkZ8OlXIU="; + cargoHash = "sha256-NlxkTQRW/GO58GOgxFRvnDwu667cKt5fzpkWKe//G6Q="; meta = with lib; { description = "Count the number of lines of LLVM IR across all instantiations of a generic function"; From 2920fdbdb7c6b03963391b08329e4951552dbf3f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 00:43:38 +0000 Subject: [PATCH 22/63] granted: 0.24.0 -> 0.25.0 --- pkgs/tools/admin/granted/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/granted/default.nix b/pkgs/tools/admin/granted/default.nix index 6624ae3eca27..ba4088cc2968 100644 --- a/pkgs/tools/admin/granted/default.nix +++ b/pkgs/tools/admin/granted/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "granted"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "common-fate"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wZP7QEFzPdDXL00/+jiVghwrObWYcy+Nf9DuOWBwrlQ="; + sha256 = "sha256-oXwBVtkHy0bIs/5iHUvxO2gxccgBC0/+7EV09LIsROo="; }; - vendorHash = "sha256-XzoN8gOQTU8LMInsV6gVetUp1xlPOxedF1ksQ0V1ynY="; + vendorHash = "sha256-EtS0cSDFWrR2rkKtNihBCZGBZC0TXruEuP2fqw0ZuIQ="; nativeBuildInputs = [ makeWrapper ]; From 7f79a78fd08bf73fd8ae31b9f96b268c65168fe8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 01:02:07 +0000 Subject: [PATCH 23/63] gh-poi: 0.9.8 -> 0.9.10 --- pkgs/by-name/gh/gh-poi/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gh/gh-poi/package.nix b/pkgs/by-name/gh/gh-poi/package.nix index e10a74a1c9c1..fd8a5bddc518 100644 --- a/pkgs/by-name/gh/gh-poi/package.nix +++ b/pkgs/by-name/gh/gh-poi/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gh-poi"; - version = "0.9.8"; + version = "0.9.10"; src = fetchFromGitHub { owner = "seachicken"; repo = "gh-poi"; rev = "v${version}"; - hash = "sha256-QpUZxho9hzmgbCFgNxwwKi6hhfyqc4b/JYKH3rP4Eb8="; + hash = "sha256-0QzCXja1UXPEC8JQIXH9Dl4PPKzqWgIy13FCYxEqggA="; }; ldflags = [ "-s" "-w" ]; @@ -19,7 +19,7 @@ buildGoModule rec { vendorHash = "sha256-D/YZLwwGJWCekq9mpfCECzJyJ/xSlg7fC6leJh+e8i0="; # Skip checks because some of test suites require fixture. - # See: https://github.com/seachicken/gh-poi/blob/v0.9.8/.github/workflows/contract-test.yml#L28-L29 + # See: https://github.com/seachicken/gh-poi/blob/v0.9.10/.github/workflows/contract-test.yml#L28-L29 doCheck = false; meta = with lib; { From aff8d11104fc569f8f93a5d1cc1d5a2e6219ab3a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 01:05:05 +0000 Subject: [PATCH 24/63] i3bar-river: 0.1.7 -> 0.1.8 --- pkgs/by-name/i3/i3bar-river/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/i3/i3bar-river/package.nix b/pkgs/by-name/i3/i3bar-river/package.nix index e629dd32b95e..fce32de9c162 100644 --- a/pkgs/by-name/i3/i3bar-river/package.nix +++ b/pkgs/by-name/i3/i3bar-river/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "i3bar-river"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "MaxVerevkin"; repo = "i3bar-river"; rev = "v${version}"; - hash = "sha256-mLRB4o8FR/R9QUpRkcNppiE2XcWFWE05wPxuKdxG18M="; + hash = "sha256-Rw4jildX3t853hIwEem/KzTBUyO3a/kour3dvSw8DVA="; }; - cargoHash = "sha256-INjuI3XTSzAjLqk/P+cd7rMhXsOBDSqMaZZN9kFyreg="; + cargoHash = "sha256-uGzXEeQ2yzk8HEdgY/gTxqaCoMO25kbiD1XrpJwmVp4="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ pango ]; From 6e940306721b300566a72f5c972ac98739f458db Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 01:15:09 +0000 Subject: [PATCH 25/63] ipfs-cluster: 1.0.8 -> 1.1.0 --- pkgs/applications/networking/ipfs-cluster/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix index 19a1b38eed42..4c623c869126 100644 --- a/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/pkgs/applications/networking/ipfs-cluster/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ipfs-cluster"; - version = "1.0.8"; + version = "1.1.0"; - vendorHash = "sha256-uwDXUy9mh/DvLuwj8Htm55wla5/JjvZH5ztJbqnox+U="; + vendorHash = "sha256-U7zh0MmuDmKQWa4uyoFDctPUfq+52Im6t2TFyWIGXAs="; src = fetchFromGitHub { owner = "ipfs-cluster"; repo = "ipfs-cluster"; rev = "v${version}"; - hash = "sha256-qZUoYJjw3Qac7Kmg5PfNWTDM8Ra3rqrbjScLbK6FRx4="; + hash = "sha256-z08LLJ/SI833wMpZJ25WDrc66Y4R5i2uGlE7Nc30Kk0="; }; meta = with lib; { From 57919568699012d08fa556dcbd1f49b9ecfaa8f9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 02:01:56 +0000 Subject: [PATCH 26/63] imgproxy: 3.24.0 -> 3.24.1 --- pkgs/servers/imgproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix index 066265e162cc..4a2e89191e18 100644 --- a/pkgs/servers/imgproxy/default.nix +++ b/pkgs/servers/imgproxy/default.nix @@ -3,12 +3,12 @@ buildGoModule rec { pname = "imgproxy"; - version = "3.24.0"; + version = "3.24.1"; src = fetchFromGitHub { owner = pname; repo = pname; - hash = "sha256-FOut1L4dyPvR1SSQLspA8PakQPewwTP2SgbfyDfWp3c="; + hash = "sha256-1AacDY4qNe+1SESsEEazxoBnJZRphnext1mu3BOKwKY="; rev = "v${version}"; }; From e39e618a65e81d19d8b71e539af196c0ab0f3fcb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 02:03:55 +0000 Subject: [PATCH 27/63] moar: 1.23.11 -> 1.23.12 --- pkgs/tools/misc/moar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/moar/default.nix b/pkgs/tools/misc/moar/default.nix index c99c394f100a..dc6b66eae7f3 100644 --- a/pkgs/tools/misc/moar/default.nix +++ b/pkgs/tools/misc/moar/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "moar"; - version = "1.23.11"; + version = "1.23.12"; src = fetchFromGitHub { owner = "walles"; repo = pname; rev = "v${version}"; - hash = "sha256-dKsDvtFs1/WToqpfW84dxDAHRN13TUnZKKk26h3pQ18="; + hash = "sha256-Ck3AhPUm8cC38LsTtud0kkRWsWiC8W2Sw6+cE17+Nso="; }; vendorHash = "sha256-1u/2OlMX2FuZaxWnpU4n5r/4xKe+rK++GoCJiSq/BdE="; From 91fe03db2ea8e3f284feab1286fc6a16867652e4 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Tue, 7 May 2024 05:58:49 +0200 Subject: [PATCH 28/63] octoprint: fix build with failing werkzeug dependency disable checks for werkzeug where one test started to fail recently. An update of werkzeug inside octoprint isn't possible (yet), so disable the tests. Signed-off-by: Florian Brandes --- pkgs/applications/misc/octoprint/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index c537afbb98ed..ef0a2b9b4bbf 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -28,6 +28,7 @@ let inherit version; hash = "sha256-LhzMlBfU2jWLnebxdOOsCUOR6h1PvvLWZ4ZdgZ39Cv4="; }; + doCheck = false; }); flask = super.flask.overridePythonAttrs (oldAttrs: rec { version = "2.2.5"; From 809898bbf90d270a8cb45151bbc35e311a0c3207 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 04:49:34 +0000 Subject: [PATCH 29/63] spicedb-zed: 0.18.0 -> 0.18.1 --- pkgs/servers/spicedb/zed.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/spicedb/zed.nix b/pkgs/servers/spicedb/zed.nix index e42bf543a239..5b6e9d24e114 100644 --- a/pkgs/servers/spicedb/zed.nix +++ b/pkgs/servers/spicedb/zed.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "zed"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "authzed"; repo = "zed"; rev = "v${version}"; - hash = "sha256-3qjwBsMISmh+0YJxYx36c3ceZJBpqkA+9XRZfgqhezw="; + hash = "sha256-+FXFHjGWKcIt3urDokk5PF24JPVs21RbQtpcYz2midM="; }; - vendorHash = "sha256-U4hFB/v9DHa3iDZJ+AgbFk5/E/LkvUoYHcaSArE/PKk="; + vendorHash = "sha256-Z6j4w4/anfK0ln2MvgnwZFoe8BA5jVHG3g9m2TynmmE="; meta = with lib; { description = "Command line for managing SpiceDB"; From 25efee42bedc8525379543eb9f2408649758b69d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 05:10:40 +0000 Subject: [PATCH 30/63] python311Packages.rq: 1.16.1 -> 1.16.2 --- pkgs/development/python-modules/rq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix index 7eb455a6dc82..a0ed2d38b2d8 100644 --- a/pkgs/development/python-modules/rq/default.nix +++ b/pkgs/development/python-modules/rq/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "rq"; - version = "1.16.1"; + version = "1.16.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "rq"; repo = "rq"; rev = "refs/tags/v${version}"; - hash = "sha256-1E7jPTSQCjuKZVFL4uZqL1WZHnxWSLTNcnpyvfHz7oY="; + hash = "sha256-8uhCV4aJNbY273jOa9D5OlgEG1w3hXVncClKQTO9Pyk="; }; build-system = [ From 996b047f76aad0f32b7351aab05db7bc8be2dc35 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 06:08:21 +0000 Subject: [PATCH 31/63] python311Packages.oci: 2.126.1 -> 2.126.2 --- pkgs/development/python-modules/oci/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index b1bb84dba786..c0d759db7b22 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.126.1"; + version = "2.126.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-emWfpI+4oyb3p8RzhLKm1iWkvLu7OZTrEnyvZ5AI9Zw="; + hash = "sha256-eejIDpKpPekxrm1H9x2skxK67KNUm9mmrGM23hZ6ztM="; }; pythonRelaxDeps = [ From 23e49b584efddfaa977730b7c7520fda9e8676d7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 May 2024 08:47:47 +0200 Subject: [PATCH 32/63] python312Packages.winacl: 0.1.8 -> 0.1.9 Changelog: https://github.com/skelsec/winacl/releases/tag/0.1.9 --- pkgs/development/python-modules/winacl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/winacl/default.nix b/pkgs/development/python-modules/winacl/default.nix index ab27147d6519..af9f9ebcc0bd 100644 --- a/pkgs/development/python-modules/winacl/default.nix +++ b/pkgs/development/python-modules/winacl/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "winacl"; - version = "0.1.8"; + version = "0.1.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-RCcaMCVi3lFin2jvFUDUDzom57wBc2RrAaZ3nO2tZEw="; + hash = "sha256-r3DC7DAXi/njyKHEjCXoeBI1/iwbMhrbRuLyrh+NSqs="; }; propagatedBuildInputs = [ From 71aa963dd960c00bd5353fa36516da802ff160ef Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 May 2024 08:49:45 +0200 Subject: [PATCH 33/63] python312Packages.winacl: refactor --- pkgs/development/python-modules/winacl/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/winacl/default.nix b/pkgs/development/python-modules/winacl/default.nix index af9f9ebcc0bd..f2907d07333f 100644 --- a/pkgs/development/python-modules/winacl/default.nix +++ b/pkgs/development/python-modules/winacl/default.nix @@ -3,12 +3,13 @@ , cryptography , fetchPypi , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "winacl"; version = "0.1.9"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -17,14 +18,13 @@ buildPythonPackage rec { hash = "sha256-r3DC7DAXi/njyKHEjCXoeBI1/iwbMhrbRuLyrh+NSqs="; }; - propagatedBuildInputs = [ - cryptography + build-system = [ + setuptools ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "cryptography>=38.0.1" "cryptography" - ''; + dependencies = [ + cryptography + ]; # Project doesn't have tests doCheck = false; From ab9a066ae1217b4807a6e30ce9747ac007957159 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 06:49:51 +0000 Subject: [PATCH 34/63] cargo-show-asm: 0.2.34 -> 0.2.35 --- pkgs/development/tools/rust/cargo-show-asm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-show-asm/default.nix b/pkgs/development/tools/rust/cargo-show-asm/default.nix index 736d546ff2aa..077b7767886c 100644 --- a/pkgs/development/tools/rust/cargo-show-asm/default.nix +++ b/pkgs/development/tools/rust/cargo-show-asm/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-show-asm"; - version = "0.2.34"; + version = "0.2.35"; src = fetchCrate { inherit pname version; - hash = "sha256-+EzI17pnqO19A+KW1AsHtBpYZq1aENA03RkK03j31LI="; + hash = "sha256-23G4Re10ksoJSWRmzRjTpSGRLk3LLnkuzTjPOgf4oOk="; }; - cargoHash = "sha256-VIfT7cXrXBE9mfHpDCI3diSD9ToRPH6UUP7ZOWvumbU="; + cargoHash = "sha256-OcGmlGA0relDY1Tn/edE1pX+vOhKFXJ8YeCdQ5b7ZnQ="; nativeBuildInputs = [ installShellFiles From e82ddf6eda1713e1873e18f6255960ae3c1b119b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 May 2024 08:50:16 +0200 Subject: [PATCH 35/63] python312Packages.winacl: format with nixfmt --- .../python-modules/winacl/default.nix | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/winacl/default.nix b/pkgs/development/python-modules/winacl/default.nix index f2907d07333f..3ff55cf32a72 100644 --- a/pkgs/development/python-modules/winacl/default.nix +++ b/pkgs/development/python-modules/winacl/default.nix @@ -1,9 +1,10 @@ -{ lib -, buildPythonPackage -, cryptography -, fetchPypi -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + cryptography, + fetchPypi, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -18,20 +19,14 @@ buildPythonPackage rec { hash = "sha256-r3DC7DAXi/njyKHEjCXoeBI1/iwbMhrbRuLyrh+NSqs="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - dependencies = [ - cryptography - ]; + dependencies = [ cryptography ]; # Project doesn't have tests doCheck = false; - pythonImportsCheck = [ - "winacl" - ]; + pythonImportsCheck = [ "winacl" ]; meta = with lib; { description = "Python module for ACL/ACE/Security descriptor manipulation"; From f10f9dcf3290d927064a4b03ae001425c497f91b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 07:06:17 +0000 Subject: [PATCH 36/63] ast-grep: 0.21.3 -> 0.21.4 --- pkgs/by-name/as/ast-grep/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix index e517689e4232..35d2ebdf835d 100644 --- a/pkgs/by-name/as/ast-grep/package.nix +++ b/pkgs/by-name/as/ast-grep/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ast-grep"; - version = "0.21.3"; + version = "0.21.4"; src = fetchFromGitHub { owner = "ast-grep"; repo = "ast-grep"; rev = version; - hash = "sha256-vI40H+hLR1OR1Nark9NL4YWbx/ZElYTk651+COJQF9o="; + hash = "sha256-qoQUc+qMKptCxgW6Yfc2umhSsn27vv1SvcvjCFeuIrA="; }; - cargoHash = "sha256-bjBi8gcTT0tjnq+WSET3ywAvugJCdRXWYL8G6rJcxe4="; + cargoHash = "sha256-acgGz8FToQDlSuxge0hvApk4SOxQ74mMvx0A2+zv65o="; nativeBuildInputs = [ installShellFiles ]; From ce300f2d7b8260747a735cb2a594102820768dad Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 May 2024 09:44:29 +0200 Subject: [PATCH 37/63] trufflehog: 3.75.0 -> 3.75.1 Diff: https://github.com/trufflesecurity/trufflehog/compare/refs/tags/v3.75.0...v3.75.1 Changelog: https://github.com/trufflesecurity/trufflehog/releases/tag/v3.75.1 --- pkgs/tools/security/trufflehog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index aed1f4b89a96..a49bab95f6dd 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.75.0"; + version = "3.75.1"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-C8yMJnxc0j5F5U854ukWEsS2m7966Czsbp+T3sNswY0="; + hash = "sha256-y6UnJ6lPcMxUsTZBwGjfiNvLsq7PYZhSEQHy2tU9xl0="; }; - vendorHash = "sha256-CEGb9utdXyu6Navapbp0C/cWoNOrc0woRe0WAF/vr/M="; + vendorHash = "sha256-woQPmothNrn5ZNZmz8ODP8P8nTVoT6v7/4Z9kfdmfno="; proxyVendor = true; From 9e4b41f629a5699da08c62e2f33da069fe7d7650 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 May 2024 09:48:27 +0200 Subject: [PATCH 38/63] sqlfluff: 3.0.5 -> 3.0.6 Diff: https://github.com/sqlfluff/sqlfluff/compare/refs/tags/3.0.5...3.0.6 Changelog: https://github.com/sqlfluff/sqlfluff/blob/3.0.6/CHANGELOG.md --- pkgs/development/tools/database/sqlfluff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index 110131532e60..7db4d2c7d3a5 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "3.0.5"; + version = "3.0.6"; pyproject = true; src = fetchFromGitHub { owner = "sqlfluff"; repo = "sqlfluff"; rev = "refs/tags/${version}"; - hash = "sha256-jH6o1moyyugKtIIccp8Tbcg5EAMOxzNco9saUgoDzWY="; + hash = "sha256-VDLUCxDQKWQEeZQkeZP13KNm48GCQ3i4CLOAB/Kermo="; }; build-system = with python3.pkgs; [ setuptools ]; From 08cbf4e5a054b207b5ac96bb9a096f5084d4c5bd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 07:49:15 +0000 Subject: [PATCH 39/63] github-backup: 0.45.1 -> 0.45.2 --- pkgs/tools/misc/github-backup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/github-backup/default.nix b/pkgs/tools/misc/github-backup/default.nix index 4ff25301c8c8..f555ca74d611 100644 --- a/pkgs/tools/misc/github-backup/default.nix +++ b/pkgs/tools/misc/github-backup/default.nix @@ -7,12 +7,12 @@ python3.pkgs.buildPythonApplication rec { pname = "github-backup"; - version = "0.45.1"; + version = "0.45.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-+dQVewMHSF0SnOKmgwc9pmqXAJGLjSqwS9YQHdvEmKo="; + hash = "sha256-wn2JRMLfqhhTREeYM+mcs68xlkRWKMlxKXToa83pu2g="; }; nativeBuildInputs = with python3.pkgs; [ From 9102fb6912f9f93ff054db032fbdf53463a528db Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 08:30:06 +0000 Subject: [PATCH 40/63] thunderbird-unwrapped: 115.10.1 -> 115.10.2 --- .../networking/mailreaders/thunderbird/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 5a55476d4b9e..0a272c42d478 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -44,13 +44,13 @@ rec { thunderbird-115 = (buildMozillaMach rec { pname = "thunderbird"; - version = "115.10.1"; + version = "115.10.2"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "0324811d3e7e6228bb45cbf01e8a4a08b8386e22d1b52eb79f9a9a3bda940eb9d534ec1230961e9a998a0162c299a1ad49d23c5fbfa8e287896bcc0fd1c398e0"; + sha512 = "e893cba882fe3fba516758b8822fa16a6c5b1f633cd2877a91357255f956be32b55ee671ab8ebc4372f116848d4fb67a2220a673c8d5f3c95952ba266d99cd67"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. From 5cc13d7e058cae6b047a308e936dc0aaff8808b5 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 7 May 2024 10:30:54 +0200 Subject: [PATCH 41/63] python311Packages.torchsnapshot: init at 0.1.0 --- .../python-modules/torchsnapshot/default.nix | 71 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 73 insertions(+) create mode 100644 pkgs/development/python-modules/torchsnapshot/default.nix diff --git a/pkgs/development/python-modules/torchsnapshot/default.nix b/pkgs/development/python-modules/torchsnapshot/default.nix new file mode 100644 index 000000000000..62f6fd6b24de --- /dev/null +++ b/pkgs/development/python-modules/torchsnapshot/default.nix @@ -0,0 +1,71 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchFromGitHub, + setuptools, + wheel, + aiofiles, + aiohttp, + importlib-metadata, + nest-asyncio, + psutil, + pyyaml, + torch, + typing-extensions, + pytest-asyncio, + pytestCheckHook, + pythonAtLeast, + stdenv, +}: + +buildPythonPackage rec { + pname = "torchsnapshot"; + version = "0.1.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "pytorch"; + repo = "torchsnapshot"; + rev = "refs/tags/${version}"; + hash = "sha256-F8OaxLH8BL6MPNLFv1hBuVmeEdnEQ5w2Qny6by1wP6k="; + }; + + build-system = [ + setuptools + wheel + ]; + + dependencies = [ + aiofiles + aiohttp + importlib-metadata + nest-asyncio + psutil + pyyaml + torch + typing-extensions + ]; + + pythonImportsCheck = [ "torchsnapshot" ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + meta = with lib; { + description = "A performant, memory-efficient checkpointing library for PyTorch applications, designed with large, complex distributed workloads in mind"; + homepage = "https://github.com/pytorch/torchsnapshot/"; + changelog = "https://github.com/pytorch/torchsnapshot/releases/tag/${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ GaetanLepage ]; + broken = + # https://github.com/pytorch/torchsnapshot/issues/175 + pythonAtLeast "3.12" + # ModuleNotFoundError: No module named 'torch._C._distributed_c10d'; 'torch._C' is not a package + || stdenv.isDarwin; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7f54378c13b7..af75b2c1a97c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15217,6 +15217,8 @@ self: super: with self; { openai-triton = self.openai-triton-bin; }; + torchsnapshot = callPackage ../development/python-modules/torchsnapshot { }; + torchWithCuda = self.torch.override { openai-triton = self.openai-triton-cuda; cudaSupport = true; From 08e29ab1632a5b920420a568fd9fdf238831eb75 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 7 May 2024 11:17:14 +0200 Subject: [PATCH 42/63] build-support/php: remove confusing `with self;` --- pkgs/top-level/php-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 62ffa53e54ea..6af2a8b575f6 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -46,7 +46,9 @@ , fetchpatch }: -lib.makeScope pkgs.newScope (self: with self; { +lib.makeScope pkgs.newScope (self: let + inherit (self) buildPecl callPackage mkExtension php; +in { buildPecl = callPackage ../build-support/php/build-pecl.nix { php = php.unwrapped; }; From 3d155494e45d63780685591272da68cd358451ea Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 7 May 2024 11:18:34 +0200 Subject: [PATCH 43/63] build-support/php: reorganize files Pave the way for having multiple versions in the future --- pkgs/build-support/php/builders/default.nix | 8 ++++++++ .../php/{ => builders/v1}/build-composer-project.nix | 2 +- .../php/{ => builders/v1}/build-composer-repository.nix | 2 +- .../php/{ => builders/v1}/hooks/composer-install-hook.sh | 0 .../{ => builders/v1}/hooks/composer-repository-hook.sh | 0 .../php/{ => builders/v1}/hooks/default.nix | 0 .../php/{ => builders/v1}/hooks/php-script-utils.bash | 0 pkgs/top-level/php-packages.nix | 9 +++++---- 8 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 pkgs/build-support/php/builders/default.nix rename pkgs/build-support/php/{ => builders/v1}/build-composer-project.nix (96%) rename pkgs/build-support/php/{ => builders/v1}/build-composer-repository.nix (97%) rename pkgs/build-support/php/{ => builders/v1}/hooks/composer-install-hook.sh (100%) rename pkgs/build-support/php/{ => builders/v1}/hooks/composer-repository-hook.sh (100%) rename pkgs/build-support/php/{ => builders/v1}/hooks/default.nix (100%) rename pkgs/build-support/php/{ => builders/v1}/hooks/php-script-utils.bash (100%) diff --git a/pkgs/build-support/php/builders/default.nix b/pkgs/build-support/php/builders/default.nix new file mode 100644 index 000000000000..209c834367d1 --- /dev/null +++ b/pkgs/build-support/php/builders/default.nix @@ -0,0 +1,8 @@ +{ callPackage, callPackages, ... }: +{ + v1 = { + buildComposerProject = callPackage ./v1/build-composer-project.nix { }; + mkComposerRepository = callPackage ./v1/build-composer-repository.nix { }; + composerHooks = callPackages ./v1/hooks { }; + }; +} diff --git a/pkgs/build-support/php/build-composer-project.nix b/pkgs/build-support/php/builders/v1/build-composer-project.nix similarity index 96% rename from pkgs/build-support/php/build-composer-project.nix rename to pkgs/build-support/php/builders/v1/build-composer-project.nix index b83734a02f02..a29233593254 100644 --- a/pkgs/build-support/php/build-composer-project.nix +++ b/pkgs/build-support/php/builders/v1/build-composer-project.nix @@ -12,7 +12,7 @@ let let phpDrv = finalAttrs.php or php; composer = finalAttrs.composer or phpDrv.packages.composer; - composer-local-repo-plugin = callPackage ./pkgs/composer-local-repo-plugin.nix { }; + composer-local-repo-plugin = callPackage ../../pkgs/composer-local-repo-plugin.nix { }; in { composerLock = previousAttrs.composerLock or null; diff --git a/pkgs/build-support/php/build-composer-repository.nix b/pkgs/build-support/php/builders/v1/build-composer-repository.nix similarity index 97% rename from pkgs/build-support/php/build-composer-repository.nix rename to pkgs/build-support/php/builders/v1/build-composer-repository.nix index ec6c35b8a42c..54944b91d202 100644 --- a/pkgs/build-support/php/build-composer-repository.nix +++ b/pkgs/build-support/php/builders/v1/build-composer-repository.nix @@ -24,7 +24,7 @@ let let phpDrv = finalAttrs.php or php; composer = finalAttrs.composer or phpDrv.packages.composer; - composer-local-repo-plugin = callPackage ./pkgs/composer-local-repo-plugin.nix { }; + composer-local-repo-plugin = callPackage ../../pkgs/composer-local-repo-plugin.nix { }; in assert (lib.assertMsg (previousAttrs ? src) "mkComposerRepository expects src argument."); assert ( diff --git a/pkgs/build-support/php/hooks/composer-install-hook.sh b/pkgs/build-support/php/builders/v1/hooks/composer-install-hook.sh similarity index 100% rename from pkgs/build-support/php/hooks/composer-install-hook.sh rename to pkgs/build-support/php/builders/v1/hooks/composer-install-hook.sh diff --git a/pkgs/build-support/php/hooks/composer-repository-hook.sh b/pkgs/build-support/php/builders/v1/hooks/composer-repository-hook.sh similarity index 100% rename from pkgs/build-support/php/hooks/composer-repository-hook.sh rename to pkgs/build-support/php/builders/v1/hooks/composer-repository-hook.sh diff --git a/pkgs/build-support/php/hooks/default.nix b/pkgs/build-support/php/builders/v1/hooks/default.nix similarity index 100% rename from pkgs/build-support/php/hooks/default.nix rename to pkgs/build-support/php/builders/v1/hooks/default.nix diff --git a/pkgs/build-support/php/hooks/php-script-utils.bash b/pkgs/build-support/php/builders/v1/hooks/php-script-utils.bash similarity index 100% rename from pkgs/build-support/php/hooks/php-script-utils.bash rename to pkgs/build-support/php/builders/v1/hooks/php-script-utils.bash diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 6af2a8b575f6..e5bcc7ba3c59 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -48,15 +48,16 @@ lib.makeScope pkgs.newScope (self: let inherit (self) buildPecl callPackage mkExtension php; + + builders = import ../build-support/php/builders { + inherit callPackages callPackage buildPecl; + }; in { buildPecl = callPackage ../build-support/php/build-pecl.nix { php = php.unwrapped; }; - composerHooks = callPackages ../build-support/php/hooks { }; - - mkComposerRepository = callPackage ../build-support/php/build-composer-repository.nix { }; - buildComposerProject = callPackage ../build-support/php/build-composer-project.nix { }; + inherit (builders.v1) buildComposerProject composerHooks mkComposerRepository; # Wrap mkDerivation to prepend pname with "php-" to make names consistent # with how buildPecl does it and make the file easier to overview. From 9752fa0276bb85b76861109565e4c47b7a472518 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 09:24:45 +0000 Subject: [PATCH 44/63] pyright: 1.1.360 -> 1.1.361 --- pkgs/by-name/py/pyright/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/py/pyright/package.nix b/pkgs/by-name/py/pyright/package.nix index f73cc100fbff..357ecc116049 100644 --- a/pkgs/by-name/py/pyright/package.nix +++ b/pkgs/by-name/py/pyright/package.nix @@ -1,13 +1,13 @@ { lib, buildNpmPackage, fetchFromGitHub, runCommand, jq }: let - version = "1.1.360"; + version = "1.1.361"; src = fetchFromGitHub { owner = "Microsoft"; repo = "pyright"; rev = "${version}"; - hash = "sha256-aVzQM9yfiIC5y7mgpym7ha2a4UKpOwYs+dUmIG0tlcQ="; + hash = "sha256-Prp8LlkSxK2zuVi1lYtI4MdBTGrGhA52Cl5a016ttDY="; }; patchedPackageJSON = runCommand "package.json" { } '' @@ -37,7 +37,7 @@ let pname = "pyright-internal"; inherit version src; sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-lUAPeIw9sj3JyX8G8lMsJk3wf3AOlPRModN4u1iTpcQ="; + npmDepsHash = "sha256-kWDMbzLTDIyG9fUixEJ8Uap4wJmLiu0CQWKr9K5hAJQ="; dontNpmBuild = true; installPhase = '' runHook preInstall @@ -51,7 +51,7 @@ buildNpmPackage rec { inherit version src; sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-CcjVFvEqi0f6ltY9O4c7pBFAuxuKgX9WMKZ9TCBYLyk="; + npmDepsHash = "sha256-6Drw9H5eTxpZVrQZpUIarcu3a6UpU/8qX1MzM4q5IfY="; postPatch = '' chmod +w ../../ From 2b0b15ec94d24a1991ead8312802b8f8884235c6 Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Sat, 4 May 2024 21:35:17 +0200 Subject: [PATCH 45/63] k3s: package k3s-killall script Provide the k3s-killall.sh script for orderly shutdown of k3s. --- nixos/tests/k3s/single-node.nix | 12 ++++ .../networking/cluster/k3s/builder.nix | 57 +++++++++++++++++++ 2 files changed, 69 insertions(+) diff --git a/nixos/tests/k3s/single-node.nix b/nixos/tests/k3s/single-node.nix index fd64a050e61e..b7ac5d9eeeac 100644 --- a/nixos/tests/k3s/single-node.nix +++ b/nixos/tests/k3s/single-node.nix @@ -78,6 +78,18 @@ import ../make-test-python.nix ({ pkgs, lib, k3s, ... }: # regression test for #176445 machine.fail("journalctl -o cat -u k3s.service | grep 'ipset utility not found'") + with subtest("Run k3s-killall"): + # Call the killall script with a clean path to assert that + # all required commands are wrapped + output = machine.succeed("PATH= ${k3s}/bin/k3s-killall.sh 2>&1 | tee /dev/stderr") + assert "command not found" not in output, "killall script contains unknown command" + + # Check that killall cleaned up properly + machine.fail("systemctl is-active k3s.service") + machine.fail("systemctl list-units | grep containerd") + machine.fail("ip link show | awk -F': ' '{print $2}' | grep -e flannel -e cni0") + machine.fail("ip netns show | grep cni-") + machine.shutdown() ''; }) diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix index e4c7a42fd578..44910857c3e4 100644 --- a/pkgs/applications/networking/cluster/k3s/builder.nix +++ b/pkgs/applications/networking/cluster/k3s/builder.nix @@ -56,6 +56,14 @@ lib: , nixosTests , pkgsBuildBuild , go +, runCommand +, bash +, procps +, coreutils +, gnugrep +, findutils +, gnused +, systemd }: # k3s is a kinda weird derivation. One of the main points of k3s is the @@ -157,6 +165,42 @@ let rev = "v${k3sVersion}"; sha256 = k3sRepoSha256; }; + + # Modify the k3s installer script so that we can let it install only + # killall.sh + k3sKillallSh = runCommand "k3s-killall.sh" { } '' + # Copy the upstream k3s install script except for the last lines that + # actually run the install process + sed --quiet '/# --- run the install process --/q;p' ${k3sRepo}/install.sh > install.sh + + # Let killall expect "containerd-shim" in the Nix store + to_replace="k3s/data/\[\^/\]\*/bin/containerd-shim" + replacement="/nix/store/.*k3s-containerd.*/bin/containerd-shim" + changes=$(sed -i "s|$to_replace|$replacement| w /dev/stdout" install.sh) + if [ -z "$changes" ]; then + echo "failed to replace \"$to_replace\" in k3s installer script (install.sh)" + exit 1 + fi + + remove_matching_line() { + line_to_delete=$(grep -n "$1" install.sh | cut -d : -f 1 || true) + if [ -z $line_to_delete ]; then + echo "failed to find expression \"$1\" in k3s installer script (install.sh)" + exit 1 + fi + sed -i "''${line_to_delete}d" install.sh + } + + # Don't change mode and owner of killall + remove_matching_line "chmod.*KILLALL_K3S_SH" + remove_matching_line "chown.*KILLALL_K3S_SH" + + # Execute only the "create_killall" function of the installer script + sed -i '$acreate_killall' install.sh + + KILLALL_K3S_SH=$out bash install.sh + ''; + # Stage 1 of the k3s build: # Let's talk about how k3s is structured. # One of the ideas of k3s is that there's the single "k3s" binary which can @@ -278,6 +322,16 @@ buildGoModule rec { runc ]; + k3sKillallDeps = [ + bash + systemd + procps + coreutils + gnugrep + findutils + gnused + ]; + buildInputs = k3sRuntimeDeps; nativeBuildInputs = [ @@ -334,6 +388,9 @@ buildGoModule rec { ln -s $out/bin/k3s $out/bin/kubectl ln -s $out/bin/k3s $out/bin/crictl ln -s $out/bin/k3s $out/bin/ctr + install -m 0755 ${k3sKillallSh} -D $out/bin/k3s-killall.sh + wrapProgram $out/bin/k3s-killall.sh \ + --prefix PATH : ${lib.makeBinPath (k3sRuntimeDeps ++ k3sKillallDeps)} ''; doInstallCheck = true; From 262eeddca4f798f3ede338a60989e991ed3d4be5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 09:53:25 +0000 Subject: [PATCH 46/63] gimme-aws-creds: 2.8.0 -> 2.8.1.1 --- pkgs/tools/admin/gimme-aws-creds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/gimme-aws-creds/default.nix b/pkgs/tools/admin/gimme-aws-creds/default.nix index f4a2e496b056..a1e8d594448e 100644 --- a/pkgs/tools/admin/gimme-aws-creds/default.nix +++ b/pkgs/tools/admin/gimme-aws-creds/default.nix @@ -25,14 +25,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "gimme-aws-creds"; - version = "2.8.0"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.8.1.1"; # N.B: if you change this, check if overrides are still up-to-date format = "setuptools"; src = fetchFromGitHub { owner = "Nike-Inc"; repo = "gimme-aws-creds"; rev = "v${version}"; - hash = "sha256-RcqvI+jR7TiNAzq8F6VGVhyj6MxnmsjQKh0CiZvLY9Q="; + hash = "sha256-vnTMFZgv2tW7b4Ga6B9TZcE/xTwPUUGZ3WP943FPpEc="; }; nativeBuildInputs = with python.pkgs; [ From 629e81236df08421219cee154061678392e3ebaa Mon Sep 17 00:00:00 2001 From: annalee <168274788+annaleeleaves@users.noreply.github.com> Date: Tue, 7 May 2024 10:49:49 +0000 Subject: [PATCH 47/63] cwebbin: -std=c++14 due to register keyword - fix build with clang - refactor to use default buildPhase and installPhase --- .../tools/misc/cwebbin/default.nix | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/misc/cwebbin/default.nix b/pkgs/development/tools/misc/cwebbin/default.nix index 055a24f3fe0a..a5ed3e222aaa 100644 --- a/pkgs/development/tools/misc/cwebbin/default.nix +++ b/pkgs/development/tools/misc/cwebbin/default.nix @@ -1,9 +1,17 @@ { lib, stdenv, fetchFromGitHub, fetchurl, tie }: +let + cweb = fetchurl { + url = "https://www.ctan.org/tex-archive/web/c_cpp/cweb/cweb-3.64ah.tgz"; + sha256 = "1hdzxfzaibnjxjzgp6d2zay8nsarnfy9hfq55hz1bxzzl23n35aj"; + }; +in stdenv.mkDerivation rec { pname = "cwebbin"; version = "22p"; + __structuredAttrs = true; + src = fetchFromGitHub { owner = "ascherer"; repo = "cwebbin"; @@ -11,10 +19,9 @@ stdenv.mkDerivation rec { sha256 = "0zf93016hm9i74i2v384rwzcw16y3hg5vc2mibzkx1rzvqa50yfr"; }; - cweb = fetchurl { - url = "https://www.ctan.org/tex-archive/web/c_cpp/cweb/cweb-3.64ah.tgz"; - sha256 = "1hdzxfzaibnjxjzgp6d2zay8nsarnfy9hfq55hz1bxzzl23n35aj"; - }; + prePatch = '' + tar xf ${cweb} + ''; # Remove references to __DATE__ and __TIME__ postPatch = '' @@ -26,6 +33,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ tie ]; + makefile = "Makefile.unix"; + makeFlags = [ "MACROSDIR=$(out)/share/texmf/tex/generic/cweb" "CWEBINPUTS=$(out)/lib/cweb" @@ -35,18 +44,17 @@ stdenv.mkDerivation rec { "CP=cp" "RM=rm" "PDFTEX=echo" - "CC=${stdenv.cc.targetPrefix}c++" + # requires __structuredAttrs = true + "CC=$(CXX) -std=c++14" ]; - buildPhase = '' - zcat ${cweb} | tar -xvpf - - make -f Makefile.unix boot $makeFlags - make -f Makefile.unix cautiously $makeFlags - ''; + buildFlags = [ + "boot" + "cautiously" + ]; - installPhase = '' + preInstall = '' mkdir -p $out/share/man/man1 $out/share/texmf/tex/generic $out/share/emacs $out/lib - make -f Makefile.unix install $makeFlags ''; meta = with lib; { From f543909d2da0bc374276d6ce0000a34fd5dcddec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 11:17:13 +0000 Subject: [PATCH 48/63] python311Packages.yolink-api: 0.4.3 -> 0.4.4 --- pkgs/development/python-modules/yolink-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yolink-api/default.nix b/pkgs/development/python-modules/yolink-api/default.nix index c1b4703ea4d4..8a567cd5a51e 100644 --- a/pkgs/development/python-modules/yolink-api/default.nix +++ b/pkgs/development/python-modules/yolink-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "yolink-api"; - version = "0.4.3"; + version = "0.4.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "YoSmart-Inc"; repo = "yolink-api"; rev = "refs/tags/v${version}"; - hash = "sha256-cLuto2V5i3au1MRYYbgR2plw9YBpgIAxsG2fu4t37jk="; + hash = "sha256-yRxv3Itj+SkLtj5rErOzJoxj0JhsAWrdi0DucKZKKIU="; }; build-system = [ setuptools ]; From 832bb3df1c1805040f5c637413efd9a4e9fc7277 Mon Sep 17 00:00:00 2001 From: Jonas Meurer Date: Tue, 7 May 2024 12:58:42 +0200 Subject: [PATCH 49/63] phpdocumentor: add missing build input Since 3be507be1e2ea19b8d53450bac494e2ac30a642c 'php.buildComposerProject' does not provide the 'makeBinaryWrapper' anymore, causing the build to fail. --- pkgs/by-name/ph/phpdocumentor/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ph/phpdocumentor/package.nix b/pkgs/by-name/ph/phpdocumentor/package.nix index d94b143a0c0e..e0eeef5935a3 100644 --- a/pkgs/by-name/ph/phpdocumentor/package.nix +++ b/pkgs/by-name/ph/phpdocumentor/package.nix @@ -1,6 +1,7 @@ { lib , php , fetchFromGitHub +, makeBinaryWrapper }: php.buildComposerProject (finalAttrs: { @@ -19,6 +20,8 @@ php.buildComposerProject (finalAttrs: { # Needed because of the unbound version constraint on phpdocumentor/json-path composerStrictValidation = false; + nativeBuildInputs = [ makeBinaryWrapper ]; + installPhase = '' runHook preInstall From 8224753ddf178ecb7e86b742506010b9f3d03c46 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 7 May 2024 11:41:35 +0200 Subject: [PATCH 50/63] python311Packages.pytest-markdown-docs: init at 0.5.1 --- .../pytest-markdown-docs/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-markdown-docs/default.nix diff --git a/pkgs/development/python-modules/pytest-markdown-docs/default.nix b/pkgs/development/python-modules/pytest-markdown-docs/default.nix new file mode 100644 index 000000000000..46dcd7d94043 --- /dev/null +++ b/pkgs/development/python-modules/pytest-markdown-docs/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, poetry-core +, markdown-it-py +, pytest +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pytest-markdown-docs"; + version = "0.5.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "modal-com"; + repo = "pytest-markdown-docs"; + rev = "refs/tags/v${version}"; + hash = "sha256-mclN28tfPcoFxswECjbrkeOI51XXSqUXfbvuSHrd7Sw="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + markdown-it-py + pytest + ]; + + pythonImportsCheck = [ + "pytest_markdown_docs" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Run pytest on markdown code fence blocks"; + homepage = "https://github.com/modal-com/pytest-markdown-docs"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e5e1dba98772..7d3e60e6b273 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12120,6 +12120,8 @@ self: super: with self; { pytest-logdog = callPackage ../development/python-modules/pytest-logdog { }; + pytest-markdown-docs = callPackage ../development/python-modules/pytest-markdown-docs { }; + pytest-md-report = callPackage ../development/python-modules/pytest-md-report { }; pytest-metadata = callPackage ../development/python-modules/pytest-metadata { }; From 1d12174dcac0cf138c25c23283666c3138e2be45 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 12:02:55 +0000 Subject: [PATCH 51/63] speedtest-go: 1.6.12 -> 1.7.0 --- pkgs/tools/networking/speedtest-go/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/speedtest-go/default.nix b/pkgs/tools/networking/speedtest-go/default.nix index 3d079932c607..cd99a297b944 100644 --- a/pkgs/tools/networking/speedtest-go/default.nix +++ b/pkgs/tools/networking/speedtest-go/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "speedtest-go"; - version = "1.6.12"; + version = "1.7.0"; src = fetchFromGitHub { owner = "showwin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-YXLa/0WCWDhQNIDM4kY/5BvUnb+GMmNzAZcYewrMYeg="; + hash = "sha256-G/ovJk/4pDSDlOUSP9/d0vzTg5IaMPMMPhAN+VGxi/c="; }; vendorHash = "sha256-wQqAX7YuxxTiMWmV9LRoXunGMMzs12UyHbf4VvbQF1E="; From e027db61dc24e1efbf15a1624bc59fcbe890b773 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 7 May 2024 11:28:05 +0200 Subject: [PATCH 52/63] python311Packages.pettingzoo: init at 1.24.3 --- .../python-modules/pettingzoo/default.nix | 135 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 137 insertions(+) create mode 100644 pkgs/development/python-modules/pettingzoo/default.nix diff --git a/pkgs/development/python-modules/pettingzoo/default.nix b/pkgs/development/python-modules/pettingzoo/default.nix new file mode 100644 index 000000000000..389abd5f8907 --- /dev/null +++ b/pkgs/development/python-modules/pettingzoo/default.nix @@ -0,0 +1,135 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, setuptools +, wheel +, gymnasium +, numpy +, chess +, pillow +, pybox2d +, pygame +, pymunk +, rlcard +, scipy +, pre-commit +, pynput +, pytest +, pytest-cov +, pytest-markdown-docs +, pytest-xdist +, pytestCheckHook +, stdenv +}: + +buildPythonPackage rec { + pname = "pettingzoo"; + version = "1.24.3"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "Farama-Foundation"; + repo = "PettingZoo"; + rev = "refs/tags/${version}"; + hash = "sha256-TVM4MrA4W6AIWEdBIecI85ahJAAc21f27OzCxSpOoZU="; + }; + + build-system = [ + setuptools + wheel + ]; + + dependencies = [ + gymnasium + numpy + ]; + + passthru.optional-dependencies = { + all = [ + chess + # multi-agent-ale-py + pillow + pybox2d + pygame + pymunk + rlcard + scipy + # shimmy + ]; + atari = [ + # multi-agent-ale-py + pygame + ]; + butterfly = [ + pygame + pymunk + ]; + classic = [ + chess + pygame + rlcard + # shimmy + ]; + mpe = [ + pygame + ]; + other = [ + pillow + ]; + sisl = [ + pybox2d + pygame + pymunk + scipy + ]; + testing = [ + # autorom + pre-commit + pynput + pytest + pytest-cov + pytest-markdown-docs + pytest-xdist + ]; + }; + + pythonImportsCheck = [ + "pettingzoo" + ]; + + nativeCheckInputs = [ + chess + pygame + pymunk + pytest-markdown-docs + pytest-xdist + pytestCheckHook + rlcard + ]; + + disabledTestPaths = [ + # Require unpackaged multi_agent_ale_py + "test/all_parameter_combs_test.py" + "test/pickle_test.py" + "test/unwrapped_test.py" + ]; + + disabledTests = [ + # ImportError: cannot import name 'pytest_plugins' from 'pettingzoo.classic' + "test_chess" + ] ++ lib.optionals stdenv.isDarwin [ + # Crashes on darwin: `Fatal Python error: Aborted` + "test_multi_episode_parallel_env_wrapper" + ]; + + meta = with lib; { + description = "An API standard for multi-agent reinforcement learning environments, with popular reference environments and related utilities"; + homepage = "https://github.com/Farama-Foundation/PettingZoo"; + changelog = "https://github.com/Farama-Foundation/PettingZoo/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7d3e60e6b273..6a0ffafb7376 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9582,6 +9582,8 @@ self: super: with self; { peco = callPackage ../development/python-modules/peco { }; + pettingzoo = callPackage ../development/python-modules/pettingzoo { }; + peewee = callPackage ../development/python-modules/peewee { }; peewee-migrate = callPackage ../development/python-modules/peewee-migrate { }; From eed572f65e14d271f2b3fa483d2e6a797eb2b837 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 12:42:06 +0000 Subject: [PATCH 53/63] civo: 1.0.81 -> 1.0.82 --- pkgs/applications/networking/cluster/civo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/civo/default.nix b/pkgs/applications/networking/cluster/civo/default.nix index 44f87f0e1c9f..372a09e93a88 100644 --- a/pkgs/applications/networking/cluster/civo/default.nix +++ b/pkgs/applications/networking/cluster/civo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "civo"; - version = "1.0.81"; + version = "1.0.82"; src = fetchFromGitHub { owner = "civo"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-YdrJbT9Ozp1vlvQBYQNjJX6n3vIXYj3dmKhAsBPrvi8="; + sha256 = "sha256-pwi0Z0dO2z8Ovlt9gKyVNrh0ZZ2M9xnahBmbTNK2Bnw="; }; - vendorHash = "sha256-YNbxV79XQBmd7oTanwLOMdmt2ds4ttX1ttr8vUycVzg="; + vendorHash = "sha256-NYNp4KGcVma4ltkq2SJZJOaeKS0j/X2TlUrOnptxiYE="; nativeBuildInputs = [ installShellFiles ]; From c4b72cc072cc32a3fe06740dd2655c28c9b96877 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 7 May 2024 15:00:27 +0200 Subject: [PATCH 54/63] p11-kit: remove mesonEmulatorHook No longer necessary since p11-kit commit 3ba2c55 ("Check for GNU strerror_r using the compiler only"), originally in 0.25.1. --- pkgs/development/libraries/p11-kit/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index ab9bfcbc1d97..32ee1dced38e 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -9,7 +9,6 @@ , docbook-xsl-nons , docbook_xml_dtd_43 , gettext -, mesonEmulatorHook , libffi , libintl }: @@ -39,10 +38,6 @@ stdenv.mkDerivation rec { docbook-xsl-nons docbook_xml_dtd_43 gettext - ] ++ lib.optionals - (!stdenv.buildPlatform.canExecute stdenv.hostPlatform - && !stdenv.hostPlatform.isMinGW) [ - mesonEmulatorHook ]; buildInputs = [ From e208ce1f405a93d3468098c37922508dbeaef24c Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 7 May 2024 21:04:19 +0800 Subject: [PATCH 55/63] xfce.xfce4-panel-profiles: Fix missing typelib Use setupHook to set up the proper GI_TYPELIB_PATH. --- .../xfce4-panel-profiles/default.nix | 60 ++++++++++++++----- 1 file changed, 46 insertions(+), 14 deletions(-) diff --git a/pkgs/desktops/xfce/applications/xfce4-panel-profiles/default.nix b/pkgs/desktops/xfce/applications/xfce4-panel-profiles/default.nix index e223f8bc6663..2e25e686ccd5 100644 --- a/pkgs/desktops/xfce/applications/xfce4-panel-profiles/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-panel-profiles/default.nix @@ -1,31 +1,63 @@ -{ mkXfceDerivation, lib, python3, intltool, gettext, - gtk3, libxfce4ui, libxfce4util, pango, harfbuzz, gdk-pixbuf, atk }: +{ stdenv +, lib +, fetchFromGitLab +, gettext +, gobject-introspection +, intltool +, wrapGAppsHook3 +, glib +, gtk3 +, libxfce4ui +, python3 +, gitUpdater +}: let - pythonEnv = python3.withPackages(ps: [ ps.pygobject3 ps.psutil ]); - makeTypelibPath = lib.makeSearchPathOutput "lib/girepository-1.0" "lib/girepository-1.0"; -in mkXfceDerivation { - category = "apps"; + pythonEnv = python3.withPackages (ps: [ + ps.pygobject3 + ps.psutil + ]); +in +stdenv.mkDerivation (finalAttrs: { pname = "xfce4-panel-profiles"; version = "1.0.14"; - sha256 = "sha256-mGA70t2U4mqEbcrj/DDsPl++EKWyZ8YXzKzzVOrH5h8="; + src = fetchFromGitLab { + domain = "gitlab.xfce.org"; + owner = "apps"; + repo = "xfce4-panel-profiles"; + rev = "xfce4-panel-profiles-${finalAttrs.version}"; + sha256 = "sha256-mGA70t2U4mqEbcrj/DDsPl++EKWyZ8YXzKzzVOrH5h8="; + }; - nativeBuildInputs = [ intltool gettext ]; - propagatedBuildInputs = [ pythonEnv ]; + nativeBuildInputs = [ + gettext + gobject-introspection + intltool + wrapGAppsHook3 + ]; + + buildInputs = [ + glib + gtk3 + libxfce4ui + pythonEnv + ]; configurePhase = '' + runHook preConfigure + # This is just a handcrafted script and does not accept additional arguments. ./configure --prefix=$out + runHook postConfigure ''; - postFixup = '' - wrapProgram $out/bin/xfce4-panel-profiles \ - --set GI_TYPELIB_PATH ${makeTypelibPath [ gtk3 libxfce4ui libxfce4util pango harfbuzz gdk-pixbuf atk ]} - ''; + passthru.updateScript = gitUpdater { rev-prefix = "xfce4-panel-profiles-"; }; meta = with lib; { + homepage = "https://docs.xfce.org/apps/xfce4-panel-profiles/start"; description = "Simple application to manage Xfce panel layouts"; mainProgram = "xfce4-panel-profiles"; maintainers = with maintainers; [ ] ++ teams.xfce.members; + platforms = platforms.linux; }; -} +}) From 3be1b16698a12531b1a5edc3d4a56ab62ea41fbf Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Tue, 7 May 2024 15:27:08 +0200 Subject: [PATCH 56/63] nixos/plausible: fix unit start script In 8bb777ee378082942231f63a035923a475538030 a condition was added to only execute the createdb.sh script if database setup was configurated. However a superfluace " was added at the end of the line which cased an escaping error the resulted in #309520. Fixes #309520 --- nixos/modules/services/web-apps/plausible.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/plausible.nix b/nixos/modules/services/web-apps/plausible.nix index b9e5afd4d141..393b3dd5bd16 100644 --- a/nixos/modules/services/web-apps/plausible.nix +++ b/nixos/modules/services/web-apps/plausible.nix @@ -278,7 +278,7 @@ in { ${lib.optionalString cfg.database.postgres.setup '' # setup - ${cfg.package}/createdb.sh" + ${cfg.package}/createdb.sh ''} ${cfg.package}/migrate.sh From 8edee82bc2e845ea6cd314edcc94184e5a44febf Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Tue, 7 May 2024 15:35:22 +0200 Subject: [PATCH 57/63] plausible: take take-plausible-maintainership --- nixos/modules/services/web-apps/plausible.nix | 2 +- pkgs/servers/web-apps/plausible/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/plausible.nix b/nixos/modules/services/web-apps/plausible.nix index b9e5afd4d141..1d2fb13c8b49 100644 --- a/nixos/modules/services/web-apps/plausible.nix +++ b/nixos/modules/services/web-apps/plausible.nix @@ -329,6 +329,6 @@ in { ]; }; - meta.maintainers = with maintainers; [ ]; + meta.maintainers = with maintainers; [ xanderio ]; meta.doc = ./plausible.md; } diff --git a/pkgs/servers/web-apps/plausible/default.nix b/pkgs/servers/web-apps/plausible/default.nix index 24f684c0c954..257fb6818e26 100644 --- a/pkgs/servers/web-apps/plausible/default.nix +++ b/pkgs/servers/web-apps/plausible/default.nix @@ -89,7 +89,7 @@ beamPackages.mixRelease { changelog = "https://github.com/plausible/analytics/blob/${src.rev}/CHANGELOG.md"; description = " Simple, open-source, lightweight (< 1 KB) and privacy-friendly web analytics alternative to Google Analytics"; mainProgram = "plausible"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ xanderio ]; platforms = platforms.unix; }; } From 56abb8dd9bda51b62759456fb387649222ffa848 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 13:51:51 +0000 Subject: [PATCH 58/63] ircdog: 0.5.2 -> 0.5.3 --- pkgs/applications/networking/irc/ircdog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/ircdog/default.nix b/pkgs/applications/networking/irc/ircdog/default.nix index 56c951798fe9..f08d6857799c 100644 --- a/pkgs/applications/networking/irc/ircdog/default.nix +++ b/pkgs/applications/networking/irc/ircdog/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ircdog"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "goshuirc"; repo = "ircdog"; rev = "refs/tags/v${version}"; - hash = "sha256-rV9IBa30v1T3Zw/av8nfmX9Bg20FPAGdJkMn17r8rYw="; + hash = "sha256-TdMgt1ZgoEaweH8Cbb+wG/H1Bx9DpgHgzGO5dZfxvK8="; }; vendorHash = null; From 5223087841daf625ff458aa16db21f5b9fdd2d46 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 14:25:10 +0000 Subject: [PATCH 59/63] musescore: 4.2.1 -> 4.3.0 --- pkgs/applications/audio/musescore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 37d713b5e534..a5058f9b7834 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -47,13 +47,13 @@ let } else portaudio; in stdenv'.mkDerivation (finalAttrs: { pname = "musescore"; - version = "4.2.1"; + version = "4.3.0"; src = fetchFromGitHub { owner = "musescore"; repo = "MuseScore"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-YCeO/ijxA+tZxNviqmlIBkAdjPTrKoOoo1QyMIOqhWU="; + sha256 = "sha256-X3zvrIf5DOC5PWcnuw0aClm++IWUED1ZzAyjnp7Mo+g="; }; cmakeFlags = [ From 11733d0047a7ed6130bb8d2570357a6b6fcead7b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 7 May 2024 15:05:52 +0200 Subject: [PATCH 60/63] python311Packages.nbmake: init at 1.5.3 --- .../python-modules/nbmake/default.nix | 74 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 76 insertions(+) create mode 100644 pkgs/development/python-modules/nbmake/default.nix diff --git a/pkgs/development/python-modules/nbmake/default.nix b/pkgs/development/python-modules/nbmake/default.nix new file mode 100644 index 000000000000..03606d7b0787 --- /dev/null +++ b/pkgs/development/python-modules/nbmake/default.nix @@ -0,0 +1,74 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, poetry-core +, pythonRelaxDepsHook +, setuptools +, wheel +, ipykernel +, nbclient +, nbformat +, pygments +, pytest +, pyyaml +, pytest-xdist +, pytestCheckHook +, typing-extensions +}: + +buildPythonPackage rec { + pname = "nbmake"; + version = "1.5.3"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "treebeardtech"; + repo = "nbmake"; + rev = "refs/tags/v${version}"; + hash = "sha256-sX0YqyBchLlo0QPIpLvl11/gwoiZknG5rBDzmQKiXhs="; + }; + + build-system = [ + poetry-core + pythonRelaxDepsHook + setuptools + wheel + ]; + + dependencies = [ + ipykernel + nbclient + nbformat + pygments + pytest + pyyaml + ]; + + pythonRelaxDeps = [ + "nbclient" + ]; + + pythonImportsCheck = [ + "nbmake" + ]; + + nativeCheckInputs = [ + pytest-xdist + pytestCheckHook + typing-extensions + ]; + + __darwinAllowLocalNetworking = true; + + + meta = with lib; { + description = "Pytest plugin for testing notebooks"; + homepage = "https://github.com/treebeardtech/nbmake"; + changelog = "https://github.com/treebeardtech/nbmake/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d5e00ae23405..cc50b14e4089 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8630,6 +8630,8 @@ self: super: with self; { nbformat = callPackage ../development/python-modules/nbformat { }; + nbmake = callPackage ../development/python-modules/nbmake { }; + nbmerge = callPackage ../development/python-modules/nbmerge { }; nbsmoke = callPackage ../development/python-modules/nbsmoke { }; From b22991a6b1e920770e4baf9c755746408654d0e5 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 7 May 2024 15:11:47 +0200 Subject: [PATCH 61/63] python311Packages.portion: init at 2.4.2 --- .../python-modules/portion/default.nix | 49 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/portion/default.nix diff --git a/pkgs/development/python-modules/portion/default.nix b/pkgs/development/python-modules/portion/default.nix new file mode 100644 index 000000000000..5cba2a579294 --- /dev/null +++ b/pkgs/development/python-modules/portion/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, setuptools +, wheel +, sortedcontainers +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "portion"; + version = "2.4.2"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "AlexandreDecan"; + repo = "portion"; + rev = "refs/tags/${version}"; + hash = "sha256-URoyuE0yivUqPjJZbvATkAnTxicY4F2eiJ16rIUdY3Y="; + }; + + build-system = [ + setuptools + wheel + ]; + + dependencies = [ + sortedcontainers + ]; + + pythonImportsCheck = [ + "portion" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Portion, a Python library providing data structure and operations for intervals"; + homepage = "https://github.com/AlexandreDecan/portion"; + changelog = "https://github.com/AlexandreDecan/portion/blob/${src.rev}/CHANGELOG.md"; + license = licenses.lgpl3; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cc50b14e4089..529797ce7d17 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10248,6 +10248,8 @@ self: super: with self; { portend = callPackage ../development/python-modules/portend { }; + portion = callPackage ../development/python-modules/portion { }; + port-for = callPackage ../development/python-modules/port-for { }; portpicker = callPackage ../development/python-modules/portpicker { }; From 988e24e43b98ca3e81a8f8922b471b44c545aafc Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 7 May 2024 11:29:05 +0200 Subject: [PATCH 62/63] python311Packages.minari: init at 0.4.3 --- .../python-modules/minari/default.nix | 88 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 2 + 3 files changed, 92 insertions(+) create mode 100644 pkgs/development/python-modules/minari/default.nix diff --git a/pkgs/development/python-modules/minari/default.nix b/pkgs/development/python-modules/minari/default.nix new file mode 100644 index 000000000000..45c3f0fc36ec --- /dev/null +++ b/pkgs/development/python-modules/minari/default.nix @@ -0,0 +1,88 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, setuptools +, wheel +, google-cloud-storage +, gymnasium +, h5py +, numpy +, packaging +, portion +, rich +, tqdm +, typer +, typing-extensions +, imageio +, nbmake +, pytest +, pytest-markdown-docs +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "minari"; + version = "0.4.3"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "Farama-Foundation"; + repo = "Minari"; + rev = "refs/tags/v${version}"; + hash = "sha256-DwuANo0PCb2pPTVST8EwuJHe5HKRV8JIpFBpSqoJNh8="; + }; + + build-system = [ + setuptools + wheel + ]; + + dependencies = [ + google-cloud-storage + gymnasium + h5py + numpy + packaging + portion + rich + tqdm + typer + typing-extensions + ]; + + passthru.optional-dependencies = { + testing = [ + # gymnasium-robotics + imageio + nbmake + pytest + pytest-markdown-docs + ]; + }; + + pythonImportsCheck = [ + "minari" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTestPaths = [ + # Require internet access + "tests/dataset/test_dataset_download.py" + "tests/test_cli.py" + ]; + + meta = with lib; { + description = "A standard format for offline reinforcement learning datasets, with popular reference datasets and related utilities"; + homepage = "https://github.com/Farama-Foundation/Minari"; + changelog = "https://github.com/Farama-Foundation/Minari/releases/tag/v${version}"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ GaetanLepage ]; + mainProgram = "minari"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fdbd40af2b98..f69f3a852c3d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31399,6 +31399,8 @@ with pkgs; manuskript = libsForQt5.callPackage ../applications/editors/manuskript { }; + minari = python3Packages.toPythonApplication python3Packages.minari; + mindforger = libsForQt5.callPackage ../applications/editors/mindforger { }; mi2ly = callPackage ../applications/audio/mi2ly { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 529797ce7d17..36783fd443f8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7427,6 +7427,8 @@ self: super: with self; { millheater = callPackage ../development/python-modules/millheater { }; + minari = callPackage ../development/python-modules/minari { }; + mindsdb-evaluator = callPackage ../development/python-modules/mindsdb-evaluator { }; minexr = callPackage ../development/python-modules/minexr { }; From aa4f51b469d18e092dce6d66cfaca86727b81f22 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 00:25:12 +0000 Subject: [PATCH 63/63] buildkite-agent-metrics: 5.9.3 -> 5.9.4 --- pkgs/servers/monitoring/buildkite-agent-metrics/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix b/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix index bf1af9e944d7..4139b9e6f81d 100644 --- a/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix +++ b/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix @@ -4,7 +4,7 @@ }: buildGoModule rec { pname = "buildkite-agent-metrics"; - version = "5.9.3"; + version = "5.9.4"; outputs = [ "out" "lambda" ]; @@ -12,10 +12,10 @@ buildGoModule rec { owner = "buildkite"; repo = "buildkite-agent-metrics"; rev = "v${version}"; - hash = "sha256-DepIptvR4i0+/45stCMErJtDeAFIDiNbhioitQ8gYBs="; + hash = "sha256-S9dkahAAoOwwEcWTzo+JkoZkQAQqPT5tfSZY9IWnWaU="; }; - vendorHash = "sha256-YEvVGtfhe/RBeuD87C2BNOFEeK40JDidX4loSLdBwhs="; + vendorHash = "sha256-r+K/RbNmVYm1LKTZvvKR9zBM35xLkMN8SadOttoTWzo="; postInstall = '' mkdir -p $lambda/bin