From ffd3da44f346f8b7fa2c07761459389904098b1c Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Tue, 19 Jul 2022 19:26:08 -0400 Subject: [PATCH 001/113] defaultGemConfig.grpc: Fix build on v1.48.0+ Upstream commit 0a5d9828c1f6b32e8462a00029b1ba2a720c867b changed how the extension build script detects an Apple toolchain; adjust accordingly by forcing it to be false. Keep both fixes so this is more compatible. --- pkgs/development/ruby-modules/gem-config/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 6f9da13f5034..5a6d885159a5 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -321,8 +321,12 @@ in substituteInPlace Makefile \ --replace '-Wno-invalid-source-encoding' "" '' + lib.optionalString stdenv.isDarwin '' + # For < v1.48.0 substituteInPlace src/ruby/ext/grpc/extconf.rb \ --replace "ENV['AR'] = 'libtool -o' if RUBY_PLATFORM =~ /darwin/" "" + # For >= v1.48.0 + substituteInPlace src/ruby/ext/grpc/extconf.rb \ + --replace 'apple_toolchain = ' 'apple_toolchain = false && ' ''; }; From 17585ec0dc5a608857852a7fbc522f0a99817dba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Jul 2022 00:58:51 +0000 Subject: [PATCH 002/113] barman: 3.0.0 -> 3.0.1 --- pkgs/tools/misc/barman/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/barman/default.nix b/pkgs/tools/misc/barman/default.nix index 4ad66a98ad5a..36fd90273f29 100644 --- a/pkgs/tools/misc/barman/default.nix +++ b/pkgs/tools/misc/barman/default.nix @@ -4,13 +4,13 @@ }: python3Packages.buildPythonApplication rec { pname = "barman"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "EnterpriseDB"; repo = pname; - rev = "release/${version}"; - sha256 = "sha256-WLKtra1kNxvm4iO3NEhMNCSioHL9I8GIgkbtu95IyTQ="; + rev = "refs/tags/release/${version}"; + sha256 = "sha256-e6euOtvJx+xUq5pWmWK6l7nv/twOa+0OABUTYvMd8Ow="; }; checkInputs = with python3Packages; [ From f22c5e38e74a28ea6049ec8beabeb0d19d2b647c Mon Sep 17 00:00:00 2001 From: Van Tuan Vo Date: Wed, 20 Jul 2022 10:18:25 +0200 Subject: [PATCH 003/113] uniffi-bindgen: 0.17.0 -> 0.19.3 --- .../tools/uniffi-bindgen/Cargo.lock | 684 +++++++++++------- .../tools/uniffi-bindgen/default.nix | 5 +- 2 files changed, 423 insertions(+), 266 deletions(-) diff --git a/pkgs/development/tools/uniffi-bindgen/Cargo.lock b/pkgs/development/tools/uniffi-bindgen/Cargo.lock index 4de3b80928aa..97a7addb26e1 100644 --- a/pkgs/development/tools/uniffi-bindgen/Cargo.lock +++ b/pkgs/development/tools/uniffi-bindgen/Cargo.lock @@ -4,21 +4,15 @@ version = 3 [[package]] name = "anyhow" -version = "1.0.53" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0" - -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +checksum = "bb07d2053ccdbe10e2af2995a2f116c1330396493dc1269f6a91d0ae82e19704" [[package]] name = "askama" -version = "0.10.5" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d298738b6e47e1034e560e5afe63aa488fea34e25ec11b855a76f0d7b8e73134" +checksum = "fb98f10f371286b177db5eeb9a6e5396609555686a35e1d4f7b9a9c6d8af0139" dependencies = [ "askama_derive", "askama_escape", @@ -27,9 +21,9 @@ dependencies = [ [[package]] name = "askama_derive" -version = "0.10.5" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2925c4c290382f9d2fa3d1c1b6a63fa1427099721ecca4749b154cc9c25522" +checksum = "87bf87e6e8b47264efa9bde63d6225c6276a52e05e91bf37eaa8afd0032d6b71" dependencies = [ "askama_shared", "proc-macro2", @@ -38,18 +32,20 @@ dependencies = [ [[package]] name = "askama_escape" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1bb320f97e6edf9f756bf015900038e43c7700e059688e5724a928c8f3b8d5" +checksum = "619743e34b5ba4e9703bba34deac3427c72507c7159f5fd030aea8cac0cfe341" [[package]] name = "askama_shared" -version = "0.11.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2582b77e0f3c506ec4838a25fa8a5f97b9bed72bb6d3d272ea1c031d8bd373bc" +checksum = "bf722b94118a07fcbc6640190f247334027685d4e218b794dbfe17c32bf38ed0" dependencies = [ "askama_escape", - "nom 6.2.1", + "mime", + "mime_guess", + "nom 7.1.1", "proc-macro2", "quote", "serde", @@ -57,6 +53,23 @@ dependencies = [ "toml", ] +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + [[package]] name = "bitflags" version = "1.3.2" @@ -77,26 +90,15 @@ dependencies = [ [[package]] name = "bytes" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" - -[[package]] -name = "callbacks" -version = "0.17.0" -dependencies = [ - "lazy_static", - "thiserror", - "uniffi", - "uniffi_build", - "uniffi_macros", -] +checksum = "f0b3de4a0c5e67e16066a0715723abd91edc2f9001d09c46e1dca929351e130e" [[package]] name = "camino" -version = "1.0.7" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3132262930b0522068049f5870a856ab8affc80c70d08b6ecb785771a6fc23" +checksum = "869119e97797867fd90f5e22af7d0bd274bd4635ebb9eb68c04f3f513ae6c412" dependencies = [ "serde", ] @@ -112,22 +114,17 @@ dependencies = [ [[package]] name = "cargo_metadata" -version = "0.13.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "081e3f0755c1f380c2d010481b6fa2e02973586d5f2b24eebb7a2a1d98b143d8" +checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" dependencies = [ "camino", "cargo-platform", "semver", - "semver-parser", "serde", "serde_json", ] -[[package]] -name = "cdylib-dependency" -version = "0.17.0" - [[package]] name = "cfg-if" version = "1.0.0" @@ -136,29 +133,46 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "2.34.0" +version = "3.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +checksum = "d2dbdf4bdacb33466e854ce889eee8dfd5729abf7ccd7664d0a2d60cd384440b" dependencies = [ + "atty", "bitflags", + "clap_derive", + "clap_lex", + "indexmap", + "lazy_static", + "strsim", + "termcolor", "textwrap", - "unicode-width", ] [[package]] -name = "coverall" -version = "0.17.0" +name = "clap_derive" +version = "3.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25320346e922cffe59c0bbc5410c8d8784509efb321488971081313cb1e1a33c" dependencies = [ - "lazy_static", - "thiserror", - "uniffi", - "uniffi_build", - "uniffi_macros", + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +dependencies = [ + "os_str_bytes", ] [[package]] name = "crate_one" -version = "0.17.0" +version = "0.19.3" dependencies = [ "anyhow", "bytes", @@ -169,7 +183,7 @@ dependencies = [ [[package]] name = "crate_two" -version = "0.17.0" +version = "0.19.3" dependencies = [ "anyhow", "bytes", @@ -179,70 +193,6 @@ dependencies = [ "uniffi_macros", ] -[[package]] -name = "custom-types" -version = "0.17.0" -dependencies = [ - "anyhow", - "bytes", - "serde_json", - "uniffi", - "uniffi_build", - "uniffi_macros", - "url", -] - -[[package]] -name = "ext-types-guid" -version = "0.17.0" -dependencies = [ - "anyhow", - "bytes", - "serde_json", - "thiserror", - "uniffi", - "uniffi_build", - "uniffi_macros", -] - -[[package]] -name = "ext-types-lib" -version = "0.17.0" -dependencies = [ - "anyhow", - "bytes", - "custom-types", - "ext-types-guid", - "uniffi", - "uniffi-one", - "uniffi_build", - "uniffi_macros", - "url", -] - -[[package]] -name = "external_types_lib" -version = "0.17.0" -dependencies = [ - "anyhow", - "bytes", - "crate_one", - "crate_two", - "uniffi", - "uniffi_build", - "uniffi_macros", -] - -[[package]] -name = "ffi-crate" -version = "0.17.0" -dependencies = [ - "cdylib-dependency", - "uniffi", - "uniffi_build", - "uniffi_macros", -] - [[package]] name = "form_urlencoded" version = "1.0.1" @@ -253,6 +203,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "fs-err" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bd79fa345a495d3ae89fb7165fec01c0e72f41821d642dda363a1e97975652e" + [[package]] name = "funty" version = "1.1.0" @@ -266,30 +222,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] -name = "heck" -version = "0.3.3" +name = "hashbrown" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] -name = "i1015-fully-qualified-types" -version = "0.17.0" -dependencies = [ - "uniffi", - "uniffi_build", - "uniffi_macros", -] +name = "heck" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" [[package]] -name = "i356-enum-without-int-helpers" -version = "0.17.0" +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" dependencies = [ - "uniffi", - "uniffi_build", - "uniffi_macros", + "libc", ] [[package]] @@ -304,19 +254,20 @@ dependencies = [ ] [[package]] -name = "itoa" -version = "1.0.1" +name = "indexmap" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" +checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +dependencies = [ + "autocfg", + "hashbrown", +] [[package]] -name = "kotlin-experimental-unsigned-types" -version = "0.17.0" -dependencies = [ - "uniffi", - "uniffi_build", - "uniffi_macros", -] +name = "itoa" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" [[package]] name = "lazy_static" @@ -325,23 +276,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] -name = "lexical-core" -version = "0.7.6" +name = "libc" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" +checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" + +[[package]] +name = "libloading" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" dependencies = [ - "arrayvec", - "bitflags", "cfg-if", - "ryu", - "static_assertions", + "winapi", ] [[package]] name = "log" -version = "0.4.14" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ "cfg-if", ] @@ -359,15 +313,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" [[package]] -name = "nom" -version = "5.1.2" +name = "mime" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" +checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" + +[[package]] +name = "mime_guess" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" dependencies = [ - "memchr", - "version_check", + "mime", + "unicase", ] +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + [[package]] name = "nom" version = "6.2.1" @@ -376,31 +342,37 @@ checksum = "9c5c51b9083a3c620fa67a2a635d1ce7d95b897e957d6b28ff9a5da960a103a6" dependencies = [ "bitvec", "funty", - "lexical-core", "memchr", "version_check", ] [[package]] -name = "omit_argument_labels" -version = "0.17.0" +name = "nom" +version = "7.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" dependencies = [ - "uniffi", - "uniffi_build", - "uniffi_macros", + "memchr", + "minimal-lexical", ] [[package]] name = "once_cell" -version = "1.9.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5" +checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" + +[[package]] +name = "os_str_bytes" +version = "6.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "648001efe5d5c0102d8cea768e348da85d90af8ba91f0bea908f157951493cd4" [[package]] name = "paste" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0744126afe1a6dd7f394cb50a716dbe086cb06e255e53d8d0185d82828358fb5" +checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc" [[package]] name = "percent-encoding" @@ -409,28 +381,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" [[package]] -name = "pest" -version = "2.1.3" +name = "proc-macro-error" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ - "ucd-trie", + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", ] [[package]] name = "proc-macro2" -version = "1.0.36" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" +checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7" dependencies = [ - "unicode-xid", + "unicode-ident", ] [[package]] name = "quote" -version = "1.0.15" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145" +checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" dependencies = [ "proc-macro2", ] @@ -443,43 +430,33 @@ checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" [[package]] name = "ryu" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" +checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695" [[package]] name = "semver" -version = "0.11.0" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" +checksum = "a2333e6df6d6598f2b1974829f853c2b4c5f4a6e503c10af918081aa6f8564e1" dependencies = [ - "semver-parser", "serde", ] -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] - [[package]] name = "serde" -version = "1.0.136" +version = "1.0.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" +checksum = "0171ebb889e45aa68b44aee0859b3eede84c6f5f5c228e6f140c0b2a0a46cad6" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.136" +version = "1.0.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" +checksum = "dc1d3230c1de7932af58ad8ffbe1d784bd55efd5a9d84ac24f69c72d83543dfb" dependencies = [ "proc-macro2", "quote", @@ -488,9 +465,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.78" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d23c1ba4cf0efd44be32017709280b32d1cea5c3f1275c3b6d9e8bc54f758085" +checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7" dependencies = [ "itoa", "ryu", @@ -504,14 +481,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] -name = "syn" -version = "1.0.86" +name = "strsim" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "syn" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" dependencies = [ "proc-macro2", "quote", - "unicode-xid", + "unicode-ident", ] [[package]] @@ -522,36 +505,33 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "termcolor" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" dependencies = [ "winapi-util", ] [[package]] name = "textwrap" -version = "0.11.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] +checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" [[package]] name = "thiserror" -version = "1.0.30" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" +checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.30" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" +checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" dependencies = [ "proc-macro2", "quote", @@ -560,9 +540,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" dependencies = [ "tinyvec_macros", ] @@ -575,72 +555,65 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "toml" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" dependencies = [ "serde", ] [[package]] name = "trybuild" -version = "1.0.55" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099a24e67e2b4083a6d0beb5a98e274c3160edfb879d71cd2cd14da93786a93b" +checksum = "764b9e244b482a9b81bde596aa37aa6f1347bf8007adab25e59f901b32b4e0a0" dependencies = [ "glob", "once_cell", "serde", + "serde_derive", "serde_json", "termcolor", "toml", ] [[package]] -name = "ucd-trie" -version = "0.1.3" +name = "unicase" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" +checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +dependencies = [ + "version_check", +] [[package]] name = "unicode-bidi" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" +checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" + +[[package]] +name = "unicode-ident" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7" [[package]] name = "unicode-normalization" -version = "0.1.19" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" +checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6" dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-segmentation" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" - -[[package]] -name = "unicode-width" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" - -[[package]] -name = "unicode-xid" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" - [[package]] name = "uniffi" -version = "0.17.0" +version = "0.19.3" dependencies = [ "anyhow", "bytes", + "camino", "cargo_metadata", "lazy_static", "log", @@ -652,7 +625,7 @@ dependencies = [ [[package]] name = "uniffi-example-arithmetic" -version = "0.17.0" +version = "0.19.3" dependencies = [ "thiserror", "uniffi", @@ -662,16 +635,29 @@ dependencies = [ [[package]] name = "uniffi-example-callbacks" -version = "0.17.0" +version = "0.19.3" dependencies = [ "uniffi", "uniffi_build", "uniffi_macros", ] +[[package]] +name = "uniffi-example-custom-types" +version = "0.19.3" +dependencies = [ + "anyhow", + "bytes", + "serde_json", + "uniffi", + "uniffi_build", + "uniffi_macros", + "url", +] + [[package]] name = "uniffi-example-geometry" -version = "0.17.0" +version = "0.19.3" dependencies = [ "uniffi", "uniffi_build", @@ -680,7 +666,7 @@ dependencies = [ [[package]] name = "uniffi-example-rondpoint" -version = "0.17.0" +version = "0.19.3" dependencies = [ "uniffi", "uniffi_build", @@ -689,7 +675,7 @@ dependencies = [ [[package]] name = "uniffi-example-sprites" -version = "0.17.0" +version = "0.19.3" dependencies = [ "uniffi", "uniffi_build", @@ -698,7 +684,7 @@ dependencies = [ [[package]] name = "uniffi-example-todolist" -version = "0.17.0" +version = "0.19.3" dependencies = [ "lazy_static", "thiserror", @@ -708,9 +694,10 @@ dependencies = [ ] [[package]] -name = "uniffi-fixture-time" -version = "0.17.0" +name = "uniffi-fixture-callbacks" +version = "0.19.3" dependencies = [ + "lazy_static", "thiserror", "uniffi", "uniffi_build", @@ -718,8 +705,47 @@ dependencies = [ ] [[package]] -name = "uniffi-one" -version = "0.17.0" +name = "uniffi-fixture-coverall" +version = "0.19.3" +dependencies = [ + "lazy_static", + "thiserror", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-fixture-ext-types" +version = "0.19.3" +dependencies = [ + "anyhow", + "bytes", + "uniffi", + "uniffi-example-custom-types", + "uniffi-fixture-ext-types-guid", + "uniffi-fixture-ext-types-lib-one", + "uniffi_build", + "uniffi_macros", + "url", +] + +[[package]] +name = "uniffi-fixture-ext-types-guid" +version = "0.19.3" +dependencies = [ + "anyhow", + "bytes", + "serde_json", + "thiserror", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-fixture-ext-types-lib-one" +version = "0.19.3" dependencies = [ "anyhow", "bytes", @@ -728,33 +754,153 @@ dependencies = [ "uniffi_macros", ] +[[package]] +name = "uniffi-fixture-external-types" +version = "0.19.3" +dependencies = [ + "anyhow", + "bytes", + "crate_one", + "crate_two", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-fixture-keywords-kotlin" +version = "0.19.3" +dependencies = [ + "thiserror", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-fixture-keywords-rust" +version = "0.19.3" +dependencies = [ + "thiserror", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-fixture-reexport-scaffolding-macro" +version = "0.19.3" +dependencies = [ + "cargo_metadata", + "lazy_static", + "libloading", + "uniffi", + "uniffi-fixture-callbacks", + "uniffi-fixture-coverall", + "uniffi_bindgen", +] + +[[package]] +name = "uniffi-fixture-regression-cdylib-dependency" +version = "0.19.3" + +[[package]] +name = "uniffi-fixture-regression-cdylib-dependency-ffi-crate" +version = "0.19.3" +dependencies = [ + "uniffi", + "uniffi-fixture-regression-cdylib-dependency", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-fixture-regression-i1015-fully-qualified-types" +version = "0.19.3" +dependencies = [ + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-fixture-regression-i356-enum-without-int-helpers" +version = "0.19.3" +dependencies = [ + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-fixture-regression-kotlin-experimental-unsigned-types" +version = "0.19.3" +dependencies = [ + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-fixture-regression-missing-newline" +version = "0.19.3" +dependencies = [ + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-fixture-swift-omit-argument-labels" +version = "0.19.3" +dependencies = [ + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-fixture-time" +version = "0.19.3" +dependencies = [ + "thiserror", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + [[package]] name = "uniffi_bindgen" -version = "0.17.0" +version = "0.19.3" dependencies = [ "anyhow", "askama", + "camino", "cargo_metadata", "clap", + "fs-err", "heck", + "lazy_static", "paste", "serde", "toml", - "weedle", + "weedle2", ] [[package]] name = "uniffi_build" -version = "0.17.0" +version = "0.19.3" dependencies = [ "anyhow", + "camino", "uniffi_bindgen", ] [[package]] name = "uniffi_macros" -version = "0.17.0" +version = "0.19.3" dependencies = [ + "camino", "glob", "proc-macro2", "quote", @@ -762,9 +908,22 @@ dependencies = [ "uniffi_build", ] +[[package]] +name = "uniffi_testing" +version = "0.19.3" +dependencies = [ + "anyhow", + "camino", + "cargo_metadata", + "fs-err", + "lazy_static", + "serde", + "serde_json", +] + [[package]] name = "uniffi_uitests" -version = "0.17.0" +version = "0.19.3" dependencies = [ "trybuild", "uniffi", @@ -791,12 +950,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] -name = "weedle" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "610950904727748ca09682e857f0d6d6437f0ca862f32f9229edba8cec8b2635" +name = "weedle2" +version = "3.0.0" dependencies = [ - "nom 5.1.2", + "fs-err", + "nom 6.2.1", ] [[package]] diff --git a/pkgs/development/tools/uniffi-bindgen/default.nix b/pkgs/development/tools/uniffi-bindgen/default.nix index 59ecd71a4114..1073152732e0 100644 --- a/pkgs/development/tools/uniffi-bindgen/default.nix +++ b/pkgs/development/tools/uniffi-bindgen/default.nix @@ -11,17 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "uniffi-bindgen"; - version = "0.17.0"; + version = "0.19.3"; src = fetchFromGitHub { owner = "mozilla"; repo = "uniffi-rs"; rev = "v${version}"; - hash = "sha256-EGyJrW0U/dnKT7OWgd8LehCyvj6mxud3QWbBVyhoK4Y="; + hash = "sha256-A6Zd1jfhoR4yW2lT5qYE3vJTpiJc94pK/XQmfE2QLFc="; }; cargoLock.lockFileContents = builtins.readFile ./Cargo.lock; - cargoHash = "sha256-Fw+yCAI32NdFKJGPuNU6t0FiEfohoVD3VQfInNJuooI="; cargoBuildFlags = [ "-p uniffi_bindgen" ]; cargoTestFlags = [ "-p uniffi_bindgen" ]; From 0c2efbe5b6275a1d0c3e67494e86eea068b7e064 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Wed, 20 Jul 2022 18:17:41 -0300 Subject: [PATCH 004/113] vscode-extensions.prisma.prisma: 3.14.0 -> 4.1.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 551d898cdf56..afd7634e7247 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1955,8 +1955,8 @@ let mktplcRef = { name = "prisma"; publisher = "Prisma"; - version = "3.14.0"; - sha256 = "09dlm2awd2h0xmx1vcx95kdvz3xf4f5pd7zcdg3mb0g2az4nfld7"; + version = "4.1.0"; + sha256 = "sha256-YpdxRoeIesx4R2RIpJ8YmmHEmR3lezdN1efhhg14MzI="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/Prisma.prisma/changelog"; From 19326e453b1174aa5d494acb5bc2eaef5d6ef187 Mon Sep 17 00:00:00 2001 From: Finn Behrens Date: Thu, 21 Jul 2022 10:41:37 +0200 Subject: [PATCH 005/113] roswell: change platform to unix --- pkgs/development/tools/roswell/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/roswell/default.nix b/pkgs/development/tools/roswell/default.nix index 89c2745e33e6..50f074a266d5 100644 --- a/pkgs/development/tools/roswell/default.nix +++ b/pkgs/development/tools/roswell/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { description = "Roswell is a Lisp implementation installer/manager, launcher, and much more"; license = licenses.mit; maintainers = with maintainers; [ hiro98 ]; - platforms = platforms.linux; + platforms = platforms.unix; homepage = "https://github.com/roswell/roswell"; mainProgram = "ros"; }; From f18b419aa1ce0da1a01e0b1549aa310acddf200c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Jul 2022 11:06:25 +0200 Subject: [PATCH 006/113] slowhttptest: 1.8.2 -> 1.9.0 --- pkgs/tools/security/slowhttptest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/slowhttptest/default.nix b/pkgs/tools/security/slowhttptest/default.nix index 5dce5d5439ac..b4c2b0efeec3 100644 --- a/pkgs/tools/security/slowhttptest/default.nix +++ b/pkgs/tools/security/slowhttptest/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "slowhttptest"; - version = "1.8.2"; + version = "1.9.0"; src = fetchFromGitHub { owner = "shekyan"; repo = pname; rev = "v${version}"; - sha256 = "1xv2j3hl4zj0s2cxcsvlwgridh9ap4g84g7c4918d03id15wydcx"; + sha256 = "sha256-rIvd3LykVAbDXtFWZ1EQ+QKeALzqwK6pq7In0BsCOFo="; }; buildInputs = [ openssl ]; From 135809658f2b2d23d25011c730c9e7501c83e066 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Jul 2022 09:44:03 +0000 Subject: [PATCH 007/113] python310Packages.asf-search: 5.0.1 -> 5.0.2 --- pkgs/development/python-modules/asf-search/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asf-search/default.nix b/pkgs/development/python-modules/asf-search/default.nix index f2cd65d9a6f2..6e857499f651 100644 --- a/pkgs/development/python-modules/asf-search/default.nix +++ b/pkgs/development/python-modules/asf-search/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "asf-search"; - version = "5.0.1"; + version = "5.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "asfadmin"; repo = "Discovery-asf_search"; rev = "refs/tags/v${version}"; - hash = "sha256-v8++qPeAPc/0nYEYK4GltDflF/unPbX0EvKkjZFuOQY="; + hash = "sha256-Jynks+c8OV0t1GoKAk4vP9jYQ0PclJHl3x8q78au5gk="; }; propagatedBuildInputs = [ From baa890fcedd70ce0f1979f265277d05c936c412d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Jul 2022 09:49:37 +0000 Subject: [PATCH 008/113] python310Packages.pip-api: 0.0.29 -> 0.0.30 --- pkgs/development/python-modules/pip-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pip-api/default.nix b/pkgs/development/python-modules/pip-api/default.nix index 5e4412dcf857..fe7cc3ef7163 100644 --- a/pkgs/development/python-modules/pip-api/default.nix +++ b/pkgs/development/python-modules/pip-api/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pip-api"; - version = "0.0.29"; + version = "0.0.30"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9wFYTrHD4BAhyEb4nWKauTc7ZiTwYmdXd0rVT8TClXE="; + hash = "sha256-oF3yx6qbcVc3S89Cc1RCAaDHuuYKnGW8+E85We84lvM="; }; propagatedBuildInputs = [ From ed649931c580efb834cfbe89d320496b3b5444b8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Jul 2022 10:34:24 +0000 Subject: [PATCH 009/113] python310Packages.aioshelly: 2.0.0 -> 2.0.1 --- pkgs/development/python-modules/aioshelly/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index 6c6ba7e93ec6..69932532efa2 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "2.0.0"; + version = "2.0.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "home-assistant-libs"; repo = pname; - rev = version; - hash = "sha256-1bIlK/5UoGq6xTjcpkAkHPBlM+ifZhnbWzGbPRdFGkU="; + rev = "refs/tags/${version}"; + hash = "sha256-BUKuZza9Jer334LUmU5zmfjg1ISuxg7HETEbUMB80KY="; }; propagatedBuildInputs = [ From 2857f248c41d8a1754dd45c023fc5b48b2bc2c94 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Jul 2022 12:30:31 +0000 Subject: [PATCH 010/113] python310Packages.types-pytz: 2022.1.1 -> 2022.1.2 --- pkgs/development/python-modules/types-pytz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-pytz/default.nix b/pkgs/development/python-modules/types-pytz/default.nix index 2c7e5f73879c..fe533ab5ea3c 100644 --- a/pkgs/development/python-modules/types-pytz/default.nix +++ b/pkgs/development/python-modules/types-pytz/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-pytz"; - version = "2022.1.1"; + version = "2022.1.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-TnrdcIhtwu5u51NcgYSibusKyduvrpliy4gtdLn2czA="; + sha256 = "sha256-GoslwiXF5r2EaKqetF3dOzN/ZxbUByrQqk7x5BR47rw="; }; # Modules doesn't have tests From cc18e3ce0ea384905443a23bd0409a3707ebebf1 Mon Sep 17 00:00:00 2001 From: Izumi Raine <63145238+IzumiRaine@users.noreply.github.com> Date: Thu, 21 Jul 2022 18:13:01 +0200 Subject: [PATCH 011/113] anki-bin: 2.1.52 -> 2.1.54 --- pkgs/games/anki/bin.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix index 45ec432dc7ba..82064325ab5f 100644 --- a/pkgs/games/anki/bin.nix +++ b/pkgs/games/anki/bin.nix @@ -3,22 +3,22 @@ let pname = "anki-bin"; # Update hashes for both Linux and Darwin! - version = "2.1.52"; + version = "2.1.54"; sources = { linux = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-qt6.tar.zst"; - sha256 = "sha256-+eRflNMxutoSY9yQfnhIjfLg9b9CNv+7UuYyg4jgfK4="; + sha256 = "sha256-NFhgVd4ctEsh7iaSZ9v0OMszd81H41eq+y+FRIhcCtE="; }; # For some reason anki distributes completely separate dmg-files for the aarch64 version and the x86_64 version darwin-x86_64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-intel-qt6.dmg"; - sha256 = "sha256-keQxaf0KOQjCb22dQD/1VytW2fk35OPUJyJ42kaoAr8="; + sha256 = "sha256-kus59Z9Oe4sbAlF4szeg751hlSEUR0ijKz4rjfHEWgA="; }; darwin-aarch64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple-qt6.dmg"; - sha256 = "sha256-mYPSOjXh18nWpZjXLAjEodoxopr6rxadESMAf/t9SlI="; + sha256 = "sha256-ROIpGB3W21ttWj+cRkf0rpLFrO4LR6+ZyGRsalz5J+E="; }; }; From 077f3efe82baedcc2f2f31876f7d3d566d49ee42 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Jul 2022 18:50:31 +0000 Subject: [PATCH 012/113] python310Packages.types-requests: 2.28.2 -> 2.28.3 --- pkgs/development/python-modules/types-requests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index 90fd0a6bf413..a42ce6a71d79 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.28.2"; + version = "2.28.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-OY+IzZMCx5bLY9ECGvKh+3rlB3QaPVCO344HRtjBagQ="; + sha256 = "sha256-+56mkxF2aWf56RhhIR7HRJ9khAJbdm6nCWicDbsp17o="; }; propagatedBuildInputs = [ From 7e0d8135dd0877a0ce47d3b17fc055475f4a65ca Mon Sep 17 00:00:00 2001 From: Noah Fontes Date: Thu, 21 Jul 2022 13:05:57 -0700 Subject: [PATCH 013/113] mate: expose all packages in a scope MATE currently uses a scope, but it doesn't actually expose that scope to callers, which makes overriding packages in overlays quite difficult as you have to figure out where each package is plumbed through in the attrset. You end up with contrived expressions like: mate = super.mate // { # ... extraPackages = (self.lib.remove super.mate.whatever super.mate.extraPackages) ++ [ self.mate.whatever ]; }; This change exposes the scope so that we can use overrideScope' in overlays instead. --- pkgs/desktops/mate/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix index d52066be3f26..092d11346552 100644 --- a/pkgs/desktops/mate/default.nix +++ b/pkgs/desktops/mate/default.nix @@ -1,9 +1,7 @@ -{ pkgs, newScope }: +{ pkgs, lib }: let - callPackage = newScope self; - - self = rec { + packages = self: with self; { # Update script tailored to mate packages from git repository mateUpdateScript = { pname, version, odd-unstable ? true, rev-prefix ? "v", url ? null }: @@ -101,4 +99,4 @@ let }; -in self +in lib.makeScope pkgs.newScope packages From a62e7e74ee866d27b9e39865c2a5b346b5bd7666 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Jul 2022 22:00:55 +0000 Subject: [PATCH 014/113] python310Packages.icecream: 2.1.2 -> 2.1.3 --- pkgs/development/python-modules/icecream/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/icecream/default.nix b/pkgs/development/python-modules/icecream/default.nix index 81fd7c8a693a..45dc837665cf 100644 --- a/pkgs/development/python-modules/icecream/default.nix +++ b/pkgs/development/python-modules/icecream/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "icecream"; - version = "2.1.2"; + version = "2.1.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-CTALLRxnhxJBDL1HyVGY6xtYD2bzEaVUzNa551js4O4="; + sha256 = "sha256-CqSnwzdOw2FTodCPgeMIDoPYrB7v2X0vT+lUTo+bSd4="; }; propagatedBuildInputs = [ asttokens colorama executing pygments ]; From 63c871907375170d97e686d83b4360374231a374 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Jul 2022 23:55:58 +0000 Subject: [PATCH 015/113] python310Packages.plexapi: 4.11.2 -> 4.12.0 --- pkgs/development/python-modules/plexapi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index fcbb4925fc80..4ddd955cf4d0 100644 --- a/pkgs/development/python-modules/plexapi/default.nix +++ b/pkgs/development/python-modules/plexapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "plexapi"; - version = "4.11.2"; + version = "4.12.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pkkid"; repo = "python-plexapi"; - rev = version; - sha256 = "sha256-N4ic1DDMAHnHYYoD59ZHFqlgLlvFZV8Nn7V47NDXE5U="; + rev = "refs/tags/${version}"; + sha256 = "sha256-GtFAHNqneoWPCUegFDIpmeyuCsjwAx9o6t0ptGNLBeQ="; }; propagatedBuildInputs = [ From 532ed62cbe8b1bf05a05ae96d02e4f4d3b30ad18 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Jul 2022 00:45:19 +0000 Subject: [PATCH 016/113] python310Packages.plaid-python: 9.7.0 -> 9.8.0 --- pkgs/development/python-modules/plaid-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 44247bfdcc67..f4082ad41257 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "9.7.0"; + version = "9.8.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-yNjrWjlTF7cfEpFbPP6b/L6foNuhNa6JFNv6ImbAZ5k="; + hash = "sha256-iILDOpajLdTi+yPBNIr2+Sb1qBl0KCoSow2XBmDpFSI="; }; propagatedBuildInputs = [ From 0a44f5469566e1fcfb3334f3726ae1310f617f83 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Tue, 19 Jul 2022 13:28:45 -0700 Subject: [PATCH 017/113] ipxe: fix cross-compilation Tested x86_64 -> arm64 cross compilation, and testing booting via ipxe on an arm64 device. --- pkgs/tools/misc/ipxe/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index dacc3416c93e..03efc1b664c5 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, unstableGitUpdater +{ stdenv, lib, fetchFromGitHub, unstableGitUpdater, buildPackages , gnu-efi, mtools, openssl, perl, xorriso, xz , syslinux ? null , embedScript ? null @@ -32,6 +32,9 @@ stdenv.mkDerivation rec { version = "unstable-2022-04-06"; nativeBuildInputs = [ gnu-efi mtools openssl perl xorriso xz ] ++ lib.optional stdenv.hostPlatform.isx86 syslinux; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + + strictDeps = true; src = fetchFromGitHub { owner = "ipxe"; @@ -51,6 +54,7 @@ stdenv.mkDerivation rec { makeFlags = [ "ECHO_E_BIN_ECHO=echo" "ECHO_E_BIN_ECHO_E=echo" # No /bin/echo here. + "CROSS=${stdenv.cc.targetPrefix}" ] ++ lib.optional (embedScript != null) "EMBED=${embedScript}"; From fca7fb8305fe9170b4945df3cf17c8bde2727548 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Jul 2022 01:58:31 +0000 Subject: [PATCH 018/113] dcnnt: 0.7.0 -> 0.7.1 --- pkgs/servers/dcnnt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dcnnt/default.nix b/pkgs/servers/dcnnt/default.nix index a7759191a12a..07458c40b8f8 100644 --- a/pkgs/servers/dcnnt/default.nix +++ b/pkgs/servers/dcnnt/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "dcnnt"; - version = "0.7.0"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-LP3tOInpqVpO/BWla7/gZCGUUZ/1J8dHegGa0hRiRDQ="; + sha256 = "sha256-vKCQgg0m58hoN79WcZ4mM6bjCJOPxhAT4ifZ3b/5bkA="; }; propagatedBuildInputs = [ From 632970438c6b9e4ede220ff21250cd76fcb2c24c Mon Sep 17 00:00:00 2001 From: linsui Date: Fri, 22 Jul 2022 11:58:11 +0800 Subject: [PATCH 019/113] dotter: 0.12.11 -> 0.12.13 --- pkgs/tools/misc/dotter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/dotter/default.nix b/pkgs/tools/misc/dotter/default.nix index a160fb8b1c58..20699c52849f 100644 --- a/pkgs/tools/misc/dotter/default.nix +++ b/pkgs/tools/misc/dotter/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "dotter"; - version = "0.12.11"; + version = "0.12.13"; src = fetchFromGitHub { owner = "SuperCuber"; repo = "dotter"; rev = "v${version}"; - hash = "sha256-7K0p20FqaYFzOmUAeq1ousAPCeqE4AZoARF3UY4p4bY="; + hash = "sha256-j3Dj43AbD0V5pZ6mM1uvPsqWAVJrmWyWvwC5NK1cRRY="; }; - cargoHash = "sha256-BN6cdRmhvMjYQlaEa840+syuVKKUQ59TPMKicm40MTk="; + cargoHash = "sha256-HPs55JBbYObunU0cSm/7lsu/DOk4ne9Ea9MCRJ427zo="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; From 106a7250f83e6d3741c6ff8144b9126b8e652a47 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Jul 2022 04:06:21 +0000 Subject: [PATCH 020/113] python310Packages.pysigma: 0.6.6 -> 0.6.8 --- pkgs/development/python-modules/pysigma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix index d7deac2bc257..a125c68dbf98 100644 --- a/pkgs/development/python-modules/pysigma/default.nix +++ b/pkgs/development/python-modules/pysigma/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pysigma"; - version = "0.6.6"; + version = "0.6.8"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma"; rev = "refs/tags/v${version}"; - hash = "sha256-9t582CuDq7JeCcaPqWZGMUVLx8e78PygfNPp/s7rMA8="; + hash = "sha256-Jq37/9w1GHr+GZ8Fvftmfz2XkL3zUpTjbDlokrUoLtw="; }; nativeBuildInputs = [ From 347c8314795cbfb5ed5dbfae98c74310bd0fe18c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 22 Jul 2022 04:20:00 +0000 Subject: [PATCH 021/113] millet: fix hash upstream re tagged the commit --- pkgs/development/tools/millet/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/millet/default.nix b/pkgs/development/tools/millet/default.nix index 57dee6810940..d8e116ffcd1c 100644 --- a/pkgs/development/tools/millet/default.nix +++ b/pkgs/development/tools/millet/default.nix @@ -8,7 +8,7 @@ rustPlatform.buildRustPackage rec { owner = "azdavis"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+4lMRd4pzbkRDct5kz17MB9drN6sEtYLk29d6TlubLk="; + sha256 = "sha256-nFFgVvctkGCU0BOh8JWftw2pt0KP5bYh+uhm/LhdspQ="; }; cargoSha256 = "sha256-MoXKNUgNeg2AG7G78wnZvLXADhCsK/WB5WiT5lTSmIQ="; From 9f191401d42511748bee8e0bc1569273e36cd49b Mon Sep 17 00:00:00 2001 From: Mostly Void <7rat13@gmail.com> Date: Fri, 22 Jul 2022 09:36:23 +0530 Subject: [PATCH 022/113] wayshot: init at 1.1.9 --- pkgs/tools/misc/wayshot/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/misc/wayshot/default.nix diff --git a/pkgs/tools/misc/wayshot/default.nix b/pkgs/tools/misc/wayshot/default.nix new file mode 100644 index 000000000000..659ad3add410 --- /dev/null +++ b/pkgs/tools/misc/wayshot/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "wayshot"; + version = "1.1.9"; + + src = fetchFromGitHub { + owner = "waycrate"; + repo = pname; + rev = version; + hash = "sha256-4tzL/9p/qBCSWX+O7wZlKi9qb7mIt+hoxcQY7cWlFoU="; + }; + + cargoHash = "sha256-/FAI2VUoyQ1+3CuA7sEpeF5oeJdGB9CRZEp1leLnTh4="; + + meta = with lib; { + description = "A native, blazing-fast screenshot tool for wlroots based compositors such as sway and river"; + homepage = "https://github.com/waycrate/wayshot"; + license = licenses.bsd2; + maintainers = [ maintainers.dit7ya ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d9a2ab1bec3..637ce32c95c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27788,6 +27788,8 @@ with pkgs; waybar = callPackage ../applications/misc/waybar {}; + wayshot = callPackage ../tools/misc/wayshot { }; + wbg = callPackage ../applications/misc/wbg { }; hikari = callPackage ../applications/window-managers/hikari { From 163e97cf9b3d86061c00221b8292fb407c9ed020 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Jul 2022 04:48:35 +0000 Subject: [PATCH 023/113] python310Packages.motionblinds: 0.6.10 -> 0.6.11 --- pkgs/development/python-modules/motionblinds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/motionblinds/default.nix b/pkgs/development/python-modules/motionblinds/default.nix index 9ff4bc02e74e..e818b1d1e612 100644 --- a/pkgs/development/python-modules/motionblinds/default.nix +++ b/pkgs/development/python-modules/motionblinds/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "motionblinds"; - version = "0.6.10"; + version = "0.6.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "motion-blinds"; rev = "refs/tags/${version}"; - sha256 = "sha256-WCwj/2iUXOhmww4hiI5KPA7VyoVEYDeEMmnZM+DGHmc="; + sha256 = "sha256-LHZp5IXZqPYNwPlOQySwxon3uZX15caZvMeMY6QQIqk="; }; propagatedBuildInputs = [ From 8937f57f7e26267977b9325f85ca62164cce038d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Jul 2022 05:20:11 +0000 Subject: [PATCH 024/113] python310Packages.pysigma-backend-splunk: 0.3.4 -> 0.3.5 --- .../python-modules/pysigma-backend-splunk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pysigma-backend-splunk/default.nix b/pkgs/development/python-modules/pysigma-backend-splunk/default.nix index aa316a261753..7f7539973ab3 100644 --- a/pkgs/development/python-modules/pysigma-backend-splunk/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-splunk/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysigma-backend-splunk"; - version = "0.3.4"; + version = "0.3.5"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "SigmaHQ"; repo = "pySigma-backend-splunk"; - rev = "v${version}"; - hash = "sha256-zsX2lycqJKRASXio8s3Cvkt1yfnBm5cwQOFAFA891GI="; + rev = "refs/tags/v${version}"; + hash = "sha256-W6wnxQPrtMDG5jctB7CMXr4kPIhZievFTBJCeSeDCWw="; }; nativeBuildInputs = [ From 699484a3dfa61221fc9b94d301908a12b7b1d97c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Jul 2022 06:23:28 +0000 Subject: [PATCH 025/113] python310Packages.dvc-objects: 0.1.1 -> 0.1.4 --- pkgs/development/python-modules/dvc-objects/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvc-objects/default.nix b/pkgs/development/python-modules/dvc-objects/default.nix index d2256958313f..589ec159684f 100644 --- a/pkgs/development/python-modules/dvc-objects/default.nix +++ b/pkgs/development/python-modules/dvc-objects/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dvc-objects"; - version = "0.1.1"; + version = "0.1.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-s399GZ/ZuGQcV03NMJMUczEI00m8/xuuFJfzcjuV7T0="; + hash = "sha256-fFpRrFRa1VcVdc/uIJZ+DR74ivttRKkXgibXV3q72qY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From fd3eecd6b0e5d8283b00d8f289ebeed919507d60 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Jul 2022 09:41:55 +0000 Subject: [PATCH 026/113] python310Packages.pyinsteon: 1.1.3 -> 1.2.0 --- pkgs/development/python-modules/pyinsteon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix index caa84f7a6558..5340be273fc9 100644 --- a/pkgs/development/python-modules/pyinsteon/default.nix +++ b/pkgs/development/python-modules/pyinsteon/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyinsteon"; - version = "1.1.3"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-CYXsYOqh41qRob2DRxTB6zcc/jcdT9/vWJTRk2LJgWo="; + hash = "sha256-PMjvic+K/m7beavlZvGhJcizSNCzLPZYLm3P2V9EPLs="; }; propagatedBuildInputs = [ From a38928f186c199f8f249cab671acfef9b9c95d56 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Jul 2022 10:13:40 +0000 Subject: [PATCH 027/113] python310Packages.pydal: 20220720.1 -> 20220721.1 --- pkgs/development/python-modules/pydal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydal/default.nix b/pkgs/development/python-modules/pydal/default.nix index e06f23acd30e..8087c66bdb57 100644 --- a/pkgs/development/python-modules/pydal/default.nix +++ b/pkgs/development/python-modules/pydal/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pydal"; - version = "20220720.1"; + version = "20220721.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-cKw3thTqQWsTRqJQD9SyaBVBLM9YIqE/y/gIh4FL1bc="; + sha256 = "sha256-dOSTpK9HZFZL5/QWK/HTzPAgpsCSyj9r5a57cQpmlhY="; }; postPatch = '' From 5f66ce8d65128738bf07b9d68eb0011ace111a22 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Jul 2022 11:00:29 +0000 Subject: [PATCH 028/113] python310Packages.plugwise: 0.20.1 -> 0.21.0 --- pkgs/development/python-modules/plugwise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 8ebfd659b408..16f777aad94c 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.20.1"; + version = "0.21.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Sk7L0JPwn7IXVl5GeERxrG/vrHXeNwUjW1mgm4g40Ng="; + sha256 = "sha256-pw1apxqjKKv05Qw2VFN0cKit/3fas7PUb1wS/XsJruY="; }; propagatedBuildInputs = [ From f1fb190556ae7ed8e43c82dd10fb41de62a02bf9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Jul 2022 12:07:23 +0000 Subject: [PATCH 029/113] python310Packages.cyclonedx-python-lib: 2.6.0 -> 2.7.0 --- .../python-modules/cyclonedx-python-lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index 05cb491c14e2..fc275b16dfeb 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "2.6.0"; + version = "2.7.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-UM5z8FEu+Pua/LToraGh8N6V3ujUnu4F6lJec+4cUg4="; + hash = "sha256-Imn9wl5I7dzkUnVBzK2vhWOrf89FycVW4GvEYFeSujU="; }; nativeBuildInputs = [ From 24ec38e629b038cb99bcdc4f6692298f7b4e8c2f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Jul 2022 14:15:25 +0000 Subject: [PATCH 030/113] python310Packages.fastprogress: 1.0.2 -> 1.0.3 --- pkgs/development/python-modules/fastprogress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastprogress/default.nix b/pkgs/development/python-modules/fastprogress/default.nix index cd1b4e3bbacf..2ef751ad1b3b 100644 --- a/pkgs/development/python-modules/fastprogress/default.nix +++ b/pkgs/development/python-modules/fastprogress/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "fastprogress"; - version = "1.0.2"; + version = "1.0.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-lga6RCUFo6RFgdY97dzlv/HfF6y9w3JS98PxvlLB0kM="; + sha256 = "sha256-ehfStDiJD4OMBI7vzjLE3tRxl+zI6gQs7MM9PeuAIvU="; }; propagatedBuildInputs = [ numpy ]; From 4f006ccc5c975a41d651e3b9805b4ec93c5667c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Jul 2022 14:30:46 +0000 Subject: [PATCH 031/113] python310Packages.srsly: 2.4.3 -> 2.4.4 --- pkgs/development/python-modules/srsly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix index 7a2d6790b47d..5108f9ea5eaa 100644 --- a/pkgs/development/python-modules/srsly/default.nix +++ b/pkgs/development/python-modules/srsly/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "srsly"; - version = "2.4.3"; + version = "2.4.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-2+kfbdSuqegZSTYoNW3HFb2cYGSGKXu3yldI5uADhBw="; + hash = "sha256-6KBlgWJ7ZxLxnGAkG3wUwrspzobvBPeRN5p58bJJoSg="; }; nativeBuildInputs = [ cython ]; From a4e05bdc8a3742bcf85dde8eb04aae80a105636d Mon Sep 17 00:00:00 2001 From: Justinas Stankevicius Date: Fri, 22 Jul 2022 18:57:01 +0300 Subject: [PATCH 032/113] jellyfin-ffmpeg: 5.0.1-7 -> 5.0.1-8 --- pkgs/development/libraries/jellyfin-ffmpeg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix index 0f07c472c307..e2c692c84057 100644 --- a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix +++ b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix @@ -8,13 +8,13 @@ nv-codec-headers = nv-codec-headers-11; }).overrideAttrs (old: rec { pname = "jellyfin-ffmpeg"; - version = "5.0.1-7"; + version = "5.0.1-8"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-ffmpeg"; rev = "v${version}"; - sha256 = "sha256-jMd7tEEfiHqTp4q8c6EvbjL0KyJ6ucj4ZNrKOJLJ1Mc="; + sha256 = "sha256-zr1WuTkOBAVk7JkpDT52rfGGOaXEqiPFIGmJUDPhI/w="; }; postPatch = '' From 9ae26e798e3cba55d88189fa3023329839b1c9e0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Jul 2022 16:54:35 +0000 Subject: [PATCH 033/113] python310Packages.mailchecker: 4.1.17 -> 4.1.18 --- pkgs/development/python-modules/mailchecker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mailchecker/default.nix b/pkgs/development/python-modules/mailchecker/default.nix index ca5b0d3184e0..2f13ce79c96f 100644 --- a/pkgs/development/python-modules/mailchecker/default.nix +++ b/pkgs/development/python-modules/mailchecker/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "mailchecker"; - version = "4.1.17"; + version = "4.1.18"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NfgLI490/9YoHIXTVD890RTe+qP9rrwAFv8Xkc1IY5s="; + hash = "sha256-zBikruHBTXKK4Yk7euTp0lTcdCG5AQ/kMZrECAvQ7Zw="; }; # Module has no tests From 28746f92c9853c96531cb4f2894bf5fc42675e9b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Jul 2022 17:01:57 +0000 Subject: [PATCH 034/113] python310Packages.types-setuptools: 63.2.0 -> 63.2.1 --- pkgs/development/python-modules/types-setuptools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index fafb100aa8b3..fd1c98be2fa9 100644 --- a/pkgs/development/python-modules/types-setuptools/default.nix +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "63.2.0"; + version = "63.2.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/JpsR3ajmND1eyWcqJN0g0IXTFKjXVk9CLVvUqqZwaQ="; + sha256 = "sha256-KVekCt38pccSX9jThqnv2lN5CYxuZqCOAiV/0c6kITE="; }; # Module doesn't have tests From 95bf014f8803e3fd3cb738ad0553bbea109914c8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Jul 2022 17:27:14 +0000 Subject: [PATCH 035/113] python310Packages.pylink-square: 0.13.0 -> 0.14.1 --- pkgs/development/python-modules/pylink-square/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pylink-square/default.nix b/pkgs/development/python-modules/pylink-square/default.nix index 7da521ef48fe..9de892352760 100644 --- a/pkgs/development/python-modules/pylink-square/default.nix +++ b/pkgs/development/python-modules/pylink-square/default.nix @@ -11,15 +11,15 @@ buildPythonPackage rec { pname = "pylink-square"; - version = "0.13.0"; + version = "0.14.1"; format = "setuptools"; src = fetchFromGitHub { owner = "square"; repo = "pylink"; - rev = "v${version}"; - hash = "sha256-SH2oxOlsX5dE8wMXpWPA/rEVrJwxJzizsOiYbwaGjLw="; + rev = "refs/tags/v${version}"; + hash = "sha256-eCVNDPXtZAuzGb4ZOnjEmE1pKPOl52xRfZy+ppfxS3g="; }; propagatedBuildInputs = [ psutil six future ]; From 91e80ce0f4b0d0a096f1731abfe0884e42bcebac Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Fri, 22 Jul 2022 19:39:58 +0200 Subject: [PATCH 036/113] vscode-extensions.eamodio.gitlens: 12.1.1 -> 12.1.2 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 551d898cdf56..1e935993d232 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -783,8 +783,8 @@ let mktplcRef = { name = "gitlens"; publisher = "eamodio"; - version = "12.1.1"; - sha256 = "0i1wxgc61rrf11zff0481dg9s2lmv1ngpwx8nb2ygf6lh0axr7cj"; + version = "12.1.2"; + sha256 = "0wpmfrfpi6wl9v3dknx2qr2m74azpcw8bvhac21v67w6jxnl3jd9"; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog"; From ad3599c8066067e15ccc801bc9f064e7fbfaa311 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Fri, 22 Jul 2022 19:43:29 +0200 Subject: [PATCH 037/113] vscode-extensions.jock.svg: 1.4.17 -> 1.4.19 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 1e935993d232..e49a7a94e716 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1379,8 +1379,8 @@ let mktplcRef = { name = "svg"; publisher = "jock"; - version = "1.4.17"; - sha256 = "sha256-CDxh/YRyDGocxG4qOcyLXA0zHCg0YJ7XUu3OjFFjleI="; + version = "1.4.19"; + sha256 = "1yl5pxsayplkdqv5jipii7pyj85j2lc4zmibyr69470b6li264rq"; }; meta = with lib; { license = licenses.mit; From 35327dd5e7132ce4b0c2a9b4ee0aa496e42e8832 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Fri, 22 Jul 2022 19:44:40 +0200 Subject: [PATCH 038/113] vscode-extensions.ms-azuretools.vscode-docker: 1.22.0 -> 1.22.1 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index e49a7a94e716..d80d1f2b8c6e 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1648,8 +1648,8 @@ let mktplcRef = { name = "vscode-docker"; publisher = "ms-azuretools"; - version = "1.22.0"; - sha256 = "sha256-+cY9uLQ4oIk7V/4uCNc6BdIAQCXvPPGeqd0apbDjDos="; + version = "1.22.1"; + sha256 = "1ix363fjxi9g450rs3ghx44z3hppvasf0xpzgha93m90djd7ai52"; }; meta = { license = lib.licenses.mit; From 356b04671f92c40339be621e063976d882900f2f Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Fri, 22 Jul 2022 19:45:18 +0200 Subject: [PATCH 039/113] vscode-extensions.redhat.vscode-yaml: 1.7.0 -> 1.9.1 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index d80d1f2b8c6e..c22e92870504 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1859,8 +1859,8 @@ let mktplcRef = { name = "vscode-yaml"; publisher = "redhat"; - version = "1.7.0"; - sha256 = "1bbjpaypp0mq5akww5f0pkpq01j0xhhvkfr44f4lb2rdhr5nmnvc"; + version = "1.9.1"; + sha256 = "10m70sahl7vf8y82gqz9yk6bk4k4b923xn5rk7fax1nqw0pkln2w"; }; meta = { license = lib.licenses.mit; From 920fa3031d62d1fde3970efbc8f8d039ec1bc1ce Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Fri, 22 Jul 2022 19:45:52 +0200 Subject: [PATCH 040/113] vscode-extensions.pkief.material-icon-theme: 4.16.0 -> 4.19.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index c22e92870504..57cc9b89a7ad 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1915,8 +1915,8 @@ let mktplcRef = { name = "material-icon-theme"; publisher = "PKief"; - version = "4.16.0"; - sha256 = "sha256-AOHvWoVB26caNgEEnKBhw5Z/tRtaTSeVLkO6Rlc/kqo="; + version = "4.19.0"; + sha256 = "1azkkp4bnd7n8v0m4325hfrr6p6ikid88xbxaanypji25pnyq5a4"; }; meta = { license = lib.licenses.mit; From 9027613f4ae4d20a189336543df886965a67a398 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Fri, 22 Jul 2022 19:46:26 +0200 Subject: [PATCH 041/113] vscode-extensions.streetsidesoftware.code-spell-checker: 2.2.5 -> 2.3.1 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 57cc9b89a7ad..ae78faf900d4 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2248,8 +2248,8 @@ let mktplcRef = { name = "code-spell-checker"; publisher = "streetsidesoftware"; - version = "2.2.5"; - sha256 = "0ayhlzh3b2mcdx6mdj00y4qxvv6mirfpnp8q5zvidm6sv3vwlcj0"; + version = "2.3.1"; + sha256 = "0pm9i3zw4aa4qrcqnzb9bz166rl7p6nwb81m9rqzisdc85mx4s3x"; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; From 3f4624cf20e79446b93a71267b62321da0b35490 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Fri, 22 Jul 2022 19:46:57 +0200 Subject: [PATCH 042/113] vscode-extensions.wix.vscode-import-cost: 2.15.0 -> 3.3.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index ae78faf900d4..a21c27467af9 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2540,8 +2540,8 @@ let mktplcRef = { name = "vscode-import-cost"; publisher = "wix"; - version = "2.15.0"; - sha256 = "0d3b6654cdck1syn74vmmd1jmgkrw5v4c4cyrhdxbhggkip732bc"; + version = "3.3.0"; + sha256 = "0wl8vl8n0avd6nbfmis0lnlqlyh4yp3cca6kvjzgw5xxdc5bl38r"; }; meta = with lib; { license = licenses.mit; From eef8ecf0ab967ac31ad5e453e400a1ddc41f5af2 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Fri, 22 Jul 2022 19:56:22 +0200 Subject: [PATCH 043/113] spicetify-cli: 2.10.2 -> 2.11.1 --- pkgs/applications/misc/spicetify-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix index 4e540accce23..ab6d61f7dd26 100644 --- a/pkgs/applications/misc/spicetify-cli/default.nix +++ b/pkgs/applications/misc/spicetify-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.10.2"; + version = "2.11.1"; src = fetchFromGitHub { owner = "spicetify"; repo = pname; rev = "v${version}"; - sha256 = "sha256-chaCz4+RXPUP/MZymxA0h1ATuWYRgru3JMELiWPEBcE="; + sha256 = "sha256-NX3qbnnbV2mLxBQCjfl7xNicyir6usi2uYGw6Yij/ho="; }; vendorSha256 = "sha256-zYIbtcDM9iYSRHagvI9D284Y7w0ZxG4Ba1p4jqmQyng="; From a1bf8ce827fdd1996cc75f7971fcdb0f61336cad Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Fri, 22 Jul 2022 22:27:24 +0300 Subject: [PATCH 044/113] fava: 1.21 -> 1.22.1 --- pkgs/applications/office/fava/default.nix | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index c702c02c147a..e339b2a0c4bf 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -1,26 +1,15 @@ -{ lib, python3, fetchpatch }: +{ lib, python3 }: python3.pkgs.buildPythonApplication rec { pname = "fava"; - version = "1.21"; + version = "1.22.1"; format = "pyproject"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "sha256-0aFCKEjmXn6yddgNMi9t4rzqHcN7VBLoz3LEg9apmNY="; + sha256 = "sha256-gte1N43b9AokmEqONdvEcaGXDPIeGflsk+wuxDtTeR4="; }; - patches = [ - (fetchpatch { - # Update werkzeug compatibility - url = "https://github.com/beancount/fava/commit/5a99417a42e1d739b1e57fae2d01ff1d146dcbc2.patch"; - hash = "sha256-Y6IcxZAcFJEYgT8/xBIABdkP+pUdQX1EgSS5uNdSJUE="; - excludes = [ - ".pre-commit-config.yaml" - ]; - }) - ]; - nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; propagatedBuildInputs = with python3.pkgs; [ From e4c840d4425e2da51155132eaf96fcff1655b019 Mon Sep 17 00:00:00 2001 From: Craftman7 Date: Fri, 22 Jul 2022 13:03:34 -0700 Subject: [PATCH 045/113] exodus: 22.6.17 -> 22.7.15 --- pkgs/applications/blockchains/exodus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index 3a8554470566..064b8a2d489e 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -4,11 +4,11 @@ cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core, libxkbcommon, mesa }: stdenv.mkDerivation rec { pname = "exodus"; - version = "22.6.17"; + version = "22.7.15"; src = fetchurl { url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip"; - sha256 = "1gllmrmc1gylw54yrgy1ggpn3kvkyxf7ydjvd5n5kvd8d9xh78ng"; + sha256 = "sha256-tQwxzhy+d2hA7VvZB9qSF7uaYIffAyX9ovZYQ8HDEB8="; }; sourceRoot = "."; From cb608633e866c6cefaedd02eb36d0708938cf50a Mon Sep 17 00:00:00 2001 From: Philipp Date: Fri, 22 Jul 2022 23:21:13 +0200 Subject: [PATCH 046/113] mtxclient: 0.7.0 -> 0.8.0 --- pkgs/development/libraries/mtxclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index 619ed721dff2..81b84e1a11fe 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mtxclient"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "mtxclient"; rev = "v${version}"; - sha256 = "sha256-iGw+qdw7heL5q7G0dwtl4PX2UA0Kka0FUmH610dM/00="; + sha256 = "sha256-SQoPeUdDNQU4qYDd8udQnIJ6PrZFtEOmf9uqnw1+fz4="; }; postPatch = '' From a3aef504aa0b66eeae2bad25aa32b8046d207f19 Mon Sep 17 00:00:00 2001 From: Philipp Date: Fri, 22 Jul 2022 23:21:36 +0200 Subject: [PATCH 047/113] nheko: 0.9.3 -> 0.10.0 --- .../networking/instant-messengers/nheko/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 750511ebf152..d3a7abae8205 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -33,13 +33,13 @@ mkDerivation rec { pname = "nheko"; - version = "0.9.3"; + version = "0.10.0"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "nheko"; rev = "v${version}"; - sha256 = "sha256-h1Yahz7Rt7+r55RFTSVj6E14nWnjCs0CecljceaWgaQ="; + sha256 = "sha256-JNAI1+GmRgee7bqeJi8JadV3W7vXMpEvvKqqinb97Ng="; }; nativeBuildInputs = [ From c8d7f30927e94a80fd4084ea188a68d1efc2bac8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Jul 2022 00:26:01 +0000 Subject: [PATCH 048/113] python310Packages.hahomematic: 2022.7.11 -> 2022.7.12 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 1c79ef3c7642..43a349c8f2eb 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2022.7.11"; + version = "2022.7.12"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-BR92UGcmNWwQWZFK40rnkYvNbRoL2AYod4oozYXLSuM="; + sha256 = "sha256-9ErXsJUFM0Us9ChkYvpa2bNEy3CBJwfYAz4vnk2wu4Q="; }; propagatedBuildInputs = [ From 61aeb83a5b8edfccf06a148d97978862c56c5a5e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Jul 2022 01:58:59 +0000 Subject: [PATCH 049/113] python310Packages.twilio: 7.11.0 -> 7.12.0 --- pkgs/development/python-modules/twilio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 2b85e9ef8bdf..8c0a1f7fc2f2 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "7.11.0"; + version = "7.12.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-JeguDPbsG3aeXDqqojfJHGpDVniY+IvWMD2GCgCUvuQ="; + hash = "sha256-/ni7QwBJTLc9hZPFg6wPskwuqmyKS4MHr+r7d/i87Mc="; }; propagatedBuildInputs = [ From 8ea2c95ad8bec664a6400084602251696b2945b5 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 23 Jul 2022 10:43:23 -0500 Subject: [PATCH 050/113] postgresqlPackages.postgis: 3.2.1 -> 3.2.2 --- pkgs/servers/sql/postgresql/ext/postgis.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index d0dfa5d00f56..d8373f598484 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation rec { pname = "postgis"; - version = "3.2.1"; + version = "3.2.2"; outputs = [ "out" "doc" ]; src = fetchurl { url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"; - sha256 = "sha256-+6to3ebKOTSyS6CMirDP8llPV/k96rQaFcgq4btpiT4="; + sha256 = "sha256-GM89AT9FsaqO1Z14vHB+nhJeJQ2PBhU5aum/4918PXw="; }; buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ] From b6d808aa846968acc98afa74c2ff4c456f1ecb8f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 23 Jul 2022 04:20:00 +0000 Subject: [PATCH 051/113] certigo: 1.15.1 -> 1.16.0 https://github.com/square/certigo/releases/tag/v1.16.0 --- pkgs/tools/admin/certigo/default.nix | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/pkgs/tools/admin/certigo/default.nix b/pkgs/tools/admin/certigo/default.nix index d2914dbf95ae..792fed6e35d7 100644 --- a/pkgs/tools/admin/certigo/default.nix +++ b/pkgs/tools/admin/certigo/default.nix @@ -1,31 +1,17 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, fetchpatch }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "certigo"; - version = "1.15.1"; + version = "1.16.0"; src = fetchFromGitHub { owner = "square"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XGR6xIXdFLnJTFd+mJneRb/WkLmi0Jscta9Bj3paM1M="; + sha256 = "sha256-+j1NeQJPDwQxXVYnHNmL49Li2IMH+9ehS0HSM3kqyxU="; }; - patches = [ - (fetchpatch { - name = "backport_TestConnect-Apple-Fixes.patch"; - url = "https://github.com/square/certigo/commit/5332ac7ca20bdea63657cc8319e8b8fda4326938.patch"; - sha256 = "sha256-mSNuiui2dxkXnCrXJ/asIzC8F1mtPecOVOIu6mE5jq4="; - }) - - (fetchpatch { - name = "backport_TestConnect-Expected-CipherSuite-Fixes.patch"; - url = "https://github.com/square/certigo/commit/7ef0417bde4aafc69cbb72f0dd6d3577a56054a1.patch"; - sha256 = "sha256-TUQ8B23HKheaPUjj4NkvjmZBAAhDNTyo2c8jf4qukds="; - }) - ]; - - vendorSha256 = "sha256-qS/tIi6umSuQcl43SI4LyL0k5eWfRWs7kVybRPGKcbs="; + vendorSha256 = "sha256-G9YpMF4qyL8eJPnai81ihVTDK9E4meKxdpk+rjISnIM="; meta = with lib; { description = "A utility to examine and validate certificates in a variety of formats"; From c748802922909f902da2b89bf8a2a004218fd0ed Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 23 Jul 2022 04:20:00 +0000 Subject: [PATCH 052/113] postgresqlPackages.pgroonga: 2.3.6 -> 2.3.7 --- pkgs/servers/sql/postgresql/ext/pgroonga.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 6d34900deebf..5d69e312f5bf 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgroonga"; - version = "2.3.6"; + version = "2.3.7"; src = fetchurl { url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-/GimaiFuMEuw4u9if3Z//1KPT78rvaJ+jNjbG3ugkLA="; + sha256 = "sha256-EodqpYF3wJJdgzHZHqmY0tsrF2YnGirnQWCWaDZ9v8E="; }; nativeBuildInputs = [ pkg-config ]; From 3a66ca46a0f6143b5aa5c29bfef316c0f0eb480c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 23 Jul 2022 04:20:00 +0000 Subject: [PATCH 053/113] terracognita: 0.7.4 -> 0.7.6 --- pkgs/development/tools/misc/terracognita/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/terracognita/default.nix b/pkgs/development/tools/misc/terracognita/default.nix index b3fd7a54ec0b..0ca36d896dec 100644 --- a/pkgs/development/tools/misc/terracognita/default.nix +++ b/pkgs/development/tools/misc/terracognita/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terracognita"; - version = "0.7.4"; + version = "0.7.6"; src = fetchFromGitHub { owner = "cycloidio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QaJoHnuzSQXxEuGpui9lyKAjT2wdz4XmMAh5cAOKvBg="; + sha256 = "sha256-9t3W/mHXXl8Sw/2iQ5D3U66LiO+/mQ56K+ihJCO4au4="; }; - vendorSha256 = "sha256-HcUH3cnaeyB2XnfcRLulsRcHaCwdLkiIb518Ucl2tv8="; + vendorSha256 = "sha256-JkgkBxeUUQBb+VQzhovH5MnVwdxplKMVCGs4CX/fZlY="; doCheck = false; From 8aebac5ecad3f1a68b9f1968345ca7eaf2c0122d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 23 Jul 2022 04:20:00 +0000 Subject: [PATCH 054/113] watchexec: 1.19.0 -> 1.20.4 --- pkgs/tools/misc/watchexec/default.nix | 12 +++++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix index d54e906f347e..6fa707b521f3 100644 --- a/pkgs/tools/misc/watchexec/default.nix +++ b/pkgs/tools/misc/watchexec/default.nix @@ -1,21 +1,23 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, CoreServices, Foundation, installShellFiles, libiconv }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, Cocoa, AppKit, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "watchexec"; - version = "1.19.0"; + version = "1.20.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "cli-v${version}"; - sha256 = "sha256-Zqu6Qor7kHSeOFyHjcrl6RhB8gL9pljHt7hEd6/0Kss="; + sha256 = "sha256-se3iqz+qjwf71wvHQhCWYryEdUc+kY0Q0ZTg4i1ayNI="; }; - cargoSha256 = "sha256-XwgoYaqgDkNggzi2TL/JPfh8LSFSzSWOVMbkmhXX73I="; + cargoSha256 = "sha256-YM+Zm3wFp3Lsx5LmyjGwZywV/SZjriL6JMDO1l0tNf4="; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Foundation libiconv ]; + buildInputs = lib.optionals stdenv.isDarwin [ Cocoa AppKit ]; + + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework AppKit"; checkFlags = [ "--skip=help" "--skip=help_short" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f08816c0ba8..01e779306d1c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11672,7 +11672,7 @@ with pkgs; wander = callPackage ../tools/admin/wander { }; watchexec = callPackage ../tools/misc/watchexec { - inherit (darwin.apple_sdk.frameworks) CoreServices Foundation; + inherit (darwin.apple_sdk.frameworks) Cocoa AppKit; }; watchlog = callPackage ../tools/misc/watchlog { }; From ffdf4f9d5f127fde5d6b818cea32bb2466e48a8a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 23 Jul 2022 06:34:50 +0200 Subject: [PATCH 055/113] grafana: 9.0.3 -> 9.0.4 ChangeLog: https://github.com/grafana/grafana/releases/tag/v9.0.4 --- pkgs/servers/monitoring/grafana/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index eda6b1ec9571..a695698c15ab 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "9.0.3"; + version = "9.0.4"; excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ]; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-oFVAiQt+ZxLB1On1wKM2R2qTEl5zBbWpkvBOLQ081+A="; + sha256 = "sha256-V28wUkgWLUTRBNbx5xAdLUcFGU2DQ5Az5SSIJPv393U="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-l2XTC0OxIeUD4sjM4w9WsT9s5akGjWpFmnZnmI/vSEA="; + sha256 = "sha256-UU/THOSYJfbgx/Mn3rMZiODeHX4I6l/7Kpg5mBq5FUI="; }; - vendorSha256 = "sha256-ncMIu6J7D3xflZSxf8txpaQd0YW62CtzcO5w/PUE1UU="; + vendorSha256 = "sha256-6Z1qvn5HTybKAjsst8kSGYCbEIBsPyhNswVGGiMD9B8="; nativeBuildInputs = [ wire ]; From dbddcbb2ef6e7e9184d17d230f1221a0fbbc7313 Mon Sep 17 00:00:00 2001 From: Kevin Griffin Date: Sat, 23 Jul 2022 15:56:45 +0900 Subject: [PATCH 056/113] _1password: 2.5.1 -> 2.6.0 Also addresses hash mismatch on Darwin. --- pkgs/applications/misc/1password/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 0d18b3dd37a3..72f4120cfc04 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -12,12 +12,12 @@ let if extension == "zip" then fetchzip args else fetchurl args; pname = "1password-cli"; - version = "2.5.1"; + version = "2.6.0"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-HZ6AVheJrw9ZR9HGWbB6/kCzbrfYcwApa2z18tDBo1k=" "zip"; - i686-linux = fetch "linux_386" "sha256-aG6oW0epF+P9pSWMlTStSbBynBDkGX1B+0NHUnwLRhs=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-7GkBVcvXM/WZiXEiIbYh9lS0f4BS4Hc4RCVjr8FoW8A=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-XebD33fX15RsFUdbV+DvMRIi1MSyMfIRC3JOwcmi8kk=" "pkg"; + aarch64-linux = fetch "linux_arm64" "sha256-2V3/F7/HEOvk2T1dv4rnS0xu6Z5EqGSV/9erED7ZS1w=" "zip"; + i686-linux = fetch "linux_386" "sha256-z4pKZY5DQ2oDHHuet1S/p7GM+rXS8/8xmTrN+rqCUBo=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-1/DgwHMkUenj+2ZyADeBK1HJ3M/b2PoAey36eAqAUSQ=" "zip"; + aarch64-darwin = fetch "apple_universal" "sha256-YPidRXNzNNuDoM2Gd5dEsCDxwosBJFKSzjoP0SPkQZs=" "pkg"; x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; From d915c3746d707844a2d05ec4cfa8758b72e91ff0 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Sat, 23 Jul 2022 15:28:26 +0800 Subject: [PATCH 057/113] cargo-make: 0.35.13 -> 0.35.15 --- pkgs/development/tools/rust/cargo-make/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index 59ea51406ce0..f39cbfea08f3 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.35.13"; + version = "0.35.15"; src = fetchCrate { inherit pname version; - sha256 = "sha256-rkE/GLFZP1C5C4s6ghbfsJY92Wu3ku27VRorU/ZGelA="; + sha256 = "sha256-fHW3ypi/BlfDybhnHOmPoBlyMdf3ZK7pOnH35cvhhRU="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; - cargoSha256 = "sha256-GSHbs8GUHqFrBN1Op6Uh4fPzXEjSkX+a6beBQxS19K8="; + cargoSha256 = "sha256-Az7A0VMlWv34uUeM0TH7tT5FPja/j0x6aoF7qDw8JCs="; # Some tests fail because they need network access. # However, Travis ensures a proper build. From 272768d5b8f6d8980c0fb893ca00774c729b82ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Jul 2022 08:17:02 +0000 Subject: [PATCH 058/113] python310Packages.adafruit-platformdetect: 3.25.0 -> 3.26.0 --- .../python-modules/adafruit-platformdetect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index c5d1d1b9e88d..d4e94a4c72d8 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.25.0"; + version = "3.26.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - hash = "sha256-8K8OKHxuPG5bibb49Epgv9lMuZ7Ipk9753sI22e6j24="; + hash = "sha256-lkzTJfjJNKsMmLet9VXv5Ao8+Dks4P0+0nRpWHHs3G0="; }; nativeBuildInputs = [ From a070b2e8737b9d481b0b10dccc701e06827d2480 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Wed, 20 Jul 2022 15:28:47 +0200 Subject: [PATCH 059/113] uniffi-bindgen: add update script --- .../tools/uniffi-bindgen/default.nix | 2 ++ .../tools/uniffi-bindgen/update.sh | 35 +++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100755 pkgs/development/tools/uniffi-bindgen/update.sh diff --git a/pkgs/development/tools/uniffi-bindgen/default.nix b/pkgs/development/tools/uniffi-bindgen/default.nix index 1073152732e0..d30e09b8e94b 100644 --- a/pkgs/development/tools/uniffi-bindgen/default.nix +++ b/pkgs/development/tools/uniffi-bindgen/default.nix @@ -35,6 +35,8 @@ rustPlatform.buildRustPackage rec { --suffix PATH : ${lib.strings.makeBinPath [ rustfmt ktlint yapf rubocop ] } ''; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "Toolkit for building cross-platform software components in Rust"; homepage = "https://mozilla.github.io/uniffi-rs/"; diff --git a/pkgs/development/tools/uniffi-bindgen/update.sh b/pkgs/development/tools/uniffi-bindgen/update.sh new file mode 100755 index 000000000000..4815f6eedd6d --- /dev/null +++ b/pkgs/development/tools/uniffi-bindgen/update.sh @@ -0,0 +1,35 @@ +#!/usr/bin/env nix-shell +#! nix-shell -p nix cargo rsync nix-update +#! nix-shell -i bash + +set -euo pipefail + +if [[ -z "${UPDATE_NIX_ATTR_PATH+x}" ]]; then + echo "Error: run the following command from nixpkgs root:" >&2 + echo " nix-shell maintainers/scripts/update.nix --argstr package uniffi-bindgen" >&2 + exit 1 +fi + +targetLockfile="$(dirname "$0")/Cargo.lock" + +# Update version and hash +nix-update "$UPDATE_NIX_ATTR_PATH" + +# Update lockfile through `cargo update` +src=$(nix-build -A "${UPDATE_NIX_ATTR_PATH}.src" --no-out-link) + +tmp=$(mktemp -d) + +cleanup() { + echo "Removing $tmp" >&2 + rm -rf "$tmp" +} + +trap cleanup EXIT + +rsync -a --chmod=ugo=rwX "$src/" "$tmp" + +pushd "$tmp" +cargo update +cp "Cargo.lock" "$targetLockfile" +popd From e2759f1b17b117f4b9c7cf19035d3a6f03b34b8e Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Wed, 20 Jul 2022 13:19:42 +0200 Subject: [PATCH 060/113] uniffi-bindgen: use `cargoLock.lockFile` --- pkgs/development/tools/uniffi-bindgen/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/uniffi-bindgen/default.nix b/pkgs/development/tools/uniffi-bindgen/default.nix index d30e09b8e94b..28ecc281a14e 100644 --- a/pkgs/development/tools/uniffi-bindgen/default.nix +++ b/pkgs/development/tools/uniffi-bindgen/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-A6Zd1jfhoR4yW2lT5qYE3vJTpiJc94pK/XQmfE2QLFc="; }; - cargoLock.lockFileContents = builtins.readFile ./Cargo.lock; + cargoLock.lockFile = ./Cargo.lock; cargoBuildFlags = [ "-p uniffi_bindgen" ]; cargoTestFlags = [ "-p uniffi_bindgen" ]; From 54173e95c3b09ee85f2cc7fec75740f28a440a69 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Jul 2022 08:45:48 +0000 Subject: [PATCH 061/113] python310Packages.tatsu: 5.8.1 -> 5.8.2 --- pkgs/development/python-modules/tatsu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tatsu/default.nix b/pkgs/development/python-modules/tatsu/default.nix index 2bbd7dd532f9..fae42ac5914e 100644 --- a/pkgs/development/python-modules/tatsu/default.nix +++ b/pkgs/development/python-modules/tatsu/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "tatsu"; - version = "5.8.1"; + version = "5.8.2"; # upstream only supports 3.10+ disabled = pythonOlder "3.10"; @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "neogeny"; repo = "TatSu"; rev = "refs/tags/v${version}"; - sha256 = "sha256-2zEpP1WATqzAo0HsBGdjjk/RoliyIim1OltPoJTlxIU="; + sha256 = "sha256-eJJ438zjXRZ7dk36RPkFvhcIA5RYo5MsjptZIpjCrVI="; }; nativeBuildInputs = [ pytest-runner ]; From 29107c388ab49aea062d272fba2ca4bf9b44e3d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Sat, 23 Jul 2022 20:17:46 +1000 Subject: [PATCH 062/113] rbspy: fix compilation with rust 1.62 --- pkgs/development/tools/rbspy/default.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/rbspy/default.nix b/pkgs/development/tools/rbspy/default.nix index fbd97882428f..4e7135233baa 100644 --- a/pkgs/development/tools/rbspy/default.nix +++ b/pkgs/development/tools/rbspy/default.nix @@ -1,4 +1,11 @@ -{ stdenv, rustPlatform, fetchFromGitHub, lib, ruby, which}: +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, fetchpatch +, ruby +, which +}: rustPlatform.buildRustPackage rec { pname = "rbspy"; version = "0.12.1"; @@ -13,6 +20,15 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "98vmUoWSehX/9rMlHNSvKHJvJxW99pOhS08FI3OeLGo="; doCheck = true; + patches = [ + # Backport rust 1.62 support. Should be removed in the next rbspy release. + (fetchpatch { + name = "rust-1.62.patch"; + url = "https://github.com/rbspy/rbspy/commit/f5a8eecfbf2ad0b3ff9105115988478fb760d54d.patch"; + sha256 = "sha256-+04rvEXU7/lx5IQkk3Bhe+KLN8PwxZ0j4nH5ySnS154="; + }) + ]; + # Tests in initialize.rs rely on specific PIDs being queried and attaching # tracing to forked processes, which don't work well with the isolated build. preCheck = '' From 217e40ec41eee9c115128d80f9ec0c0cee965917 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sat, 23 Jul 2022 12:25:22 +0100 Subject: [PATCH 063/113] _7zz: improve update.sh script --- pkgs/tools/archivers/7zz/update.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/archivers/7zz/update.sh b/pkgs/tools/archivers/7zz/update.sh index bbc9804799ab..1a6d38ea6097 100755 --- a/pkgs/tools/archivers/7zz/update.sh +++ b/pkgs/tools/archivers/7zz/update.sh @@ -1,13 +1,14 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p coreutils gnused curl jq +#! nix-shell -i bash -p coreutils gnused curl jq nix-prefetch set -euo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" DRV_DIR="$PWD" OLD_VERSION="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" - -NEW_VERSION="$(curl "https://sourceforge.net/projects/sevenzip/best_release.json" | jq '.platform_releases.linux.filename' -r | cut -d/ -f3)" +# The best_release.json is not always up-to-date +# In those cases you can force the version by calling `./update.sh ` +NEW_VERSION="${1:-$(curl 'https://sourceforge.net/projects/sevenzip/best_release.json' | jq '.platform_releases.linux.filename' -r | cut -d/ -f3)}" echo "comparing versions $OLD_VERSION => $NEW_VERSION" if [[ "$OLD_VERSION" == "$NEW_VERSION" ]]; then From 2458b102be66712cfcd7dccfa46e5de0dc7920cd Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sat, 23 Jul 2022 12:25:57 +0100 Subject: [PATCH 064/113] _7zz: 22.00 -> 22.01 --- pkgs/tools/archivers/7zz/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/archivers/7zz/default.nix b/pkgs/tools/archivers/7zz/default.nix index 4f41a09304fb..0c8c6ed5d3ad 100644 --- a/pkgs/tools/archivers/7zz/default.nix +++ b/pkgs/tools/archivers/7zz/default.nix @@ -26,13 +26,13 @@ let in stdenv.mkDerivation rec { pname = "7zz"; - version = "22.00"; + version = "22.01"; src = fetchurl { url = "https://7-zip.org/a/7z${lib.replaceStrings [ "." ] [ "" ] version}-src.tar.xz"; hash = { - free = "sha256-QzGZgPxHobGwstFfVRtb4V+hqMM7dMIy2/EZcJ2aZe8="; - unfree = "sha256-QJafYB6Gr/Saqgug31zm/Tl89+JoOoS1kbAIHkYe9nU="; + free = "sha256-mp3cFXOEiVptkUdD1+X8XxwoJhBGs+Ns5qk3HBByfLg="; + unfree = "sha256-OTCYcwxwBCOSr4CJF+dllF3CQ33ueq48/MSWbrkg+8U="; }.${if enableUnfree then "unfree" else "free"}; downloadToTemp = (!enableUnfree); # remove the unRAR related code from the src drv From 01d30cca0e3568f0321205e1e03c83060f6e745d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Jul 2022 11:27:23 +0000 Subject: [PATCH 065/113] python310Packages.homematicip: 1.0.5 -> 1.0.6 --- pkgs/development/python-modules/homematicip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/homematicip/default.nix b/pkgs/development/python-modules/homematicip/default.nix index 2330a356dd89..df9bf4d718a6 100644 --- a/pkgs/development/python-modules/homematicip/default.nix +++ b/pkgs/development/python-modules/homematicip/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "homematicip"; - version = "1.0.5"; + version = "1.0.6"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "hahn-th"; repo = "homematicip-rest-api"; rev = "refs/tags/${version}"; - hash = "sha256-pfVjnRO6iKEgLDQz4JMARzab21XLbbUDUMyMWatGlJ8="; + hash = "sha256-z27VGApm5VsDm6VG0DaDOmhFrvRhLLINHtSM/cIiXyY="; }; propagatedBuildInputs = [ From 071f18d7cd7d05a29c6d4ec105cdfecee6d5dbe5 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sat, 23 Jul 2022 13:51:48 +0200 Subject: [PATCH 066/113] pt2-clone: 1.49 -> 1.50 --- pkgs/applications/audio/pt2-clone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index 70c6dd12ed84..c51d50fdc42b 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.49"; + version = "1.50"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "sha256-mE7mcaQCJlMzFTec9/faTyIZ7aoA4ygn60wS5QgVF7k="; + sha256 = "sha256-IZakhYVtVXmcKwUMl/v1w6Huu5XWQfaBCatTN4hQAbM="; }; nativeBuildInputs = [ cmake ]; From 3b1ea472d3d535dbaec7a8d62afcb6324d69680f Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sat, 23 Jul 2022 13:58:04 +0200 Subject: [PATCH 067/113] ft2-clone: 1.55 -> 1.56 --- pkgs/applications/audio/ft2-clone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index addc9313527a..f6a1ef821b5d 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.55"; + version = "1.56"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "sha256-qk6SHL9K4+9Em1jjrPOm14msOoqRiAahlRoiRiAMLC0="; + sha256 = "sha256-kSnsep6abE07Q1EpGEeX8e/2APc60TxR2MhLZxqW9WY="; }; # Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh) From 65399c47424c7b33d90c6a3b581b38ed2f66b859 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 23 Jul 2022 13:57:25 +0200 Subject: [PATCH 068/113] nixos/syncthing: don't leak the secret API key in process listings --- nixos/modules/services/networking/syncthing.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index 0f697c0cc255..66b85cd9d8a9 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -30,15 +30,22 @@ let updateConfig = pkgs.writers.writeDash "merge-syncthing-config" '' set -efu + # be careful not to leak secrets in the filesystem or in process listings + + umask 0077 + # get the api key by parsing the config.xml while - ! api_key=$(${pkgs.libxml2}/bin/xmllint \ + ! ${pkgs.libxml2}/bin/xmllint \ --xpath 'string(configuration/gui/apikey)' \ - ${cfg.configDir}/config.xml) + ${cfg.configDir}/config.xml \ + >"$RUNTIME_DIRECTORY/api_key" do sleep 1; done + (printf "X-API-Key: "; cat "$RUNTIME_DIRECTORY/api_key") >"$RUNTIME_DIRECTORY/headers" + curl() { - ${pkgs.curl}/bin/curl -sSLk -H "X-API-Key: $api_key" \ + ${pkgs.curl}/bin/curl -sSLk -H "@$RUNTIME_DIRECTORY/headers" \ --retry 1000 --retry-delay 1 --retry-all-errors \ "$@" } @@ -576,6 +583,7 @@ in { serviceConfig = { User = cfg.user; RemainAfterExit = true; + RuntimeDirectory = "syncthing-init"; Type = "oneshot"; ExecStart = updateConfig; }; From 83e1754b23c3f9561a0753fc3a9d84d0549a0f8a Mon Sep 17 00:00:00 2001 From: Mostly Void <7rat13@gmail.com> Date: Sat, 23 Jul 2022 10:33:31 +0530 Subject: [PATCH 069/113] autotiling-rs: init at 0.1.3 --- pkgs/misc/autotiling-rs/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/misc/autotiling-rs/default.nix diff --git a/pkgs/misc/autotiling-rs/default.nix b/pkgs/misc/autotiling-rs/default.nix new file mode 100644 index 000000000000..6e0ffebf0323 --- /dev/null +++ b/pkgs/misc/autotiling-rs/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "autotiling-rs"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "ammgws"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-LQbmF2M6pWa0QEbKF770x8TFLMGrJeq5HnXHvLrDDPA="; + }; + + cargoHash = "sha256-wot5GKBA2TBrA/jnWD0eypPRqUodmk/TJlYJMl3/gm4="; + + meta = with lib; { + description = "Autotiling for sway (and possibly i3)"; + homepage = "https://github.com/ammgws/autotiling-rs"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d9a2ab1bec3..6e05434034fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34480,6 +34480,8 @@ with pkgs; autotiling = python3Packages.callPackage ../misc/autotiling { }; + autotiling-rs = callPackage ../misc/autotiling-rs { }; + avell-unofficial-control-center = python3Packages.callPackage ../applications/misc/avell-unofficial-control-center { }; beep = callPackage ../misc/beep { }; From 69036df904c92bdd73bf3e689956dcbcdd02045c Mon Sep 17 00:00:00 2001 From: Minijackson Date: Sat, 23 Jul 2022 15:26:13 +0200 Subject: [PATCH 070/113] carla: 2.4.3 -> 2.5.0 --- pkgs/applications/audio/carla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index 9e4e6a2880d0..291c3875cea8 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -15,13 +15,13 @@ assert withGtk3 -> gtk3 != null; stdenv.mkDerivation rec { pname = "carla"; - version = "2.4.3"; + version = "2.5.0"; src = fetchFromGitHub { owner = "falkTX"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FAQTIM5NpcOhLNMf62qiKaxg6QtK5uIJF/XT6KJVnUc="; + sha256 = "sha256-KcwEuiy58wjTr+RWPmpMaPgM0olzxiWp9MMYiKwmIcI="; }; nativeBuildInputs = [ From 3fd4bfbee719ad38d96048e0cb7fc311c698c806 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sat, 23 Jul 2022 15:45:44 +0200 Subject: [PATCH 071/113] faircamp: unstable-2022-03-20 -> unstable-2022-07-22 --- pkgs/applications/misc/faircamp/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/faircamp/default.nix b/pkgs/applications/misc/faircamp/default.nix index ef82703ac4cf..2113d53595da 100644 --- a/pkgs/applications/misc/faircamp/default.nix +++ b/pkgs/applications/misc/faircamp/default.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage { pname = "faircamp"; - version = "unstable-2022-03-20"; + version = "unstable-2022-07-22"; # TODO when switching to a stable release, use fetchFromGitea and add a # version test. Meanwhile, fetchgit is used to make unstableGitUpdater work. src = fetchgit { url = "https://codeberg.org/simonrepp/faircamp.git"; - rev = "863cecb468a58a774bd2d1d93f99f3c8ecd8205c"; - sha256 = "sha256-JodIo601BYesbiHarnBk4/GuFR/bpCswxQbaysRP+CI="; + rev = "4803b6e0b59c1fc9922d1e498743a0171d7f324d"; + sha256 = "sha256-VliBGYZPoX65JURlBaVMCMB5DuE/gqr27KcEzAVRFxc="; }; - cargoHash = "sha256-XqsUUc+s01t4KHtktbNhm52r0NeLbcBg5DVw3Xn0oZk="; + cargoHash = "sha256-fs7CXw6CS+TtMxLtDaQiYY6fiBFl4RCttymQJDAm6dg="; nativeBuildInputs = [ makeWrapper From ae74cf3bb5b00801c6b34a0d2a6b809ba0d30355 Mon Sep 17 00:00:00 2001 From: "Yestin L. Harrison" Date: Wed, 20 Jul 2022 20:14:32 -0700 Subject: [PATCH 072/113] mpd: fix 0.23.8 on darwin - 0.23.8 includes https://github.com/MusicPlayerDaemon/MPD/commit/c975d8b94316c86bf5950ed3abeba394e1263677 - said change fixes deprecation warnings introduced in the 12.0 sdk, using definitions from the 12.0 sdk - nixpkgs uses 10.12 and 11.0, neither of which are the 12.0 sdk - this will gracefully degrade into a no-op when that changes --- pkgs/servers/mpd/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 79a84f965bcd..82c5ac5ea5da 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -145,6 +145,12 @@ let ] ++ concatAttrVals features_ nativeFeatureDependencies; + postPatch = lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "12.0") '' + substituteInPlace src/output/plugins/OSXOutputPlugin.cxx \ + --replace kAudioObjectPropertyElement{Main,Master} \ + --replace kAudioHardwareServiceDeviceProperty_Virtual{Main,Master}Volume + ''; + # Otherwise, the meson log says: # # Program zip found: NO From e199adde73bdaec179185debdeeaa0ff36618e92 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Wed, 29 Jun 2022 13:15:41 +0200 Subject: [PATCH 073/113] organicmaps: 2022.06.18-2 -> 2022.06.29-3 --- pkgs/applications/misc/organicmaps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index c44fc41a5c65..7a588209c3a4 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -19,13 +19,13 @@ mkDerivation rec { pname = "organicmaps"; - version = "2022.06.18-2"; + version = "2022.06.29-3"; src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; rev = "${version}-android"; - sha256 = "sha256-FlytRGiqGr9L5ZwL1slbPjagJKsleOXM8+loPmtfccI="; + sha256 = "sha256-/K3bxnb6y+9nEuGvoIpPl218xmNqjOWgpV8hQ/W12ZA="; fetchSubmodules = true; }; From 8c21ef98fba4b2560a663345cac6782447a36575 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sat, 23 Jul 2022 10:27:48 -0400 Subject: [PATCH 074/113] ncnn: 20220216 -> 20220721 --- pkgs/development/libraries/ncnn/default.nix | 5 ++--- pkgs/development/libraries/ncnn/gpu-include.patch | 13 ------------- 2 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 pkgs/development/libraries/ncnn/gpu-include.patch diff --git a/pkgs/development/libraries/ncnn/default.nix b/pkgs/development/libraries/ncnn/default.nix index 8c0f213b8298..bf4b74c03649 100644 --- a/pkgs/development/libraries/ncnn/default.nix +++ b/pkgs/development/libraries/ncnn/default.nix @@ -11,18 +11,17 @@ stdenv.mkDerivation rec { pname = "ncnn"; - version = "20220216"; + version = "20220721"; src = fetchFromGitHub { owner = "Tencent"; repo = pname; rev = version; - sha256 = "sha256-QHLD5NQZA7WR4mRQ0NIaXuAu59IV4SjXHOOlar5aOew="; + sha256 = "sha256-35OwvYYZtfugvujWl6bL8p8HU+z1kQsvnJ+aQOgO8V8="; }; patches = [ ./cmakelists.patch - ./gpu-include.patch ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/ncnn/gpu-include.patch b/pkgs/development/libraries/ncnn/gpu-include.patch deleted file mode 100644 index 8f751c769947..000000000000 --- a/pkgs/development/libraries/ncnn/gpu-include.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/gpu.cpp b/src/gpu.cpp -index 51cd7f95..bf7ed828 100644 ---- a/src/gpu.cpp -+++ b/src/gpu.cpp -@@ -21,7 +21,7 @@ - #include - - #include "glslang/SPIRV/GlslangToSpv.h" --#include "glslang/glslang/Public/ShaderLang.h" -+#include "glslang/Public/ShaderLang.h" - - #include "command.h" - #include "layer.h" From 7eeaecfaea6f5a76cdd76f6a77f04fbc9bf43556 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 21 Jul 2022 11:44:48 -0700 Subject: [PATCH 075/113] arcanist: pin php to 8.0 --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f16821397dae..4f08816c0ba8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1909,7 +1909,8 @@ with pkgs; }) arangodb_3_3 arangodb_3_4 arangodb_3_5; arangodb = arangodb_3_4; - arcanist = callPackage ../development/tools/misc/arcanist { php = php81; }; + # arcanist currently crashes with some workflows on php8.1, use 8.0 + arcanist = callPackage ../development/tools/misc/arcanist { php = php80; }; arduino = arduino-core.override { withGui = true; }; From b5362aac78e9a3f2f6edbc7b4dd005457081acf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sat, 23 Jul 2022 12:10:11 -0300 Subject: [PATCH 076/113] lxqt.pcmanfm-qt: add libexif dependence --- pkgs/desktops/lxqt/pcmanfm-qt/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix index e5f3246b06bb..d5bfb1dd3bfb 100644 --- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix +++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , cmake , pkg-config +, libexif , lxqt , qtbase , qttools @@ -32,6 +33,7 @@ mkDerivation rec { ]; buildInputs = [ + libexif qtbase qttools qtx11extras From 2133278f96966989cb7693cc289def2bedfd6c05 Mon Sep 17 00:00:00 2001 From: kilianar Date: Wed, 20 Jul 2022 21:58:10 +0200 Subject: [PATCH 077/113] nixosTests.podgrab: fix failing test defaultPort and customPort aren't python variables causing the test to fail. We instead use the nix variables with string interpolation. --- nixos/tests/podgrab.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/podgrab.nix b/nixos/tests/podgrab.nix index e5a340dc2ac8..dc9dfebaf49b 100644 --- a/nixos/tests/podgrab.nix +++ b/nixos/tests/podgrab.nix @@ -22,11 +22,11 @@ import ./make-test-python.nix ({ pkgs, ... }: { start_all() default.wait_for_unit("podgrab") - default.wait_for_open_port(defaultPort) + default.wait_for_open_port(${toString defaultPort}) default.succeed("curl --fail http://localhost:${toString defaultPort}") customized.wait_for_unit("podgrab") - customized.wait_for_open_port(customPort) + customized.wait_for_open_port(${toString customPort}) customized.succeed("curl --fail http://localhost:${toString customPort}") ''; From 10164a5de120724033a47cea3b07c70ec100e879 Mon Sep 17 00:00:00 2001 From: Tom Fitzhenry Date: Sun, 24 Jul 2022 01:20:43 +1000 Subject: [PATCH 078/113] upower: 0.99.19 -> 1.90.0 --- pkgs/os-specific/linux/upower/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 2ef6d8c8243d..279f7c22e646 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { pname = "upower"; - version = "0.99.19"; + version = "1.90.0"; outputs = [ "out" "dev" ] ++ lib.optionals withDocs [ "devdoc" ]; @@ -37,18 +37,9 @@ stdenv.mkDerivation rec { owner = "upower"; repo = "upower"; rev = "v${version}"; - sha256 = "gpLsBh4jgiDO8bxic2BTFhjIwc2q/tuAIxykTHqK6UM="; + hash = "sha256-+C/4dDg6WTLpBgkpNyxjthSdqYdaTLC8vG6jG1LNJ7w="; }; - patches = [ - # Fix test - # https://gitlab.freedesktop.org/upower/upower/-/merge_requests/150 - (fetchpatch { - url = "https://gitlab.freedesktop.org/upower/upower/-/commit/a78ee6039054770b466749f8ec4bfbe4c278d697.patch"; - sha256 = "aUPXnr/2PlOZNb7mQl43hmKe01DtuBUrGnqvwBFRf7Q="; - }) - ]; - strictDeps = true; depsBuildBuild = [ From 53d3769f18ddb401343da83d441add97903f139d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Jul 2022 15:34:18 +0000 Subject: [PATCH 079/113] python310Packages.glfw: 2.5.3 -> 2.5.4 --- pkgs/development/python-modules/glfw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/glfw/default.nix b/pkgs/development/python-modules/glfw/default.nix index accd8fcf5b91..5eac6a3f2c2f 100644 --- a/pkgs/development/python-modules/glfw/default.nix +++ b/pkgs/development/python-modules/glfw/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "glfw"; - version = "2.5.3"; + version = "2.5.4"; src = fetchFromGitHub { owner = "FlorianRhiem"; repo = "pyGLFW"; rev = "refs/tags/v${version}"; - sha256 = "sha256-LaK/lYCUN7PDy8QsaGCnQPM1nvQNeBRTdEEkKtaMUHA="; + sha256 = "sha256-4Ym3Vmkf+HwORbhR72Ws/cqLkNMPCY8FL35O2hSalGQ="; }; # Patch path to GLFW shared object From c0ec5a04a57f1da2c701f748ff7e8203331f7afc Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sat, 23 Jul 2022 01:05:04 +0300 Subject: [PATCH 080/113] gamemode: 1.6.1 -> 1.7 https://github.com/FeralInteractive/gamemode/releases/tag/1.7 --- pkgs/tools/games/gamemode/default.nix | 38 +++++++++---------- .../no-install-systemd-sysusers.patch | 16 ++++++++ 2 files changed, 35 insertions(+), 19 deletions(-) create mode 100644 pkgs/tools/games/gamemode/no-install-systemd-sysusers.patch diff --git a/pkgs/tools/games/gamemode/default.nix b/pkgs/tools/games/gamemode/default.nix index e9fdec592204..e2aeea83776d 100644 --- a/pkgs/tools/games/gamemode/default.nix +++ b/pkgs/tools/games/gamemode/default.nix @@ -10,38 +10,30 @@ , inih , systemd , appstream +, makeWrapper +, findutils +, gawk +, procps }: stdenv.mkDerivation rec { pname = "gamemode"; - version = "1.6.1"; + version = "1.7"; src = fetchFromGitHub { owner = "FeralInteractive"; repo = pname; rev = version; - sha256 = "sha256-P00OnZiPZyxBu9zuG+3JNorXHBhJZy+cKPjX+duZrJ0="; + sha256 = "sha256-DIFcmWFkoZOklo1keYcCl6n2GJgzWKC8usHFcJmfarU="; }; outputs = [ "out" "dev" "lib" "man" "static" ]; patches = [ - # Run executables from PATH instead of /usr/bin - # See https://github.com/FeralInteractive/gamemode/pull/323 - (fetchpatch { - url = "https://github.com/FeralInteractive/gamemode/commit/be44b7091baa33be6dda60392e4c06c2f398ee72.patch"; - sha256 = "TlDUETs4+N3pvrVd0FQGlGmC+6ByhJ2E7gKXa7suBtE="; - }) - - # Fix loading shipped config when using a prefix other than /usr - # See https://github.com/FeralInteractive/gamemode/pull/324 - (fetchpatch { - url = "https://github.com/FeralInteractive/gamemode/commit/b29aa903ce5acc9141cfd3960c98ccb047eca872.patch"; - sha256 = "LwBzBJQ7dfm2mFVSOSPjJP+skgV5N6h77i66L1Sq+ZM="; - }) - # Add @libraryPath@ template variable to fix loading the PRELOAD library ./preload-nix-workaround.patch + # Do not install systemd sysusers configuration + ./no-install-systemd-sysusers.patch ]; postPatch = '' @@ -55,6 +47,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ + makeWrapper meson ninja pkg-config @@ -85,13 +78,20 @@ stdenv.mkDerivation rec { moveToOutput lib/*.a "$static" ''; - # Add $lib/lib to gamemoded & gamemode-simulate-game's rpath since - # they use dlopen to load libgamemode. Can't use makeWrapper since - # it would break the security wrapper in the NixOS module. postFixup = '' + # Add $lib/lib to gamemoded & gamemode-simulate-game's rpath since + # they use dlopen to load libgamemode. Can't use makeWrapper since + # it would break the security wrapper in the NixOS module. for bin in "$out/bin/gamemoded" "$out/bin/gamemode-simulate-game"; do patchelf --set-rpath "$lib/lib:$(patchelf --print-rpath "$bin")" "$bin" done + + wrapProgram "$out/bin/gamemodelist" \ + --prefix PATH : ${lib.makeBinPath [ + findutils + gawk + procps + ]} ''; meta = with lib; { diff --git a/pkgs/tools/games/gamemode/no-install-systemd-sysusers.patch b/pkgs/tools/games/gamemode/no-install-systemd-sysusers.patch new file mode 100644 index 000000000000..27aa1d4d710c --- /dev/null +++ b/pkgs/tools/games/gamemode/no-install-systemd-sysusers.patch @@ -0,0 +1,16 @@ +diff --git i/data/meson.build w/data/meson.build +index 6fb82d8..2e9e170 100644 +--- i/data/meson.build ++++ w/data/meson.build +@@ -21,11 +21,6 @@ if sd_bus_provider == 'systemd' + configuration: data_conf, + install_dir: path_systemd_unit_dir, + ) +- # Install the sysusers.d file +- install_data( +- files('gamemode.conf'), +- install_dir: path_systemd_sysusers_dir, +- ) + endif + + # Install the D-BUS service file From 0beea3a05a520799e01bfb523279efbb5681bbb2 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 23 Jul 2022 17:57:04 +0200 Subject: [PATCH 081/113] bambootracker: 0.5.0 -> 0.5.1 --- pkgs/applications/audio/bambootracker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/bambootracker/default.nix b/pkgs/applications/audio/bambootracker/default.nix index b2cce97bbc46..7408f57a1a98 100644 --- a/pkgs/applications/audio/bambootracker/default.nix +++ b/pkgs/applications/audio/bambootracker/default.nix @@ -12,14 +12,14 @@ mkDerivation rec { pname = "bambootracker"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "BambooTracker"; repo = "BambooTracker"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "1mpbvhsmrn0wdmxfp3n5dwv4474qlhy47r3vwc2jwdslq6vgl1fa"; + sha256 = "sha256-AEELUJYiapF/sBWRXXuBXUHwnKp0szdIOCNVMYufv94="; }; nativeBuildInputs = [ qmake qttools pkg-config ]; From 05fc99037caccdaf7212ed55137359204f7ebd99 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sat, 23 Jul 2022 12:42:08 -0300 Subject: [PATCH 082/113] linuxKernel.packages.linux_5_18.can-isotp: mark broken --- pkgs/os-specific/linux/can-isotp/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/can-isotp/default.nix b/pkgs/os-specific/linux/can-isotp/default.nix index 73edb3be9ec3..7c20b74e54cb 100644 --- a/pkgs/os-specific/linux/can-isotp/default.nix +++ b/pkgs/os-specific/linux/can-isotp/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies; meta = with lib; { + broken = kernel.kernelAtLeast "5.16"; description = "Kernel module for ISO-TP (ISO 15765-2)"; homepage = "https://github.com/hartkopp/can-isotp"; license = licenses.gpl2; From 3bfb2046fd733d0523352146a8735ba65120d5e9 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sat, 23 Jul 2022 12:32:09 -0300 Subject: [PATCH 083/113] linuxKernel.packages.linux_5_18.mwprocapture: mark broken --- pkgs/os-specific/linux/mwprocapture/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix index 8a04386a7186..2286e86df72c 100644 --- a/pkgs/os-specific/linux/mwprocapture/default.nix +++ b/pkgs/os-specific/linux/mwprocapture/default.nix @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { ''; meta = { + broken = kernel.kernelAtLeast "5.16"; homepage = "http://www.magewell.com/"; description = "Linux driver for the Magewell Pro Capture family"; license = licenses.unfreeRedistributable; From 34c3eb5f328b7ddbcdca25c8f5ca930177721d96 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 23 Jul 2022 18:17:46 +0200 Subject: [PATCH 084/113] naabu: 2.0.7 -> 2.0.8 --- pkgs/tools/security/naabu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/naabu/default.nix b/pkgs/tools/security/naabu/default.nix index a93e8082a0c7..600e2000bc3f 100644 --- a/pkgs/tools/security/naabu/default.nix +++ b/pkgs/tools/security/naabu/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "naabu"; - version = "2.0.7"; + version = "2.0.8"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "naabu"; rev = "v${version}"; - sha256 = "sha256-pfaK2Hj6iHk8njEMEbeSHGIKTn5O3IF83At14iDNI34="; + sha256 = "sha256-W0GFSshnVmejq0XHZHFZRHB+RVSsUsHLRqGtyxo/BmQ="; }; - vendorSha256 = "sha256-eco1e1A0cDk1Yc0KP9tc3Kf4E+z1av7EDHynVhoHhMk="; + vendorSha256 = "sha256-+VtQz4objH5Z6IIuQj63E7L9nMWxb5mWK2H/MF0+FxE="; buildInputs = [ libpcap From 534c138962a17cbb25725c72115cc1992e42164f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Jul 2022 16:24:09 +0000 Subject: [PATCH 085/113] python310Packages.zcs: 0.1.17 -> 0.1.18 --- pkgs/development/python-modules/zcs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zcs/default.nix b/pkgs/development/python-modules/zcs/default.nix index 8ad26668bc5e..26a47a1f7698 100644 --- a/pkgs/development/python-modules/zcs/default.nix +++ b/pkgs/development/python-modules/zcs/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "zcs"; - version = "0.1.17"; + version = "0.1.18"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ZoQgAaJy3kKHLljyKA0Oo/D1kefE8X9FlsGDSNt1nPw="; + sha256 = "sha256-cIg0LFQFVo91Ywvulxtx0/PPyQnRflJFnIi0gaUGGq4="; }; patches = [ From 214ea4599f5d8d2a9d49d6c8ee5f4c21aae3abe1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 23 Jul 2022 18:52:37 +0200 Subject: [PATCH 086/113] irssi: 1.4.1 -> 1.4.2 --- pkgs/applications/networking/irc/irssi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 9ea6c32c7de6..b04cd2e07aab 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "irssi"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "irssi"; repo = "irssi"; rev = version; - hash = "sha256-HLcIhAZoJfCHoSNQCpoytBR0zmiZd919FcKWCl35G0A="; + hash = "sha256-dQZ/CeBfcfWGjKPF3fR62JDqyEXGv5hd9VT4OEbgJhQ="; }; nativeBuildInputs = [ From 2714e5dbc8c7913e4d8f29324ef3009a07fb5fbf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 23 Jul 2022 19:07:06 +0200 Subject: [PATCH 087/113] python310Packages.sentry-sdk: 1.7.2 -> 1.8.0 --- pkgs/development/python-modules/sentry-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index eca91def2313..477dc540cf8d 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.7.2"; + version = "1.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -55,7 +55,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = version; - hash = "sha256-0VQ1P3xWC1keoXaPfIzh+uGXvRAK3nOrc6fLKIhfiHk="; + hash = "sha256-PtGQJUZ6/u2exmg6P5VV2RoBKyuV3G2YuAWgA06oQKo="; }; propagatedBuildInputs = [ From c8504947e4c69f6eeef27c70a93a74214c7346a1 Mon Sep 17 00:00:00 2001 From: Shane Sveller Date: Sat, 23 Jul 2022 12:12:09 -0500 Subject: [PATCH 088/113] waypoint: 0.8.2 -> 0.9.0 https://github.com/hashicorp/waypoint/blob/v0.9.0/CHANGELOG.md#090-july-05-2022 https://www.hashicorp.com/blog/waypoint-0-9-adds-new-runner-commands --- pkgs/applications/networking/cluster/waypoint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/waypoint/default.nix b/pkgs/applications/networking/cluster/waypoint/default.nix index 038ab2c2bf7f..aaff24f70760 100644 --- a/pkgs/applications/networking/cluster/waypoint/default.nix +++ b/pkgs/applications/networking/cluster/waypoint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "waypoint"; - version = "0.8.2"; + version = "0.9.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Pq1gGXROPHHMaOoQwx6cObvMF+SoilOROR4bwI0Y/GM="; + sha256 = "sha256-R+X0fp4AdC3u+/rX2Vb0P3MTBRi94wfT9YvW2pxwr5Y="; }; - vendorSha256 = "sha256-Q8ookgQwecRuSrnQiIREBMDxK9NAWfHu+sIQeMO/T4w="; + vendorSha256 = "sha256-bDsmou4zmRz8DyENdteJ3MzhTpCgri4ISIgxi7fhQdc="; nativeBuildInputs = [ go-bindata installShellFiles ]; From 013fbaefe9e56913136258fbab5d48292ddd89b9 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Sat, 23 Jul 2022 19:51:21 +0200 Subject: [PATCH 089/113] polymc: 1.3.2 -> 1.4.0 --- pkgs/games/polymc/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/games/polymc/default.nix b/pkgs/games/polymc/default.nix index f7d0f9af13d7..40692cb3c7a8 100644 --- a/pkgs/games/polymc/default.nix +++ b/pkgs/games/polymc/default.nix @@ -16,21 +16,22 @@ , openal , msaClientID ? "" , jdks ? [ jdk jdk8 ] +, extra-cmake-modules }: stdenv.mkDerivation rec { pname = "polymc"; - version = "1.3.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "PolyMC"; repo = "PolyMC"; rev = version; - sha256 = "sha256-hqsyS82UzgCUZ9HjoPKjOLE49fwLntRAh3mVrTsmi3o="; + sha256 = "sha256-gaPqCAC/tE6nUONgWSrVm3oBzSnOhZ5xiAJ+QyX+8rA="; fetchSubmodules = true; }; - nativeBuildInputs = [ cmake file jdk wrapQtAppsHook ]; + nativeBuildInputs = [ extra-cmake-modules cmake file jdk wrapQtAppsHook ]; buildInputs = [ qtbase zlib quazip ]; cmakeFlags = lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ]; From 6f0279fcb5595ad2587153756c0a77f6d8c194fd Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Sat, 23 Jul 2022 11:20:33 -0700 Subject: [PATCH 090/113] bear: 3.0.19 -> 3.0.20 --- pkgs/development/tools/build-managers/bear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index e636f938c776..50474c2a522b 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "bear"; - version = "3.0.19"; + version = "3.0.20"; src = fetchFromGitHub { owner = "rizsotto"; repo = pname; rev = version; - sha256 = "sha256-Jj38dmzr8NDDMercfWyJrMFxGBSExCGPeG2IVEtnSxY="; + sha256 = "sha256-8hA0Y/AGczFwggxkTG7PQKOVnr2Oizx4OH38nS5jCU0="; }; nativeBuildInputs = [ cmake pkg-config ]; From f0f07edc83403b854b0822f7614ac9a7e3cdd62c Mon Sep 17 00:00:00 2001 From: Winter Date: Sat, 23 Jul 2022 14:27:18 -0400 Subject: [PATCH 091/113] thefuck: lib.optional -> lib.optionals --- pkgs/tools/misc/thefuck/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/thefuck/default.nix b/pkgs/tools/misc/thefuck/default.nix index 87d6dcfb0c2e..13f741c5444f 100644 --- a/pkgs/tools/misc/thefuck/default.nix +++ b/pkgs/tools/misc/thefuck/default.nix @@ -18,7 +18,7 @@ buildPythonApplication rec { checkInputs = [ go mock pytestCheckHook pytest-mock ]; - disabledTests = lib.optional stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.isDarwin [ "test_settings_defaults" "test_from_file" "test_from_env" From 09c3e368e99e13c8fb773475e5f8a9577276c2a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20He=C3=9Felmann?= Date: Sat, 23 Jul 2022 17:03:58 +0200 Subject: [PATCH 092/113] xonsh: 0.11.0 -> 0.13.0 Fixes #182544 --- pkgs/shells/xonsh/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index 4fa5d9b087be..ed11f0828d66 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "xonsh"; - version = "0.11.0"; + version = "0.13.0"; # fetch from github because the pypi package ships incomplete tests src = fetchFromGitHub { owner = "xonsh"; repo = "xonsh"; rev = version; - sha256 = "sha256-jfxQMEVABTOhx679V0iGVX9RisuY42lSdztYXMLwdcw="; + sha256 = "sha256-8X/+mQrwJ0yaUHRKdoY3G0P8kq22hYfRK+7WRl/zamc="; }; LC_ALL = "en_US.UTF-8"; @@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec { ]; postInstall = '' - wrapProgram $out/bin/xon.sh \ + wrapProgram $out/bin/xonsh \ $makeWrapperArgs ''; @@ -49,6 +49,8 @@ python3Packages.buildPythonApplication rec { "test_colorize_file" "test_loading_correctly" "test_no_command_path_completion" + "test_bsd_man_page_completions" + "test_xonsh_activator" # fails on non-interactive shells "test_capture_always" "test_casting" @@ -56,9 +58,14 @@ python3Packages.buildPythonApplication rec { "test_dirty_working_directory" "test_man_completion" "test_vc_get_branch" + "test_bash_and_is_alias_is_only_functional_alias" ]; disabledTestPaths = [ + # fails on sandbox + "tests/completers/test_command_completers.py" + "tests/test_ptk_highlight.py" + "tests/test_ptk_shell.py" # fails on non-interactive shells "tests/prompt/test_gitstatus.py" "tests/completers/test_bash_completer.py" From 10e96b76b3a896291016aa55240c63b0a6122495 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 23 Jul 2022 18:27:45 +0100 Subject: [PATCH 093/113] grails: 5.1.7 -> 5.1.9 addressing CVE-2022-35912 https://nvd.nist.gov/vuln/detail/CVE-2022-35912 --- pkgs/development/web/grails/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index 2497956b9182..c1ab63b132aa 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { pname = "grails"; - version = "5.1.7"; + version = "5.1.9"; src = fetchurl { url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip"; - sha256 = "sha256-Sk+VvuEyzZ9sSeI9fOuHgmgSu89WjriiK/6UU/eWqag="; + sha256 = "sha256-gOC1jwFoasxTAhXoX/Mbl5uL1p6NjXcjpz7td8DZUlk="; }; nativeBuildInputs = [ unzip ]; From bba36e0154a3f32ac284d8ac620d6b9ba84bf040 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 23 Jul 2022 18:30:02 +0100 Subject: [PATCH 094/113] grails: mark as sourceProvenance binaryBytecode --- pkgs/development/web/grails/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index c1ab63b132aa..4924b42079c0 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://grails.org/"; license = licenses.asl20; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; From e8b1b05acde7285d0926606bbeedf8d4eaa07b25 Mon Sep 17 00:00:00 2001 From: Winter Date: Sat, 23 Jul 2022 14:39:22 -0400 Subject: [PATCH 095/113] fish: add winter and srapenne as maintainers --- pkgs/shells/fish/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 01219e2165ec..060f1e5844dc 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -287,7 +287,7 @@ let homepage = "https://fishshell.com/"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = with maintainers; [ cole-h ]; + maintainers = with maintainers; [ cole-h winter srapenne ]; }; passthru = { From 241a178eda8eec81df0acbc4759c1d7c2e25d440 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Sun, 17 Jul 2022 10:55:13 +0200 Subject: [PATCH 096/113] python310Packages.apache-beam: Add missing test dependency --- pkgs/development/python-modules/apache-beam/default.nix | 7 +++---- pkgs/development/python-modules/testcontainers/default.nix | 7 ++++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix index 17e5389a5bbc..19e2cc827b94 100644 --- a/pkgs/development/python-modules/apache-beam/default.nix +++ b/pkgs/development/python-modules/apache-beam/default.nix @@ -37,8 +37,8 @@ , sqlalchemy , tenacity , typing-extensions -, scikit-learn -}: +, testcontainers +, scikit-learn }: buildPythonPackage rec { pname = "apache-beam"; @@ -107,6 +107,7 @@ buildPythonPackage rec { scikit-learn sqlalchemy tenacity + testcontainers ]; # Make sure we're running the tests for the actually installed @@ -122,8 +123,6 @@ buildPythonPackage rec { # container_init: Callable[[], Union[PostgresContainer, MySqlContainer]], # E NameError: name 'MySqlContainer' is not defined # - # Test relies on the testcontainers package, which is not currently (as of - # 2022-04-08) available in nixpkgs. "apache_beam/io/external/xlang_jdbcio_it_test.py" # These tests depend on the availability of specific servers backends. diff --git a/pkgs/development/python-modules/testcontainers/default.nix b/pkgs/development/python-modules/testcontainers/default.nix index a690be883340..65c8ed8bf460 100644 --- a/pkgs/development/python-modules/testcontainers/default.nix +++ b/pkgs/development/python-modules/testcontainers/default.nix @@ -3,8 +3,7 @@ , buildPythonPackage , deprecation , docker -, wrapt -}: +, wrapt }: buildPythonPackage rec { pname = "testcontainers"; @@ -31,7 +30,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Allows using docker containers for functional and integration testing"; + description = '' + Allows using docker containers for functional and integration testing + ''; homepage = "https://github.com/testcontainers/testcontainers-python"; license = licenses.asl20; maintainers = with maintainers; [ onny ]; From ac4755181fed8ac29d992ca22f52c8774ee738f0 Mon Sep 17 00:00:00 2001 From: Chen Date: Sun, 24 Jul 2022 03:16:47 +0800 Subject: [PATCH 097/113] htmldoc: fix darwin build (#178725) Co-authored-by: Sandro --- pkgs/tools/typesetting/htmldoc/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/htmldoc/default.nix b/pkgs/tools/typesetting/htmldoc/default.nix index 37b0b42d23e5..c3e5c66ba56f 100644 --- a/pkgs/tools/typesetting/htmldoc/default.nix +++ b/pkgs/tools/typesetting/htmldoc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, zlib, libpng, libjpeg, SystemConfiguration, Foundation, pkg-config }: +{ lib, stdenv, testers, fetchFromGitHub, zlib, libpng, libjpeg, SystemConfiguration, Foundation, pkg-config, htmldoc }: stdenv.mkDerivation rec { pname = "htmldoc"; @@ -14,8 +14,18 @@ stdenv.mkDerivation rec { buildInputs = [ zlib libpng libjpeg ] ++ lib.optionals stdenv.isDarwin [ Foundation SystemConfiguration ]; + # do not generate universal binary on Darwin + # because it is not supported by Nix's clang + postPatch = '' + substituteInPlace configure --replace "-arch x86_64 -arch arm64" "" + ''; + + passthru.tests = testers.testVersion { + package = htmldoc; + command = "htmldoc --version"; + }; + meta = with lib; { - broken = stdenv.isDarwin; description = "Converts HTML files to PostScript and PDF"; homepage = "https://michaelrsweet.github.io/htmldoc"; changelog = "https://github.com/michaelrsweet/htmldoc/releases/tag/v${version}"; From 8ad9860b50370b585a248c1b938cbd0d12afe1c2 Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Sat, 23 Jul 2022 21:21:25 +0200 Subject: [PATCH 098/113] xwayland: 22.1.1 -> 22.1.3 (#174926) Co-authored-by: Sandro --- pkgs/servers/x11/xorg/xwayland.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 97414481a915..134e992a56c8 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -42,12 +42,12 @@ , defaultFontPath ? "" }: stdenv.mkDerivation rec { - pname = "xwayland"; - version = "22.1.1"; + version = "22.1.3"; + src = fetchurl { url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz"; - sha256 = "sha256-9dDgujfhm7h8YvYdpZcL0gSTnyEgYglkvtTMhJW6plc="; + sha256 = "sha256-pxLre84yzZNN82gUtd0EaqZwiZwW/pjyr7ADV4+GocU="; }; depsBuildBuild = [ From dd2709275ce5175db2a278ee53f5e360c6850b50 Mon Sep 17 00:00:00 2001 From: Winter Date: Sat, 23 Jul 2022 15:18:39 -0400 Subject: [PATCH 099/113] fish-irssi: unstable-2013-04-13 -> unstable-2021-04-16 --- .../networking/irc/irssi/fish/default.nix | 30 +++++++---------- .../irc/irssi/fish/irssi-include-dir.patch | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 46 insertions(+), 19 deletions(-) create mode 100644 pkgs/applications/networking/irc/irssi/fish/irssi-include-dir.patch diff --git a/pkgs/applications/networking/irc/irssi/fish/default.nix b/pkgs/applications/networking/irc/irssi/fish/default.nix index c275f904660b..b26b2cb1daf4 100644 --- a/pkgs/applications/networking/irc/irssi/fish/default.nix +++ b/pkgs/applications/networking/irc/irssi/fish/default.nix @@ -1,34 +1,28 @@ -{ lib, stdenv, fetchFromGitHub, irssi, gmp, automake, autoconf, libtool, openssl, glib, pkg-config }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, glib, openssl, irssi }: stdenv.mkDerivation rec { pname = "fish-irssi"; - version = "unstable-2013-04-13"; + version = "unstable-2021-04-16"; src = fetchFromGitHub { owner = "falsovsky"; repo = "FiSH-irssi"; - rev = "e98156bebd8c150bf100b3a0356e7103bb5c20e6"; - sha256 = "0mqq7q3rnkzx4j352g1l8sv3g687d76ikjl9c7g6xw96y91kqvdp"; + rev = "fcc484f09ce6941ba2e499605270593ddd13b81a"; + hash = "sha256-KIPnz17a0CFfoPO2dZz90j+wG/dR4pv5d0iZMRf7Vkc="; }; - preConfigure = '' - cp -a "${irssi.src}" "./${irssi.name}" - configureFlags="$configureFlags --with-irssi-source=`pwd`/${irssi.name}" + patches = [ ./irssi-include-dir.patch ]; - ./regen.sh - ''; + nativeBuildInputs = [ cmake pkg-config ]; - installPhase = '' - mkdir -p $out/lib/irssi/modules - cp src/.libs/libfish.so $out/lib/irssi/modules - ''; + buildInputs = [ glib openssl ]; - nativeBuildInputs = [ pkg-config autoconf automake ]; - buildInputs = [ gmp libtool openssl glib ]; + cmakeFlags = [ "-DIRSSI_INCLUDE_PATH:PATH=${irssi}/include" ]; - meta = { + meta = with lib; { homepage = "https://github.com/falsovsky/FiSH-irssi"; - license = lib.licenses.unfree; # I can't find any mention of license - maintainers = with lib.maintainers; [viric]; + license = licenses.mit; + maintainers = with maintainers; [ viric ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/irc/irssi/fish/irssi-include-dir.patch b/pkgs/applications/networking/irc/irssi/fish/irssi-include-dir.patch new file mode 100644 index 000000000000..0a51ec327bdc --- /dev/null +++ b/pkgs/applications/networking/irc/irssi/fish/irssi-include-dir.patch @@ -0,0 +1,33 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 601b92b..b440f83 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -36,27 +36,10 @@ if(OPENSSL_FOUND) + MESSAGE(STATUS "Using OpenSSL ${OPENSSL_VERSION}") + ENDIF() + +-# Sets a variable that the user can set with +-# cmake -DIRSSI_INCLUDE_DIR:PATH=/path/to/irssi/includes . +-SET(IRSSI_INCLUDE_DIR "" CACHE PATH "Path to irssi include files") +- +-# Tries to find the irssi include files in the most common places, +-# and in the user defined directory +-FIND_PATH(IRSSI_INCLUDE_PATH +- NAMES irssi-config.h src/common.h +- PATHS /usr/include/irssi /usr/local/include/irssi ${IRSSI_INCLUDE_DIR} +-) +- +-# Bail out if the required irssi files werent found +-IF(NOT IRSSI_INCLUDE_PATH) +- MESSAGE(SEND_ERROR "Could not detect the irssi include files. Please run:\n# cmake -DIRSSI_INCLUDE_DIR:PATH=/path/to/irssi/includes .") +- RETURN() +-ENDIF() +- + MESSAGE(STATUS "irssi includes were found on ${IRSSI_INCLUDE_PATH}") + + # Add the weirdo irssi includes directories +-INCLUDE_DIRECTORIES(${IRSSI_INCLUDE_PATH} ${IRSSI_INCLUDE_PATH}/src ${IRSSI_INCLUDE_PATH}/src/fe-common/core ${IRSSI_INCLUDE_PATH}/src/core) ++INCLUDE_DIRECTORIES(${IRSSI_INCLUDE_PATH} ${IRSSI_INCLUDE_PATH}/irssi ${IRSSI_INCLUDE_PATH}/irssi/src ${IRSSI_INCLUDE_PATH}/irssi/src/fe-common/core ${IRSSI_INCLUDE_PATH}/irssi/src/core) + + MESSAGE(STATUS "The module will be installed by default to ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/irssi/modules") + MESSAGE(STATUS "You can change it with 'cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr .'") diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f08816c0ba8..46942ec7aa32 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28032,7 +28032,7 @@ with pkgs; irssi = callPackage ../applications/networking/irc/irssi { }; - irssi_fish = callPackage ../applications/networking/irc/irssi/fish { }; + fish-irssi = callPackage ../applications/networking/irc/irssi/fish { }; kirc = callPackage ../applications/networking/irc/kirc { }; From 64e11aab7f24cee0dafcd7256134a3f67f275a79 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sat, 23 Jul 2022 22:53:04 +0300 Subject: [PATCH 100/113] werf: 1.2.128 -> 1.2.138 Also, remove gitUpdater so that r-ryantm would work. --- .../networking/cluster/werf/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 4439e89d71fd..b20aa362fbe6 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -5,21 +5,22 @@ , installShellFiles , btrfs-progs , glibc -, gitUpdater +, testers +, werf }: buildGoModule rec { pname = "werf"; - version = "1.2.128"; + version = "1.2.138"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - sha256 = "sha256-H1GzIxj6ZrlcNM4Y0oKYoVBsMFj4wYP9XYicAmIpaik="; + sha256 = "sha256-gRMPTw/PzAE/kij4dq9ph/1Iz/a+fEsT5HSogC5EDFE="; }; - vendorSha256 = "sha256-78V+cw0A3Q3Gagl4KrserFXvV17MSqhpaFG38VKwhKg="; + vendorSha256 = "sha256-6/XiTgAQ3M3ge/b7uEFD0K+3kd7I2yqZJjgPVXP+uQ0="; proxyVendor = true; @@ -58,10 +59,10 @@ buildGoModule rec { --zsh <($out/bin/werf completion --shell=zsh) ''; - passthru.updateScript = gitUpdater { - inherit pname version; - ignoredVersions = "1\.[3-9].*"; - rev-prefix = "v"; + passthru.tests.version = testers.testVersion { + package = werf; + command = "werf version"; + version = "v${version}"; }; meta = with lib; { From d383e90ace6480d6846b6dd3cbe66d30c044bd30 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sun, 14 Nov 2021 16:27:00 -0300 Subject: [PATCH 101/113] _7zz: build on macOS --- pkgs/tools/archivers/7zz/default.nix | 47 ++++++++++++------- .../archivers/7zz/fix-build-on-darwin.patch | 24 ++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 55 insertions(+), 18 deletions(-) create mode 100644 pkgs/tools/archivers/7zz/fix-build-on-darwin.patch diff --git a/pkgs/tools/archivers/7zz/default.nix b/pkgs/tools/archivers/7zz/default.nix index 0c8c6ed5d3ad..150230f775a4 100644 --- a/pkgs/tools/archivers/7zz/default.nix +++ b/pkgs/tools/archivers/7zz/default.nix @@ -2,9 +2,9 @@ , lib , fetchurl - # Only used for x86/x86_64 + # Only used for Linux's x86/x86_64 , uasm -, useUasm ? stdenv.hostPlatform.isx86 +, useUasm ? (stdenv.isLinux && stdenv.hostPlatform.isx86) # RAR code is under non-free unRAR license # see the meta.license section below for more details @@ -16,13 +16,13 @@ }: let - inherit (stdenv.hostPlatform) system; - platformSuffix = { - aarch64-linux = "_arm64"; - i686-linux = "_x86"; - x86_64-linux = "_x64"; - }.${system} or - (builtins.trace "`platformSuffix` not available for `${system}.` Making a generic `7zz` build." ""); + makefile = { + aarch64-darwin = "../../cmpl_mac_arm64.mak"; + x86_64-darwin = "../../cmpl_mac_x64.mak"; + aarch64-linux = "../../cmpl_gcc_arm64.mak"; + i686-linux = "../../cmpl_gcc_x86.mak"; + x86_64-linux = "../../cmpl_gcc_x64.mak"; + }.${stdenv.hostPlatform.system} or "../../cmpl_gcc.mak"; # generic build in stdenv.mkDerivation rec { pname = "7zz"; @@ -51,27 +51,40 @@ stdenv.mkDerivation rec { ''; }; - sourceRoot = "CPP/7zip/Bundles/Alone2"; + sourceRoot = "."; + + patches = [ ./fix-build-on-darwin.patch ]; + patchFlags = [ "-p0" ]; + + NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ + "-Wno-deprecated-copy-dtor" + ]; + + inherit makefile; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "CXX=${stdenv.cc.targetPrefix}c++" - ] ++ - lib.optionals useUasm [ "MY_ASM=uasm" ] ++ + ] + ++ lib.optionals useUasm [ "MY_ASM=uasm" ] + # We need at minimum 10.13 here because of utimensat, however since + # we need a bump anyway, let's set the same minimum version as the one in + # aarch64-darwin so we don't need additional changes for it + ++ lib.optionals stdenv.isDarwin [ "MACOSX_DEPLOYMENT_TARGET=10.16" ] # it's the compression code with the restriction, see DOC/License.txt - lib.optionals (!enableUnfree) [ "DISABLE_RAR_COMPRESS=true" ]; - - makefile = "../../cmpl_gcc${platformSuffix}.mak"; + ++ lib.optionals (!enableUnfree) [ "DISABLE_RAR_COMPRESS=true" ]; nativeBuildInputs = lib.optionals useUasm [ uasm ]; enableParallelBuilding = true; + preBuild = "cd CPP/7zip/Bundles/Alone2"; + installPhase = '' runHook preInstall - install -Dm555 -t $out/bin b/g${platformSuffix}/7zz + install -Dm555 -t $out/bin b/*/7zz install -Dm444 -t $out/share/doc/${pname} ../../../../DOC/*.txt runHook postInstall @@ -96,7 +109,7 @@ stdenv.mkDerivation rec { # the unRAR compression code is disabled by default lib.optionals enableUnfree [ unfree ]; maintainers = with maintainers; [ anna328p peterhoeg jk ]; - platforms = platforms.linux; + platforms = platforms.unix; mainProgram = "7zz"; }; } diff --git a/pkgs/tools/archivers/7zz/fix-build-on-darwin.patch b/pkgs/tools/archivers/7zz/fix-build-on-darwin.patch new file mode 100644 index 000000000000..9d8ee7f9bc60 --- /dev/null +++ b/pkgs/tools/archivers/7zz/fix-build-on-darwin.patch @@ -0,0 +1,24 @@ +diff -Naur CPP/7zip/Common/FileStreams.cpp CPP/7zip/Common/FileStreams.cpp +--- CPP/7zip/Common/FileStreams.cpp ++++ CPP/7zip/Common/FileStreams.cpp +@@ -12,7 +12,7 @@ + #include + + // for major()/minor(): +-#if defined(__FreeBSD__) || defined(BSD) ++#if defined(__FreeBSD__) || defined(BSD) || defined(__APPLE__) + #include + #else + #include +diff -Naur CPP/7zip/UI/Common/UpdateCallback.cpp CPP/7zip/UI/Common/UpdateCallback.cpp +--- CPP/7zip/UI/Common/UpdateCallback.cpp ++++ CPP/7zip/UI/Common/UpdateCallback.cpp +@@ -9,7 +9,7 @@ + // #include + + // for major()/minor(): +-#if defined(__FreeBSD__) || defined(BSD) ++#if defined(__FreeBSD__) || defined(BSD) || defined(__APPLE__) + #include + #else + #include diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 325540d5baa7..622d78b7ecd1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -995,7 +995,7 @@ with pkgs; _6tunnel = callPackage ../tools/networking/6tunnel { }; - _7zz = callPackage ../tools/archivers/7zz { }; + _7zz = darwin.apple_sdk_11_0.callPackage ../tools/archivers/7zz { }; _9pfs = callPackage ../tools/filesystems/9pfs { }; From d4c799277a2b2a4e40dd4c8a575611cae9058b67 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Jul 2022 20:23:12 +0000 Subject: [PATCH 102/113] time-decode: 4.0.0 -> 4.1.2 --- pkgs/tools/misc/time-decode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/time-decode/default.nix b/pkgs/tools/misc/time-decode/default.nix index 5dcc64cf1cfd..28fcaea73e7a 100644 --- a/pkgs/tools/misc/time-decode/default.nix +++ b/pkgs/tools/misc/time-decode/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "time-decode"; - version = "4.0.0"; + version = "4.1.2"; src = fetchFromGitHub { owner = "digitalsleuth"; repo = "time_decode"; rev = "refs/tags/v${version}"; - sha256 = "sha256-J5mgAEANAKKbzRMX/LIpdlnP8GkOXFEOmhEO495Z0p4="; + sha256 = "sha256-79TReAEHvLldp0n3jTvws3mFE/1O1h6TocjMHrurwt4="; }; propagatedBuildInputs = with python3.pkgs; [ From a2b8a94988c69dfee49da6fcafd800a82785fbc8 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sat, 23 Jul 2022 13:55:49 -0700 Subject: [PATCH 103/113] browsh: 1.6.4 -> 1.8.0 --- .../networking/browsers/browsh/default.nix | 43 +-- .../networking/browsers/browsh/deps.nix | 264 ------------------ 2 files changed, 14 insertions(+), 293 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/browsh/deps.nix diff --git a/pkgs/applications/networking/browsers/browsh/default.nix b/pkgs/applications/networking/browsers/browsh/default.nix index e106eb7ff664..60e8631249fd 100644 --- a/pkgs/applications/networking/browsers/browsh/default.nix +++ b/pkgs/applications/networking/browsers/browsh/default.nix @@ -1,60 +1,45 @@ -{ lib, buildGoPackage, fetchurl, fetchFromGitHub, go-bindata }: +{ lib, buildGoModule, fetchurl, fetchFromGitHub }: let - version = "1.6.4"; + version = "1.8.0"; # TODO: must build the extension instead of downloading it. But since it's # literally an asset that is indifferent regardless of the platform, this # might be just enough. webext = fetchurl { - url = "https://github.com/browsh-org/browsh/releases/download/v${version}/browsh-${version}-an.fx.xpi"; - sha256 = "1shf1s9s525wns5vrsc4ns21zjxm1si43lx6v0q8ma6vd5x5445l"; + url = "https://github.com/browsh-org/browsh/releases/download/v${version}/browsh-${version}.xpi"; + sha256 = "sha256-12xWbf4ngYHWLKV9yyxyi0Ny/zHSj2o7Icats+Ef+pA="; }; -in buildGoPackage rec { +in + +buildGoModule rec { inherit version; pname = "browsh"; - goPackagePath = "browsh"; + sourceRoot = "source/interfacer"; - # further go package dependencies are defined in deps.nix, see line below. src = fetchFromGitHub { owner = "browsh-org"; repo = "browsh"; rev = "v${version}"; - sha256 = "0gvf5k1gm81xxg7ha309kgfkgl5357dli0fbc4z01rmfgbl0rfa0"; + sha256 = "sha256-/tH1w6qi+rimsqtk8Y8AYljU3X4vbmoDtV07piWSBdw="; }; - nativeBuildInputs = [ go-bindata ]; + vendorSha256 = "sha256-eCvV3UuM/JtCgMqvwvqWF3bpOmPSos5Pfhu6ETaS58c="; - # embed the web extension in a go file and place it where it's supposed to - # be. See - # https://github.com/browsh-org/browsh/blob/v1.5.0/interfacer/contrib/xpi2bin.sh preBuild = '' - xpiprefix="$(mktemp -d)" - cp "${webext}" "$xpiprefix/browsh.xpi" - go-bindata \ - -prefix "$xpiprefix" \ - -pkg browsh \ - -o "$NIX_BUILD_TOP/go/src/${goPackagePath}/interfacer/src/browsh/webextension.go" \ - "$xpiprefix/browsh.xpi" - - sed \ - -e 's:Asset("/browsh.xpi"):Asset("browsh.xpi"):g' \ - -i "$NIX_BUILD_TOP/go/src/${goPackagePath}/interfacer/src/browsh/firefox.go" + cp "${webext}" src/browsh/browsh.xpi ''; - postBuild = '' - mv "$NIX_BUILD_TOP/go/bin/src" "$NIX_BUILD_TOP/go/bin/browsh" - ''; - - goDeps = ./deps.nix; + # Tests require network access + doCheck = false; meta = with lib; { description = "A fully-modern text-based browser, rendering to TTY and browsers"; homepage = "https://www.brow.sh/"; - maintainers = [ maintainers.kalbasit ]; + maintainers = with maintainers; [ kalbasit siraben ]; license = lib.licenses.lgpl21; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; diff --git a/pkgs/applications/networking/browsers/browsh/deps.nix b/pkgs/applications/networking/browsers/browsh/deps.nix deleted file mode 100644 index 12154af752da..000000000000 --- a/pkgs/applications/networking/browsers/browsh/deps.nix +++ /dev/null @@ -1,264 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/NYTimes/gziphandler"; - fetch = { - type = "git"; - url = "https://github.com/NYTimes/gziphandler"; - rev = "dd0439581c7657cb652dfe5c71d7d48baf39541d"; - sha256 = "0rhrjlw220hnymzfccm0yir3pc9dpj7h3gwzhzq2cbsb3hhsqvyy"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "github.com/gdamore/encoding"; - fetch = { - type = "git"; - url = "https://github.com/gdamore/encoding"; - rev = "6289cdc94c00ac4aa177771c5fce7af2f96b626d"; - sha256 = "1vmm5zll92i2fm4ajqx0gyx0p9j36496x5nabi3y0x7h0inv0pk9"; - }; - } - { - goPackagePath = "github.com/gdamore/tcell"; - fetch = { - type = "git"; - url = "https://github.com/gdamore/tcell"; - rev = "b5d0c1ac570211e469f43ff88c0c6aa4b56cc99a"; - sha256 = "0g2zfbgyk3djlk0qpmrgcyy0ba9ad932yswpaacswi21qyf9gwag"; - }; - } - { - goPackagePath = "github.com/go-errors/errors"; - fetch = { - type = "git"; - url = "https://github.com/go-errors/errors"; - rev = "a6af135bd4e28680facf08a3d206b454abc877a4"; - sha256 = "0rznpknk19rxkr7li6dqs52c26pjazp69lh493l4ny4sxn5922lp"; - }; - } - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "66b9c49e59c6c48f0ffce28c2d8b8a5678502c6d"; - sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk"; - }; - } - { - goPackagePath = "github.com/hashicorp/hcl"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/hcl"; - rev = "8cb6e5b959231cc1119e43259c4a608f9c51a241"; - sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; - }; - } - { - goPackagePath = "github.com/hpcloud/tail"; - fetch = { - type = "git"; - url = "https://github.com/hpcloud/tail"; - rev = "a30252cb686a21eb2d0b98132633053ec2f7f1e5"; - sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0"; - }; - } - { - goPackagePath = "github.com/lucasb-eyer/go-colorful"; - fetch = { - type = "git"; - url = "https://github.com/lucasb-eyer/go-colorful"; - rev = "30298f24079860c4dee452fdef6519b362a4a026"; - sha256 = "0fig06880bvk1l92j4127v4x9sar4ds7ga8959gxxghb2w70b7l2"; - }; - } - { - goPackagePath = "github.com/magiconair/properties"; - fetch = { - type = "git"; - url = "https://github.com/magiconair/properties"; - rev = "de8848e004dd33dc07a2947b3d76f618a7fc7ef1"; - sha256 = "19zqw1x0w0crh8zc84yy82nkcc5yjz72gviaf2xjgfm5a8np7nyb"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "3ee7d812e62a0804a7d0a324e0249ca2db3476d3"; - sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs"; - }; - } - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "3536a929edddb9a5b34bd6861dc4a9647cb459fe"; - sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr"; - }; - } - { - goPackagePath = "github.com/onsi/ginkgo"; - fetch = { - type = "git"; - url = "https://github.com/onsi/ginkgo"; - rev = "eea6ad008b96acdaa524f5b409513bf062b500ad"; - sha256 = "1326s5fxgasdpz1qqwrw4n5p3k0vz44msnyz14knrhlw5l97lx33"; - }; - } - { - goPackagePath = "github.com/onsi/gomega"; - fetch = { - type = "git"; - url = "https://github.com/onsi/gomega"; - rev = "90e289841c1ed79b7a598a7cd9959750cb5e89e2"; - sha256 = "1n7i4hksdgv410m43v2sw14bl5vy59dkp6nlw5l76nibbh37syr9"; - }; - } - { - goPackagePath = "github.com/pelletier/go-toml"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "728039f679cbcd4f6a54e080d2219a4c4928c546"; - sha256 = "1v76s3vds0i9dxaha4ikd6xjm7vqqfk6sy9l6jc2lsvmj99d5sy6"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "ba968bfe8b2f7e042a574c888954fccecfa385b4"; - sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; - }; - } - { - goPackagePath = "github.com/shibukawa/configdir"; - fetch = { - type = "git"; - url = "https://github.com/shibukawa/configdir"; - rev = "e180dbdc8da04c4fa04272e875ce64949f38bd3e"; - sha256 = "0vbma9jkwh0ifz8dk2ssgmy7aiaify63lpa0lah7i4dkkxr94c9z"; - }; - } - { - goPackagePath = "github.com/spf13/afero"; - fetch = { - type = "git"; - url = "https://github.com/spf13/afero"; - rev = "588a75ec4f32903aa5e39a2619ba6a4631e28424"; - sha256 = "0j9r65qgd58324m85lkl49vk9dgwd62g7dwvkfcm3k6i9dc555a9"; - }; - } - { - goPackagePath = "github.com/spf13/cast"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cast"; - rev = "8c9545af88b134710ab1cd196795e7f2388358d7"; - sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5"; - }; - } - { - goPackagePath = "github.com/spf13/jwalterweatherman"; - fetch = { - type = "git"; - url = "https://github.com/spf13/jwalterweatherman"; - rev = "94f6ae3ed3bceceafa716478c5fbf8d29ca601a1"; - sha256 = "1ywmkwci5zyd88ijym6f30fj5c0k2yayxarkmnazf5ybljv50q7b"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "298182f68c66c05229eb03ac171abe6e309ee79a"; - sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; - }; - } - { - goPackagePath = "github.com/spf13/viper"; - fetch = { - type = "git"; - url = "https://github.com/spf13/viper"; - rev = "b5bf975e5823809fb22c7644d008757f78a4259e"; - sha256 = "1zpzxvn13wpvbblbbn73svaq39zgxfjqhci9d68g3qf309pcfy19"; - }; - } - { - goPackagePath = "github.com/ulule/limiter"; - fetch = { - type = "git"; - url = "https://github.com/ulule/limiter"; - rev = "38b2a440be905c8be884fd5e114dc893a64e5d81"; - sha256 = "0sbbfz9k3m2hf45cx7y7xshsr3rac495lks9ciwmnrzsnxfdh3l5"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "461777fb6f67e8cb9d70cda16573678d085a74cf"; - sha256 = "0sc0llch05q6h7nqgayi3sgismsznpnlsz4gh89y4klpymdcpbh2"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "93c9922d18aeb82498a065f07aec7ad7fa60dfb7"; - sha256 = "0hv96nwbv0li3nrv43ldfzmf12yrrbji2cf8n44iibv8ps5kfssx"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "342b2e1fbaa52c93f31447ad2c6abc048c63e475"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; - }; - } - { - goPackagePath = "gopkg.in/fsnotify.v1"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "gopkg.in/tomb.v1"; - fetch = { - type = "git"; - url = "https://github.com/go-tomb/tomb"; - rev = "dd632973f1e7218eb1089048e0798ec9ae7dceb8"; - sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://github.com/go-yaml/yaml"; - rev = "51d6538a90f86fe93ac480b35f37b2be17fef232"; - sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; - }; - } -] From d6ccd0064d0d80e753464e6c7448f63c1c2c9ff2 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sun, 24 Jul 2022 02:19:34 +0300 Subject: [PATCH 104/113] slop: add missing libSM dependency (#182506) * slop: format * slop: add missing libSM dependency --- pkgs/tools/misc/slop/default.nix | 38 +++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix index 69fa8d694541..d0736761bada 100644 --- a/pkgs/tools/misc/slop/default.nix +++ b/pkgs/tools/misc/slop/default.nix @@ -1,6 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config -, glew, glm, libGLU, libGL, libX11, libXext, libXrender, icu -, cppcheck +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, glew +, glm +, libGLU +, libGL +, libX11 +, libXext +, libXrender +, icu +, libSM }: stdenv.mkDerivation rec { @@ -14,17 +25,28 @@ stdenv.mkDerivation rec { sha256 = "sha256-LdBQxw8K8WWSfm4E2QpK4GYTuYvI+FX5gLOouVFSU/U="; }; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ glew glm libGLU libGL libX11 libXext libXrender icu ] - ++ lib.optional doCheck cppcheck; + nativeBuildInputs = [ + cmake + pkg-config + ]; - doCheck = false; + buildInputs = [ + glew + glm + libGLU + libGL + libX11 + libXext + libXrender + icu + libSM + ]; meta = with lib; { inherit (src.meta) homepage; description = "Queries a selection from the user and prints to stdout"; platforms = lib.platforms.linux; - license = lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; maintainers = with maintainers; [ ]; }; } From 98a24a173e62e4e715c6ca50f21127259b026f46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9C=E5=9D=82=E9=9B=85?= <23130178+ShadowRZ@users.noreply.github.com> Date: Sun, 24 Jul 2022 07:38:46 +0800 Subject: [PATCH 105/113] libsForQt5.kirigami-gallery: init at 22.04.3 (#182339) Co-authored-by: Ivv <41924494+IvarWithoutBones@users.noreply.github.com> Co-authored-by: Sandro --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/kirigami-gallery.nix | 31 ++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/applications/kde/kirigami-gallery.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 146ee9b145a7..316798712075 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -145,6 +145,7 @@ let kio-extras = callPackage ./kio-extras.nix {}; kio-gdrive = callPackage ./kio-gdrive.nix {}; kipi-plugins = callPackage ./kipi-plugins.nix {}; + kirigami-gallery = callPackage ./kirigami-gallery.nix {}; kitinerary = callPackage ./kitinerary.nix {}; kldap = callPackage ./kldap.nix {}; kleopatra = callPackage ./kleopatra.nix {}; diff --git a/pkgs/applications/kde/kirigami-gallery.nix b/pkgs/applications/kde/kirigami-gallery.nix new file mode 100644 index 000000000000..f012188ed992 --- /dev/null +++ b/pkgs/applications/kde/kirigami-gallery.nix @@ -0,0 +1,31 @@ +{ mkDerivation +, lib +, kirigami2 +, extra-cmake-modules +, kitemmodels +, qtgraphicaleffects +, qtquickcontrols2 +, qttools +, qtbase +}: + +mkDerivation rec { + pname = "kirigami-gallery"; + + nativeBuildInputs = [ extra-cmake-modules qttools ]; + + buildInputs = [ + qtgraphicaleffects + qtquickcontrols2 + kirigami2 + kitemmodels + ]; + + meta = with lib; { + homepage = "https://apps.kde.org/kirigami2.gallery/"; + description = "View examples of Kirigami components"; + license = licenses.lgpl2; + maintainers = with maintainers; [ shadowrz ]; + broken = versionOlder qtbase.version "5.15"; + }; +} From 1acad56b03fe76bbfe328eb0edf16a3308a90f19 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 Jul 2022 00:42:22 +0000 Subject: [PATCH 106/113] python310Packages.pyswitchbot: 0.14.1 -> 0.15.0 --- pkgs/development/python-modules/pyswitchbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index 961ef5f246a8..e66489bbc2e9 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.14.1"; + version = "0.15.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-/p5rmoxSl4Y3X1N3E3BSwPUGV8MCxI0sxv1i9w3fJiY="; + hash = "sha256-x1uRUr9mU510X2rSGBYBheB9rqsGBFr3SLnWcXiIBfk="; }; propagatedBuildInputs = [ From 780ac585679123f1b029d5e443fc57df75316cc4 Mon Sep 17 00:00:00 2001 From: Craftman7 Date: Sat, 23 Jul 2022 18:56:11 -0700 Subject: [PATCH 107/113] maintainers: add Crafter --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cde1edad6a50..50faa9ce29fd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2649,6 +2649,12 @@ fingerprint = "8026 D24A A966 BF9C D3CD CB3C 08FB 2BFC 470E 75B4"; }]; }; + Crafter = { + email = "crafter@crafter.rocks"; + github = "Craftzman7"; + githubId = 70068692; + name = "Crafter"; + }; craigem = { email = "craige@mcwhirter.io"; github = "craigem"; From 60a93661cab3fc9632ad57a464511a68063a2606 Mon Sep 17 00:00:00 2001 From: Craftman7 Date: Sat, 23 Jul 2022 18:56:33 -0700 Subject: [PATCH 108/113] railway: init at 1.8.3 --- pkgs/development/tools/railway/default.nix | 28 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/tools/railway/default.nix diff --git a/pkgs/development/tools/railway/default.nix b/pkgs/development/tools/railway/default.nix new file mode 100644 index 000000000000..e93cf7b57dc6 --- /dev/null +++ b/pkgs/development/tools/railway/default.nix @@ -0,0 +1,28 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "railway"; + version = "1.8.3"; + + src = fetchFromGitHub { + owner = "railwayapp"; + repo = "cli"; + rev = "v${version}"; + sha256 = "sha256-PAKg/8Ljcrz92M4sdKXZBe9Qa0NYwWnghzjxsCO8nhU="; + }; + + ldflags = [ "-s" "-w" ]; + + vendorSha256 = "sha256-nLuomuAScodgLUKzMTiygtFBnNHrqAojOySZgKLVGJY="; + + postInstall = '' + mv $out/bin/cli $out/bin/railway + ''; + + meta = with lib; { + description = "Railway CLI"; + homepage = "https://railway.app"; + license = licenses.mit; + maintainers = with maintainers; [ Crafter ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 480c5ab77043..e066e40835a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10010,6 +10010,8 @@ with pkgs; quilt = callPackage ../development/tools/quilt { }; + railway = callPackage ../development/tools/railway { }; + quota = if stdenv.isLinux then linuxquota else unixtools.quota; qvge = libsForQt5.callPackage ../applications/graphics/qvge { }; From c6b7abc361569ec886b4a89c8b85aace13c2cb76 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 Jul 2022 02:41:35 +0000 Subject: [PATCH 109/113] git-machete: 3.11.2 -> 3.11.3 --- .../version-management/git-and-tools/git-machete/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index d0fabf46b65c..bfa1e578fda9 100644 --- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.11.2"; + version = "3.11.3"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - sha256 = "sha256-alSok5/qcAOBUTNlGjeVSEbT4xW+HzPWj59njfXpG6w="; + sha256 = "sha256-3DIRHvl6r/NhTEQiGqgY59xSI4Y67xRcETgyVv1DIVA="; }; nativeBuildInputs = [ installShellFiles ]; From d3515dd4a78f041a84c275e7caf9bbb13e9f8922 Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Sat, 30 Apr 2022 11:53:45 +0000 Subject: [PATCH 110/113] coccinelle: 1.1.0 -> 1.1.1 --- .../tools/misc/coccinelle/default.nix | 56 +++++++++++++++---- 1 file changed, 44 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix index 2d9aa55ed050..66424e439684 100644 --- a/pkgs/development/tools/misc/coccinelle/default.nix +++ b/pkgs/development/tools/misc/coccinelle/default.nix @@ -1,21 +1,53 @@ -{ fetchurl, lib, stdenv, python3, ncurses, ocamlPackages, pkg-config }: +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, ocamlPackages +, pkg-config +, autoreconfHook +}: stdenv.mkDerivation rec { pname = "coccinelle"; - version = "1.1.0"; + version = "1.1.1"; - src = fetchurl { - url = "https://coccinelle.gitlabpages.inria.fr/website/distrib/${pname}-${version}.tar.gz"; - sha256 = "0k0x4qnxzj8fymkp6y9irggcah070hj7hxq8l6ddj8ccpmjbhnsb"; + src = fetchFromGitHub { + repo = pname; + rev = version; + owner = "coccinelle"; + hash = "sha256-rS9Ktp/YcXF0xUtT4XZtH5F9huvde0vRztY7vGtyuqY="; }; - buildInputs = with ocamlPackages; [ - ocaml findlib menhir - ocaml_pcre parmap stdcompat - python3 ncurses pkg-config + patches = [ + # Fix data path lookup. + # https://github.com/coccinelle/coccinelle/pull/270 + (fetchpatch { + url = "https://github.com/coccinelle/coccinelle/commit/540888ff426e0b1f7907b63ce26e712d1fc172cc.patch"; + sha256 = "sha256-W8RNIWDAC3lQ5bG+gD50r7x919JIcZRpt3QSOSMWpW4="; + }) ]; - doCheck = false; + nativeBuildInputs = with ocamlPackages; [ + autoreconfHook + pkg-config + ocaml + findlib + menhir + ]; + + buildInputs = with ocamlPackages; [ + ocaml_pcre + parmap + pyml + stdcompat + ]; + + strictDeps = true; + + postPatch = '' + # Ensure dependencies from Nixpkgs are picked up. + rm -rf bundles/ + ''; meta = { description = "Program to apply semantic patches to C code"; @@ -33,8 +65,8 @@ stdenv.mkDerivation rec { and others) for finding and fixing bugs in systems code. ''; - homepage = "http://coccinelle.lip6.fr/"; - license = lib.licenses.gpl2; + homepage = "https://coccinelle.gitlabpages.inria.fr/website/"; + license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.thoughtpolice ]; }; From 46cf1b978133b993eacf30a3c564df29044df0e5 Mon Sep 17 00:00:00 2001 From: Kamil Date: Sun, 24 Jul 2022 06:20:15 +0300 Subject: [PATCH 111/113] tbb: Fix build for aarch64-darwin (#182367) --- pkgs/development/libraries/tbb/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index 1d739810e9e6..4617614b25ee 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -36,6 +36,13 @@ stdenv.mkDerivation rec { url = "https://github.com/oneapi-src/oneTBB/pull/833/commits/c18342ba667d1f33f5e9a773aa86b091a9694b97.patch"; sha256 = "ZUExE3nsW80Z5GPWZnDNuDiHHaD1EF7qNl/G5M+Wcxg="; }) + + # Fixes build for aarch64-darwin + (fetchurl { + name = "aarch64-darwin.patch"; + url = "https://github.com/oneapi-src/oneTBB/pull/258/commits/86f6dcdc17a8f5ef2382faaef860cfa5243984fe.patch"; + sha256 = "sha256-JXqrFPCb3q1vfxk752tQu7HhApCB4YH2LoVnGRwmspk="; + }) ]; nativeBuildInputs = lib.optionals stdenv.isDarwin [ From 422acf32d0e88e2c5e4ab2ae8732b48e7f3e54fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 24 Jul 2022 08:23:49 +0200 Subject: [PATCH 112/113] libsolv: replace lzma alias with actual xz attribute --- pkgs/development/libraries/libsolv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index 67797100aa9a..7267b7d99b2f 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, ninja, pkg-config -, zlib, lzma, bzip2, zchunk, zstd +, zlib, xz, bzip2, zchunk, zstd , expat, rpm, db }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake ninja pkg-config ]; - buildInputs = [ zlib lzma bzip2 zchunk zstd expat rpm db ]; + buildInputs = [ zlib xz bzip2 zchunk zstd expat rpm db ]; meta = with lib; { description = "A free package dependency solver"; From 47f09a22851fde43c3b690d220449b0dac2935a5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 24 Jul 2022 03:57:29 +0000 Subject: [PATCH 113/113] terraform-providers: update 2022-07-24 --- .../terraform-providers/providers.json | 194 +++++++++--------- 1 file changed, 97 insertions(+), 97 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index cd8cf81c903d..e714ad4afd73 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -3,10 +3,10 @@ "owner": "CiscoDevNet", "provider-source-address": "registry.terraform.io/CiscoDevNet/aci", "repo": "terraform-provider-aci", - "rev": "v2.3.0", - "sha256": "sha256-V4LvMVWuKsGMVo/P8r79ICy3SrsVmCOMl75yRIixqAQ=", + "rev": "v2.4.0", + "sha256": "sha256-jP9C2RF0lTzQ2HB21WPAZ1aONcQijiYxfi7miltT7W0=", "vendorSha256": null, - "version": "2.3.0" + "version": "2.4.0" }, "acme": { "owner": "vancluever", @@ -49,10 +49,10 @@ "owner": "aliyun", "provider-source-address": "registry.terraform.io/aliyun/alicloud", "repo": "terraform-provider-alicloud", - "rev": "v1.176.0", - "sha256": "sha256-YMcB1CdnXdYHBUdghFP/4BHCtWfOSzPXMD+VZp49VY0=", - "vendorSha256": "sha256-6FiVXy/q3WImYDbwvj9e3ns9gilaL6GBW5qCpaUNCW0=", - "version": "1.176.0" + "rev": "v1.177.0", + "sha256": "sha256-Fm0ECJ/pszClIlzqRcW8jKwU+PfejL8D8ln/5GxWHH8=", + "vendorSha256": "sha256-pia256CKguRY+Acedq6QJmgBpiIGwxgn6tchFB6qjwQ=", + "version": "1.177.0" }, "ansible": { "owner": "nbering", @@ -76,37 +76,37 @@ "owner": "auth0", "provider-source-address": "registry.terraform.io/auth0/auth0", "repo": "terraform-provider-auth0", - "rev": "v0.33.0", - "sha256": "sha256-yAt2uBrkHS6TalHArSikRxTo8s0g/PoNoPBS/d/iWzY=", - "vendorSha256": "sha256-HJtG2sCQpY9rTSwHj2PjSiF8236VLufF9B9TyubGD/Q=", - "version": "0.33.0" + "rev": "v0.34.0", + "sha256": "sha256-wjqJf3MgLL5NAXp0Nf9VWg8D8jEKvyXoLCMq9yyyFGM=", + "vendorSha256": "sha256-5OIMhuzM/jTXNeZpMG3BOOUTmJyoLrbOjR2O7ixDDlM=", + "version": "0.34.0" }, "avi": { "owner": "vmware", "provider-source-address": "registry.terraform.io/vmware/avi", "repo": "terraform-provider-avi", - "rev": "v21.1.4", - "sha256": "sha256-6H56TRA3I0CQ9/d8JdP5JNL0u3lpS8YhCvdSM5bxYp8=", - "vendorSha256": "sha256-b0MwGmgugZdmVk7ZVBSCivDQ4n+tLABymH/igo/S1Wc=", - "version": "21.1.4" + "rev": "v22.1.1", + "sha256": "sha256-BQ4M1e7wWDCq2HEJIoAAqSUmq9hV66auvH47p3j2M8I=", + "vendorSha256": "sha256-otOArethLfanpp3KjQCutrlOxkcpr+6YHn5xWl31feE=", + "version": "22.1.1" }, "aviatrix": { "owner": "AviatrixSystems", "provider-source-address": "registry.terraform.io/AviatrixSystems/aviatrix", "repo": "terraform-provider-aviatrix", - "rev": "v2.22.1", - "sha256": "sha256-jvk6j/JZvRSq1ywlkJdCXGFrJccjViCVAIe+z4SjiUk=", + "rev": "v2.22.2", + "sha256": "sha256-3IzIeixm63r42s/Bs8EMemxK0u0TSCWgTuPw3FoBSws=", "vendorSha256": null, - "version": "2.22.1" + "version": "2.22.2" }, "aws": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v4.22.0", - "sha256": "sha256-F+YzXIKkF/eGUY3l8MjeP+8GqS37e1N9b+fmNCkdeMM=", - "vendorSha256": "sha256-kz0bPsfLCekRj/ZGCBT+eFRMRkV+Dc69RkyBbFaztd0=", - "version": "4.22.0" + "rev": "v4.23.0", + "sha256": "sha256-cl58lC2oAT+8kISm59E1zRq9pZk+xaQxVxnDge/9jFk=", + "vendorSha256": "sha256-ew6s5QbGOibhCyhbhEjCCVA6d7BrhH7UPovizv/U85Y=", + "version": "4.23.0" }, "azuread": { "owner": "hashicorp", @@ -121,10 +121,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v3.14.0", - "sha256": "sha256-/lE+PuljWG57d3tSiNo0ED4Cj2fJbyDsWNqdYcl1vS4=", + "rev": "v3.15.0", + "sha256": "sha256-U6AVVbX1IuYIASuC7W9ZLpXjT/aOBrg+H7mbVwJfZMc=", "vendorSha256": null, - "version": "3.14.0" + "version": "3.15.0" }, "azurestack": { "owner": "hashicorp", @@ -377,10 +377,10 @@ "owner": "exoscale", "provider-source-address": "registry.terraform.io/exoscale/exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.38.0", - "sha256": "sha256-TVJlfce5bF5Z64FOPKqb0ac+NtjzeHsid+Q7vWIINuk=", + "rev": "v0.39.1", + "sha256": "sha256-dsTKh/Fx0PEka/vOy/AJ3CAcE2lpY7x62ms0sTIPwOw=", "vendorSha256": null, - "version": "0.38.0" + "version": "0.39.1" }, "external": { "owner": "hashicorp", @@ -395,19 +395,19 @@ "owner": "fastly", "provider-source-address": "registry.terraform.io/fastly/fastly", "repo": "terraform-provider-fastly", - "rev": "v2.2.0", - "sha256": "sha256-x5Rl4JW59kuAoX0pSpCpto3dcvyEhvZlocg8fv2R6Jw=", + "rev": "v2.2.1", + "sha256": "sha256-Ls5yTkwnvBjvGyJZ9Hr+BE6jFuwoTfl/iFVf3WsduF8=", "vendorSha256": null, - "version": "2.2.0" + "version": "2.2.1" }, "flexibleengine": { "owner": "FlexibleEngineCloud", "provider-source-address": "registry.terraform.io/FlexibleEngineCloud/flexibleengine", "repo": "terraform-provider-flexibleengine", - "rev": "v1.31.0", - "sha256": "sha256-Vu6XRRtN+04Hg1OhZ42QaqFiVbov0Zg5v6Rbyeyz410=", + "rev": "v1.31.1", + "sha256": "sha256-QB3O9Ez+hFgBE1yYi1kqtC3WW//Ueg/Ij4p2WbQz/AE=", "vendorSha256": "sha256-P2/yK6aLNdmC8g5dMKK0hpAdj76KtewzVVHQsVgr3J4=", - "version": "1.31.0" + "version": "1.31.1" }, "fortios": { "owner": "fortinetdev", @@ -431,10 +431,10 @@ "owner": "integrations", "provider-source-address": "registry.terraform.io/integrations/github", "repo": "terraform-provider-github", - "rev": "v4.27.0", - "sha256": "sha256-cQMkBhXvD5sO9obHGH64GcDg6v5X5qs9QHwjyBNkRww=", + "rev": "v4.27.1", + "sha256": "sha256-Pu8I+tAcrEN8ZtBv/gH1VguO1GVk3tnqeJ50cLh7/HQ=", "vendorSha256": null, - "version": "4.27.0" + "version": "4.27.1" }, "gitlab": { "owner": "gitlabhq", @@ -450,20 +450,20 @@ "provider-source-address": "registry.terraform.io/hashicorp/google", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.28.0", - "sha256": "sha256-Dy0T5/G8vzaE688o/lb4H3ccE0mGnTRDQHIxcvs1C9k=", - "vendorSha256": "sha256-c836amEF3krq1ERNZGTUgQ6nzPUKg8GiJ2RkDmcVPNk=", - "version": "4.28.0" + "rev": "v4.29.0", + "sha256": "sha256-4qWqL/A/Q9tOokhQc8HMgqNVnLjfLkMKM8JfSZSMuj8=", + "vendorSha256": "sha256-slZpug9kyO3BNARwBUgZLRj0QWkUAKzb9eSVhth9zhY=", + "version": "4.29.0" }, "google-beta": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google-beta", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.28.0", - "sha256": "sha256-faYPwFcusDVM1TM5I9sgpUBER8TB2ltaTryyDvLQz9g=", - "vendorSha256": "sha256-c836amEF3krq1ERNZGTUgQ6nzPUKg8GiJ2RkDmcVPNk=", - "version": "4.28.0" + "rev": "v4.29.0", + "sha256": "sha256-bBpJ+iG/wTXUQCVIPyEyyZG41Qeot8unGF0qQj2Pco8=", + "vendorSha256": "sha256-slZpug9kyO3BNARwBUgZLRj0QWkUAKzb9eSVhth9zhY=", + "version": "4.29.0" }, "googleworkspace": { "owner": "hashicorp", @@ -487,19 +487,19 @@ "owner": "gridscale", "provider-source-address": "registry.terraform.io/gridscale/gridscale", "repo": "terraform-provider-gridscale", - "rev": "v1.14.3", - "sha256": "sha256-OGVIZ6q8qq4XkkWxjX5BQCJE9qubJ5Xnt2DrD23JGB8=", + "rev": "v1.15.0", + "sha256": "sha256-vbFrwAZBazZok4LwXTTa4QIZpHxIPKv3x6vUyVt2S2I=", "vendorSha256": null, - "version": "1.14.3" + "version": "1.15.0" }, "hcloud": { "owner": "hetznercloud", "provider-source-address": "registry.terraform.io/hetznercloud/hcloud", "repo": "terraform-provider-hcloud", - "rev": "v1.34.3", - "sha256": "sha256-3p7pdpBxrbKZx6di39GQb2DOS2ZtN4uVmIb2OU0Zs+c=", + "rev": "v1.35.0", + "sha256": "sha256-64WfmC0QZRYP3L9Lf3bT5Cy5qOAlCpNt6ME/xe8U6MA=", "vendorSha256": "sha256-3JFdsuJlDW6xTgSgn7hkIWfH9Iqr35t8op4yVXYIFpg=", - "version": "1.34.3" + "version": "1.35.0" }, "helm": { "owner": "hashicorp", @@ -514,10 +514,10 @@ "owner": "heroku", "provider-source-address": "registry.terraform.io/heroku/heroku", "repo": "terraform-provider-heroku", - "rev": "v5.1.0", - "sha256": "sha256-MMX8zaM3J2GxMXUX0YNX03V8uQzb67cIUF432tjm3Mw=", + "rev": "v5.1.1", + "sha256": "sha256-lXMxIxXgjW2hD4wJQBnc19WFym4zJSKq3dUeUbIqiOQ=", "vendorSha256": null, - "version": "5.1.0" + "version": "5.1.1" }, "hetznerdns": { "owner": "timohirt", @@ -676,10 +676,10 @@ "owner": "linode", "provider-source-address": "registry.terraform.io/linode/linode", "repo": "terraform-provider-linode", - "rev": "v1.28.0", - "sha256": "sha256-FkfyyG+DcfsTQY319zmg5iiCgAW8Eu2PxWF35vd51Ng=", - "vendorSha256": "sha256-fWD1Qf6vFe/MH2K2yFufCFBcVuos7FD31ShOA9GvsWw=", - "version": "1.28.0" + "rev": "v1.28.1", + "sha256": "sha256-w7PvzcgyzrkxQ+I8Bjw5C3MqMmiJS5neuGipC+H+mEM=", + "vendorSha256": "sha256-c0NtM3TkkSjrwQ9fj0XiH0BYnSsE8uzirkTv2QHzPOg=", + "version": "1.28.1" }, "linuxbox": { "owner": "numtide", @@ -794,10 +794,10 @@ "owner": "newrelic", "provider-source-address": "registry.terraform.io/newrelic/newrelic", "repo": "terraform-provider-newrelic", - "rev": "v2.48.2", - "sha256": "sha256-iLgc9nkeQIElVvu7+Pw5yZyzsx3VovCKOoJMIPigBGo=", - "vendorSha256": "sha256-ch+xeSTIu1zkbPN/zq3BKywNLt6ip1HxYCvSmU+0+mI=", - "version": "2.48.2" + "rev": "v2.49.1", + "sha256": "sha256-+jjMdBj8yEJBA9etiRo3qu+/KfpOe3Gb2DqCR8YPzPI=", + "vendorSha256": "sha256-iIArzW/r57OCtq/lNaFCvQrrGJ8WPHo4md+JrHdMyGs=", + "version": "2.49.1" }, "nomad": { "owner": "hashicorp", @@ -849,10 +849,10 @@ "owner": "oracle", "provider-source-address": "registry.terraform.io/oracle/oci", "repo": "terraform-provider-oci", - "rev": "v4.84.0", - "sha256": "sha256-fLWA7SPoCzO2TZkxnUw5K07OCAQYd+X5BMnHeIdAEdA=", + "rev": "v4.85.0", + "sha256": "sha256-Idqd8l2vxgWyV7uze66mP2/+KKaPQug8FXfyDb8d1Vg=", "vendorSha256": null, - "version": "4.84.0" + "version": "4.85.0" }, "okta": { "owner": "okta", @@ -894,19 +894,19 @@ "owner": "opentelekomcloud", "provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.30.0", - "sha256": "sha256-goXQlsOw/nE4d+9VXfqr1yhf/DEOtlVdIS2QJ2s4+8M=", + "rev": "v1.30.1", + "sha256": "sha256-FIxW/bxs/w4j/YyYIYLQHH3Nh4TUWNb2pGqC6zjBiww=", "vendorSha256": "sha256-0QKYpjA9iv8dSOZ5mIqJ/hpQxlgd+5Y/txBDa0Gsqqc=", - "version": "1.30.0" + "version": "1.30.1" }, "opsgenie": { "owner": "opsgenie", "provider-source-address": "registry.terraform.io/opsgenie/opsgenie", "repo": "terraform-provider-opsgenie", - "rev": "v0.6.10", - "sha256": "sha256-nA3AXwvVFBnyVK8qeUN0AUzISpAYzVdLtyBQNbUxuM8=", + "rev": "v0.6.11", + "sha256": "sha256-R+IKAI86DhQ2E74VpswqG75p7PRzSV77at2+dAyI5RI=", "vendorSha256": null, - "version": "0.6.10" + "version": "0.6.11" }, "ovh": { "owner": "ovh", @@ -1011,10 +1011,10 @@ "owner": "scaleway", "provider-source-address": "registry.terraform.io/scaleway/scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.2.2", - "sha256": "sha256-uSJga2M+9unC8eJkUjhuCQbTTGXEYGky4MJyVL0ZfiQ=", - "vendorSha256": "sha256-DOL38q5463aOMijP6AbBuE7jI7hvLYLm8yCBxrr6DoA=", - "version": "2.2.2" + "rev": "v2.2.3", + "sha256": "sha256-XiGc6MU0TrpaZL0SRKez2IUFM7MZIu8tGMFIUQJzbv4=", + "vendorSha256": "sha256-pDDk4cGCZEotOfL1OLEVJVQ35lI/fdNh2NNjAkIHTZ0=", + "version": "2.2.3" }, "secret": { "owner": "numtide", @@ -1038,10 +1038,10 @@ "owner": "jianyuan", "provider-source-address": "registry.terraform.io/jianyuan/sentry", "repo": "terraform-provider-sentry", - "rev": "v0.9.2", - "sha256": "sha256-/Am4v+s7l3hDCbvIV34aG9C+dMEtPS6qB97FywcZcho=", - "vendorSha256": "sha256-A8VxxoMYd8Z4DRFmBLh/uSzjWxIyLQGtV4kGbuDfv8I=", - "version": "0.9.2" + "rev": "v0.9.3", + "sha256": "sha256-FTwJ0H5k5zeglgjur3O6b4GybWAmVF4K7QmNMlvHnlY=", + "vendorSha256": "sha256-lmnZLgCTpKGhk+rUWwL2GQoBAXlU006Sk1GZrcEvhD4=", + "version": "0.9.3" }, "shell": { "owner": "scottwinkler", @@ -1056,10 +1056,10 @@ "owner": "splunk-terraform", "provider-source-address": "registry.terraform.io/splunk-terraform/signalfx", "repo": "terraform-provider-signalfx", - "rev": "v6.13.1", - "sha256": "sha256-OtWJgLObTaWCGOjxN8nlkmfW+D6EMS0esht/OkJaioM=", - "vendorSha256": "sha256-yWqUsObvABwmA6V9ecz8SFtk1Bhdq2/dUpnNLKQtuNM=", - "version": "6.13.1" + "rev": "v6.14.0", + "sha256": "sha256-29yN8n/m/1kSl9xRlf5dae9KOL16FvfZJuM1fLqWPd4=", + "vendorSha256": "sha256-I9fWw6wJiytEuiT8gQVSTKuQggXCMENn4RBxPsenZOY=", + "version": "6.14.0" }, "skytap": { "owner": "skytap", @@ -1074,10 +1074,10 @@ "owner": "Snowflake-Labs", "provider-source-address": "registry.terraform.io/Snowflake-Labs/snowflake", "repo": "terraform-provider-snowflake", - "rev": "v0.39.0", - "sha256": "sha256-I15vLcZtVPs/37vRuJk5qiiWxNXY561gpWkOLw4ZN6w=", + "rev": "v0.40.0", + "sha256": "sha256-xouzlgI7MkFfela0ZgaX318YhgBLN5/qN+yqZ7rxVGQ=", "vendorSha256": "sha256-I0d7Nm8h7vBHxvcyTousg7Uc+QuYu8FCPabPNMw8rGM=", - "version": "0.39.0" + "version": "0.40.0" }, "sops": { "owner": "carlpett", @@ -1128,10 +1128,10 @@ "owner": "tencentcloudstack", "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", - "rev": "v1.76.0", - "sha256": "sha256-Qfe2j6y2qn1GVtsv9+Sy7r9tmPMuAkkNNsOqno2nCx8=", + "rev": "v1.76.2", + "sha256": "sha256-dtymdUggjQk3v8FWWBktMe2kPoeEn3FBsXSZ12JneRw=", "vendorSha256": null, - "version": "1.76.0" + "version": "1.76.2" }, "tfe": { "owner": "hashicorp", @@ -1164,10 +1164,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/tls", "repo": "terraform-provider-tls", - "rev": "v3.4.0", - "sha256": "sha256-14sKHnmUfDbXceH+bfSPuA1TKo6Q6kkazYwHC15D4vY=", - "vendorSha256": "sha256-o7QvF6Z/HCyb/EBr0m90B63AVKqxteQEBXe+OuovnYg=", - "version": "3.4.0" + "rev": "v4.0.0", + "sha256": "sha256-owOYnn4tIvdCxCZLaAhq9UwcgDIwyrISVTxWjC6oRM8=", + "vendorSha256": "sha256-Uk20wDu2qIs9Ez/H6NyHMS7i34Il0ReuDzC3MnKdHSk=", + "version": "4.0.0" }, "triton": { "deleteVendor": true, @@ -1201,10 +1201,10 @@ "owner": "cloudposse", "provider-source-address": "registry.terraform.io/cloudposse/utils", "repo": "terraform-provider-utils", - "rev": "0.17.27", - "sha256": "sha256-FE2G0EOjI4D9HzH05eiwTHc4ZN+5NfcJXYoMUZN+OWM=", - "vendorSha256": "sha256-/ZxmvsKTteAvl9NoCyxSQk4llDsGZmZTZxEIPlqXvY0=", - "version": "0.17.27" + "rev": "0.17.28", + "sha256": "sha256-8Ep4eYpFSJtIA7twOpUI5ns4/lqSnM07MflQJLnC8eU=", + "vendorSha256": "sha256-6ELd3Cxc460TY+XY1AcDQamYg76hWad6bO9BzTEWleU=", + "version": "0.17.28" }, "vault": { "owner": "hashicorp",