From e9a5942610d09b77e355ba6327a261a60ed96bcf Mon Sep 17 00:00:00 2001 From: Vincent Fischer Date: Tue, 23 Aug 2022 11:54:04 +0200 Subject: [PATCH 001/114] add new maintainer astrobeastie --- maintainers/maintainer-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6e677fe04b7..1bd92495f8d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1186,6 +1186,15 @@ githubId = 12923; name = "Astro"; }; + astrobeastie = { + email = "fischervincent98@gmail.com"; + github = "astrobeastie"; + githubId = 26362368; + name = "Vincent Fischer"; + keys = [{ + fingerprint = "BF47 81E1 F304 1ADF 18CE C401 DE16 C7D1 536D A72F"; + }]; + }; astsmtl = { email = "astsmtl@yandex.ru"; github = "astsmtl"; From 61405895687427cb98a2f7bb83f8cc1e515c791e Mon Sep 17 00:00:00 2001 From: Vincent Fischer Date: Tue, 23 Aug 2022 12:36:41 +0200 Subject: [PATCH 002/114] cargo-hf2: init at 0.3.3 --- .../tools/rust/cargo-hf2/add-cargo-lock.patch | 789 ++++++++++++++++++ .../tools/rust/cargo-hf2/default.nix | 36 + pkgs/top-level/all-packages.nix | 2 + 3 files changed, 827 insertions(+) create mode 100644 pkgs/development/tools/rust/cargo-hf2/add-cargo-lock.patch create mode 100644 pkgs/development/tools/rust/cargo-hf2/default.nix diff --git a/pkgs/development/tools/rust/cargo-hf2/add-cargo-lock.patch b/pkgs/development/tools/rust/cargo-hf2/add-cargo-lock.patch new file mode 100644 index 00000000000..8b7dba9a2cf --- /dev/null +++ b/pkgs/development/tools/rust/cargo-hf2/add-cargo-lock.patch @@ -0,0 +1,789 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..c249e21 +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,783 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++version = 3 ++ ++[[package]] ++name = "addr2line" ++version = "0.17.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" ++dependencies = [ ++ "gimli", ++] ++ ++[[package]] ++name = "adler" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" ++ ++[[package]] ++name = "aho-corasick" ++version = "0.7.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "android_system_properties" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d7ed72e1635e121ca3e79420540282af22da58be50de153d36f81ddc6b83aa9e" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "ansi_term" ++version = "0.12.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" ++dependencies = [ ++ "winapi", ++] ++ ++[[package]] ++name = "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 = "backtrace" ++version = "0.3.66" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" ++dependencies = [ ++ "addr2line", ++ "cc", ++ "cfg-if", ++ "libc", ++ "miniz_oxide", ++ "object", ++ "rustc-demangle", ++] ++ ++[[package]] ++name = "bitflags" ++version = "1.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" ++ ++[[package]] ++name = "bumpalo" ++version = "3.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d" ++ ++[[package]] ++name = "cargo-hf2" ++version = "0.3.3" ++dependencies = [ ++ "cargo-project", ++ "colored", ++ "hf2", ++ "hidapi", ++ "log", ++ "maplit", ++ "pretty_env_logger 0.3.1", ++ "structopt", ++] ++ ++[[package]] ++name = "cargo-project" ++version = "0.2.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "04e57b974bffaf97c6a66551e4f947e34637ec25f35aaf9b45f03326a9e3874f" ++dependencies = [ ++ "failure", ++ "glob", ++ "log", ++ "rustc-cfg", ++ "serde", ++ "serde_derive", ++ "toml", ++] ++ ++[[package]] ++name = "cc" ++version = "1.0.73" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" ++ ++[[package]] ++name = "cfg-if" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" ++ ++[[package]] ++name = "chrono" ++version = "0.4.22" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" ++dependencies = [ ++ "iana-time-zone", ++ "js-sys", ++ "num-integer", ++ "num-traits", ++ "time", ++ "wasm-bindgen", ++ "winapi", ++] ++ ++[[package]] ++name = "clap" ++version = "2.34.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" ++dependencies = [ ++ "ansi_term", ++ "atty", ++ "bitflags", ++ "strsim", ++ "textwrap", ++ "unicode-width", ++ "vec_map", ++] ++ ++[[package]] ++name = "colored" ++version = "2.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" ++dependencies = [ ++ "atty", ++ "lazy_static", ++ "winapi", ++] ++ ++[[package]] ++name = "core-foundation-sys" ++version = "0.8.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" ++ ++[[package]] ++name = "crc-any" ++version = "2.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "774646b687f63643eb0f4bf13dc263cb581c8c9e57973b6ddf78bda3994d88df" ++ ++[[package]] ++name = "env_logger" ++version = "0.6.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3" ++dependencies = [ ++ "atty", ++ "humantime", ++ "log", ++ "regex", ++ "termcolor", ++] ++ ++[[package]] ++name = "env_logger" ++version = "0.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" ++dependencies = [ ++ "atty", ++ "humantime", ++ "log", ++ "regex", ++ "termcolor", ++] ++ ++[[package]] ++name = "failure" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" ++dependencies = [ ++ "backtrace", ++ "failure_derive", ++] ++ ++[[package]] ++name = "failure_derive" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++ "synstructure", ++] ++ ++[[package]] ++name = "gimli" ++version = "0.26.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" ++ ++[[package]] ++name = "glob" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" ++ ++[[package]] ++name = "goblin" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d20fd25aa456527ce4f544271ae4fea65d2eda4a6561ea56f39fb3ee4f7e3884" ++dependencies = [ ++ "log", ++ "plain", ++ "scroll", ++] ++ ++[[package]] ++name = "heck" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" ++dependencies = [ ++ "unicode-segmentation", ++] ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "hf2" ++version = "0.3.3" ++dependencies = [ ++ "crc-any", ++ "goblin", ++ "hidapi", ++ "log", ++ "maplit", ++ "scroll", ++] ++ ++[[package]] ++name = "hf2-cli" ++version = "0.3.3" ++dependencies = [ ++ "crc-any", ++ "hf2", ++ "hidapi", ++ "log", ++ "maplit", ++ "pretty_env_logger 0.4.0", ++ "structopt", ++] ++ ++[[package]] ++name = "hidapi" ++version = "1.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "38b1717343691998deb81766bfcd1dce6df0d5d6c37070b5a3de2bb6d39f7822" ++dependencies = [ ++ "cc", ++ "libc", ++ "pkg-config", ++] ++ ++[[package]] ++name = "humantime" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" ++dependencies = [ ++ "quick-error", ++] ++ ++[[package]] ++name = "iana-time-zone" ++version = "0.1.46" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ad2bfd338099682614d3ee3fe0cd72e0b6a41ca6a87f6a74a3bd593c91650501" ++dependencies = [ ++ "android_system_properties", ++ "core-foundation-sys", ++ "js-sys", ++ "wasm-bindgen", ++ "winapi", ++] ++ ++[[package]] ++name = "js-sys" ++version = "0.3.59" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2" ++dependencies = [ ++ "wasm-bindgen", ++] ++ ++[[package]] ++name = "lazy_static" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ++ ++[[package]] ++name = "libc" ++version = "0.2.132" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5" ++ ++[[package]] ++name = "log" ++version = "0.4.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" ++dependencies = [ ++ "cfg-if", ++] ++ ++[[package]] ++name = "maplit" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" ++ ++[[package]] ++name = "memchr" ++version = "2.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" ++ ++[[package]] ++name = "miniz_oxide" ++version = "0.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc" ++dependencies = [ ++ "adler", ++] ++ ++[[package]] ++name = "num-integer" ++version = "0.1.45" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" ++dependencies = [ ++ "autocfg", ++ "num-traits", ++] ++ ++[[package]] ++name = "num-traits" ++version = "0.2.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" ++dependencies = [ ++ "autocfg", ++] ++ ++[[package]] ++name = "object" ++version = "0.29.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "once_cell" ++version = "1.13.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e" ++ ++[[package]] ++name = "pkg-config" ++version = "0.3.25" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" ++ ++[[package]] ++name = "plain" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" ++ ++[[package]] ++name = "pretty_env_logger" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "717ee476b1690853d222af4634056d830b5197ffd747726a9a1eee6da9f49074" ++dependencies = [ ++ "chrono", ++ "env_logger 0.6.2", ++ "log", ++] ++ ++[[package]] ++name = "pretty_env_logger" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d" ++dependencies = [ ++ "env_logger 0.7.1", ++ "log", ++] ++ ++[[package]] ++name = "proc-macro-error" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" ++dependencies = [ ++ "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.43" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" ++dependencies = [ ++ "unicode-ident", ++] ++ ++[[package]] ++name = "quick-error" ++version = "1.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" ++ ++[[package]] ++name = "quote" ++version = "1.0.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" ++dependencies = [ ++ "proc-macro2", ++] ++ ++[[package]] ++name = "regex" ++version = "1.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" ++dependencies = [ ++ "aho-corasick", ++ "memchr", ++ "regex-syntax", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.6.27" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" ++ ++[[package]] ++name = "rustc-cfg" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ad221fe7cd09334f8735dcc157b1178e343f43dfaefcd1b09d7fd4fc0921b6f" ++dependencies = [ ++ "failure", ++] ++ ++[[package]] ++name = "rustc-demangle" ++version = "0.1.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" ++ ++[[package]] ++name = "scroll" ++version = "0.10.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fda28d4b4830b807a8b43f7b0e6b5df875311b3e7621d84577188c175b6ec1ec" ++dependencies = [ ++ "scroll_derive", ++] ++ ++[[package]] ++name = "scroll_derive" ++version = "0.10.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aaaae8f38bb311444cfb7f1979af0bc9240d95795f75f9ceddf6a59b79ceffa0" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "serde" ++version = "1.0.144" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860" ++ ++[[package]] ++name = "serde_derive" ++version = "1.0.144" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "strsim" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" ++ ++[[package]] ++name = "structopt" ++version = "0.3.26" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" ++dependencies = [ ++ "clap", ++ "lazy_static", ++ "structopt-derive", ++] ++ ++[[package]] ++name = "structopt-derive" ++version = "0.4.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" ++dependencies = [ ++ "heck", ++ "proc-macro-error", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "syn" ++version = "1.0.99" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-ident", ++] ++ ++[[package]] ++name = "synstructure" ++version = "0.12.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++ "unicode-xid", ++] ++ ++[[package]] ++name = "termcolor" ++version = "1.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" ++dependencies = [ ++ "winapi-util", ++] ++ ++[[package]] ++name = "textwrap" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" ++dependencies = [ ++ "unicode-width", ++] ++ ++[[package]] ++name = "time" ++version = "0.1.44" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" ++dependencies = [ ++ "libc", ++ "wasi", ++ "winapi", ++] ++ ++[[package]] ++name = "toml" ++version = "0.4.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" ++dependencies = [ ++ "serde", ++] ++ ++[[package]] ++name = "unicode-ident" ++version = "1.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" ++ ++[[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.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" ++ ++[[package]] ++name = "vec_map" ++version = "0.8.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" ++ ++[[package]] ++name = "version_check" ++version = "0.9.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" ++ ++[[package]] ++name = "wasi" ++version = "0.10.0+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" ++ ++[[package]] ++name = "wasm-bindgen" ++version = "0.2.82" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d" ++dependencies = [ ++ "cfg-if", ++ "wasm-bindgen-macro", ++] ++ ++[[package]] ++name = "wasm-bindgen-backend" ++version = "0.2.82" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f" ++dependencies = [ ++ "bumpalo", ++ "log", ++ "once_cell", ++ "proc-macro2", ++ "quote", ++ "syn", ++ "wasm-bindgen-shared", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro" ++version = "0.2.82" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602" ++dependencies = [ ++ "quote", ++ "wasm-bindgen-macro-support", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro-support" ++version = "0.2.82" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++ "wasm-bindgen-backend", ++ "wasm-bindgen-shared", ++] ++ ++[[package]] ++name = "wasm-bindgen-shared" ++version = "0.2.82" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a" ++ ++[[package]] ++name = "winapi" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", ++] ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++ ++[[package]] ++name = "winapi-util" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" ++dependencies = [ ++ "winapi", ++] ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/pkgs/development/tools/rust/cargo-hf2/default.nix b/pkgs/development/tools/rust/cargo-hf2/default.nix new file mode 100644 index 00000000000..4d3076ca7d6 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-hf2/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, libusb1 +, pkg-config +, rustfmt +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-hf2"; + version = "0.3.3"; + + src = fetchFromGitHub { + owner = "jacobrosenthal"; + repo = "hf2-rs"; + rev = "v${version}"; + sha256 = "1vkmdmc2041h7msygqb97zcl8vdxjqwy7w0lvbnw99h693q3hqa0"; + }; + + cargoPatches = [ + ./add-cargo-lock.patch + ]; + + cargoSha256 = "sha256-5aTqiJ23XuY9MNIt3lVMIJ+33BZkcS02HbctIJrnEfo="; + + nativeBuildInputs = [ pkg-config rustfmt ]; + buildInputs = [ libusb1 ]; + + meta = with lib; { + description = "Cargo Subcommand for Microsoft HID Flashing Library for UF2 Bootloaders "; + homepage = "https://lib.rs/crates/cargo-hf2"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ astrobeastie ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e905eb5542..ca874f4def9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14388,6 +14388,8 @@ with pkgs; inherit (darwin) libiconv; inherit (darwin.apple_sdk.frameworks) Security CoreFoundation; }; + + cargo-hf2 = callPackage ../development/tools/rust/cargo-hf2 { }; cargo-inspect = callPackage ../development/tools/rust/cargo-inspect { inherit (darwin.apple_sdk.frameworks) Security; }; From 3e0987eba142b8bbb8b0e2eb25554c8e3f1f268f Mon Sep 17 00:00:00 2001 From: Vincent Fischer Date: Tue, 23 Aug 2022 14:56:52 +0200 Subject: [PATCH 003/114] cargo-hf2: add AppKit dependency for Darwin --- pkgs/development/tools/rust/cargo-hf2/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-hf2/default.nix b/pkgs/development/tools/rust/cargo-hf2/default.nix index 4d3076ca7d6..8813af645e9 100644 --- a/pkgs/development/tools/rust/cargo-hf2/default.nix +++ b/pkgs/development/tools/rust/cargo-hf2/default.nix @@ -5,6 +5,7 @@ , libusb1 , pkg-config , rustfmt +, AppKit }: rustPlatform.buildRustPackage rec { @@ -25,7 +26,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-5aTqiJ23XuY9MNIt3lVMIJ+33BZkcS02HbctIJrnEfo="; nativeBuildInputs = [ pkg-config rustfmt ]; - buildInputs = [ libusb1 ]; + + buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; meta = with lib; { description = "Cargo Subcommand for Microsoft HID Flashing Library for UF2 Bootloaders "; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca874f4def9..9b1b67175d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14389,7 +14389,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security CoreFoundation; }; - cargo-hf2 = callPackage ../development/tools/rust/cargo-hf2 { }; + cargo-hf2 = callPackage ../development/tools/rust/cargo-hf2 { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; cargo-inspect = callPackage ../development/tools/rust/cargo-inspect { inherit (darwin.apple_sdk.frameworks) Security; }; From 66f79ca2a573506352109673f9e6a7e20dfa28c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Wed, 21 Sep 2022 12:31:18 +1000 Subject: [PATCH 004/114] python310Packages.pulumi-aws: mark as working on darwin and aarch64 --- pkgs/development/python-modules/pulumi-aws/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/pulumi-aws/default.nix b/pkgs/development/python-modules/pulumi-aws/default.nix index e6aaa0cd202..8637808b312 100644 --- a/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/pkgs/development/python-modules/pulumi-aws/default.nix @@ -40,7 +40,6 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; description = "Pulumi python amazon web services provider"; homepage = "https://github.com/pulumi/pulumi-aws"; license = licenses.asl20; From 870d6f4a98f19374d1188006574b8d55ca4a6547 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 29 Sep 2022 10:54:21 +0200 Subject: [PATCH 005/114] licenses: remove gpl1 --- lib/licenses.nix | 5 ----- pkgs/applications/audio/crip/default.nix | 2 +- pkgs/applications/audio/gbsplay/default.nix | 2 +- pkgs/applications/audio/pd-plugins/puremapping/default.nix | 2 +- pkgs/applications/misc/grsync/default.nix | 2 +- pkgs/applications/science/logic/prover9/default.nix | 2 +- pkgs/development/libraries/libdvbcsa/default.nix | 2 +- pkgs/development/python-modules/geeknote/default.nix | 2 +- pkgs/development/python-modules/hopcroftkarp/default.nix | 2 +- pkgs/development/python-modules/mysqlclient/default.nix | 2 +- pkgs/games/xbill/default.nix | 2 +- pkgs/misc/screensavers/electricsheep/default.nix | 2 +- pkgs/tools/graphics/graph-easy/default.nix | 2 +- pkgs/tools/networking/pirate-get/default.nix | 2 +- pkgs/tools/security/bmrsa/11.nix | 2 +- pkgs/tools/text/untex/default.nix | 2 +- 16 files changed, 15 insertions(+), 20 deletions(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index 6eeba6588be..5839013c177 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -969,11 +969,6 @@ in mkLicense lset) ({ fullName = "GNU Free Documentation License v1.3"; deprecated = true; }; - gpl1 = { - spdxId = "GPL-1.0"; - fullName = "GNU General Public License v1.0"; - deprecated = true; - }; gpl2 = { spdxId = "GPL-2.0"; fullName = "GNU General Public License v2.0"; diff --git a/pkgs/applications/audio/crip/default.nix b/pkgs/applications/audio/crip/default.nix index d635dce83f4..d41ebed0960 100644 --- a/pkgs/applications/audio/crip/default.nix +++ b/pkgs/applications/audio/crip/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://bach.dynet.com/crip/"; description = "Terminal-based ripper/encoder/tagger tool for creating Ogg Vorbis/FLAC files"; - license = lib.licenses.gpl1; + license = lib.licenses.gpl1Only; platforms = lib.platforms.linux; maintainers = [ maintainers.endgame ]; }; diff --git a/pkgs/applications/audio/gbsplay/default.nix b/pkgs/applications/audio/gbsplay/default.nix index 59253af2ad6..1e6bbdb4dd7 100644 --- a/pkgs/applications/audio/gbsplay/default.nix +++ b/pkgs/applications/audio/gbsplay/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Gameboy sound player"; - license = licenses.gpl1; + license = licenses.gpl1Plus; platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/applications/audio/pd-plugins/puremapping/default.nix b/pkgs/applications/audio/pd-plugins/puremapping/default.nix index 811b8c2ee9a..5aef92ab61f 100644 --- a/pkgs/applications/audio/pd-plugins/puremapping/default.nix +++ b/pkgs/applications/audio/pd-plugins/puremapping/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Set of externals to facilitate the use of sensors within Pure Data and to create complex relations between input and output of a dynamic system"; homepage = "http://www.chnry.net/ch/?090-Pure-Mapping&lang=en"; - license = lib.licenses.gpl1; + license = lib.licenses.gpl1Only; maintainers = [ lib.maintainers.magnetophon ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/applications/misc/grsync/default.nix b/pkgs/applications/misc/grsync/default.nix index c8068d68223..3a6a717b6e1 100644 --- a/pkgs/applications/misc/grsync/default.nix +++ b/pkgs/applications/misc/grsync/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Synchronize folders, files and make backups"; homepage = "http://www.opbyte.it/grsync/"; - license = licenses.gpl1; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = [ maintainers.kuznero ]; }; diff --git a/pkgs/applications/science/logic/prover9/default.nix b/pkgs/applications/science/logic/prover9/default.nix index aa01469bfbb..5c476be06e4 100644 --- a/pkgs/applications/science/logic/prover9/default.nix +++ b/pkgs/applications/science/logic/prover9/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://www.cs.unm.edu/~mccune/mace4/"; - license = licenses.gpl1; + license = licenses.gpl2Only; description = "Automated theorem prover for first-order and equational logic"; longDescription = '' Prover9 is a resolution/paramodulation automated theorem prover diff --git a/pkgs/development/libraries/libdvbcsa/default.nix b/pkgs/development/libraries/libdvbcsa/default.nix index 3eebaafe450..7da80a75d6a 100644 --- a/pkgs/development/libraries/libdvbcsa/default.nix +++ b/pkgs/development/libraries/libdvbcsa/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { description = "A free implementation of the DVB Common Scrambling Algorithm with encryption and decryption capabilities"; homepage = "http://www.videolan.org/developers/libdvbcsa.html"; platforms = lib.platforms.unix; - license = lib.licenses.gpl1; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ melias122 ]; }; diff --git a/pkgs/development/python-modules/geeknote/default.nix b/pkgs/development/python-modules/geeknote/default.nix index 6c416548184..813adfb0dbf 100644 --- a/pkgs/development/python-modules/geeknote/default.nix +++ b/pkgs/development/python-modules/geeknote/default.nix @@ -31,7 +31,7 @@ buildPythonPackage { meta = with lib; { description = "Work with Evernote from command line"; homepage = "http://www.geeknote.me"; - license = licenses.gpl1; + license = licenses.gpl1Only; maintainers = with maintainers; [ hbunke ]; }; diff --git a/pkgs/development/python-modules/hopcroftkarp/default.nix b/pkgs/development/python-modules/hopcroftkarp/default.nix index 995f10073c6..775ff1a50f5 100644 --- a/pkgs/development/python-modules/hopcroftkarp/default.nix +++ b/pkgs/development/python-modules/hopcroftkarp/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Implementation of HopcroftKarp's algorithm"; homepage = "https://github.com/sofiat-olaosebikan/hopcroftkarp"; - license = licenses.gpl1; + license = licenses.gpl3Only; maintainers = [ maintainers.costrouc ]; }; } diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix index c12b16611e9..0d043e789df 100644 --- a/pkgs/development/python-modules/mysqlclient/default.nix +++ b/pkgs/development/python-modules/mysqlclient/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface to MySQL"; homepage = "https://github.com/PyMySQL/mysqlclient-python"; - license = licenses.gpl1; + license = licenses.gpl2Only; maintainers = with maintainers; [ y0no ]; }; } diff --git a/pkgs/games/xbill/default.nix b/pkgs/games/xbill/default.nix index 765af44936a..ac387a4a8c0 100644 --- a/pkgs/games/xbill/default.nix +++ b/pkgs/games/xbill/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv; { description = "Protect a computer network from getting infected"; homepage = "http://www.xbill.org/"; - license = lib.licenses.gpl1; + license = lib.licenses.gpl1Only; maintainers = with lib.maintainers; [ aw ]; longDescription = '' Ever get the feeling that nothing is going right? You're a sysadmin, diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix index 4b79758ef89..0ab0f6bee31 100644 --- a/pkgs/misc/screensavers/electricsheep/default.nix +++ b/pkgs/misc/screensavers/electricsheep/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { homepage = "https://electricsheep.org/"; maintainers = with maintainers; [ ]; platforms = platforms.linux; - license = licenses.gpl1; + license = licenses.gpl2Only; }; } diff --git a/pkgs/tools/graphics/graph-easy/default.nix b/pkgs/tools/graphics/graph-easy/default.nix index 341d6dea90a..b12a56c963e 100644 --- a/pkgs/tools/graphics/graph-easy/default.nix +++ b/pkgs/tools/graphics/graph-easy/default.nix @@ -10,7 +10,7 @@ perlPackages.buildPerlPackage { meta = with lib; { description = "Render/convert graphs in/from various formats"; - license = licenses.gpl1; + license = licenses.gpl1Only; platforms = platforms.unix; maintainers = [ maintainers.jensbin ]; }; diff --git a/pkgs/tools/networking/pirate-get/default.nix b/pkgs/tools/networking/pirate-get/default.nix index 9b5846d6f76..ec2c821f6e8 100644 --- a/pkgs/tools/networking/pirate-get/default.nix +++ b/pkgs/tools/networking/pirate-get/default.nix @@ -16,7 +16,7 @@ buildPythonApplication rec { meta = with lib; { description = "A command line interface for The Pirate Bay"; homepage = "https://github.com/vikstrous/pirate-get"; - license = licenses.gpl1; + license = licenses.gpl3Plus; maintainers = with maintainers; [ rnhmjoj ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/security/bmrsa/11.nix b/pkgs/tools/security/bmrsa/11.nix index 71bdfae4e42..932566c6506 100644 --- a/pkgs/tools/security/bmrsa/11.nix +++ b/pkgs/tools/security/bmrsa/11.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "RSA utility"; homepage = "http://bmrsa.sourceforge.net/"; - license = licenses.gpl1; + license = licenses.gpl2Only; platforms = platforms.linux; }; } diff --git a/pkgs/tools/text/untex/default.nix b/pkgs/tools/text/untex/default.nix index 55cf01d698f..63108a92378 100644 --- a/pkgs/tools/text/untex/default.nix +++ b/pkgs/tools/text/untex/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A utility which removes LaTeX commands from input"; homepage = "https://www.ctan.org/pkg/untex"; - license = licenses.gpl1; + license = licenses.gpl1Only; maintainers = with maintainers; [ joachifm ]; platforms = platforms.all; }; From 5a0cd9c748c37c9792564856957aa0d199c4c313 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Oct 2022 11:51:49 +0000 Subject: [PATCH 006/114] fwts: 21.07.00 -> 22.09.00 --- pkgs/os-specific/linux/fwts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index 585347caac0..a5b2dabfd26 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "fwts"; - version = "21.07.00"; + version = "22.09.00"; src = fetchzip { url = "https://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz"; - sha256 = "sha256-cTm8R7sUJk5aTjXvsxfBXX0J/ehVoqo43ILZ6VqaPTI="; + sha256 = "sha256-BaaUvRbon8V8RvAgw+AC9MCHC65Y/NFT1iFZ+B8P2Hk="; stripRoot = false; }; From d709a706c90559f60448289286c454778f7db5f4 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Sat, 1 Oct 2022 19:27:53 -0700 Subject: [PATCH 007/114] super-slicer: use non-EGL version of wxWidgets. Fixes #193135 Signed-off-by: David Anderson --- pkgs/development/libraries/wxwidgets/wxGTK31.nix | 2 ++ pkgs/top-level/all-packages.nix | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wxwidgets/wxGTK31.nix b/pkgs/development/libraries/wxwidgets/wxGTK31.nix index 5bce6250c74..d84c8a5aa5e 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK31.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK31.nix @@ -17,6 +17,7 @@ , compat28 ? false , compat30 ? true , unicode ? true +, withEGL ? true , withGtk2 ? (!stdenv.isDarwin) , withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , withWebKit ? stdenv.isDarwin @@ -95,6 +96,7 @@ stdenv.mkDerivation rec { (if compat28 then "--enable-compat28" else "--disable-compat28") (if compat30 then "--enable-compat30" else "--disable-compat30") ] + ++ lib.optional (!withEGL) "--disable-glcanvasegl" ++ lib.optional unicode "--enable-unicode" ++ lib.optional withMesa "--with-opengl" ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fff8023f2a2..4815db7278a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31369,9 +31369,19 @@ with pkgs; prusa-slicer = callPackage ../applications/misc/prusa-slicer { }; - super-slicer = callPackage ../applications/misc/prusa-slicer/super-slicer.nix { }; + super-slicer = callPackage ../applications/misc/prusa-slicer/super-slicer.nix { + wxGTK31-gtk3 = wxGTK31-gtk3.override { + # https://github.com/supermerill/SuperSlicer/issues/1093 + withEGL = false; + }; + }; - super-slicer-latest = (callPackage ../applications/misc/prusa-slicer/super-slicer.nix { }).latest; + super-slicer-latest = (callPackage ../applications/misc/prusa-slicer/super-slicer.nix { + wxGTK31-gtk3 = wxGTK31-gtk3.override { + # https://github.com/supermerill/SuperSlicer/issues/1093 + withEGL = false; + }; + }).latest; snapmaker-luban = callPackage ../applications/misc/snapmaker-luban { }; From eb20178f3a7ab337c65269b6bd08f483ee897469 Mon Sep 17 00:00:00 2001 From: koral Date: Sun, 2 Oct 2022 21:11:25 +0200 Subject: [PATCH 008/114] losslesscut: 3.43.0 -> 3.46.2 --- pkgs/applications/video/losslesscut-bin/appimage.nix | 2 +- pkgs/applications/video/losslesscut-bin/default.nix | 8 ++++---- pkgs/applications/video/losslesscut-bin/dmg.nix | 2 +- pkgs/applications/video/losslesscut-bin/windows.nix | 10 +++++----- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/video/losslesscut-bin/appimage.nix b/pkgs/applications/video/losslesscut-bin/appimage.nix index 87518479db4..8e84406c60e 100644 --- a/pkgs/applications/video/losslesscut-bin/appimage.nix +++ b/pkgs/applications/video/losslesscut-bin/appimage.nix @@ -5,7 +5,7 @@ let nameRepo = "lossless-cut"; nameCamel = "LosslessCut"; name = "${pname}-${version}"; - nameSource = "${nameCamel}-linux.AppImage"; + nameSource = "${nameCamel}-linux-x86_64.AppImage"; nameExecutable = "losslesscut"; owner = "mifi"; src = fetchurl { diff --git a/pkgs/applications/video/losslesscut-bin/default.nix b/pkgs/applications/video/losslesscut-bin/default.nix index be7786f9102..77dd6e0c35f 100644 --- a/pkgs/applications/video/losslesscut-bin/default.nix +++ b/pkgs/applications/video/losslesscut-bin/default.nix @@ -1,9 +1,9 @@ { callPackage, stdenvNoCC, lib }: let - version = "3.43.0"; - appimage = callPackage ./appimage.nix { inherit version; sha256 = "1xfr3i4gsi13wj374yr5idhgs0q71s4h33yxdr7b7xjdg2gb8lp1"; }; - dmg = callPackage ./dmg.nix { inherit version; sha256 = "1axki47hrxx5m0hrmjpxcya091lahqfnh2pd3zhn5dd496slq8an"; }; - windows = callPackage ./windows.nix { inherit version; sha256 = "1v00gym18hjxxm42dfqmw7vhwh8lgjz2jgv6fmg234npr3d43py5"; }; + version = "3.46.2"; + appimage = callPackage ./appimage.nix { inherit version; sha256 = "sha256-p+HscYsChR90JHdYjurY4OOHgveGXbJomz1klBCsF2Q="; }; + dmg = callPackage ./dmg.nix { inherit version; sha256 = "sha256-350MHWwyjCdvIv6W6lX6Hr6PLDiAwO/e+KW0yKi/Yoc="; }; + windows = callPackage ./windows.nix { inherit version; sha256 = "sha256-48ifhvIWSPmmnBnW8tP7NeWPIWJYWNqGP925O50CAwQ="; }; in ( if stdenvNoCC.isDarwin then dmg else if stdenvNoCC.isCygwin then windows diff --git a/pkgs/applications/video/losslesscut-bin/dmg.nix b/pkgs/applications/video/losslesscut-bin/dmg.nix index 3cbd77198b9..e334c0a58b9 100644 --- a/pkgs/applications/video/losslesscut-bin/dmg.nix +++ b/pkgs/applications/video/losslesscut-bin/dmg.nix @@ -4,7 +4,7 @@ let pname = "losslesscut"; nameRepo = "lossless-cut"; nameCamel = "LosslessCut"; - nameSource = "${nameCamel}-mac.dmg"; + nameSource = "${nameCamel}-mac-x64.dmg"; nameApp = nameCamel + ".app"; owner = "mifi"; src = fetchurl { diff --git a/pkgs/applications/video/losslesscut-bin/windows.nix b/pkgs/applications/video/losslesscut-bin/windows.nix index 0e6ed9b0412..89ccbca4832 100644 --- a/pkgs/applications/video/losslesscut-bin/windows.nix +++ b/pkgs/applications/video/losslesscut-bin/windows.nix @@ -1,7 +1,7 @@ { stdenvNoCC , lib , fetchurl -, unzip +, p7zip , version , sha256 , useMklink ? false @@ -11,8 +11,8 @@ let pname = "losslesscut"; nameRepo = "lossless-cut"; nameCamel = "LosslessCut"; - nameSourceBase = "${nameCamel}-win"; - nameSource = "${nameSourceBase}.zip"; + nameSourceBase = "${nameCamel}-win-x64"; + nameSource = "${nameSourceBase}.7z"; nameExecutable = "${nameCamel}.exe"; owner = "mifi"; getSymlinkCommand = if (customSymlinkCommand != null) then customSymlinkCommand @@ -27,10 +27,10 @@ in stdenvNoCC.mkDerivation { inherit sha256; }; - nativeBuildInputs = [ unzip ]; + nativeBuildInputs = [ p7zip ]; unpackPhase = '' - unzip $src -d ${nameSourceBase} + 7z x $src -o${nameSourceBase} ''; sourceRoot = nameSourceBase; From 22d82d169c2e192b32d6d17db75913c3f7eb28e9 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 5 Oct 2022 18:39:08 +0200 Subject: [PATCH 009/114] python3Packages.skia-pathops: fix build on aarch64-darwin --- pkgs/development/python-modules/skia-pathops/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/skia-pathops/default.nix b/pkgs/development/python-modules/skia-pathops/default.nix index b537d5a9bf6..4da35b98f4a 100644 --- a/pkgs/development/python-modules/skia-pathops/default.nix +++ b/pkgs/development/python-modules/skia-pathops/default.nix @@ -28,6 +28,13 @@ buildPythonPackage rec { substituteInPlace setup.py \ --replace "build_cmd = [sys.executable, build_skia_py, build_dir]" \ 'build_cmd = [sys.executable, build_skia_py, "--no-fetch-gn", "--no-virtualenv", "--gn-path", "${gn}/bin/gn", build_dir]' + '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + substituteInPlace src/cpp/skia-builder/skia/gn/skia/BUILD.gn \ + --replace "-march=armv7-a" "-march=armv8-a" \ + --replace "-mfpu=neon" "" \ + --replace "-mthumb" "" + substituteInPlace src/cpp/skia-builder/skia/src/core/SkOpts.cpp \ + --replace "defined(SK_CPU_ARM64)" "0" ''; nativeBuildInputs = [ cython ninja setuptools-scm ] @@ -46,6 +53,5 @@ buildPythonPackage rec { homepage = "https://skia.org/dev/present/pathops"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.BarinovMaxim ]; - broken = stdenv.isDarwin && stdenv.isAarch64; # clang-11: error: the clang compiler does not support '-march=armv7-a' }; } From df369b38a0f10a9538ce007171d461fd2cc954a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Oct 2022 16:34:01 +0000 Subject: [PATCH 010/114] netbox: 3.3.4 -> 3.3.5 --- pkgs/servers/web-apps/netbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/netbox/default.nix b/pkgs/servers/web-apps/netbox/default.nix index 8ef20c0aa8b..6d516161ab9 100644 --- a/pkgs/servers/web-apps/netbox/default.nix +++ b/pkgs/servers/web-apps/netbox/default.nix @@ -17,13 +17,13 @@ let in py.pkgs.buildPythonApplication rec { pname = "netbox"; - version = "3.3.4"; + version = "3.3.5"; src = fetchFromGitHub { owner = "netbox-community"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-bXrolmpXrO86CbS+5D8ik+Iv/Gb8f7om2ddGs/g61Sg="; + sha256 = "sha256-PHKAGIxajjpBNo40eeqhh1L6Cd3ahjKaHvVtDR5Pyt8="; }; format = "other"; From 4dede45d4e1f18fd2a84a70bb5434cb04f6e5976 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Oct 2022 02:29:54 +0000 Subject: [PATCH 011/114] python310Packages.gaphas: 3.8.0 -> 3.8.1 --- pkgs/development/python-modules/gaphas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gaphas/default.nix b/pkgs/development/python-modules/gaphas/default.nix index 85d1256b058..9569c1c8e10 100644 --- a/pkgs/development/python-modules/gaphas/default.nix +++ b/pkgs/development/python-modules/gaphas/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "gaphas"; - version = "3.8.0"; + version = "3.8.1"; disabled = pythonOlder "3.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-szES3oLJayboCAMCGKtQqclOcbpYtEn3rg95OPtOZpU="; + sha256 = "sha256-mT9o/qV+SkJHV1MDwu/bK5HAiHM5YEv354R0HiMgTb8="; }; nativeBuildInputs = [ From d64475464c1922e3420f70f1defc5823f5d13b46 Mon Sep 17 00:00:00 2001 From: grindhold Date: Fri, 30 Sep 2022 14:13:14 +0200 Subject: [PATCH 012/114] libgtkflow: split into 3 separate derivations --- .../{libgtkflow => libgflow}/default.nix | 20 +++++-- .../libraries/libgtkflow3/default.nix | 54 +++++++++++++++++++ .../libraries/libgtkflow4/default.nix | 54 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +- 4 files changed, 126 insertions(+), 6 deletions(-) rename pkgs/development/libraries/{libgtkflow => libgflow}/default.nix (59%) create mode 100644 pkgs/development/libraries/libgtkflow3/default.nix create mode 100644 pkgs/development/libraries/libgtkflow4/default.nix diff --git a/pkgs/development/libraries/libgtkflow/default.nix b/pkgs/development/libraries/libgflow/default.nix similarity index 59% rename from pkgs/development/libraries/libgtkflow/default.nix rename to pkgs/development/libraries/libgflow/default.nix index 78e43d56b9a..007afa6ef5b 100644 --- a/pkgs/development/libraries/libgtkflow/default.nix +++ b/pkgs/development/libraries/libgflow/default.nix @@ -1,15 +1,18 @@ {stdenv, lib, vala, meson, ninja, pkg-config, fetchFromGitea, gobject-introspection, glib, gtk3}: stdenv.mkDerivation rec { - pname = "libgtkflow"; - version = "0.10.0"; + pname = "libgflow"; + version = "1.0.4"; + + outputs = [ "out" "dev" "devdoc" ]; + outputBin = "devdoc"; # demo app src = fetchFromGitea { domain = "notabug.org"; owner = "grindhold"; - repo = pname; - rev = version; - hash = "sha256-iTOoga94yjGTowQOM/EvHEDOO9Z3UutPGRgEoI1UWkI="; + repo = "libgtkflow"; + rev = "gflow_${version}"; + hash = "sha256-JoVq7U5JQ3pRxptR7igWFw7lcBTsgr3aVXxayLqhyFo="; }; nativeBuildInputs = [ @@ -25,8 +28,15 @@ stdenv.mkDerivation rec { glib ]; + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + mesonFlags = [ "-Denable_valadoc=true" + "-Denable_gtk3=false" + "-Denable_gtk4=false" ]; meta = with lib; { diff --git a/pkgs/development/libraries/libgtkflow3/default.nix b/pkgs/development/libraries/libgtkflow3/default.nix new file mode 100644 index 00000000000..7c85bd00b5d --- /dev/null +++ b/pkgs/development/libraries/libgtkflow3/default.nix @@ -0,0 +1,54 @@ +{stdenv, lib, vala, meson, ninja, pkg-config, fetchFromGitea, gobject-introspection, glib, gtk3, libgflow}: + +stdenv.mkDerivation rec { + pname = "libgtkflow3"; + version = "1.0.6"; + + outputs = [ "out" "dev" "devdoc" ]; + outputBin = "devdoc"; # demo app + + src = fetchFromGitea { + domain = "notabug.org"; + owner = "grindhold"; + repo = "libgtkflow"; + rev = "gtkflow3_${version}"; + hash = "sha256-JoVq7U5JQ3pRxptR7igWFw7lcBTsgr3aVXxayLqhyFo="; + }; + + nativeBuildInputs = [ + vala + meson + ninja + pkg-config + gobject-introspection + ]; + + buildInputs = [ + gtk3 + glib + libgflow + ]; + + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + + mesonFlags = [ + "-Denable_valadoc=true" + "-Denable_gtk4=false" + "-Denable_gflow=false" + ]; + + postPatch = '' + rm -r libgflow + ''; + + meta = with lib; { + description = "Flow graph widget for GTK 3"; + homepage = "https://notabug.org/grindhold/libgtkflow"; + maintainers = with maintainers; [ grindhold ]; + license = licenses.lgpl3Plus; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libgtkflow4/default.nix b/pkgs/development/libraries/libgtkflow4/default.nix new file mode 100644 index 00000000000..60439e7636e --- /dev/null +++ b/pkgs/development/libraries/libgtkflow4/default.nix @@ -0,0 +1,54 @@ +{stdenv, lib, vala, meson, ninja, pkg-config, fetchFromGitea, gobject-introspection, glib, gtk4, libgflow}: + +stdenv.mkDerivation rec { + pname = "libgtkflow4"; + version = "0.2.6"; + + outputs = [ "out" "dev" "devdoc" ]; + outputBin = "devdoc"; # demo app + + src = fetchFromGitea { + domain = "notabug.org"; + owner = "grindhold"; + repo = "libgtkflow"; + rev = "gtkflow4_${version}"; + hash = "sha256-JoVq7U5JQ3pRxptR7igWFw7lcBTsgr3aVXxayLqhyFo="; + }; + + nativeBuildInputs = [ + vala + meson + ninja + pkg-config + gobject-introspection + ]; + + buildInputs = [ + gtk4 + glib + libgflow + ]; + + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + + mesonFlags = [ + "-Denable_valadoc=true" + "-Denable_gtk3=false" + "-Denable_gflow=false" + ]; + + postPatch = '' + rm -r libgflow + ''; + + meta = with lib; { + description = "Flow graph widget for GTK 3"; + homepage = "https://notabug.org/grindhold/libgtkflow"; + maintainers = with maintainers; [ grindhold ]; + license = licenses.lgpl3Plus; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 295e50ee13f..4a84ebc4aa3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -899,7 +899,9 @@ with pkgs; ld-is-cc-hook = makeSetupHook { name = "ld-is-cc-hook"; } ../build-support/setup-hooks/ld-is-cc-hook.sh; - libgtkflow = callPackage ../development/libraries/libgtkflow { }; + libgflow = callPackage ../development/libraries/libgflow { }; + libgtkflow3 = callPackage ../development/libraries/libgtkflow3 { }; + libgtkflow4 = callPackage ../development/libraries/libgtkflow4 { }; libredirect = callPackage ../build-support/libredirect { }; From 5819054b67906123fbf2dfceb1d2b8c7c2189da8 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Sun, 9 Oct 2022 11:40:53 +0200 Subject: [PATCH 013/114] guake: 3.6.3 -> 3.9.0 Fixes CVE-2021-23556 --- .../applications/terminal-emulators/guake/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/terminal-emulators/guake/default.nix b/pkgs/applications/terminal-emulators/guake/default.nix index cc2dc5c55d6..84674881a73 100644 --- a/pkgs/applications/terminal-emulators/guake/default.nix +++ b/pkgs/applications/terminal-emulators/guake/default.nix @@ -15,15 +15,15 @@ python3.pkgs.buildPythonApplication rec { pname = "guake"; - version = "3.6.3"; + version = "3.9.0"; format = "other"; src = fetchFromGitHub { owner = "Guake"; repo = "guake"; - rev = version; - sha256 = "13ipnmqcyixpa6qv83m0f91za4kar14s5jpib68b32z65x1h0j3b"; + rev = "refs/tags/${version}"; + sha256 = "sha256-BW13fBH26UqMPMjV8JC4QkpgzyoPfCpAfSkJD68uOZU="; }; # Strict deps breaks guake @@ -55,12 +55,15 @@ python3.pkgs.buildPythonApplication rec { pycairo pygobject3 setuptools + setuptools-scm + pyyaml ]; PBR_VERSION = version; # pbr needs either .git directory, sdist, or env var + SETUPTOOLS_SCM_PRETEND_VERSION = version; makeFlags = [ - "prefix=${placeholder "out"}" + "PREFIX=${placeholder "out"}" ]; preFixup = '' From d34cf47881fe1d1cd46b96df1f73e991332b2973 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Sun, 9 Oct 2022 11:45:29 +0200 Subject: [PATCH 014/114] guake: update release notes --- .../doc/manual/from_md/release-notes/rl-2211.section.xml | 8 ++++++++ nixos/doc/manual/release-notes/rl-2211.section.md | 2 ++ 2 files changed, 10 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 78bd6c6a22d..44c820411ba 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -703,6 +703,14 @@ release notes for more details. + + + The guake package has been updated from + 3.6.3 to 3.9.0, see the + changelog + for more details. + + dockerTools.buildImage deprecates the diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 37b0db8a8ce..a65877f359f 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -230,6 +230,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - The `diamond` package has been update from 0.8.36 to 2.0.15. See the [upstream release notes](https://github.com/bbuchfink/diamond/releases) for more details. +- The `guake` package has been updated from 3.6.3 to 3.9.0, see the [changelog](https://github.com/Guake/guake/releases) for more details. + - `dockerTools.buildImage` deprecates the misunderstood `contents` parameter, in favor of `copyToRoot`. Use `copyToRoot = buildEnv { ... };` or similar if you intend to add packages to `/bin`. From 9878eebbeadbcd4f6fc648d44787a14cde3066b5 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Fri, 7 Oct 2022 14:53:11 -0700 Subject: [PATCH 015/114] nodePackages.pnpm: 7.13.2 -> 7.13.3 --- pkgs/development/node-packages/node-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index f9188054eec..c710f16c98a 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -126979,10 +126979,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "7.13.2"; + version = "7.13.3"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-7.13.2.tgz"; - sha512 = "lOQRBcCWycLK1PB9KptqTd6iyiH7m4GRuS4G2j4b74yDx/XvRXtP/weYz8e0/ia7HX1pMF1vJCF48ssklq0TJQ=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-7.13.3.tgz"; + sha512 = "6avqSfzfAr/9w1ZleaMI276ZuZUu88eOIe6v2mTCuwtSjUEqheboH1G4m7jgF+4arMUfnBrz371UAU+DCeCiSA=="; }; buildInputs = globalBuildInputs; meta = { From d3237e3e7467e7eef139a3632bc1d37a6e3a6e40 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 9 Oct 2022 21:16:52 +0200 Subject: [PATCH 016/114] overcommit: 0.51.0 -> 0.59.1 --- .../development/tools/overcommit/Gemfile.lock | 12 ++++++---- pkgs/development/tools/overcommit/default.nix | 6 ++++- pkgs/development/tools/overcommit/gemset.nix | 24 +++++++++++++------ 3 files changed, 29 insertions(+), 13 deletions(-) diff --git a/pkgs/development/tools/overcommit/Gemfile.lock b/pkgs/development/tools/overcommit/Gemfile.lock index 9a6441e76b8..4c96598be69 100644 --- a/pkgs/development/tools/overcommit/Gemfile.lock +++ b/pkgs/development/tools/overcommit/Gemfile.lock @@ -1,11 +1,13 @@ GEM remote: https://rubygems.org/ specs: - childprocess (3.0.0) - iniparse (1.4.4) - overcommit (0.51.0) - childprocess (>= 0.6.3, < 4) + childprocess (4.1.0) + iniparse (1.5.0) + overcommit (0.59.1) + childprocess (>= 0.6.3, < 5) iniparse (~> 1.4) + rexml (~> 3.2) + rexml (3.2.5) PLATFORMS ruby @@ -14,4 +16,4 @@ DEPENDENCIES overcommit BUNDLED WITH - 2.1.4 + 2.3.22 diff --git a/pkgs/development/tools/overcommit/default.nix b/pkgs/development/tools/overcommit/default.nix index 6b90160245d..d8e526d265c 100644 --- a/pkgs/development/tools/overcommit/default.nix +++ b/pkgs/development/tools/overcommit/default.nix @@ -1,10 +1,14 @@ -{ lib, bundlerApp }: +{ lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "overcommit"; gemdir = ./.; exes = [ "overcommit" ]; + passthru = { + updateScript = bundlerUpdateScript "overcommit"; + }; + meta = with lib; { description = "Tool to manage and configure Git hooks"; homepage = "https://github.com/sds/overcommit"; diff --git a/pkgs/development/tools/overcommit/gemset.nix b/pkgs/development/tools/overcommit/gemset.nix index 95244c1afe6..d0d6f362253 100644 --- a/pkgs/development/tools/overcommit/gemset.nix +++ b/pkgs/development/tools/overcommit/gemset.nix @@ -4,30 +4,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ic028k8xgm2dds9mqnvwwx3ibaz32j8455zxr9f4bcnviyahya5"; + sha256 = "1lvcp8bsd35g57f7wz4jigcw2sryzzwrpcgjwwf3chmjrjcww5in"; type = "gem"; }; - version = "3.0.0"; + version = "4.1.0"; }; iniparse = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xbik6838gfh5yq9ahh1m7dzszxlk0g7x5lvhb8amk60mafkrgws"; + sha256 = "1wb1qy4i2xrrd92dc34pi7q7ibrjpapzk9y465v0n9caiplnb89n"; type = "gem"; }; - version = "1.4.4"; + version = "1.5.0"; }; overcommit = { - dependencies = ["childprocess" "iniparse"]; + dependencies = ["childprocess" "iniparse" "rexml"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fjrrm9dy9mry5ss96sizn6xcphia5l54ydz9c31phipm61nwmfk"; + sha256 = "0dbz2y98r351r218m9d871ris1zfb6bcwr1gdhb39g2r9pail79n"; type = "gem"; }; - version = "0.51.0"; + version = "0.59.1"; + }; + rexml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + type = "gem"; + }; + version = "3.2.5"; }; } From ddb0ac635709866853d4037367449ef61455ef62 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 9 Oct 2022 21:17:46 +0200 Subject: [PATCH 017/114] overcommit: add anthonyroussel to maintainers --- pkgs/development/tools/overcommit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/overcommit/default.nix b/pkgs/development/tools/overcommit/default.nix index d8e526d265c..663a13af370 100644 --- a/pkgs/development/tools/overcommit/default.nix +++ b/pkgs/development/tools/overcommit/default.nix @@ -13,7 +13,7 @@ bundlerApp { description = "Tool to manage and configure Git hooks"; homepage = "https://github.com/sds/overcommit"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne ]; + maintainers = with maintainers; [ Br1ght0ne anthonyroussel ]; platforms = platforms.unix; }; } From 5457fdf27380a821b2944f1ab1ccee1e20a07675 Mon Sep 17 00:00:00 2001 From: Robert Kovacsics Date: Thu, 29 Sep 2022 11:44:04 +0100 Subject: [PATCH 018/114] gitlab-runner: Install `clear-docker-cache` script --- .../continuous-integration/gitlab-runner/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 0c2d1839339..d55ea9ae52a 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitLab, fetchurl }: +{ lib, buildGoModule, fetchFromGitLab, fetchurl, bash }: let version = "15.4.0"; @@ -14,6 +14,9 @@ buildGoModule rec { "-X ${commonPackagePath}.REVISION=v${version}" ]; + # For patchShebangs + buildInputs = [ bash ]; + vendorSha256 = "sha256-S0x1b2ITtqMoqdssoTgnolDC6Tyq3IdkJqxwZ29qCyU="; src = fetchFromGitLab { @@ -45,6 +48,10 @@ buildGoModule rec { rm helpers/docker/auth/auth_test.go ''; + postInstall = '' + install packaging/root/usr/share/gitlab-runner/clear-docker-cache $out/bin + ''; + preCheck = '' # Make the tests pass outside of GitLab CI export CI=0 From 77a0f1af20097f831f3f47ecb78476351406e4a3 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 10 Oct 2022 16:50:37 +0200 Subject: [PATCH 019/114] freefilesync: 11.25 -> 11.26 --- pkgs/applications/networking/freefilesync/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/freefilesync/default.nix b/pkgs/applications/networking/freefilesync/default.nix index aa5b0fcc4b0..c6f9c1c9fdf 100644 --- a/pkgs/applications/networking/freefilesync/default.nix +++ b/pkgs/applications/networking/freefilesync/default.nix @@ -13,13 +13,13 @@ gcc12Stdenv.mkDerivation rec { pname = "freefilesync"; - version = "11.25"; + version = "11.26"; src = fetchFromGitHub { owner = "hkneptune"; repo = "FreeFileSync"; rev = "v${version}"; - sha256 = "sha256-JV9qwBiF9kl+wc9+7lUufQVu6uiMQ6vojntxduNJ8MI="; + sha256 = "sha256-MKs9PfxKVxfDYYB8Dqop9dUd757ajjgvIdMtKJX5dNw="; }; # Patches from ROSA Linux @@ -43,11 +43,6 @@ gcc12Stdenv.mkDerivation rec { }) ]; - postPatch = '' - substituteInPlace FreeFileSync/Source/ui/version_check.cpp \ - --replace "openBrowserForDownload();" "openBrowserForDownload(parent);" - ''; - nativeBuildInputs = [ pkg-config ]; From 8a4c3732163f847455b3e6940f24cabe361829e4 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Mon, 10 Oct 2022 18:19:42 +0300 Subject: [PATCH 020/114] Revert "parlatype: remove" This reverts commit 3d957ef33b5603d025935b4950a423ddc5054f40. --- pkgs/applications/audio/parlatype/default.nix | 66 +++++++++++++++++++ pkgs/top-level/aliases.nix | 1 - pkgs/top-level/all-packages.nix | 2 + 3 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/audio/parlatype/default.nix diff --git a/pkgs/applications/audio/parlatype/default.nix b/pkgs/applications/audio/parlatype/default.nix new file mode 100644 index 00000000000..c1bb1102bf1 --- /dev/null +++ b/pkgs/applications/audio/parlatype/default.nix @@ -0,0 +1,66 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, meson, gtk3, at-spi2-core, dbus, gst_all_1, sphinxbase, pocketsphinx, ninja, gettext, appstream-glib, python3, glib, gobject-introspection, gsettings-desktop-schemas, itstool, wrapGAppsHook, hicolor-icon-theme }: + +stdenv.mkDerivation rec { + pname = "parlatype"; + version = "2.1"; + + src = fetchFromGitHub { + owner = "gkarsay"; + repo = pname; + rev = "v${version}"; + sha256 = "1k53q0kbwpnbgyr0lmfzf5sm4f93d8nbjrzdz9pdhzpxgihndg25"; + }; + + nativeBuildInputs = [ + pkg-config + meson + ninja + gettext + appstream-glib + python3 + gobject-introspection + itstool + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + at-spi2-core + dbus + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly + gst_all_1.gst-libav + sphinxbase + pocketsphinx + glib + gsettings-desktop-schemas + hicolor-icon-theme + ]; + + postPatch = '' + chmod +x data/meson_post_install.py + patchShebangs data/meson_post_install.py + ''; + + doCheck = false; + + buildPhase = '' + export GST_PLUGIN_SYSTEM_PATH_1_0="$out/lib/gstreamer-1.0/:$GST_PLUGIN_SYSTEM_PATH_1_0" + ''; + + meta = with lib; { + description = "GNOME audio player for transcription"; + longDescription = '' + Parlatype is a minimal audio player for manual speech transcription, written for the GNOME desktop environment. + It plays audio sources to transcribe them in your favourite text application. + It’s intended to be useful for journalists, students, scientists and whoever needs to transcribe audio files. + ''; + homepage = "https://gkarsay.github.io/parlatype/"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.melchips ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 47c6302adac..4bc8a92cbf3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1023,7 +1023,6 @@ mapAliases ({ paperless-ng = paperless-ngx; # Added 2022-04-11 parity = openethereum; # Added 2020-08-01 parity-ui = throw "parity-ui was removed because it was broken and unmaintained by upstream"; # Added 2022-01-10 - parlatype = throw "parlatype has been removed: unmaintained"; # Added 2022-04-24 parquet-cpp = throw "'parquet-cpp' has been renamed to/replaced by 'arrow-cpp'"; # Converted to throw 2022-02-22 patchmatrix = throw "'patchmatrix' has been renamed to/replaced by 'open-music-kontrollers.patchmatrix'"; # Added 2022-03-09 pass-otp = throw "'pass-otp' has been renamed to/replaced by 'pass.withExtensions'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c308e39f19e..c6131e90d5e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30019,6 +30019,8 @@ with pkgs; paraview = libsForQt5.callPackage ../applications/graphics/paraview { }; + parlatype = callPackage ../applications/audio/parlatype { }; + packet = callPackage ../development/tools/packet { }; packet-sd = callPackage ../development/tools/packet-sd { }; From 81738843e9511ef7609a46496ea8b07cacde1107 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Mon, 10 Oct 2022 18:22:58 +0300 Subject: [PATCH 021/114] parlatype: disable pocketsphinx integration --- pkgs/applications/audio/parlatype/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/parlatype/default.nix b/pkgs/applications/audio/parlatype/default.nix index c1bb1102bf1..ca18acd048c 100644 --- a/pkgs/applications/audio/parlatype/default.nix +++ b/pkgs/applications/audio/parlatype/default.nix @@ -33,8 +33,6 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gst_all_1.gst-libav - sphinxbase - pocketsphinx glib gsettings-desktop-schemas hicolor-icon-theme @@ -47,6 +45,8 @@ stdenv.mkDerivation rec { doCheck = false; + mesonFlags = [ "-Dasr=false" ]; + buildPhase = '' export GST_PLUGIN_SYSTEM_PATH_1_0="$out/lib/gstreamer-1.0/:$GST_PLUGIN_SYSTEM_PATH_1_0" ''; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://gkarsay.github.io/parlatype/"; license = licenses.gpl3Plus; - maintainers = [ maintainers.melchips ]; + maintainers = with maintainers; [ alexshpilkin melchips ]; platforms = platforms.linux; }; } From 0aa7db6030704cfef15de8e3fd90bfe26b01793c Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Mon, 10 Oct 2022 18:23:19 +0300 Subject: [PATCH 022/114] parlatype: 2.1 -> 3.1 --- pkgs/applications/audio/parlatype/default.nix | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/audio/parlatype/default.nix b/pkgs/applications/audio/parlatype/default.nix index ca18acd048c..71cfe338c62 100644 --- a/pkgs/applications/audio/parlatype/default.nix +++ b/pkgs/applications/audio/parlatype/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, meson, gtk3, at-spi2-core, dbus, gst_all_1, sphinxbase, pocketsphinx, ninja, gettext, appstream-glib, python3, glib, gobject-introspection, gsettings-desktop-schemas, itstool, wrapGAppsHook, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, pkg-config, meson, gtk3, dbus, gst_all_1, ninja, gettext, appstream-glib, python3, desktop-file-utils, glib, gobject-introspection, gsettings-desktop-schemas, isocodes, itstool, libxml2, wrapGAppsHook, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "parlatype"; - version = "2.1"; + version = "3.1"; src = fetchFromGitHub { owner = "gkarsay"; repo = pname; rev = "v${version}"; - sha256 = "1k53q0kbwpnbgyr0lmfzf5sm4f93d8nbjrzdz9pdhzpxgihndg25"; + sha256 = "1a4xlsbszb50vnz1g7kf7hl7aywp7s7xaravkcx13csn0a7l3x45"; }; nativeBuildInputs = [ @@ -18,14 +18,15 @@ stdenv.mkDerivation rec { gettext appstream-glib python3 + desktop-file-utils gobject-introspection itstool + libxml2 wrapGAppsHook ]; buildInputs = [ gtk3 - at-spi2-core dbus gst_all_1.gstreamer gst_all_1.gst-plugins-base @@ -36,21 +37,16 @@ stdenv.mkDerivation rec { glib gsettings-desktop-schemas hicolor-icon-theme + isocodes ]; postPatch = '' - chmod +x data/meson_post_install.py patchShebangs data/meson_post_install.py + patchShebangs libparlatype/tests/data/generate_config_data ''; doCheck = false; - mesonFlags = [ "-Dasr=false" ]; - - buildPhase = '' - export GST_PLUGIN_SYSTEM_PATH_1_0="$out/lib/gstreamer-1.0/:$GST_PLUGIN_SYSTEM_PATH_1_0" - ''; - meta = with lib; { description = "GNOME audio player for transcription"; longDescription = '' @@ -58,7 +54,7 @@ stdenv.mkDerivation rec { It plays audio sources to transcribe them in your favourite text application. It’s intended to be useful for journalists, students, scientists and whoever needs to transcribe audio files. ''; - homepage = "https://gkarsay.github.io/parlatype/"; + homepage = "https://www.parlatype.org/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ alexshpilkin melchips ]; platforms = platforms.linux; From c8eae7a5261a0d2ceaf0ad8a8b08050ec5bf40f2 Mon Sep 17 00:00:00 2001 From: Robert Kovacsics Date: Thu, 29 Sep 2022 11:44:40 +0100 Subject: [PATCH 023/114] nixos/gitlab-runner: Add `gitlab-runner.clear-docker-cache` service --- .../continuous-integration/gitlab-runner.nix | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix index fb148e7cffb..2050e04d55c 100644 --- a/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -453,6 +453,43 @@ in }; }); }; + clear-docker-cache = { + enable = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Whether to periodically prune gitlab runner's Docker resources. If + enabled, a systemd timer will run {command}`clear-docker-cache` as + specified by the `dates` option. + ''; + }; + + flags = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "prune" ]; + description = lib.mdDoc '' + Any additional flags passed to {command}`clear-docker-cache`. + ''; + }; + + dates = mkOption { + default = "weekly"; + type = types.str; + description = lib.mdDoc '' + Specification (in the format described by + {manpage}`systemd.time(7)`) of the time at + which the prune will occur. + ''; + }; + + package = mkOption { + default = config.virtualisation.docker.package; + defaultText = literalExpression "config.virtualisation.docker.package"; + example = literalExpression "pkgs.docker"; + description = lib.mdDoc "Docker package to use for clearing up docker cache."; + }; + }; }; config = mkIf cfg.enable { warnings = (mapAttrsToList @@ -497,6 +534,22 @@ in KillMode = "process"; }; }; + # Enable periodic clear-docker-cache script + systemd.services.gitlab-runner-clear-docker-cache = { + description = "Prune gitlab-runner docker resources"; + restartIfChanged = false; + unitConfig.X-StopOnRemoval = false; + + serviceConfig.Type = "oneshot"; + + path = [ cfg.clear-docker-cache.package pkgs.gawk ]; + + script = '' + ${pkgs.gitlab-runner}/bin/clear-docker-cache ${toString cfg.clear-docker-cache.flags} + ''; + + startAt = optional cfg.clear-docker-cache.enable cfg.clear-docker-cache.dates; + }; # Enable docker if `docker` executor is used in any service virtualisation.docker.enable = mkIf ( any (s: s.executor == "docker") (attrValues cfg.services) From 5af1ad13f6263c9927917df64400c2888f10a78d Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Mon, 10 Oct 2022 08:37:33 +0200 Subject: [PATCH 024/114] lua: 5.4.3 -> 5.4.4 CVE-2021-44647, CVE-2021-44964, CVE-2021-43519 --- pkgs/development/interpreters/lua-5/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix index 39de7278543..d236252e5bc 100644 --- a/pkgs/development/interpreters/lua-5/default.nix +++ b/pkgs/development/interpreters/lua-5/default.nix @@ -77,8 +77,8 @@ in rec { lua5_4 = callPackage ./interpreter.nix { self = lua5_4; - sourceVersion = { major = "5"; minor = "4"; patch = "3"; }; - hash = "1yxvjvnbg4nyrdv10bq42gz6dr66pyan28lgzfygqfwy2rv24qgq"; + sourceVersion = { major = "5"; minor = "4"; patch = "4"; }; + hash = "sha256-Fkx4SWU7gK5nvsS3RzuIS/XMjS3KBWU0dewu0nuev2E="; makeWrapper = makeBinaryWrapper; inherit passthruFun; From 1441c7930e6bda56bb6e3337010551a3437332a6 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Tue, 11 Oct 2022 12:39:17 +0200 Subject: [PATCH 025/114] guake: remove gbr, setuptools deps --- pkgs/applications/terminal-emulators/guake/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/applications/terminal-emulators/guake/default.nix b/pkgs/applications/terminal-emulators/guake/default.nix index 84674881a73..ee28a250478 100644 --- a/pkgs/applications/terminal-emulators/guake/default.nix +++ b/pkgs/applications/terminal-emulators/guake/default.nix @@ -51,15 +51,12 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ dbus-python - pbr pycairo pygobject3 - setuptools setuptools-scm pyyaml ]; - PBR_VERSION = version; # pbr needs either .git directory, sdist, or env var SETUPTOOLS_SCM_PRETEND_VERSION = version; makeFlags = [ From e0e3ba86b6065e5616ef12dc64ca82869955e40e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Oct 2022 12:18:09 +0000 Subject: [PATCH 026/114] python310Packages.libcloud: 3.6.0 -> 3.6.1 --- pkgs/development/python-modules/libcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libcloud/default.nix b/pkgs/development/python-modules/libcloud/default.nix index 62cd5e3b3e5..7ebfe30ac93 100644 --- a/pkgs/development/python-modules/libcloud/default.nix +++ b/pkgs/development/python-modules/libcloud/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "apache-libcloud"; - version = "3.6.0"; + version = "3.6.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-SjuRQQM3mOT7B4hv8mJU5jXgIqy91wg3XqxvVuMjUGw="; + sha256 = "sha256-D6zzIGVoQwyZjaQOm7rG06DE/IDdUWdNnnlLOBRQEgw="; }; propagatedBuildInputs = [ From 8f31bb2012e6bd90cfe089440e454badb661e085 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 11 Oct 2022 14:28:20 +0200 Subject: [PATCH 027/114] spatialite_gui: migrate to wxGTK32 --- pkgs/applications/gis/spatialite-gui/default.nix | 5 ++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/gis/spatialite-gui/default.nix b/pkgs/applications/gis/spatialite-gui/default.nix index 3fc5b08beb1..76014887d2b 100644 --- a/pkgs/applications/gis/spatialite-gui/default.nix +++ b/pkgs/applications/gis/spatialite-gui/default.nix @@ -20,7 +20,6 @@ , sqlite , virtualpg , wxGTK -, wxmac , xz , zstd , Carbon @@ -57,10 +56,10 @@ stdenv.mkDerivation rec { proj sqlite virtualpg + wxGTK xz zstd - ] ++ lib.optional stdenv.isLinux wxGTK - ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa IOKit wxmac ]; + ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa IOKit ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2fa7db54f21..f7e32689ff3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26751,7 +26751,7 @@ with pkgs; spatialite_gui = callPackage ../applications/gis/spatialite-gui { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa IOKit; - wxGTK = wxGTK30-gtk3; + wxGTK = wxGTK32; }; spatialite_tools = callPackage ../applications/gis/spatialite-tools { }; From 88364f38c408ab12e95eb5ff5896a64fc9758d18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Tue, 11 Oct 2022 00:40:48 -0500 Subject: [PATCH 028/114] calibre: fix epub-viewer --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index e573ee93d21..da230acbbe6 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -124,11 +124,11 @@ stdenv.mkDerivation rec { pycryptodome # the following are distributed with calibre, but we use upstream instead odfpy - ] ++ lib.optionals (lib.lists.any (p: p == stdenv.hostPlatform.system) pyqtwebengine.meta.platforms) [ + ] ++ lib.optionals (lib.lists.any (p: p == stdenv.hostPlatform.system) pyqt6-webengine.meta.platforms) [ # much of calibre's functionality is usable without a web # browser, so we enable building on platforms which qtwebengine # does not support by simply omitting qtwebengine. - pyqtwebengine + pyqt6-webengine ] ++ lib.optional (unrarSupport) unrardll ); From 25f5ae092e240a2f8352057342aad88992ec9f0e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Oct 2022 13:54:01 +0000 Subject: [PATCH 029/114] syncstorage-rs: 0.12.3 -> 0.12.4 --- pkgs/servers/syncstorage-rs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/syncstorage-rs/default.nix b/pkgs/servers/syncstorage-rs/default.nix index 26bf5488f93..460f412a7f8 100644 --- a/pkgs/servers/syncstorage-rs/default.nix +++ b/pkgs/servers/syncstorage-rs/default.nix @@ -21,13 +21,13 @@ in rustPlatform.buildRustPackage rec { pname = "syncstorage-rs"; - version = "0.12.3"; + version = "0.12.4"; src = fetchFromGitHub { owner = "mozilla-services"; repo = pname; rev = version; - hash = "sha256-al3SgpJPg8dfdghV1dl00wShrKSJFegRVTilaOi0RHQ="; + hash = "sha256-X+AtorrDjxPYRmG1kVumF857mLFfHVUmfOntUbO7J1U="; }; nativeBuildInputs = [ @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec { --prefix PATH : ${lib.makeBinPath [ pyFxADeps ]} ''; - cargoSha256 = "sha256-+9Yi+oKctFiTR8cXN6ajtwKEC0kkOP3+kPfUPSYsx5A="; + cargoSha256 = "sha256-mCEQELIi4baPpQOO0Ya51bDfw24I/9tZIRjic6OzMF4="; buildFeatures = [ "grpcio/openssl" ]; From 52755d8ae129e5a7af39b49b04a9eb521cd32080 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Oct 2022 14:00:10 +0000 Subject: [PATCH 030/114] thedesk: 22.3.1 -> 23.0.1 --- pkgs/applications/misc/thedesk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/thedesk/default.nix b/pkgs/applications/misc/thedesk/default.nix index c9d845574ff..132b205f85c 100644 --- a/pkgs/applications/misc/thedesk/default.nix +++ b/pkgs/applications/misc/thedesk/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "thedesk"; - version = "22.3.1"; + version = "23.0.1"; src = fetchurl { url = "https://github.com/cutls/TheDesk/releases/download/v${version}/${pname}_${version}_amd64.deb"; - sha256 = "sha256-5KB88zMgwfObgmcMTe6R+oG48qLHrMht6vM1EvI+QFY="; + sha256 = "sha256-DyaJggucFOxkrpaJSmg5fTrK8O3HA0Byd5pHwcgPSIM="; }; nativeBuildInputs = [ From 0c5f797ff11dae9a4b15599f7c6bcb9512e9ea86 Mon Sep 17 00:00:00 2001 From: siph Date: Tue, 11 Oct 2022 08:35:15 -0600 Subject: [PATCH 031/114] devilspie2: 0.43 -> 0.44 --- pkgs/applications/misc/devilspie2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/devilspie2/default.nix b/pkgs/applications/misc/devilspie2/default.nix index b9d8b0f9797..68bdb64b5bf 100644 --- a/pkgs/applications/misc/devilspie2/default.nix +++ b/pkgs/applications/misc/devilspie2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "devilspie2"; - version = "0.43"; + version = "0.44"; src = fetchurl { - url = "https://download.savannah.gnu.org/releases/devilspie2/devilspie2_${version}-src.tar.gz"; - sha256 = "0a7qjl2qd4099kkkbwa1y2fk48s21jlr409lf9mij7mlc9yc3zzc"; + url = "https://download.savannah.gnu.org/releases/devilspie2/devilspie2-${version}.tar.xz"; + sha256 = "Cp8erdKyKjGBY+QYAGXUlSIboaQ60gIepoZs0RgEJkA="; }; nativeBuildInputs = [ intltool pkg-config ]; From 3f525e0de4fa7eda30e7ef22759faf3c4885a173 Mon Sep 17 00:00:00 2001 From: 360ied <19516527+360ied@users.noreply.github.com> Date: Mon, 10 Oct 2022 18:56:30 -0400 Subject: [PATCH 032/114] classicube: 1.3.2 -> 1.3.3 --- pkgs/games/classicube/default.nix | 6 +++--- pkgs/games/classicube/font-location.patch | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/games/classicube/default.nix b/pkgs/games/classicube/default.nix index b2b2ee68ff0..84ce22a51a0 100644 --- a/pkgs/games/classicube/default.nix +++ b/pkgs/games/classicube/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "ClassiCube"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "UnknownShadow200"; repo = "ClassiCube"; rev = version; - sha256 = "6a0f7b03ef3a7f74cf42ffa5b88ab1a7b7beb4d864871a1b700465343ae74bb6"; + sha256 = "a31e95a7f49e58aaf4271015dd60730fc74d9776dfac425a8f14eb64cdcd9944"; }; nativeBuildInputs = [ dos2unix makeWrapper ]; @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { # in ~/.local/share instead. wrapProgram "$out/bin/ClassiCube" \ --run 'mkdir -p "$HOME/.local/share/ClassiCube"' \ - --add-flags '-d"$HOME/.local/share/ClassiCube"' + --run 'cd "$HOME/.local/share/ClassiCube"' ''; meta = with lib; { diff --git a/pkgs/games/classicube/font-location.patch b/pkgs/games/classicube/font-location.patch index 48428a8bb94..bb7d383236f 100644 --- a/pkgs/games/classicube/font-location.patch +++ b/pkgs/games/classicube/font-location.patch @@ -6,10 +6,10 @@ index bca992d..3540afa 100644 String_FromConst("/Library/Fonts") }; #else -- static const cc_string dirs[2] = { +- static const cc_string dirs[] = { - String_FromConst("/usr/share/fonts"), - String_FromConst("/usr/local/share/fonts") -+ static const cc_string dirs[1] = { ++ static const cc_string dirs[] = { + String_FromConst("%NIXPKGS_FONT_PATH%") }; #endif From 938af386b02ba3a514878292ab90a73da37e2c28 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 11 Oct 2022 18:30:05 +0200 Subject: [PATCH 033/114] ucc: init at 1.1.0 --- pkgs/development/libraries/ucc/default.nix | 50 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/libraries/ucc/default.nix diff --git a/pkgs/development/libraries/ucc/default.nix b/pkgs/development/libraries/ucc/default.nix new file mode 100644 index 00000000000..1e626911f28 --- /dev/null +++ b/pkgs/development/libraries/ucc/default.nix @@ -0,0 +1,50 @@ +{ stdenv, lib, fetchFromGitHub, libtool, automake, autoconf, ucx +, enableCuda ? false +, cudatoolkit +, enableAvx ? stdenv.hostPlatform.avxSupport +, enableSse41 ? stdenv.hostPlatform.sse4_1Support +, enableSse42 ? stdenv.hostPlatform.sse4_2Support +} : + +stdenv.mkDerivation rec { + pname = "ucc"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "openucx"; + repo = "ucc"; + rev = "v${version}"; + sha256 = "sha256-5rf08SXy+vCfnz4zLJ0cMnxwso4WpZOt0jRRAUviVFU="; + }; + + enableParallelBuilding = true; + + postPatch = '' + + for comp in $(find src/components -name Makefile.am); do + substituteInPlace $comp \ + --replace "/bin/bash" "${stdenv.shell}" + done + ''; + + preConfigure = '' + ./autogen.sh + ''; + + nativeBuildInputs = [ libtool automake autoconf ]; + buildInputs = [ ucx ] + ++ lib.optional enableCuda cudatoolkit; + + configureFlags = [ ] + ++ lib.optional enableSse41 "--with-sse41" + ++ lib.optional enableSse42 "--with-sse42" + ++ lib.optional enableAvx "--with-avx" + ++ lib.optional enableCuda "--with-cuda=${cudatoolkit}"; + + meta = with lib; { + description = "Collective communication operations API"; + license = licenses.bsd3; + maintainers = [ maintainers.markuskowa ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 987f3341dc0..b7236d3cb5b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10527,6 +10527,8 @@ with pkgs; mpi = openmpi; # this attribute should used to build MPI applications + ucc = callPackage ../development/libraries/ucc {}; + ucx = callPackage ../development/libraries/ucx {}; openmodelica = recurseIntoAttrs (callPackage ../applications/science/misc/openmodelica {}); From 0925f41aacae455a64bf1c53540a2d7e0fb92024 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Oct 2022 16:32:49 +0000 Subject: [PATCH 034/114] aliyun-cli: 3.0.127 -> 3.0.128 --- pkgs/tools/admin/aliyun-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/tools/admin/aliyun-cli/default.nix index 77763d3a708..f8aec10b9fd 100644 --- a/pkgs/tools/admin/aliyun-cli/default.nix +++ b/pkgs/tools/admin/aliyun-cli/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.127"; + version = "3.0.128"; src = fetchFromGitHub { rev = "v${version}"; owner = "aliyun"; repo = pname; fetchSubmodules = true; - sha256 = "sha256-itgmVUKWJMFOej2u8nPGAVwsTOCRL3zFMuM8jbuieDI="; + sha256 = "sha256-FKynQXvxWU4adGzLTKkRpGCej1So8XbeqqGYu0RM4Rw="; }; - vendorSha256 = "sha256-aqu70PSI+xFin8xvVUb0tCN1Am/7WKvI5+EMIKTFKe0="; + vendorSha256 = "sha256-p1QRYXPetuC8jkPRx54jIKBN5WHgrw4/TZ2RUK2kzDU="; subPackages = [ "main" ]; From dc21004419911ba5ed92ccf960fabc653221f6f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Oct 2022 16:46:18 +0000 Subject: [PATCH 035/114] aws-nuke: 2.19.0 -> 2.20.0 --- pkgs/tools/admin/aws-nuke/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/aws-nuke/default.nix b/pkgs/tools/admin/aws-nuke/default.nix index af0d06b1b6a..b8261cab273 100644 --- a/pkgs/tools/admin/aws-nuke/default.nix +++ b/pkgs/tools/admin/aws-nuke/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "aws-nuke"; - version = "2.19.0"; + version = "2.20.0"; src = fetchFromGitHub { owner = "rebuy-de"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4G+/VNTp5Bb1TAcqb//LUvwEGDrXRNNka4X52jCH+Rs="; + sha256 = "sha256-UxisIhV23shgDC+9uN/YSPTHNa/hiPu8Rl06vxjJWNc="; }; - vendorSha256 = "sha256-p+pcVvu+d/scel8VVCFqZccwfOTOyKeud3gKLqpWE1g="; + vendorSha256 = "sha256-sdEaYHH5ZsxF4aKyFMjh5YZVwx0dEbSY0S8R3L10ywM="; preBuild = '' if [ "x$outputHashAlgo" != "x" ]; then From cd81115e20defb47a56e75974f927aef42b8e110 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Oct 2022 16:46:54 +0000 Subject: [PATCH 036/114] baresip: 2.8.1 -> 2.8.2 --- .../networking/instant-messengers/baresip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index b032cc2faa8..fd4e214cb03 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -25,13 +25,13 @@ , libvpx }: stdenv.mkDerivation rec { - version = "2.8.1"; + version = "2.8.2"; pname = "baresip"; src = fetchFromGitHub { owner = "baresip"; repo = "baresip"; rev = "v${version}"; - sha256 = "sha256-qtdwFAJLsHqhYVmD1YRUw0NMqX+Vq5BHR5mMvZISnuY="; + sha256 = "sha256-+hkV9s4ORm4Kqu9zBmxtFZJFG3gh70OOxpjix052bM0="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ From 12ac8bc7adb31d49218367440b1a07ff2cee9dfc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Oct 2022 16:50:24 +0000 Subject: [PATCH 037/114] bemenu: 0.6.12 -> 0.6.13 --- pkgs/applications/misc/bemenu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix index 9f69cdc5d2d..5b78e999320 100644 --- a/pkgs/applications/misc/bemenu/default.nix +++ b/pkgs/applications/misc/bemenu/default.nix @@ -11,13 +11,13 @@ assert x11Support -> xorg != null; stdenv.mkDerivation rec { pname = "bemenu"; - version = "0.6.12"; + version = "0.6.13"; src = fetchFromGitHub { owner = "Cloudef"; repo = pname; rev = version; - sha256 = "sha256-u8DQn1WIQjt1Be3WMAUNr/4qQm4vLGaj5RY49sQVpFI="; + sha256 = "sha256-YGaAJOyVZBHEWQuZVfPIIbtuntv1klQk9GcWRN+oVF4="; }; nativeBuildInputs = [ pkg-config pcre ]; From fe130b7af4c00bbf628440588d8fb606eafc6ced Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Oct 2022 17:02:54 +0000 Subject: [PATCH 038/114] python310Packages.pex: 2.1.109 -> 2.1.110 --- pkgs/development/python-modules/pex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 817bd4be1be..36bf41a6e91 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.109"; + version = "2.1.110"; format = "flit"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-G9HcDLVvRB+OXmcp2SYp2rSUsbOcKjrN8KdUMQP8DKo="; + hash = "sha256-MYHUTxVc5lh1JnOw10trB6nBiIIExm9cxeHRyKwVzhU="; }; nativeBuildInputs = [ From f88fc14fa8075b1a3984ce204e0bf2f0371567c9 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 11 Oct 2022 13:04:21 -0400 Subject: [PATCH 039/114] ruff: 0.0.68 -> 0.0.69 --- pkgs/development/tools/ruff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index d2459504e5d..a8c76f3e5e2 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.68"; + version = "0.0.69"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KHFOFl/UE0SlzKwdyWqEeIlA/fsOsSYSZ5B+XWniNUA="; + sha256 = "sha256-5TAuWBb4RJGO7prliR+c1wAOmTRaJ/erwK9ISQTiaNA="; }; - cargoSha256 = "sha256-v5TTNMp1Whw6ScJueo0IRqkef73U7nqoYi3vZJ/RbgU="; + cargoSha256 = "sha256-bv51Hj/JMfFr9SLGQxAoWDCeLr4cI6jpYxnnncAQ6kU="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices From a2071cad5526480efcbd06294bf81fd531843626 Mon Sep 17 00:00:00 2001 From: Ronuk Raval Date: Mon, 10 Oct 2022 12:42:10 -0400 Subject: [PATCH 040/114] git-nomad: init at 0.6.0 --- .../git-and-tools/git-nomad/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/applications/version-management/git-and-tools/git-nomad/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-nomad/default.nix b/pkgs/applications/version-management/git-and-tools/git-nomad/default.nix new file mode 100644 index 00000000000..f11e978ceaf --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-nomad/default.nix @@ -0,0 +1,22 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "git-nomad"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "rraval"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-1PXAdXafkPOIVzaWjW/RlWHwYhMqPoj0Hj5JmOMUj8A="; + }; + + cargoHash = "sha256-ULcdJRla1JwI0y6ngW9xQXjNw2wO48HuAczsNIsJJK0="; + + meta = with lib; { + description = "Synchronize work-in-progress git branches in a light weight fashion"; + homepage = "https://github.com/rraval/git-nomad"; + license = licenses.mit; + maintainers = with maintainers; [ rraval ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a06ecf7dac..2d46a830aed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6955,6 +6955,8 @@ with pkgs; git-my = callPackage ../applications/version-management/git-and-tools/git-my { }; + git-nomad = callPackage ../applications/version-management/git-and-tools/git-nomad { }; + git-octopus = callPackage ../applications/version-management/git-and-tools/git-octopus { }; git-open = callPackage ../applications/version-management/git-and-tools/git-open { }; From bea5ec6f7d97b03e9f412b184ec3d018fd23f651 Mon Sep 17 00:00:00 2001 From: maralorn Date: Tue, 11 Oct 2022 19:42:36 +0200 Subject: [PATCH 041/114] chrysalis: 0.11.5 -> 0.11.8 --- pkgs/applications/misc/chrysalis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/chrysalis/default.nix b/pkgs/applications/misc/chrysalis/default.nix index 749dc4b8e86..8206698ce2e 100644 --- a/pkgs/applications/misc/chrysalis/default.nix +++ b/pkgs/applications/misc/chrysalis/default.nix @@ -2,7 +2,7 @@ let pname = "chrysalis"; - version = "0.11.5"; + version = "0.11.8"; in appimageTools.wrapAppImage rec { name = "${pname}-${version}-binary"; @@ -10,7 +10,7 @@ in appimageTools.wrapAppImage rec { inherit name; src = fetchurl { url = "https://github.com/keyboardio/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; - sha256 = "sha256-3GdObGW91nDqOAlHcaI/4wnbl2EG2RGGzpwY+XYQ0u4="; + sha256 = "sha256-yyb6sRCPjHCK0tkuHTffw2NkZHcqw9tIdHbbBiKLGu8="; }; }; From 7d62668da62c1af7c61e1b2a1d7b3a9f32c15bba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Oct 2022 18:40:16 +0000 Subject: [PATCH 042/114] dnsproxy: 0.45.2 -> 0.45.3 --- pkgs/tools/networking/dnsproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 7c0bf5c4f59..642db551d4b 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.45.2"; + version = "0.45.3"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2lPGKLmLDP39qtyb88MiCBVjbztrBFqqy5hc7iOK3QE="; + sha256 = "sha256-0yb+YfX8+QKH+Mi0D1Gh0b1hfh2EiemMTkotV+z53Ns="; }; vendorSha256 = null; From 5c08754283e543071a38d948fda3b50d1bf29a63 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Oct 2022 19:06:47 +0000 Subject: [PATCH 043/114] python310Packages.pylitterbot: 2022.9.6 -> 2022.10.1 --- pkgs/development/python-modules/pylitterbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index c0c919321c0..5c56150e8f5 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pylitterbot"; - version = "2022.9.6"; + version = "2022.10.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "natekspencer"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-+8vsnSEEZ7uypASsJZ2MIK+riIF01Lxa1E3t0pC+e/I="; + hash = "sha256-E7rBRPtXa/E6jf75zULuGaiu2DHvq4hZjcwPwj/w9ww="; }; nativeBuildInputs = [ From 83a898a461daad1ff07fa6b04dd042a768aa3637 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Oct 2022 19:53:22 +0000 Subject: [PATCH 044/114] ft2-clone: 1.59 -> 1.60 --- 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 d26d92e00db..cfa831ab525 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.59"; + version = "1.60"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "sha256-TQJCkvPV6vbhURLcuH41i8obHnfHkrCTJG0+IuSVDos="; + sha256 = "sha256-6/9NaQSRNGnuIivIeWi/dOBSOzxhZYghy7zvdB5i500="; }; # Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh) From 790a7e4434e0dbd76a391d556745ba83892592d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Oct 2022 20:07:11 +0000 Subject: [PATCH 045/114] gitleaks: 8.13.0 -> 8.14.1 --- pkgs/tools/security/gitleaks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix index 1c68b87147a..9850d317971 100644 --- a/pkgs/tools/security/gitleaks/default.nix +++ b/pkgs/tools/security/gitleaks/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.13.0"; + version = "8.14.1"; src = fetchFromGitHub { owner = "zricethezav"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Pdl26PoTcI0LiC3O8EN/vW9LjVfI54TsspRnmhpFaVo="; + sha256 = "sha256-UHl+bb7Szw+gB5oy0Wsc2fhEniXNnuIXFtV62kJy3f8="; }; vendorSha256 = "sha256-Ev0/CSpwJDmc+Dvu/bFDzsgsq80rWImJWXNAUqYHgoE="; From cb61e14ff832e571a8a89e638a68f0ee579b38e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Oct 2022 20:26:29 +0000 Subject: [PATCH 046/114] himalaya: 0.5.10 -> 0.6.0 --- .../networking/mailreaders/himalaya/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/himalaya/default.nix b/pkgs/applications/networking/mailreaders/himalaya/default.nix index 91161e5ab14..52aac148df3 100644 --- a/pkgs/applications/networking/mailreaders/himalaya/default.nix +++ b/pkgs/applications/networking/mailreaders/himalaya/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "himalaya"; - version = "0.5.10"; + version = "0.6.0"; src = fetchFromGitHub { owner = "soywod"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CXchZbXX7NH2ZXeAoPph3qxxdcAdDVZLBmOMwxFu+Yo="; + sha256 = "sha256-d+ERCUPUHx41HfBtjb6BjhGKzkUTGIb01BRWvAnLYwk="; }; - cargoSha256 = "sha256-sSQX7DHDgh1eO1Dwn1f0m51Bl2ZG1daRtrnYvsvPOkg="; + cargoSha256 = "sha256-ICaahkIP1uSm4iXvSPMo8uVTtSa1nCyJdDihGdVEQvg="; nativeBuildInputs = lib.optionals enableCompletions [ installShellFiles ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ]; From 7b4547322679f9e70f43d122a427b033d9b7d7df Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Oct 2022 20:27:08 +0000 Subject: [PATCH 047/114] humioctl: 0.30.1 -> 0.30.2 --- pkgs/applications/logging/humioctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/logging/humioctl/default.nix b/pkgs/applications/logging/humioctl/default.nix index 2003eb5264e..a1959b473dd 100644 --- a/pkgs/applications/logging/humioctl/default.nix +++ b/pkgs/applications/logging/humioctl/default.nix @@ -1,8 +1,8 @@ { buildGoModule, fetchFromGitHub, installShellFiles, lib }: let - humioCtlVersion = "0.30.1"; - sha256 = "sha256-w+mZi3KdBnBRII/Mi+1SN/u4dhz2vfqn3nzU6AKk4yM="; + humioCtlVersion = "0.30.2"; + sha256 = "sha256-FqBS6PoEKMqK590f58re4ycYmrJScyij74Ngj+PLzLs="; vendorSha256 = "sha256-70QxW2nn6PS6HZWllmQ8O39fbUcbe4c/nKAygLnD4n0="; in buildGoModule { name = "humioctl-${humioCtlVersion}"; From 58ca4f90608cd3a2a3805faed0b71ff1a1166676 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Oct 2022 19:27:15 +0000 Subject: [PATCH 048/114] faas-cli: 0.14.8 -> 0.14.10 --- pkgs/development/tools/faas-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/faas-cli/default.nix b/pkgs/development/tools/faas-cli/default.nix index 11d3677f5e6..0bf1b71ceb3 100644 --- a/pkgs/development/tools/faas-cli/default.nix +++ b/pkgs/development/tools/faas-cli/default.nix @@ -18,13 +18,13 @@ let in buildGoModule rec { pname = "faas-cli"; - version = "0.14.8"; + version = "0.14.10"; src = fetchFromGitHub { owner = "openfaas"; repo = "faas-cli"; rev = version; - sha256 = "sha256-sdvApbsVgs5+pd/gVdkWbBk4eWojbqYbXXIjdbJXwGs="; + sha256 = "sha256-wXF9Ol92+JTfxXVuoXH3M8vaTrG+HeBTsvcIdqFfPG8="; }; vendorSha256 = null; From ec70a388c55fb6e2378dff96d9a72839b77d3cc7 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Mon, 3 Oct 2022 09:55:30 +0200 Subject: [PATCH 049/114] onedrive: 2.4.20 -> 2.4.21 --- pkgs/applications/networking/sync/onedrive/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/pkgs/applications/networking/sync/onedrive/default.nix index 9fa34e785b0..0945de2011b 100644 --- a/pkgs/applications/networking/sync/onedrive/default.nix +++ b/pkgs/applications/networking/sync/onedrive/default.nix @@ -43,13 +43,14 @@ stdenv.mkDerivation rec { postInstall = '' installShellCompletion --bash --name ${pname} contrib/completions/complete.bash installShellCompletion --zsh --name _${pname} contrib/completions/complete.zsh + installShellCompletion --fish --name ${pname} contrib/completions/complete.fish ''; meta = with lib; { description = "A complete tool to interact with OneDrive on Linux"; homepage = "https://github.com/abraunegg/onedrive"; license = licenses.gpl3Only; - maintainers = with maintainers; [ srgom peterhoeg ]; + maintainers = with maintainers; [ srgom peterhoeg bertof ]; platforms = platforms.linux; }; } From e003972403574285dc4af92e0f90d21c21e46f14 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Oct 2022 03:30:55 +0000 Subject: [PATCH 050/114] free42: 3.0.14 -> 3.0.15 --- pkgs/applications/misc/free42/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/free42/default.nix b/pkgs/applications/misc/free42/default.nix index 9f1b6f73a1a..0d01122e6a5 100644 --- a/pkgs/applications/misc/free42/default.nix +++ b/pkgs/applications/misc/free42/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "free42"; - version = "3.0.14"; + version = "3.0.15"; src = fetchFromGitHub { owner = "thomasokken"; repo = pname; rev = "v${version}"; - hash = "sha256-Jx+MLItr+rIGfzJdQku1pRXaIldfrpG3vfOhjebSIZA="; + hash = "sha256-QeUopHBW3KZGkYklOJIjlNCQG+aab2vwbIsVBfQ07R4="; }; nativeBuildInputs = [ From b9b60fad403723526fcddfc45abc9ba2a8aa5768 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 12 Oct 2022 03:50:35 +0000 Subject: [PATCH 051/114] =?UTF-8?q?terraform-providers.heroku:=205.1.4=20?= =?UTF-8?q?=E2=86=92=205.1.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index cfcab22c872..baf8244c112 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -506,13 +506,13 @@ "version": "2.7.0" }, "heroku": { - "hash": "sha256-n6M7i7zompAGRoP9WxrcWdBHsK2RssfTgCKsvAE5XZM=", + "hash": "sha256-V6jShbhVwsUTxj2tp2msIseZnckHgB7bBswqIRlrwjQ=", "owner": "heroku", "provider-source-address": "registry.terraform.io/heroku/heroku", "repo": "terraform-provider-heroku", - "rev": "v5.1.4", + "rev": "v5.1.5", "vendorHash": null, - "version": "5.1.4" + "version": "5.1.5" }, "hetznerdns": { "hash": "sha256-QmD9UlQpyvEz4in1I960J0eC6xNtgk5z8tZUxaApOwE=", From 638a7e1d5198812337648ccf0db234e47bbea559 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 12 Oct 2022 03:53:04 +0000 Subject: [PATCH 052/114] =?UTF-8?q?terraform-providers.linode:=201.29.2=20?= =?UTF-8?q?=E2=86=92=201.29.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index baf8244c112..83b8c995a38 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -669,13 +669,13 @@ "version": "0.7.0" }, "linode": { - "hash": "sha256-gysdJOGUmhwFoRpR0Yp2p/Vjb69k+fDzcWatOgA+/AQ=", + "hash": "sha256-FtJYpHmXkXBIcxlrUN9hOid3x4wMSk5NI2CFzmwniu4=", "owner": "linode", "provider-source-address": "registry.terraform.io/linode/linode", "repo": "terraform-provider-linode", - "rev": "v1.29.2", - "vendorHash": "sha256-Sp/e3QVdUeQGflDGYLSMPGqxcMWoIY8Q9nZUteFIryo=", - "version": "1.29.2" + "rev": "v1.29.3", + "vendorHash": "sha256-D7WZ2Ep/W8aCCFOVgsveJKAIg/j5l9fEnnXLMobICnc=", + "version": "1.29.3" }, "linuxbox": { "hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=", From d309f7dc3cecb9aaf796b9cc4b6c6b9dca2b95c7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 12 Oct 2022 03:53:06 +0000 Subject: [PATCH 053/114] =?UTF-8?q?terraform-providers.pagerduty:=202.6.2?= =?UTF-8?q?=20=E2=86=92=202.6.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 83b8c995a38..7736745141e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -904,13 +904,13 @@ "version": "0.22.0" }, "pagerduty": { - "hash": "sha256-Kdm6WizssVdMwsTUyV4wUAW6QelUxDE9GZDGvnehFCw=", + "hash": "sha256-S55TSm3aFe9ACo+ysNRnyQ/U55C2KoZroQEHVBXsSPI=", "owner": "PagerDuty", "provider-source-address": "registry.terraform.io/PagerDuty/pagerduty", "repo": "terraform-provider-pagerduty", - "rev": "v2.6.2", + "rev": "v2.6.3", "vendorHash": null, - "version": "2.6.2" + "version": "2.6.3" }, "panos": { "hash": "sha256-mscWNK113W7CVKI+qPGYX3irQI3YhkLdXox4pddOdF0=", From 3bc6cb1ef4ef086bb5388f4ce2333661cd515250 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 12 Oct 2022 03:54:52 +0000 Subject: [PATCH 054/114] =?UTF-8?q?terraform-providers.time:=200.8.0=20?= =?UTF-8?q?=E2=86=92=200.9.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 7736745141e..2be6bc77f23 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1138,13 +1138,13 @@ "version": "1.0.0" }, "time": { - "hash": "sha256-r1AzzO1fxmDZkxWKg+LUiYU19oAg8TthIJA7c0tktZE=", + "hash": "sha256-tDYrKU/kggrv/p8QZ0LbHjQSOaNrQ0qy9ekY7DAXqEA=", "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/time", "repo": "terraform-provider-time", - "rev": "v0.8.0", - "vendorHash": "sha256-67V+lG6mkLuzoJnd8OoH73/XBnkgqDmv6aqpSSsHSqg=", - "version": "0.8.0" + "rev": "v0.9.0", + "vendorHash": "sha256-I4CnaSyn32S7FM56dYWZhzGUKByP2DXD0t/eBOL2ALs=", + "version": "0.9.0" }, "tls": { "hash": "sha256-q3zt+5zd/bJ42sWbFwuE+rDyHHcZoVBZF4c61aJJkMs=", From 0d74b078cefdf642909f2d1600ab3f1c4dc89c34 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 12 Oct 2022 03:55:20 +0000 Subject: [PATCH 055/114] =?UTF-8?q?terraform-providers.ucloud:=201.32.3=20?= =?UTF-8?q?=E2=86=92=201.32.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 2be6bc77f23..09a88bbd31a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1175,13 +1175,13 @@ "version": "1.9.1" }, "ucloud": { - "hash": "sha256-+qbDbss4HSy0hCWiqMBgshvP8WZujJGzy6omXIkypNo=", + "hash": "sha256-O/M864JY7nW+PZ53z26QvOAar5DeqBGk+dfzarfUy+g=", "owner": "ucloud", "provider-source-address": "registry.terraform.io/ucloud/ucloud", "repo": "terraform-provider-ucloud", - "rev": "v1.32.3", + "rev": "v1.32.4", "vendorHash": null, - "version": "1.32.3" + "version": "1.32.4" }, "utils": { "hash": "sha256-Mh1yj1VZ620xSs1a5j86K4uCUyjzdeCphKLANQvgTNA=", From 93a795a555000c0e191efe943736c40acdab12ae Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 12 Oct 2022 03:56:49 +0000 Subject: [PATCH 056/114] =?UTF-8?q?terraform-providers.utils:=201.4.1=20?= =?UTF-8?q?=E2=86=92=201.5.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 09a88bbd31a..711080c9c0b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1184,13 +1184,13 @@ "version": "1.32.4" }, "utils": { - "hash": "sha256-Mh1yj1VZ620xSs1a5j86K4uCUyjzdeCphKLANQvgTNA=", + "hash": "sha256-6o55uGTaqf3rbqoIGiYi5F4zOkK7D0YP+LdaMmBtw24=", "owner": "cloudposse", "provider-source-address": "registry.terraform.io/cloudposse/utils", "repo": "terraform-provider-utils", - "rev": "1.4.1", - "vendorHash": "sha256-00kcosPSk/Ll7UQhnrEGRo0USvFM2V5MLKnndfhQEQA=", - "version": "1.4.1" + "rev": "1.5.0", + "vendorHash": "sha256-D1QpZTh/4BgAbsoo4RRpJoIFwkHYBkN5JWfCOe5N/A0=", + "version": "1.5.0" }, "vault": { "hash": "sha256-v+WhEJ9HsTdOqSVpbV/qVCEICsgY3nEqcIutYHi3aQ8=", From 2757fba524867a4c9de5304f6e5a508ea6ad9019 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Oct 2022 05:34:40 +0000 Subject: [PATCH 057/114] python310Packages.teslajsonpy: 2.4.5 -> 3.0.0 --- pkgs/development/python-modules/teslajsonpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index 084d9b4e078..1ee167ab51f 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "2.4.5"; + version = "3.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "zabuldon"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-fsZBHJUX/DytSO680hiXhS6+jCKOKz1n+PxZa9kyWnc="; + sha256 = "sha256-9S1ZhXHkLnDmYBAMwOIQt7AUj43+wtxXGpYx7oe4CGc="; }; nativeBuildInputs = [ From 5c58d4f5ea4192cfc8817f3bab28574b503956c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 11 Oct 2022 22:24:53 -0700 Subject: [PATCH 058/114] qutebrowser: fix build --- .../networking/browsers/qutebrowser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index a3f5b323697..c4327901d73 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -116,15 +116,15 @@ buildPythonApplication { # Install icons for i in 16 24 32 48 64 128 256 512; do - install -Dm644 "qutebrowser/icons/qutebrowser-''${i}x''${i}.png" \ + install -Dm644 "${lib.optionalString isQt6 "qutebrowser/"}icons/qutebrowser-''${i}x''${i}.png" \ "$out/share/icons/hicolor/''${i}x''${i}/apps/qutebrowser.png" done - install -Dm644 ${if isQt6 then "qutebrowser/" else ""}icons/qutebrowser.svg \ + install -Dm644 ${lib.optionalString isQt6 "qutebrowser/"}icons/qutebrowser.svg \ "$out/share/icons/hicolor/scalable/apps/qutebrowser.svg" # Install scripts sed -i "s,/usr/bin/,$out/bin/,g" scripts/open_url_in_instance.sh - ${if isQt6 then "rm -rf scripts/{testbrowser,dev}" else ""} + ${lib.optionalString isQt6 "rm -rf scripts/{testbrowser,dev}"} install -Dm755 -t "$out/share/qutebrowser/scripts/" $(find scripts -type f) install -Dm755 -t "$out/share/qutebrowser/userscripts/" misc/userscripts/* From b2a5c364d7ce47254c5777ed4914281dbc1c7add Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 12 Oct 2022 08:43:30 +0200 Subject: [PATCH 059/114] heroic: don't use the `kdialog` top-level alias https://hydra.nixos.org/log/ygsis1s955063im3i37cqwb9grfjyfsz-nixpkgs-release-checks.drv --- pkgs/games/heroic/fhsenv.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/heroic/fhsenv.nix b/pkgs/games/heroic/fhsenv.nix index 72b67f06050..75012f405f8 100644 --- a/pkgs/games/heroic/fhsenv.nix +++ b/pkgs/games/heroic/fhsenv.nix @@ -15,7 +15,7 @@ buildFHSUserEnv { curl gawk gnome.zenity - kdialog + plasma5Packages.kdialog mangohud nettools opencl-headers From 98e5fcb9c784b91342e6f33d8aa0c362b847a995 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Oct 2022 06:43:54 +0000 Subject: [PATCH 060/114] werf: 1.2.177 -> 1.2.178 --- pkgs/applications/networking/cluster/werf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 22c0178cd8f..325fb030972 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "werf"; - version = "1.2.177"; + version = "1.2.178"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-hvMDQlWlAy7gRiSJMt2qAtBpYEbfhGS/DZeQK5ueHYA="; + hash = "sha256-gmUamDV7gH30grFkG6rqDEf73wxe+FqhPi1GkNOeKuk="; }; vendorHash = "sha256-4QVLxvprm27Bv/ZFgxTtqZcSAWak1e+G8s+heW1JZnA="; From e1734cb2b4670d5e6bfeba9a6728fc76fddbb41f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Oct 2022 01:14:59 +0000 Subject: [PATCH 061/114] redpanda: 22.2.5 -> 22.2.6 --- pkgs/servers/redpanda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/servers/redpanda/default.nix index f941114881c..afd7d25dfc0 100644 --- a/pkgs/servers/redpanda/default.nix +++ b/pkgs/servers/redpanda/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchzip }: let - version = "22.2.5"; + version = "22.2.6"; platform = if stdenv.isLinux then "linux" else "darwin"; arch = if stdenv.isAarch64 then "arm" else "amd"; sha256s = { darwin.amd = "sha256-AXk3aP1SGiHTfHTCBRTagX0DAVmdcVVIkxWaTnZxB8g="; darwin.arm = "sha256-pvOVvNc8lZ2d2fVZVYWvumVWYpnLORNY/3o1t4BN2N4="; - linux.amd = "sha256-cQtUu3mVTcRm1HYlzw+nOqTOx6W0XuALkip9uFXyLeM="; + linux.amd = "sha256-azh9/NaKR11Ssd7gxYXsasSWuLfxSqz1C8tHmqjd3Xs="; linux.arm = "sha256-WHjYAbytiu747jFqN0KZ/CkIwAVI7fb32ywtRiQOBm8="; }; in stdenv.mkDerivation rec { From eafbd542ed0e721c4faae46adbe58419bbaa0f95 Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Wed, 12 Oct 2022 01:24:28 -0600 Subject: [PATCH 062/114] qutebrowser-qt6: fix help command Fixes #195626 The unstable qt6 build requires invoking the doc builder before setup.py is called in order to have it properly installed. Also added pygments as a missing doc build dependency. --- .../networking/browsers/qutebrowser/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index c4327901d73..27dd55fc787 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -75,7 +75,8 @@ buildPythonApplication { nativeBuildInputs = [ wrapQtAppsHook wrapGAppsHook asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt - ]; + ] + ++ lib.optional isQt6 python3Packages.pygments; propagatedBuildInputs = with python3Packages; ([ pyyaml backendPackage jinja2 pygments @@ -97,6 +98,12 @@ buildPythonApplication { dontWrapGApps = true; dontWrapQtApps = true; + preConfigure = '' + a2x -f manpage doc/qutebrowser.1.asciidoc + '' + lib.optionalString isQt6 '' + python scripts/asciidoc2html.py + ''; + postPatch = '' substituteInPlace qutebrowser/misc/quitter.py --subst-var-by qutebrowser "$out/bin/qutebrowser" @@ -105,10 +112,6 @@ buildPythonApplication { sed -i "s,/usr/share/pdf.js,${pdfjs},g" qutebrowser/browser/pdfjs.py ''; - postBuild = '' - a2x -f manpage doc/qutebrowser.1.asciidoc - ''; - postInstall = '' install -Dm644 doc/qutebrowser.1 "$out/share/man/man1/qutebrowser.1" install -Dm644 misc/org.qutebrowser.qutebrowser.desktop \ From 80f28828c73ae6a2bb3ad667a969fa5527657dc3 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Wed, 12 Oct 2022 09:58:10 +0200 Subject: [PATCH 063/114] gerrit: 3.5.1 -> 3.6.2 (#195630) https://www.gerritcodereview.com/3.6.html --- pkgs/applications/version-management/gerrit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/applications/version-management/gerrit/default.nix index e1e1fe17547..335a899b4da 100644 --- a/pkgs/applications/version-management/gerrit/default.nix +++ b/pkgs/applications/version-management/gerrit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gerrit"; - version = "3.5.1"; + version = "3.6.2"; src = fetchurl { url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war"; - sha256 = "3fb5de878b6470dc8ef65ce22f2709cb8baecb5f16d89497dfaa33a0f33f7920"; + sha256 = "sha256-/OckQD6r9WSMx9Vt44eFpzsacH6VMa6NJX6sj2HBQSs="; }; buildCommand = '' From 334f2a858424172756222e0270c5a3e88a787792 Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Wed, 12 Oct 2022 10:40:40 +0200 Subject: [PATCH 064/114] openmm: init at 7.7.0 openmm formatting and inputs openmm: clang optional openmm: formatting openmm: formatting openmm: formatting openmm: formatting openmm: fix openmm: disable more tests openmm: disable more tests openmm: disable more stochastic tests --- .../science/chemistry/openmm/default.nix | 91 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 5 + 3 files changed, 98 insertions(+) create mode 100644 pkgs/development/libraries/science/chemistry/openmm/default.nix diff --git a/pkgs/development/libraries/science/chemistry/openmm/default.nix b/pkgs/development/libraries/science/chemistry/openmm/default.nix new file mode 100644 index 00000000000..16bb94246e4 --- /dev/null +++ b/pkgs/development/libraries/science/chemistry/openmm/default.nix @@ -0,0 +1,91 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, gfortran +, fftwSinglePrec +, doxygen +, swig +, python3Packages, enablePython ? false +, opencl-headers, ocl-icd, enableOpencl ? false +, clang, enableClang ? true +, cudatoolkit, enableCuda ? false +}: + +stdenv.mkDerivation rec { + pname = "openmm"; + version = "7.7.0"; + + src = fetchFromGitHub { + owner = "openmm"; + repo = pname; + rev = version; + hash = "sha256-2PYUGTMVQ5qVDeeABrwR45U3JIgo2xMXKlD6da7y3Dw="; + }; + + # "This test is stochastic and may occassionally fail". It does. + postPatch = '' + rm \ + platforms/*/tests/Test*BrownianIntegrator.* \ + platforms/*/tests/Test*LangevinIntegrator.* \ + serialization/tests/TestSerializeIntegrator.cpp + ''; + + nativeBuildInputs = [ cmake gfortran swig doxygen python3Packages.python ]; + + buildInputs = [ fftwSinglePrec ] + ++ lib.optionals enableOpencl [ ocl-icd opencl-headers ] + ++ lib.optional enableCuda cudatoolkit; + + propagatedBuildInputs = lib.optionals enablePython (with python3Packages; [ + python + numpy + cython + ]); + + cmakeFlags = [ + "-DBUILD_TESTING=ON" + "-DOPENMM_BUILD_AMOEBA_PLUGIN=ON" + "-DOPENMM_BUILD_CPU_LIB=ON" + "-DOPENMM_BUILD_C_AND_FORTRAN_WRAPPERS=ON" + "-DOPENMM_BUILD_DRUDE_PLUGIN=ON" + "-DOPENMM_BUILD_PME_PLUGIN=ON" + "-DOPENMM_BUILD_RPMD_PLUGIN=ON" + "-DOPENMM_BUILD_SHARED_LIB=ON" + ] ++ lib.optionals enablePython [ + "-DOPENMM_BUILD_PYTHON_WRAPPERS=ON" + ] ++ lib.optionals enableClang [ + "-DCMAKE_C_COMPILER=${clang}/bin/clang" + "-DCMAKE_CXX_COMPILER=${clang}/bin/clang++" + ] ++ lib.optionals enableOpencl [ + "-DOPENMM_BUILD_OPENCL_LIB=ON" + "-DOPENMM_BUILD_AMOEBA_OPENCL_LIB=ON" + "-DOPENMM_BUILD_DRUDE_OPENCL_LIB=ON" + "-DOPENMM_BUILD_RPMD_OPENCL_LIB=ON" + ] ++ lib.optionals enableCuda [ + "-DCUDA_SDK_ROOT_DIR=${cudatoolkit}" + "-DOPENMM_BUILD_AMOEBA_CUDA_LIB=ON" + "-DOPENMM_BUILD_CUDA_LIB=ON" + "-DOPENMM_BUILD_DRUDE_CUDA_LIB=ON" + "-DOPENMM_BUILD_RPMD_CUDA_LIB=ON" + "-DCMAKE_LIBRARY_PATH=${cudatoolkit}/lib64/stubs" + ]; + + postInstall = lib.strings.optionalString enablePython '' + export OPENMM_LIB_PATH=$out/lib + export OPENMM_INCLUDE_PATH=$out/include + cd python + ${python3Packages.python.interpreter} setup.py build + ${python3Packages.python.interpreter} setup.py install --prefix=$out + ''; + + doCheck = true; + + meta = with lib; { + description = "Toolkit for molecular simulation using high performance GPU code"; + homepage = "https://openmm.org/"; + license = with licenses; [ gpl3Plus lgpl3Plus mit ]; + platforms = platforms.linux; + maintainers = [ maintainers.sheepforce ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 673f42bd5df..a4d35d79872 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30278,6 +30278,8 @@ with pkgs; open-policy-agent = callPackage ../development/tools/open-policy-agent { }; + openmm = callPackage ../development/libraries/science/chemistry/openmm { }; + openshift = callPackage ../applications/networking/cluster/openshift { }; opsdroid = callPackage ../applications/networking/opsdroid { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 077d3fda679..e2355c76798 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6533,6 +6533,11 @@ in { openidc-client = callPackage ../development/python-modules/openidc-client { }; + openmm = toPythonModule (pkgs.openmm.override { + python3Packages = self; + enablePython = true; + }); + openpyxl = callPackage ../development/python-modules/openpyxl { }; openrazer = callPackage ../development/python-modules/openrazer/pylib.nix { }; From 0d0c03fb0bb3b7407243bde95c482831ed9bfa9c Mon Sep 17 00:00:00 2001 From: Adam Joseph <54836058+amjoseph-nixpkgs@users.noreply.github.com> Date: Wed, 12 Oct 2022 09:08:50 +0000 Subject: [PATCH 065/114] coding-conventions.chapter.md: update to account for #89885 (#191378) https://github.com/NixOS/nixpkgs/pull/89885 ensures that fetches are done securely (i.e. without `--insecure`) when the `hash` parameter is one of the four special "fake" hashes. However the manual was not updated in that PR. This commit updates the manual to account for the already-merged changes from that PR. Co-authored-by: Valentin Gagarin --- .../coding-conventions.chapter.md | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/doc/contributing/coding-conventions.chapter.md b/doc/contributing/coding-conventions.chapter.md index 585b8d3679c..e4e7b5bd3a8 100644 --- a/doc/contributing/coding-conventions.chapter.md +++ b/doc/contributing/coding-conventions.chapter.md @@ -480,15 +480,23 @@ Preferred source hash type is sha256. There are several ways to get it. 4. Extracting hash from local source tarball can be done with `sha256sum`. Use `nix-prefetch-url file:///path/to/tarball` if you want base32 hash. -5. Fake hash: set fake hash in package expression, perform build and extract correct hash from error Nix prints. +5. Fake hash: set the hash to one of - For package updates it is enough to change one symbol to make hash fake. For new packages, you can use `lib.fakeSha256`, `lib.fakeSha512` or any other fake hash. + - `""` + - `lib.fakeHash` + - `lib.fakeSha256` + - `lib.fakeSha512` + + in the package expression, attempt build and extract correct hash from error messages. + + :::{.warning} + You must use one of these four fake hashes and not some arbitrarily-chosen hash. + + See [](#sec-source-hashes-security). + ::: This is last resort method when reconstructing source URL is non-trivial and `nix-prefetch-url -A` isn’t applicable (for example, [one of `kodi` dependencies](https://github.com/NixOS/nixpkgs/blob/d2ab091dd308b99e4912b805a5eb088dd536adb9/pkgs/applications/video/kodi/default.nix#L73)). The easiest way then would be replace hash with a fake one and rebuild. Nix build will fail and error message will contain desired hash. -::: {.warning} -This method has security problems. Check below for details. -::: ### Obtaining hashes securely {#sec-source-hashes-security} @@ -500,7 +508,7 @@ Let's say Man-in-the-Middle (MITM) sits close to your network. Then instead of f - `https://` URLs are secure in methods 1, 2, 3; -- `https://` URLs are not secure in method 5. When obtaining hashes with fake hash method, TLS checks are disabled. So refetch source hash from several different networks to exclude MITM scenario. Alternatively, use fake hash method to make Nix error, but instead of extracting hash from error, extract `https://` URL and prefetch it with method 1. +- `https://` URLs are secure in method 5 *only if* you use one of the listed fake hashes. If you use any other hash, `fetchurl` will pass `--insecure` to `curl` and may then degrade to HTTP in case of TLS certificate expiration. ## Patches {#sec-patches} From ca03be9517b01f7fc2f974b3886efa24c2a9659c Mon Sep 17 00:00:00 2001 From: siph Date: Wed, 12 Oct 2022 03:11:55 -0600 Subject: [PATCH 066/114] devilspie2: update homepage in meta --- pkgs/applications/misc/devilspie2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/devilspie2/default.nix b/pkgs/applications/misc/devilspie2/default.nix index 68bdb64b5bf..581a8126cad 100644 --- a/pkgs/applications/misc/devilspie2/default.nix +++ b/pkgs/applications/misc/devilspie2/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { positioned at a specific screen position, or position a window on a specific workspace. ''; - homepage = "https://www.gusnan.se/devilspie2/"; + homepage = "https://www.nongnu.org/devilspie2/"; license = licenses.gpl3; maintainers = [ maintainers.ebzzry ]; platforms = platforms.linux; From 7d3e7f48903918cc8b1f102e3a2602114fba357e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Oct 2022 12:15:10 +0200 Subject: [PATCH 067/114] python3Packages.bcrypt: Revert to 3.2.2 on i686-linux The latest bcrypt version segfaults during test_kdf, which prevents the package from building. The package is in the critical chain for many NixOS tests, which currently won't complete on i686-linux. Upstream-Issue: https://github.com/pyca/bcrypt/issues/407 --- pkgs/development/python-modules/bcrypt/3.nix | 51 ++++++++++++++++++++ pkgs/top-level/python-packages.nix | 5 +- 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/bcrypt/3.nix diff --git a/pkgs/development/python-modules/bcrypt/3.nix b/pkgs/development/python-modules/bcrypt/3.nix new file mode 100644 index 00000000000..2f242faac86 --- /dev/null +++ b/pkgs/development/python-modules/bcrypt/3.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, setuptools +, isPyPy +, fetchPypi +, pythonOlder +, cffi +, pytestCheckHook +, six +}: + +buildPythonPackage rec { + pname = "bcrypt"; + version = "3.2.2"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-QzxBDCF3BXcF2iqfLNAd0VdJOyp6wUyFk6FrPatra/s="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + six + cffi + ]; + + propagatedNativeBuildInputs = [ + cffi + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "bcrypt" + ]; + + meta = with lib; { + description = "Modern password hashing for your software and your servers"; + homepage = "https://github.com/pyca/bcrypt/"; + license = licenses.asl20; + maintainers = with maintainers; [ domenkozar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 077d3fda679..47928f1cc22 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1285,7 +1285,10 @@ in { bcdoc = callPackage ../development/python-modules/bcdoc { }; - bcrypt = callPackage ../development/python-modules/bcrypt { }; + bcrypt = if stdenv.hostPlatform.system == "i686-linux" then + callPackage ../development/python-modules/bcrypt/3.nix { } + else + callPackage ../development/python-modules/bcrypt { }; beaker = callPackage ../development/python-modules/beaker { }; From 0310ac43a5b29b5aad8dd8bc0a9adfc4da8d8dd6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Oct 2022 13:00:01 +0200 Subject: [PATCH 068/114] python3Packages.mypy: Disable mypy.report import on i686-linux Importing the mypy.report fails due to a circular import. --- pkgs/development/python-modules/mypy/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index 3e58b91b160..b664d871fb5 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -63,10 +63,12 @@ buildPythonPackage rec { "mypy" "mypy.api" "mypy.fastparse" - "mypy.report" "mypy.types" "mypyc" "mypyc.analysis" + ] ++ lib.optionals (!stdenv.hostPlatform.isi686) [ + # ImportError: cannot import name 'map_instance_to_supertype' from partially initialized module 'mypy.maptype' (most likely due to a circular import) + "mypy.report" ]; # Compile mypy with mypyc, which makes mypy about 4 times faster. The compiled From a0231e8ccebfadfc742a9da51cc14c375eeeb682 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Oct 2022 13:11:54 +0200 Subject: [PATCH 069/114] pebble: mark broken on 32bit platforms --- pkgs/tools/admin/pebble/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/admin/pebble/default.nix b/pkgs/tools/admin/pebble/default.nix index 8fc32a2e4e7..a3c8d20b107 100644 --- a/pkgs/tools/admin/pebble/default.nix +++ b/pkgs/tools/admin/pebble/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildGoModule , fetchFromGitHub , nixosTests @@ -22,6 +23,8 @@ buildGoModule rec { }; meta = { + # ca/ca.go:374:67: 9223372038 (untyped int constant) overflows uint + broken = stdenv.hostPlatform.is32bit; homepage = "https://github.com/letsencrypt/pebble"; description = "A miniature version of Boulder, Pebble is a small RFC 8555 ACME test server not suited for a production CA"; license = [ lib.licenses.mpl20 ]; From 07f03615ba871e5f82390db41d2ff511ade7f631 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Oct 2022 11:24:03 +0000 Subject: [PATCH 070/114] dagger: 0.2.35 -> 0.2.36 --- .../tools/continuous-integration/dagger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/dagger/default.nix b/pkgs/development/tools/continuous-integration/dagger/default.nix index 055f361452a..78c93efc2b9 100644 --- a/pkgs/development/tools/continuous-integration/dagger/default.nix +++ b/pkgs/development/tools/continuous-integration/dagger/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dagger"; - version = "0.2.35"; + version = "0.2.36"; src = fetchFromGitHub { owner = "dagger"; repo = "dagger"; rev = "v${version}"; - sha256 = "sha256-bLeNCi9ghNuHcMjUV3JWmC7nQTUZA9lU3Rc0TO7AWto="; + sha256 = "sha256-U+MdX/7RIrhnPjUjzYAQEVeHQUpgMtKanvjPLBjCNSY="; }; vendorSha256 = "sha256-ArdqEHECnGTMs3sJrPIAfmTT0D2V8SHyTYXmDODVtuo="; From 6425011efe079f34bb795a1bc192cc0db3590155 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 9 Oct 2022 16:12:02 +0000 Subject: [PATCH 071/114] update-python-libraries: remove old Nix fallback Since c0972c16dcb ("update-python-libraries: add missing dependency nix"), Nix will be provided as a dependency, so we know we'll always be using a modern version and no longer need the fallback. --- .../update-python-libraries/update-python-libraries.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py index 3843497d94e..ea8af4241cf 100755 --- a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py +++ b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py @@ -342,11 +342,7 @@ def _update_package(path, target): text = _replace_value('version', new_version, text) # hashes from pypi are 16-bit encoded sha256's, normalize it to sri to avoid merge conflicts # sri hashes have been the default format since nix 2.4+ - try: - sri_hash = subprocess.check_output(["nix", "hash", "to-sri", "--type", "sha256", new_sha256]).decode('utf-8').strip() - except subprocess.CalledProcessError: - # nix<2.4 compat - sri_hash = subprocess.check_output(["nix", "to-sri", "--type", "sha256", new_sha256]).decode('utf-8').strip() + sri_hash = subprocess.check_output(["nix", "hash", "to-sri", "--type", "sha256", new_sha256]).decode('utf-8').strip() # fetchers can specify a sha256, or a sri hash From 3dae05bb9193f3910f1ac0251b1c1eb4f7f07872 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 9 Oct 2022 16:13:44 +0000 Subject: [PATCH 072/114] update-python-libraries: enable nix command Since the Nix command used is an implementation detail of the script, it's the script that will have to be updated if the command changes, it's the script that should be opting into this, rather than making the user do it globally. --- .../python/update-python-libraries/update-python-libraries.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py index ea8af4241cf..07a72a3f2ec 100755 --- a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py +++ b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py @@ -342,7 +342,7 @@ def _update_package(path, target): text = _replace_value('version', new_version, text) # hashes from pypi are 16-bit encoded sha256's, normalize it to sri to avoid merge conflicts # sri hashes have been the default format since nix 2.4+ - sri_hash = subprocess.check_output(["nix", "hash", "to-sri", "--type", "sha256", new_sha256]).decode('utf-8').strip() + sri_hash = subprocess.check_output(["nix", "--extra-experimental-features", "nix-command", "hash", "to-sri", "--type", "sha256", new_sha256]).decode('utf-8').strip() # fetchers can specify a sha256, or a sri hash From 16ead09b5e3ab9b1c7a5dc43bb6ad497ccba8f4d Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Wed, 12 Oct 2022 14:41:20 +0300 Subject: [PATCH 073/114] parlatype: sort dependencies and reformat --- pkgs/applications/audio/parlatype/default.nix | 61 +++++++++++++------ 1 file changed, 42 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/audio/parlatype/default.nix b/pkgs/applications/audio/parlatype/default.nix index 71cfe338c62..6aa92a3a99f 100644 --- a/pkgs/applications/audio/parlatype/default.nix +++ b/pkgs/applications/audio/parlatype/default.nix @@ -1,41 +1,62 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, meson, gtk3, dbus, gst_all_1, ninja, gettext, appstream-glib, python3, desktop-file-utils, glib, gobject-introspection, gsettings-desktop-schemas, isocodes, itstool, libxml2, wrapGAppsHook, hicolor-icon-theme }: +{ lib +, stdenv +, fetchFromGitHub +, appstream-glib +, dbus +, desktop-file-utils +, gettext +, glib +, gobject-introspection +, gsettings-desktop-schemas +, gst_all_1 +, gtk3 +, hicolor-icon-theme +, isocodes +, itstool +, libxml2 +, meson +, ninja +, pkg-config +, python3 +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "parlatype"; version = "3.1"; src = fetchFromGitHub { - owner = "gkarsay"; - repo = pname; - rev = "v${version}"; + owner = "gkarsay"; + repo = pname; + rev = "v${version}"; sha256 = "1a4xlsbszb50vnz1g7kf7hl7aywp7s7xaravkcx13csn0a7l3x45"; }; nativeBuildInputs = [ - pkg-config - meson - ninja - gettext appstream-glib - python3 desktop-file-utils + gettext gobject-introspection itstool libxml2 + meson + ninja + pkg-config + python3 wrapGAppsHook ]; buildInputs = [ - gtk3 dbus - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-ugly - gst_all_1.gst-libav glib gsettings-desktop-schemas + gst_all_1.gst-libav + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-ugly + gst_all_1.gstreamer + gtk3 hicolor-icon-theme isocodes ]; @@ -50,9 +71,11 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GNOME audio player for transcription"; longDescription = '' - Parlatype is a minimal audio player for manual speech transcription, written for the GNOME desktop environment. - It plays audio sources to transcribe them in your favourite text application. - It’s intended to be useful for journalists, students, scientists and whoever needs to transcribe audio files. + Parlatype is a minimal audio player for manual speech transcription, + written for the GNOME desktop environment. It plays audio sources to + transcribe them in your favourite text application. It’s intended to be + useful for journalists, students, scientists and whoever needs to + transcribe audio files. ''; homepage = "https://www.parlatype.org/"; license = licenses.gpl3Plus; From 7fc8453a6872573b1f0c75118a09367d1461b3ac Mon Sep 17 00:00:00 2001 From: Yureka Date: Wed, 12 Oct 2022 14:20:21 +0200 Subject: [PATCH 074/114] libusb1: enable udev support for dynamically linked musl platform (#195351) This was previously disabled because pkgs.udev (=pkgs.systemd) was not building on musl, but that is no longer the case. This fixes the build of pkgsMusl.usbutils, which requires udev support in libusb1. --- pkgs/development/libraries/libusb1/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 3b23402fe33..f7f1633ed44 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -3,7 +3,7 @@ , fetchpatch , autoreconfHook , pkg-config -, enableUdev ? stdenv.isLinux && !stdenv.hostPlatform.isMusl +, enableUdev ? stdenv.isLinux && !stdenv.targetPlatform.isStatic , udev , libobjc , IOKit From 9ff71f97c885dd46c25dd5927ea24f3bcfd9e9bb Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 11 Oct 2022 20:44:47 +0300 Subject: [PATCH 075/114] python-setup-hook: use buildPackages.callPackage to not change hashes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit this is just a hook so its safe without this change: we build a python3 for buildHost twice instead of only once while the result of the build is the same ``` nix-repl> pkgsCross.aarch64-multiplatform.python3.pythonForBuild «derivation /nix/store/5sx1ng86lxzggi33rchvq0z16ywkg11b-python3-3.10.7.drv» nix-repl> pkgsCross.aarch64-multiplatform.buildPackages.python3 «derivation /nix/store/c5rlaqdfymd3j5v41rh98pjcv3dx3sh7-python3-3.10.7.drv» ``` ``` $ nix-diff $(getOutForDrv "/nix/store/5sx1ng86lxzggi33rchvq0z16ywkg11b-python3-3.10.7.drv") $(getOutForDrv "/nix/store/c5rlaqdfymd3j5v41rh98pjcv3dx3sh7-python3-3.10.7.drv") --environment - /nix/store/3fkwg2pypsxhydgwb9m7f1v5pcgfns6p-python3-3.10.7:{out} + /nix/store/wyhbl43ycqn43d08v5fqj1j6ynf7nz73-python3-3.10.7:{out} • The input derivation named `python-setup-hook.sh` differs - /nix/store/slvn39rh0l53c9czaf3g6a4awcj63j5r-python-setup-hook.sh.drv:{out} + /nix/store/bcjff6dn4gp7pf0knnja9ax4qrll78d5-python-setup-hook.sh.drv:{out} • The set of input source names do not match: - cross-file.conf • The input derivation named `stdenv-linux` differs - /nix/store/rsxsipgabvny0mc286j3vfpgaaaixdyz-stdenv-linux.drv:{out} + /nix/store/46ywpk0p6r22y502gi21xxghminy9lbj-stdenv-linux.drv:{out} • The set of input derivation names do not match: - hook + acl-2.3.1 + attr-2.5.1 + binutils-2.39 + binutils-wrapper-2.39 + ed-1.18 + expand-response-params + gcc-11.3.0 + gcc-wrapper-11.3.0 + glibc-2.35-163 + gmp-with-cxx-stage4-6.2.1 + libidn2-2.3.2 + libunistring-1.0 + linux-headers-5.19 + pcre-8.45 + zlib-1.2.12 • The set of input derivations named `bzip2-1.0.8` do not match • The set of input derivations named `xz-5.2.6` do not match • The environments do not match: + allowedRequisites=... defaultNativeBuildInputs='' ... '' • The environments do not match: cmakeFlags='' -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_SYSTEM_PROCESSOR=aarch64 -DCMAKE_HOST_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_PROCESSOR=x86_64 '' configureFlags='' --build=x86_64-unknown-linux-gnu --host=aarch64-unknown-linux-gnu '' mesonFlags='' --cross-file=/nix/store/0d6bflf42rgrrxhp10visp67scqncd4g-cross-file.conf '' stdenv='' /nix/store/6ji09gqw12pnp3ylw3rrsd65f9vhhx89-stdenv-linux/nix/store/ykjm8yzjcwg2xpf640zh6jql5s8yimkp-stdenv-linux '' • The environments do not match: setupHook='' /nix/store/x6rrxsai11kl9gq29ipv0jn455admav3-python-setup-hook.sh/nix/store/h7z4wvlf7n23ir86nngjn9rpk1ygc7di-python-setup-hook.sh '' ``` --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7f75ae2d08e..cc178cfc73e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15588,7 +15588,7 @@ with pkgs; update-python-libraries = callPackage ../development/interpreters/python/update-python-libraries { }; # Should eventually be moved inside Python interpreters. - python-setup-hook = callPackage ../development/interpreters/python/setup-hook.nix { }; + python-setup-hook = buildPackages.callPackage ../development/interpreters/python/setup-hook.nix { }; pythonDocs = recurseIntoAttrs (callPackage ../development/interpreters/python/cpython/docs {}); From fa2021c7b69916754655c525d7ebbc0bc946c003 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 12 Oct 2022 11:05:36 +0200 Subject: [PATCH 076/114] fido2luks: 0.2.20 -> 0.2.21 + fix license --- pkgs/tools/security/fido2luks/default.nix | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/security/fido2luks/default.nix b/pkgs/tools/security/fido2luks/default.nix index 8877419a4b7..9545f6781db 100644 --- a/pkgs/tools/security/fido2luks/default.nix +++ b/pkgs/tools/security/fido2luks/default.nix @@ -10,37 +10,29 @@ rustPlatform.buildRustPackage rec { pname = "fido2luks"; - version = "0.2.20"; + version = "0.2.21"; src = fetchFromGitHub { owner = "shimunn"; repo = pname; rev = version; - sha256 = "04gl7wn38f42mapmkf026rya668vvhm03yi8iqnz31xgggbr2irm"; + sha256 = "sha256-bXwaFiRHURvS5KtTqIj+3GlGNbEulDgMDP51ZiO1w9o="; }; - cargoPatches = [ - #https://github.com/shimunn/fido2luks/pull/50 - (fetchpatch { - name = "libcryptsetup-rs.patch"; - url = "https://github.com/shimunn/fido2luks/commit/c87a9bbb4cbbe90be7385d4bc2946716c593b91d.diff"; - sha256 = "2IWz9gcEbXhHlz7VWoJNBZfwnJm/J3RRuXg91xH9Pl4="; - }) - ]; + nativeBuildInputs = [ pkg-config clang ]; buildInputs = [ cryptsetup ]; - nativeBuildInputs = [ pkg-config clang ]; configurePhase = '' export LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib" ''; - cargoSha256 = "U/2dAmFmW6rQvojaKSDdO+/WzajBJmhOZWvzwdiYBm0="; + cargoSha256 = "sha256-MPji87jYJjYtDAXO+v/Z4XRtCKo+ftsNvmlBrM9iMTk="; meta = with lib; { description = "Decrypt your LUKS partition using a FIDO2 compatible authenticator"; homepage = "https://github.com/shimunn/fido2luks"; - license = licenses.gpl3; + license = licenses.mpl20; maintainers = with maintainers; [ prusnak mmahut ]; platforms = platforms.linux; }; From b468eb865524252a271cafaf59febc13765a39bb Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 12 Oct 2022 15:27:08 +0200 Subject: [PATCH 077/114] jenkins: 2.361.1 -> 2.361.2 (#195565) https://www.jenkins.io/changelog-stable//#v2.361.2 --- .../tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 5b8dff8d6c6..f8d23d3fcec 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.361.1"; + version = "2.361.2"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "1cvyj3arqzrvqd5m4plqvl6d4ra85n6kk2vzd9wqbxvhsm1jp9q8"; + hash = "sha256-QRp5x+DVCCdFBx4mEIE0aqTKJ/ZJ/rBBdW0dJ6mD2/Y="; }; nativeBuildInputs = [ makeWrapper ]; From 9673ea736af82a37bd40243eb10c9557237ea5a6 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 12 Oct 2022 09:49:10 -0400 Subject: [PATCH 078/114] =?UTF-8?q?oh-my-zsh:=202022-10-07=20=E2=86=92=202?= =?UTF-8?q?022-10-12=20(#195666)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index ff524568b00..18609c78e33 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }: stdenv.mkDerivation rec { - version = "2022-10-07"; + version = "2022-10-12"; pname = "oh-my-zsh"; - rev = "11daa7dd5f22acadef1135000e92cc899e22c134"; + rev = "b9be3a43b4da579299b4426b1ba9121f746e2555"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "xtDymRvgm3VHTY3Hh6ikGTY8DQ5jn7Oc44b3HMXz75U="; + sha256 = "KKvIYEYh8wpgil8d+Uf9M7uk0etPMOtrTjESa2hwJu4="; }; strictDeps = true; From f3cdcef7a03c36fa02b3c7af1620353380cdbe1f Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Oct 2022 16:18:57 +0200 Subject: [PATCH 079/114] sockdump: unstable-2022-05-27 -> unstable-2022-10-12 Fixes https://github.com/mechpen/sockdump/issues/15. --- pkgs/tools/networking/sockdump/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/sockdump/default.nix b/pkgs/tools/networking/sockdump/default.nix index 1a918664665..db9edba0b22 100644 --- a/pkgs/tools/networking/sockdump/default.nix +++ b/pkgs/tools/networking/sockdump/default.nix @@ -2,13 +2,13 @@ python3.pkgs.buildPythonApplication rec { pname = "sockdump"; - version = "unstable-2022-05-27"; + version = "unstable-2022-10-12"; src = fetchFromGitHub { owner = "mechpen"; repo = pname; - rev = "4bb689933f253d4f58c8bb81b992cc883068e873"; - hash = "sha256-B2ob4k29kgPA4JMtwr0Ma7vQeDRHL/vTFAJxhdS8ShA="; + rev = "005dcb056238c2e37ff378aef27c953208ffa08f"; + hash = "sha256-X8PIUDxlcdPoD7+aLDWzlWV++P3mmu52BwY7irhypww="; }; propagatedBuildInputs = [ bcc ]; From 51c9acf26dec754b5a89c52097b30900a31ab040 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Maret?= Date: Wed, 12 Oct 2022 17:00:24 +0200 Subject: [PATCH 080/114] python3Packages.astroquery: fix build --- pkgs/development/python-modules/astroquery/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/astroquery/default.nix b/pkgs/development/python-modules/astroquery/default.nix index 6c1d39a82b0..4dfcde70c55 100644 --- a/pkgs/development/python-modules/astroquery/default.nix +++ b/pkgs/development/python-modules/astroquery/default.nix @@ -13,6 +13,7 @@ , pytestCheckHook , pyvo , astropy-helpers +, setuptools , isPy3k }: @@ -37,7 +38,7 @@ buildPythonPackage rec { pyvo ]; - nativeBuildInputs = [ astropy-helpers ]; + nativeBuildInputs = [ astropy-helpers setuptools ]; # Disable automatic update of the astropy-helper module postPatch = '' From faacc2c571d47ca883a75c470c363aa9e1a1f7f9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Oct 2022 15:09:38 +0000 Subject: [PATCH 081/114] liferea: 1.13.9 -> 1.14-RC1 --- pkgs/applications/networking/newsreaders/liferea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index ae8aa4656c0..15b3c8a976a 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "liferea"; - version = "1.13.9"; + version = "1.14-RC1"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "IP3TSmnRekFebxeBh5JRegeSedx+y24e4X9muMAyhFk="; + sha256 = "cBtS+Km2d1n5Yl0wrQkN3Pg6OxSzhG7oVu7ZJ5RQuRQ="; }; nativeBuildInputs = [ From c41058468d91d2fce5835da673845ec5f2a96511 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 12 Oct 2022 18:52:38 +0300 Subject: [PATCH 082/114] n8n: fix build on aarch64 By performing an oraclectomy. --- pkgs/applications/networking/n8n/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/networking/n8n/default.nix b/pkgs/applications/networking/n8n/default.nix index e8b3d258c9c..cdaf4286f93 100644 --- a/pkgs/applications/networking/n8n/default.nix +++ b/pkgs/applications/networking/n8n/default.nix @@ -15,6 +15,15 @@ nodePackages.n8n.override { pkgs.postgresql ]; + # Oracle's official package on npm is binary only (WHY?!) and doesn't provide binaries for aarch64. + # This can supposedly be fixed by building a custom copy of the module from source, but that's way + # too much complexity for a setup no one would ever actually run. + # + # NB: If you _are_ actually running n8n on Oracle on aarch64, feel free to submit a patch. + preRebuild = lib.optionalString stdenv.isAarch64 '' + rm -rf node_modules/oracledb + ''; + dontNpmInstall = true; passthru = { From dd34f474ed6c719c094085e24108888761ab2b67 Mon Sep 17 00:00:00 2001 From: Shadaj Laddad Date: Mon, 29 Aug 2022 16:40:28 -0700 Subject: [PATCH 083/114] nixos/restic: make it possible to use the existing backup cache for prune/check Configures the `--cache-dir` parameter for the prune and check commands run after backing up. For `check`, also adds a `checkOpts` flag to enable using the cache, since that is disabled by default. --- nixos/modules/services/backup/restic.nix | 16 ++++++++++++++-- nixos/tests/restic.nix | 4 ++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix index 2b0dcb16344..6fde11927c0 100644 --- a/nixos/modules/services/backup/restic.nix +++ b/nixos/modules/services/backup/restic.nix @@ -196,6 +196,18 @@ in ]; }; + checkOpts = mkOption { + type = types.listOf types.str; + default = [ ]; + description = lib.mdDoc '' + A list of options for 'restic check', which is run after + pruning. + ''; + example = [ + "--with-cache" + ]; + }; + dynamicFilesFrom = mkOption { type = with types; nullOr str; default = null; @@ -270,8 +282,8 @@ in then if (backup.paths != null) then concatStringsSep " " backup.paths else "" else "--files-from ${filesFromTmpFile}"; pruneCmd = optionals (builtins.length backup.pruneOpts > 0) [ - (resticCmd + " forget --prune " + (concatStringsSep " " backup.pruneOpts)) - (resticCmd + " check") + (resticCmd + " forget --prune --cache-dir=%C/restic-backups-${name} " + (concatStringsSep " " backup.pruneOpts)) + (resticCmd + " check --cache-dir=%C/restic-backups-${name} " + (concatStringsSep " " backup.checkOpts)) ]; # Helper functions for rclone remotes rcloneRemoteName = builtins.elemAt (splitString ":" backup.repository) 1; diff --git a/nixos/tests/restic.nix b/nixos/tests/restic.nix index 75fffe9d9a8..16dd5f8c5c8 100644 --- a/nixos/tests/restic.nix +++ b/nixos/tests/restic.nix @@ -68,6 +68,9 @@ import ./make-test-python.nix ( package = pkgs.writeShellScriptBin "restic" '' echo "$@" >> /tmp/fake-restic.log; ''; + + pruneOpts = [ "--keep-last 1" ]; + checkOpts = [ "--some-check-option" ]; }; }; @@ -98,6 +101,7 @@ import ./make-test-python.nix ( '${pkgs.restic}/bin/restic -r ${rcloneRepository} -p ${passwordFile} snapshots -c | grep -e "^1 snapshot"', "systemctl start restic-backups-custompackage.service", "grep 'backup .* /opt' /tmp/fake-restic.log", + "grep 'check .* --some-check-option' /tmp/fake-restic.log", "timedatectl set-time '2017-12-13 13:45'", "systemctl start restic-backups-remotebackup.service", "rm /opt/backupCleanupCommand", From 96fa2023535f2768db28622b056140ee1e8d9d58 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 12 Oct 2022 12:42:35 -0400 Subject: [PATCH 084/114] wordpressPackages.plugins.worker: init at 4.9.14 --- .../wordpress/packages/languages.json | 6 ++-- .../web-apps/wordpress/packages/plugins.json | 34 +++++++++++-------- .../wordpress/packages/wordpress-plugins.json | 1 + 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/pkgs/servers/web-apps/wordpress/packages/languages.json b/pkgs/servers/web-apps/wordpress/packages/languages.json index f5847cad4c9..03e49d39c45 100644 --- a/pkgs/servers/web-apps/wordpress/packages/languages.json +++ b/pkgs/servers/web-apps/wordpress/packages/languages.json @@ -1,9 +1,9 @@ { "de_DE": { "path": "de_DE", - "rev": "932483", - "sha256": "1n4rf1bkr8xr6yqxd7c6s4ha3ll819fbfiqln57is9knfpdd6fnq", - "version": "5.8" + "rev": "963003", + "sha256": "167zar1gp2jb6nx5nb5367mxk7b8c481gmg75m1s82y4mzlprc55", + "version": "5.9" }, "fr_FR": { "path": "fr_FR", diff --git a/pkgs/servers/web-apps/wordpress/packages/plugins.json b/pkgs/servers/web-apps/wordpress/packages/plugins.json index 85b103da39d..e474a1f3fdb 100644 --- a/pkgs/servers/web-apps/wordpress/packages/plugins.json +++ b/pkgs/servers/web-apps/wordpress/packages/plugins.json @@ -60,16 +60,16 @@ "version": "3.0.3" }, "lightbox-photoswipe": { - "path": "lightbox-photoswipe/tags/5.0.16", - "rev": "2790158", - "sha256": "1pd83v7nz2l002z1y27h97gmhcdcbvsfi8x7llrg9vzijrx0vf18", - "version": "5.0.16" + "path": "lightbox-photoswipe/tags/5.0.18", + "rev": "2796750", + "sha256": "1c6wnxq70rxqj95w0ygnhkl8kxnvcpy4sxj2nniim0wsilpr3w8g", + "version": "5.0.18" }, "mailpoet": { - "path": "mailpoet/tags/3.100.1", - "rev": "2795092", - "sha256": "0wgzmicf6mmkmkwsxxaz2d8sylvq6v0a98nbc2yswd11l4igc8ld", - "version": "3.100.1" + "path": "mailpoet/tags/3.100.2", + "rev": "2797181", + "sha256": "04vxwxdvpp80hh381xb88g81i9ps1imvvax5nljjx7nywwc5p9ci", + "version": "3.100.2" }, "opengraph": { "path": "opengraph/tags/1.11.0", @@ -90,15 +90,21 @@ "version": "0.9.3" }, "webp-converter-for-media": { - "path": "webp-converter-for-media/tags/5.2.4", - "rev": "2791011", - "sha256": "18y0yrngywz0zlxd67cn16nvzypb395rhsfavfyl6pq0ygymcxnm", - "version": "5.2.4" + "path": "webp-converter-for-media/tags/5.3.0", + "rev": "2797448", + "sha256": "1w6i4z09rj9prj4skv9j2m45nsi1an092j2frfzf1wmdacvsrmvh", + "version": "5.3.0" + }, + "worker": { + "path": "worker/tags/4.9.14", + "rev": "2739771", + "sha256": "14bq99cdpdqp1vydhgk3n4gyi99w1b0x1xkz1rnalj0xgqiq19hd", + "version": "4.9.14" }, "wp-change-email-sender": { "path": "wp-change-email-sender/trunk", - "rev": "2655179", - "sha256": "0dv5604mn4ly2zm6mwqf5y8vp9cfiw70v66bimvgbahxz4i2w23q", + "rev": "2796798", + "sha256": "1wkj15vclbh4l38fkrmbmc4w7lapfydq9rrpn508ki19f4544dam", "version": "1.0" }, "wp-gdpr-compliance": { diff --git a/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json b/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json index bef597c40f8..a66a0678923 100644 --- a/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json +++ b/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json @@ -15,6 +15,7 @@ , "simple-login-captcha" , "static-mail-sender-configurator" , "webp-converter-for-media" +, "worker" , "wp-mail-smtp" , "wp-gdpr-compliance" , "wp-statistics" From 76f2f7968049ac6701b8f9453e96cae3776f6eb0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Oct 2022 17:51:51 +0000 Subject: [PATCH 085/114] gum: 0.7.0 -> 0.8.0 --- pkgs/applications/misc/gum/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/gum/default.nix b/pkgs/applications/misc/gum/default.nix index 416de12bcb1..d4bd7c63a72 100644 --- a/pkgs/applications/misc/gum/default.nix +++ b/pkgs/applications/misc/gum/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gum"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-T8dIk99qUMyeZvfM+rLA13HAmITQ8SMsQ9uIXtMM+MM="; + sha256 = "sha256-6x1t/PLs1dqlY5XQ1F0PDqZ/TofZ0h1hTc0C1sjn3fA="; }; - vendorSha256 = "sha256-sht9e4pam4aJCylUZPeVGwk9TYttumJSniNVxI0LfNM="; + vendorSha256 = "sha256-rOBwhPXo4sTSI3j3rn3c5qWGnGFgkpeFUKgtzKBltbg="; nativeBuildInputs = [ installShellFiles From bb38470b969039859fdcfc084485b58fdb7898ad Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 6 Oct 2022 06:42:56 +0200 Subject: [PATCH 086/114] =?UTF-8?q?ocamlPackages.ff:=200.4.0=20=E2=86=92?= =?UTF-8?q?=200.6.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ocamlPackages.ff-pbt: 0.6.1 → 0.6.2 ocamlPackages.ff-sig: 0.6.1 → 0.6.2 --- pkgs/development/ocaml-modules/ff/default.nix | 22 +++++-------------- pkgs/development/ocaml-modules/ff/pbt.nix | 6 +++-- pkgs/development/ocaml-modules/ff/sig.nix | 12 +++++----- 3 files changed, 15 insertions(+), 25 deletions(-) diff --git a/pkgs/development/ocaml-modules/ff/default.nix b/pkgs/development/ocaml-modules/ff/default.nix index 80ea140a201..5681b33cb76 100644 --- a/pkgs/development/ocaml-modules/ff/default.nix +++ b/pkgs/development/ocaml-modules/ff/default.nix @@ -1,32 +1,22 @@ -{ lib, fetchFromGitLab, buildDunePackage, ocaml, zarith, alcotest }: +{ lib, buildDunePackage, ff-pbt, ff-sig, zarith, alcotest }: buildDunePackage rec { pname = "ff"; - version = "0.4.0"; - - src = fetchFromGitLab { - owner = "dannywillems"; - repo = "ocaml-ff"; - rev = version; - sha256 = "1ik29srzkd0pl48p1si9p1c4f8vmx5rgm02yv2arj3vg0a1nfhdv"; - }; - - useDune2 = true; + inherit (ff-sig) version src; propagatedBuildInputs = [ + ff-sig zarith ]; checkInputs = [ alcotest + ff-pbt ]; - doCheck = lib.versionAtLeast ocaml.version "4.08"; + doCheck = true; - meta = { - homepage = "https://gitlab.com/dannywillems/ocaml-ff"; + meta = ff-sig.meta // { description = "OCaml implementation of Finite Field operations"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.ulrikstrid ]; }; } diff --git a/pkgs/development/ocaml-modules/ff/pbt.nix b/pkgs/development/ocaml-modules/ff/pbt.nix index e0363160dd7..ffd78381127 100644 --- a/pkgs/development/ocaml-modules/ff/pbt.nix +++ b/pkgs/development/ocaml-modules/ff/pbt.nix @@ -1,8 +1,8 @@ -{ lib, fetchFromGitLab, buildDunePackage, zarith, ff-sig, alcotest }: +{ lib, buildDunePackage, zarith, ff-sig, alcotest }: buildDunePackage { pname = "ff-pbt"; - inherit (ff-sig) version src doCheck useDune2; + inherit (ff-sig) version src; minimalOCamlVersion = "4.08"; @@ -10,6 +10,8 @@ buildDunePackage { alcotest ]; + doCheck = true; + propagatedBuildInputs = [ zarith ff-sig diff --git a/pkgs/development/ocaml-modules/ff/sig.nix b/pkgs/development/ocaml-modules/ff/sig.nix index a2c7ca0d0c6..503a26f6398 100644 --- a/pkgs/development/ocaml-modules/ff/sig.nix +++ b/pkgs/development/ocaml-modules/ff/sig.nix @@ -2,16 +2,14 @@ buildDunePackage rec { pname = "ff-sig"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitLab { - owner = "dannywillems"; - repo = "ocaml-ff"; + owner = "nomadic-labs"; + repo = "cryptography/ocaml-ff"; rev = version; - sha256 = "0p42ivyfbn1pwm18773y4ga9cm64ysha0rplzvrnhszg01anarc0"; + sha256 = "sha256-IoUH4awMOa1pm/t8E5io87R0TZsAxJjGWaXhXjn/w+Y="; }; - useDune2 = true; - propagatedBuildInputs = [ zarith ]; @@ -19,7 +17,7 @@ buildDunePackage rec { doCheck = true; meta = { - homepage = "https://gitlab.com/dannywillems/ocaml-ff"; + inherit (src.meta) homepage; description = "Minimal finite field signatures"; license = lib.licenses.mit; maintainers = [ lib.maintainers.ulrikstrid ]; From 37053d45f94e70493cbcd4808f761a797d210701 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 12 Oct 2022 20:02:11 +0200 Subject: [PATCH 087/114] nvidia-texture-tools: unstable-2019-10-27 -> unstable-2020-12-21 --- .../nvidia-texture-tools/default.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/nvidia-texture-tools/default.nix b/pkgs/development/libraries/nvidia-texture-tools/default.nix index 67624596720..3a907a6ba79 100644 --- a/pkgs/development/libraries/nvidia-texture-tools/default.nix +++ b/pkgs/development/libraries/nvidia-texture-tools/default.nix @@ -2,22 +2,15 @@ stdenv.mkDerivation rec { pname = "nvidia-texture-tools"; - version = "unstable-2019-10-27"; + version = "unstable-2020-12-21"; src = fetchFromGitHub { owner = "castano"; repo = "nvidia-texture-tools"; - rev = "a131e4c6b0b7c9c73ccc3c9e6f1c7e165be86bcc"; - sha256 = "1qzyr3ib5dpxyq1y33lq02qv4cww075sm9bm4f651d34q5x38sk3"; + rev = "aeddd65f81d36d8cb7b169b469ef25156666077e"; + sha256 = "sha256-BYNm8CxPQbfmnnzNmOQ2Dc8HSyO8mkqzYsBZ5T80398="; }; - patches = [ - (fetchpatch { - url = "https://github.com/castano/nvidia-texture-tools/commit/6474f2593428d89ec152da2502aa136ababe66ca.patch"; - sha256 = "0akbkvm55hiv58jx71h9hj173rbnqlb5a430y9azjiix7zga42vd"; - }) - ]; - nativeBuildInputs = [ cmake ]; outputs = [ "out" "dev" "lib" ]; @@ -26,6 +19,10 @@ stdenv.mkDerivation rec { # Make a recently added pure virtual function just virtual, # to keep compatibility. sed -i 's/virtual void endImage() = 0;/virtual void endImage() {}/' src/nvtt/nvtt.h + '' + lib.optionalString stdenv.isAarch64 '' + # remove x86_64-only libraries + sed -i '/bc1enc/d' src/nvtt/tests/CMakeLists.txt + sed -i '/libsquish/d;/CMP_Core/d' extern/CMakeLists.txt ''; cmakeFlags = [ @@ -42,6 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/castano/nvidia-texture-tools"; license = licenses.mit; platforms = platforms.unix; - broken = stdenv.isAarch64; + maintainers = with maintainers; [ wegank ]; }; } From 284adcab1f31d3c9ddb375e1c4830297a24e234f Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 12 Oct 2022 20:02:26 +0200 Subject: [PATCH 088/114] zeroad: fix build on aarch64-linux --- pkgs/games/0ad/game.nix | 5 +++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index 23e906703f4..488ef0c91e1 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -48,6 +48,11 @@ stdenv.mkDerivation rec { "-I${libXcursor.dev}/include/X11" "-I${SDL2}/include/SDL2" "-I${fmt.dev}/include" + "-I${nvidia-texture-tools.dev}/include" + ]; + + NIX_CFLAGS_LINK = toString [ + "-L${nvidia-texture-tools.lib}/lib/static" ]; patches = [ ./rootdir_env.patch ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e7546d684a..a94858c82f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34528,7 +34528,7 @@ with pkgs; keen4 = callPackage ../games/keen4 { }; zeroadPackages = recurseIntoAttrs (callPackage ../games/0ad { - wxGTK = wxGTK31; + wxGTK = wxGTK32; }); zeroad = zeroadPackages.zeroad; From c8d4492a8d5e97e155f419cda0fcdc5e18f0e079 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 12 Oct 2022 20:07:18 +0200 Subject: [PATCH 089/114] chromium: 106.0.5249.103 -> 106.0.5249.119 https://chromereleases.googleblog.com/2022/10/stable-channel-update-for-desktop_11.html This update includes 6 security fixes. CVEs: CVE-2022-3445 CVE-2022-3446 CVE-2022-3447 CVE-2022-3448 CVE-2022-3449 CVE-2022-3450 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 30fbc5dbb51..8391d1634e4 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "106.0.5249.103", - "sha256": "0k2f3hc6mdmwzw9zzwcv6pnpibdz47a3xxkhfcvdki5gbag6cpr2", - "sha256bin64": "0bg6d9fv3ha7iql17nj8h22klbs3ls2nlvabczhh067mh3fpzf5x", + "version": "106.0.5249.119", + "sha256": "14niglj8q6mfkmgbbjhaipmyhv6vryx93crswb1xa871a14in28g", + "sha256bin64": "1kcf8l6ivqzx6qaiy7vx2l6mhfqn4lq93dkgcx1bdadikwcpq0dd", "deps": { "gn": { "version": "2022-08-11", From 10e5fa68de2d259a371b450d9c362d518e9842f2 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 12 Oct 2022 20:07:18 +0200 Subject: [PATCH 090/114] ungoogled-chromium: 106.0.5249.103 -> 106.0.5249.119 --- .../networking/browsers/chromium/upstream-info.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 30fbc5dbb51..90697c53de9 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -45,9 +45,9 @@ } }, "ungoogled-chromium": { - "version": "106.0.5249.103", - "sha256": "0k2f3hc6mdmwzw9zzwcv6pnpibdz47a3xxkhfcvdki5gbag6cpr2", - "sha256bin64": "0bg6d9fv3ha7iql17nj8h22klbs3ls2nlvabczhh067mh3fpzf5x", + "version": "106.0.5249.119", + "sha256": "14niglj8q6mfkmgbbjhaipmyhv6vryx93crswb1xa871a14in28g", + "sha256bin64": "1kcf8l6ivqzx6qaiy7vx2l6mhfqn4lq93dkgcx1bdadikwcpq0dd", "deps": { "gn": { "version": "2022-08-11", @@ -56,8 +56,8 @@ "sha256": "13zks2z65kg7fzzsysq4mswd4bhhy3h7ycdrpxfilcvixx2n2gac" }, "ungoogled-patches": { - "rev": "106.0.5249.103-1", - "sha256": "00acfq9hsdjqqlxddr9lr45l4372mpqxj717qpf78z8iyrccjm23" + "rev": "106.0.5249.119-1", + "sha256": "0mgyakq0g3v24b1qn76zblhjf9zzbiv1fq95w7w42nv3fvxfrxr2" } } } From 58cb56ee9cfa87cf00ecac99ccca8ca65f4a2e78 Mon Sep 17 00:00:00 2001 From: Yureka Date: Wed, 12 Oct 2022 20:10:33 +0200 Subject: [PATCH 091/114] influxdb2: fix build with rust 1.54 (#195534) --- pkgs/servers/nosql/influxdb2/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/servers/nosql/influxdb2/default.nix b/pkgs/servers/nosql/influxdb2/default.nix index 8fbe6768a5a..cca0ab5153e 100644 --- a/pkgs/servers/nosql/influxdb2/default.nix +++ b/pkgs/servers/nosql/influxdb2/default.nix @@ -1,6 +1,7 @@ { buildGoModule , fetchFromGitHub , fetchurl +, fetchpatch , go-bindata , lib , llvmPackages @@ -40,6 +41,16 @@ let rev = "v${libflux_version}"; sha256 = "sha256-xcsmvT8Ve1WbfwrdVPnJcj7RAvrk795N3C95ubbGig0="; }; + patches = [ + # https://github.com/influxdata/flux/pull/5273 + # fix compile error with Rust 1.64 + (fetchpatch { + url = "https://github.com/influxdata/flux/commit/20ca62138a0669f2760dd469ca41fc333e04b8f2.patch"; + stripLen = 2; + extraPrefix = ""; + sha256 = "sha256-Fb4CuH9ZvrPha249dmLLI8MqSNQRKqKPxPbw2pjqwfY="; + }) + ]; sourceRoot = "source/libflux"; cargoSha256 = "sha256-+hJQFV0tWeTQDN560DzROUNpdkcZ5h2sc13akHCgqPc="; nativeBuildInputs = [ llvmPackages.libclang ]; From 7f4fe58f00352359afa09610b9a08e7be57f8bd4 Mon Sep 17 00:00:00 2001 From: Yureka Date: Wed, 12 Oct 2022 20:14:07 +0200 Subject: [PATCH 092/114] wofi: 1.2.4 -> 1.3 (#195595) --- pkgs/applications/misc/wofi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/applications/misc/wofi/default.nix index 25cbac7d229..0020594bb8c 100644 --- a/pkgs/applications/misc/wofi/default.nix +++ b/pkgs/applications/misc/wofi/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "wofi"; - version = "1.2.4"; + version = "1.3"; src = fetchhg { url = "https://hg.sr.ht/~scoopta/wofi"; rev = "v${version}"; - sha256 = "1bnf078fg1kwslzwm1mjxwcqqq3bhk1dzymwfw9gk3brqbxrl75c"; + sha256 = "sha256-GxMjEXBPQniD+Yc9QZjd8TH4ILJAX5dNzrjxDawhy8w="; }; nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook installShellFiles ]; From f5ba2af2a218d7d490a3b8c7cd7f99e440f9ee4d Mon Sep 17 00:00:00 2001 From: Yureka Date: Mon, 3 Oct 2022 20:19:08 +0200 Subject: [PATCH 093/114] {temurin,adoptopenjdk}-bin: add alpine_linux os to generate-sources script --- pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py | 2 +- pkgs/development/compilers/temurin-bin/generate-sources.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py index 1d030e3f1d2..5ff56b2bd29 100755 --- a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py +++ b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py @@ -8,7 +8,7 @@ import sys # openjdk15 is only for bootstrapping openjdk releases = ("openjdk8", "openjdk11", "openjdk13", "openjdk14", "openjdk15", "openjdk16", "openjdk17") -oses = ("mac", "linux") +oses = ("mac", "linux", "alpine_linux") types = ("jre", "jdk") impls = ("hotspot", "openj9") diff --git a/pkgs/development/compilers/temurin-bin/generate-sources.py b/pkgs/development/compilers/temurin-bin/generate-sources.py index ae3c06d1dfe..7af35920efc 100755 --- a/pkgs/development/compilers/temurin-bin/generate-sources.py +++ b/pkgs/development/compilers/temurin-bin/generate-sources.py @@ -7,7 +7,7 @@ import requests import sys feature_versions = (8, 11, 16, 17) -oses = ("mac", "linux") +oses = ("mac", "linux", "alpine-linux") types = ("jre", "jdk") impls = ("hotspot") From d968a99bc0a40279578145baeb53411afe1cbfe3 Mon Sep 17 00:00:00 2001 From: Yureka Date: Mon, 3 Oct 2022 21:18:24 +0200 Subject: [PATCH 094/114] {temurin,adoptopenjdk}-bin: regenerate sources.json --- .../compilers/adoptopenjdk-bin/sources.json | 104 ++++++++++++++++++ .../compilers/temurin-bin/sources.json | 76 +++++++++++++ 2 files changed, 180 insertions(+) diff --git a/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/pkgs/development/compilers/adoptopenjdk-bin/sources.json index 7738e410162..54b75e8e73c 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/sources.json +++ b/pkgs/development/compilers/adoptopenjdk-bin/sources.json @@ -1,5 +1,31 @@ { "openjdk11": { + "alpine_linux": { + "jdk": { + "hotspot": { + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "101", + "sha256": "327b3bfd1c14e15bf6c7fb4d0c6c3f9406c1282a16e24b1424215d764f687cb6", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.16.1_1.tar.gz", + "version": "11.0.16" + } + } + }, + "jre": { + "hotspot": { + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "101", + "sha256": "4cdebb54ead80e6dff562ad51db850244b1b419ba72062782156df59854a6b22", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.16.1_1.tar.gz", + "version": "11.0.16" + } + } + } + }, "linux": { "jdk": { "hotspot": { @@ -628,6 +654,32 @@ } }, "openjdk16": { + "alpine_linux": { + "jdk": { + "hotspot": { + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "7", + "sha256": "85788b1a1f470ca7ddc576028f29abbc3bc3b08f82dd811a3e24371689d7dc0f", + "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_alpine-linux_hotspot_16.0.2_7.tar.gz", + "version": "16.0.2" + } + } + }, + "jre": { + "hotspot": { + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "9", + "sha256": "5f10ffc12056b735f5fe505ec6c481fff94de27e80c1d77ea9f9e2830669cc1d", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_x64_alpine-linux_hotspot_16.0.1_9.tar.gz", + "version": "16.0.1" + } + } + } + }, "linux": { "jdk": { "hotspot": { @@ -794,6 +846,32 @@ } }, "openjdk17": { + "alpine_linux": { + "jdk": { + "hotspot": { + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "101", + "sha256": "1a1706304c26da0d8d2e05127c5aa7dba00e5401b2c0228c8ae894d2812beee0", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.4.1_1.tar.gz", + "version": "17.0.4" + } + } + }, + "jre": { + "hotspot": { + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "101", + "sha256": "cd0300449a26b3141e313f6ab55b20edfa4b289dc44a7a3989fa2c29152bf7fb", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.4.1_1.tar.gz", + "version": "17.0.4" + } + } + } + }, "linux": { "jdk": { "hotspot": { @@ -896,6 +974,32 @@ } }, "openjdk8": { + "alpine_linux": { + "jdk": { + "hotspot": { + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "1", + "sha256": "e5dcb8f947b687597f92fa80c008a2a17ce86f739dd6dce7ca741921621acb21", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u345b01.tar.gz", + "version": "8.0.345" + } + } + }, + "jre": { + "hotspot": { + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "1", + "sha256": "6352a4d55373266af90b2f2ec13f4397ada58f5cdc57944ea046c9c538341fd3", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u345b01.tar.gz", + "version": "8.0.345" + } + } + } + }, "linux": { "jdk": { "hotspot": { diff --git a/pkgs/development/compilers/temurin-bin/sources.json b/pkgs/development/compilers/temurin-bin/sources.json index ee823173821..ec696e1ac20 100644 --- a/pkgs/development/compilers/temurin-bin/sources.json +++ b/pkgs/development/compilers/temurin-bin/sources.json @@ -1,5 +1,81 @@ { "hotspot": { + "alpine-linux": { + "jdk": { + "openjdk11": { + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "1", + "sha256": "327b3bfd1c14e15bf6c7fb4d0c6c3f9406c1282a16e24b1424215d764f687cb6", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.16.1_1.tar.gz", + "version": "11.0.16" + } + }, + "openjdk16": { + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "7", + "sha256": "85788b1a1f470ca7ddc576028f29abbc3bc3b08f82dd811a3e24371689d7dc0f", + "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_alpine-linux_hotspot_16.0.2_7.tar.gz", + "version": "16.0.2" + } + }, + "openjdk17": { + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "1", + "sha256": "1a1706304c26da0d8d2e05127c5aa7dba00e5401b2c0228c8ae894d2812beee0", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.4.1_1.tar.gz", + "version": "17.0.4" + } + }, + "openjdk8": { + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "1", + "sha256": "e5dcb8f947b687597f92fa80c008a2a17ce86f739dd6dce7ca741921621acb21", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u345b01.tar.gz", + "version": "8.0.345" + } + } + }, + "jre": { + "openjdk11": { + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "1", + "sha256": "4cdebb54ead80e6dff562ad51db850244b1b419ba72062782156df59854a6b22", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.16.1_1.tar.gz", + "version": "11.0.16" + } + }, + "openjdk17": { + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "1", + "sha256": "cd0300449a26b3141e313f6ab55b20edfa4b289dc44a7a3989fa2c29152bf7fb", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.4.1_1.tar.gz", + "version": "17.0.4" + } + }, + "openjdk8": { + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "1", + "sha256": "6352a4d55373266af90b2f2ec13f4397ada58f5cdc57944ea046c9c538341fd3", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u345b01.tar.gz", + "version": "8.0.345" + } + } + } + }, "linux": { "jdk": { "openjdk11": { From 8886c89d0eff3a192ed9f98a13849f76e73c5073 Mon Sep 17 00:00:00 2001 From: Yureka Date: Mon, 10 Oct 2022 10:57:08 +0200 Subject: [PATCH 095/114] {temurin,adoptopenjdk}-bin: use alpine_linux os for musl libc --- .../compilers/adoptopenjdk-bin/jdk11-linux.nix | 11 ++++++----- .../compilers/adoptopenjdk-bin/jdk13-linux.nix | 11 ++++++----- .../compilers/adoptopenjdk-bin/jdk14-linux.nix | 11 ++++++----- .../compilers/adoptopenjdk-bin/jdk15-linux.nix | 11 ++++++----- .../compilers/adoptopenjdk-bin/jdk16-linux.nix | 11 ++++++----- .../compilers/adoptopenjdk-bin/jdk17-linux.nix | 7 ++++--- .../compilers/adoptopenjdk-bin/jdk8-linux.nix | 11 ++++++----- pkgs/development/compilers/temurin-bin/jdk-linux.nix | 5 +++-- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/java-packages.nix | 2 +- 10 files changed, 45 insertions(+), 37 deletions(-) diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix index da5e9c49d23..fcad50017db 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix @@ -1,11 +1,12 @@ -{ lib }: +{ stdenv, lib }: let + variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux"; sources = lib.importJSON ./sources.json; in { - jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.linux.jdk.hotspot; }; - jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.linux.jre.hotspot; }; - jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.linux.jdk.openj9; }; - jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.linux.jre.openj9; }; + jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.${variant}.jdk.hotspot; }; + jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.${variant}.jre.hotspot; }; + jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.${variant}.jdk.openj9; }; + jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.${variant}.jre.openj9; }; } diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix index f503b03a833..6c57b542e65 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix @@ -1,11 +1,12 @@ -{ lib }: +{ stdenv, lib }: let + variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux"; sources = lib.importJSON ./sources.json; in { - jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.linux.jdk.hotspot; knownVulnerabilities = ["Support ended"]; }; - jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.linux.jre.hotspot; knownVulnerabilities = ["Support ended"]; }; - jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.linux.jdk.openj9; knownVulnerabilities = ["Support ended"]; }; - jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.linux.jre.openj9; knownVulnerabilities = ["Support ended"]; }; + jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.${variant}.jdk.hotspot; knownVulnerabilities = ["Support ended"]; }; + jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.${variant}.jre.hotspot; knownVulnerabilities = ["Support ended"]; }; + jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.${variant}.jdk.openj9; knownVulnerabilities = ["Support ended"]; }; + jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.${variant}.jre.openj9; knownVulnerabilities = ["Support ended"]; }; } diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix index a55a708b372..573fc17b51b 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix @@ -1,11 +1,12 @@ -{ lib }: +{ stdenv, lib }: let + variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux"; sources = lib.importJSON ./sources.json; in { - jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.linux.jdk.hotspot; knownVulnerabilities = ["Support ended"]; }; - jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.linux.jre.hotspot; knownVulnerabilities = ["Support ended"]; }; - jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.linux.jdk.openj9; knownVulnerabilities = ["Support ended"]; }; - jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.linux.jre.openj9; knownVulnerabilities = ["Support ended"]; }; + jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.${variant}.jdk.hotspot; knownVulnerabilities = ["Support ended"]; }; + jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.${variant}.jre.hotspot; knownVulnerabilities = ["Support ended"]; }; + jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.${variant}.jdk.openj9; knownVulnerabilities = ["Support ended"]; }; + jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.${variant}.jre.openj9; knownVulnerabilities = ["Support ended"]; }; } diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix index e248555a6d0..7c6d1d36021 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix @@ -1,11 +1,12 @@ -{ lib }: +{ stdenv, lib }: let + variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux"; sources = lib.importJSON ./sources.json; in { - jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.linux.jdk.hotspot; }; - jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.linux.jre.hotspot; }; - jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.linux.jdk.openj9; }; - jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.linux.jre.openj9; }; + jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jdk.hotspot; }; + jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jre.hotspot; }; + jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jdk.openj9; }; + jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jre.openj9; }; } diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk16-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk16-linux.nix index 794545ea80a..3d803901d34 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk16-linux.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk16-linux.nix @@ -1,11 +1,12 @@ -{ lib }: +{ stdenv, lib }: let + variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux"; sources = lib.importJSON ./sources.json; in { - jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.linux.jdk.hotspot; }; - jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.linux.jre.hotspot; }; - jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.linux.jdk.openj9; }; - jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.linux.jre.openj9; }; + jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jdk.hotspot; }; + jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jre.hotspot; }; + jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jdk.openj9; }; + jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jre.openj9; }; } diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk17-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk17-linux.nix index f162d8d2968..e069a8521d7 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk17-linux.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk17-linux.nix @@ -1,9 +1,10 @@ -{ lib }: +{ stdenv, lib }: let + variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux"; sources = lib.importJSON ./sources.json; in { - jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk17.linux.jdk.hotspot; }; - jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk17.linux.jre.hotspot; }; + jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk17.${variant}.jdk.hotspot; }; + jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk17.${variant}.jre.hotspot; }; } diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix index 67b50220ba2..2b0cac66498 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix @@ -1,11 +1,12 @@ -{ lib }: +{ stdenv, lib }: let + variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux"; sources = lib.importJSON ./sources.json; in { - jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.linux.jdk.hotspot; }; - jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.linux.jre.hotspot; }; - jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.linux.jdk.openj9; }; - jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.linux.jre.openj9; }; + jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.${variant}.jdk.hotspot; }; + jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.${variant}.jre.hotspot; }; + jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.${variant}.jdk.openj9; }; + jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.${variant}.jre.openj9; }; } diff --git a/pkgs/development/compilers/temurin-bin/jdk-linux.nix b/pkgs/development/compilers/temurin-bin/jdk-linux.nix index 4c0306d5aba..df136f8d0c1 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-linux.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-linux.nix @@ -1,7 +1,8 @@ -{ lib, callPackage }: +{ stdenv, lib, callPackage }: let - sources = (lib.importJSON ./sources.json).hotspot.linux; + variant = if stdenv.hostPlatform.isMusl then "alpine-linux" else "linux"; + sources = (lib.importJSON ./sources.json).hotspot.${variant}; common = opts: callPackage (import ./jdk-linux-base.nix opts) {}; in { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da14b2debfe..228de64830d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13197,7 +13197,7 @@ with pkgs; semeru-bin = semeru-bin-17; semeru-jre-bin = semeru-jre-bin-17; - adoptopenjdk-bin-17-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk17-linux.nix { inherit lib; }; + adoptopenjdk-bin-17-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk17-linux.nix { inherit stdenv lib; }; adoptopenjdk-bin-17-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk17-darwin.nix { inherit lib; }; adoptopenjdk-hotspot-bin-17 = if stdenv.isLinux diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index ba69287fa8d..8a419a6a096 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -28,7 +28,7 @@ in { }; mkAdoptopenjdk = path-linux: path-darwin: let - package-linux = import path-linux { inherit lib; }; + package-linux = import path-linux { inherit stdenv lib; }; package-darwin = import path-darwin { inherit lib; }; package = if stdenv.isLinux then package-linux From 50ecf779c9804b34332f7ea5fcdc55f85fe1a9d6 Mon Sep 17 00:00:00 2001 From: Yureka Date: Mon, 10 Oct 2022 10:57:19 +0200 Subject: [PATCH 096/114] pkgsMusl.jdk: fix build --- pkgs/development/compilers/openjdk/17.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/compilers/openjdk/17.nix b/pkgs/development/compilers/openjdk/17.nix index 41af0d72246..e9408ba341b 100644 --- a/pkgs/development/compilers/openjdk/17.nix +++ b/pkgs/development/compilers/openjdk/17.nix @@ -51,6 +51,13 @@ let url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch"; sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; }) + + # Patch borrowed from Alpine to fix build errors with musl libc and recent gcc. + # This is applied anywhere to prevent patchrot. + (fetchurl { + url = "https://git.alpinelinux.org/aports/plain/community/openjdk17/FixNullPtrCast.patch?id=6f97cb0ae4dff6588dae5868c2522aea96c99d2c"; + sha256 = "sha256-giOmMInwLH0Ei9H7ETsrrzQU09I6+dn8KpPrKb7zn8I="; + }) ] ++ lib.optionals (!headless && enableGnome2) [ ./swing-use-gtk-jdk13.patch ]; From d451ea73dc8b4ed51d2a534f9c7b6e64268c3271 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 11 Oct 2022 10:25:03 +0200 Subject: [PATCH 097/114] coqPackages.coq-elpi: disable OCaml warnings --- pkgs/development/coq-modules/coq-elpi/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index c872659b50c..8adea66a6de 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -53,6 +53,8 @@ in mkCoqDerivation { release."1.6.0".sha256 = "0kf99i43mlf750fr7fric764mm495a53mg5kahnbp6zcjcxxrm0b"; releaseRev = v: "v${v}"; + buildFlags = [ "OCAMLWARN=" ]; + mlPlugin = true; propagatedBuildInputs = [ elpi ]; From 661ee3a26903ff58fd57f4f4396a748950ba3570 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 11 Oct 2022 08:51:38 +0200 Subject: [PATCH 098/114] coq_8_16: use OCaml 4.14 --- pkgs/applications/science/logic/coq/default.nix | 9 ++++++--- pkgs/top-level/all-packages.nix | 8 +++++++- pkgs/top-level/coq-packages.nix | 4 +++- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index f1ec27642fe..a258c4f5cea 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -7,7 +7,9 @@ { lib, stdenv, fetchzip, writeText, pkg-config, gnumake42 , customOCamlPackages ? null -, ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ocamlPackages_4_12, ncurses +, ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ocamlPackages_4_12 +, ocamlPackages_4_14 +, ncurses , buildIde ? null # default is true for Coq < 8.14 and false for Coq >= 8.14 , glib, gnome, wrapGAppsHook, makeDesktopItem, copyDesktopItems , csdp ? null @@ -68,11 +70,12 @@ let '' else ""; ocamlPackages = if !isNull customOCamlPackages then customOCamlPackages else with versions; switch coq-version [ - { case = range "8.14" "8.14"; out = ocamlPackages_4_12; } + { case = range "8.16" "8.17"; out = ocamlPackages_4_14; } + { case = range "8.14" "8.15"; out = ocamlPackages_4_12; } { case = range "8.11" "8.13"; out = ocamlPackages_4_10; } { case = range "8.7" "8.10"; out = ocamlPackages_4_09; } { case = range "8.5" "8.6"; out = ocamlPackages_4_05; } - ] ocamlPackages_4_12; + ] ocamlPackages_4_14; ocamlNativeBuildInputs = with ocamlPackages; [ ocaml findlib ] ++ optional (coqAtLeast "8.14") dune_2; ocamlPropagatedBuildInputs = [ ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 228de64830d..8b02c16a25f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35294,7 +35294,13 @@ with pkgs; cadical = callPackage ../applications/science/logic/cadical {}; inherit (callPackage ./coq-packages.nix { - inherit (ocaml-ng) ocamlPackages_4_05 ocamlPackages_4_09 ocamlPackages_4_10 ocamlPackages_4_12; + inherit (ocaml-ng) + ocamlPackages_4_05 + ocamlPackages_4_09 + ocamlPackages_4_10 + ocamlPackages_4_12 + ocamlPackages_4_14 + ; }) mkCoqPackages coqPackages_8_5 coq_8_5 coqPackages_8_6 coq_8_6 diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 87688c53d2d..6ab9c35b045 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchzip , callPackage, newScope, recurseIntoAttrs, ocamlPackages_4_05, ocamlPackages_4_09 -, ocamlPackages_4_10, ocamlPackages_4_12, fetchpatch, makeWrapper, coq2html +, ocamlPackages_4_10, ocamlPackages_4_12, ocamlPackages_4_14 +, fetchpatch, makeWrapper, coq2html }@args: let lib = import ../build-support/coq/extra-lib.nix {inherit (args) lib;}; in let @@ -130,6 +131,7 @@ let ocamlPackages_4_09 ocamlPackages_4_10 ocamlPackages_4_12 + ocamlPackages_4_14 ; }; in rec { From 1101dfae20910c42290246532ca735fe454f924c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 11 Oct 2022 08:51:44 +0200 Subject: [PATCH 099/114] coq: default to version 8.16 --- pkgs/top-level/coq-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 6ab9c35b045..65de529685e 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -173,7 +173,7 @@ in rec { coqPackages_8_14 = mkCoqPackages coq_8_14; coqPackages_8_15 = mkCoqPackages coq_8_15; coqPackages_8_16 = mkCoqPackages coq_8_16; - coqPackages = recurseIntoAttrs coqPackages_8_15; + coqPackages = recurseIntoAttrs coqPackages_8_16; coq = coqPackages.coq; } From 0f6feea49ee7dccb8d501ffdd22edbdca20f7592 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Oct 2022 18:59:54 +0000 Subject: [PATCH 100/114] python310Packages.ansible-core: 2.13.4 -> 2.13.5 --- pkgs/development/python-modules/ansible/core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 7afd70c5853..5858fa875cd 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "ansible-core"; - version = "2.13.4"; + version = "2.13.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ePRcLEcq9gubS4y9q6WjkRB5CHiRqfbG7XJjJ7jyHGo="; + sha256 = "sha256-JtzZIY1VRMwVFE9gu1tjTyJ25HbIn0gbP2GcT53vFYg="; }; # ansible_connection is already wrapped, so don't pass it through From 285dc9c1de8f8955beaa619de2d8d7536d7879f6 Mon Sep 17 00:00:00 2001 From: Christoph Neidahl Date: Wed, 12 Oct 2022 21:08:31 +0200 Subject: [PATCH 101/114] open-watcom-v2: Fix bindir name for Darwin (#191537) --- pkgs/development/compilers/open-watcom/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/open-watcom/wrapper.nix b/pkgs/development/compilers/open-watcom/wrapper.nix index fe787cbedbf..0677d32e6ea 100644 --- a/pkgs/development/compilers/open-watcom/wrapper.nix +++ b/pkgs/development/compilers/open-watcom/wrapper.nix @@ -18,7 +18,7 @@ let "binnt" (lib.optionalString is32bit "binw") ] else if (isDarwin && is64bit) then [ - "osx64" + "bino64" ] else [ (lib.optionalString is64bit "binl64") "binl" From 41f84310f928081e9eac059b1da153b49419fb28 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Oct 2022 19:45:11 +0000 Subject: [PATCH 102/114] python310Packages.azure-mgmt-authorization: 2.0.0 -> 3.0.0 --- .../python-modules/azure-mgmt-authorization/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-authorization/default.nix b/pkgs/development/python-modules/azure-mgmt-authorization/default.nix index 0489cb112b8..05d7398b598 100644 --- a/pkgs/development/python-modules/azure-mgmt-authorization/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-authorization/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-authorization"; - version = "2.0.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0776edc4980be940a8602eefc0372b4d1a1fa26caa46e3c0234e0c7a0feda4ec"; + sha256 = "sha256-Cl1/aDvzNyI2uEHNvUZ39rCO185BuZnD5kTUKGJSBX0="; }; propagatedBuildInputs = [ From b1dc7b33bc16726d63409a03d4bce2e68013daf2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Oct 2022 20:16:52 +0000 Subject: [PATCH 103/114] mapcidr: 1.0.2 -> 1.0.3 --- pkgs/tools/misc/mapcidr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/mapcidr/default.nix b/pkgs/tools/misc/mapcidr/default.nix index 7bf238965a5..911cde27cc6 100644 --- a/pkgs/tools/misc/mapcidr/default.nix +++ b/pkgs/tools/misc/mapcidr/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "mapcidr"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qfEm+DFnTmGwHV7Sb488qFmjT+7QSCmbT4n5JhtDo5g="; + sha256 = "sha256-dsHTnaK1Bna6Gbr/J+PYjeZ0WqJh696sliTd5JF1C+o="; }; - vendorSha256 = "sha256-5XkBw/RBNcQyoKuWQuBGGRKawuKJtMOKG06lpIPBf+8="; + vendorSha256 = "sha256-RblYkQSOMOKaI4ODkNae3rxJEaxkzwA2SuoMr+Z2/ew="; modRoot = "."; subPackages = [ From 9683bb1e37c044cf24166e17cc8f8e8546c7bfd8 Mon Sep 17 00:00:00 2001 From: kilianar Date: Wed, 12 Oct 2022 22:20:16 +0200 Subject: [PATCH 104/114] bitwarden: 2022.8.1 -> 2022.10.0 - https://github.com/bitwarden/clients/releases/tag/desktop-v2022.9.0 - https://github.com/bitwarden/clients/releases/tag/desktop-v2022.9.1 - https://github.com/bitwarden/clients/releases/tag/desktop-v2022.10.0 --- pkgs/tools/security/bitwarden/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index 842eb758c30..f7ea2c184e6 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "bitwarden"; - version = "2022.8.1"; + version = "2022.10.0"; src = fetchurl { url = "https://github.com/bitwarden/clients/releases/download/desktop-v${version}/Bitwarden-${version}-amd64.deb"; - sha256 = "sha256-MmhHs1Gp6H1CkLO/yCBhsF0KMiYXz37D6QP26fS+/u0="; + sha256 = "sha256-KJBRaxrHhoWEMrt4tVg6elVX7Z2AXi9mD1RJDzbRhdI="; }; desktopItem = makeDesktopItem { From 67c319b77b90895f5e253c3179c045cf5a7426ff Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 Oct 2022 23:16:36 +0200 Subject: [PATCH 105/114] prometheus-kea-exporter: 0.4.2 -> 0.4.4 --- pkgs/servers/monitoring/prometheus/kea-exporter.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/kea-exporter.nix b/pkgs/servers/monitoring/prometheus/kea-exporter.nix index 98df8861e82..c3ebc47c072 100644 --- a/pkgs/servers/monitoring/prometheus/kea-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/kea-exporter.nix @@ -2,13 +2,18 @@ python3Packages.buildPythonApplication rec { pname = "kea-exporter"; - version = "0.4.2"; + version = "0.4.4"; + format = "pyproject"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0dpzicv0ksyda2lprldkj452c23qycl5c9avca6x7f7rbqry9pnd"; + hash = "sha256-8hWQfI9HCSKhkgN3F0mwvKKJg6FlwqRZ1QuQFB1YXrc="; }; + nativeBuildInputs = with python3Packages; [ + poetry-core + ]; + propagatedBuildInputs = with python3Packages; [ click prometheus-client From e50c0576a0595aea7536d0197127ac9249171346 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 Oct 2022 23:26:45 +0200 Subject: [PATCH 106/114] python310Packages.neo4j: 5.0.1 -> 5.1.0 --- pkgs/development/python-modules/neo4j/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index f86421aacfe..a647b602c02 100644 --- a/pkgs/development/python-modules/neo4j/default.nix +++ b/pkgs/development/python-modules/neo4j/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "neo4j"; - version = "5.0.1"; + version = "5.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; rev = "refs/tags/${version}"; - hash = "sha256-R4+cShkG1c3PRiU92OPPEVsXR4zt0G/7ZJcYACtPvHs="; + hash = "sha256-v/IJdgn3C1JgT0KJ9O7wn+5nexDbakzM/u8bAeEPjz0="; }; propagatedBuildInputs = [ From b6bee1b2a0e9eb96072543fe1b989b6eee19d0d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Oct 2022 21:28:50 +0000 Subject: [PATCH 107/114] python310Packages.azure-storage-file-share: 12.9.0 -> 12.10.0 --- .../python-modules/azure-storage-file-share/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-storage-file-share/default.nix b/pkgs/development/python-modules/azure-storage-file-share/default.nix index 866e8173278..dc016068569 100644 --- a/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "azure-storage-file-share"; - version = "12.9.0"; + version = "12.10.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-faowRP4H1/dQTLmhX5mhessoyAjtgzQWeL8t+TFfXCI="; + hash = "sha256-ANp31hkDL4TGoeP6Or9fI0LjYGyVMQJfuzd8RLrYZxI="; }; propagatedBuildInputs = [ From 4ddefe300357a5efe23b49d9b9cc4840f2410933 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 Oct 2022 23:34:48 +0200 Subject: [PATCH 108/114] python310Packages.peaqevcore: 6.0.3 -> 7.0.8 --- pkgs/development/python-modules/peaqevcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index fe1abfe870d..dc8bd7e433b 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "6.0.3"; + version = "7.0.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-GaN/3WbuXc5p/+VhFngSX6aKnxMj72pyeB9HaA+PbCo="; + hash = "sha256-B6N9JLjbezYMO1119OR58cDhKY1ry7FKf+Q9wpHGiBE="; }; postPatch = '' From 7a04eea25017b182d65f2f8e0eca6e535355a178 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Oct 2022 21:44:17 +0000 Subject: [PATCH 109/114] python310Packages.blebox-uniapi: 2.1.0 -> 2.1.1 --- pkgs/development/python-modules/blebox-uniapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/blebox-uniapi/default.nix b/pkgs/development/python-modules/blebox-uniapi/default.nix index cc43e9b26d5..16acd30f186 100644 --- a/pkgs/development/python-modules/blebox-uniapi/default.nix +++ b/pkgs/development/python-modules/blebox-uniapi/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "blebox-uniapi"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "blebox"; repo = "blebox_uniapi"; rev = "refs/tags/v${version}"; - sha256 = "sha256-mJaUB4kEm+eRh3Kc+SiTCSSmCmBEJBVZ5uah95MJX64="; + sha256 = "sha256-F0zvfqbcQCgpr9//TfhUHVT5KofFSyzRKWkLw4I4gxk="; }; postPatch = '' From d73c7ed622be830fbbb9376ae392f4c1df94497a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 Oct 2022 23:53:01 +0200 Subject: [PATCH 110/114] python310Packages.losant-rest: 1.16.5 -> 1.16.6 --- pkgs/development/python-modules/losant-rest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/losant-rest/default.nix b/pkgs/development/python-modules/losant-rest/default.nix index 915a0154fd8..0e80ef1da88 100644 --- a/pkgs/development/python-modules/losant-rest/default.nix +++ b/pkgs/development/python-modules/losant-rest/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "losant-rest"; - version = "1.16.5"; + version = "1.16.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Losant"; repo = "losant-rest-python"; rev = "v${version}"; - sha256 = "sha256-dwlLoRRY1Fx1VBOGIJr//zFPf0WpOabS3HuCxHsn4HI="; + sha256 = "sha256-x8a2W64zLDi8r7d8B7GYCwWtSAB3BH+Sprbw+Xr7mH4="; }; propagatedBuildInputs = [ From 2601e8bf883a1570c39132325c53efb2b9eb2c4a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Oct 2022 22:13:43 +0000 Subject: [PATCH 111/114] python310Packages.click-option-group: 0.5.3 -> 0.5.5 --- .../python-modules/click-option-group/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/click-option-group/default.nix b/pkgs/development/python-modules/click-option-group/default.nix index cf39ba80845..828b6a83be1 100644 --- a/pkgs/development/python-modules/click-option-group/default.nix +++ b/pkgs/development/python-modules/click-option-group/default.nix @@ -8,15 +8,15 @@ buildPythonPackage rec { pname = "click-option-group"; - version = "0.5.3"; + version = "0.5.5"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "click-contrib"; repo = pname; - rev = "v${version}"; - sha256 = "1w0692s8fabncpggpwl2d4dfqjjlmcia271rrb8hcz0r6nvw98ak"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-ur7ycioZmgWMp4N+MURj1ggYMzs2eauteg1B5eLkSvc="; }; propagatedBuildInputs = [ From eff6add801c59f67cbce6988d8dc1ce072d4200a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Oct 2022 00:23:08 +0200 Subject: [PATCH 112/114] python310Packages.blebox-uniapi: disable on older Python releases --- .../python-modules/blebox-uniapi/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/blebox-uniapi/default.nix b/pkgs/development/python-modules/blebox-uniapi/default.nix index 16acd30f186..a080d20c042 100644 --- a/pkgs/development/python-modules/blebox-uniapi/default.nix +++ b/pkgs/development/python-modules/blebox-uniapi/default.nix @@ -7,17 +7,21 @@ , deepmerge , pytest-asyncio , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "blebox-uniapi"; version = "2.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "blebox"; repo = "blebox_uniapi"; rev = "refs/tags/v${version}"; - sha256 = "sha256-F0zvfqbcQCgpr9//TfhUHVT5KofFSyzRKWkLw4I4gxk="; + hash = "sha256-F0zvfqbcQCgpr9//TfhUHVT5KofFSyzRKWkLw4I4gxk="; }; postPatch = '' @@ -37,7 +41,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "blebox_uniapi" ]; + pythonImportsCheck = [ + "blebox_uniapi" + ]; meta = with lib; { description = "Python API for accessing BleBox smart home devices"; From 05c08b3fc31798a54a1d7ed24dfa89bf19c50b8f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Oct 2022 00:31:21 +0200 Subject: [PATCH 113/114] python310Packages.yalexs: 1.2.4 -> 1.2.6 --- pkgs/development/python-modules/yalexs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix index ef43c46a0a4..2ffd5fe287e 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "yalexs"; - version = "1.2.4"; + version = "1.2.6"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jg2tsCkAAm7/NJ5wcwA/2E0GspM747WHwcXWnC0j1Q8="; + sha256 = "sha256-E+Forcx6dRtDeagcjGGE8DFkAKUgsHyCEONW7WU0lpo="; }; propagatedBuildInputs = [ From 13062ca2d5e11486a9226c71738a808cdf104599 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Oct 2022 00:32:59 +0200 Subject: [PATCH 114/114] python310Packages.hahomematic: 2022.10.4 -> 2022.10.5 --- 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 cc2d1b85711..720a3cc9f8a 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2022.10.4"; + version = "2022.10.5"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-/cJL0DFBook1PjmLTW5H4/sUpwcfoRHvyH8mdAczS4o="; + sha256 = "sha256-E4sKIfrdEqdUqbXciIBAfIOuT/jpkS509P3+lVE3p1M="; }; nativeBuildInputs = [