From b46cee679f6904b0854c68c901372d0bc2237d84 Mon Sep 17 00:00:00 2001 From: Mathew Polzin Date: Tue, 19 Mar 2024 17:05:34 -0500 Subject: [PATCH 001/209] idris2: prefer chez 10 over chez-racket --- pkgs/development/compilers/idris2/idris2.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/idris2/idris2.nix b/pkgs/development/compilers/idris2/idris2.nix index 421fb93cf03b..452e9da97c35 100644 --- a/pkgs/development/compilers/idris2/idris2.nix +++ b/pkgs/development/compilers/idris2/idris2.nix @@ -17,10 +17,12 @@ # NOTICE: An `idris2WithPackages` is available at: https://github.com/claymager/idris2-pkgs let - # Taken from Idris2/idris2/flake.nix. Check if the idris2 project does it this - # way, still, every now and then. - platformChez = if stdenv.system == "x86_64-linux" then chez else chez-racket; -# Uses scheme to bootstrap the build of idris2 + platformChez = + if (stdenv.system == "x86_64-linux") || (lib.versionAtLeast chez.version "10.0.0") + then + chez + else + chez-racket; in stdenv.mkDerivation rec { pname = "idris2"; version = "0.7.0"; From 2662a65c4ae1ed1f907bdd8ea2375cdbdceca916 Mon Sep 17 00:00:00 2001 From: Tim Van Baak Date: Mon, 8 Apr 2024 03:41:09 +0000 Subject: [PATCH 002/209] mopidy-youtube: add extraPkgs to allow adding alternative backends --- pkgs/applications/audio/mopidy/youtube.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/mopidy/youtube.nix b/pkgs/applications/audio/mopidy/youtube.nix index 20958429c30e..a4aea017ea4e 100644 --- a/pkgs/applications/audio/mopidy/youtube.nix +++ b/pkgs/applications/audio/mopidy/youtube.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , python3 , mopidy +, extraPkgs ? pkgs: [] }: python3.pkgs.buildPythonApplication rec { @@ -25,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { ytmusicapi ] ++ [ mopidy - ]; + ] ++ extraPkgs pkgs; nativeCheckInputs = with python3.pkgs; [ vcrpy From 067d46bc663dc27a7d7bbdae0b3f65d63bb2260f Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 25 Apr 2024 16:15:44 +0200 Subject: [PATCH 003/209] photoprism: 231128-f48ff16ef -> 240420-ef5f14bc4 https://github.com/photoprism/photoprism/releases/tag/240420-ef5f14bc4 --- pkgs/servers/photoprism/backend.nix | 2 +- pkgs/servers/photoprism/default.nix | 4 ++-- pkgs/servers/photoprism/frontend.nix | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/photoprism/backend.nix b/pkgs/servers/photoprism/backend.nix index 7403f4dc897f..c1fc2f5b00c4 100644 --- a/pkgs/servers/photoprism/backend.nix +++ b/pkgs/servers/photoprism/backend.nix @@ -19,7 +19,7 @@ buildGoModule rec { substituteInPlace internal/commands/passwd.go --replace '/bin/stty' "${coreutils}/bin/stty" ''; - vendorHash = "sha256-mt2L5vf57/MntjtfJVua799nF4CkRYI8payLoPc0oQA="; + vendorHash = "sha256-ogJ/FwWJt1L0NGKX29tqWmHo4WslzC7ck5r7vn5PEuY="; subPackages = [ "cmd/photoprism" ]; diff --git a/pkgs/servers/photoprism/default.nix b/pkgs/servers/photoprism/default.nix index f2f7914394b8..c9b05257de86 100644 --- a/pkgs/servers/photoprism/default.nix +++ b/pkgs/servers/photoprism/default.nix @@ -1,14 +1,14 @@ { pkgs, lib, stdenv, fetchFromGitHub, fetchzip, darktable, rawtherapee, ffmpeg, libheif, exiftool, imagemagick, makeWrapper, testers }: let - version = "231128-f48ff16ef"; + version = "240420-ef5f14bc4"; pname = "photoprism"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-gVxKa5JKGz5VSVCuJHat0DWCYaUH+9an6JsYUPe9muQ="; + hash = "sha256-oJRd4eTwoTYKAJAsG9y0mnG+zF+eeLlSXNgaKLcb43w="; }; libtensorflow = pkgs.callPackage ./libtensorflow.nix { }; diff --git a/pkgs/servers/photoprism/frontend.nix b/pkgs/servers/photoprism/frontend.nix index 782efb1d0d3d..67f2cdd147a8 100644 --- a/pkgs/servers/photoprism/frontend.nix +++ b/pkgs/servers/photoprism/frontend.nix @@ -8,7 +8,7 @@ buildNpmPackage { cd frontend ''; - npmDepsHash = "sha256-4bAWSSy7kvG1ChzEb2iuxgWxnkjtJlr7Lm7USbgsmAw="; + npmDepsHash = "sha256-mgDg6awsEHkZyMzvFLwlfXGjdvjtwkNJiiNcnRBSJVo="; installPhase = '' runHook preInstall From a064513ad395d680ec3d5f56abc4ed30c23150ee Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Sun, 28 Apr 2024 07:47:10 -0400 Subject: [PATCH 004/209] tabby: 0.8.3 -> 0.10.0 https://github.com/TabbyML/tabby/releases/tag/v0.10.0 --- pkgs/by-name/ta/tabby/Cargo.lock | 1129 ++++++++++++++++++++++++----- pkgs/by-name/ta/tabby/package.nix | 10 +- 2 files changed, 971 insertions(+), 168 deletions(-) diff --git a/pkgs/by-name/ta/tabby/Cargo.lock b/pkgs/by-name/ta/tabby/Cargo.lock index ab4805aecd1d..9a443d99f541 100644 --- a/pkgs/by-name/ta/tabby/Cargo.lock +++ b/pkgs/by-name/ta/tabby/Cargo.lock @@ -24,6 +24,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" dependencies = [ "cfg-if", + "getrandom 0.2.11", "once_cell", "version_check", "zerocopy", @@ -40,7 +41,7 @@ dependencies = [ [[package]] name = "aim-downloader" -version = "0.8.3" +version = "0.10.0" dependencies = [ "async-stream", "clap", @@ -184,6 +185,40 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" +[[package]] +name = "async-convert" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d416feee97712e43152cd42874de162b8f9b77295b1c85e5d92725cc8310bae" +dependencies = [ + "async-trait", +] + +[[package]] +name = "async-openai" +version = "0.18.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dea5c9223f84965c603fd58c4c9ddcd1907efb2e54acf6fb47039358cd374df4" +dependencies = [ + "async-convert", + "backoff", + "base64 0.21.5", + "bytes", + "derive_builder", + "futures", + "rand 0.8.5", + "reqwest", + "reqwest-eventsource 0.4.0", + "secrecy", + "serde", + "serde_json", + "thiserror", + "tokio", + "tokio-stream", + "tokio-util", + "tracing", +] + [[package]] name = "async-stream" version = "0.3.5" @@ -203,7 +238,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.52", ] [[package]] @@ -214,7 +249,26 @@ checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.52", +] + +[[package]] +name = "atoi" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" +dependencies = [ + "num-traits", +] + +[[package]] +name = "atomic-write-file" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edcdbedc2236483ab103a53415653d6b4442ea6141baf1ffa85df29635e88436" +dependencies = [ + "nix", + "rand 0.8.5", ] [[package]] @@ -315,6 +369,20 @@ dependencies = [ "tracing-opentelemetry", ] +[[package]] +name = "backoff" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" +dependencies = [ + "futures-core", + "getrandom 0.2.11", + "instant", + "pin-project-lite", + "rand 0.8.5", + "tokio", +] + [[package]] name = "backtrace" version = "0.3.67" @@ -342,6 +410,12 @@ version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +[[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" + [[package]] name = "base64ct" version = "1.6.0" @@ -368,6 +442,9 @@ name = "bitflags" version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +dependencies = [ + "serde", +] [[package]] name = "bitpacking" @@ -441,6 +518,42 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +[[package]] +name = "cached" +version = "0.49.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e8e463fceca5674287f32d252fb1d94083758b8709c160efae66d263e5f4eba" +dependencies = [ + "ahash", + "async-trait", + "cached_proc_macro", + "cached_proc_macro_types", + "futures", + "hashbrown 0.14.3", + "instant", + "once_cell", + "thiserror", + "tokio", +] + +[[package]] +name = "cached_proc_macro" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad9f16c0d84de31a2ab7fdf5f7783c14631f7075cf464eb3bb43119f61c9cb2a" +dependencies = [ + "darling 0.14.4", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "cached_proc_macro_types" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade8366b8bd5ba243f0a58f036cc0ca8a2f069cff1a2351ef1cac6b083e16fc0" + [[package]] name = "cargo-lock" version = "9.0.0" @@ -532,7 +645,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.52", ] [[package]] @@ -592,6 +705,12 @@ dependencies = [ "windows-sys 0.45.0", ] +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + [[package]] name = "core-foundation" version = "0.9.3" @@ -617,6 +736,21 @@ dependencies = [ "libc", ] +[[package]] +name = "crc" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + [[package]] name = "crc32fast" version = "1.3.2" @@ -626,17 +760,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "cron" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab00a636277f7ea5d8dd92ac7a5099fc9a46e5327bba84d3640b41ae127eada9" -dependencies = [ - "chrono", - "error-chain", - "nom 4.1.1", -] - [[package]] name = "cron" version = "0.12.0" @@ -644,7 +767,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ff76b51e4c068c52bfd2866e1567bee7c567ae8f24ada09fd4307019e25eab7" dependencies = [ "chrono", - "nom 7.1.3", + "nom", "once_cell", ] @@ -683,14 +806,20 @@ dependencies = [ ] [[package]] -name = "crossbeam-utils" -version = "0.8.16" +name = "crossbeam-queue" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" dependencies = [ - "cfg-if", + "crossbeam-utils", ] +[[package]] +name = "crossbeam-utils" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" + [[package]] name = "crunchy" version = "0.2.2" @@ -737,7 +866,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.32", + "syn 2.0.52", ] [[package]] @@ -754,7 +883,7 @@ checksum = "4a076022ece33e7686fb76513518e219cca4fce5750a8ae6d1ce6c0f48fd1af9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.52", ] [[package]] @@ -846,6 +975,17 @@ version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" +[[package]] +name = "der" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +dependencies = [ + "const-oid", + "pem-rfc7468", + "zeroize", +] + [[package]] name = "deranged" version = "0.3.8" @@ -904,6 +1044,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", + "const-oid", "crypto-common", "subtle", ] @@ -945,6 +1086,9 @@ name = "either" version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +dependencies = [ + "serde", +] [[package]] name = "email-encoding" @@ -1005,25 +1149,32 @@ dependencies = [ ] [[package]] -name = "error-chain" -version = "0.10.0" +name = "etcetera" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9435d864e017c3c6afeac1654189b06cdb491cf2ff73dbf0d73b0f292f42ff8" +checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" dependencies = [ - "backtrace", + "cfg-if", + "home", + "windows-sys 0.48.0", ] [[package]] -name = "fallible-iterator" -version = "0.3.0" +name = "event-listener" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] -name = "fallible-streaming-iterator" -version = "0.1.9" +name = "eventsource-stream" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" +checksum = "74fef4569247a5f429d9156b9d0a2599914385dd189c539334c625d8099d90ab" +dependencies = [ + "futures-core", + "nom", + "pin-project-lite", +] [[package]] name = "fastdivide" @@ -1046,6 +1197,15 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +[[package]] +name = "fid-rs" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c28658c0c3420305705adde833a0d2d614207507d013a5f25707553fb2ae2cd" +dependencies = [ + "rayon", +] + [[package]] name = "file-rotate" version = "0.7.5" @@ -1057,13 +1217,10 @@ dependencies = [ ] [[package]] -name = "filenamify" -version = "0.1.0" +name = "finl_unicode" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b781e8974b2cc71ac3c587c881c11ee5fe9a379f43503674e1e1052647593b4c" -dependencies = [ - "regex", -] +checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" [[package]] name = "fixedbitset" @@ -1081,6 +1238,17 @@ dependencies = [ "miniz_oxide 0.7.1", ] +[[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "futures-core", + "futures-sink", + "spin 0.9.8", +] + [[package]] name = "fnv" version = "1.0.7" @@ -1174,6 +1342,17 @@ dependencies = [ "futures-util", ] +[[package]] +name = "futures-intrusive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" +dependencies = [ + "futures-core", + "lock_api", + "parking_lot", +] + [[package]] name = "futures-io" version = "0.3.29" @@ -1188,7 +1367,7 @@ checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.52", ] [[package]] @@ -1203,6 +1382,12 @@ version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +[[package]] +name = "futures-timer" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" + [[package]] name = "futures-util" version = "0.3.29" @@ -1280,15 +1465,15 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" dependencies = [ "aho-corasick", "bstr", - "fnv", "log", - "regex", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", ] [[package]] @@ -1330,6 +1515,12 @@ dependencies = [ "tracing", ] +[[package]] +name = "hash-ids" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9289cbc8064a1c2f505c92d4d17f7fe5050d487728c19cee7936bd204069bc9d" + [[package]] name = "hashbrown" version = "0.12.3" @@ -1394,6 +1585,9 @@ name = "heck" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +dependencies = [ + "unicode-segmentation", +] [[package]] name = "hermit-abi" @@ -1416,6 +1610,24 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "hkdf" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +dependencies = [ + "hmac", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + [[package]] name = "home" version = "0.5.5" @@ -1455,16 +1667,16 @@ dependencies = [ [[package]] name = "http-api-bindings" -version = "0.8.3" +version = "0.10.0" dependencies = [ "anyhow", + "async-openai", + "async-stream", "async-trait", "futures", - "reqwest", - "serde", "serde_json", + "tabby-common", "tabby-inference", - "tokio", "tracing", ] @@ -1527,6 +1739,20 @@ dependencies = [ "want", ] +[[package]] +name = "hyper-rustls" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +dependencies = [ + "futures-util", + "http", + "hyper", + "rustls", + "tokio", + "tokio-rustls", +] + [[package]] name = "hyper-timeout" version = "0.4.1" @@ -1609,40 +1835,20 @@ checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" [[package]] name = "ignore" -version = "0.4.20" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" +checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" dependencies = [ + "crossbeam-deque", "globset", - "lazy_static", "log", "memchr", - "regex", + "regex-automata 0.4.3", "same-file", - "thread_local", "walkdir", "winapi-util", ] -[[package]] -name = "include_dir" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e" -dependencies = [ - "include_dir_macros", -] - -[[package]] -name = "include_dir_macros" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f" -dependencies = [ - "proc-macro2", - "quote", -] - [[package]] name = "indexmap" version = "1.9.3" @@ -1740,23 +1946,21 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" -[[package]] -name = "job_scheduler" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51f368c9c76dde2282714ae32dc274b79c27527a0c06c816f6dda048904d0d7c" -dependencies = [ - "chrono", - "cron 0.6.1", - "uuid 0.8.2", -] - [[package]] name = "jobserver" version = "0.1.26" @@ -1813,7 +2017,7 @@ dependencies = [ [[package]] name = "juniper-axum" -version = "0.8.3" +version = "0.10.0" dependencies = [ "axum", "juniper", @@ -1871,6 +2075,9 @@ name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +dependencies = [ + "spin 0.5.2", +] [[package]] name = "lettre" @@ -1878,21 +2085,24 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5aaf628956b6b0852e12ac3505d20d7a12ecc1e32d5ea921f002af4a74036a5" dependencies = [ + "async-trait", "base64 0.21.5", "chumsky", "email-encoding", "email_address", "fastrand 2.0.1", + "futures-io", "futures-util", "hostname", "httpdate", "idna 0.5.0", "mime", "native-tls", - "nom 7.1.3", + "nom", "quoted_printable", "socket2 0.5.5", "tokio", + "tokio-native-tls", "url", ] @@ -1918,6 +2128,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + [[package]] name = "libsqlite3-sys" version = "0.27.0" @@ -1958,7 +2174,7 @@ checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "llama-cpp-bindings" -version = "0.8.3" +version = "0.10.0" dependencies = [ "async-stream", "async-trait", @@ -2002,6 +2218,15 @@ dependencies = [ "tracing-subscriber 0.3.17", ] +[[package]] +name = "louds-rs" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e16a91fb20f74b6d9a758a0103a2884af525a2fa34fbfe19f4b3c5482a4a54e9" +dependencies = [ + "fid-rs", +] + [[package]] name = "lru" version = "0.11.1" @@ -2056,6 +2281,16 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" +[[package]] +name = "md-5" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +dependencies = [ + "cfg-if", + "digest", +] + [[package]] name = "measure_time" version = "0.8.2" @@ -2068,9 +2303,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.2" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memmap2" @@ -2133,7 +2368,7 @@ checksum = "ddece26afd34c31585c74a4db0630c376df271c285d682d1e55012197830b6df" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.52", ] [[package]] @@ -2250,12 +2485,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9a91b326434fca226707ed8ec1fd22d4e1c96801abdf10c412afdc7d97116e0" [[package]] -name = "nom" -version = "4.1.1" +name = "nix" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c349f68f25f596b9f44cf0e7c69752a5c633b0550c3ff849518bfba0233774a" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "memchr", + "bitflags 2.4.0", + "cfg-if", + "libc", ] [[package]] @@ -2268,6 +2505,17 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "npm-package-json" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df163f89771bd6654d5e116952b9ab2d0b952cd8e3315ddaa615f6d2bfbb1fde" +dependencies = [ + "serde", + "serde_json", + "thiserror", +] + [[package]] name = "ntapi" version = "0.4.1" @@ -2287,6 +2535,27 @@ dependencies = [ "winapi", ] +[[package]] +name = "nucleo" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5262af4c94921c2646c5ac6ff7900c2af9cbb08dc26a797e18130a7019c039d4" +dependencies = [ + "nucleo-matcher", + "parking_lot", + "rayon", +] + +[[package]] +name = "nucleo-matcher" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf33f538733d1a5a3494b836ba913207f14d9d4a1d3cd67030c5061bdd2cac85" +dependencies = [ + "memchr", + "unicode-segmentation", +] + [[package]] name = "num-bigint" version = "0.4.4" @@ -2298,6 +2567,23 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-bigint-dig" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +dependencies = [ + "byteorder", + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand 0.8.5", + "smallvec", + "zeroize", +] + [[package]] name = "num-derive" version = "0.3.3" @@ -2319,6 +2605,17 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-iter" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + [[package]] name = "num-traits" version = "0.2.17" @@ -2326,6 +2623,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", + "libm", ] [[package]] @@ -2423,7 +2721,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.52", ] [[package]] @@ -2549,6 +2847,18 @@ dependencies = [ "stable_deref_trait", ] +[[package]] +name = "package-lock-json-parser" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8707d34f4a67f9c733970b8afc7b82d8623bc0746ff17b460aa6f2ea5ef487d3" +dependencies = [ + "serde", + "serde_json", + "thiserror", + "tracing", +] + [[package]] name = "parking_lot" version = "0.12.1" @@ -2572,6 +2882,16 @@ dependencies = [ "windows-targets 0.48.0", ] +[[package]] +name = "parse-git-url" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cd626725d3855a68fdede6483fae43429129bf246f42d8db598911c8036cf47" +dependencies = [ + "tracing", + "url", +] + [[package]] name = "password-hash" version = "0.5.0" @@ -2599,6 +2919,15 @@ dependencies = [ "serde", ] +[[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + [[package]] name = "percent-encoding" version = "2.3.1" @@ -2636,7 +2965,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.52", ] [[package]] @@ -2677,7 +3006,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.52", ] [[package]] @@ -2692,6 +3021,27 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der", + "pkcs8", + "spki", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + [[package]] name = "pkg-config" version = "0.3.27" @@ -2746,9 +3096,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] @@ -2833,10 +3183,16 @@ dependencies = [ ] [[package]] -name = "quote" -version = "1.0.32" +name = "querystring" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "9318ead08c799aad12a55a3e78b82e0b6167271ffd1f627b758891282f739187" + +[[package]] +name = "quote" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -3050,21 +3406,27 @@ dependencies = [ "http", "http-body", "hyper", + "hyper-rustls", "hyper-tls", "ipnet", "js-sys", "log", "mime", + "mime_guess", "native-tls", "once_cell", "percent-encoding", "pin-project-lite", + "rustls", + "rustls-native-certs", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", "system-configuration", "tokio", "tokio-native-tls", + "tokio-rustls", "tokio-util", "tower-service", "url", @@ -3075,6 +3437,38 @@ dependencies = [ "winreg", ] +[[package]] +name = "reqwest-eventsource" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f03f570355882dd8d15acc3a313841e6e90eddbc76a93c748fd82cc13ba9f51" +dependencies = [ + "eventsource-stream", + "futures-core", + "futures-timer", + "mime", + "nom", + "pin-project-lite", + "reqwest", + "thiserror", +] + +[[package]] +name = "reqwest-eventsource" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f529a5ff327743addc322af460761dff5b50e0c826b9e6ac44c3195c50bb2026" +dependencies = [ + "eventsource-stream", + "futures-core", + "futures-timer", + "mime", + "nom", + "pin-project-lite", + "reqwest", + "thiserror", +] + [[package]] name = "ring" version = "0.17.5" @@ -3084,7 +3478,7 @@ dependencies = [ "cc", "getrandom 0.2.11", "libc", - "spin", + "spin 0.9.8", "untrusted", "windows-sys 0.48.0", ] @@ -3112,31 +3506,23 @@ dependencies = [ ] [[package]] -name = "rusqlite" -version = "0.30.0" +name = "rsa" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a78046161564f5e7cd9008aff3b2990b3850dc8e0349119b98e8f251e099f24d" +checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" dependencies = [ - "bitflags 2.4.0", - "chrono", - "fallible-iterator", - "fallible-streaming-iterator", - "hashlink", - "libsqlite3-sys", - "smallvec", -] - -[[package]] -name = "rusqlite_migration" -version = "1.1.0-beta.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5767f8cb28e54d1ed745f072b72c6e68bfa6179fabb4cd15bdb8575858e301d" -dependencies = [ - "include_dir", - "log", - "rusqlite", - "tokio", - "tokio-rusqlite", + "const-oid", + "digest", + "num-bigint-dig", + "num-integer", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core 0.6.4", + "signature", + "spki", + "subtle", + "zeroize", ] [[package]] @@ -3184,7 +3570,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils 8.0.0", - "syn 2.0.32", + "syn 2.0.52", "walkdir", ] @@ -3257,6 +3643,49 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "rustls" +version = "0.21.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] + +[[package]] +name = "rustls-native-certs" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.5", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "rustversion" version = "1.0.14" @@ -3305,6 +3734,26 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" +[[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "secrecy" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bd1c54ea06cfd2f6b63219704de0b9b4f72dcc2b8fdef820be6cd799780e91e" +dependencies = [ + "serde", + "zeroize", +] + [[package]] name = "security-framework" version = "2.9.2" @@ -3380,7 +3829,7 @@ checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.52", ] [[package]] @@ -3474,7 +3923,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.52", ] [[package]] @@ -3485,7 +3934,7 @@ checksum = "b93fb4adc70021ac1b47f7d45e8cc4169baaa7ea58483bc5b721d19a26202212" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.52", ] [[package]] @@ -3550,6 +3999,16 @@ dependencies = [ "libc", ] +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest", + "rand_core 0.6.4", +] + [[package]] name = "similar" version = "2.3.0" @@ -3623,11 +4082,248 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + [[package]] name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + +[[package]] +name = "sql_query_builder" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b371e496dc275fae413896ef31160eaeb949df66a942245cf3f37fb741389611" + +[[package]] +name = "sqlformat" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c" +dependencies = [ + "itertools 0.12.0", + "nom", + "unicode_categories", +] + +[[package]] +name = "sqlx" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dba03c279da73694ef99763320dea58b51095dfe87d001b1d4b5fe78ba8763cf" +dependencies = [ + "sqlx-core", + "sqlx-macros", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", +] + +[[package]] +name = "sqlx-core" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d84b0a3c3739e220d94b3239fd69fb1f74bc36e16643423bd99de3b43c21bfbd" +dependencies = [ + "ahash", + "atoi", + "byteorder", + "bytes", + "chrono", + "crc", + "crossbeam-queue", + "dotenvy", + "either", + "event-listener", + "futures-channel", + "futures-core", + "futures-intrusive", + "futures-io", + "futures-util", + "hashlink", + "hex", + "indexmap 2.0.1", + "log", + "memchr", + "once_cell", + "paste", + "percent-encoding", + "serde", + "serde_json", + "sha2", + "smallvec", + "sqlformat", + "thiserror", + "tokio", + "tokio-stream", + "tracing", + "url", +] + +[[package]] +name = "sqlx-macros" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89961c00dc4d7dffb7aee214964b065072bff69e36ddb9e2c107541f75e4f2a5" +dependencies = [ + "proc-macro2", + "quote", + "sqlx-core", + "sqlx-macros-core", + "syn 1.0.109", +] + +[[package]] +name = "sqlx-macros-core" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0bd4519486723648186a08785143599760f7cc81c52334a55d6a83ea1e20841" +dependencies = [ + "atomic-write-file", + "dotenvy", + "either", + "heck", + "hex", + "once_cell", + "proc-macro2", + "quote", + "serde", + "serde_json", + "sha2", + "sqlx-core", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", + "syn 1.0.109", + "tempfile", + "tokio", + "url", +] + +[[package]] +name = "sqlx-mysql" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e37195395df71fd068f6e2082247891bc11e3289624bbc776a0cdfa1ca7f1ea4" +dependencies = [ + "atoi", + "base64 0.21.5", + "bitflags 2.4.0", + "byteorder", + "bytes", + "chrono", + "crc", + "digest", + "dotenvy", + "either", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "generic-array", + "hex", + "hkdf", + "hmac", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "percent-encoding", + "rand 0.8.5", + "rsa", + "serde", + "sha1", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "tracing", + "whoami", +] + +[[package]] +name = "sqlx-postgres" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6ac0ac3b7ccd10cc96c7ab29791a7dd236bd94021f31eec7ba3d46a74aa1c24" +dependencies = [ + "atoi", + "base64 0.21.5", + "bitflags 2.4.0", + "byteorder", + "chrono", + "crc", + "dotenvy", + "etcetera", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "hex", + "hkdf", + "hmac", + "home", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "rand 0.8.5", + "serde", + "serde_json", + "sha1", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "tracing", + "whoami", +] + +[[package]] +name = "sqlx-sqlite" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "210976b7d948c7ba9fced8ca835b11cbb2d677c59c79de41ac0d397e14547490" +dependencies = [ + "atoi", + "chrono", + "flume", + "futures-channel", + "futures-core", + "futures-executor", + "futures-intrusive", + "futures-util", + "libsqlite3-sys", + "log", + "percent-encoding", + "serde", + "sqlx-core", + "tracing", + "url", + "urlencoding", +] [[package]] name = "stable_deref_trait" @@ -3660,6 +4356,17 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a8348af2d9fc3258c8733b8d9d8db2e56f54b2363a4b5b81585c7875ed65e65" +[[package]] +name = "stringprep" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6" +dependencies = [ + "finl_unicode", + "unicode-bidi", + "unicode-normalization", +] + [[package]] name = "strsim" version = "0.9.3" @@ -3713,9 +4420,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.32" +version = "2.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" +checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" dependencies = [ "proc-macro2", "quote", @@ -3766,7 +4473,7 @@ dependencies = [ [[package]] name = "tabby" -version = "0.8.3" +version = "0.10.0" dependencies = [ "anyhow", "assert-json-diff", @@ -3788,8 +4495,10 @@ dependencies = [ "openssl", "opentelemetry", "opentelemetry-otlp", + "parse-git-url", "regex", "reqwest", + "reqwest-eventsource 0.5.0", "serde", "serde-jsonlines 0.5.0", "serde_json", @@ -3819,11 +4528,10 @@ dependencies = [ [[package]] name = "tabby-common" -version = "0.8.3" +version = "0.10.0" dependencies = [ "anyhow", "async-trait", - "filenamify", "glob", "home", "lazy_static", @@ -3835,30 +4543,39 @@ dependencies = [ "serdeconv", "tantivy", "thiserror", + "url", "utoipa", "uuid 1.6.1", ] [[package]] name = "tabby-db" -version = "0.8.3" +version = "0.10.0" dependencies = [ "anyhow", "assert_matches", + "cached", "chrono", - "include_dir", + "hash-ids", "lazy_static", - "rusqlite", - "rusqlite_migration", - "tabby-common", + "sql_query_builder", + "sqlx", + "tabby-db-macros", "tokio", - "tokio-rusqlite", "uuid 1.6.1", ] +[[package]] +name = "tabby-db-macros" +version = "0.10.0" +dependencies = [ + "quote", + "syn 2.0.52", +] + [[package]] name = "tabby-download" -version = "0.8.3" +version = "0.10.0" dependencies = [ "aim-downloader", "anyhow", @@ -3870,28 +4587,31 @@ dependencies = [ [[package]] name = "tabby-inference" -version = "0.8.3" +version = "0.10.0" dependencies = [ + "anyhow", "async-stream", "async-trait", "dashmap", "derive_builder", "futures", - "regex", "tabby-common", + "trie-rs", ] [[package]] name = "tabby-scheduler" -version = "0.8.3" +version = "0.10.0" dependencies = [ "anyhow", + "async-trait", "cargo-lock", "file-rotate", "ignore", - "job_scheduler", "kdam", "lazy_static", + "npm-package-json", + "package-lock-json-parser", "requirements", "serde-jsonlines 0.4.0", "serde_json", @@ -3900,9 +4620,11 @@ dependencies = [ "tantivy", "temp_testdir", "tokio", + "tokio-cron-scheduler", "tracing", "tracing-test", "tree-sitter-c", + "tree-sitter-c-sharp", "tree-sitter-cpp", "tree-sitter-go", "tree-sitter-java", @@ -3910,37 +4632,48 @@ dependencies = [ "tree-sitter-python", "tree-sitter-ruby", "tree-sitter-rust", + "tree-sitter-solidity", "tree-sitter-tags", "tree-sitter-typescript", + "yarn-lock-parser", ] [[package]] name = "tabby-webserver" -version = "0.8.3" +version = "0.10.0" dependencies = [ "anyhow", "argon2", "assert_matches", "async-trait", "axum", + "base64 0.22.0", "bincode", + "cached", "chrono", "futures", + "hash-ids", "hyper", + "ignore", "jsonwebtoken", "juniper", "juniper-axum", "lazy_static", "lettre", "mime_guess", + "nucleo", "pin-project", + "querystring", "reqwest", "rust-embed 8.0.0", "serde", "serde_json", + "serial_test 3.0.0", + "strum", "tabby-common", "tabby-db", "tarpc", + "temp_testdir", "thiserror", "tokio", "tokio-cron-scheduler", @@ -3949,6 +4682,8 @@ dependencies = [ "tower-http 0.4.0", "tracing", "unicase", + "url", + "urlencoding", "uuid 1.6.1", "validator", ] @@ -4060,7 +4795,7 @@ version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d39c5a03100ac10c96e0c8b07538e2ab8b17da56434ab348309b31f23fada77" dependencies = [ - "nom 7.1.3", + "nom", ] [[package]] @@ -4189,7 +4924,7 @@ checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.52", ] [[package]] @@ -4273,7 +5008,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de2c1fd54a857b29c6cd1846f31903d0ae8e28175615c14a277aed45c58d8e27" dependencies = [ "chrono", - "cron 0.12.0", + "cron", "num-derive", "num-traits", "tokio", @@ -4299,7 +5034,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.52", ] [[package]] @@ -4324,13 +5059,12 @@ dependencies = [ ] [[package]] -name = "tokio-rusqlite" -version = "0.5.0" +name = "tokio-rustls" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc785c98d0c872455381e59be1f33a8f3a6b4e852544212e37601cc2ccb21d39" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "crossbeam-channel", - "rusqlite", + "rustls", "tokio", ] @@ -4563,7 +5297,7 @@ checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.52", ] [[package]] @@ -4722,6 +5456,16 @@ dependencies = [ "tree-sitter", ] +[[package]] +name = "tree-sitter-c-sharp" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ab3dc608f34924fa9e10533a95f62dbc14b6de0ddd7107722eba66fe19ae31" +dependencies = [ + "cc", + "tree-sitter", +] + [[package]] name = "tree-sitter-cpp" version = "0.20.3" @@ -4791,6 +5535,15 @@ dependencies = [ "tree-sitter", ] +[[package]] +name = "tree-sitter-solidity" +version = "0.0.3" +source = "git+https://github.com/JoranHonig/tree-sitter-solidity?rev=b239a95#b239a95f94cfcc6e7b3e961bc73a28d55e214f02" +dependencies = [ + "cc", + "tree-sitter", +] + [[package]] name = "tree-sitter-tags" version = "0.20.2" @@ -4813,6 +5566,15 @@ dependencies = [ "tree-sitter", ] +[[package]] +name = "trie-rs" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5096c019d49566aff57593a06e401c7f588da84e9a575d0ed2ac0913f51928c0" +dependencies = [ + "louds-rs", +] + [[package]] name = "try-lock" version = "0.2.4" @@ -4880,12 +5642,24 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + [[package]] name = "unicode-width" version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +[[package]] +name = "unicode_categories" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" + [[package]] name = "unreachable" version = "1.0.0" @@ -4921,6 +5695,12 @@ dependencies = [ "regex", ] +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + [[package]] name = "utf-8" version = "0.7.6" @@ -4960,7 +5740,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.52", ] [[package]] @@ -4984,9 +5764,6 @@ name = "uuid" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" -dependencies = [ - "getrandom 0.2.11", -] [[package]] name = "uuid" @@ -5008,7 +5785,7 @@ checksum = "f49e7f3f3db8040a100710a11932239fd30697115e2ba4107080d8252939845e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.52", ] [[package]] @@ -5090,9 +5867,9 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -5141,7 +5918,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.52", "wasm-bindgen-shared", ] @@ -5175,7 +5952,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.52", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5220,6 +5997,12 @@ dependencies = [ "once_cell", ] +[[package]] +name = "whoami" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" + [[package]] name = "winapi" version = "0.3.9" @@ -5447,6 +6230,16 @@ dependencies = [ "linked-hash-map", ] +[[package]] +name = "yarn-lock-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d0603904f8482a1a2a038c9f89c75b0e435392513c3abd3d284123381bbe51f" +dependencies = [ + "nom", + "thiserror", +] + [[package]] name = "zerocopy" version = "0.7.32" @@ -5464,9 +6257,15 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.52", ] +[[package]] +name = "zeroize" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" + [[package]] name = "zip" version = "0.6.6" diff --git a/pkgs/by-name/ta/tabby/package.nix b/pkgs/by-name/ta/tabby/package.nix index 1879a9f3354b..9c92625dc7b0 100644 --- a/pkgs/by-name/ta/tabby/package.nix +++ b/pkgs/by-name/ta/tabby/package.nix @@ -2,6 +2,7 @@ , lib , rustPlatform , fetchFromGitHub +, nix-update-script , stdenv , git @@ -31,7 +32,7 @@ let # https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/ollama/default.nix pname = "tabby"; - version = "0.8.3"; + version = "0.10.0"; availableAccelerations = flatten [ @@ -77,7 +78,7 @@ let # to use a specific device type as it is relying on llama-cpp only being # built to use one type of device. # - # See: https://github.com/TabbyML/tabby/blob/v0.8.3/crates/llama-cpp-bindings/include/engine.h#L20 + # See: https://github.com/TabbyML/tabby/blob/v0.10.0/crates/llama-cpp-bindings/include/engine.h#L20 # llamaccpPackage = llama-cpp.override { rocmSupport = enableRocm; @@ -107,7 +108,7 @@ rustPlatform.buildRustPackage { owner = "TabbyML"; repo = "tabby"; rev = "v${version}"; - hash = "sha256-+5Q5XKfh7+g24y2hBqJC/jNEoRytDdcRdn838xc7c8w="; + hash = "sha256-Oi4KY2H6/dSBydjvPmycdinXUWCdbbhV32wKRvjjnuo="; fetchSubmodules = true; }; @@ -116,6 +117,7 @@ rustPlatform.buildRustPackage { outputHashes = { "tree-sitter-c-0.20.6" = "sha256-Etl4s29YSOxiqPo4Z49N6zIYqNpIsdk/Qd0jR8jdvW4="; "tree-sitter-cpp-0.20.3" = "sha256-UrQ48CoUMSHmlHzOMu22c9N4hxJtHL2ZYRabYjf5byA="; + "tree-sitter-solidity-0.0.3" = "sha256-b+LthCf+g19sjKeNgXZmUV0RNi94O3u0WmXfgKRpaE0="; }; }; @@ -152,6 +154,8 @@ rustPlatform.buildRustPackage { # file cannot create directory: /var/empty/local/lib64/cmake/Llama doCheck = false; + passthru.updateScript = nix-update-script { }; + meta = with lib; { homepage = "https://github.com/TabbyML/tabby"; changelog = "https://github.com/TabbyML/tabby/releases/tag/v${version}"; From 0efb88dd82adbff1df43e45fd159019215389948 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sun, 28 Apr 2024 22:49:25 +0200 Subject: [PATCH 005/209] prometheus-tor-exporter: add Scrumplex as maintainer Signed-off-by: Sefa Eyeoglu --- pkgs/servers/monitoring/prometheus/tor-exporter.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/monitoring/prometheus/tor-exporter.nix b/pkgs/servers/monitoring/prometheus/tor-exporter.nix index caee06b735d0..c12e92c5ee56 100644 --- a/pkgs/servers/monitoring/prometheus/tor-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/tor-exporter.nix @@ -34,7 +34,7 @@ python3Packages.buildPythonApplication rec { mainProgram = "prometheus-tor-exporter"; homepage = "https://github.com/atx/prometheus-tor_exporter"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ Scrumplex ]; platforms = platforms.unix; }; } From 73be5103dd772e4a87cf199ce7b2853d4f2367c3 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sun, 28 Apr 2024 22:55:31 +0200 Subject: [PATCH 006/209] wlr-protocols: add Scrumplex as maintainer Signed-off-by: Sefa Eyeoglu --- pkgs/development/libraries/wlroots/protocols.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wlroots/protocols.nix b/pkgs/development/libraries/wlroots/protocols.nix index fa69879ae97e..c928da147e12 100644 --- a/pkgs/development/libraries/wlroots/protocols.nix +++ b/pkgs/development/libraries/wlroots/protocols.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitLab, wayland-scanner }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "wlr-protocols"; version = "unstable-2022-09-05"; @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.freedesktop.org/wlroots/wlr-protocols"; license = licenses.mit; # See file headers platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ Scrumplex ]; }; } From 5ffda4c121efb1ee805f72bfe4923e26d4123c28 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sun, 28 Apr 2024 23:09:48 +0200 Subject: [PATCH 007/209] sops: add Scrumplex as maintainer Signed-off-by: Sefa Eyeoglu --- pkgs/tools/security/sops/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/sops/default.nix b/pkgs/tools/security/sops/default.nix index 707d4b8c3131..fcca98818534 100644 --- a/pkgs/tools/security/sops/default.nix +++ b/pkgs/tools/security/sops/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { description = "Simple and flexible tool for managing secrets"; changelog = "https://github.com/getsops/sops/blob/v${version}/CHANGELOG.rst"; mainProgram = "sops"; - maintainers = [ ]; + maintainers = with maintainers; [ Scrumplex ]; license = licenses.mpl20; }; } From ce4252be50a642e9612e8761981f70800e23f865 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 29 Apr 2024 17:35:19 +0000 Subject: [PATCH 008/209] autosuspend: 6.1.1 -> 7.0.0 --- pkgs/by-name/au/autosuspend/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/au/autosuspend/package.nix b/pkgs/by-name/au/autosuspend/package.nix index a39d3ec782c1..3b9246a3fbd4 100644 --- a/pkgs/by-name/au/autosuspend/package.nix +++ b/pkgs/by-name/au/autosuspend/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "autosuspend"; - version = "6.1.1"; + version = "7.0.0"; disabled = python3.pythonOlder "3.8"; @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { owner = "languitar"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-LGU/yhwuc6BuctCibm0AaRheQkuSIgEVXzcWQHCJ/8Y="; + hash = "sha256-AJ0ZWRxqhBJEics6XnIVWyf7pJI8MphQU4LRqSYYNSQ="; }; postPatch = '' From 00fc2d271cfd25b03990c72b20e93c6f96c7f7ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 30 Apr 2024 06:40:46 +0000 Subject: [PATCH 009/209] python311Packages.wktutils: 1.1.6 -> 2.0.0 --- pkgs/development/python-modules/wktutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wktutils/default.nix b/pkgs/development/python-modules/wktutils/default.nix index 549e7f480b08..6b78ba959946 100644 --- a/pkgs/development/python-modules/wktutils/default.nix +++ b/pkgs/development/python-modules/wktutils/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "wktutils"; - version = "1.1.6"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "asfadmin"; repo = "Discovery-WKTUtils"; rev = "refs/tags/v${version}"; - hash = "sha256-PFeIMIFOff9ztdmIP7jcFzKkmhm01G0QnDm20AafUsg="; + hash = "sha256-mB+joEZq/aFPcRqFAzPgwG26Wi7WiRCeQeFottk+4Ho="; }; propagatedBuildInputs = [ From 27262b7d82301faa101b3c6e84c423438c75b9cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 29 Apr 2024 09:58:53 +0200 Subject: [PATCH 010/209] sops: add myself as a maintainer Update pkgs/tools/security/sops/default.nix --- pkgs/tools/security/sops/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/sops/default.nix b/pkgs/tools/security/sops/default.nix index fcca98818534..6ececc3613d3 100644 --- a/pkgs/tools/security/sops/default.nix +++ b/pkgs/tools/security/sops/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { description = "Simple and flexible tool for managing secrets"; changelog = "https://github.com/getsops/sops/blob/v${version}/CHANGELOG.rst"; mainProgram = "sops"; - maintainers = with maintainers; [ Scrumplex ]; + maintainers = with maintainers; [ Scrumplex mic92 ]; license = licenses.mpl20; }; } From 50a020aa5637929897d12409b284e30d3e1f2244 Mon Sep 17 00:00:00 2001 From: Jonas Rembser Date: Thu, 2 May 2024 10:44:47 +0200 Subject: [PATCH 011/209] root: add back explicit disabling of compiler warnings for clang This reverts commit 6665f67b4eef1f0e6ed467c80e86ed10c3553594. I misunderstood something when preparing that commit: I thought it was about compailer warnings when compiling ROOT with clang, but actually it was to avoid warning *when compiling clang*. This is still necessary. --- pkgs/applications/science/misc/root/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 59bb9415b37d..6d6108a4360b 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -195,6 +195,9 @@ stdenv.mkDerivation rec { "-Druntime_cxxmodules=OFF" ]; + # suppress warnings from compilation of the vendored clang to avoid running into log limits on the Hydra + NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-shadow" "-Wno-maybe-uninitialized" ]; + postInstall = '' for prog in rootbrowse rootcp rooteventselector rootls rootmkdir rootmv rootprint rootrm rootslimtree; do wrapProgram "$out/bin/$prog" \ From 5b671b7fc8ba3c315fb584f75c3fb61c09ebf582 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Fri, 3 May 2024 13:41:51 +0100 Subject: [PATCH 012/209] nixos/zfs: Default autoscrub interval to monthly --- nixos/modules/tasks/filesystems/zfs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 2c749d45d7a1..9d65319f348d 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -447,9 +447,9 @@ in enable = mkEnableOption "periodic scrubbing of ZFS pools"; interval = mkOption { - default = "Sun, 02:00"; + default = "monthly"; type = types.str; - example = "daily"; + example = "quarterly"; description = '' Systemd calendar expression when to scrub ZFS pools. See {manpage}`systemd.time(7)`. From 8e0e9bdee874c3a3cdb50100f93f99c98ac7a7c6 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Fri, 9 Feb 2024 15:03:47 +0000 Subject: [PATCH 013/209] nixos/zfs: Added a randomizedDelaySec option to ZFS autoscrub/trim timers Allows operators to space out these IO operations across a fleet of machines, rather than have them all happen at the same time. --- nixos/modules/tasks/filesystems/zfs.nix | 30 ++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 2c749d45d7a1..cf8ad94eea13 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -441,6 +441,18 @@ in {manpage}`systemd.time(7)`. ''; }; + + randomizedDelaySec = mkOption { + default = "6h"; + type = types.str; + example = "12h"; + description = '' + Add a randomized delay before each ZFS trim. + The delay will be chosen between zero and this value. + This value must be a time span in the format specified by + {manpage}`systemd.time(7)` + ''; + }; }; services.zfs.autoScrub = { @@ -456,6 +468,18 @@ in ''; }; + randomizedDelaySec = mkOption { + default = "6h"; + type = types.str; + example = "12h"; + description = '' + Add a randomized delay before each ZFS autoscrub. + The delay will be chosen between zero and this value. + This value must be a time span in the format specified by + {manpage}`systemd.time(7)` + ''; + }; + pools = mkOption { default = []; type = types.listOf types.str; @@ -862,6 +886,7 @@ in timerConfig = { OnCalendar = cfgScrub.interval; Persistent = "yes"; + RandomizedDelaySec = cfgScrub.randomizedDelaySec; }; }; }) @@ -879,7 +904,10 @@ in serviceConfig.ExecStart = "${pkgs.runtimeShell} -c 'for pool in $(zpool list -H -o name); do zpool trim $pool; done || true' "; }; - systemd.timers.zpool-trim.timerConfig.Persistent = "yes"; + systemd.timers.zpool-trim.timerConfig = { + Persistent = "yes"; + RandomizedDelaySec = cfgTrim.randomizedDelaySec; + }; }) ]; } From 88d6b79d2e8ffed880085822fc3b643eec858d14 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Fri, 3 May 2024 22:13:22 +0200 Subject: [PATCH 014/209] aws-encryption-sdk-cli: fix build --- pkgs/tools/admin/aws-encryption-sdk-cli/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix b/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix index f0d5aa5d3915..c218831b7ae8 100644 --- a/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix +++ b/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix @@ -26,13 +26,18 @@ in localPython.pkgs.buildPythonApplication rec { pname = "aws-encryption-sdk-cli"; version = "4.1.0"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-OCbt0OkDVfpzUIogbsKzaPAle2L6l6N3cmZoS2hEaSM="; }; - propagatedBuildInputs = with localPython.pkgs; [ + build-system = with localPython.pkgs; [ + setuptools + ]; + + dependencies = with localPython.pkgs; [ attrs aws-encryption-sdk base64io @@ -45,7 +50,7 @@ localPython.pkgs.buildPythonApplication rec { nativeCheckInputs = with localPython.pkgs; [ mock pytest-mock - pytestCheckHook + pytest7CheckHook ]; disabledTestPaths = [ From 7153787bcda2c1e0eaa5ca69bb19e1092167555f Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Sun, 5 May 2024 00:32:06 +0800 Subject: [PATCH 015/209] nezha-agent: 0.16.5 -> 0.16.6 --- pkgs/by-name/ne/nezha-agent/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ne/nezha-agent/package.nix b/pkgs/by-name/ne/nezha-agent/package.nix index 228810059921..6e5216f5e466 100644 --- a/pkgs/by-name/ne/nezha-agent/package.nix +++ b/pkgs/by-name/ne/nezha-agent/package.nix @@ -7,16 +7,16 @@ }: buildGoModule rec { pname = "nezha-agent"; - version = "0.16.5"; + version = "0.16.6"; src = fetchFromGitHub { owner = "nezhahq"; repo = "agent"; rev = "v${version}"; - hash = "sha256-WRHYI3/6qrVZRa4ANA6VBBJCaINP1N8Xjy0GWO4LqgA="; + hash = "sha256-+78WrkFMY2dfqU3ShmzQgR1ZgEKyb9COUjlIf695OM8="; }; - vendorHash = "sha256-AtcRfvYBgTZJz9dpsMgacnV8RNi2Ph7QgUrcE6zzTo8="; + vendorHash = "sha256-kqu3+hO0juxI5qbczVFg0GF+pljmePFbKd59a14U7Pg="; ldflags = [ "-s" From 081e6f300b21109b3802b16f6767ff1bc3c4e396 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 May 2024 04:46:12 +0000 Subject: [PATCH 016/209] uclibc: 1.0.47 -> 1.0.48 --- pkgs/by-name/uc/uclibc-ng/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/uc/uclibc-ng/package.nix b/pkgs/by-name/uc/uclibc-ng/package.nix index d2ce33e4bab3..aee6f6f015f1 100644 --- a/pkgs/by-name/uc/uclibc-ng/package.nix +++ b/pkgs/by-name/uc/uclibc-ng/package.nix @@ -59,11 +59,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "uclibc-ng"; - version = "1.0.47"; + version = "1.0.48"; src = fetchurl { url = "https://downloads.uclibc-ng.org/releases/${finalAttrs.version}/uClibc-ng-${finalAttrs.version}.tar.xz"; - hash = "sha256-KaTWhKBto0TuPuCazCynZJ1ZKuP/hI9pgUXEbe8F78s="; + hash = "sha256-O/X8bMXLxFS2xHhCR1XG9x58FVeKLJZvAmBqpcVZbiE="; }; # 'ftw' needed to build acl, a coreutils dependency From ef3ee8602ed4d47caead727855c7e2e5e6d474f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 May 2024 10:42:07 +0000 Subject: [PATCH 017/209] microsoft-edge: 124.0.2478.67 -> 124.0.2478.80 --- .../networking/browsers/microsoft-edge/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix index f07e5e938856..147e1709d41b 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,20 +1,20 @@ { beta = import ./browser.nix { channel = "beta"; - version = "124.0.2478.67"; + version = "125.0.2535.13"; revision = "1"; - hash = "sha256-EywgM3G0Yph3dofullSVZpXSvT2MHc4uPyGAoaXCgN8="; + hash = "sha256-vO7crYX/QW+S1fjT37JtyRJyziauG+H3LWOasX4VaKM="; }; dev = import ./browser.nix { channel = "dev"; - version = "125.0.2535.6"; + version = "126.0.2552.0"; revision = "1"; - hash = "sha256-iD/e7AuPG0uNZY20wFQRbvAaKmaUw2RKeRJADU1MFRI="; + hash = "sha256-TQHTqCweP0mEkEYRxlU7YtYS6Y6ooZ4V6peCsVvcIjg="; }; stable = import ./browser.nix { channel = "stable"; - version = "124.0.2478.67"; + version = "124.0.2478.80"; revision = "1"; - hash = "sha256-PRL2aiebCoK0eGJWlvI+Gsk14FltV+GaQdojLuDFimU="; + hash = "sha256-p+t12VcwxSDuyZj3VfzEJ6m0rGoVC7smeyHoODttwQU="; }; } From 35bbca41da0ee1a12bb1aea631676f5d0e82bc7a Mon Sep 17 00:00:00 2001 From: Jonas Rembser Date: Thu, 2 May 2024 12:44:06 +0200 Subject: [PATCH 018/209] root: remove redundant cmake flags This commit suggests to remove CMake flags that are the same as the default in ROOT. Many of these flags were useful in the past, but in the last years the default built configuration of ROOT was improved and many toggles are now unnecessary. Removing the redundant flags makes it clearer what the differences of the package to the default configuration are, and it's also more future-proof in case flags get deprecated or removed. --- .../science/misc/root/default.nix | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 6d6108a4360b..ba8911f5fc0f 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -151,40 +151,19 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ - "-Drpath=ON" "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" "-Dbuiltin_llvm=OFF" - "-Dbuiltin_freetype=OFF" - "-Dbuiltin_gtest=OFF" - "-Dbuiltin_nlohmannjson=OFF" - "-Dbuiltin_openui5=ON" "-Dclad=OFF" - "-Ddavix=ON" - "-Ddcache=OFF" "-Dfail-on-missing=ON" - "-Dfftw3=OFF" "-Dfitsio=OFF" - "-Dfortran=OFF" "-Dgnuinstall=ON" - "-Dimt=ON" - "-Dgviz=OFF" - "-Dhttp=ON" "-Dmysql=OFF" - "-Dodbc=OFF" - "-Dopengl=ON" "-Dpgsql=OFF" - "-Dpythia8=OFF" - "-Droot7=ON" "-Dsqlite=OFF" - "-Dssl=ON" - "-Dtmva=ON" "-Dtmva-pymva=OFF" "-Dvdt=OFF" - "-Dwebgui=ON" - "-Dxml=ON" - "-Dxrootd=ON" ] ++ lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${lib.getDev stdenv.cc.libc}/include" ++ lib.optionals stdenv.isDarwin [ From 9283efe75770b8b58b9e30d19988f2e822445f69 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:47:26 +0100 Subject: [PATCH 019/209] c0: unstable-2023-09-05 -> 0-unstable-2023-09-05 --- pkgs/development/compilers/c0/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/c0/default.nix b/pkgs/development/compilers/c0/default.nix index de728cb32c9f..15b83980b9c6 100644 --- a/pkgs/development/compilers/c0/default.nix +++ b/pkgs/development/compilers/c0/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "c0"; - version = "unstable-2023-09-05"; + version = "0-unstable-2023-09-05"; src = fetchFromBitbucket { owner = "c0-lang"; From 5c85ae0bac4480d800b4e1991b3e5c9b46ecff48 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:48:18 +0100 Subject: [PATCH 020/209] open-watcom-v2-unwrapped: unstable-2023-11-24 -> 0-unstable-2023-11-24 --- pkgs/development/compilers/open-watcom/v2.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/open-watcom/v2.nix b/pkgs/development/compilers/open-watcom/v2.nix index 37503496c917..de4aad453c38 100644 --- a/pkgs/development/compilers/open-watcom/v2.nix +++ b/pkgs/development/compilers/open-watcom/v2.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "${passthru.prettyName}-unwrapped"; # nixpkgs-update: no auto update - version = "unstable-2023-11-24"; + version = "0-unstable-2023-11-24"; src = fetchFromGitHub { owner = "open-watcom"; @@ -89,6 +89,8 @@ stdenv.mkDerivation rec { prettyName = "open-watcom-v2"; updateScript = unstableGitUpdater { url = "https://github.com/open-watcom/open-watcom-v2.git"; + # no numerical releases, monthly "YYYY-MM-DD-Build" tags and daily "Current-build", "Last-CI-build" & "Coverity-scan" retagging + hardcodeZeroVersion = true; }; }; From 0122b82531e23279384ef3877523383ccfa9a7e9 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:48:43 +0100 Subject: [PATCH 021/209] zig-shell-completions: unstable-2023-11-18 -> 0-unstable-2023-11-18 --- pkgs/development/compilers/zig/shell-completions.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/zig/shell-completions.nix b/pkgs/development/compilers/zig/shell-completions.nix index d60f7950dcad..44773cf9a553 100644 --- a/pkgs/development/compilers/zig/shell-completions.nix +++ b/pkgs/development/compilers/zig/shell-completions.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "zig-shell-completions"; - version = "unstable-2023-11-18"; + version = "0-unstable-2023-11-18"; src = fetchFromGitHub { owner = "ziglang"; From 402d9d64e259255a75d66cc153392637d0aae630 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:49:59 +0100 Subject: [PATCH 022/209] femtolisp: unstable-2023-07-12 -> 0-unstable-2023-07-12 --- pkgs/development/interpreters/femtolisp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/femtolisp/default.nix b/pkgs/development/interpreters/femtolisp/default.nix index ecd3bc1f8fd7..34efdc91ac6d 100644 --- a/pkgs/development/interpreters/femtolisp/default.nix +++ b/pkgs/development/interpreters/femtolisp/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { pname = "femtolisp"; - version = "unstable-2023-07-12"; + version = "0-unstable-2023-07-12"; src = fetchFromSourcehut { owner = "~ft"; From 85a40080aab1ceb9ba3de22031fb465fde637982 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:51:17 +0100 Subject: [PATCH 023/209] nelua: unstable-2024-04-20 -> 0-unstable-2024-04-20 --- pkgs/development/interpreters/nelua/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/nelua/default.nix b/pkgs/development/interpreters/nelua/default.nix index fd57cc4b46ee..07494f121b02 100644 --- a/pkgs/development/interpreters/nelua/default.nix +++ b/pkgs/development/interpreters/nelua/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "nelua"; - version = "unstable-2024-04-20"; + version = "0-unstable-2024-04-20"; src = fetchFromGitHub { owner = "edubart"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace lualib/nelua/version.lua \ --replace "NELUA_GIT_HASH = nil" "NELUA_GIT_HASH = '${src.rev}'" \ - --replace "NELUA_GIT_DATE = nil" "NELUA_GIT_DATE = '${lib.removePrefix "unstable-" version}'" + --replace "NELUA_GIT_DATE = nil" "NELUA_GIT_DATE = '${lib.removePrefix "0-unstable-" version}'" ''; makeFlags = [ "PREFIX=$(out)" ]; @@ -23,7 +23,10 @@ stdenv.mkDerivation rec { doCheck = true; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = unstableGitUpdater { + # no releases, only stale "latest" tag + hardcodeZeroVersion = true; + }; meta = with lib; { description = "Minimal, efficient, statically-typed and meta-programmable systems programming language heavily inspired by Lua, which compiles to C and native code"; From 9293af315e4603d4ee1383f1440e98fabbdea51d Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:44:15 +0100 Subject: [PATCH 024/209] scheme-manpages: unstable-2024-02-11 -> 0-unstable-2024-02-11 --- pkgs/data/documentation/scheme-manpages/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/documentation/scheme-manpages/default.nix b/pkgs/data/documentation/scheme-manpages/default.nix index 87119f31452b..96d8d9ac1194 100644 --- a/pkgs/data/documentation/scheme-manpages/default.nix +++ b/pkgs/data/documentation/scheme-manpages/default.nix @@ -2,7 +2,7 @@ stdenvNoCC.mkDerivation rec { pname = "scheme-manpages"; - version = "unstable-2024-02-11"; + version = "0-unstable-2024-02-11"; src = fetchFromGitHub { owner = "schemedoc"; From 4712ec00cfd393fbe8e7036b001bc743efb343e6 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:45:07 +0100 Subject: [PATCH 025/209] dracula-theme: unstable-2024-04-24 -> 4.0.0-unstable-2024-04-24 --- pkgs/data/themes/dracula-theme/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/dracula-theme/default.nix b/pkgs/data/themes/dracula-theme/default.nix index cb3e112821fc..229a19f1b966 100644 --- a/pkgs/data/themes/dracula-theme/default.nix +++ b/pkgs/data/themes/dracula-theme/default.nix @@ -2,7 +2,7 @@ let themeName = "Dracula"; - version = "unstable-2024-04-24"; + version = "4.0.0-unstable-2024-04-24"; in stdenvNoCC.mkDerivation { pname = "dracula-theme"; @@ -38,7 +38,9 @@ stdenvNoCC.mkDerivation { runHook postInstall ''; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; meta = with lib; { description = "Dracula variant of the Ant theme"; From caa9e587a4e698731873c928f251026b6a3e5613 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:45:39 +0100 Subject: [PATCH 026/209] material-kwin-decoration: unstable-2023-01-15 -> 7-unstable-2023-01-15 --- pkgs/data/themes/material-kwin-decoration/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/material-kwin-decoration/default.nix b/pkgs/data/themes/material-kwin-decoration/default.nix index ba81e1f62987..85bf37cc7892 100644 --- a/pkgs/data/themes/material-kwin-decoration/default.nix +++ b/pkgs/data/themes/material-kwin-decoration/default.nix @@ -17,7 +17,7 @@ mkDerivation rec { pname = "material-kwin-decoration"; - version = "unstable-2023-01-15"; + version = "7-unstable-2023-01-15"; src = fetchFromGitHub { owner = "Zren"; @@ -47,7 +47,9 @@ mkDerivation rec { ]; passthru = { - updateScript = unstableGitUpdater { }; + updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; }; meta = with lib; { From 4b084efb0d969403cdcfe828cd0d96ed9a074605 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:46:08 +0100 Subject: [PATCH 027/209] nixos-bgrt-plymouth: unstable-2023-03-10 -> 0-unstable-2023-03-10 --- pkgs/data/themes/nixos-bgrt-plymouth/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/themes/nixos-bgrt-plymouth/default.nix b/pkgs/data/themes/nixos-bgrt-plymouth/default.nix index 0486aed864f4..b6b5be1adda0 100644 --- a/pkgs/data/themes/nixos-bgrt-plymouth/default.nix +++ b/pkgs/data/themes/nixos-bgrt-plymouth/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "nixos-bgrt-plymouth"; - version = "unstable-2023-03-10"; + version = "0-unstable-2023-03-10"; src = fetchFromGitHub { repo = "plymouth-theme-nixos-bgrt"; From 3b7eb42bff7550309177ba5a263fad262d4c8644 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 5 May 2024 17:39:54 +0200 Subject: [PATCH 028/209] autosuspend: drop support for older versions of python Co-authored-by: Anthony Roussel --- pkgs/by-name/au/autosuspend/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/au/autosuspend/package.nix b/pkgs/by-name/au/autosuspend/package.nix index 3b9246a3fbd4..63f4c07c289f 100644 --- a/pkgs/by-name/au/autosuspend/package.nix +++ b/pkgs/by-name/au/autosuspend/package.nix @@ -9,7 +9,7 @@ python3.pkgs.buildPythonApplication rec { pname = "autosuspend"; version = "7.0.0"; - disabled = python3.pythonOlder "3.8"; + disabled = python3.pythonOlder "3.10"; src = fetchFromGitHub { owner = "languitar"; From 29a16ce2a73d78639a539a324ef7ef74f9c2befc Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:46:29 +0100 Subject: [PATCH 029/209] pantheon.file-roller-contract: unstable-2021-02-22 -> 0-unstable-2021-02-22 --- pkgs/desktops/pantheon/desktop/file-roller-contract/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/pantheon/desktop/file-roller-contract/default.nix b/pkgs/desktops/pantheon/desktop/file-roller-contract/default.nix index c9a24b4906c7..6a2a22ddf83a 100644 --- a/pkgs/desktops/pantheon/desktop/file-roller-contract/default.nix +++ b/pkgs/desktops/pantheon/desktop/file-roller-contract/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "file-roller-contract"; - version = "unstable-2021-02-22"; + version = "0-unstable-2021-02-22"; src = fetchFromGitHub { owner = "elementary"; From cfc30e70941243b2e67eb7e864e23675e2392760 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:46:52 +0100 Subject: [PATCH 030/209] wingpanel-indicator-ayatana: unstable-2023-04-18 -> 2.0.7-unstable-2023-04-18 --- .../third-party/wingpanel-indicator-ayatana/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix b/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix index f199894d924b..c3c24b02401a 100644 --- a/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix +++ b/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-ayatana"; - version = "unstable-2023-04-18"; + version = "2.0.7-unstable-2023-04-18"; src = fetchFromGitHub { owner = "Lafydev"; From abb24383d2c0b172c5df26d196985b5776abe177 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 18:02:55 +0100 Subject: [PATCH 031/209] sladeUnstable: unstable-2023-09-30 -> 3.2.4-unstable-2023-09-30 --- pkgs/games/doom-ports/slade/git.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/doom-ports/slade/git.nix b/pkgs/games/doom-ports/slade/git.nix index 7ecc5d5d1b6a..db85d405f8c5 100644 --- a/pkgs/games/doom-ports/slade/git.nix +++ b/pkgs/games/doom-ports/slade/git.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "slade"; - version = "unstable-2023-09-30"; + version = "3.2.4-unstable-2023-09-30"; src = fetchFromGitHub { owner = "sirjuddington"; From 60d2263d86dd75e4a779a1ea000cb5a1da3ce791 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 18:03:32 +0100 Subject: [PATCH 032/209] nile: unstable-2024-03-09 -> 1.0.2-unstable-2024-03-09 --- pkgs/games/nile/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/games/nile/default.nix b/pkgs/games/nile/default.nix index b83eda87f934..18d1d3c28ae5 100644 --- a/pkgs/games/nile/default.nix +++ b/pkgs/games/nile/default.nix @@ -15,7 +15,7 @@ buildPythonApplication rec { pname = "nile"; - version = "unstable-2024-03-09"; + version = "1.0.2-unstable-2024-03-09"; format = "pyproject"; src = fetchFromGitHub { @@ -56,5 +56,7 @@ buildPythonApplication rec { maintainers = with maintainers; [ aidalgol ]; }; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; } From 4d15920cd16128fb3ebff4289d659395d2cf4aaf Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 18:06:15 +0100 Subject: [PATCH 033/209] bloat: unstable-2024-02-12 -> 0-unstable-2024-02-12 --- pkgs/servers/bloat/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/bloat/default.nix b/pkgs/servers/bloat/default.nix index dfde129e8887..3ca2b494e234 100644 --- a/pkgs/servers/bloat/default.nix +++ b/pkgs/servers/bloat/default.nix @@ -6,7 +6,7 @@ buildGoModule { pname = "bloat"; - version = "unstable-2024-02-12"; + version = "0-unstable-2024-02-12"; src = fetchgit { url = "git://git.freesoftwareextremist.com/bloat"; From 5ae0b96fa2a54efe9e9a549f9e678ad1b17d1f1a Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 18:06:57 +0100 Subject: [PATCH 034/209] klipper: unstable-2024-04-20 -> 0.12.0-unstable-2024-04-20 --- pkgs/servers/klipper/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index 071c268c5dc6..3752c7147797 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "klipper"; - version = "unstable-2024-04-20"; + version = "0.12.0-unstable-2024-04-20"; src = fetchFromGitHub { owner = "KevinOConnor"; @@ -63,7 +63,10 @@ stdenv.mkDerivation rec { runHook postInstall ''; - passthru.updateScript = unstableGitUpdater { url = meta.homepage; }; + passthru.updateScript = unstableGitUpdater { + url = meta.homepage; + tagPrefix = "v"; + }; meta = with lib; { description = "The Klipper 3D printer firmware"; From cbf9e8f389556f6956d973d7ff297978e5a15001 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 18:07:50 +0100 Subject: [PATCH 035/209] moonraker: unstable-2023-12-27 -> 0.8.0-unstable-2023-12-27 --- pkgs/servers/moonraker/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/moonraker/default.nix b/pkgs/servers/moonraker/default.nix index d4cc61af2802..a6b3f3eb21e7 100644 --- a/pkgs/servers/moonraker/default.nix +++ b/pkgs/servers/moonraker/default.nix @@ -24,7 +24,7 @@ let ); in stdenvNoCC.mkDerivation rec { pname = "moonraker"; - version = "unstable-2023-12-27"; + version = "0.8.0-unstable-2023-12-27"; src = fetchFromGitHub { owner = "Arksine"; @@ -44,7 +44,10 @@ in stdenvNoCC.mkDerivation rec { ''; passthru = { - updateScript = unstableGitUpdater { url = meta.homepage; }; + updateScript = unstableGitUpdater { + url = meta.homepage; + tagPrefix = "v"; + }; tests.moonraker = nixosTests.moonraker; }; From 77f1d8831c98b41160cc4383536bed3fea40e929 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 18:08:11 +0100 Subject: [PATCH 036/209] postgresqlPackages.pgjwt: unstable-2023-03-02 -> 0-unstable-2023-03-02 --- pkgs/servers/sql/postgresql/ext/pgjwt.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgjwt.nix b/pkgs/servers/sql/postgresql/ext/pgjwt.nix index 2b6ee2edaf85..7134c052363d 100644 --- a/pkgs/servers/sql/postgresql/ext/pgjwt.nix +++ b/pkgs/servers/sql/postgresql/ext/pgjwt.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "pgjwt"; - version = "unstable-2023-03-02"; + version = "0-unstable-2023-03-02"; src = fetchFromGitHub { owner = "michelp"; From 92dcac933996e1d56d4ce34d1dc8b9dae3edfc63 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 18:09:03 +0100 Subject: [PATCH 037/209] postgresqlPackages.tds_fdw: unstable-2024-02-10 -> 2.0.3-unstable-2024-02-10 --- pkgs/servers/sql/postgresql/ext/tds_fdw.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix index 9986f2131f30..86ab520944e7 100644 --- a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "tds_fdw"; # Move to stable version when it's released. - version = "unstable-2024-02-10"; + version = "2.0.3-unstable-2024-02-10"; buildInputs = [ postgresql freetds ]; @@ -21,7 +21,9 @@ stdenv.mkDerivation rec { install -D tds_fdw.control -t $out/share/postgresql/extension ''; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; meta = with lib; { description = "A PostgreSQL foreign data wrapper to connect to TDS databases (Sybase and Microsoft SQL Server)"; From be077886cd21429930edfe7585755b3cc4e23282 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 18:11:02 +0100 Subject: [PATCH 038/209] nushellPlugins.net: unstable-2024-04-05 -> 0-unstable-2024-04-05 cargoHash is affected by version change because full derivation name is used in the vendoring process. --- pkgs/shells/nushell/plugins/net.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/nushell/plugins/net.nix b/pkgs/shells/nushell/plugins/net.nix index a4a2d049b9b5..23729360e83a 100644 --- a/pkgs/shells/nushell/plugins/net.nix +++ b/pkgs/shells/nushell/plugins/net.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage { pname = "nu-plugin-net"; - version = "unstable-2024-04-05"; + version = "0-unstable-2024-04-05"; src = fetchFromGitHub { owner = "fennewald"; @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage { hash = "sha256-uKLYTRR2tThSvwWbvEePOLZ9ehNPfCYruZxTKSIxpEA="; }; - cargoHash = "sha256-2A9RalZhXigLq/6w738G6PnkV3FyK+3HHXPDQRHTIm0="; + cargoHash = "sha256-BsCOej31vfTf+Wca4+AjxkhXz6wpMRFJmGBsUqOj2U0="; nativeBuildInputs = [ rustPlatform.bindgenHook From e1c10217f95693ac6335e7573a82137d4fd65cab Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 18:11:33 +0100 Subject: [PATCH 039/209] rc-9front: unstable-2022-11-01 -> 0-unstable-2022-11-01 --- pkgs/shells/rc-9front/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/shells/rc-9front/default.nix b/pkgs/shells/rc-9front/default.nix index a7d2f1e54e3e..ff265dbec871 100644 --- a/pkgs/shells/rc-9front/default.nix +++ b/pkgs/shells/rc-9front/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { pname = "rc-9front"; - version = "unstable-2022-11-01"; + version = "0-unstable-2022-11-01"; src = fetchFrom9Front { domain = "shithub.us"; From 693b337466340eace2090621aea3a3a651d16475 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 18:12:25 +0100 Subject: [PATCH 040/209] zsh-prezto: unstable-2024-04-15 -> 0-unstable-2024-04-15 --- pkgs/shells/zsh/zsh-prezto/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/shells/zsh/zsh-prezto/default.nix b/pkgs/shells/zsh/zsh-prezto/default.nix index 61b51a252fb6..e311bea156f1 100644 --- a/pkgs/shells/zsh/zsh-prezto/default.nix +++ b/pkgs/shells/zsh/zsh-prezto/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "zsh-prezto"; - version = "unstable-2024-04-15"; + version = "0-unstable-2024-04-15"; src = fetchFromGitHub { owner = "sorin-ionescu"; From e53cfeee3e7d56bed6e01ec4f508f3abe40ffd7a Mon Sep 17 00:00:00 2001 From: Jonas Rembser Date: Thu, 2 May 2024 12:30:22 +0200 Subject: [PATCH 041/209] root: enable `clad` for automatic differentiation in ROOT Clad is a clang plugin that can be used in Cling to create gradients of C++ functions. It is included in ROOT via `ExternalProject_Add`: https://github.com/root-project/root/blob/master/interpreter/cling/tools/plugins/clad/CMakeLists.txt Clad is used for example in RooFit to create analytical gradients of likelihoods. --- .../science/misc/root/default.nix | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index ba8911f5fc0f..fe4169ab592e 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , callPackage +, fetchgit , fetchurl , fetchpatch , makeWrapper @@ -68,6 +69,12 @@ stdenv.mkDerivation rec { hash = "sha256-MA237RtnjtL7ljXKZ1khoZRcfCED2oQAM7STCR9VcAw="; }; + clad_src = fetchgit { + url = "https://github.com/vgvassilev/clad"; + rev = "refs/tags/v1.4"; # Make sure that this is the same tag as in the ROOT build files! + hash = "sha256-OI9PaS7kQ/ewD5Soe3gG5FZdlR6qG6Y3mfHwi5dj1sI="; + }; + nativeBuildInputs = [ makeWrapper cmake pkg-config git ]; propagatedBuildInputs = [ nlohmann_json @@ -131,6 +138,23 @@ stdenv.mkDerivation rec { substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \ --replace 'set(lcgpackages ' '#set(lcgpackages ' + # We have to bypass the connection check, because it would disable clad. + # This should probably be fixed upstream with a flag to disable the + # connectivity check! + substituteInPlace CMakeLists.txt \ + --replace 'if(NO_CONNECTION)' 'if(FALSE)' + substituteInPlace interpreter/cling/tools/plugins/CMakeLists.txt \ + --replace 'if(NOT DEFINED NO_CONNECTION OR NOT NO_CONNECTION)' 'if(TRUE)' + # Make sure that clad is not downloaded when building + substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \ + --replace 'UPDATE_COMMAND ""' 'SOURCE_DIR ${clad_src} DOWNLOAD_COMMAND "" UPDATE_COMMAND ""' + # Make sure that clad is finding the right llvm version + substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \ + --replace '-DLLVM_DIR=''${LLVM_BINARY_DIR}' '-DLLVM_DIR=${llvm_13.dev}/lib/cmake/llvm' + # Fix that will also be upstream in ROOT 6.32. TODO: remove it when updating to 6.32 + substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \ + --replace 'set(_CLAD_LIBRARY_PATH ''${clad_install_dir}/plugins/lib)' 'set(_CLAD_LIBRARY_PATH ''${CMAKE_CURRENT_BINARY_DIR}/clad-prefix/src/clad-build/lib''${LLVM_LIBDIR_SUFFIX})' + substituteInPlace interpreter/llvm-project/clang/tools/driver/CMakeLists.txt \ --replace 'add_clang_symlink(''${link} clang)' "" @@ -155,7 +179,6 @@ stdenv.mkDerivation rec { "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" "-Dbuiltin_llvm=OFF" - "-Dclad=OFF" "-Dfail-on-missing=ON" "-Dfitsio=OFF" "-Dgnuinstall=ON" From cdefff65b8474a454f5fefeb92ea21e55e915977 Mon Sep 17 00:00:00 2001 From: Jonas Rembser Date: Sun, 5 May 2024 23:31:57 +0200 Subject: [PATCH 042/209] root: fix typos --- pkgs/applications/science/misc/root/setup-hook.sh | 4 ++-- pkgs/applications/science/misc/root/sw_vers.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/misc/root/setup-hook.sh b/pkgs/applications/science/misc/root/setup-hook.sh index 34c9bfdcebbd..7affd21012eb 100644 --- a/pkgs/applications/science/misc/root/setup-hook.sh +++ b/pkgs/applications/science/misc/root/setup-hook.sh @@ -12,8 +12,8 @@ thisroot () { postHooks+=(thisroot) -addRootInludePath() { +addRootIncludePath() { addToSearchPath ROOT_INCLUDE_PATH $1/include } -addEnvHooks "$targetOffset" addRootInludePath +addEnvHooks "$targetOffset" addRootIncludePath diff --git a/pkgs/applications/science/misc/root/sw_vers.patch b/pkgs/applications/science/misc/root/sw_vers.patch index 54ad1091392e..2a0fcd757719 100644 --- a/pkgs/applications/science/misc/root/sw_vers.patch +++ b/pkgs/applications/science/misc/root/sw_vers.patch @@ -48,7 +48,7 @@ diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake #---Set Linker flags---------------------------------------------------------------------- - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -mmacosx-version-min=${MACOSX_VERSION}") else (CMAKE_SYSTEM_NAME MATCHES Darwin) - MESSAGE(FATAL_ERROR "There is no setup for this this Apple system up to now. Don't know waht to do. Stop cmake at this point.") + MESSAGE(FATAL_ERROR "There is no setup for this this Apple system up to now. Don't know what to do. Stop cmake at this point.") endif (CMAKE_SYSTEM_NAME MATCHES Darwin) diff a/config/root-config.in b/config/root-config.in --- a/config/root-config.in From db942c10c8e811ef9b5b79ee7cf9004fa6a56ad9 Mon Sep 17 00:00:00 2001 From: Jonas Rembser Date: Sun, 5 May 2024 23:32:17 +0200 Subject: [PATCH 043/209] root: update homepage We try to promote the URL that is just `root.cern` nowadays. --- pkgs/applications/science/misc/root/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index fe4169ab592e..afc048cc41ef 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -256,7 +256,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; meta = with lib; { - homepage = "https://root.cern.ch/"; + homepage = "https://root.cern/"; description = "A data analysis framework"; platforms = platforms.unix; maintainers = [ maintainers.guitargeek maintainers.veprbl ]; From 772ae48e69f46df11483fd5e12a9fae5b77e7ce4 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 16 Nov 2023 15:04:21 +0300 Subject: [PATCH 044/209] nixos/tests: disable logrotate service by default in tests --- .../modules/testing/test-instrumentation.nix | 2 + nixos/tests/logrotate.nix | 90 ++++++++++--------- 2 files changed, 51 insertions(+), 41 deletions(-) diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index 28abbe66adaf..dd8816063c70 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -218,6 +218,8 @@ in services.displayManager.logToJournal = true; + services.logrotate.enable = lib.mkDefault false; + # Make sure we use the Guest Agent from the QEMU package for testing # to reduce the closure size required for the tests. services.qemuGuest.package = pkgs.qemu_test.ga; diff --git a/nixos/tests/logrotate.nix b/nixos/tests/logrotate.nix index bcbe89c259ae..f9c5e9060970 100644 --- a/nixos/tests/logrotate.nix +++ b/nixos/tests/logrotate.nix @@ -16,52 +16,60 @@ import ./make-test-python.nix ({ pkgs, ... }: rec { }; nodes = { - defaultMachine = { ... }: { }; + defaultMachine = { ... }: { + services.logrotate.enable = true; + }; failingMachine = { ... }: { - services.logrotate.configFile = pkgs.writeText "logrotate.conf" '' - # self-written config file - su notarealuser notagroupeither - ''; + services.logrotate = { + enable = true; + configFile = pkgs.writeText "logrotate.conf" '' + # self-written config file + su notarealuser notagroupeither + ''; + }; }; machine = { config, ... }: { imports = [ importTest ]; - services.logrotate.settings = { - # remove default frequency header and add another - header = { - frequency = null; - delaycompress = true; - }; - # extra global setting... affecting nothing - last_line = { - global = true; - priority = 2000; - shred = true; - }; - # using mail somewhere should add --mail to logrotate invocation - sendmail = { - mail = "user@domain.tld"; - }; - # postrotate should be suffixed by 'endscript' - postrotate = { - postrotate = "touch /dev/null"; - }; - # check checkConfig works as expected: there is nothing to check here - # except that the file build passes - checkConf = { - su = "root utmp"; - createolddir = "0750 root utmp"; - create = "root utmp"; - "create " = "0750 root utmp"; - }; - # multiple paths should be aggregated - multipath = { - files = [ "file1" "file2" ]; - }; - # overriding imported path should keep existing attributes - # (e.g. olddir is still set) - import = { - notifempty = true; + services.logrotate = { + enable = true; + settings = { + # remove default frequency header and add another + header = { + frequency = null; + delaycompress = true; + }; + # extra global setting... affecting nothing + last_line = { + global = true; + priority = 2000; + shred = true; + }; + # using mail somewhere should add --mail to logrotate invocation + sendmail = { + mail = "user@domain.tld"; + }; + # postrotate should be suffixed by 'endscript' + postrotate = { + postrotate = "touch /dev/null"; + }; + # check checkConfig works as expected: there is nothing to check here + # except that the file build passes + checkConf = { + su = "root utmp"; + createolddir = "0750 root utmp"; + create = "root utmp"; + "create " = "0750 root utmp"; + }; + # multiple paths should be aggregated + multipath = { + files = [ "file1" "file2" ]; + }; + # overriding imported path should keep existing attributes + # (e.g. olddir is still set) + import = { + notifempty = true; + }; }; }; }; From 3684009cfec20ac5cc437cde4c9889077d5d4c92 Mon Sep 17 00:00:00 2001 From: nat Date: Mon, 6 May 2024 16:56:32 +0200 Subject: [PATCH 045/209] steamtinkerlaunch: add surfaceflinger to maintainers --- pkgs/tools/games/steamtinkerlaunch/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/games/steamtinkerlaunch/default.nix b/pkgs/tools/games/steamtinkerlaunch/default.nix index f9db25353499..13460b07aad8 100644 --- a/pkgs/tools/games/steamtinkerlaunch/default.nix +++ b/pkgs/tools/games/steamtinkerlaunch/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { mainProgram = "steamtinkerlaunch"; homepage = "https://github.com/sonic2kk/steamtinkerlaunch"; license = licenses.gpl3; - maintainers = with maintainers; [ urandom ]; + maintainers = with maintainers; [ urandom surfaceflinger ]; platforms = lib.platforms.linux; }; } From 6496a33b4c21e570bc739b377e3f5f34371aaeeb Mon Sep 17 00:00:00 2001 From: nat Date: Mon, 6 May 2024 17:00:10 +0200 Subject: [PATCH 046/209] steamtinkerlaunch: 12.12 -> 12.12-unstable-2024-05-03 --- pkgs/tools/games/steamtinkerlaunch/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/games/steamtinkerlaunch/default.nix b/pkgs/tools/games/steamtinkerlaunch/default.nix index 13460b07aad8..42935ad6e393 100644 --- a/pkgs/tools/games/steamtinkerlaunch/default.nix +++ b/pkgs/tools/games/steamtinkerlaunch/default.nix @@ -1,11 +1,11 @@ { bash +, fetchFromGitHub , gawk , git -, gnugrep -, fetchFromGitHub , lib , makeWrapper -, stdenv +, procps +, stdenvNoCC , unixtools , unzip , wget @@ -14,15 +14,15 @@ , yad }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation { pname = "steamtinkerlaunch"; - version = "12.12"; + version = "12.12-unstable-2024-05-03"; src = fetchFromGitHub { owner = "sonic2kk"; - repo = pname; - rev = "v${version}"; - hash = "sha256-oigHNfg5rHxRabwUs66ye+chJzivmCIw8mg/GaJLPkg="; + repo = "steamtinkerlaunch"; + rev = "59b421b2f3686120a076909a4a158824cd4ef05e"; + hash = "sha256-CGtSGAm+52t2zFsPJEsm76w+FEHhbOd9NYuerGa31tc="; }; # hardcode PROGCMD because #150841 @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { bash gawk git - gnugrep + procps unixtools.xxd unzip wget From 8327efe27b57012316887c954e8cb4e3bf3eb50b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 01:38:45 +0000 Subject: [PATCH 047/209] kubectl-gadget: 0.27.0 -> 0.28.0 --- .../networking/cluster/kubectl-gadget/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubectl-gadget/default.nix b/pkgs/applications/networking/cluster/kubectl-gadget/default.nix index 98a656f23859..e902bc3597eb 100644 --- a/pkgs/applications/networking/cluster/kubectl-gadget/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-gadget/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubectl-gadget"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "inspektor-gadget"; repo = "inspektor-gadget"; rev = "v${version}"; - hash = "sha256-u5lzCIbSIOrhI2OE2PprvNZv7KetYGntyADVftSJrkY="; + hash = "sha256-iQ+9CN6De2jz3+dZ26jgqbXAx9Fef8ROgVX8kKYMAG0="; }; - vendorHash = "sha256-ZsSzLIVVoKZZEZOIYJTNl0DGere3sKfXsjXbRVmeYC4="; + vendorHash = "sha256-0XByai7fEnkmEEkH1koVM1+z3UNFLbsUCK3sP4KBe+A="; CGO_ENABLED = 0; From 21f831e62f6f577cc0e50653a8e62f13405b44b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 01:46:29 +0000 Subject: [PATCH 048/209] meli: 0.8.4 -> 0.8.5 --- pkgs/by-name/me/meli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/me/meli/package.nix b/pkgs/by-name/me/meli/package.nix index a4ff654ad892..ab5d838c0ae4 100644 --- a/pkgs/by-name/me/meli/package.nix +++ b/pkgs/by-name/me/meli/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { pname = "meli"; - version = "0.8.4"; + version = "0.8.5"; src = fetchzip { urls = [ @@ -30,10 +30,10 @@ rustPlatform.buildRustPackage rec { "https://codeberg.org/meli/meli/archive/v${version}.tar.gz" "https://github.com/meli/meli/archive/refs/tags/v${version}.tar.gz" ]; - hash = "sha256-wmIlYgXB17/i9Q+6C7pbcEjVlEuvhmqrSH+cDmaBKLs="; + hash = "sha256-xfc4DZGKQi/n87JcjTl+s2UFJ20v+6JmzSL36pZlSc0="; }; - cargoHash = "sha256-gYS/dxNMz/HkCmRXH5AdHPXJ2giqpAHc4eVXJGOpMDM="; + cargoHash = "sha256-7ax3VQ+McmzxdG8TeKnMnD0uJmM0pi9Sskfdl2SZkz4="; # Needed to get openssl-sys to use pkg-config OPENSSL_NO_VENDOR=1; From 95ba709ab52a32a051667badf03eb844f721b088 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 02:23:18 +0000 Subject: [PATCH 049/209] limine: 7.4.1 -> 7.5.0 --- pkgs/by-name/li/limine/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index 3a5d77693523..ed94c8db68d1 100644 --- a/pkgs/by-name/li/limine/package.nix +++ b/pkgs/by-name/li/limine/package.nix @@ -12,7 +12,7 @@ }: let - version = "7.4.1"; + version = "7.5.0"; in # The output of the derivation is a tool to create bootable images using Limine # as bootloader for various platforms and corresponding binary and helper files. @@ -24,7 +24,7 @@ stdenv.mkDerivation { # Packaging that in Nix is very cumbersome. src = fetchurl { url = "https://github.com/limine-bootloader/limine/releases/download/v${version}/limine-${version}.tar.gz"; - sha256 = "sha256-0SCy5msjWG9c1UHJka1typCTGh21VzHLfH5pMPMdEH0="; + sha256 = "sha256-4mUoBl+MG+rkRd/fBJuTTGGdPcncuhnumfi5s2yh7yI="; }; nativeBuildInputs = [ From 92af417a135c2ec90f0ddf75f269c09fc4b0b73c Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Tue, 7 May 2024 04:50:27 +0200 Subject: [PATCH 050/209] cdecl: adopt, migrate to by-name, reformat --- .../cd}/cdecl/cdecl-2.5-lex.patch | 0 .../cd/cdecl/package.nix} | 21 ++++++++++++++++--- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 18 insertions(+), 5 deletions(-) rename pkgs/{development/tools => by-name/cd}/cdecl/cdecl-2.5-lex.patch (100%) rename pkgs/{development/tools/cdecl/default.nix => by-name/cd/cdecl/package.nix} (77%) diff --git a/pkgs/development/tools/cdecl/cdecl-2.5-lex.patch b/pkgs/by-name/cd/cdecl/cdecl-2.5-lex.patch similarity index 100% rename from pkgs/development/tools/cdecl/cdecl-2.5-lex.patch rename to pkgs/by-name/cd/cdecl/cdecl-2.5-lex.patch diff --git a/pkgs/development/tools/cdecl/default.nix b/pkgs/by-name/cd/cdecl/package.nix similarity index 77% rename from pkgs/development/tools/cdecl/default.nix rename to pkgs/by-name/cd/cdecl/package.nix index 48870c7d2df1..5bc045bc0edc 100644 --- a/pkgs/development/tools/cdecl/default.nix +++ b/pkgs/by-name/cd/cdecl/package.nix @@ -1,4 +1,13 @@ -{lib, stdenv, fetchurl, bison, flex, readline, ncurses, gnused}: +{ + lib, + stdenv, + fetchurl, + bison, + flex, + readline, + ncurses, + gnused, +}: stdenv.mkDerivation rec { pname = "cdecl"; @@ -15,12 +24,18 @@ stdenv.mkDerivation rec { makeFlags="$makeFlags PREFIX=$out BINDIR=$out/bin MANDIR=$out/man1 CATDIR=$out/cat1 CC=$CC"; mkdir -p $out/bin; ''; - buildInputs = [bison flex readline ncurses]; + + buildInputs = [ + bison + flex + readline + ncurses + ]; meta = { description = "Translator English -- C/C++ declarations"; license = lib.licenses.publicDomain; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ sigmanificient ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 445ae1120707..16ed37cff807 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6612,8 +6612,6 @@ with pkgs; ccze = callPackage ../tools/misc/ccze { }; - cdecl = callPackage ../development/tools/cdecl { }; - cdi2iso = callPackage ../tools/cd-dvd/cdi2iso { }; cdist = python3Packages.callPackage ../tools/admin/cdist { }; From 3c966635624d73a0866e5e531e5d647cde0b7cf0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 03:17:29 +0000 Subject: [PATCH 051/209] unison: 2.53.4 -> 2.53.5 --- pkgs/by-name/un/unison/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/un/unison/package.nix b/pkgs/by-name/un/unison/package.nix index 9aeac3fa2d3e..f512d775ea8d 100644 --- a/pkgs/by-name/un/unison/package.nix +++ b/pkgs/by-name/un/unison/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "unison"; - version = "2.53.4"; + version = "2.53.5"; src = fetchFromGitHub { owner = "bcpierce00"; repo = "unison"; rev = "v${finalAttrs.version}"; - hash = "sha256-nFT6FjlQjh6qx0fepmT4aiQj2SxA7U/as+IU9xXNok0="; + hash = "sha256-XCdK38jG7tRI+/Zk72JVY8a/pPJF6KVaf8l2s3hgxLs="; }; strictDeps = true; From d528c4c934f4c9bb12b934bc1add073c80ab16a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 04:18:27 +0000 Subject: [PATCH 052/209] weasis: 4.3.0 -> 4.4.0 --- pkgs/by-name/we/weasis/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/we/weasis/package.nix b/pkgs/by-name/we/weasis/package.nix index 0637fea1c58f..ae500efec3fd 100644 --- a/pkgs/by-name/we/weasis/package.nix +++ b/pkgs/by-name/we/weasis/package.nix @@ -14,12 +14,12 @@ let in stdenv.mkDerivation rec { pname = "weasis"; - version = "4.3.0"; + version = "4.4.0"; # Their build instructions indicate to use the packaging script src = fetchzip { url = "https://github.com/nroduit/Weasis/releases/download/v${version}/weasis-native.zip"; - hash = "sha256-4Ew7RG8eM8pa6AiblREgt03fGOQVKVzkQMR87GIJIVM="; + hash = "sha256-+Bi9rTuM9osKzbKVA4exqsFm8p9+1OHgJqRSNnCC6QQ="; stripRoot = false; }; From de8d1617da6352748416b5b6317a552ebaad3310 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Tue, 7 May 2024 05:22:46 +0200 Subject: [PATCH 053/209] cdecl: major modernization refactor cdecl: add homepage and mainProgram cdecl: fix passthru.tests.x86_64-darwin --- pkgs/by-name/cd/cdecl/package.nix | 45 +++++++++++++++++++++---------- 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/cd/cdecl/package.nix b/pkgs/by-name/cd/cdecl/package.nix index 5bc045bc0edc..16412a52a370 100644 --- a/pkgs/by-name/cd/cdecl/package.nix +++ b/pkgs/by-name/cd/cdecl/package.nix @@ -1,29 +1,24 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, bison, flex, readline, ncurses, - gnused, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cdecl"; version = "2.5"; - src = fetchurl { - url = "https://www.cdecl.org/files/${pname}-blocks-${version}.tar.gz"; - sha256 = "1b7k0ra30hh8mg8fqv0f0yzkaac6lfg6n376drgbpxg4wwml1rly"; - }; - patches = [ ./cdecl-2.5-lex.patch ]; - preBuild = '' - ${gnused}/bin/sed 's/getline/cdecl_getline/g' -i cdecl.c; - makeFlagsArray=(CFLAGS="-DBSD -DUSE_READLINE -std=gnu89" LIBS=-lreadline); - makeFlags="$makeFlags PREFIX=$out BINDIR=$out/bin MANDIR=$out/man1 CATDIR=$out/cat1 CC=$CC"; - mkdir -p $out/bin; - ''; + src = fetchFromGitHub { + owner = "ridiculousfish"; + repo = "cdecl-blocks"; + # github repo has no tag, but the 2.5 version match this commit + rev = "cb130ea7e61df5b6fa1e84f996e3f04e21a0181c"; + hash = "sha256-lErAxTpPIT49QdOpdjM9e3Qyaajzc+iwv27B3XUFUuE="; + }; buildInputs = [ bison @@ -32,10 +27,32 @@ stdenv.mkDerivation rec { ncurses ]; + NIX_CFLAGS_COMPILE = "-DBSD -DUSE_READLINE -std=gnu89"; + NIX_LDFLAGS = "-lreadline"; + + makeFlags = [ + "CC=${stdenv.cc}/bin/cc" # otherwise fails on x86_64-darwin + "PREFIX=${placeholder "out"}" + "BINDIR=${placeholder "out"}/bin" + "MANDIR=${placeholder "out"}/man1" + "CATDIR=${placeholder "out"}/cat1" + ]; + + patches = [ ./cdecl-2.5-lex.patch ]; + prePatch = '' + substituteInPlace cdecl.c --replace 'getline' 'cdecl_getline' + ''; + + preInstall = '' + mkdir -p $out/bin; + ''; + meta = { description = "Translator English -- C/C++ declarations"; + homepage = "https://cdecl.org"; license = lib.licenses.publicDomain; maintainers = with lib.maintainers; [ sigmanificient ]; platforms = lib.platforms.unix; + mainProgram = "cdecl"; }; } From 791f78150c499bf4d342c61b4c34ed68c5e7053b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 05:15:16 +0000 Subject: [PATCH 054/209] cobang: 0.10.9 -> 0.12.0 --- pkgs/applications/misc/cobang/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cobang/default.nix b/pkgs/applications/misc/cobang/default.nix index 15db663db99e..999bc4e0cc89 100644 --- a/pkgs/applications/misc/cobang/default.nix +++ b/pkgs/applications/misc/cobang/default.nix @@ -24,14 +24,14 @@ buildPythonApplication rec { pname = "cobang"; - version = "0.10.9"; + version = "0.12.0"; pyproject = true; src = fetchFromGitHub { owner = "hongquan"; repo = "CoBang"; rev = "refs/tags/v${version}"; - hash = "sha256-xOP2XkmHOGMe50dn4StX/9veTdloLHq76ENWEUK4Keo="; + hash = "sha256-4INScFnYSwVnGjaohgDL3Sv/NeIwiiyLux8c9/Y/Wq4="; }; postPatch = '' From b3333e3e6032f52a7353400b9171a82f7d785657 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 05:59:48 +0000 Subject: [PATCH 055/209] beeper: 3.103.36 -> 3.104.7 --- .../networking/instant-messengers/beeper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/beeper/default.nix b/pkgs/applications/networking/instant-messengers/beeper/default.nix index 06e2a17d564e..2d70e6a75ea7 100644 --- a/pkgs/applications/networking/instant-messengers/beeper/default.nix +++ b/pkgs/applications/networking/instant-messengers/beeper/default.nix @@ -11,11 +11,11 @@ }: let pname = "beeper"; - version = "3.103.36"; + version = "3.104.7"; name = "${pname}-${version}"; src = fetchurl { - url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.103.36-build-240411hw9xbpc7s-x86_64.AppImage"; - hash = "sha256-qxu/a8eeWeOKCsno51J2IHUXTXH82KXBNajfoEkkid8="; + url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.104.7-build-2405024h1b4qoap-x86_64.AppImage"; + hash = "sha256-VjN9bKxFokExEjMGz42d/VVwVWJzowI42ONsNyXEbnc="; }; appimage = appimageTools.wrapType2 { inherit version pname src; From 1288e458b5af432ce35c1a689c2774dedebb29be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 08:30:49 +0000 Subject: [PATCH 056/209] codeium: 1.8.30 -> 1.8.32 --- pkgs/by-name/co/codeium/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/co/codeium/package.nix b/pkgs/by-name/co/codeium/package.nix index febeaa05b5d7..18cfe7b98b4a 100644 --- a/pkgs/by-name/co/codeium/package.nix +++ b/pkgs/by-name/co/codeium/package.nix @@ -13,10 +13,10 @@ let }.${system} or throwSystem; hash = { - x86_64-linux = "sha256-GAYwn2Epa5sT963e1Q7uOEBznSuE+5TV+Afr5ogCkSI="; - aarch64-linux = "sha256-EU++TsPV8kljhHv2e4NxhYThkLeSFK+xPqO0j+eM0Pw="; - x86_64-darwin = "sha256-/KlEyyC1jsQMQbO5xCO/6ONCTa/atwEnU71zUcroPIk="; - aarch64-darwin = "sha256-YQ5vNboYNT+uJa/8KiI812lGDfzuWJbA3ZzlzLpDqHY="; + x86_64-linux = "sha256-60wg6DspTyYFVuGjNld5Wb9if51EEXNPNR1wHbomKmY="; + aarch64-linux = "sha256-F8MQEoRJ3xYq6sEQNWx9DpLbbxT3lBd/PufPt7l5Bi4="; + x86_64-darwin = "sha256-Sz4AT5yGPTIQyzNF6+Ku4pSmMkbHMtCRDRHn9Q5EQ28="; + aarch64-darwin = "sha256-4Xatp0ZvRfgCxMME9CrhkZiTwrH4OjF8+E7IV95QH70="; }.${system} or throwSystem; bin = "$out/bin/codeium_language_server"; @@ -24,7 +24,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "codeium"; - version = "1.8.30"; + version = "1.8.32"; src = fetchurl { name = "${finalAttrs.pname}-${finalAttrs.version}.gz"; url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz"; From 0a2e184b495bd6ee88fcfbf5aa9cd4cdf72ff516 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 12:19:47 +0000 Subject: [PATCH 057/209] _0xpropo: 1.000 -> 1.100 --- pkgs/by-name/_0/_0xpropo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/_0/_0xpropo/package.nix b/pkgs/by-name/_0/_0xpropo/package.nix index 74bf73cf935f..200e9758f778 100644 --- a/pkgs/by-name/_0/_0xpropo/package.nix +++ b/pkgs/by-name/_0/_0xpropo/package.nix @@ -5,14 +5,14 @@ }: stdenvNoCC.mkDerivation rec { pname = "0xpropo"; - version = "1.000"; + version = "1.100"; src = let underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in fetchzip { url = "https://github.com/0xType/0xPropo/releases/download/${version}/0xPropo_${underscoreVersion}.zip"; - hash = "sha256-yIhabwHjBipkcmsSRaokBXCbawQkUNOU8v+fbn2iiY4="; + hash = "sha256-ZlZNvn9xiOxS+dfGI1rGbh6XlXo3/puAm2vhKh63sK4="; }; installPhase = '' From ef1c2ae6c668fac72415c1a88117f6ed3a4ad808 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 12:20:21 +0000 Subject: [PATCH 058/209] appflowy: 0.5.5 -> 0.5.6 --- pkgs/applications/office/appflowy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index 33783ed01b4b..fa400eccc9d3 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "appflowy"; - version = "0.5.5"; + version = "0.5.6"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-${version}-linux-x86_64.tar.gz"; - hash = "sha256-sDA//ARuzU0q2V3jhFXGhaQaeF0jsDRbtdHCBTgIL8U="; + hash = "sha256-6eolLBWVpnEvjA+C6R5gpkxG/G59atrkwOP7CWhs7oI="; stripRoot = false; }; From c5f4f7823940379c67836ad3054197de7df09780 Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Tue, 7 May 2024 20:39:15 +0800 Subject: [PATCH 059/209] home-assistant-custom-lovelace-modules.zigbee2mqtt-networkmap: unstable-2023-12-16 -> 0.9.0 Changelog: https://github.com/azuwis/zigbee2mqtt-networkmap/releases/tag/v0.9.0 - Format using nixfmt-rfc-style - Add passthru.updateScript - Add meta.changelog --- .../zigbee2mqtt-networkmap/default.nix | 19 +++++++++++-------- .../zigbee2mqtt-networkmap/update.sh | 9 +++++++++ 2 files changed, 20 insertions(+), 8 deletions(-) create mode 100755 pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/update.sh diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/default.nix index f8e75ede0156..8de17253e000 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/default.nix @@ -1,25 +1,26 @@ -{ lib -, fetchFromGitHub -, fetchYarnDeps -, mkYarnPackage +{ + lib, + fetchFromGitHub, + fetchYarnDeps, + mkYarnPackage, }: mkYarnPackage rec { pname = "zigbee2mqtt-networkmap"; - version = "unstable-2023-12-16"; + version = "0.9.0"; src = fetchFromGitHub { owner = "azuwis"; repo = "zigbee2mqtt-networkmap"; - rev = "7851357d78ebc0d1cc3cb5c661267a1e8b4c09e3"; - hash = "sha256-x7RVy0stWT6+8f0/0VORVBgGpBbsbyJBC38xIxXhzos="; + rev = "v${version}"; + hash = "sha256-K4DyrurC4AzzJCcB4CS9UlQbUQSWpR7PevA2JFFMRZM="; }; packageJSON = ./package.json; offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-s+vnyUeJKkkA5G0AmsfIG0Zh4bYdDc2B5MSNvdwhjgs="; + hash = "sha256-h/5TWaIg8AfY6I/JBRmUF6yCCbxCMs9nRECWEaaK2to="; }; configurePhase = '' @@ -49,8 +50,10 @@ mkYarnPackage rec { doDist = false; passthru.entrypoint = "zigbee2mqtt-networkmap.js"; + passthru.updateScript = ./update.sh; meta = with lib; { + changelog = "https://github.com/azuwis/zigbee2mqtt-networkmap/releases/tag/v${version}"; description = "Home Assistant Custom Card to show Zigbee2mqtt network map"; homepage = "https://github.com/azuwis/zigbee2mqtt-networkmap"; maintainers = with maintainers; [ azuwis ]; diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/update.sh b/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/update.sh new file mode 100755 index 000000000000..b2675bc5c3d9 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/update.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix-update + +set -xe + +dirname="$(dirname "$0")" + +# nix-update picks the wrong file `pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix` +nix-update --override-filename "$dirname/default.nix" home-assistant-custom-lovelace-modules.zigbee2mqtt-networkmap From be0140e44e6ecf9d431f6c2ba4486b43b8f8b6a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 15:03:35 +0000 Subject: [PATCH 060/209] svd2rust: 0.33.1 -> 0.33.2 --- pkgs/development/tools/rust/svd2rust/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix index 260809a5c9bf..b9b76e915b5a 100644 --- a/pkgs/development/tools/rust/svd2rust/default.nix +++ b/pkgs/development/tools/rust/svd2rust/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "svd2rust"; - version = "0.33.1"; + version = "0.33.2"; src = fetchCrate { inherit pname version; - hash = "sha256-omAL/nRdB5wngOQTaZdnq9XaPnDj6kxda+27TQS7dUQ="; + hash = "sha256-4qwRBJNbPkqEHrRY67wgxtmVLzaVkCSvvMc8gKPblew="; }; - cargoHash = "sha256-YmnKZhGDQ+eqHy/KQxp3ZdCxKrZEKcS2R+5/t6HhOCg="; + cargoHash = "sha256-5NGW9uTemoHWvrhz06suVXzjZ48pk+jN6DUkdzIXT5k="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' From feb804804e5db722817f7f5bd63cda556094d8fe Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Tue, 7 May 2024 17:25:08 +0200 Subject: [PATCH 061/209] slumber: fix darwin build --- pkgs/by-name/sl/slumber/package.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sl/slumber/package.nix b/pkgs/by-name/sl/slumber/package.nix index 32fc52be0d9b..3a01367689d4 100644 --- a/pkgs/by-name/sl/slumber/package.nix +++ b/pkgs/by-name/sl/slumber/package.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + darwin, +}: rustPlatform.buildRustPackage rec { pname = "slumber"; version = "1.1.0"; @@ -14,12 +20,13 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-AK/+1tCdvNucIbxwyqOt/TbOaJPVDOKFEx5NqW2Yd4U="; + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; + meta = with lib; { description = "Terminal-based HTTP/REST client"; homepage = "https://slumber.lucaspickering.me"; license = licenses.mit; mainProgram = "slumber"; maintainers = with maintainers; [ javaes ]; - broken = stdenv.isDarwin || stdenv.isAarch64; }; } From cdc46168b4176f82e0bb9d7404f038ad050d73cf Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Tue, 7 May 2024 12:31:21 -0300 Subject: [PATCH 062/209] github: add k3s label --- .github/labeler.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/labeler.yml b/.github/labeler.yml index b88f7f5179ec..57086953f8d0 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -113,6 +113,14 @@ - pkgs/applications/editors/jupyter-kernels/**/* - pkgs/applications/editors/jupyter/**/* +"6.topic: k3s": + - any: + - changed-files: + - any-glob-to-any-file: + - nixos/modules/services/cluster/k3s/**/* + - nixos/tests/k3s/**/* + - pkgs/applications/networking/cluster/k3s/**/* + "6.topic: kernel": - any: - changed-files: From 71fa21072f971b2c6f7c234d7717f7786602320b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 16:59:57 +0000 Subject: [PATCH 063/209] python311Packages.nocasedict: 2.0.1 -> 2.0.3 --- pkgs/development/python-modules/nocasedict/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nocasedict/default.nix b/pkgs/development/python-modules/nocasedict/default.nix index 9d727ec0ecba..eb9677438e62 100644 --- a/pkgs/development/python-modules/nocasedict/default.nix +++ b/pkgs/development/python-modules/nocasedict/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "nocasedict"; - version = "2.0.1"; + version = "2.0.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-lgy2mfEgnagKw546tQqnNC/oyp9wYGwjRHpRBVBDXlA="; + hash = "sha256-HJImx/WoqXrVHcsK4xV6cg4/fLnEVo0i6joF4/hWWKk="; }; propagatedBuildInputs = [ From d4ad55d495115fd2408c6e456a6961649da2b3c6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 17:00:12 +0000 Subject: [PATCH 064/209] pocketbase: 0.22.10 -> 0.22.11 --- pkgs/servers/pocketbase/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix index b4dd0f5f80a9..5743771c9016 100644 --- a/pkgs/servers/pocketbase/default.nix +++ b/pkgs/servers/pocketbase/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.22.10"; + version = "0.22.11"; src = fetchFromGitHub { owner = "pocketbase"; repo = "pocketbase"; rev = "v${version}"; - hash = "sha256-4mx2jIAEkzeaSWISKspeEFH7DT8qcuaZfEiEvXTQgYs="; + hash = "sha256-PYaAZRD7MPq2+bWqjkX0UrfFG9Er5Isfkm67GY8TO0U="; }; - vendorHash = "sha256-ZjnUw35ag9UIxS3fqwDCrdehTtM0VqjyHRAvbzNFF48="; + vendorHash = "sha256-M7UWOUKenXfzro0fcXjT5MGnUcWeiuaLd7GznU81SCA="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; From 4cf3f1042b229283ac1295edbfd823dc69d334da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 17:45:54 +0000 Subject: [PATCH 065/209] python311Packages.pytest-playwright: 0.4.4 -> 0.5.0 --- pkgs/development/python-modules/pytest-playwright/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-playwright/default.nix b/pkgs/development/python-modules/pytest-playwright/default.nix index df1045a19955..4c52a882988d 100644 --- a/pkgs/development/python-modules/pytest-playwright/default.nix +++ b/pkgs/development/python-modules/pytest-playwright/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pytest-playwright"; - version = "0.4.4"; + version = "0.5.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "playwright-pytest"; rev = "refs/tags/v${version}"; - hash = "sha256-jCK2i27wRGsv65zfzW+Ef72HNQd4Qu/Mw3HX66ZMQ9Y="; + hash = "sha256-HS0Qpr5R4dAoXe0bpPGU7JABB7CmwugReRD75XeJ8l4="; }; nativeBuildInputs = [ From 3869e9479ca69103d363b11f2293cb9b7353f7a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 17:51:57 +0000 Subject: [PATCH 066/209] python311Packages.mkdocs-git-revision-date-localized-plugin: 1.2.4 -> 1.2.5 --- .../mkdocs-git-revision-date-localized-plugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix b/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix index c885727a2538..0a76166dd406 100644 --- a/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix +++ b/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mkdocs-git-revision-date-localized-plugin"; - version = "1.2.4"; + version = "1.2.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "timvink"; repo = "mkdocs-git-revision-date-localized-plugin"; rev = "refs/tags/v${version}"; - hash = "sha256-sN3cuRjB3zkwp0xYoH20IJ8edXqi5rw66e3N4DuNqVU="; + hash = "sha256-cezL65Wsdaa9W4dGLgTz1x3UFrDRDJaGuttr58CBcuw="; }; propagatedBuildInputs = [ From cb372e92c85e1b5908e2a1bb192407db0b8cd245 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 18:58:29 +0000 Subject: [PATCH 067/209] changedetection-io: 0.45.21 -> 0.45.22 --- pkgs/servers/web-apps/changedetection-io/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/changedetection-io/default.nix b/pkgs/servers/web-apps/changedetection-io/default.nix index c5bac2fa3d90..4aa7455aa209 100644 --- a/pkgs/servers/web-apps/changedetection-io/default.nix +++ b/pkgs/servers/web-apps/changedetection-io/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "changedetection-io"; - version = "0.45.21"; + version = "0.45.22"; format = "setuptools"; src = fetchFromGitHub { owner = "dgtlmoon"; repo = "changedetection.io"; rev = "refs/tags/${version}"; - hash = "sha256-v+bjGIwJlHcim29BRR+5kZABnmtLYSS/U3pbPnCvAhU="; + hash = "sha256-q8Cflu5rYmV//l0MGM4LOep5v/tEHYm2u0A1E5k9kLk="; }; postPatch = '' From 960558fccd6616872a2d448f2a25abadae171e2f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 19:15:42 +0000 Subject: [PATCH 068/209] instawow: 4.1.1 -> 4.2.0 --- pkgs/games/instawow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/instawow/default.nix b/pkgs/games/instawow/default.nix index 02daa3207837..28abc90473ad 100644 --- a/pkgs/games/instawow/default.nix +++ b/pkgs/games/instawow/default.nix @@ -2,14 +2,14 @@ python3.pkgs.buildPythonApplication rec { pname = "instawow"; - version = "4.1.1"; + version = "4.2.0"; pyproject = true; src = fetchFromGitHub { owner = "layday"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-RRBuFja5vejzjrtOvRBIjT7sq/Wg/39FA/o9O8c2B0o="; + sha256 = "sha256-eHydxQxqHKTBrhiPl8coMNYYr7gNfKF4Tf8clbiq2HE="; }; extras = [ ]; # Disable GUI, most dependencies are not packaged. From a245bd249c6ebccb136aca71f356f87f287e0478 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Tue, 7 May 2024 12:28:41 -0700 Subject: [PATCH 069/209] signalbackup-tools: 20240504 -> 20240506 Diff: https://github.com/bepaald/signalbackup-tools/compare/20240504...20240506 --- .../instant-messengers/signalbackup-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index e1e3f83d05d5..08bf8397c938 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20240504"; + version = "20240506"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-ojV/taYV5J4nHfDg//lJ78ltJv7nIG1H9iXo95nA/n8="; + hash = "sha256-rPM5Qz1n9bTOF//sqpT+LvEjBSCT2BjyQBIxjV6CkGU="; }; postPatch = '' From 1fe57eb30e5bcdead559572613895c0468201846 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 21:38:06 +0000 Subject: [PATCH 070/209] supabase-cli: 1.164.1 -> 1.166.2 --- pkgs/development/tools/supabase-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/supabase-cli/default.nix b/pkgs/development/tools/supabase-cli/default.nix index cd2f0bacc96e..0ffe6d98e6d7 100644 --- a/pkgs/development/tools/supabase-cli/default.nix +++ b/pkgs/development/tools/supabase-cli/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "supabase-cli"; - version = "1.164.1"; + version = "1.166.2"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - hash = "sha256-VbJ/A+ohPCVf2DxODK79Va8coHMGlJBkQoSEcUvlr6Q="; + hash = "sha256-QytOsrFSRHyYX9nq3pttKwjH7XbRHrzoLO3pJnd0U5Q="; }; - vendorHash = "sha256-mD0EmYwxCOrKcudJLr56p/bmM0uufNn4MgFTHTSa/ec="; + vendorHash = "sha256-6dDI3zFZgjDbbvaAEmjzurJ1obFoxMfakmrOewR4qdo="; ldflags = [ "-s" From 2a272110dc2da2ccea8012b6288a1d7d4ba7e85c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 May 2024 00:43:36 +0000 Subject: [PATCH 071/209] go2tv: 1.15.0 -> 1.16.0 --- pkgs/applications/video/go2tv/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/go2tv/default.nix b/pkgs/applications/video/go2tv/default.nix index d8fc548f10b3..df2300150e4d 100644 --- a/pkgs/applications/video/go2tv/default.nix +++ b/pkgs/applications/video/go2tv/default.nix @@ -14,16 +14,16 @@ buildGoModule rec { pname = "go2tv" + lib.optionalString (!withGui) "-lite"; - version = "1.15.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "alexballas"; repo = "go2tv"; rev = "v${version}"; - sha256 = "sha256-5GOhTDlUpzInMm8hVcBjbf1CXRw2GQITRtj6UaxYHtE="; + sha256 = "sha256-ZP4ZpNc5l4Acw83Q4rSvPYByvgiKpkbxxu0bseivW58="; }; - vendorHash = null; + vendorHash = "sha256-na79rF/9o+s6E4i08Ocs6u98IABc19sTGFvjI6yeJFo="; nativeBuildInputs = [ pkg-config ]; From 6c37b42a92b68e52d78e2b328c28d3b8f6cd5c59 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 May 2024 01:21:51 +0000 Subject: [PATCH 072/209] gittuf: 0.3.0 -> 0.4.0 --- pkgs/by-name/gi/gittuf/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/gittuf/package.nix b/pkgs/by-name/gi/gittuf/package.nix index 8b7e9063f7ab..3d33fdbae07a 100644 --- a/pkgs/by-name/gi/gittuf/package.nix +++ b/pkgs/by-name/gi/gittuf/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gittuf"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "gittuf"; repo = pname; rev = "v${version}"; - hash = "sha256-lECvgagcqBS+BVD296e6WjjSCA3vI0nfLzpLTi/7N0I="; + hash = "sha256-BXqxVtdxUbcl2cK4kYEBZIbMCKOjPvuoTnDh8L6+mO8="; }; - vendorHash = "sha256-UKhXbZXKNtMnQe7sHBOmzzXGBHuDTYeZGKnteZirskA="; + vendorHash = "sha256-yRUgtUeoTthxSGZ6VX/MOVeY0NUXq0Nf+XlysHqcpWw="; ldflags = [ "-X github.com/gittuf/gittuf/internal/version.gitVersion=${version}" ]; From d2f88e1a0c9b4f4760bc42d94d75d06043dec1ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 May 2024 01:43:20 +0000 Subject: [PATCH 073/209] i2p: 2.5.0 -> 2.5.1 --- pkgs/by-name/i2/i2p/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/i2/i2p/package.nix b/pkgs/by-name/i2/i2p/package.nix index 0c659755ee4e..7f1cfb025558 100644 --- a/pkgs/by-name/i2/i2p/package.nix +++ b/pkgs/by-name/i2/i2p/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "i2p"; - version = "2.5.0"; + version = "2.5.1"; src = fetchzip { urls = [ @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { "https://files.i2p-projekt.de/" "https://download.i2p2.no/releases/" ]); - hash = "sha256-mGBt2BrHU2ETV3jRay5tEpMJEO3b3K6BlBjYZNedtEA="; + hash = "sha256-38kG0UyU1ngVdUb/H5tIuG3p+bsvJznjervDh3TWoGo="; }; strictDeps = true; From e7118994b994adf06507041c2cf88c6e91ab453b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 May 2024 02:25:51 +0000 Subject: [PATCH 074/209] libgbinder: 1.1.38 -> 1.1.39 --- pkgs/development/libraries/libgbinder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgbinder/default.nix b/pkgs/development/libraries/libgbinder/default.nix index 3f30a443e094..cfdfd7482b42 100644 --- a/pkgs/development/libraries/libgbinder/default.nix +++ b/pkgs/development/libraries/libgbinder/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libgbinder"; - version = "1.1.38"; + version = "1.1.39"; src = fetchFromGitHub { owner = "mer-hybris"; repo = pname; rev = version; - sha256 = "sha256-k5oCwi1KvyRVawH0d4Kp+MCxkymAtl6zVk7DVRXFVMg="; + sha256 = "sha256-O+Fg6NtWdBe0k+XhE/h62C1tvC6Y1BQZWva63sXJDfY="; }; outputs = [ "out" "dev" ]; From 83089a1a1c2274bb1ffb8fa4288d20e199afb583 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 May 2024 06:40:27 +0000 Subject: [PATCH 075/209] wasm-tools: 1.206.0 -> 1.207.0 --- pkgs/tools/misc/wasm-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/wasm-tools/default.nix b/pkgs/tools/misc/wasm-tools/default.nix index 529815b12ec4..d928b723943c 100644 --- a/pkgs/tools/misc/wasm-tools/default.nix +++ b/pkgs/tools/misc/wasm-tools/default.nix @@ -5,19 +5,19 @@ rustPlatform.buildRustPackage rec { pname = "wasm-tools"; - version = "1.206.0"; + version = "1.207.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-dRCPur2EmEF5GV4PWSWAKIE+A9KfW2FbnUJVdXct3aA="; + hash = "sha256-Q2WLvAjZ0UQyIgVen4QuEtef1MJvhKLMlj8RYYoJuVQ="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-M3wtgvZWWTlB1mmyLJNHBXwVMc5b61ie/RmSGn1ow9U="; + cargoHash = "sha256-VHHtwP9LPmG0MHpv/1mf4LntTuBeDHhPA4gqz5mhlpg="; cargoBuildFlags = [ "--package" "wasm-tools" ]; cargoTestFlags = [ "--all" ]; From 8d5ef6f5e94e2d3e53e458568afeeb653560170d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 May 2024 08:56:19 +0000 Subject: [PATCH 076/209] libglibutil: 1.0.77 -> 1.0.79 --- pkgs/development/libraries/libglibutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libglibutil/default.nix b/pkgs/development/libraries/libglibutil/default.nix index 66fa722573fd..d96b3505bcb9 100644 --- a/pkgs/development/libraries/libglibutil/default.nix +++ b/pkgs/development/libraries/libglibutil/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libglibutil"; - version = "1.0.77"; + version = "1.0.79"; src = fetchFromGitHub { owner = "sailfishos"; repo = pname; rev = version; - sha256 = "sha256-SLpyQsRl7yfCAgK3udSSQo8OZOf6FRCzFKIDDUKg1gs="; + sha256 = "sha256-UJsKjvigZuwDL4DyjUE6fXEecgoHrTE+5pO0hVyCwP4="; }; outputs = [ "out" "dev" ]; From e854824e7e68d2b1011535d6efdcb7b5041b0cbb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 11:08:11 +0200 Subject: [PATCH 077/209] python312Packages.aiomisc: 17.5.6 -> 17.5.15 Changelog: https://github.com/aiokitchen/aiomisc/blob/master/CHANGELOG.md --- pkgs/development/python-modules/aiomisc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiomisc/default.nix b/pkgs/development/python-modules/aiomisc/default.nix index 9182859bb90e..47a702ddf083 100644 --- a/pkgs/development/python-modules/aiomisc/default.nix +++ b/pkgs/development/python-modules/aiomisc/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "aiomisc"; - version = "17.5.6"; + version = "17.5.15"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-oq4z+ULN6VYkXX4Oz/JqKZSIh55AHOxFJVLyaNGqaNA="; + hash = "sha256-tfJm0W20UeuWIrihXpEmbiX5+Zs1ASIzJbhjodLdctI="; }; build-system = [ poetry-core ]; From 56dbd3cf56e3a7484a505aae238848cc86a006cc Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Wed, 8 May 2024 12:00:50 +0200 Subject: [PATCH 078/209] opencomposite: use unstableGitUpdater Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/op/opencomposite/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/opencomposite/package.nix b/pkgs/by-name/op/opencomposite/package.nix index dff4e5988cda..cb6e6f8213cf 100644 --- a/pkgs/by-name/op/opencomposite/package.nix +++ b/pkgs/by-name/op/opencomposite/package.nix @@ -12,7 +12,7 @@ , vulkan-loader , xorg -, nix-update-script +, unstableGitUpdater }: stdenv.mkDerivation { @@ -52,8 +52,9 @@ stdenv.mkDerivation { runHook postInstall ''; - passthru.updateScript = nix-update-script { - extraArgs = [ "--version=branch=openxr" ]; + passthru.updateScript = unstableGitUpdater { + hardcodeZeroVersion = true; + branch = "openxr"; }; meta = with lib; { From 9a03c6630002b4c35647daa65ee1d681159d5fd1 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Wed, 8 May 2024 12:03:24 +0200 Subject: [PATCH 079/209] opencomposite: unstable-2024-03-04 -> 0-unstable-2024-05-08 Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/op/opencomposite/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/opencomposite/package.nix b/pkgs/by-name/op/opencomposite/package.nix index cb6e6f8213cf..8e58c90dfdf6 100644 --- a/pkgs/by-name/op/opencomposite/package.nix +++ b/pkgs/by-name/op/opencomposite/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation { pname = "opencomposite"; - version = "unstable-2024-03-04"; + version = "0-unstable-2024-05-08"; src = fetchFromGitLab { owner = "znixian"; repo = "OpenOVR"; - rev = "1bfdf67358add5f573efedbec1fa65d18b790e0e"; - hash = "sha256-qF5oMI9B5a1oE2gQb/scbom/39Efccja0pTPHHaHMA8="; + rev = "5ddd6024efafa82c7a432c9dd8a67e3d5c3f9b38"; + hash = "sha256-m6Xhi6xlDWiVqtYyxpQP2vp5JsB2EKsoXkmd0IYtPQ8="; }; nativeBuildInputs = [ From bf952f3388e4410db2357e2891447b09dbbf2942 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 May 2024 11:08:06 +0000 Subject: [PATCH 080/209] offat: 0.17.3 -> 0.17.5 --- pkgs/by-name/of/offat/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/of/offat/package.nix b/pkgs/by-name/of/offat/package.nix index 6bdd5e507b71..029fab3da789 100644 --- a/pkgs/by-name/of/offat/package.nix +++ b/pkgs/by-name/of/offat/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "offat"; - version = "0.17.3"; + version = "0.17.5"; pyproject = true; src = fetchFromGitHub { owner = "OWASP"; repo = "OFFAT"; rev = "refs/tags/v${version}"; - hash = "sha256-q9xqtJJ9R81tNvd5Z6S4OWMqDwVoijntw2LOXldVy0E="; + hash = "sha256-61VJPsmSvKZKBWQNl7klqZqFjEjhM3n4LuafZh4d6g4="; }; sourceRoot = "${src.name}/src"; From 9c8328d342224e0c912105470c5928182d1435f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 May 2024 11:11:22 +0000 Subject: [PATCH 081/209] _64gram: 1.1.19 -> 1.1.22 --- pkgs/by-name/_6/_64gram/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/_6/_64gram/package.nix b/pkgs/by-name/_6/_64gram/package.nix index 8db36cf9abf5..0cf62f11f3f3 100644 --- a/pkgs/by-name/_6/_64gram/package.nix +++ b/pkgs/by-name/_6/_64gram/package.nix @@ -7,7 +7,7 @@ telegram-desktop.overrideAttrs (old: rec { pname = "64gram"; - version = "1.1.19"; + version = "1.1.22"; src = fetchFromGitHub { owner = "TDesktop-x64"; @@ -15,7 +15,7 @@ telegram-desktop.overrideAttrs (old: rec { rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-9QCh7/eNPWqsOF+cjO61EnqqhAdy6+4UxZhWjfJc5gQ="; + hash = "sha256-Fhix+kCqUTr9qGMzDc2undxmhjmM6fPorZebeqXNHHE="; }; passthru.updateScript = nix-update-script {}; From 7f16302d55f9a2849bcb0859417828f1cfb85812 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 May 2024 11:27:50 +0000 Subject: [PATCH 082/209] json-schema-for-humans: 0.47 -> 1.0.1 --- .../python-modules/json-schema-for-humans/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix index f758ae924496..de8f63fea748 100644 --- a/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "json-schema-for-humans"; - version = "0.47"; + version = "1.0.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "coveooss"; repo = "json-schema-for-humans"; rev = "refs/tags/v${version}"; - hash = "sha256-yioYsCp+q5YWdIWDlNZkpaLqo++n+dV5jyEeIhUDHr4="; + hash = "sha256-ZlGIttfFOL4uLgzXIFvmyFDGrm8/Vr94QaFSn4/5ITI="; }; pythonRelaxDeps = [ From 87c3037e4ffb28f05aa6d3a3cf1ce546415f53e8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 May 2024 11:53:30 +0000 Subject: [PATCH 083/209] dart-sass: 1.75.0 -> 1.77.0 --- .../tools/misc/dart-sass/default.nix | 8 +-- .../tools/misc/dart-sass/pubspec.lock.json | 60 +++++++++---------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/pkgs/development/tools/misc/dart-sass/default.nix b/pkgs/development/tools/misc/dart-sass/default.nix index 6ca7e8f43987..6262260326ef 100644 --- a/pkgs/development/tools/misc/dart-sass/default.nix +++ b/pkgs/development/tools/misc/dart-sass/default.nix @@ -10,24 +10,24 @@ }: let - embedded-protocol-version = "2.6.0"; + embedded-protocol-version = "2.7.0"; embedded-protocol = fetchFromGitHub { owner = "sass"; repo = "sass"; rev = "refs/tags/embedded-protocol-${embedded-protocol-version}"; - hash = "sha256-pNQnbOKVxRW9AiPteuO2Gq6ejV5Yd9GTuxZSyC/0SlE="; + hash = "sha256-BQCQ4GE85teRkCY2iuvqFT4vyf6RzZ1ztoRhBCAwA4w="; }; in buildDartApplication rec { pname = "dart-sass"; - version = "1.75.0"; + version = "1.77.0"; src = fetchFromGitHub { owner = "sass"; repo = pname; rev = version; - hash = "sha256-nj1CCg/eID5dmW/omIGQYNP/uOKNvMzgo3RLBGLULKI="; + hash = "sha256-x42T8nDmwktfsd89PS8jrSIw2Dc1hKwrZxSn7h7FqAs="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; diff --git a/pkgs/development/tools/misc/dart-sass/pubspec.lock.json b/pkgs/development/tools/misc/dart-sass/pubspec.lock.json index dc96a67bd282..a3f10f435ae1 100644 --- a/pkgs/development/tools/misc/dart-sass/pubspec.lock.json +++ b/pkgs/development/tools/misc/dart-sass/pubspec.lock.json @@ -24,11 +24,11 @@ "dependency": "direct dev", "description": { "name": "archive", - "sha256": "22600aa1e926be775fa5fe7e6894e7fb3df9efda8891c73f70fb3262399a432d", + "sha256": "ecf4273855368121b1caed0d10d4513c7241dfc813f7d3c8933b36622ae9b265", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.4.10" + "version": "3.5.1" }, "args": { "dependency": "direct main", @@ -134,11 +134,11 @@ "dependency": "transitive", "description": { "name": "coverage", - "sha256": "8acabb8306b57a409bf4c83522065672ee13179297a6bb0cb9ead73948df7c76", + "sha256": "3945034e86ea203af7a056d98e98e42a5518fff200d6e8e6647e1886b07e936e", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.7.2" + "version": "1.8.0" }, "crypto": { "dependency": "direct dev", @@ -314,11 +314,11 @@ "dependency": "transitive", "description": { "name": "json_annotation", - "sha256": "b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.8.1" + "version": "4.9.0" }, "lints": { "dependency": "direct dev", @@ -364,11 +364,11 @@ "dependency": "direct main", "description": { "name": "meta", - "sha256": "25dfcaf170a0190f47ca6355bdd4552cb8924b430512ff0cafb8db9bd41fe33b", + "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.14.0" + "version": "1.15.0" }, "mime": { "dependency": "transitive", @@ -384,11 +384,11 @@ "dependency": "transitive", "description": { "name": "native_stack_traces", - "sha256": "c797830b9910d13b0f4e70ddef15cde034214fe3bdb8092c4ea5ffad2f74013f", + "sha256": "64d2f4bcf3b69326fb9bc91b4dd3a06f94bb5bbc3a65e25ae6467ace0b34bfd3", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.6" + "version": "0.5.7" }, "native_synchronization": { "dependency": "direct main", @@ -460,16 +460,6 @@ "source": "hosted", "version": "6.0.2" }, - "pointycastle": { - "dependency": "transitive", - "description": { - "name": "pointycastle", - "sha256": "70fe966348fe08c34bf929582f1d8247d9d9408130723206472b4687227e4333", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.8.0" - }, "pool": { "dependency": "direct main", "description": { @@ -594,11 +584,11 @@ "dependency": "transitive", "description": { "name": "shelf_web_socket", - "sha256": "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1", + "sha256": "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.4" + "version": "2.0.0" }, "source_map_stack_trace": { "dependency": "transitive", @@ -684,11 +674,11 @@ "dependency": "direct dev", "description": { "name": "test", - "sha256": "d87214d19fb311997d8128ec501a980f77cb240ac4e7e219accf452813ff473c", + "sha256": "d11b55850c68c1f6c0cf00eabded4e66c4043feaf6c0d7ce4a36785137df6331", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.25.3" + "version": "1.25.5" }, "test_api": { "dependency": "transitive", @@ -704,11 +694,11 @@ "dependency": "transitive", "description": { "name": "test_core", - "sha256": "2236f70be1e5ab405c675e88c36935a87dad9e05a506b57dd5c0f617f5aebcb2", + "sha256": "4d070a6bc36c1c4e89f20d353bfd71dc30cdf2bd0e14349090af360a029ab292", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.1" + "version": "0.6.2" }, "test_descriptor": { "dependency": "direct dev", @@ -764,11 +754,11 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "a75f83f14ad81d5fe4b3319710b90dec37da0e22612326b696c9e1b8f34bbf48", + "sha256": "7475cb4dd713d57b6f7464c0e13f06da0d535d8b2067e188962a59bac2cf280b", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.2.0" + "version": "14.2.2" }, "watcher": { "dependency": "direct main", @@ -790,15 +780,25 @@ "source": "hosted", "version": "0.5.1" }, + "web_socket": { + "dependency": "transitive", + "description": { + "name": "web_socket", + "sha256": "bfe704c186c6e32a46f6607f94d079cd0b747b9a489fceeecc93cd3adb98edd5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.3" + }, "web_socket_channel": { "dependency": "transitive", "description": { "name": "web_socket_channel", - "sha256": "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42", + "sha256": "a2d56211ee4d35d9b344d9d4ce60f362e4f5d1aafb988302906bd732bc731276", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.5" + "version": "3.0.0" }, "webkit_inspection_protocol": { "dependency": "transitive", From c443d4016e968ea94ed0c189d1204769e8772af5 Mon Sep 17 00:00:00 2001 From: jacobi petrucciani Date: Wed, 8 May 2024 08:04:06 -0400 Subject: [PATCH 084/209] python312Packages.gamble: fix build to use poetry --- .../python-modules/gamble/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/gamble/default.nix b/pkgs/development/python-modules/gamble/default.nix index c4bb32027102..171eb03a7529 100644 --- a/pkgs/development/python-modules/gamble/default.nix +++ b/pkgs/development/python-modules/gamble/default.nix @@ -1,22 +1,29 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pytestCheckHook , pythonOlder +, poetry-core }: buildPythonPackage rec { pname = "gamble"; version = "0.13"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-P0w1Q1Kus742Yu/MpqheEbp1+Pt21f163JWZfKJj3SA="; + src = fetchFromGitHub { + owner = "jpetrucciani"; + repo = "gamble"; + rev = "refs/tags/${version}"; + hash = "sha256-eHosY/JfJr317S7WI8phy7DNHf3cZzs6c5MMfw7yzAE="; }; + build-system = [ + poetry-core + ]; + nativeCheckInputs = [ pytestCheckHook ]; From 30f3c4f8103b254a2ac674aa22b4136252beb23f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 May 2024 13:33:53 +0000 Subject: [PATCH 085/209] cozette: 1.23.2 -> 1.24.0 --- pkgs/data/fonts/cozette/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/cozette/default.nix b/pkgs/data/fonts/cozette/default.nix index 4e052cdf3c97..e1f6e57c8982 100644 --- a/pkgs/data/fonts/cozette/default.nix +++ b/pkgs/data/fonts/cozette/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "cozette"; - version = "1.23.2"; + version = "1.24.0"; src = fetchzip { url = "https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts-v-${builtins.replaceStrings ["."] ["-"] version}.zip"; - hash = "sha256-v1UWrVx1PnNPiFtMMy4kOkIe//iHxx0LOA4nHo95Zws="; + hash = "sha256-BA3pVcqZnakoYhF00OqDzo4GwRB5txGKN/ou2EvadWo="; }; installPhase = '' From 0050395076567966aee29cc70f1dd4e85d9f450a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 May 2024 14:08:59 +0000 Subject: [PATCH 086/209] fastly: 10.8.10 -> 10.9.0 --- pkgs/misc/fastly/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix index 712a28782af7..36e24bfe1226 100644 --- a/pkgs/misc/fastly/default.nix +++ b/pkgs/misc/fastly/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "fastly"; - version = "10.8.10"; + version = "10.9.0"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-AUseetBbr4phJJZe0qh9vXeNX7IwFGhgm+uGCbVWx5s="; + hash = "sha256-KdgloTp/mlkPJpjqYJk4Wa7fhgIuwFpAkeIKNxwTfFk="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -33,7 +33,7 @@ buildGoModule rec { "cmd/fastly" ]; - vendorHash = "sha256-L9U2MN7b2AU3fQSBKhF2Q6p7eN95bQGV0u9c0C6/yx0="; + vendorHash = "sha256-gjk+igFRVauDRC44YrZUB6uDNAfqnjDcqDPcAWUBhkc="; nativeBuildInputs = [ installShellFiles From 60c34eeaebd22e70d806c805206cc4396b8f4b61 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 4 May 2024 19:58:03 +0400 Subject: [PATCH 087/209] imposm: init at 0.12.0 --- pkgs/by-name/im/imposm/package.nix | 34 ++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 pkgs/by-name/im/imposm/package.nix diff --git a/pkgs/by-name/im/imposm/package.nix b/pkgs/by-name/im/imposm/package.nix new file mode 100644 index 000000000000..e52cac5634cb --- /dev/null +++ b/pkgs/by-name/im/imposm/package.nix @@ -0,0 +1,34 @@ +{ lib, buildGoModule, fetchFromGitHub, leveldb, geos }: + +buildGoModule rec { + pname = "imposm"; + version = "0.12.0"; + + src = fetchFromGitHub { + owner = "omniscale"; + repo = "imposm3"; + rev = "v${version}"; + hash = "sha256-xX4cV/iU7u/g9n7dtkkkCtNOPZK5oyprNHGDUuW+ees="; + }; + + vendorHash = null; + + buildInputs = [ leveldb geos ]; + + ldflags = [ + "-s -w" + "-X github.com/omniscale/imposm3.Version=${version}" + ]; + + # requires network access + doCheck = false; + + meta = with lib; { + description = "Imposm imports OpenStreetMap data into PostGIS"; + homepage = "https://imposm.org/"; + changelog = "https://github.com/omniscale/imposm3/releases/tag/${src.rev}"; + license = licenses.apsl20; + maintainers = with maintainers; [ sikmir ]; + mainProgram = "imposm"; + }; +} From a9dca1409d65dd0cabd77a9c25f58fcbd6336955 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 May 2024 16:15:12 +0000 Subject: [PATCH 088/209] unciv: 4.11.9 -> 4.11.10 --- pkgs/by-name/un/unciv/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/un/unciv/package.nix b/pkgs/by-name/un/unciv/package.nix index d55a5d06ec9a..c849498f1bc8 100644 --- a/pkgs/by-name/un/unciv/package.nix +++ b/pkgs/by-name/un/unciv/package.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "4.11.9"; + version = "4.11.10"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - hash = "sha256-fAosJmEAQGA1QAyabcmqwuDeqUM+t3mNIfSOrAwc5hg="; + hash = "sha256-RBdMgxJRVM8dj4eDh/ZAzJkyWoAJnpge3Vg25H9+Eak="; }; dontUnpack = true; From 3fb880f337248535fe73eae1564d4d1a634d7b64 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 May 2024 16:28:24 +0000 Subject: [PATCH 089/209] syncthing: 1.27.6 -> 1.27.7 --- pkgs/applications/networking/syncthing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 99d2f65bf14c..2535675c6497 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -13,13 +13,13 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.27.6"; + version = "1.27.7"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - hash = "sha256-BZAje6dA3wmJ6feHWIYPPYTA3sp1WGwl4MjUJS7iZCo="; + hash = "sha256-Y/gwQfb3ShOsXsNLomtqUlmYaw7FQQ6IUN1fHSYOouQ="; }; vendorHash = "sha256-xVSSFFTqU7jww8YTeXKfa3096c2FmEgkcXvuqFHb12E="; From f867fae833b56df00f6b3f7ec31e9f12dc1ee70e Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Wed, 8 May 2024 18:09:38 +0200 Subject: [PATCH 090/209] xml-tooling-c: adopt, migrate to by-name, refactor --- .../xm/xml-tooling-c/package.nix} | 37 +++++++++++++++---- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 29 insertions(+), 10 deletions(-) rename pkgs/{development/libraries/xml-tooling-c/default.nix => by-name/xm/xml-tooling-c/package.nix} (53%) diff --git a/pkgs/development/libraries/xml-tooling-c/default.nix b/pkgs/by-name/xm/xml-tooling-c/package.nix similarity index 53% rename from pkgs/development/libraries/xml-tooling-c/default.nix rename to pkgs/by-name/xm/xml-tooling-c/package.nix index f58f50b4a72f..439f7e64899b 100644 --- a/pkgs/development/libraries/xml-tooling-c/default.nix +++ b/pkgs/by-name/xm/xml-tooling-c/package.nix @@ -1,5 +1,15 @@ -{ lib, stdenv, fetchgit, autoreconfHook, pkg-config -, boost, curl, openssl, log4shib, xercesc, xml-security-c +{ + lib, + stdenv, + fetchgit, + autoreconfHook, + pkg-config, + boost, + curl, + openssl, + log4shib, + xercesc, + xml-security-c, }: stdenv.mkDerivation rec { @@ -12,17 +22,28 @@ stdenv.mkDerivation rec { sha256 = "sha256-FQ109ahOSWj3hvaxu1r/0FTpCuWaLgSEKM8NBio+wqU="; }; - buildInputs = [ boost curl openssl log4shib xercesc xml-security-c ]; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ + boost + curl + openssl + log4shib + xercesc + xml-security-c + ]; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; env.NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.isDarwin) "-std=c++14"; enableParallelBuilding = true; - meta = with lib; { + meta = { description = "A low-level library that provides a high level interface to XML processing for OpenSAML 2"; - platforms = platforms.unix; - license = licenses.asl20; - maintainers = [ ]; + platforms = lib.platforms.unix; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.sigmanificient ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a38897c6125b..91a14ee840e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25052,8 +25052,6 @@ with pkgs; xml-security-c = callPackage ../development/libraries/xml-security-c { }; - xml-tooling-c = callPackage ../development/libraries/xml-tooling-c { }; - xlslib = callPackage ../development/libraries/xlslib { }; xsimd = callPackage ../development/libraries/xsimd { }; From 9ab0b195d1c0b63b4642af76ecf762c938116d60 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Tue, 7 May 2024 16:18:27 +0530 Subject: [PATCH 091/209] ags: 1.8.0 -> 1.8.2 add update script --- pkgs/by-name/ag/ags/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ag/ags/package.nix b/pkgs/by-name/ag/ags/package.nix index 218d8fd7780d..9f0e7a36a24c 100644 --- a/pkgs/by-name/ag/ags/package.nix +++ b/pkgs/by-name/ag/ags/package.nix @@ -16,17 +16,18 @@ , typescript , wrapGAppsHook3 , linux-pam +, nix-update-script }: buildNpmPackage rec { pname = "ags"; - version = "1.8.0"; + version = "1.8.2"; src = fetchFromGitHub { owner = "Aylur"; repo = "ags"; rev = "v${version}"; - hash = "sha256-+0us1/lawDXp6RXn4ev95a99VgpsVPi2A4jwNS2O1Uo="; + hash = "sha256-ebnkUaee/pnfmw1KmOZj+MP1g5wA+8BT/TPKmn4Dkwc="; fetchSubmodules = true; }; @@ -63,6 +64,8 @@ buildNpmPackage rec { chmod u+x ./post_install.sh && patchShebangs ./post_install.sh ''; + passthru.updateScript = nix-update-script {}; + meta = with lib; { homepage = "https://github.com/Aylur/ags"; description = "A EWW-inspired widget system as a GJS library"; From fd152d9f30bcab2f6b0e13016bc39dc89e64acf6 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Tue, 7 May 2024 16:25:28 +0530 Subject: [PATCH 092/209] ags: add johnrtitor as maintainer --- pkgs/by-name/ag/ags/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ag/ags/package.nix b/pkgs/by-name/ag/ags/package.nix index 9f0e7a36a24c..73c7acd83dee 100644 --- a/pkgs/by-name/ag/ags/package.nix +++ b/pkgs/by-name/ag/ags/package.nix @@ -70,7 +70,7 @@ buildNpmPackage rec { homepage = "https://github.com/Aylur/ags"; description = "A EWW-inspired widget system as a GJS library"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ foo-dogsquared ]; + maintainers = with maintainers; [ foo-dogsquared johnrtitor ]; mainProgram = "ags"; platforms = platforms.linux; }; From dd042ccaaef6f60beaab718d53eb678bcdae0413 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Tue, 7 May 2024 16:29:18 +0530 Subject: [PATCH 093/209] ags: format with nixfmt-rfc-style --- pkgs/by-name/ag/ags/package.nix | 55 +++++++++++++++++---------------- 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/pkgs/by-name/ag/ags/package.nix b/pkgs/by-name/ag/ags/package.nix index 73c7acd83dee..85fb28aa12a3 100644 --- a/pkgs/by-name/ag/ags/package.nix +++ b/pkgs/by-name/ag/ags/package.nix @@ -1,22 +1,23 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -, meson -, ninja -, pkg-config -, gobject-introspection -, gjs -, glib-networking -, gnome -, gtk-layer-shell -, libpulseaudio -, libsoup_3 -, networkmanager -, upower -, typescript -, wrapGAppsHook3 -, linux-pam -, nix-update-script +{ + lib, + buildNpmPackage, + fetchFromGitHub, + meson, + ninja, + pkg-config, + gobject-introspection, + gjs, + glib-networking, + gnome, + gtk-layer-shell, + libpulseaudio, + libsoup_3, + networkmanager, + upower, + typescript, + wrapGAppsHook3, + linux-pam, + nix-update-script, }: buildNpmPackage rec { @@ -33,9 +34,7 @@ buildNpmPackage rec { npmDepsHash = "sha256-ucWdADdMqAdLXQYKGOXHNRNM9bhjKX4vkMcQ8q/GZ20="; - mesonFlags = [ - (lib.mesonBool "build_types" true) - ]; + mesonFlags = [ (lib.mesonBool "build_types" true) ]; nativeBuildInputs = [ meson @@ -66,12 +65,16 @@ buildNpmPackage rec { passthru.updateScript = nix-update-script {}; - meta = with lib; { + meta = { homepage = "https://github.com/Aylur/ags"; description = "A EWW-inspired widget system as a GJS library"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ foo-dogsquared johnrtitor ]; + changelog = "https://github.com/Aylur/ags/releases/tag/v${version}"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ + foo-dogsquared + johnrtitor + ]; mainProgram = "ags"; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } From 5a1cb2997c4cbed04c71af35cd8c5e2b7ea3e04c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 19:57:48 +0200 Subject: [PATCH 094/209] python312Packages.rokuecp: 0.19.2 -> 0.19.3 Diff: https://github.com/ctalkington/python-rokuecp/compare/refs/tags/0.19.2...0.19.3 Changelog: https://github.com/ctalkington/python-rokuecp/releases/tag/0.19.3 --- pkgs/development/python-modules/rokuecp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rokuecp/default.nix b/pkgs/development/python-modules/rokuecp/default.nix index 0a204c11be28..8090bda230bb 100644 --- a/pkgs/development/python-modules/rokuecp/default.nix +++ b/pkgs/development/python-modules/rokuecp/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "rokuecp"; - version = "0.19.2"; + version = "0.19.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "ctalkington"; repo = "python-rokuecp"; rev = "refs/tags/${version}"; - hash = "sha256-L6uedckc2lEQ6CUlQGEyDhnuVsxRRgDQJUEsZTfm2sU="; + hash = "sha256-XMJ2V59E4SEVlEhgc1hstLmtzl1gxwCsq+4vmkL3CPM="; }; nativeBuildInputs = [ From 25d0207632ab17b827025d746827793f979a45b4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 19:59:14 +0200 Subject: [PATCH 095/209] python312Packages.rokuecp: refactor --- .../python-modules/rokuecp/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/rokuecp/default.nix b/pkgs/development/python-modules/rokuecp/default.nix index 8090bda230bb..7bcbd4a8d40b 100644 --- a/pkgs/development/python-modules/rokuecp/default.nix +++ b/pkgs/development/python-modules/rokuecp/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "rokuecp"; version = "0.19.3"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -29,11 +29,17 @@ buildPythonPackage rec { hash = "sha256-XMJ2V59E4SEVlEhgc1hstLmtzl1gxwCsq+4vmkL3CPM="; }; - nativeBuildInputs = [ + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'version = "0.0.0"' 'version = "${version}"' \ + --replace-fail "--cov" "" + ''; + + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp backoff cachetools @@ -49,12 +55,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'version = "0.0.0"' 'version = "${version}"' \ - --replace "--cov" "" - ''; - disabledTests = [ # Network related tests are having troube in the sandbox "test_resolve_hostname" From 43cc6801e302748486e5c3fa401e18cf76b7fd7f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 20:00:29 +0200 Subject: [PATCH 096/209] python312Packages.rokuecp: format with nixfmt --- .../python-modules/rokuecp/default.nix | 39 +++++++++---------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/rokuecp/default.nix b/pkgs/development/python-modules/rokuecp/default.nix index 7bcbd4a8d40b..47800983f5e3 100644 --- a/pkgs/development/python-modules/rokuecp/default.nix +++ b/pkgs/development/python-modules/rokuecp/default.nix @@ -1,18 +1,19 @@ -{ lib -, aiohttp -, aresponses -, awesomeversion -, backoff -, buildPythonPackage -, cachetools -, fetchFromGitHub -, poetry-core -, pytest-asyncio -, pytest-freezegun -, pytestCheckHook -, pythonOlder -, xmltodict -, yarl +{ + lib, + aiohttp, + aresponses, + awesomeversion, + backoff, + buildPythonPackage, + cachetools, + fetchFromGitHub, + poetry-core, + pytest-asyncio, + pytest-freezegun, + pytestCheckHook, + pythonOlder, + xmltodict, + yarl, }: buildPythonPackage rec { @@ -35,9 +36,7 @@ buildPythonPackage rec { --replace-fail "--cov" "" ''; - build-system = [ - poetry-core - ]; + build-system = [ poetry-core ]; dependencies = [ aiohttp @@ -66,9 +65,7 @@ buildPythonPackage rec { "test_get_tv_channels_single_channel" ]; - pythonImportsCheck = [ - "rokuecp" - ]; + pythonImportsCheck = [ "rokuecp" ]; meta = with lib; { description = "Asynchronous Python client for Roku (ECP)"; From 36eae19b00a92cd043db2e5b52c8b92b303c3a89 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 20:04:57 +0200 Subject: [PATCH 097/209] python312Packages.pyenphase: 1.20.2 -> 1.20.3 Diff: https://github.com/pyenphase/pyenphase/compare/refs/tags/v1.20.2...v1.20.3 Changelog: https://github.com/pyenphase/pyenphase/blob/v1.20.3/CHANGELOG.md --- pkgs/development/python-modules/pyenphase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyenphase/default.nix b/pkgs/development/python-modules/pyenphase/default.nix index 45e4b014db72..3081ed70edb5 100644 --- a/pkgs/development/python-modules/pyenphase/default.nix +++ b/pkgs/development/python-modules/pyenphase/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "pyenphase"; - version = "1.20.2"; + version = "1.20.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "pyenphase"; repo = "pyenphase"; rev = "refs/tags/v${version}"; - hash = "sha256-sjZaLqTYoXJ1cpaSuyLNAsUrACOMVah7DKaKxGkG0zE="; + hash = "sha256-4lMsyzw56gFimUs52mEzy5eKYF9s2ClNi3yfdIBbccY="; }; postPatch = '' From e12fbc0bc8d41a80ee3289335ead063d97b4bd45 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 20:06:33 +0200 Subject: [PATCH 098/209] python312Packages.publicsuffixlist: 0.10.0.20240506 -> 0.10.0.20240508 --- pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 4fcf9436e071..f404504cce90 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "0.10.0.20240506"; + version = "0.10.0.20240508"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gg1UcELZ8+gQg4VcBsagHhtUc9i6/d03q9oanyDT6K8="; + hash = "sha256-DnDamv29WeYYL6FFDxfxFWRGYUvmNemorW+DlvoEM64="; }; build-system = [ setuptools ]; From 9808270ad40be66b92a930e9784aaa523a50eb2d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 20:28:54 +0200 Subject: [PATCH 099/209] python312Packages.fuzzytm: 2.0.5 -> 2.0.9 --- pkgs/development/python-modules/fuzzytm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fuzzytm/default.nix b/pkgs/development/python-modules/fuzzytm/default.nix index e7dae0d02ee1..7f0ac6c5df92 100644 --- a/pkgs/development/python-modules/fuzzytm/default.nix +++ b/pkgs/development/python-modules/fuzzytm/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "fuzzytm"; - version = "2.0.5"; + version = "2.0.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "FuzzyTM"; inherit version; - hash = "sha256-IELkjd3/yc2lBYsLP6mms9LEcXOfVtNNooEKCMf9BtU="; + hash = "sha256-z0ESYtB7BqssxIHlrd0F+/qapOM1nrDi3Zih5SvgDGY="; }; propagatedBuildInputs = [ From a381bb051228a38f28e18282695bb69c7ddad232 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 20:31:38 +0200 Subject: [PATCH 100/209] python312Packages.fuzzytm: refactor --- pkgs/development/python-modules/fuzzytm/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fuzzytm/default.nix b/pkgs/development/python-modules/fuzzytm/default.nix index 7f0ac6c5df92..4a7d8ddbd930 100644 --- a/pkgs/development/python-modules/fuzzytm/default.nix +++ b/pkgs/development/python-modules/fuzzytm/default.nix @@ -5,6 +5,7 @@ , numpy , pandas , pyfume +, setuptools , scipy , pythonOlder }: @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "fuzzytm"; version = "2.0.9"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +23,11 @@ buildPythonPackage rec { hash = "sha256-z0ESYtB7BqssxIHlrd0F+/qapOM1nrDi3Zih5SvgDGY="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ gensim numpy pandas From ffd0198c413d41935043cce2fde2305639bb3268 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 20:32:17 +0200 Subject: [PATCH 101/209] python312Packages.fuzzytm: format with nixfmt --- .../python-modules/fuzzytm/default.nix | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/fuzzytm/default.nix b/pkgs/development/python-modules/fuzzytm/default.nix index 4a7d8ddbd930..3a86d0c55397 100644 --- a/pkgs/development/python-modules/fuzzytm/default.nix +++ b/pkgs/development/python-modules/fuzzytm/default.nix @@ -1,13 +1,14 @@ -{ lib -, buildPythonPackage -, fetchPypi -, gensim -, numpy -, pandas -, pyfume -, setuptools -, scipy -, pythonOlder +{ + lib, + buildPythonPackage, + fetchPypi, + gensim, + numpy, + pandas, + pyfume, + setuptools, + scipy, + pythonOlder, }: buildPythonPackage rec { @@ -23,9 +24,7 @@ buildPythonPackage rec { hash = "sha256-z0ESYtB7BqssxIHlrd0F+/qapOM1nrDi3Zih5SvgDGY="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ gensim @@ -38,9 +37,7 @@ buildPythonPackage rec { # Module has no tests doCheck = false; - pythonImportsCheck = [ - "FuzzyTM" - ]; + pythonImportsCheck = [ "FuzzyTM" ]; meta = with lib; { description = "Library for Fuzzy Topic Models"; From d78764a623931b10f07a5d6919ab9559a65ffbc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= Date: Wed, 8 May 2024 20:51:39 +0200 Subject: [PATCH 102/209] wasmtime: 20.0.1 -> 20.0.2 --- pkgs/development/interpreters/wasmtime/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 088ef8ba9a90..fafe521fbde1 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "20.0.1"; + version = "20.0.2"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-Qgeg/TYjbfzDEXTPqS6GkTOQrLMGc6D3vochuJSqas0="; + hash = "sha256-zXBVqSBq/dLY8oEs0dNZxtjs4H1aKTJYeeazysHvh3w="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-HfTwN53j60sG3mcWPEKeveyf7sEbI2746pTJSn6Zlp0="; + cargoHash = "sha256-jFqLUWdW/UfOc843aWO7RNDx1E6sBhUWB5Xw2+A2u90="; cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ]; outputs = [ "out" "dev" ]; From 7e2cf7d35222dd912a0a3d16b9e0a42402e8c43a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment?= Date: Wed, 8 May 2024 21:29:00 +0200 Subject: [PATCH 103/209] python3Packages.pyrad: fix build failing - Failing on ZHF https://hydra.nixos.org/build/258464455 - Fix netaddr to use the correct version - Fix use of deleted methods in python312 causing build fail --- .../python-modules/pyrad/default.nix | 27 ++++++++++++++++--- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyrad/default.nix b/pkgs/development/python-modules/pyrad/default.nix index 8a7074888716..7f96cb627008 100644 --- a/pkgs/development/python-modules/pyrad/default.nix +++ b/pkgs/development/python-modules/pyrad/default.nix @@ -6,7 +6,19 @@ , netaddr , six , unittestCheckHook +, fetchPypi }: +let + netaddr_0_8_0 = netaddr.overridePythonAttrs (oldAttrs: rec { + version = "0.8.0"; + + src = fetchPypi { + pname = "netaddr"; + inherit version; + hash = "sha256-1sxXx6B7HZ0ukXqos2rozmHDW6P80bg8oxxaDuK1okM="; + }; + }); +in buildPythonPackage rec { pname = "pyrad"; @@ -33,14 +45,21 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - netaddr + netaddr_0_8_0 six ]; - preCheck = '' substituteInPlace tests/testServer.py \ - --replace "def testBind(self):" "def dontTestBind(self):" \ - --replace "def testBindv6(self):" "def dontTestBindv6(self):" + --replace-warn "def testBind(self):" "def dontTestBind(self):" \ + --replace-warn "def testBindv6(self):" "def dontTestBindv6(self):" \ + + # A lot of test methods have been deprecated since Python 3.1 + # and have been removed in Python 3.12. + # https://docs.python.org/3/whatsnew/3.11.html#pending-removal-in-python-3-12 + substituteInPlace tests/*.py \ + --replace-quiet "self.failUnless" "self.assertTrue" \ + --replace-quiet "self.failIf" "self.assertFalse" \ + --replace-quiet "self.assertEquals" "self.assertEqual" ''; nativeCheckInputs = [ From 4b94aaf0ed117df1eb65bbe621b5bac39fa1a16d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment?= Date: Wed, 8 May 2024 21:34:56 +0200 Subject: [PATCH 104/209] maintainers: add drawbu --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b2cded239a7b..824866dd397a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5383,6 +5383,12 @@ githubId = 472846; name = "Sebastian Krohn"; }; + drawbu = { + email = "clement21.boillot@gmail.com"; + github = "drawbu"; + githubId = 69208565; + name = "Clément Boillot"; + }; drets = { email = "dmitryrets@gmail.com"; github = "drets"; From cf3c73e7776a8359e13fcc20e5c83dfce7202dd1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 May 2024 19:53:06 +0000 Subject: [PATCH 105/209] dmarc-report-converter: 0.7.2 -> 0.8.0 --- pkgs/by-name/dm/dmarc-report-converter/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/dm/dmarc-report-converter/package.nix b/pkgs/by-name/dm/dmarc-report-converter/package.nix index 488ce0a92d64..e91c35698cc5 100644 --- a/pkgs/by-name/dm/dmarc-report-converter/package.nix +++ b/pkgs/by-name/dm/dmarc-report-converter/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "dmarc-report-converter"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "tierpod"; repo = "dmarc-report-converter"; rev = "v${version}"; - hash = "sha256-93sNEBV7MxZr6tqPaFKgY0KA1J3W0HoCiIDZg268Smc="; + hash = "sha256-TqvAqMZEXhMO3/0VNY3Mr/E15QQbucuKyG95j2jWU5g="; }; vendorHash = null; From 23c0e1d7d6e65f766684506c9691bda71b72fdd7 Mon Sep 17 00:00:00 2001 From: Enric Morales Date: Wed, 8 May 2024 17:59:19 +0200 Subject: [PATCH 106/209] flac123: 0.0.12 -> 2.1.1, reformat, move to pkgs/by-name --- pkgs/applications/audio/flac123/default.nix | 22 ------------ pkgs/by-name/fl/flac123/package.nix | 38 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 38 insertions(+), 24 deletions(-) delete mode 100644 pkgs/applications/audio/flac123/default.nix create mode 100644 pkgs/by-name/fl/flac123/package.nix diff --git a/pkgs/applications/audio/flac123/default.nix b/pkgs/applications/audio/flac123/default.nix deleted file mode 100644 index 646e361524d4..000000000000 --- a/pkgs/applications/audio/flac123/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, fetchurl, autoreconfHook, flac, libao, libogg, popt }: - -stdenv.mkDerivation rec { - pname = "flac123"; - version = "0.0.12"; - - src = fetchurl { - url = "mirror://sourceforge/flac-tools/${pname}-${version}-release.tar.gz"; - sha256 = "0zg4ahkg7v81za518x32wldf42g0rrvlrcqhrg9sv3li9bayyxhr"; - }; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ flac libao libogg popt ]; - - meta = with lib; { - homepage = "https://flac-tools.sourceforge.net/"; - description = "A command-line program for playing FLAC audio files"; - license = licenses.gpl2Plus; - platforms = platforms.all; - mainProgram = "flac123"; - }; -} diff --git a/pkgs/by-name/fl/flac123/package.nix b/pkgs/by-name/fl/flac123/package.nix new file mode 100644 index 000000000000..463144b1de08 --- /dev/null +++ b/pkgs/by-name/fl/flac123/package.nix @@ -0,0 +1,38 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + flac, + libao, + libogg, + popt, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "flac123"; + version = "2.1.1"; + + src = fetchFromGitHub { + owner = "flac123"; + repo = "flac123"; + rev = "v${finalAttrs.version}"; + hash = "sha256-LtL69t2r9TlIkpQWZLge8ib7NZ5rvLW6JllG2UM16Kw="; + }; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ + flac + libao + libogg + popt + ]; + + meta = { + homepage = "https://github.com/flac123/flac123"; + description = "A command-line program for playing FLAC audio files"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ kiike ]; + mainProgram = "flac123"; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a38897c6125b..c7beeb4769b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8109,8 +8109,6 @@ with pkgs; fim = callPackage ../tools/graphics/fim { }; - flac123 = callPackage ../applications/audio/flac123 { }; - flamegraph = callPackage ../development/tools/flamegraph { }; flawfinder = callPackage ../development/tools/flawfinder { }; From d09f4d94d6cbef039fed56093a851af1219c603b Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 8 May 2024 00:07:14 +0200 Subject: [PATCH 107/209] normcap: 0.5.4 -> 0.5.6 Diff: https://github.com/dynobo/normcap/compare/refs/tags/v0.5.4...v0.5.6 --- pkgs/by-name/no/normcap/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/no/normcap/package.nix b/pkgs/by-name/no/normcap/package.nix index 0f6e21671de3..40c7d66a9f00 100644 --- a/pkgs/by-name/no/normcap/package.nix +++ b/pkgs/by-name/no/normcap/package.nix @@ -25,7 +25,7 @@ in ps.buildPythonApplication rec { pname = "normcap"; - version = "0.5.4"; + version = "0.5.6"; format = "pyproject"; disabled = ps.pythonOlder "3.9"; @@ -34,7 +34,7 @@ ps.buildPythonApplication rec { owner = "dynobo"; repo = "normcap"; rev = "refs/tags/v${version}"; - hash = "sha256-bYja05U/JBwSij1J2LxN+c5Syrb4qzWSZY5+HNmC9Zo="; + hash = "sha256-pvctgJCst536D3yLlel70hCwe1T3lxA8F6L3KKbfiEA="; }; postPatch = '' From 0a95f1e6a72272ba363adf3b1386ed9c90947afd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 May 2024 21:35:10 +0000 Subject: [PATCH 108/209] ols: 0-unstable-2024-04-28 -> 0-unstable-2024-05-06 --- pkgs/development/tools/ols/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ols/default.nix b/pkgs/development/tools/ols/default.nix index ecc5a54778ff..d4ad7f36dc4b 100644 --- a/pkgs/development/tools/ols/default.nix +++ b/pkgs/development/tools/ols/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "ols"; - version = "0-unstable-2024-04-28"; + version = "0-unstable-2024-05-06"; src = fetchFromGitHub { owner = "DanielGavin"; repo = "ols"; - rev = "49a63471d91120a23ec86f1621e99155d1be55c2"; - hash = "sha256-fHCSPqeN24QbCzwMCLtvK5YnR0ExveDvXRuWL2nHt8M="; + rev = "5c646656e988ddcdaee09f1bea666dc00ea2ea4d"; + hash = "sha256-W8D+szu4+mDYwDLWvGRL3ICZ9Dr93pFweEO2+0awHfo="; }; passthru.updateScript = unstableGitUpdater { From 4a398361da0161f7ed641f375bcac0cbee9cf88c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 May 2024 21:39:49 +0000 Subject: [PATCH 109/209] kubescape: 3.0.9 -> 3.0.10 --- pkgs/tools/security/kubescape/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix index 501c6dc1435b..985eea01f364 100644 --- a/pkgs/tools/security/kubescape/default.nix +++ b/pkgs/tools/security/kubescape/default.nix @@ -10,17 +10,17 @@ buildGoModule rec { pname = "kubescape"; - version = "3.0.9"; + version = "3.0.10"; src = fetchFromGitHub { owner = "kubescape"; repo = "kubescape"; rev = "refs/tags/v${version}"; - hash = "sha256-pAe289XwKq/PO39/Wt60uipt4Z0ZD5f73pDaOTXXwi0="; + hash = "sha256-r6w2Cfyjxqf/1DMBGgmE8Oh/WnvBOa7mAEGXnPjk1Pg="; fetchSubmodules = true; }; - vendorHash = "sha256-UWmsS79N8ooFr4qpKqOVC14cgf5ckAQwzROHGl1smD8="; + vendorHash = "sha256-WPa6IKPjdBtoHYKA2yYtaI1LCbkyv374fcThxbSEKxo="; subPackages = [ "." From 68998c804f04d36c2c5abde3c29f3a4ba144449f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 May 2024 21:42:12 +0000 Subject: [PATCH 110/209] sabnzbd: 4.3.0 -> 4.3.1 --- pkgs/by-name/sa/sabnzbd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sa/sabnzbd/package.nix b/pkgs/by-name/sa/sabnzbd/package.nix index 9bcfe9b0ec4f..99a8e66514f6 100644 --- a/pkgs/by-name/sa/sabnzbd/package.nix +++ b/pkgs/by-name/sa/sabnzbd/package.nix @@ -48,14 +48,14 @@ let ]); path = lib.makeBinPath [ coreutils par2cmdline-turbo unrar unzip p7zip util-linux ]; in stdenv.mkDerivation rec { - version = "4.3.0"; + version = "4.3.1"; pname = "sabnzbd"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-2zRhDFKbWq4JA7XE5/VFbfkN2ZQcqcuqGD5kjHmeXUA="; + sha256 = "sha256-OlACGAYP4nMZZAVJduzj0AGTzSwM+lE7+H2xgmQVSWg="; }; nativeBuildInputs = [ makeWrapper ]; From 3dce926637afa80181c042561fa0956939d65cd1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 May 2024 21:46:38 +0000 Subject: [PATCH 111/209] consul-template: 0.37.5 -> 0.37.6 --- pkgs/tools/system/consul-template/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix index 5494b699ed4a..d9571cfcaa8d 100644 --- a/pkgs/tools/system/consul-template/default.nix +++ b/pkgs/tools/system/consul-template/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "consul-template"; - version = "0.37.5"; + version = "0.37.6"; src = fetchFromGitHub { owner = "hashicorp"; repo = "consul-template"; rev = "v${version}"; - hash = "sha256-vUNOk0lvlI2K8tIgQVWDDkTwvO5gh9xnkdkx//vP1/U="; + hash = "sha256-YkhU8BFSQpYUfgB5CxtaRJOghfH1uu1gpvArIeWHXEI="; }; vendorHash = "sha256-3Z8EiO48+OAg/TnoKUuokLBSXnUUrxe8ZgE1nrILFSg="; From 2bd868a110fc9caecc32863e1c1f1912928765f8 Mon Sep 17 00:00:00 2001 From: "Ian M. Jones" Date: Wed, 8 May 2024 22:48:51 +0100 Subject: [PATCH 112/209] wails: 2.8.1 -> 2.8.2 --- pkgs/development/tools/wails/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/wails/default.nix b/pkgs/development/tools/wails/default.nix index 7ebd579ae2df..9a158be022f3 100644 --- a/pkgs/development/tools/wails/default.nix +++ b/pkgs/development/tools/wails/default.nix @@ -14,16 +14,16 @@ buildGoModule rec { pname = "wails"; - version = "2.8.1"; + version = "2.8.2"; src = fetchFromGitHub { owner = "wailsapp"; repo = pname; rev = "v${version}"; - hash = "sha256-yIoCKnYKky+BlMjGBNRk0lKyxr3UWMdRsvyW2KUItBk="; + hash = "sha256-oJ/kxYphBTXxt7Da1x4GW/a78YV+m32iC/4N3MDjU/A="; } + "/v2"; - vendorHash = "sha256-6QFnLuRnSzIqkQkK1qg7VBYxwjK8fSQWz5RxpuyutoY="; + vendorHash = "sha256-15Vo4AKmd9qOF0ea1klTlrXJOUs+IHvsNT2rw4R7ZiU="; proxyVendor = true; From 2f04c5f8a3063206c66fa69a346d2776b8074115 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Wed, 8 May 2024 15:29:21 +0200 Subject: [PATCH 113/209] linux: always use xz for compressing modules The change I merged too hastily in #302300 increases the size by ~30%. This could be improved upon, but in the meantime let's go back to xz while keeping zstd-compressed firmware (only 4.4% larger) and _support_ for zstd-compressed modules. --- nixos/doc/manual/release-notes/rl-2405.section.md | 2 +- pkgs/os-specific/linux/kernel/common-config.nix | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index c18f3af9219f..b27d4c658bfe 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -53,7 +53,7 @@ Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for Pi - `system.etc.overlay.enable` option was added. If enabled, `/etc` is mounted via an overlayfs instead of being created by a custom perl script. -- For each supporting version of the Linux kernel firmware blobs and kernel modules +- For each supporting version of the Linux kernel firmware blobs are compressed with zstd. For firmware blobs this means an increase of 4.4% in size, however a significantly higher decompression speed. diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index cf38897c5070..62922d442697 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -951,8 +951,7 @@ let ZEROPLUS_FF = yes; MODULE_COMPRESS = whenOlder "5.13" yes; - MODULE_COMPRESS_XZ = whenOlder "5.13" yes; - MODULE_COMPRESS_ZSTD = whenAtLeast "5.13" yes; + MODULE_COMPRESS_XZ = yes; SYSVIPC = yes; # System-V IPC From 3e97f97eddaeb499a49250ff0cee32c4d7fe5b06 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 May 2024 22:49:33 +0000 Subject: [PATCH 114/209] mongoc: 1.27.0 -> 1.27.1 --- pkgs/development/libraries/mongoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index 082c0d9b308f..8a344a08fb7a 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mongoc"; - version = "1.27.0"; + version = "1.27.1"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-c-driver"; rev = "refs/tags/${version}"; - hash = "sha256-P0Mavs09FUmHxRYx/70wtjswWnrkQIo0+NrYtW4KJXo="; + hash = "sha256-3+7JfgT1hZHyTiLDqYioI5GJYnqN9crE5CrXOvit0ew="; }; nativeBuildInputs = [ From 344c714c3610f0c3eec800a73c10920e7f989716 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 May 2024 22:56:25 +0000 Subject: [PATCH 115/209] tbls: 1.74.1 -> 1.74.3 --- pkgs/tools/misc/tbls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/tbls/default.nix b/pkgs/tools/misc/tbls/default.nix index c930d2038149..0d20bead317e 100644 --- a/pkgs/tools/misc/tbls/default.nix +++ b/pkgs/tools/misc/tbls/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "tbls"; - version = "1.74.1"; + version = "1.74.3"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; rev = "v${version}"; - hash = "sha256-QuusOxXcTp7c6zkj6L//jOXWwLUgrsUFtsUtrNZrkOk="; + hash = "sha256-tS/sdX74Fr6arZh7/JiNFz1grjPMVZfg8C1VvqxsbYM="; }; - vendorHash = "sha256-mDZOBwm3k3L4QqQA+1C3jRz46R7+4wwJg9BVNWB0F0A="; + vendorHash = "sha256-NafHcWP9xJX2hy8i1TKtBi54cXDKgoxbgwLQjYRBcjU="; nativeBuildInputs = [ installShellFiles ]; From 27b7517d8716e231286cbe835d476067c0ab28f9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 May 2024 22:56:40 +0000 Subject: [PATCH 116/209] cargo-tarpaulin: 0.29.0 -> 0.29.2 --- pkgs/development/tools/analysis/cargo-tarpaulin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index accb456f1192..b554353a508c 100644 --- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; - version = "0.29.0"; + version = "0.29.2"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; rev = version; - hash = "sha256-eLLnSfuFnvlarpFBkhq3eumIyXOuuYU9ZJHpsKt0WQE="; + hash = "sha256-3OLMTiMX5dsW691MX432YUuVqKOtrmS6Tpk96QVEyo8="; }; - cargoHash = "sha256-bTflBJ5Rz2Xdip2ptUyGi+CpR0ZN0ggVutSk1S9nW1c="; + cargoHash = "sha256-+xCA0LVEHhBGOgMx+/ABZL1I7NSJEWf21p9gmQJNBJo="; nativeBuildInputs = [ pkg-config From 3a2c6c746aec49df4042782167ae509bf5d00d35 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 May 2024 22:56:54 +0000 Subject: [PATCH 117/209] hugo: 0.125.5 -> 0.125.6 --- pkgs/by-name/hu/hugo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix index 98abe2a65b21..6442d7e3fc60 100644 --- a/pkgs/by-name/hu/hugo/package.nix +++ b/pkgs/by-name/hu/hugo/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.125.5"; + version = "0.125.6"; src = fetchFromGitHub { owner = "gohugoio"; repo = "hugo"; rev = "refs/tags/v${version}"; - hash = "sha256-vvADd4S4AURkIODGvDf4J9omZjKcZeQKQ6ZSKDu1gog="; + hash = "sha256-rOkvt+U8iju+oIb/BfPMHSqhZYM6XSUS2B8Oxd46cF8="; }; - vendorHash = "sha256-L8+e6rZvFaNV9gyWJtXv9NnzoigVDSyNKTuxGrRwb44="; + vendorHash = "sha256-UJoK73oQ1gH4Y1hxjE66Ou8o9jAeJpA4njgP3VHu68s="; doCheck = false; From c3bcd14096ce642aa52ff39917fd221aba6aad87 Mon Sep 17 00:00:00 2001 From: Tomo <68489118+Tomodachi94@users.noreply.github.com> Date: Tue, 7 May 2024 16:13:07 -0700 Subject: [PATCH 118/209] vscode-extensions.jackmacwindows.vscode-computercraft: init at 1.1.1 --- .../editors/vscode/extensions/default.nix | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 854eb94ad0a5..64c7a67c2860 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2234,6 +2234,27 @@ let }; }; + jackmacwindows.vscode-computercraft = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-computercraft"; + publisher = "jackmacwindows"; + version = "1.1.1"; + hash = "sha256-ec1I3oQ06iMdSUcqf8yA3GjE7Aqa0PiLzRQLwFcL0KU="; + }; + postInstall = '' + # Remove superflouous images to reduce closure size + rm $out/$installPrefix/images/*.gif + ''; + meta = { + changelog = "https://marketplace.visualstudio.com/items/jackmacwindows.vscode-computercraft/changelog"; + description = "A Visual Studio Code extension for ComputerCraft and CC: Tweaked auto-completion"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=jackmacwindows.vscode-computercraft"; + homepage = "https://github.com/MCJack123/vscode-computercraft"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tomodachi94 ]; + }; + }; + jackmacwindows.craftos-pc = callPackage ./jackmacwindows.craftos-pc { }; james-yu.latex-workshop = buildVscodeMarketplaceExtension { From e6905b108aa5f6bf2aa72ef6f7e82ea0a12fc065 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 May 2024 23:44:15 +0000 Subject: [PATCH 119/209] pyprland: 2.2.16 -> 2.2.17 --- pkgs/by-name/py/pyprland/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/py/pyprland/package.nix b/pkgs/by-name/py/pyprland/package.nix index 6902d0d1f04c..b9821190cec2 100644 --- a/pkgs/by-name/py/pyprland/package.nix +++ b/pkgs/by-name/py/pyprland/package.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication rec { pname = "pyprland"; - version = "2.2.16"; + version = "2.2.17"; format = "pyproject"; disabled = python3Packages.pythonOlder "3.10"; @@ -14,8 +14,8 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "hyprland-community"; repo = "pyprland"; - rev = version; - hash = "sha256-zT+ixOM+by13iM78CHkQqTS9LCLFspHNyEjd7P2psUE="; + rev = "refs/tags/${version}"; + hash = "sha256-S1bIIazrBWyjF8tOcIk0AwwWq9gbpTKNsjr9iYA5lKk="; }; nativeBuildInputs = with python3Packages; [ poetry-core ]; From 6b7127232a63ec84b44cfc085420aeb5f26a23ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 May 2024 23:51:02 +0000 Subject: [PATCH 120/209] scc: 3.3.0 -> 3.3.3 --- pkgs/development/tools/misc/scc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/scc/default.nix b/pkgs/development/tools/misc/scc/default.nix index f67760c45586..5a5bf1cafefe 100644 --- a/pkgs/development/tools/misc/scc/default.nix +++ b/pkgs/development/tools/misc/scc/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "scc"; - version = "3.3.0"; + version = "3.3.3"; src = fetchFromGitHub { owner = "boyter"; repo = "scc"; rev = "v${version}"; - hash = "sha256-WZWFgbC/Yz+KNYK+bjm+rlf3MJVPMbL+7hyFOSaSewA="; + hash = "sha256-YbTPRUxkSKYZwOSK7XFr6wHqACp0rkFyzQCMcAFlZ7Y="; }; vendorHash = null; From 799a8d00dcec693fac8f2115cb3826d1a3c5407e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 May 2024 23:59:23 +0000 Subject: [PATCH 121/209] turso-cli: 0.93.0 -> 0.93.8 --- pkgs/development/tools/turso-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/turso-cli/default.nix b/pkgs/development/tools/turso-cli/default.nix index 4b93bbd8442e..322d46ac2f56 100644 --- a/pkgs/development/tools/turso-cli/default.nix +++ b/pkgs/development/tools/turso-cli/default.nix @@ -8,13 +8,13 @@ }: buildGoModule rec { pname = "turso-cli"; - version = "0.93.0"; + version = "0.93.8"; src = fetchFromGitHub { owner = "tursodatabase"; repo = "turso-cli"; rev = "v${version}"; - hash = "sha256-Q5SVudzJZJ5ftp5Xfeb75XQO44upGKlxQ/WceSSwHyU="; + hash = "sha256-glY1xWu38wZLo9eyPAR4NtGDfLl1BkaN+WICIACHECo="; }; vendorHash = "sha256-2NjdjB09WYzHjQEl2hMUWN1/xsj/Hlr8lVYU/pkxTqQ="; From 91b51a827a8912de0e224c399eca5015b37c314a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 May 2024 23:59:36 +0000 Subject: [PATCH 122/209] antares: 0.7.23 -> 0.7.24 --- pkgs/by-name/an/antares/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/an/antares/package.nix b/pkgs/by-name/an/antares/package.nix index 7e2537d211bb..99725d863dff 100644 --- a/pkgs/by-name/an/antares/package.nix +++ b/pkgs/by-name/an/antares/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "antares"; - version = "0.7.23"; + version = "0.7.24"; src = fetchFromGitHub { owner = "antares-sql"; repo = "antares"; rev = "v${version}"; - hash = "sha256-7bj0f7JrUgHr2g489ABjNLfRERQFx0foDP0YqBTNkzI="; + hash = "sha256-jMtUDqxWwfXl9x61ycohTaacNAhWawL3Z4+OPW5nbOI="; }; - npmDepsHash = "sha256-pRrg7fY5P2awds1ncsnD/lDvKmiOKhzjNcKXKy70bcs="; + npmDepsHash = "sha256-GC1hdRO8rrM97AMYCxWeNtJhyVdbKgitKLkWX7kGCwg="; buildInputs = [ nodejs ]; From f3364d323d4e7220b09323fa87446c0ce62a7412 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 May 2024 23:13:09 +0000 Subject: [PATCH 123/209] python311Packages.mplhep: 0.3.47 -> 0.3.48 --- pkgs/development/python-modules/mplhep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mplhep/default.nix b/pkgs/development/python-modules/mplhep/default.nix index cbf4e46b499e..845d9942f741 100644 --- a/pkgs/development/python-modules/mplhep/default.nix +++ b/pkgs/development/python-modules/mplhep/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "mplhep"; - version = "0.3.47"; + version = "0.3.48"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-GDLI/Y6tWiI5JcmQJ7BnwvKPGwdAwJDN4yGOgINcdB8="; + hash = "sha256-rAIiaTTSf1xINdadjHk32KOpW4SMg8jdwFt8z1oiLis="; }; nativeBuildInputs = [ From c2dd071843f0d11038ef2a5c3e97e6a965cc0d1c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 May 2024 00:18:51 +0000 Subject: [PATCH 124/209] actionlint: 1.6.27 -> 1.7.0 --- pkgs/development/tools/analysis/actionlint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/actionlint/default.nix b/pkgs/development/tools/analysis/actionlint/default.nix index 71b361b61516..a17b62998e0b 100644 --- a/pkgs/development/tools/analysis/actionlint/default.nix +++ b/pkgs/development/tools/analysis/actionlint/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { pname = "actionlint"; - version = "1.6.27"; + version = "1.7.0"; subPackages = [ "cmd/actionlint" ]; @@ -18,10 +18,10 @@ buildGoModule rec { owner = "rhysd"; repo = "actionlint"; rev = "v${version}"; - hash = "sha256-v8RuSsayIVA31ADLiAOcWwXY3HKjG15FZ/PHnY651Ac="; + hash = "sha256-+Mnlqsdk4VzXtdBUtCRvnTJ6EIDPIsBNNQJ30TIO9kQ="; }; - vendorHash = "sha256-DhZHfcnLm700i0M4pcvwlPdynbLRnG5rYsp5CrIDybw="; + vendorHash = "sha256-v0bmugCOP1XUrfe9xqN7gYKFchv6l/WpUK016xfyiCE="; nativeBuildInputs = [ makeWrapper ronn installShellFiles ]; From b0985f752f050775491a0e3ec917885cdb0efb25 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 May 2024 00:30:07 +0000 Subject: [PATCH 125/209] cpp-utilities: 5.24.7 -> 5.24.8 --- pkgs/development/libraries/cpp-utilities/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index 49ebc34fbcf2..599fa32022e1 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cpp-utilities"; - version = "5.24.7"; + version = "5.24.8"; src = fetchFromGitHub { owner = "Martchus"; repo = "cpp-utilities"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-gfyvWnvUXgjocid0nvp3lWhdPb7MYm+1GJRP5RYInEY="; + sha256 = "sha256-Bo7XYArkJOK/dsX+K+xadz8SCh736ZMaB29jX4X+RGw="; }; nativeBuildInputs = [ cmake ]; From 17e855ae2494ed0a14e81a8ff21476838ee49a7a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 May 2024 00:58:01 +0000 Subject: [PATCH 126/209] fn-cli: 0.6.32 -> 0.6.33 --- pkgs/applications/networking/cluster/fn-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/fn-cli/default.nix b/pkgs/applications/networking/cluster/fn-cli/default.nix index 94cdd457aff8..a54c38caa8f4 100644 --- a/pkgs/applications/networking/cluster/fn-cli/default.nix +++ b/pkgs/applications/networking/cluster/fn-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fn"; - version = "0.6.32"; + version = "0.6.33"; src = fetchFromGitHub { owner = "fnproject"; repo = "cli"; rev = version; - hash = "sha256-mXHDxmjQdfO6uZ1ROcxwtDaPvbv2kFV+qLbejn3Kycs="; + hash = "sha256-f8EYiTXS9ByELWWV2EF4jrDamoKRGejKhYVyNscHZvo="; }; vendorHash = null; From 6db0481e0e41952a65e4e22fbf71acd6bde73d39 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Wed, 8 May 2024 21:05:41 -0400 Subject: [PATCH 127/209] sourcehut: Fix werkzueg patch hash --- pkgs/applications/version-management/sourcehut/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/sourcehut/default.nix b/pkgs/applications/version-management/sourcehut/default.nix index c9cfa31ce9f3..c941cc7570da 100644 --- a/pkgs/applications/version-management/sourcehut/default.nix +++ b/pkgs/applications/version-management/sourcehut/default.nix @@ -69,7 +69,7 @@ let patches = (oldAttrs.patches or []) ++ [ (fetchpatch { url = "https://github.com/pallets/werkzeug/commit/4e5bdca7f8227d10cae828f8064fb98190ace4aa.patch"; - hash = "sha256-H45/YF9zaOUg6UqEEus4uBeGA/TjynuJZcRyc6BHQ30="; + hash = "sha256-83doVvfdpymlAB0EbfrHmuoKE5B2LJbFq+AY2xGpnl4="; }) ]; }); From 041ef0edd2480d665b99ad9fed734b21e5da02e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 May 2024 01:11:09 +0000 Subject: [PATCH 128/209] go-task: 3.36.0 -> 3.37.0 --- pkgs/development/tools/go-task/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index 510acbbdf045..843241f18a88 100644 --- a/pkgs/development/tools/go-task/default.nix +++ b/pkgs/development/tools/go-task/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "go-task"; - version = "3.36.0"; + version = "3.37.0"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "refs/tags/v${version}"; - hash = "sha256-09dw6bDEKbgajH+/estVYDkbUdUiUUuqXYQqeOBTeQ0="; + hash = "sha256-h3/quMJ4vdTaR+pY7NRpbNp0o3Wp+3K7kFNACp5Q1Ls="; }; - vendorHash = "sha256-ahBpIPTHByZ5Qnl6PaOeTLNBq2hQ78+dUmaHvkJxkWg="; + vendorHash = "sha256-iugFWBIKt/Rm5ccQnIFR75P1AVZbbFhWN97dvr8DoBs="; doCheck = false; From 622e0e5e44e721713290351b75f317c54edc0070 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 May 2024 01:30:39 +0000 Subject: [PATCH 129/209] osv-scanner: 1.7.2 -> 1.7.3 --- pkgs/tools/security/osv-scanner/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/osv-scanner/default.nix b/pkgs/tools/security/osv-scanner/default.nix index 70393cb9aad8..3196ebe5706b 100644 --- a/pkgs/tools/security/osv-scanner/default.nix +++ b/pkgs/tools/security/osv-scanner/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "osv-scanner"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "google"; repo = "osv-scanner"; rev = "refs/tags/v${version}"; - hash = "sha256-UE6iCvv/ByODZX+FoLvIw+EeyISWFkHb4xK5L33w1hU="; + hash = "sha256-tagTrjsYPT5csm841HvPbtUsbsaapS8JuHwsPTZWheA="; }; - vendorHash = "sha256-c/Wjhpa7upSRMaU+rheGF9dbvK0MQe3ZmPLpR5bRiUI="; + vendorHash = "sha256-yu6qefmTiMRGeyOkiQVOtXQu3BGE2SBHerWNlDDlZxw="; subPackages = [ "cmd/osv-scanner" From 1bce3ad9b08ef086e7802c389007c3b042d3eba2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 May 2024 01:30:57 +0000 Subject: [PATCH 130/209] nebula: 1.8.2 -> 1.9.0 --- pkgs/tools/networking/nebula/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/nebula/default.nix b/pkgs/tools/networking/nebula/default.nix index 5420c5fa35c3..09123767d116 100644 --- a/pkgs/tools/networking/nebula/default.nix +++ b/pkgs/tools/networking/nebula/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nebula"; - version = "1.8.2"; + version = "1.9.0"; src = fetchFromGitHub { owner = "slackhq"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-tbzdbI4QTLQcJ6kyD3c+jQvXn9ERV/9hrzNPXV9XwVM="; + hash = "sha256-JCYH3MTHHIKTA12G99e9VJQtQ6UDSxdTNCLX6ZeOKsM="; }; - vendorHash = "sha256-BL9Tx87pBZIAuoneu6Sm2gjyTTC6yOZv5GVYNNeuhtw="; + vendorHash = "sha256-4BnFvA0dxsEK7ictDUZ6nol6PtM54kk9dwKPTQbRUR0="; subPackages = [ "cmd/nebula" "cmd/nebula-cert" ]; From ca5b495b3075218380bf7307cf8e6e40a36c29c2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 May 2024 01:36:36 +0000 Subject: [PATCH 131/209] gitu: 0.19.2 -> 0.20.1 --- pkgs/by-name/gi/gitu/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/gitu/package.nix b/pkgs/by-name/gi/gitu/package.nix index 98f0bb9830eb..40a729927e6f 100644 --- a/pkgs/by-name/gi/gitu/package.nix +++ b/pkgs/by-name/gi/gitu/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "gitu"; - version = "0.19.2"; + version = "0.20.1"; src = fetchFromGitHub { owner = "altsem"; repo = "gitu"; rev = "v${version}"; - hash = "sha256-6gjXsuxKGv8OrbBg8NDOj5ITpLI3S33VsjpCbK5SaIk="; + hash = "sha256-H1REl6DkWYwZ1s8FLyHlsFi1DQY0C3Zizz/o9KUO7XQ="; }; - cargoHash = "sha256-W73sSZ/OjeRcI2NNTp2gkabtC6krXOnv8nRAbNbXOp4="; + cargoHash = "sha256-/u6VmcaQpVagz7W/eAFql9sKF+9dn/o1VGvFGJAJkaA="; nativeBuildInputs = [ pkg-config From 1319c4d4c150ccfe8001fd599a80285b8a4680a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 May 2024 02:43:29 +0000 Subject: [PATCH 132/209] nifi: 1.25.0 -> 1.26.0 --- pkgs/servers/web-apps/nifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/nifi/default.nix b/pkgs/servers/web-apps/nifi/default.nix index 6711608e2f50..e579303bcfd2 100644 --- a/pkgs/servers/web-apps/nifi/default.nix +++ b/pkgs/servers/web-apps/nifi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nifi"; - version = "1.25.0"; + version = "1.26.0"; src = fetchzip { url = "mirror://apache/nifi/${version}/nifi-${version}-bin.zip"; - hash = "sha256-k8F4Zu1X/R2tv4ZsMT7K8VdXFKX3iLPIWG+gvyNjrf0="; + hash = "sha256-V/XrggYDeitsDmdvwnXK5QIBGDDBmK4mToz1RphkbSk="; }; nativeBuildInputs = [ makeWrapper ]; From 491a55381a5218b9c164980031c339d1b77d2a5f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 May 2024 02:47:49 +0000 Subject: [PATCH 133/209] surge-XT: 1.3.1 -> 1.3.2 --- pkgs/applications/audio/surge-XT/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/surge-XT/default.nix b/pkgs/applications/audio/surge-XT/default.nix index 63cf1110d784..08dd794275d6 100644 --- a/pkgs/applications/audio/surge-XT/default.nix +++ b/pkgs/applications/audio/surge-XT/default.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { pname = "surge-XT"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "surge-synthesizer"; repo = "surge"; rev = "release_xt_${version}"; fetchSubmodules = true; - sha256 = "sha256-xcbZ5TC2W2PVzAkpoKPFIgW1oRGaC+ynQYot3cb5NAQ="; + sha256 = "sha256-r8CZxjmH9lfCizc95jRB4je+R/74zMqRMlGIZxxxriw="; }; nativeBuildInputs = [ From 4c2a5ce41f258bd7f0810d7562d41ea96d511652 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 May 2024 03:26:04 +0000 Subject: [PATCH 134/209] tailscale: 1.64.2 -> 1.66.0 --- pkgs/servers/tailscale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 20637c70129f..6596c03fb854 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -12,7 +12,7 @@ }: let - version = "1.64.2"; + version = "1.66.0"; in buildGoModule { pname = "tailscale"; @@ -22,9 +22,9 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-DS7C/G1Nj9gIjYwXaEeCLbtH9HbB0tRoJBDjZc/nq5g="; + hash = "sha256-ZI9/YlVHbdvEwD0YHWfUhciU2x4wp4GzTanwDvuIpz4="; }; - vendorHash = "sha256-pYeHqYd2cCOVQlD1r2lh//KC+732H0lj1fPDBr+W8qA="; + vendorHash = "sha256-Hd77xy8stw0Y6sfk3/ItqRIbM/349M/4uf0iNy1xJGw="; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; From f33d36cfc50b7a6578b2c06a7b98f9b7011f978d Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Thu, 9 May 2024 11:41:41 +0800 Subject: [PATCH 135/209] flyctl: 0.2.46 -> 0.2.51 --- pkgs/development/web/flyctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 489a38efcf12..1b5e2d6f0770 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGo122Module rec { pname = "flyctl"; - version = "0.2.46"; + version = "0.2.51"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-x7ICqPm3c2bpNb18vNxZVlkxtgCL2GqLMv8TxI7cUfg="; + hash = "sha256-UAA8aTT4Q3aimXJTz3P7Hirx4I3UZJb5KdXT59hxeXs="; }; - vendorHash = "sha256-tLlWPKMRPFyMDZGkdjb/hF/7/OPpducGXyGlXExBG64="; + vendorHash = "sha256-eTiY65VGFBgGzCOrnp/WbOo9Lbdk4PYwT7CppjsZ4WE="; subPackages = [ "." ]; From c3a95d6d5de09b682d63090f13c7f48253fdb0ea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 May 2024 17:04:17 +0000 Subject: [PATCH 136/209] terraform: 1.8.2 -> 1.8.3 --- pkgs/applications/networking/cluster/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index efaef0fa65b1..6abdcb2bb30e 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -166,8 +166,8 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.8.2"; - hash = "sha256-c9RzdmaTXMOi4oP++asoysDpt/BSvBK/GmEDDGViSl0="; + version = "1.8.3"; + hash = "sha256-4W1Cs3PAGn43eGDK15qSvN+gLdkkoFIwhejcJsCqcYA="; vendorHash = "sha256-2+ctm1lJjCHITWV7BqoqgBlXKjNT4lueAt4F3UtoL9Q="; patches = [ ./provider-path-0_15.patch ]; passthru = { From 6a81ed72f17b7d3694292086f25a2cef15765040 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 May 2024 00:58:37 +0000 Subject: [PATCH 137/209] gh: 2.49.0 -> 2.49.1 --- pkgs/applications/version-management/gh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gh/default.nix b/pkgs/applications/version-management/gh/default.nix index d5633ef5e3d3..c1f8a299dbcd 100644 --- a/pkgs/applications/version-management/gh/default.nix +++ b/pkgs/applications/version-management/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.49.0"; + version = "2.49.1"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - hash = "sha256-4aT8ThZt2Dlp2RjaGBiTgw2IPantSnTJPhP5Tel755Q="; + hash = "sha256-9Qr1goFmHV4rNEB849dF9+qEEMOWanCyAcNpXwuQxOo="; }; - vendorHash = "sha256-p+1Knx+z1M3m8VjsvBfY6D1Gs5va5Z8QFExv5397wHU="; + vendorHash = "sha256-FztCYs6db6f3niAru/vPpcze84nqwzspoJsdqmdkJmk="; nativeBuildInputs = [ installShellFiles ]; From c16af617a88662fb702cd26f3556bb267e36ca64 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 May 2024 01:49:49 +0000 Subject: [PATCH 138/209] opentofu: 1.7.0 -> 1.7.1 --- pkgs/applications/networking/cluster/opentofu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/opentofu/default.nix b/pkgs/applications/networking/cluster/opentofu/default.nix index 2d9b07a3f88d..1c8521d12734 100644 --- a/pkgs/applications/networking/cluster/opentofu/default.nix +++ b/pkgs/applications/networking/cluster/opentofu/default.nix @@ -14,13 +14,13 @@ let package = buildGoModule rec { pname = "opentofu"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "opentofu"; repo = "opentofu"; rev = "v${version}"; - hash = "sha256-e0u8aFua3oMsBafwRPYuWQ9M6DtC7f9LlCDGJ5vdAWE="; + hash = "sha256-201zceUedEl93nyglWJo0f9SDfFX31toP0MzzHQeJds="; }; vendorHash = "sha256-cML742FfWFNIwGyIdRd3JWcfDlOXnJVgUXz4j5fa74Q="; From fac6b8cf3a1b231fb57be8947a3e917f6ca109db Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 4 May 2024 21:30:26 +0100 Subject: [PATCH 139/209] nano: 7.2 -> 8.0 Changes: https://www.nano-editor.org/news.php --- pkgs/applications/editors/nano/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 7221e0a6c517..ff68ffb60034 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, fetchFromGitHub, ncurses, texinfo, writeScript -, common-updater-scripts, git, nix, nixfmt-classic, coreutils, gnused, callPackage -, file ? null, gettext ? null, enableNls ? true, enableTiny ? false }: +, common-updater-scripts, git, nix, nixfmt-classic, coreutils, gnused +, callPackage, file ? null, gettext ? null, enableNls ? true, enableTiny ? false +}: assert enableNls -> (gettext != null); @@ -14,11 +15,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "7.2"; + version = "8.0"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - sha256 = "hvNEJ2i9KHPOxpP4PN+AtLRErTzBR2C3Q2FHT8h6RSY="; + sha256 = "wX9D/A43M2sz7lCiCccB1b64CK3C2fCJyoMbQFOcmsQ="; }; nativeBuildInputs = [ texinfo ] ++ lib.optional enableNls gettext; @@ -32,7 +33,9 @@ in stdenv.mkDerivation rec { (lib.enableFeature enableTiny "tiny") ]; - postInstall = if enableTiny then null else '' + postInstall = if enableTiny then + null + else '' cp ${nixSyntaxHighlight}/nix.nanorc $out/share/nano/ ''; From d14678461f9a10586367b4658cdf4b1d94d949de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 May 2024 05:17:32 +0000 Subject: [PATCH 140/209] galene: 0.8.1 -> 0.8.2 --- pkgs/servers/web-apps/galene/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/web-apps/galene/default.nix b/pkgs/servers/web-apps/galene/default.nix index 73503242378a..cdbdd675a92d 100644 --- a/pkgs/servers/web-apps/galene/default.nix +++ b/pkgs/servers/web-apps/galene/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "galene"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "jech"; repo = "galene"; rev = "galene-${version}"; - hash = "sha256-CeyxeZPvClKxjEU5GYqZzV2SCyHNAktHNQbmN9wUa+4="; + hash = "sha256-536n2ZCKlWDV9MqiNBpWocwnDUFekRcN+N5DuIzq9a4="; }; - vendorHash = "sha256-NT6bNVoh26I4z/QUSJWwF5YDuzf3LUc/7OQgtslc4ME="; + vendorHash = "sha256-J0pQm2TqlYwtMNuR/53SnpAwl9L9rq7FpVd3F9M0qso="; ldflags = [ "-s" "-w" ]; preCheck = "export TZ=UTC"; From 3c72771cebb978ed5da2551469ffae72885399c2 Mon Sep 17 00:00:00 2001 From: annalee <168274788+annaleeleaves@users.noreply.github.com> Date: Thu, 9 May 2024 05:21:57 +0000 Subject: [PATCH 141/209] python31{1,2}Packages.glyphslib: 6.7.0 -> 6.7.1 https://github.com/googlefonts/glyphsLib/releases/tag/v6.7.1 --- pkgs/development/python-modules/glyphslib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/glyphslib/default.nix b/pkgs/development/python-modules/glyphslib/default.nix index 37f527f29e1b..99e519ef3728 100644 --- a/pkgs/development/python-modules/glyphslib/default.nix +++ b/pkgs/development/python-modules/glyphslib/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "glyphslib"; - version = "6.7.0"; + version = "6.7.1"; format = "pyproject"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "googlefonts"; repo = "glyphsLib"; rev = "refs/tags/v${version}"; - hash = "sha256-Fhp/2nK1LFgpJ3J7ZTxl2jKT6sCDyqT5qlLCtbnUejM="; + hash = "sha256-mUwbUGLhxwoYEwjbT558rTA8dtWxQXyqWYNEVy/WpIU="; }; nativeBuildInputs = [ setuptools-scm ]; From e197b29754e3b8de647bd75a2f98ff7dd79ffb14 Mon Sep 17 00:00:00 2001 From: annalee <168274788+annaleeleaves@users.noreply.github.com> Date: Thu, 9 May 2024 05:08:10 +0000 Subject: [PATCH 142/209] python31{1,2}Packages.glyphsets: 0.6.19 -> 1.0.0 https://github.com/googlefonts/glyphsets/releases/tag/v1.0.0 --- pkgs/development/python-modules/glyphsets/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/glyphsets/default.nix b/pkgs/development/python-modules/glyphsets/default.nix index 5decc00464a3..a686f67a64d9 100644 --- a/pkgs/development/python-modules/glyphsets/default.nix +++ b/pkgs/development/python-modules/glyphsets/default.nix @@ -6,6 +6,7 @@ , gflanguages , glyphslib , pytestCheckHook +, pyyaml , requests , setuptools , setuptools-scm @@ -14,12 +15,12 @@ buildPythonPackage rec { pname = "glyphsets"; - version = "0.6.19"; + version = "1.0.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-vO9gzMCXPlkkM9MtRhlulAnQi6uZMtJU1NqcP8w6tCo="; + hash = "sha256-fa+W1IGIZcn1P1xNKm1Yb/TOuf4QdDVnIvlDkOLOcLY="; }; dependencies = [ @@ -27,6 +28,7 @@ buildPythonPackage rec { fonttools gflanguages glyphslib + pyyaml requests setuptools unicodedata2 From 4e295b648eb40e76c841aa0e9f0875d2ae73e6a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 May 2024 05:31:34 +0000 Subject: [PATCH 143/209] cargo-whatfeatures: 0.9.11 -> 0.9.12 --- pkgs/development/tools/rust/cargo-whatfeatures/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-whatfeatures/default.nix b/pkgs/development/tools/rust/cargo-whatfeatures/default.nix index e040971df830..2aa7b4760ca1 100644 --- a/pkgs/development/tools/rust/cargo-whatfeatures/default.nix +++ b/pkgs/development/tools/rust/cargo-whatfeatures/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-whatfeatures"; - version = "0.9.11"; + version = "0.9.12"; src = fetchFromGitHub { owner = "museun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lCS0EDSNnCii98OBZlPwwq7LBociN7zo8FZJvxt9X4w="; + sha256 = "sha256-62eEHxX+Gsz+Bif1ev0nTRituRkfqlGYZfa9cFkO26M="; }; - cargoHash = "sha256-SNhulId9naSBO7UxiiX7q0RIVJngflAO2UfpxvKDIF4="; + cargoHash = "sha256-bk/mbQu4lzhA9ct7cws70MYuj8oNEBgC+0EjHlaN1lc="; nativeBuildInputs = [ pkg-config ]; From 5de1fb484354f877a1714e998986d7f05ac663b2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 May 2024 05:32:13 +0000 Subject: [PATCH 144/209] monkeysAudio: 10.71 -> 10.72 --- pkgs/applications/audio/monkeys-audio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix index 0018c99bc1af..3fdcda98d116 100644 --- a/pkgs/applications/audio/monkeys-audio/default.nix +++ b/pkgs/applications/audio/monkeys-audio/default.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "10.71"; + version = "10.72"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${ builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - hash = "sha256-YHPC+dHfvRSr6GldWSlgCGt/wuO/WXQGRliarnM8/AU="; + hash = "sha256-vtpQhCV1hkme69liTO13vz+kxpA3zJ+U1In/4z6qLbQ="; stripRoot = false; }; nativeBuildInputs = [ From 9964c3c2262d0157b20bb31811547028d1584f9d Mon Sep 17 00:00:00 2001 From: annalee <168274788+annaleeleaves@users.noreply.github.com> Date: Thu, 9 May 2024 05:40:01 +0000 Subject: [PATCH 145/209] python31{1,2}Packages.fontmake: migrate to pyproject; unbreak --- pkgs/development/python-modules/fontmake/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/fontmake/default.nix b/pkgs/development/python-modules/fontmake/default.nix index d46083361e80..9ad75847b466 100644 --- a/pkgs/development/python-modules/fontmake/default.nix +++ b/pkgs/development/python-modules/fontmake/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "fontmake"; version = "3.9.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; From 7d414b938fa31580fc3352465eeb2a2fde31f201 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Thu, 9 May 2024 08:05:49 +0200 Subject: [PATCH 146/209] tbs: 20231210 -> 20240506 --- pkgs/os-specific/linux/tbs/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/tbs/default.nix b/pkgs/os-specific/linux/tbs/default.nix index 5805a400c1e2..4d4a1a96ce5f 100644 --- a/pkgs/os-specific/linux/tbs/default.nix +++ b/pkgs/os-specific/linux/tbs/default.nix @@ -5,22 +5,22 @@ let name = repo; owner = "tbsdtv"; repo = "linux_media"; - rev = "d0a7e44358f28064697e0eed309db03166dcd83b"; - hash = "sha256-BTHlnta5qv2bdPjD2bButwYGpwR/bq99/AUoZqTHHYw="; + rev = "d8d1ff33c0c47e34fe3e860b52b4d6c457520866"; + hash = "sha256-1Z9itZ5GFpfUeRtp5xTnS+I91LUZLDhsEcF2v8ThaCs="; }; build = fetchFromGitHub rec { name = repo; owner = "tbsdtv"; repo = "media_build"; - rev = "88764363a3e3d36b3c59a0a2bf2244e262035d47"; - hash = "sha256-LFTxYVPudflxqYTSBIDNkTrGs09MOuYBXwpGYqWfEFQ="; + rev = "8cd12a6e90999f3a341018812a5d66d7e6b30913"; + hash = "sha256-+I0NrML54ni37qgDHbRUQiLmmw/UZgXmoFoiDNDeH5A="; }; in stdenv.mkDerivation { pname = "tbs"; - version = "20231210-${kernel.version}"; + version = "20240506-${kernel.version}"; srcs = [ media build ]; sourceRoot = build.name; @@ -66,6 +66,6 @@ stdenv.mkDerivation { license = licenses.gpl2; maintainers = with maintainers; [ ck3d ]; priority = -1; - broken = kernel.kernelOlder "4.14" || kernel.kernelAtLeast "6.6"; + broken = kernel.kernelOlder "4.14" || kernel.kernelAtLeast "6.9"; }; } From 6786f11afb32786abab5541b8ce9309f64173c15 Mon Sep 17 00:00:00 2001 From: Chuang Zhu Date: Mon, 6 May 2024 07:39:01 +0800 Subject: [PATCH 147/209] curl-impersonate: install headers --- pkgs/tools/networking/curl-impersonate/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/networking/curl-impersonate/default.nix b/pkgs/tools/networking/curl-impersonate/default.nix index 2ea3ac6a09a2..53db8a622080 100644 --- a/pkgs/tools/networking/curl-impersonate/default.nix +++ b/pkgs/tools/networking/curl-impersonate/default.nix @@ -31,6 +31,8 @@ let pname = "curl-impersonate-${name}"; version = "0.6.1"; + outputs = [ "out" "dev" ]; + src = fetchFromGitHub { owner = "lwthiker"; repo = "curl-impersonate"; @@ -130,6 +132,9 @@ let # Install zsh and fish completions installShellCompletion $TMPDIR/curl-impersonate-${name}.{zsh,fish} + + # Install headers + make -C curl-*/include install ''; preFixup = let From 93f99c29199aad4d7610639dd6c5fb50fd9291e8 Mon Sep 17 00:00:00 2001 From: Chuang Zhu Date: Mon, 6 May 2024 07:39:37 +0800 Subject: [PATCH 148/209] python3Packages.curl-cffi: init at 0.6.3 --- .../python-modules/curl-cffi/default.nix | 49 +++++++++++++++++++ .../curl-cffi/use-system-libs.patch | 23 +++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 74 insertions(+) create mode 100644 pkgs/development/python-modules/curl-cffi/default.nix create mode 100644 pkgs/development/python-modules/curl-cffi/use-system-libs.patch diff --git a/pkgs/development/python-modules/curl-cffi/default.nix b/pkgs/development/python-modules/curl-cffi/default.nix new file mode 100644 index 000000000000..3f752f703bf7 --- /dev/null +++ b/pkgs/development/python-modules/curl-cffi/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, curl-impersonate-chrome +, cffi +, certifi +}: + +buildPythonPackage rec { + pname = "curl-cffi"; + version = "0.6.3"; + + src = fetchFromGitHub { + owner = "yifeikong"; + repo = "curl_cffi"; + rev = "v${version}"; + hash = "sha256-VeBh5wp/VEMDGR2YK06w34hBv9qHIyA+EiZHrhEhAGw="; + }; + + patches = [ + ./use-system-libs.patch + ]; + buildInputs = [ + curl-impersonate-chrome + ]; + + format = "pyproject"; + build-system = [ + setuptools + ]; + + nativeBuildInputs = [ + cffi + ]; + propagatedBuildInputs = [ + cffi + certifi + ]; + + pythonImportsCheck = [ "curl_cffi" ]; + + meta = with lib; { + description = "Python binding for curl-impersonate via cffi"; + homepage = "https://curl-cffi.readthedocs.io"; + license = licenses.mit; + maintainers = with maintainers; [ chuangzhu ]; + }; +} diff --git a/pkgs/development/python-modules/curl-cffi/use-system-libs.patch b/pkgs/development/python-modules/curl-cffi/use-system-libs.patch new file mode 100644 index 000000000000..1d044873e461 --- /dev/null +++ b/pkgs/development/python-modules/curl-cffi/use-system-libs.patch @@ -0,0 +1,23 @@ +diff --git a/scripts/build.py b/scripts/build.py +index b705a0d..9bfcaab 100644 +--- a/scripts/build.py ++++ b/scripts/build.py +@@ -105,7 +105,6 @@ def get_curl_libraries(): + ffibuilder = FFI() + system = platform.system() + root_dir = Path(__file__).parent.parent +-download_libcurl() + + + ffibuilder.set_source( +@@ -114,9 +113,7 @@ ffibuilder.set_source( + #include "shim.h" + """, + # FIXME from `curl-impersonate` +- libraries=get_curl_libraries(), +- extra_objects=get_curl_archives(), +- library_dirs=[arch["libdir"]], ++ libraries=["curl-impersonate-chrome"], + source_extension=".c", + include_dirs=[ + str(root_dir / "include"), diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5bc4ada81896..6da27c72faa7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2636,6 +2636,8 @@ self: super: with self; { curlify = callPackage ../development/python-modules/curlify { }; + curl-cffi = callPackage ../development/python-modules/curl-cffi { }; + curtsies = callPackage ../development/python-modules/curtsies { }; curve25519-donna = callPackage ../development/python-modules/curve25519-donna { }; From 96a608f3d2f1ae2044cc1b08936ff39df246e6fc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 May 2024 09:42:50 +0200 Subject: [PATCH 149/209] kubescape: format with nixfmt --- pkgs/tools/security/kubescape/default.nix | 34 +++++++++++------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix index 985eea01f364..bfc482613d54 100644 --- a/pkgs/tools/security/kubescape/default.nix +++ b/pkgs/tools/security/kubescape/default.nix @@ -1,11 +1,12 @@ -{ lib -, stdenv -, buildGoModule -, fetchFromGitHub -, git -, installShellFiles -, kubescape -, testers +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + git, + installShellFiles, + kubescape, + testers, }: buildGoModule rec { @@ -22,17 +23,11 @@ buildGoModule rec { vendorHash = "sha256-WPa6IKPjdBtoHYKA2yYtaI1LCbkyv374fcThxbSEKxo="; - subPackages = [ - "." - ]; + subPackages = [ "." ]; - nativeBuildInputs = [ - installShellFiles - ]; + nativeBuildInputs = [ installShellFiles ]; - nativeCheckInputs = [ - git - ]; + nativeCheckInputs = [ git ]; ldflags = [ "-s" @@ -89,7 +84,10 @@ buildGoModule rec { Jenkins, CircleCI and Github workflows. ''; license = licenses.asl20; - maintainers = with maintainers; [ fab jk ]; + maintainers = with maintainers; [ + fab + jk + ]; mainProgram = "kubescape"; broken = stdenv.isDarwin; }; From 6c7320a2e2aa5fa216fdab5ff93a70e142491e0e Mon Sep 17 00:00:00 2001 From: Sam <30577766+Samasaur1@users.noreply.github.com> Date: Thu, 9 May 2024 00:50:58 -0700 Subject: [PATCH 150/209] mtr: add meta.mainProgram --- pkgs/tools/networking/mtr/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index e62b4547525a..6343cf53fb2a 100644 --- a/pkgs/tools/networking/mtr/default.nix +++ b/pkgs/tools/networking/mtr/default.nix @@ -53,6 +53,7 @@ stdenv.mkDerivation rec { homepage = "https://www.bitwizard.nl/mtr/"; license = licenses.gpl2Only; maintainers = with maintainers; [ koral orivej raskin globin ]; + mainProgram = "mtr"; platforms = platforms.unix; }; } From fe6d7b04bd879d782b172e6efbef502a294b9ea0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 May 2024 10:02:42 +0200 Subject: [PATCH 151/209] python312Packages.json-schema-for-humans: refactor --- .../python-modules/json-schema-for-humans/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix index de8f63fea748..a26e35ce9cbf 100644 --- a/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -35,12 +35,15 @@ buildPythonPackage rec { "dataclasses-json" ]; - nativeBuildInputs = [ + build-system = [ poetry-core + ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + dependencies = [ click dataclasses-json htmlmin @@ -70,10 +73,10 @@ buildPythonPackage rec { meta = with lib; { description = "Quickly generate HTML documentation from a JSON schema"; - mainProgram = "generate-schema-doc"; homepage = "https://github.com/coveooss/json-schema-for-humans"; changelog = "https://github.com/coveooss/json-schema-for-humans/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ astro ]; + mainProgram = "generate-schema-doc"; }; } From 96d18bf71b2ecb971b2cbb92559b6ec66e33a26c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 May 2024 10:03:13 +0200 Subject: [PATCH 152/209] python312Packages.json-schema-for-humans: format with nixfmt --- .../json-schema-for-humans/default.nix | 51 ++++++++----------- 1 file changed, 22 insertions(+), 29 deletions(-) diff --git a/pkgs/development/python-modules/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix index a26e35ce9cbf..e96a5b37db43 100644 --- a/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -1,20 +1,21 @@ -{ lib -, beautifulsoup4 -, buildPythonPackage -, click -, dataclasses-json -, fetchFromGitHub -, htmlmin -, jinja2 -, markdown2 -, poetry-core -, pygments -, pytestCheckHook -, pythonOlder -, pythonRelaxDepsHook -, pytz -, pyyaml -, requests +{ + lib, + beautifulsoup4, + buildPythonPackage, + click, + dataclasses-json, + fetchFromGitHub, + htmlmin, + jinja2, + markdown2, + poetry-core, + pygments, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, + pytz, + pyyaml, + requests, }: buildPythonPackage rec { @@ -31,17 +32,11 @@ buildPythonPackage rec { hash = "sha256-ZlGIttfFOL4uLgzXIFvmyFDGrm8/Vr94QaFSn4/5ITI="; }; - pythonRelaxDeps = [ - "dataclasses-json" - ]; + pythonRelaxDeps = [ "dataclasses-json" ]; - build-system = [ - poetry-core - ]; + build-system = [ poetry-core ]; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ click @@ -67,9 +62,7 @@ buildPythonPackage rec { "TestMdGenerate" ]; - pythonImportsCheck = [ - "json_schema_for_humans" - ]; + pythonImportsCheck = [ "json_schema_for_humans" ]; meta = with lib; { description = "Quickly generate HTML documentation from a JSON schema"; From 1a964af2b298cf68d9a354a99983ca62da69f782 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 May 2024 01:37:57 +0000 Subject: [PATCH 153/209] liquidsoap: 2.2.4 -> 2.2.5 --- pkgs/tools/audio/liquidsoap/full.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index f4fac11df220..c8a0d266a6c8 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -7,7 +7,7 @@ let pname = "liquidsoap"; - version = "2.2.4"; + version = "2.2.5"; in stdenv.mkDerivation { inherit pname version; @@ -16,7 +16,7 @@ stdenv.mkDerivation { owner = "savonet"; repo = "liquidsoap"; rev = "refs/tags/v${version}"; - hash = "sha256-aAW3PeobTRVi5mV321MHZ6RymvOY4DbZITjwcMwGwFo="; + hash = "sha256-o3P7oTizO2l2WkB4LormZ/Ses5jZOpgQ1r1zB1Y3Bjs="; }; postPatch = '' From 5caf4b9c39057a8d6df0c2d397032bce552e9769 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Thu, 9 May 2024 05:57:40 +0200 Subject: [PATCH 154/209] liquidsoap: add meta.changelog --- pkgs/tools/audio/liquidsoap/full.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index c8a0d266a6c8..5d749f1a818d 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -129,12 +129,13 @@ stdenv.mkDerivation { ocamlPackages.yaml ]; - meta = with lib; { + meta = { description = "Swiss-army knife for multimedia streaming"; mainProgram = "liquidsoap"; homepage = "https://www.liquidsoap.info/"; - maintainers = with maintainers; [ dandellion ehmry ]; - license = licenses.gpl2Plus; + changelog = "https://raw.githubusercontent.com/savonet/liquidsoap/main/CHANGES.md"; + maintainers = with lib.maintainers; [ dandellion ehmry ]; + license = lib.licenses.gpl2Plus; platforms = ocamlPackages.ocaml.meta.platforms or []; }; } From 46a3798b9932bfbd425c6b808ae4eb66a59eb240 Mon Sep 17 00:00:00 2001 From: Leah Amelia Chen Date: Wed, 8 May 2024 13:11:20 +0200 Subject: [PATCH 155/209] async-profiler: 2.9 -> 3.0, migrate to by-name & modernize Also added meta.mainProgram, reformatted with nixfmt-rfc-style, and made it build on Java versions >20. --- pkgs/by-name/as/async-profiler/package.nix | 46 +++++++++++++++++++ .../tools/async-profiler/default.nix | 44 ------------------ pkgs/top-level/all-packages.nix | 2 - 3 files changed, 46 insertions(+), 46 deletions(-) create mode 100644 pkgs/by-name/as/async-profiler/package.nix delete mode 100644 pkgs/development/tools/async-profiler/default.nix diff --git a/pkgs/by-name/as/async-profiler/package.nix b/pkgs/by-name/as/async-profiler/package.nix new file mode 100644 index 000000000000..4e7f2c1761db --- /dev/null +++ b/pkgs/by-name/as/async-profiler/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenv, + fetchFromGitHub, + jdk, + makeWrapper, +}: +stdenv.mkDerivation rec { + pname = "async-profiler"; + version = "3.0"; + + src = fetchFromGitHub { + owner = "jvm-profiling-tools"; + repo = "async-profiler"; + rev = "v${version}"; + hash = "sha256-0CCJoRjRLq4LpiRD0ibzK8So9qSQymePCTYUI60Oy2k="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ jdk ]; + + installPhase = + let + ext = stdenv.hostPlatform.extensions.sharedLibrary; + in + '' + runHook preInstall + install -D build/bin/asprof "$out/bin/async-profiler" + install -D build/lib/libasyncProfiler${ext} "$out/lib/libasyncProfiler${ext}" + runHook postInstall + ''; + + fixupPhase = '' + wrapProgram $out/bin/async-profiler --prefix PATH : ${lib.makeBinPath [ jdk ]} + ''; + + meta = with lib; { + description = "A low overhead sampling profiler for Java that does not suffer from Safepoint bias problem"; + homepage = "https://github.com/jvm-profiling-tools/async-profiler"; + license = licenses.asl20; + maintainers = with maintainers; [ mschuwalow ]; + platforms = platforms.all; + mainProgram = "async-profiler"; + }; +} diff --git a/pkgs/development/tools/async-profiler/default.nix b/pkgs/development/tools/async-profiler/default.nix deleted file mode 100644 index 57bb70c1dff1..000000000000 --- a/pkgs/development/tools/async-profiler/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, jdk, makeWrapper }: - -stdenv.mkDerivation rec { - pname = "async-profiler"; - version = "2.9"; - - src = fetchFromGitHub { - owner = "jvm-profiling-tools"; - repo = "async-profiler"; - rev = "v${version}"; - sha256 = "sha256-ngLUg6Fq6Ay06klGa/y8lod8W6rYMqhMhXFn5OBCSpk="; - }; - - nativeBuildInputs = [ makeWrapper ]; - - buildInputs = [ jdk ]; - - installPhase = '' - runHook preInstall - install -D "$src/profiler.sh" "$out/bin/async-profiler" - install -D build/jattach "$out/bin/jattach" - install -D build/libasyncProfiler.so "$out/lib/libasyncProfiler.so" - install -D -t "$out/share/java/" build/*.jar - runHook postInstall - ''; - - fixupPhase = '' - substituteInPlace $out/bin/async-profiler \ - --replace 'JATTACH=$SCRIPT_DIR/build/jattach' \ - 'JATTACH=${placeholder "out"}/bin/jattach' \ - --replace 'PROFILER=$SCRIPT_DIR/build/libasyncProfiler.so' \ - 'PROFILER=${placeholder "out"}/lib/libasyncProfiler.so' - - wrapProgram $out/bin/async-profiler --prefix PATH : ${lib.makeBinPath [ jdk ]} - ''; - - meta = with lib; { - description = "A low overhead sampling profiler for Java that does not suffer from Safepoint bias problem"; - homepage = "https://github.com/jvm-profiling-tools/async-profiler"; - license = licenses.asl20; - maintainers = with maintainers; [ mschuwalow ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 00a315ee410f..6379188e9123 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3310,8 +3310,6 @@ with pkgs; async = callPackage ../development/tools/async { }; - async-profiler = callPackage ../development/tools/async-profiler { }; - atheme = callPackage ../servers/irc/atheme { }; atinout = callPackage ../tools/networking/atinout { }; From 8baf42676a6430674a4f38494aea94ba596bb7f3 Mon Sep 17 00:00:00 2001 From: GY <20533356+importantblimp@users.noreply.github.com> Date: Thu, 9 May 2024 10:40:13 +1200 Subject: [PATCH 156/209] mindustry: add .desktop category --- pkgs/games/mindustry/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index 0562ff40ac2d..906c6de2795b 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -98,6 +98,7 @@ let desktopName = "Mindustry"; exec = "mindustry"; icon = "mindustry"; + categories = [ "Game" ]; }; cleanupMindustrySrc = '' From 597e641a0642f7d6713b218bc0fd26c010b8886b Mon Sep 17 00:00:00 2001 From: Tom Herbers Date: Thu, 9 May 2024 11:10:23 +0200 Subject: [PATCH 157/209] batman-adv: 2024.0 -> 2024.1 Changelog: https://www.open-mesh.org/news/116 --- pkgs/os-specific/linux/batman-adv/version.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/batman-adv/version.nix b/pkgs/os-specific/linux/batman-adv/version.nix index 545285a6cf42..6292552dd554 100644 --- a/pkgs/os-specific/linux/batman-adv/version.nix +++ b/pkgs/os-specific/linux/batman-adv/version.nix @@ -1,16 +1,16 @@ { - version = "2024.0"; + version = "2024.1"; # To get these, run: # # ``` # for tool in alfred batctl batman-adv; do - # nix-prefetch-url https://downloads.open-mesh.org/batman/releases/batman-adv-2024.0/$tool-2024.0.tar.gz --type sha256 | xargs nix hash to-sri --type sha256 + # nix-prefetch-url https://downloads.open-mesh.org/batman/releases/batman-adv-2024.1/$tool-2024.1.tar.gz --type sha256 | xargs nix hash to-sri --type sha256 # done # ``` sha256 = { - alfred = "sha256-0CmkNjirFnceX3HhNLyEPRcT10BBxlvNoYox0Y9VMb0="; - batctl = "sha256-doU+hyAa9jxBHbFS/QxiWnKalzMRWJfRMxYE4sWmfH0="; - batman-adv = "sha256-YREGl7V5n2RqKoKk3Pl/rtS7EqfMQ79Gg9LE3k9rQOc="; + alfred = "sha256-Ji2tOcm+EirH8GFwXIo+O21GJ4K74zcubfyazgw4Tbk="; + batctl = "sha256-aD3anWBU6yYKGsACLGQnmP9ASNbFOmcuoLMXjmt1egk="; + batman-adv = "sha256-pxQynGJR9IMOnPA/U8v7IoDwZ4RxtUxdRvrmGngtQyU="; }; } From fc92e0605f62ab34c70953f5330fc1dd8dd4d596 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 May 2024 09:19:32 +0000 Subject: [PATCH 158/209] qcad: 3.29.6.2 -> 3.29.6.4 --- pkgs/applications/misc/qcad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index c36068e65962..e8d216d391d0 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -18,14 +18,14 @@ mkDerivation rec { pname = "qcad"; - version = "3.29.6.2"; + version = "3.29.6.4"; src = fetchFromGitHub { name = "qcad-${version}-src"; owner = "qcad"; repo = "qcad"; rev = "v${version}"; - hash = "sha256-NKWuvhVGtlhWOfV0MWyViTgk0luA8mvnwQS0TZj7Ulc="; + hash = "sha256-/Tz3brcny9wp8DnCvO7GpPczglJpJD0kWzBR6exRlPA="; }; patches = [ From 89367b288689bb4da17a43d8fde71441dd919221 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 May 2024 11:25:09 +0200 Subject: [PATCH 159/209] python312Packages.wktutils: refactor --- .../python-modules/wktutils/default.nix | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/wktutils/default.nix b/pkgs/development/python-modules/wktutils/default.nix index 6b78ba959946..1324922e2743 100644 --- a/pkgs/development/python-modules/wktutils/default.nix +++ b/pkgs/development/python-modules/wktutils/default.nix @@ -3,15 +3,14 @@ , dateparser , defusedxml , fetchFromGitHub -, fiona , geomet , geopandas , kml2geojson , pyshp , pythonOlder , pyyaml -, regex , requests +, setuptools-scm , shapely , scikit-learn }: @@ -19,7 +18,7 @@ buildPythonPackage rec { pname = "wktutils"; version = "2.0.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -30,25 +29,32 @@ buildPythonPackage rec { hash = "sha256-mB+joEZq/aFPcRqFAzPgwG26Wi7WiRCeQeFottk+4Ho="; }; - propagatedBuildInputs = [ + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"twine",' "" + ''; + + build-system = [ + setuptools-scm + ]; + + dependencies = [ dateparser defusedxml - fiona geomet geopandas kml2geojson pyshp pyyaml - regex - requests shapely - scikit-learn ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "sklearn" "scikit-learn" - ''; + passthru.optional-dependencies = { + extras = [ + requests + scikit-learn + ]; + }; # Module doesn't have tests doCheck = false; @@ -60,6 +66,7 @@ buildPythonPackage rec { meta = with lib; { description = "Collection of tools for handling WKTs"; homepage = "https://github.com/asfadmin/Discovery-WKTUtils"; + changelog = "https://github.com/asfadmin/Discovery-WKTUtils/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; From 13472345563f49623d0d5f264c81d684dd2b81d2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 May 2024 11:25:32 +0200 Subject: [PATCH 160/209] python312Packages.wktutils: format with nixfmt --- .../python-modules/wktutils/default.nix | 39 +++++++++---------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/wktutils/default.nix b/pkgs/development/python-modules/wktutils/default.nix index 1324922e2743..23529f04a356 100644 --- a/pkgs/development/python-modules/wktutils/default.nix +++ b/pkgs/development/python-modules/wktutils/default.nix @@ -1,18 +1,19 @@ -{ lib -, buildPythonPackage -, dateparser -, defusedxml -, fetchFromGitHub -, geomet -, geopandas -, kml2geojson -, pyshp -, pythonOlder -, pyyaml -, requests -, setuptools-scm -, shapely -, scikit-learn +{ + lib, + buildPythonPackage, + dateparser, + defusedxml, + fetchFromGitHub, + geomet, + geopandas, + kml2geojson, + pyshp, + pythonOlder, + pyyaml, + requests, + setuptools-scm, + shapely, + scikit-learn, }: buildPythonPackage rec { @@ -34,9 +35,7 @@ buildPythonPackage rec { --replace-fail '"twine",' "" ''; - build-system = [ - setuptools-scm - ]; + build-system = [ setuptools-scm ]; dependencies = [ dateparser @@ -59,9 +58,7 @@ buildPythonPackage rec { # Module doesn't have tests doCheck = false; - pythonImportsCheck = [ - "WKTUtils" - ]; + pythonImportsCheck = [ "WKTUtils" ]; meta = with lib; { description = "Collection of tools for handling WKTs"; From 06667e028f776b03062a128db4b14b1f4ae92ef5 Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Thu, 9 May 2024 11:22:42 +0200 Subject: [PATCH 161/209] nixos/portunus: fix dangling service files for dex --- nixos/modules/services/misc/portunus.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/misc/portunus.nix b/nixos/modules/services/misc/portunus.nix index ab78479c96cd..bdb35da788e3 100644 --- a/nixos/modules/services/misc/portunus.nix +++ b/nixos/modules/services/misc/portunus.nix @@ -231,12 +231,14 @@ in }; systemd.services = { - dex.serviceConfig = mkIf cfg.dex.enable { - # `dex.service` is super locked down out of the box, but we need some - # place to write the SQLite database. This creates $STATE_DIRECTORY below - # /var/lib/private because DynamicUser=true, but it gets symlinked into - # /var/lib/dex inside the unit - StateDirectory = "dex"; + dex = mkIf cfg.dex.enable { + serviceConfig = { + # `dex.service` is super locked down out of the box, but we need some + # place to write the SQLite database. This creates $STATE_DIRECTORY below + # /var/lib/private because DynamicUser=true, but it gets symlinked into + # /var/lib/dex inside the unit + StateDirectory = "dex"; + }; }; portunus = { From e72edcd85085cd788d797ecd21ef8b8449bf7d74 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 May 2024 10:20:26 +0000 Subject: [PATCH 162/209] gitlab-runner: 16.11.0 -> 16.11.1 --- .../tools/continuous-integration/gitlab-runner/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 999a2ce7719b..a0e41743b8de 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitLab, fetchurl, bash }: let - version = "16.11.0"; + version = "16.11.1"; in buildGoModule rec { inherit version; @@ -17,13 +17,13 @@ buildGoModule rec { # For patchShebangs buildInputs = [ bash ]; - vendorHash = "sha256-98ixme01PHbuyCJatWErbzTeuKYSbXsLbZxNGSd+zjY="; + vendorHash = "sha256-ms93Ea2Un/F9TDmNttSxi/CtZGsOnmptCf/hjtgCMB0="; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "sha256-cPY+JAvyRb4+ytx5nwx1BaH/tZ5BW4kgWIEvD6a3aec="; + sha256 = "sha256-ISL11AvKIy/tW/3MhVZ2/XT5RcaYj+x9rHKWAB/9TdU="; }; patches = [ From e953f33121d2060a6d4407d51e5aa89a724e7d7c Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 9 May 2024 00:24:17 +0200 Subject: [PATCH 163/209] python312Packages.skein: unbreak by patching distutils, remove vendorized versioneer --- pkgs/development/python-modules/skein/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/skein/default.nix b/pkgs/development/python-modules/skein/default.nix index ff0884330b39..2f32aa1eeb78 100644 --- a/pkgs/development/python-modules/skein/default.nix +++ b/pkgs/development/python-modules/skein/default.nix @@ -2,6 +2,7 @@ , callPackage , fetchPypi , isPy27 +, pythonOlder , lib , cryptography , grpcio @@ -10,6 +11,8 @@ , hadoop , pytestCheckHook , python +, setuptools +, versioneer }: buildPythonPackage rec { @@ -25,7 +28,8 @@ buildPythonPackage rec { jarHash = "sha256-x2KH6tnoG7sogtjrJvUaxy0PCEA8q/zneuI969oBOKo="; skeinJar = callPackage ./skeinjar.nix { inherit pname version jarHash; }; - propagatedBuildInputs = [ cryptography grpcio pyyaml ]; + propagatedBuildInputs = [ cryptography grpcio pyyaml ] + ++ lib.optionals (!pythonOlder "3.12") [ setuptools ]; buildInputs = [ grpcio-tools ]; preBuild = '' @@ -37,8 +41,17 @@ buildPythonPackage rec { postPatch = '' substituteInPlace skein/core.py --replace "'yarn'" "'${hadoop}/bin/yarn'" \ --replace "else 'java'" "else '${hadoop.jdk}/bin/java'" + # Remove vendorized versioneer + rm versioneer.py + '' + lib.optionalString (!pythonOlder "3.12") '' + substituteInPlace skein/utils.py \ + --replace-fail "distutils" "setuptools._distutils" ''; + build-system = [ + versioneer + ]; + pythonImportsCheck = [ "skein" ]; nativeCheckInputs = [ pytestCheckHook ]; From 98b932ea86da550a556d13440dd47cd647a3000e Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 9 May 2024 12:32:28 +0200 Subject: [PATCH 164/209] python3Packages.skein: remove `meta = with lib;` --- pkgs/development/python-modules/skein/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/skein/default.nix b/pkgs/development/python-modules/skein/default.nix index 2f32aa1eeb78..738a6b21d8e1 100644 --- a/pkgs/development/python-modules/skein/default.nix +++ b/pkgs/development/python-modules/skein/default.nix @@ -64,12 +64,12 @@ buildPythonPackage rec { "test_cli" ]; - meta = with lib; { + meta = { homepage = "https://jcristharif.com/skein"; description = "A tool and library for easily deploying applications on Apache YARN"; mainProgram = "skein"; - license = licenses.bsd3; - maintainers = with maintainers; [ alexbiehl illustris ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ alexbiehl illustris ]; # https://github.com/NixOS/nixpkgs/issues/48663#issuecomment-1083031627 # replace with https://github.com/NixOS/nixpkgs/pull/140325 once it is merged broken = lib.traceIf isPy27 "${pname} not supported on ${python.executable}" isPy27; From bcd689277f0de79c60ba75642e00eea3f954aafa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 04:33:59 +0000 Subject: [PATCH 165/209] spicedb: 1.31.0 -> 1.32.0 --- pkgs/servers/spicedb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/spicedb/default.nix b/pkgs/servers/spicedb/default.nix index 8ded7678a860..e92978b56fd4 100644 --- a/pkgs/servers/spicedb/default.nix +++ b/pkgs/servers/spicedb/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "spicedb"; - version = "1.31.0"; + version = "1.32.0"; src = fetchFromGitHub { owner = "authzed"; repo = "spicedb"; rev = "v${version}"; - hash = "sha256-xbYK+9wTsOIh8fpgbL63JmDzsXFmfPa0TKS06hmwLAg="; + hash = "sha256-PIl5FmXWyp6mkSzTQe7hu4aWeQgGa1YrC5+t1eMQhPY="; }; - vendorHash = "sha256-RBQfrz74Fzse9Rjj6DGfMttbupfSFjP5KbxFHihwMKY="; + vendorHash = "sha256-LrNoIknYY9XIwdyUq7f5pG0IU0WZVSgTNMTFoZAIhp8="; subPackages = [ "cmd/spicedb" ]; From ad55da24c2721fb2d418726f1f55f85120a0d160 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment?= Date: Wed, 8 May 2024 21:35:15 +0200 Subject: [PATCH 166/209] python3Packages.pyrad: add drawbu to meta.maintainers --- pkgs/development/python-modules/pyrad/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyrad/default.nix b/pkgs/development/python-modules/pyrad/default.nix index 7f96cb627008..c9dfdc8ee06a 100644 --- a/pkgs/development/python-modules/pyrad/default.nix +++ b/pkgs/development/python-modules/pyrad/default.nix @@ -70,10 +70,10 @@ buildPythonPackage rec { "pyrad" ]; - meta = with lib; { + meta = { description = "Python RADIUS Implementation"; homepage = "https://github.com/pyradius/pyrad"; - license = licenses.bsd3; - maintainers = with maintainers; [ ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ drawbu ]; }; } From 5500207d41b8a0e49a6797224428399f7ba504bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment?= Date: Wed, 8 May 2024 22:59:08 +0200 Subject: [PATCH 167/209] python3Packages.pyrad: reformat using `nixfmt-rfc-style` --- .../python-modules/pyrad/default.nix | 31 ++++++++----------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/pyrad/default.nix b/pkgs/development/python-modules/pyrad/default.nix index c9dfdc8ee06a..1ecc28cce459 100644 --- a/pkgs/development/python-modules/pyrad/default.nix +++ b/pkgs/development/python-modules/pyrad/default.nix @@ -1,12 +1,13 @@ -{ buildPythonPackage -, fetchFromGitHub -, fetchpatch -, lib -, poetry-core -, netaddr -, six -, unittestCheckHook -, fetchPypi +{ + buildPythonPackage, + fetchFromGitHub, + fetchpatch, + lib, + poetry-core, + netaddr, + six, + unittestCheckHook, + fetchPypi, }: let netaddr_0_8_0 = netaddr.overridePythonAttrs (oldAttrs: rec { @@ -40,9 +41,7 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ - poetry-core - ]; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ netaddr_0_8_0 @@ -62,13 +61,9 @@ buildPythonPackage rec { --replace-quiet "self.assertEquals" "self.assertEqual" ''; - nativeCheckInputs = [ - unittestCheckHook - ]; + nativeCheckInputs = [ unittestCheckHook ]; - pythonImportsCheck = [ - "pyrad" - ]; + pythonImportsCheck = [ "pyrad" ]; meta = { description = "Python RADIUS Implementation"; From 982fe358cae9f81585b4b68b6d80986cee542a74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment?= Date: Thu, 9 May 2024 09:50:32 +0200 Subject: [PATCH 168/209] python3Packages.pyrad: update to `2.4-unstable-2023-06-13` --- .../python-modules/pyrad/default.nix | 24 ++++--------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/pyrad/default.nix b/pkgs/development/python-modules/pyrad/default.nix index 1ecc28cce459..9e2cb672d95a 100644 --- a/pkgs/development/python-modules/pyrad/default.nix +++ b/pkgs/development/python-modules/pyrad/default.nix @@ -1,7 +1,6 @@ { buildPythonPackage, fetchFromGitHub, - fetchpatch, lib, poetry-core, netaddr, @@ -23,42 +22,27 @@ in buildPythonPackage rec { pname = "pyrad"; - version = "2.4"; + version = "2.4-unstable-2023-06-13"; format = "pyproject"; src = fetchFromGitHub { owner = "pyradius"; repo = pname; - rev = version; - hash = "sha256-oqgkE0xG/8cmLeRZdGoHkaHbjtByeJwzBJwEdxH8oNY="; + rev = "dd34c5a29b46d83b0bea841e85fd72b79f315b87"; + hash = "sha256-U4VVGkDDyN4J/tRDaDGSr2TSA4JmqIoQj5qn9qBAvQU="; }; - patches = [ - (fetchpatch { - # Migrate to poetry-core - url = "https://github.com/pyradius/pyrad/commit/a4b70067dd6269e14a2f9530d820390a8a454231.patch"; - hash = "sha256-1We9wrVY3Or3GLIKK6hZvEjVYv6JOaahgP9zOMvgErE="; - }) - ]; - nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ netaddr_0_8_0 six ]; + preCheck = '' substituteInPlace tests/testServer.py \ --replace-warn "def testBind(self):" "def dontTestBind(self):" \ --replace-warn "def testBindv6(self):" "def dontTestBindv6(self):" \ - - # A lot of test methods have been deprecated since Python 3.1 - # and have been removed in Python 3.12. - # https://docs.python.org/3/whatsnew/3.11.html#pending-removal-in-python-3-12 - substituteInPlace tests/*.py \ - --replace-quiet "self.failUnless" "self.assertTrue" \ - --replace-quiet "self.failIf" "self.assertFalse" \ - --replace-quiet "self.assertEquals" "self.assertEqual" ''; nativeCheckInputs = [ unittestCheckHook ]; From 3f8ff2f06b24a379a193f79046c65a744d8776bd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 9 May 2024 12:57:15 +0200 Subject: [PATCH 169/209] home-assistant: pin sigstore at 1.1.2 Fixes the github component. Closes: #310122 --- pkgs/servers/home-assistant/default.nix | 53 +++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index eab18d3b2dcd..ed315a18df97 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -387,6 +387,46 @@ let }; }); + # newer sigstore version transitivevly require pydantic>=2 + sigstore = super.sigstore.overridePythonAttrs (oldAttrs: rec { + version = "1.1.2"; + src = fetchFromGitHub { + owner = "sigstore"; + repo = "sigstore-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-QqY5GOBS75OkbSaF5Ua5jnJAhsYfVRuWLUoWDxX8Ino="; + }; + dependencies = with self; [ + appdirs + cryptography + id + pydantic + pyjwt + pyopenssl + requests + securesystemslib + sigstore-protobuf-specs + tuf + ]; + doCheck = false; # pytest too new + }); + + sigstore-protobuf-specs = super.sigstore-protobuf-specs.overridePythonAttrs { + version = "0.1.0"; + src = fetchPypi { + pname = "sigstore-protobuf-specs"; + version = "0.1.0"; + hash = "sha256-YistIxYToo7T5mYKzYeBhnW06DSG9JoPDBmKxUdfy4E="; + }; + nativeBuildInputs = with self; [ + flit-core + pythonRelaxDepsHook + ]; + pythonRelaxDeps = [ + "betterproto" + ]; + }; + tesla-powerwall = super.tesla-powerwall.overridePythonAttrs (oldAttrs: rec { version = "0.5.1"; src = fetchFromGitHub { @@ -397,6 +437,19 @@ let }; }); + tuf = super.tuf.overridePythonAttrs rec { + version = "2.1.0"; + src = fetchFromGitHub { + owner = "theupdateframework"; + repo = "python-tuf"; + rev = "refs/tags/v${version}"; + hash = "sha256-MdPctAZuKn/YAwpMJ5gWU7PXJD3iK7bYprLXV52wNQQ="; + }; + disabledTests = [ + "test_sign_failures" + ]; + }; + versioningit = super.versioningit.overridePythonAttrs { doCheck = false; }; From 1bbd237c04dcc6e2c92ed1986bc508f69a2363ea Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 9 May 2024 13:03:15 +0200 Subject: [PATCH 170/209] python312Packages.homeassistant-stubs: 2024.5.1 -> 2024.5.2 https://github.com/KapJI/homeassistant-stubs/releases/tag/2024.5.2 --- pkgs/servers/home-assistant/stubs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 21b9895ba3ef..dd86f2244745 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2024.5.1"; + version = "2024.5.2"; format = "pyproject"; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-lYoYU39/ayZb8Ue25a7uSN5x8tihzjj5mGaVKWPfa1w="; + hash = "sha256-bgXHEz8YuHcdGYzLpM7H8IVXixFC8Bz0i4SaatA49Qo="; }; nativeBuildInputs = [ From 98e7084e4a8200be2f5c3509937c4b9b1ce8f963 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 9 May 2024 13:32:38 +0200 Subject: [PATCH 171/209] python313: 3.13.0a6 -> 3.13.0b1 https://docs.python.org/3.13/whatsnew/changelog.html#python-3-13-0b1 --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 4cc3f6f4e59e..86eaf142d920 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -93,9 +93,9 @@ in { major = "3"; minor = "13"; patch = "0"; - suffix = "a6"; + suffix = "b1"; }; - hash = "sha256-S+85PXKygaz4HTnXRV8AA26GYZPfohpO05cP0PTLoEg="; + hash = "sha256-unFqxWsDm1Ra1KkM5Yaleql4aTZFU3Ru8kRXKM7sGY4="; inherit (darwin) configd; inherit passthruFun; }; From 98919aa46a442a0e6b327702f0688b58c82b8ca2 Mon Sep 17 00:00:00 2001 From: annalee <168274788+annaleeleaves@users.noreply.github.com> Date: Thu, 9 May 2024 11:33:50 +0000 Subject: [PATCH 172/209] python311Packages.astroquery: add missing pytest pluggins --- pkgs/development/python-modules/astroquery/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/astroquery/default.nix b/pkgs/development/python-modules/astroquery/default.nix index 070238d8b2c4..79bb6b03c243 100644 --- a/pkgs/development/python-modules/astroquery/default.nix +++ b/pkgs/development/python-modules/astroquery/default.nix @@ -10,6 +10,8 @@ , pillow , pytest , pytest-astropy +, pytest-dependency +, pytest-rerunfailures , pytestCheckHook , pyvo , astropy-helpers @@ -46,11 +48,16 @@ buildPythonPackage rec { ''; nativeCheckInputs = [ + pytestCheckHook + ]; + + checkInputs = [ matplotlib pillow pytest pytest-astropy - pytestCheckHook + pytest-dependency + pytest-rerunfailures ]; pytestFlagsArray = [ From 2a95e6949babbda147aa13a10d3feacf7f9e0f6b Mon Sep 17 00:00:00 2001 From: annalee <168274788+annaleeleaves@users.noreply.github.com> Date: Thu, 9 May 2024 11:48:14 +0000 Subject: [PATCH 173/209] python31{1,2}Packages.globus-sdk: add missing dep flaky to fix tests --- .../python-modules/globus-sdk/default.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index cd8528125780..5cb49c0e9723 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -2,18 +2,20 @@ , buildPythonPackage , cryptography , fetchFromGitHub +, flaky , pyjwt , pytestCheckHook , pythonOlder , requests , responses +, setuptools , typing-extensions }: buildPythonPackage rec { pname = "globus-sdk"; version = "3.39.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +26,11 @@ buildPythonPackage rec { hash = "sha256-DjGwwpXzYRq5/hiUs/l8kD/yA58vbhvrKirKDlWoAmY="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ cryptography requests pyjwt @@ -34,17 +40,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - responses ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "pyjwt[crypto]>=2.0.0,<3.0.0" "pyjwt[crypto]>=2.0.0,<3.0.0" - ''; - - pytestFlagsArray = [ - "-W" - "ignore::DeprecationWarning" + checkInputs = [ + flaky + responses ]; pythonImportsCheck = [ From efeff02a2b3f425616d320bb6343e1aba88557e7 Mon Sep 17 00:00:00 2001 From: annalee <168274788+annaleeleaves@users.noreply.github.com> Date: Thu, 9 May 2024 12:11:45 +0000 Subject: [PATCH 174/209] python31{1,2}Packages.lmfit: unbreak - add missing dep dill - convert to pyproject - point substituteInPlace to pyproject.toml - remove working tests from skip array --- pkgs/development/python-modules/lmfit/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/lmfit/default.nix b/pkgs/development/python-modules/lmfit/default.nix index 30ccb1cb5c5d..5df47bc867a1 100644 --- a/pkgs/development/python-modules/lmfit/default.nix +++ b/pkgs/development/python-modules/lmfit/default.nix @@ -4,6 +4,7 @@ setuptools, setuptools-scm, asteval, + dill, numpy, scipy, uncertainties, @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "lmfit"; version = "1.3.0"; - format = "pyproject"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -24,7 +25,7 @@ buildPythonPackage rec { }; postPatch = '' - substituteInPlace setup.cfg --replace "--cov=lmfit --cov-report html" "" + substituteInPlace pyproject.toml --replace "--cov=lmfit --cov-report html" "" ''; nativeBuildInputs = [ @@ -34,6 +35,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ asteval + dill numpy scipy uncertainties @@ -45,13 +47,6 @@ buildPythonPackage rec { matplotlib ]; - disabledTests = [ - # https://github.com/lmfit/lmfit-py/issues/878 - "test_emcee_multiprocessing" - "test_explicit_independent_vars" - "test_result_eval_custom_x" - ]; - meta = with lib; { description = "Least-Squares Minimization with Bounds and Constraints"; homepage = "https://lmfit-py.readthedocs.io/"; From 51ec7ea4e91d26dbe7c5baf659931ed70e70da81 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 May 2024 12:32:33 +0000 Subject: [PATCH 175/209] crowdin-cli: 3.19.2 -> 3.19.3 --- pkgs/tools/text/crowdin-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/crowdin-cli/default.nix b/pkgs/tools/text/crowdin-cli/default.nix index af46fb1b6fe9..22a199680492 100644 --- a/pkgs/tools/text/crowdin-cli/default.nix +++ b/pkgs/tools/text/crowdin-cli/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "crowdin-cli"; - version = "3.19.2"; + version = "3.19.3"; src = fetchurl { url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip"; - hash = "sha256-tVfdpyQ/m6ZpVA7YFmkGSnpo8/FirIBEiIqHlUr1TKk="; + hash = "sha256-9SghBr+vyXrzB+zq+J0hRMVIom4mb4x0xBSqS4EqhVM="; }; nativeBuildInputs = [ installShellFiles makeWrapper unzip ]; From 8211a839332e08310d084b2176e19d17d927b477 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Thu, 9 May 2024 14:53:00 +0200 Subject: [PATCH 176/209] eza: 0.18.14 -> 0.18.15 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christina Sørensen --- pkgs/by-name/ez/eza/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index c98ef92ae918..6080850add19 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.18.14"; + version = "0.18.15"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-rbaKDOxHttE4SgQdExO8mlgzM0+xpWl/fL39nPinK/o="; + hash = "sha256-8Kv2jDWb1HDjxeGZ36btQM/b+lx3yKkkvMxDyzmMUvw="; }; - cargoHash = "sha256-D0h39p8vV9Vm/UgjtgpRnqaxq4l0OrGxN/1MRpUds2g="; + cargoHash = "sha256-xV1pa2vQwB9u7KUMiTawuVSgg7fmxOUxz6tFsyXak8o="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] From ca8ea04cd4fb325a349abda7619829f6a5f57fc9 Mon Sep 17 00:00:00 2001 From: Yaya Date: Wed, 8 May 2024 16:18:51 +0200 Subject: [PATCH 177/209] gitlab: 16.10.4 -> 16.10.5 https://gitlab.com/gitlab-org/gitlab/-/blob/v16.10.5-ee/CHANGELOG.md Fixes CVE-2023-6195 Fixes CVE-2023-6682 Fixes CVE-2023-6688 Fixes CVE-2024-1211 Fixes CVE-2024-1539 Fixes CVE-2024-2454 Fixes CVE-2024-2651 Fixes CVE-2024-2878 Fixes CVE-2024-3976 Fixes CVE-2024-4539 Fixes CVE-2024-4597 --- .../applications/version-management/gitlab/data.json | 12 ++++++------ .../version-management/gitlab/gitaly/default.nix | 6 +++--- .../gitlab/gitlab-pages/default.nix | 4 ++-- .../gitlab/gitlab-workhorse/default.nix | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index ff2bbcf877c0..03ad46e65943 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "16.10.4", - "repo_hash": "sha256-ieS2MO5jBNBK0hmuWLfaDjRNhn98927hlTFrDbV0zCQ=", + "version": "16.10.5", + "repo_hash": "sha256-w2cXFIm588Q/SB1kO9dGCmxO3+Xee7BaCCipuVcnfXg=", "yarn_hash": "0yzywfg4lqxjwm5cqsm4bn97zcrfvpnrs8rjrv9wv3xqvi9h9skd", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v16.10.4-ee", + "rev": "v16.10.5-ee", "passthru": { - "GITALY_SERVER_VERSION": "16.10.4", - "GITLAB_PAGES_VERSION": "16.10.4", + "GITALY_SERVER_VERSION": "16.10.5", + "GITLAB_PAGES_VERSION": "16.10.5", "GITLAB_SHELL_VERSION": "14.34.0", "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.8.0", - "GITLAB_WORKHORSE_VERSION": "16.10.4" + "GITLAB_WORKHORSE_VERSION": "16.10.5" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index ac63b4296b7a..981e5cfcc5ac 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -6,7 +6,7 @@ }: let - version = "16.10.4"; + version = "16.10.5"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -18,10 +18,10 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-dzHGnZwXomCUrlup9VD/0l084Swp9CVi4nJi6MtOwi8="; + hash = "sha256-ctJfw4aU5qsv+I3rR9xZPGssYQpTnbn4MdTVOYapHqQ="; }; - vendorHash = "sha256-mPoz+y1LWpGr+zYqAhxzznMyKIPehsDW+WFxklYSC10="; + vendorHash = "sha256-6gZr0/0ZGcFwwAY4IuW2puL/7akMZvaU0ONJGYyyJas="; ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index 5ca4a1e561f1..1520fd383dcb 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "16.10.4"; + version = "16.10.5"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-Jdg1cxHra4lHvf8+cojaE9OXR40w24OiwMhDYvmUBkI="; + hash = "sha256-wuEYcwAKYO7YZs88NvE0AI5+aZ9JeLBAeXITc2jLGVo="; }; vendorHash = "sha256-WrR4eZRAuYkhr7ZqP7OXqJ6uwvxzn+t+3OdBNcNaq0M="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 98404f4a4f6d..0d0afde0766f 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "16.10.4"; + version = "16.10.5"; # nixpkgs-update: no auto update src = fetchFromGitLab { From 01b405c59d6eba8ecd1b6d02b4558b6a2e8437ee Mon Sep 17 00:00:00 2001 From: Yaya Date: Wed, 8 May 2024 16:19:23 +0200 Subject: [PATCH 178/209] gitlab-container-registry: 3.93.0 -> 4.1.0 https://gitlab.com/gitlab-org/container-registry/-/blob/v4.1.0-gitlab/CHANGELOG.md --- .../gitlab/gitlab-container-registry/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix index 2fd7ab95ed68..747e5ba1b811 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "gitlab-container-registry"; - version = "3.93.0"; + version = "4.1.0"; rev = "v${version}-gitlab"; # nixpkgs-update: no auto update @@ -10,10 +10,10 @@ buildGoModule rec { owner = "gitlab-org"; repo = "container-registry"; inherit rev; - hash = "sha256-4jsnfkHXs9FSnyQ6JP/zmW51x8fHyQ0n+B8EPOoTSAA="; + hash = "sha256-t+i9IuBH94PpfriIAaqqWYZHxKJJDOedJ3BQXGEPp0A="; }; - vendorHash = "sha256-KZWdM8Q8ipsgm7OoLyOuHo+4Vg2Nve+yZtTSUDgjOW4="; + vendorHash = "sha256-sybppXCoTrc196xLBW1+sUg9Y5uA0GAptlJ7RjhzuGc="; postPatch = '' # Disable flaky inmemory storage driver test From 7d5b333dcdf12dc51b7df052ca0fe1969d91e7d4 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Thu, 2 May 2024 09:49:35 -0400 Subject: [PATCH 179/209] nixos/incus: add support for soft daemon restart This is a feature supported out of the box by upstream and allows the incusd service to be restarted without impacting running instances. While this does give up a bit of reproducibility, qemu and lxc for example, there are clear benefits in allowing the host to apply updates without impacting instances. Modeled after the zabbly implementation: https://github.com/zabbly/incus/blob/2a67c3e260de5a5d1259ce598d7b4423c49403be/systemd/incus-startup.service This will now be the default. --- nixos/modules/virtualisation/incus.nix | 74 +++++++++++++++--- nixos/tests/incus/container.nix | 81 ++++++++++--------- nixos/tests/incus/default.nix | 2 +- nixos/tests/incus/incusd-options.nix | 104 +++++++++++++++++++++++++ nixos/tests/incus/preseed.nix | 63 --------------- nixos/tests/incus/virtual-machine.nix | 6 ++ 6 files changed, 219 insertions(+), 111 deletions(-) create mode 100644 nixos/tests/incus/incusd-options.nix delete mode 100644 nixos/tests/incus/preseed.nix diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix index 4d04853d20a5..87568390bd3b 100644 --- a/nixos/modules/virtualisation/incus.nix +++ b/nixos/modules/virtualisation/incus.nix @@ -105,6 +105,37 @@ let path = "${pkgs.OVMFFull.fd}/FV/${ovmf-prefix}_VARS.fd"; } ]; + + environment = lib.mkMerge [ + { + INCUS_LXC_TEMPLATE_CONFIG = "${pkgs.lxcfs}/share/lxc/config"; + INCUS_OVMF_PATH = ovmf; + INCUS_USBIDS_PATH = "${pkgs.hwdata}/share/hwdata/usb.ids"; + PATH = lib.mkForce serverBinPath; + } + (lib.mkIf (cfg.ui.enable) { "INCUS_UI" = cfg.ui.package; }) + ]; + + incus-startup = pkgs.writeShellScript "incus-startup" '' + case "$1" in + start) + systemctl is-active incus.service -q && exit 0 + exec incusd activateifneeded + ;; + + stop) + systemctl is-active incus.service -q || exit 0 + exec incusd shutdown + ;; + + *) + echo "unknown argument \`$1'" >&2 + exit 1 + ;; + esac + + exit 0 + ''; in { meta = { @@ -137,6 +168,14 @@ in description = "The incus client package to use. This package is added to PATH."; }; + softDaemonRestart = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Allow for incus.service to be stopped without affecting running instances. + ''; + }; + preseed = lib.mkOption { type = lib.types.nullOr (lib.types.submodule { freeformType = preseedFormat.type; }); @@ -282,6 +321,8 @@ in systemd.services.incus = { description = "Incus Container and Virtual Machine Management Daemon"; + inherit environment; + wantedBy = lib.mkIf (!cfg.socketActivation) [ "multi-user.target" ]; after = [ "network-online.target" @@ -296,20 +337,10 @@ in wants = [ "network-online.target" ]; - environment = lib.mkMerge [ - { - INCUS_LXC_TEMPLATE_CONFIG = "${pkgs.lxcfs}/share/lxc/config"; - INCUS_OVMF_PATH = ovmf; - INCUS_USBIDS_PATH = "${pkgs.hwdata}/share/hwdata/usb.ids"; - PATH = lib.mkForce serverBinPath; - } - (lib.mkIf (cfg.ui.enable) { "INCUS_UI" = cfg.ui.package; }) - ]; - serviceConfig = { ExecStart = "${cfg.package}/bin/incusd --group incus-admin"; ExecStartPost = "${cfg.package}/bin/incusd waitready --timeout=${cfg.startTimeout}"; - ExecStop = "${cfg.package}/bin/incus admin shutdown"; + ExecStop = lib.optionalString (!cfg.softDaemonRestart) "${cfg.package}/bin/incus admin shutdown"; KillMode = "process"; # when stopping, leave the containers alone Delegate = "yes"; @@ -324,6 +355,27 @@ in }; }; + systemd.services.incus-startup = lib.mkIf cfg.softDaemonRestart { + description = "Incus Instances Startup/Shutdown"; + + inherit environment; + + after = [ + "incus.service" + "incus.socket" + ]; + requires = [ "incus.socket" ]; + + serviceConfig = { + ExecStart = "${incus-startup} start"; + ExecStop = "${incus-startup} stop"; + RemainAfterExit = true; + TimeoutStartSec = "600s"; + TimeoutStopSec = "600s"; + Type = "oneshot"; + }; + }; + systemd.sockets.incus = { description = "Incus UNIX socket"; wantedBy = [ "sockets.target" ]; diff --git a/nixos/tests/incus/container.nix b/nixos/tests/incus/container.nix index a71c5355046a..f6bc295448e2 100644 --- a/nixos/tests/incus/container.nix +++ b/nixos/tests/incus/container.nix @@ -70,51 +70,60 @@ in machine.succeed("incus exec container mount | grep 'lxcfs on /proc/cpuinfo type fuse.lxcfs'") machine.succeed("incus exec container mount | grep 'lxcfs on /proc/meminfo type fuse.lxcfs'") - with subtest("Container CPU limits can be managed"): - set_container("limits.cpu 1") - cpuinfo = machine.succeed("incus exec container grep -- -c ^processor /proc/cpuinfo").strip() - assert cpuinfo == "1", f"Wrong number of CPUs reported from /proc/cpuinfo, want: 1, got: {cpuinfo}" + with subtest("resource limits"): + with subtest("Container CPU limits can be managed"): + set_container("limits.cpu 1") + cpuinfo = machine.succeed("incus exec container grep -- -c ^processor /proc/cpuinfo").strip() + assert cpuinfo == "1", f"Wrong number of CPUs reported from /proc/cpuinfo, want: 1, got: {cpuinfo}" - set_container("limits.cpu 2") - cpuinfo = machine.succeed("incus exec container grep -- -c ^processor /proc/cpuinfo").strip() - assert cpuinfo == "2", f"Wrong number of CPUs reported from /proc/cpuinfo, want: 2, got: {cpuinfo}" + set_container("limits.cpu 2") + cpuinfo = machine.succeed("incus exec container grep -- -c ^processor /proc/cpuinfo").strip() + assert cpuinfo == "2", f"Wrong number of CPUs reported from /proc/cpuinfo, want: 2, got: {cpuinfo}" - with subtest("Container memory limits can be managed"): - set_container("limits.memory 64MB") - meminfo = machine.succeed("incus exec container grep -- MemTotal /proc/meminfo").strip() - meminfo_bytes = " ".join(meminfo.split(' ')[-2:]) - assert meminfo_bytes == "62500 kB", f"Wrong amount of memory reported from /proc/meminfo, want: '62500 kB', got: '{meminfo_bytes}'" + with subtest("Container memory limits can be managed"): + set_container("limits.memory 64MB") + meminfo = machine.succeed("incus exec container grep -- MemTotal /proc/meminfo").strip() + meminfo_bytes = " ".join(meminfo.split(' ')[-2:]) + assert meminfo_bytes == "62500 kB", f"Wrong amount of memory reported from /proc/meminfo, want: '62500 kB', got: '{meminfo_bytes}'" - set_container("limits.memory 128MB") - meminfo = machine.succeed("incus exec container grep -- MemTotal /proc/meminfo").strip() - meminfo_bytes = " ".join(meminfo.split(' ')[-2:]) - assert meminfo_bytes == "125000 kB", f"Wrong amount of memory reported from /proc/meminfo, want: '125000 kB', got: '{meminfo_bytes}'" + set_container("limits.memory 128MB") + meminfo = machine.succeed("incus exec container grep -- MemTotal /proc/meminfo").strip() + meminfo_bytes = " ".join(meminfo.split(' ')[-2:]) + assert meminfo_bytes == "125000 kB", f"Wrong amount of memory reported from /proc/meminfo, want: '125000 kB', got: '{meminfo_bytes}'" - with subtest("lxc-container generator configures plain container"): - # reuse the existing container to save some time - machine.succeed("incus exec container test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf") - check_sysctl("container") + with subtest("lxc-generator"): + with subtest("lxc-container generator configures plain container"): + # reuse the existing container to save some time + machine.succeed("incus exec container test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf") + check_sysctl("container") - with subtest("lxc-container generator configures nested container"): - machine.execute("incus delete --force container") - machine.succeed("incus launch nixos container --config security.nesting=true") - with machine.nested("Waiting for instance to start and be usable"): - retry(instance_is_up) + with subtest("lxc-container generator configures nested container"): + machine.execute("incus delete --force container") + machine.succeed("incus launch nixos container --config security.nesting=true") + with machine.nested("Waiting for instance to start and be usable"): + retry(instance_is_up) - machine.fail("incus exec container test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf") - target = machine.succeed("incus exec container readlink -- -f /run/systemd/system/systemd-binfmt.service").strip() - assert target == "/dev/null", "lxc generator did not correctly mask /run/systemd/system/systemd-binfmt.service" + machine.fail("incus exec container test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf") + target = machine.succeed("incus exec container readlink -- -f /run/systemd/system/systemd-binfmt.service").strip() + assert target == "/dev/null", "lxc generator did not correctly mask /run/systemd/system/systemd-binfmt.service" - check_sysctl("container") + check_sysctl("container") - with subtest("lxc-container generator configures privileged container"): - machine.execute("incus delete --force container") - machine.succeed("incus launch nixos container --config security.privileged=true") - with machine.nested("Waiting for instance to start and be usable"): - retry(instance_is_up) + with subtest("lxc-container generator configures privileged container"): + machine.execute("incus delete --force container") + machine.succeed("incus launch nixos container --config security.privileged=true") + with machine.nested("Waiting for instance to start and be usable"): + retry(instance_is_up) - machine.succeed("incus exec container test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf") + machine.succeed("incus exec container test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf") - check_sysctl("container") + check_sysctl("container") + + with subtest("softDaemonRestart"): + with subtest("Instance remains running when softDaemonRestart is enabled and services is stopped"): + pid = machine.succeed("incus info container | grep 'PID'").split(":")[1].strip() + machine.succeed(f"ps {pid}") + machine.succeed("systemctl stop incus") + machine.succeed(f"ps {pid}") ''; }) diff --git a/nixos/tests/incus/default.nix b/nixos/tests/incus/default.nix index b850c4fba018..d778928a3b9f 100644 --- a/nixos/tests/incus/default.nix +++ b/nixos/tests/incus/default.nix @@ -16,9 +16,9 @@ boot.initrd.systemd.enable = true; }; }; + incusd-options = import ./incusd-options.nix { inherit system pkgs; }; lxd-to-incus = import ./lxd-to-incus.nix { inherit system pkgs; }; openvswitch = import ./openvswitch.nix { inherit system pkgs; }; - preseed = import ./preseed.nix { inherit system pkgs; }; socket-activated = import ./socket-activated.nix { inherit system pkgs; }; storage = import ./storage.nix { inherit system pkgs; }; ui = import ./ui.nix { inherit system pkgs; }; diff --git a/nixos/tests/incus/incusd-options.nix b/nixos/tests/incus/incusd-options.nix new file mode 100644 index 000000000000..b1e7f497fe3e --- /dev/null +++ b/nixos/tests/incus/incusd-options.nix @@ -0,0 +1,104 @@ +# this is a set of tests for non-default options. typically the default options +# will be handled by the other tests +import ../make-test-python.nix ( + { pkgs, lib, ... }: + + let + releases = import ../../release.nix { + configuration = { + # Building documentation makes the test unnecessarily take a longer time: + documentation.enable = lib.mkForce false; + }; + }; + + container-image-metadata = releases.lxdContainerMeta.${pkgs.stdenv.hostPlatform.system}; + container-image-rootfs = releases.lxdContainerImage.${pkgs.stdenv.hostPlatform.system}; + in + { + name = "incusd-options"; + + meta = { + maintainers = lib.teams.lxc.members; + }; + + nodes.machine = { + virtualisation = { + cores = 2; + memorySize = 1024; + diskSize = 4096; + + incus = { + enable = true; + softDaemonRestart = false; + + preseed = { + networks = [ + { + name = "nixostestbr0"; + type = "bridge"; + config = { + "ipv4.address" = "10.0.100.1/24"; + "ipv4.nat" = "true"; + }; + } + ]; + profiles = [ + { + name = "default"; + devices = { + eth0 = { + name = "eth0"; + network = "nixostestbr0"; + type = "nic"; + }; + root = { + path = "/"; + pool = "nixostest_pool"; + size = "35GiB"; + type = "disk"; + }; + }; + } + ]; + storage_pools = [ + { + name = "nixostest_pool"; + driver = "dir"; + } + ]; + }; + }; + }; + networking.nftables.enable = true; + }; + + testScript = '' + def instance_is_up(_) -> bool: + status, _ = machine.execute("incus exec container --disable-stdin --force-interactive /run/current-system/sw/bin/systemctl -- is-system-running") + return status == 0 + + machine.wait_for_unit("incus.service") + machine.wait_for_unit("incus-preseed.service") + + with subtest("Container image can be imported"): + machine.succeed("incus image import ${container-image-metadata}/*/*.tar.xz ${container-image-rootfs}/*/*.tar.xz --alias nixos") + + with subtest("Container can be launched and managed"): + machine.succeed("incus launch nixos container") + with machine.nested("Waiting for instance to start and be usable"): + retry(instance_is_up) + machine.succeed("echo true | incus exec container /run/current-system/sw/bin/bash -") + + with subtest("Verify preseed resources created"): + machine.succeed("incus profile show default") + machine.succeed("incus network info nixostestbr0") + machine.succeed("incus storage show nixostest_pool") + + with subtest("Instance is stopped when softDaemonRestart is disabled and services is stopped"): + pid = machine.succeed("incus info container | grep 'PID'").split(":")[1].strip() + machine.succeed(f"ps {pid}") + machine.succeed("systemctl stop incus") + machine.fail(f"ps {pid}") + ''; + } +) diff --git a/nixos/tests/incus/preseed.nix b/nixos/tests/incus/preseed.nix deleted file mode 100644 index f2d928115f3e..000000000000 --- a/nixos/tests/incus/preseed.nix +++ /dev/null @@ -1,63 +0,0 @@ -import ../make-test-python.nix ({ pkgs, lib, ... } : - -{ - name = "incus-preseed"; - - meta = { - maintainers = lib.teams.lxc.members; - }; - - nodes.machine = { lib, ... }: { - virtualisation = { - incus.enable = true; - - incus.preseed = { - networks = [ - { - name = "nixostestbr0"; - type = "bridge"; - config = { - "ipv4.address" = "10.0.100.1/24"; - "ipv4.nat" = "true"; - }; - } - ]; - profiles = [ - { - name = "nixostest_default"; - devices = { - eth0 = { - name = "eth0"; - network = "nixostestbr0"; - type = "nic"; - }; - root = { - path = "/"; - pool = "default"; - size = "35GiB"; - type = "disk"; - }; - }; - } - ]; - storage_pools = [ - { - name = "nixostest_pool"; - driver = "dir"; - } - ]; - }; - }; - networking.nftables.enable = true; - }; - - testScript = '' - machine.wait_for_unit("incus.service") - machine.wait_for_unit("incus-preseed.service") - - with subtest("Verify preseed resources created"): - machine.succeed("incus profile show nixostest_default") - machine.succeed("incus network info nixostestbr0") - machine.succeed("incus storage show nixostest_pool") - ''; -}) diff --git a/nixos/tests/incus/virtual-machine.nix b/nixos/tests/incus/virtual-machine.nix index eebbbd113ed1..c460447f7832 100644 --- a/nixos/tests/incus/virtual-machine.nix +++ b/nixos/tests/incus/virtual-machine.nix @@ -75,5 +75,11 @@ in machine.succeed("incus config set ${instance-name} limits.cpu=2") count = int(machine.succeed("incus exec ${instance-name} -- nproc").strip()) assert count == 2, f"Wrong number of CPUs reported, want: 2, got: {count}" + + with subtest("Instance remains running when softDaemonRestart is enabled and services is stopped"): + pid = machine.succeed("incus info ${instance-name} | grep 'PID'").split(":")[1].strip() + machine.succeed(f"ps {pid}") + machine.succeed("systemctl stop incus") + machine.succeed(f"ps {pid}") ''; }) From 5362af7f0267c3e29f80055b21e3ca458345b685 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 May 2024 13:24:37 +0000 Subject: [PATCH 180/209] nfpm: 2.36.1 -> 2.37.1 --- pkgs/tools/package-management/nfpm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index 3b68b36403e2..233cd511110d 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "nfpm"; - version = "2.36.1"; + version = "2.37.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - hash = "sha256-arGTZ7GFM1kQdryPrwklY7S0B9i31eQ/MaR24mRaFAo="; + hash = "sha256-W32rjqPqMEZs7s9zi88CKm+OSVb6UKW6bEdykmOPJDw="; }; - vendorHash = "sha256-g57tLk2+WWcdG0COqkQD7eLYG0TdC0RnlhLF6Qt4woY="; + vendorHash = "sha256-zHr9NdNFlScV6GsTzwH3vsAfuP3JsNTEi/JaJEdHOck="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; From e8f3c74367d91b6dc9677c62552e5e6a938968c6 Mon Sep 17 00:00:00 2001 From: Marc Jakobi Date: Tue, 7 May 2024 22:28:47 +0200 Subject: [PATCH 181/209] luaPackages.tree-sitter-norg: init at 0.2.4-1 --- maintainers/scripts/luarocks-packages.csv | 2 + .../lua-modules/generated-packages.nix | 45 +++++++++++++++++++ pkgs/development/lua-modules/overrides.nix | 16 +++++++ 3 files changed, 63 insertions(+) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 4b41b7887512..75c4b687ecac 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -78,6 +78,7 @@ luaossl,,,,,5.1, luaposix,,,,34.1.1-1,,vyp lblasc luarepl,,,,,, luarocks-build-rust-mlua,,,,,,mrcjkb +luarocks-build-treesitter-parser,,,,,,mrcjkb luasec,,,,,,flosse luasnip,,,,,, luasocket,,,,,, @@ -131,6 +132,7 @@ tiktoken_core,,,,,,natsukium tl,,,,,,mephistophiles toml,,,,,,mrcjkb toml-edit,,,,,5.1,mrcjkb +tree-sitter-norg,,,,,5.1,mrcjkb vstruct,https://github.com/ToxicFrog/vstruct.git,,,,, vusted,,,,,,figsoda xml2lua,,,,,,teto diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 8200381b5994..0c8214d3da26 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -2332,6 +2332,30 @@ buildLuarocksPackage { }; }) {}; +luarocks-build-treesitter-parser = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder, luafilesystem }: +buildLuarocksPackage { + pname = "luarocks-build-treesitter-parser"; + version = "2.0.0-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/luarocks-build-treesitter-parser-2.0.0-1.rockspec"; + sha256 = "0ylax1r0yl5k742p8n0fq5irs2r632npigqp1qckfx7kwi89gxhb"; + }).outPath; + src = fetchzip { + url = "https://github.com/nvim-neorocks/luarocks-build-treesitter-parser/archive/v2.0.0.zip"; + sha256 = "0gqiwk7dk1xn5n2m0iq5c7xkrgyaxwyd1spb573l289gprvlrbn5"; + }; + + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua luafilesystem ]; + + meta = { + homepage = "https://github.com/nvim-neorocks/luarocks-build-treesitter-parser"; + description = "A luarocks build backend for tree-sitter parsers."; + maintainers = with lib.maintainers; [ mrcjkb ]; + license.fullName = "MIT"; + }; +}) {}; + luasec = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder, luasocket }: buildLuarocksPackage { pname = "luasec"; @@ -3669,6 +3693,27 @@ buildLuarocksPackage { }; }) {}; +tree-sitter-norg = callPackage({ buildLuarocksPackage, fetchurl, fetchzip }: +buildLuarocksPackage { + pname = "tree-sitter-norg"; + version = "0.2.4-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/tree-sitter-norg-0.2.4-1.rockspec"; + sha256 = "00mgn1kmhhrink64s1yjnz78lc7qbv0f021dsvr6z3b44srhcxb9"; + }).outPath; + src = fetchzip { + url = "https://github.com/nvim-neorg/tree-sitter-norg/archive/v0.2.4.zip"; + sha256 = "08bsk3v61r0xhracanjv25jccqv80ahipx0mv5a1slzhcyymv8kd"; + }; + + + meta = { + homepage = "https://github.com/nvim-neorg/tree-sitter-norg"; + description = "The official tree-sitter parser for Norg documents."; + license.fullName = "MIT"; + }; +}) {}; + vstruct = callPackage({ buildLuarocksPackage, fetchgit, lua, luaOlder }: buildLuarocksPackage { pname = "vstruct"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 45ee1ba28262..f022aa6172db 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -6,6 +6,7 @@ # plenary utilities , which , findutils +, clang , coreutils , curl , cyrus_sasl @@ -47,6 +48,7 @@ , sol2 , sqlite , tomlplusplus +, tree-sitter , unbound , vimPlugins , vimUtils @@ -729,6 +731,20 @@ in }); + tree-sitter-norg = prev.tree-sitter-norg.overrideAttrs (oa: { + nativeBuildInputs = let + # HACK: luarocks-nix doesn't pick up rockspec build dependencies, + # so we have to pass the correct package in here. + lua = lib.head oa.propagatedBuildInputs; + in oa.nativeBuildInputs ++ [ + lua.pkgs.luarocks-build-treesitter-parser + ] ++ (lib.optionals stdenv.isDarwin [ + clang + tree-sitter + ]); + meta.broken = (luaOlder "5.1" || stdenv.isDarwin); + }); + vstruct = prev.vstruct.overrideAttrs (_: { meta.broken = (luaOlder "5.1" || luaAtLeast "5.4"); }); From 5510aae4c83dda1992d2b6af2870d078123b4894 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Thu, 9 May 2024 15:30:03 +0200 Subject: [PATCH 182/209] openvr: add update script Signed-off-by: Sefa Eyeoglu --- pkgs/development/libraries/openvr/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/openvr/default.nix b/pkgs/development/libraries/openvr/default.nix index 5bdb10549001..9890df474590 100644 --- a/pkgs/development/libraries/openvr/default.nix +++ b/pkgs/development/libraries/openvr/default.nix @@ -7,6 +7,7 @@ , lib , libGL , stdenv +, nix-update-script }: stdenv.mkDerivation (finalAttrs: { @@ -56,6 +57,8 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DUSE_SYSTEM_JSONCPP=ON" "-DBUILD_SHARED=1" ]; + passthru.updateScript = nix-update-script { }; + meta = { broken = stdenv.isDarwin; description = "An API and runtime that allows access to VR hardware from multiple vendors without requiring that applications have specific knowledge of the hardware they are targeting"; From bdd78d731a849d8fdbe6a15625214fc12bad7a76 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Thu, 9 May 2024 15:32:02 +0200 Subject: [PATCH 183/209] openvr: 2.2.3 -> 2.5.1 Signed-off-by: Sefa Eyeoglu --- .../openvr/default.nix => by-name/op/openvr/package.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/{development/libraries/openvr/default.nix => by-name/op/openvr/package.nix} (95%) diff --git a/pkgs/development/libraries/openvr/default.nix b/pkgs/by-name/op/openvr/package.nix similarity index 95% rename from pkgs/development/libraries/openvr/default.nix rename to pkgs/by-name/op/openvr/package.nix index 9890df474590..418004909ae6 100644 --- a/pkgs/development/libraries/openvr/default.nix +++ b/pkgs/by-name/op/openvr/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "openvr"; - version = "2.2.3"; + version = "2.5.1"; src = fetchFromGitHub { owner = "ValveSoftware"; repo = "openvr"; rev = "v${finalAttrs.version}"; - hash = "sha256-Dpl88Te+EoVasoCtwERGrYt3xK8o03h15r8IVxxPPCw="; + hash = "sha256-bIKjZ7DvJVmDK386WgXaAFQrS0E1TNEUMhfQp7FNnvk="; }; patches = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ab116d42a83..b17b95399e00 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23765,7 +23765,7 @@ with pkgs; openvdb = callPackage ../development/libraries/openvdb { }; - openvr = callPackage ../development/libraries/openvr { + openvr = callPackage ../by-name/op/openvr/package.nix { inherit (darwin.apple_sdk.frameworks) Foundation AppKit; }; From ab56210eb89551807f1b2fbbae06abf11287d4bb Mon Sep 17 00:00:00 2001 From: nyanotech Date: Mon, 18 Sep 2023 12:08:38 -0700 Subject: [PATCH 184/209] python3Packages.pynetbox: add packaging as dep --- pkgs/development/python-modules/pynetbox/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pynetbox/default.nix b/pkgs/development/python-modules/pynetbox/default.nix index 0a08f4affa59..1051764887b1 100644 --- a/pkgs/development/python-modules/pynetbox/default.nix +++ b/pkgs/development/python-modules/pynetbox/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , setuptools-scm +, packaging , requests , six , pytestCheckHook @@ -25,6 +26,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + packaging requests six ]; From 03144e318ba3588fe26b939c09082bee7cad47f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 May 2024 13:46:32 +0000 Subject: [PATCH 185/209] pyenv: 2.4.0 -> 2.4.1 --- pkgs/development/tools/pyenv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/pyenv/default.nix b/pkgs/development/tools/pyenv/default.nix index f55d7bb8fcd0..e93cb4cae934 100644 --- a/pkgs/development/tools/pyenv/default.nix +++ b/pkgs/development/tools/pyenv/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "pyenv"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "pyenv"; repo = "pyenv"; rev = "refs/tags/v${version}"; - hash = "sha256-urF0glUR6W2jtT3Ek3OpbpmImiQrwHGbS1/pGuTcgyA="; + hash = "sha256-dzL0wFAm+wUEWX6a8cgZstgdi9NMmyeDIUI5pPjJpZI="; }; nativeBuildInputs = [ From c4bd61ba34c99e77ac65cc6238559acb3068ba3f Mon Sep 17 00:00:00 2001 From: Petingoso Date: Sat, 4 May 2024 12:51:42 +0100 Subject: [PATCH 186/209] lua51Packages.nfd: fix module not loading As this (issue)[https://github.com/NixOS/nixpkgs/issues/295022] complains, it wasn't finding symbols properly. I traced it to the (migration)[https://github.com/NixOS/nixpkgs/pull/288669] from buildLuarocksPackage.extraVariables to buildLuarocksPackage.luarocksConfig.variables where someone forgot to add .variables. It now launches the dialogue properly. --- pkgs/development/lua-modules/nfd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/lua-modules/nfd/default.nix b/pkgs/development/lua-modules/nfd/default.nix index 5c2ffabc9b54..581b5289aef0 100644 --- a/pkgs/development/lua-modules/nfd/default.nix +++ b/pkgs/development/lua-modules/nfd/default.nix @@ -22,7 +22,7 @@ buildLuarocksPackage { ]; knownRockspec = "lua/nfd-scm-1.rockspec"; - luarocksConfig.LUA_LIBDIR = "${lua}/lib"; + luarocksConfig.variables.LUA_LIBDIR = "${lua}/lib"; nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; From e5457f657bbbc558cd953e4d34239f7dde8601a0 Mon Sep 17 00:00:00 2001 From: Petingoso Date: Sat, 4 May 2024 22:12:08 +0100 Subject: [PATCH 187/209] lua51Packages.nfd: feat added postInstallCheck for test lua51Packages.nfd: cleanup duplicate line lua51Packages.nfd: cleanup useless undefined hooks lua51Packages.nfd: squashed commits lua51Packages.nfd: change to generic buster --- pkgs/development/lua-modules/nfd/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/lua-modules/nfd/default.nix b/pkgs/development/lua-modules/nfd/default.nix index 581b5289aef0..1cc8d66044c7 100644 --- a/pkgs/development/lua-modules/nfd/default.nix +++ b/pkgs/development/lua-modules/nfd/default.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchFromGitHub, buildLuarocksPackage, lua, pkg-config, lib -, substituteAll, zenity, AppKit }: +{ stdenv, fetchFromGitHub, buildLuarocksPackage, lua51Packages, lua, pkg-config, lib, substituteAll, zenity, AppKit}: buildLuarocksPackage { pname = "nfd"; @@ -27,10 +26,17 @@ buildLuarocksPackage { buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; - fixupPhase = '' + postInstall = '' find $out -name nfd_zenity.so -execdir mv {} nfd.so \; ''; + doInstallCheck = true; + installCheckInputs = [ lua.pkgs.busted ]; + installCheckPhase= '' + busted lua/spec/ + ''; + + meta = { description = "A tiny, neat lua library that portably invokes native file open and save dialogs."; From ea976807f3f35cfd04ff30d9bcabd18807391bfb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 May 2024 14:12:49 +0000 Subject: [PATCH 188/209] pet: 0.7.1 -> 0.8.4 --- pkgs/development/tools/pet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/pet/default.nix b/pkgs/development/tools/pet/default.nix index c911673e1168..bf4b4f0e633d 100644 --- a/pkgs/development/tools/pet/default.nix +++ b/pkgs/development/tools/pet/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pet"; - version = "0.7.1"; + version = "0.8.4"; src = fetchFromGitHub { owner = "knqyf263"; repo = "pet"; rev = "v${version}"; - sha256 = "sha256-UN7UkwzMz5KGZZqfK+g3bja/dBO6oy682b8qqYgSfPU="; + sha256 = "sha256-XFizQxegyMIAUEKT8/kzWyC4TWICMUE7SuHQsTNpK4w="; }; - vendorHash = "sha256-ebdPWKNL9i3sEGpfDCXIfOaFQjV5LXohug2qFXeWenk="; + vendorHash = "sha256-XvSg7EhFdK7wt1Eei56pj/emiE4qsVJkOpgPNsnDNc4="; ldflags = [ "-s" "-w" "-X=github.com/knqyf263/pet/cmd.version=${version}" From 934b5f5765d492bf0f2884ebdeb2a97bb034b810 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 May 2024 14:31:11 +0000 Subject: [PATCH 189/209] centrifugo: 5.3.1 -> 5.3.2 --- pkgs/by-name/ce/centrifugo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ce/centrifugo/package.nix b/pkgs/by-name/ce/centrifugo/package.nix index 6069eeb4b79d..83e0ce5b7f42 100644 --- a/pkgs/by-name/ce/centrifugo/package.nix +++ b/pkgs/by-name/ce/centrifugo/package.nix @@ -14,16 +14,16 @@ let in buildGoModule rec { pname = "centrifugo"; - version = "5.3.1"; + version = "5.3.2"; src = fetchFromGitHub { owner = "centrifugal"; repo = "centrifugo"; rev = "v${version}"; - hash = "sha256-QKHRIH61xNpQaelrupO9fzmN6XESPU1d/aXCbqYgJXs="; + hash = "sha256-h1aI+dAVL/ToHeSdI41i74Kq2JnvGgv2fI5ffhBIfRM="; }; - vendorHash = "sha256-fceoOYrDk5puImSckTkEo3hPCpbQE5t8b81sXnLid/Q="; + vendorHash = "sha256-mtIRbW8aN1PJs/43aaAa141l2VmVdVHY8bnvfV+r0e8="; ldflags = [ "-s" From 29182918b105d6743994f2bfdcbdd6a97c963f2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Thu, 9 May 2024 01:06:14 -0400 Subject: [PATCH 190/209] various: remove eclairevoyant from meta.maintainers --- pkgs/applications/audio/muse/default.nix | 2 +- pkgs/by-name/bi/bitmagnet/package.nix | 2 +- pkgs/by-name/hy/hyprlock/package.nix | 2 +- pkgs/by-name/th/themix-gui/package.nix | 2 +- pkgs/development/compilers/ghdl/default.nix | 2 +- pkgs/development/tools/bloom/default.nix | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/applications/audio/muse/default.nix index 642d1057b483..d5f32097250b 100644 --- a/pkgs/applications/audio/muse/default.nix +++ b/pkgs/applications/audio/muse/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { it is published under the GNU General Public License. ''; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ eclairevoyant orivej ]; + maintainers = with lib.maintainers; [ orivej ]; platforms = lib.platforms.linux; mainProgram = "muse4"; }; diff --git a/pkgs/by-name/bi/bitmagnet/package.nix b/pkgs/by-name/bi/bitmagnet/package.nix index 95a7afa1bede..708032b0a76d 100644 --- a/pkgs/by-name/bi/bitmagnet/package.nix +++ b/pkgs/by-name/bi/bitmagnet/package.nix @@ -30,7 +30,7 @@ buildGoModule rec { ''; homepage = "https://bitmagnet.io/"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ eclairevoyant viraptor ]; + maintainers = with lib.maintainers; [ viraptor ]; mainProgram = "bitmagnet"; }; } diff --git a/pkgs/by-name/hy/hyprlock/package.nix b/pkgs/by-name/hy/hyprlock/package.nix index 0aea3a11e58c..722e90b445ea 100644 --- a/pkgs/by-name/hy/hyprlock/package.nix +++ b/pkgs/by-name/hy/hyprlock/package.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Hyprland's GPU-accelerated screen locking utility"; homepage = "https://github.com/hyprwm/hyprlock"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ eclairevoyant ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "hyprlock"; platforms = [ "aarch64-linux" diff --git a/pkgs/by-name/th/themix-gui/package.nix b/pkgs/by-name/th/themix-gui/package.nix index 8495234c5ca5..8393884cb5c2 100644 --- a/pkgs/by-name/th/themix-gui/package.nix +++ b/pkgs/by-name/th/themix-gui/package.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation { homepage = "https://github.com/themix-project/themix-gui"; license = lib.licenses.gpl3Only; mainProgram = "themix-gui"; - maintainers = with lib.maintainers; [ eclairevoyant ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/ghdl/default.nix b/pkgs/development/compilers/ghdl/default.nix index 84109f7436fa..96f1db0e6492 100644 --- a/pkgs/development/compilers/ghdl/default.nix +++ b/pkgs/development/compilers/ghdl/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { description = "VHDL 2008/93/87 simulator"; license = lib.licenses.gpl2Plus; mainProgram = "ghdl"; - maintainers = with lib.maintainers; [ eclairevoyant lucus16 thoughtpolice ]; + maintainers = with lib.maintainers; [ lucus16 thoughtpolice ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/development/tools/bloom/default.nix b/pkgs/development/tools/bloom/default.nix index dc0a35d06542..1b977e33027b 100644 --- a/pkgs/development/tools/bloom/default.nix +++ b/pkgs/development/tools/bloom/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { description = "Debug interface for AVR-based embedded systems development on GNU/Linux"; homepage = "https://bloom.oscillate.io/"; license = lib.licenses.lgpl3Only; - maintainers = with lib.maintainers; [ eclairevoyant ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "bloom"; platforms = lib.platforms.linux; }; From 262425670c770600ad7cc980ba343b67a5691634 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 May 2024 14:55:50 +0000 Subject: [PATCH 191/209] tenki: 1.8.0 -> 1.9.0 --- pkgs/by-name/te/tenki/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/tenki/package.nix b/pkgs/by-name/te/tenki/package.nix index 464e57682494..097c5823a220 100644 --- a/pkgs/by-name/te/tenki/package.nix +++ b/pkgs/by-name/te/tenki/package.nix @@ -4,16 +4,16 @@ }: rustPlatform.buildRustPackage rec { pname = "tenki"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "ckaznable"; repo = "tenki"; rev = "v${version}"; - hash = "sha256-FItq/rnxJsEnKFPUR59Wo3eQvaykaIyCohCcOlPrdAE="; + hash = "sha256-b9tByEuZ7mdPJVGgyvCnf+pyBKhO7I/B/Ak8MtM5qhU="; }; - cargoHash = "sha256-PhilKt7gLWoOOpkpSPa1/E33rmHvX466hSCGoNfezq0="; + cargoHash = "sha256-WvxO5muh0IGHoZr/ahE9rHs+MiXLGnQq3dgz63TwFRc="; meta = with lib; { description = "tty-clock with weather effect"; From 383f07dc04f318ddf7024130272dc28d098b215d Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 9 May 2024 17:18:39 +0200 Subject: [PATCH 192/209] treewide: remove some leftover patches files --- pkgs/applications/audio/beast/patch.patch | 187 ------------------ .../backup/areca/fix-javah-bug.diff | 24 --- 2 files changed, 211 deletions(-) delete mode 100644 pkgs/applications/audio/beast/patch.patch delete mode 100644 pkgs/applications/backup/areca/fix-javah-bug.diff diff --git a/pkgs/applications/audio/beast/patch.patch b/pkgs/applications/audio/beast/patch.patch deleted file mode 100644 index 9d9f82cf4b4b..000000000000 --- a/pkgs/applications/audio/beast/patch.patch +++ /dev/null @@ -1,187 +0,0 @@ -Index: beast-0.7.1/shell/Makefile.in -=================================================================== ---- beast-0.7.1.orig/shell/Makefile.in -+++ beast-0.7.1/shell/Makefile.in -@@ -859,10 +859,7 @@ check-before: check-installation - check-installation: - @for p in $(bin_PROGRAMS) ; do \ - pp="$(DESTDIR)$(bindir)/$$p" ; \ -- echo "TEST: test -x \"$$pp\"" ; \ -- test -x "$$pp" || \ -- { echo "Failed to verify installation of executable: $$pp"; \ -- exit 1 ; } \ -+ echo "TEST: test -x \"$$pp\" Test disabled" ; \ - done - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. -Index: beast-0.7.1/shell/Makefile.am -=================================================================== ---- beast-0.7.1.orig/shell/Makefile.am -+++ beast-0.7.1/shell/Makefile.am -@@ -859,10 +859,7 @@ check-before: check-installation - check-installation: - @for p in $(bin_PROGRAMS) ; do \ - pp="$(DESTDIR)$(bindir)/$$p" ; \ -- echo "TEST: test -x \"$$pp\"" ; \ -- test -x "$$pp" || \ -- { echo "Failed to verify installation of executable: $$pp"; \ -- exit 1 ; } \ -+ echo "TEST: test -x \"$$pp\" Test disabled" ; \ - done - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. -Index: beast-0.7.1/birnet/birnettests.h -=================================================================== ---- beast-0.7.1.orig/birnet/birnettests.h -+++ beast-0.7.1/birnet/birnettests.h -@@ -27,6 +27,7 @@ - - #include - #include -+#include - - BIRNET_EXTERN_C_BEGIN(); - -Index: beast-0.7.1/tools/bseloopfuncs.c -=================================================================== ---- beast-0.7.1.orig/tools/bseloopfuncs.c -+++ beast-0.7.1/tools/bseloopfuncs.c -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - - typedef struct { - gdouble score; ---- beast-0.7.1.orig/bse/Makefile.am 2008-06-01 13:12:28.116708321 +0200 -+++ beast-0.7.1/bse/Makefile.am 2008-06-01 13:12:40.000000000 +0200 -@@ -10,7 +10,7 @@ - # need -I$(top_builddir) for - # need -I$(srcdir) for "bseserver.h" in .genprc.c - # need -I. (builddir) for "bsecore.genidl.hh" in bsecore.cc --INCLUDES += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I. $(BSE_CFLAGS) -DG_DISABLE_DEPRECATED -DG_DISABLE_CONST_RETURNS -+INCLUDES += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I. $(BSE_CFLAGS) -DG_DISABLE_CONST_RETURNS - DEFS += $(strip \ - $(patsubst %, -DG_LOG_DOMAIN=\"BSE\" -DBSE_COMPILATION, \ - $(filter $( - JNI compilation task (builds libarecafs.so ... for unix-like operating systems only) -+ - -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ - - - From e23512d2e80c4f262d51e15b78c46dcd0557be77 Mon Sep 17 00:00:00 2001 From: Chuang Zhu Date: Mon, 6 May 2024 07:42:25 +0800 Subject: [PATCH 193/209] komikku: 1.39.0 -> 1.45.1 --- pkgs/applications/graphics/komikku/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/komikku/default.nix b/pkgs/applications/graphics/komikku/default.nix index 22bce94e11ab..ac9d11b8a87b 100644 --- a/pkgs/applications/graphics/komikku/default.nix +++ b/pkgs/applications/graphics/komikku/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { pname = "komikku"; - version = "1.39.0"; + version = "1.45.1"; format = "other"; @@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { owner = "valos"; repo = "Komikku"; rev = "v${version}"; - hash = "sha256-bAk+F81q0sPSgU8LkpniVJyKaQt6cxUaUzNSZ3f5v0Q="; + hash = "sha256-gTZ2LuCsYFIUASfjzLi4t0PbjyriU9FR7d2G+PcLDVc="; }; nativeBuildInputs = [ @@ -62,7 +62,7 @@ python3.pkgs.buildPythonApplication rec { natsort piexif pillow - pure-protobuf + curl-cffi pygobject3 python-magic rarfile From 706b41a4dfddf05441c6abcdb7f05752945e34d1 Mon Sep 17 00:00:00 2001 From: Florian Engel Date: Thu, 9 May 2024 17:24:44 +0200 Subject: [PATCH 194/209] doc/go: Update url for module documentation The old wiki is deprecated --- doc/languages-frameworks/go.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/languages-frameworks/go.section.md b/doc/languages-frameworks/go.section.md index 2f4cb0326a8a..d98ecb1c0421 100644 --- a/doc/languages-frameworks/go.section.md +++ b/doc/languages-frameworks/go.section.md @@ -2,7 +2,7 @@ ## Building Go modules with `buildGoModule` {#ssec-language-go} -The function `buildGoModule` builds Go programs managed with Go modules. It builds [Go Modules](https://github.com/golang/go/wiki/Modules) through a two phase build: +The function `buildGoModule` builds Go programs managed with Go modules. It builds [Go Modules](https://go.dev/wiki/Modules) through a two phase build: - An intermediate fetcher derivation called `goModules`. This derivation will be used to fetch all the dependencies of the Go module. - A final derivation will use the output of the intermediate derivation to build the binaries and produce the final output. From 30b9b41eac75534c1d6684e10a0cb1976ceec141 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 May 2024 15:41:22 +0000 Subject: [PATCH 195/209] automatic-timezoned: 2.0.12 -> 2.0.13 --- pkgs/tools/system/automatic-timezoned/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/tools/system/automatic-timezoned/default.nix index 2964368633ab..20d45f3e9c71 100644 --- a/pkgs/tools/system/automatic-timezoned/default.nix +++ b/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "2.0.12"; + version = "2.0.13"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QOhGjLwVeht5S0jG5Fs/2e0RKExAcDJIMSGqdgARewM="; + sha256 = "sha256-OmeS4phePGa8Vt/5Mj4743dWEC/+owOHwZTFYH5Ci38="; }; - cargoHash = "sha256-TE8W2wYmqC4f9dNwM3UB8444e8eE1sYX/T6hfuCeDOo="; + cargoHash = "sha256-KKx46Qxeumw13Gzv1TE3OZ8/FWqZHEOBZrkqr+AgNGE="; meta = with lib; { description = "Automatically update system timezone based on location"; From b49b9c8798b3b63f56deb9db0be57ea7d0f131ea Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 May 2024 17:43:45 +0200 Subject: [PATCH 196/209] cnspec: 11.3.0 -> 11.3.1 Diff: https://github.com/mondoohq/cnspec/compare/refs/tags/v11.3.0...v11.3.1 Changelog: https://github.com/mondoohq/cnspec/releases/tag/v11.3.1 --- pkgs/tools/security/cnspec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index 4156a4509d86..c5c0fcef5dc6 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "11.3.0"; + version = "11.3.1"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-Xq5kOyIKCfTkzyQQQf/krgcKi78JInAFT5oNgjOlINo="; + hash = "sha256-XDUjDw8Xd0DwX275MvowVo4yhaK0Sqjd2f2RGe22MSY="; }; proxyVendor = true; - vendorHash = "sha256-a0TjKpoS2NwvYeJhb2YIxX5XI/HdKjYPnZkfTKII/DY="; + vendorHash = "sha256-54dcWKTVplIrBQlCtQFLiGwEzxT3eMIxqLhL3PO+wdk="; subPackages = [ "apps/cnspec" ]; From 80a914d232a19e0fd20487e3e0fc2a5bbc58d93d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 May 2024 17:45:15 +0200 Subject: [PATCH 197/209] python312Packages.boto3-stubs: 1.34.100 -> 1.34.101 --- pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index c508277ead7a..bb0a67a7ede0 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -366,7 +366,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.100"; + version = "1.34.101"; pyproject = true; disabled = pythonOlder "3.7"; @@ -374,7 +374,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-eAjX0fYFwg5Ph+4XxIZNEMHWCUES2us0BgBaDVsTyKg="; + hash = "sha256-GexON+k1FlMZID3tULcKLLxrVUscVMzS9fZNgD+rB4U="; }; build-system = [ setuptools ]; From 14d99a9bfec66aad9de5c4931d092b03985b05f7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 May 2024 17:51:23 +0200 Subject: [PATCH 198/209] checkov: 3.2.85 -> 3.2.88 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.2.85...3.2.88 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.88 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 609d1b28586b..ab325b7410c5 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.85"; + version = "3.2.88"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-FS/WD4+1XVDAi91RQD4a47Wd1Ns496KoM8MKd09uR78="; + hash = "sha256-vhYnWDL1rAshXgVDmEW1Ueip3a+yTLo1S8dGTsMXJLo="; }; patches = [ ./flake8-compat-5.x.patch ]; From 0b34fea5b890abc8623c7edd37d68b1ce0924c99 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 May 2024 17:52:46 +0200 Subject: [PATCH 199/209] exploitdb: 2024-05-05 -> 2024-05-09 Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/refs/tags/2024-05-05...2024-05-09 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index d4bd0e22c5ed..8752844e2233 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2024-05-05"; + version = "2024-05-09"; src = fetchFromGitLab { owner = "exploit-database"; repo = "exploitdb"; rev = "refs/tags/${version}"; - hash = "sha256-z982UAu9mmF4NsM4XJYOFdqOblFUg+MeJnlic86AcI0="; + hash = "sha256-k0rBx2rVJoDB2AEfcyQEmanoWgiu1Q7fRDL2xqMfn3Q="; }; nativeBuildInputs = [ makeWrapper ]; From 11c2265d7e238ba6bad0e3e56f3b42e258b1aed7 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Tue, 7 May 2024 05:29:57 +0200 Subject: [PATCH 200/209] cdecl: 2.5 -> 2.5-unstable-2024-05-07, add check, refactor Jumping almost 8 years ahead, to the repo latest commit cdecl: add check phase cdecl: further refactoring --- pkgs/by-name/cd/cdecl/package.nix | 48 ++++++++++++++----- .../cdecl/test_remove_interactive_line.patch | 10 ++++ 2 files changed, 46 insertions(+), 12 deletions(-) create mode 100644 pkgs/by-name/cd/cdecl/test_remove_interactive_line.patch diff --git a/pkgs/by-name/cd/cdecl/package.nix b/pkgs/by-name/cd/cdecl/package.nix index 16412a52a370..016a15e9bea0 100644 --- a/pkgs/by-name/cd/cdecl/package.nix +++ b/pkgs/by-name/cd/cdecl/package.nix @@ -10,38 +10,62 @@ stdenv.mkDerivation { pname = "cdecl"; - version = "2.5"; + version = "2.5-unstable-2024-05-07"; src = fetchFromGitHub { owner = "ridiculousfish"; repo = "cdecl-blocks"; - # github repo has no tag, but the 2.5 version match this commit - rev = "cb130ea7e61df5b6fa1e84f996e3f04e21a0181c"; - hash = "sha256-lErAxTpPIT49QdOpdjM9e3Qyaajzc+iwv27B3XUFUuE="; + rev = "1e6e1596771183d9bb90bcf152d6bc2055219a7e"; + hash = "sha256-5XuiYkFe+QvVBRIXRieKoE0zbISMvU1iLgEfkw6GnlE="; }; - buildInputs = [ + patches = [ + ./cdecl-2.5-lex.patch + # when `USE_READLINE` is enabled, this option will not be present + ./test_remove_interactive_line.patch + ]; + + prePatch = '' + substituteInPlace cdecl.c \ + --replace 'getline' 'cdecl_getline' + ''; + + strictDeps = true; + + nativeBuildInputs = [ bison flex + ]; + + buildInputs = [ readline ncurses ]; - NIX_CFLAGS_COMPILE = "-DBSD -DUSE_READLINE -std=gnu89"; - NIX_LDFLAGS = "-lreadline"; + env = { + NIX_CFLAGS_COMPILE = toString ( + [ + "-DBSD" + "-DUSE_READLINE" + ] + ++ lib.optionals stdenv.cc.isClang [ + "-Wno-error=int-conversion" + "-Wno-error=incompatible-function-pointer-types" + ] + ); + NIX_LDFLAGS = "-lreadline"; + }; makeFlags = [ - "CC=${stdenv.cc}/bin/cc" # otherwise fails on x86_64-darwin + "CC=${stdenv.cc.targetPrefix}cc" "PREFIX=${placeholder "out"}" "BINDIR=${placeholder "out"}/bin" "MANDIR=${placeholder "out"}/man1" "CATDIR=${placeholder "out"}/cat1" ]; - patches = [ ./cdecl-2.5-lex.patch ]; - prePatch = '' - substituteInPlace cdecl.c --replace 'getline' 'cdecl_getline' - ''; + doCheck = true; + checkTarget = "test"; preInstall = '' mkdir -p $out/bin; diff --git a/pkgs/by-name/cd/cdecl/test_remove_interactive_line.patch b/pkgs/by-name/cd/cdecl/test_remove_interactive_line.patch new file mode 100644 index 000000000000..5a769f2dfec9 --- /dev/null +++ b/pkgs/by-name/cd/cdecl/test_remove_interactive_line.patch @@ -0,0 +1,10 @@ +--- a/test_expected_output.txt 2024-05-07 05:47:13.184419240 +0200 ++++ b/test_expected_output.txt 2024-05-07 05:48:38.980122345 +0200 +@@ -26,7 +26,6 @@ + options + create (-c), nocreate + prompt, noprompt (-q) +- interactive (-i), nointeractive + ritchie (-r), preansi (-p), ansi (-a) or cplusplus (-+) + + Current set values are: From 040441451b6df8d2fcaaf91430c00fcfab6b3002 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 9 May 2024 18:04:03 +0200 Subject: [PATCH 201/209] flac123: set meta.platforms --- pkgs/by-name/fl/flac123/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/fl/flac123/package.nix b/pkgs/by-name/fl/flac123/package.nix index 463144b1de08..2a042366cc25 100644 --- a/pkgs/by-name/fl/flac123/package.nix +++ b/pkgs/by-name/fl/flac123/package.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ kiike ]; mainProgram = "flac123"; + platforms = lib.platforms.unix; }; }) From 2dbf171225aa5a913b1262d8872ca64a20341116 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 May 2024 16:46:43 +0000 Subject: [PATCH 202/209] yor: 0.1.193 -> 0.1.194 --- pkgs/applications/networking/cluster/yor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/yor/default.nix b/pkgs/applications/networking/cluster/yor/default.nix index 76a9d0ce3d52..28536a7ed07d 100644 --- a/pkgs/applications/networking/cluster/yor/default.nix +++ b/pkgs/applications/networking/cluster/yor/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "yor"; - version = "0.1.193"; + version = "0.1.194"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-6IdCnuW49DVeOJKBD6AYxr2kbv7CmpFReja3PweDSmU="; + hash = "sha256-8JkxCkDYalu3IMoGbyNOEJ28CgU87gTq0bX+o+5sV2Q="; }; vendorHash = "sha256-uT/jGD4hDVes4h+mlSIT2p+C9TjxnUWsmKv9haPjjLc="; From 84e1257d092174f0045586891d60fc22dd295a91 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 May 2024 16:46:59 +0000 Subject: [PATCH 203/209] kubeconform: 0.6.4 -> 0.6.5 --- pkgs/applications/networking/cluster/kubeconform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubeconform/default.nix b/pkgs/applications/networking/cluster/kubeconform/default.nix index b129e0c65bd5..ec9d9c56f466 100644 --- a/pkgs/applications/networking/cluster/kubeconform/default.nix +++ b/pkgs/applications/networking/cluster/kubeconform/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeconform"; - version = "0.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "yannh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PUZ3zwgOQ362ikoX1D7SLThiaFpXJh9TKOdjZqZDtSg="; + sha256 = "sha256-4rHEkzoO0AuuFB6G/z1WjGqfYMaHF3Z1YDAhIbBVCts="; }; vendorHash = null; From 9038ada165cabbd5f70173570603e49057c8b8a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 May 2024 17:42:56 +0000 Subject: [PATCH 204/209] python311Packages.optimum: 1.19.1 -> 1.19.2 --- pkgs/development/python-modules/optimum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/optimum/default.nix b/pkgs/development/python-modules/optimum/default.nix index 5c096eab5952..ecc214e1051d 100644 --- a/pkgs/development/python-modules/optimum/default.nix +++ b/pkgs/development/python-modules/optimum/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "optimum"; - version = "1.19.1"; + version = "1.19.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "optimum"; rev = "refs/tags/v${version}"; - hash = "sha256-EHu3p3M7xBjMnf3tKsneYOZtd9YWsC0qok1fnk4TMAg="; + hash = "sha256-GYgLh6vlOoVvTvhNPfBT4YEqRhB7gZMqlOuab6maVGU="; }; propagatedBuildInputs = [ From 377ebb104a153b17d6fd48a190859c045aec88ae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 May 2024 17:43:05 +0000 Subject: [PATCH 205/209] naabu: 2.3.0 -> 2.3.1 --- pkgs/tools/security/naabu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/naabu/default.nix b/pkgs/tools/security/naabu/default.nix index a10c6601412b..cf82ca531195 100644 --- a/pkgs/tools/security/naabu/default.nix +++ b/pkgs/tools/security/naabu/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "naabu"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "naabu"; rev = "refs/tags/v${version}"; - hash = "sha256-4aFr0kSKsNVXmYNYSt6mP4HryyIYvUKdzIYWjgPhG1Y="; + hash = "sha256-BICNSizc5DD538ZUoRUC1jSDCEkyrh7iYOM4a6cBqkQ="; }; - vendorHash = "sha256-QHVB8ovAWECb4n6CKTK4tnGgTrJSFxIV0KZk4PEYInE="; + vendorHash = "sha256-GhnEjlV6b61VH/eswBQ9Lelc0IgGawjDRZHzGt7653Q="; buildInputs = [ libpcap From 8dd5e2606e9a75bcc05b8b90f5350a023b485929 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 May 2024 18:09:07 +0000 Subject: [PATCH 206/209] smcroute: 2.5.6 -> 2.5.7 --- pkgs/servers/smcroute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/smcroute/default.nix b/pkgs/servers/smcroute/default.nix index 2bebb4ecfc5d..09d2ef89131a 100644 --- a/pkgs/servers/smcroute/default.nix +++ b/pkgs/servers/smcroute/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "smcroute"; - version = "2.5.6"; + version = "2.5.7"; src = fetchFromGitHub { owner = "troglobit"; repo = "smcroute"; rev = version; - sha256 = "sha256-I9kc1F+GZf8Gl0Wx3J45Bf/RyFTyHVhwDz5l+sp/2pc="; + sha256 = "sha256-b1FsaDw5wAZkOwc6Y7TsMwyfxIRQ2rNUTK+knEzOn7w="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 29fd229d8cbb51f66a14ce1c8ca6268f431d9368 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 May 2024 18:29:21 +0000 Subject: [PATCH 207/209] zarf: 0.33.1 -> 0.33.2 --- pkgs/applications/networking/cluster/zarf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/zarf/default.nix b/pkgs/applications/networking/cluster/zarf/default.nix index 3608bad410bc..4feb61699e56 100644 --- a/pkgs/applications/networking/cluster/zarf/default.nix +++ b/pkgs/applications/networking/cluster/zarf/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "zarf"; - version = "0.33.1"; + version = "0.33.2"; src = fetchFromGitHub { owner = "defenseunicorns"; repo = "zarf"; rev = "v${version}"; - hash = "sha256-JmUJUZn4mnTKdAVzYaCGZXDJmIeGfyn8Z+OfLfXp/S0="; + hash = "sha256-BafS+++8iTVT38pneqCfAQFg15PpXOW/Bv8anmdHZTg="; }; - vendorHash = "sha256-fpseCFQjLhUbhisjOYmLfznKGea5+E8CzjtbE7CEsk8="; + vendorHash = "sha256-4AN/0OgFX+5uymN/QfOr0sZipTmszhieOPmReKciFtg="; proxyVendor = true; preBuild = '' From 1157ea6821d4e121dfeec8a23b705017db6e582f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 May 2024 18:29:59 +0000 Subject: [PATCH 208/209] python311Packages.ledgerblue: 0.1.50 -> 0.1.53 --- pkgs/development/python-modules/ledgerblue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix index f78d9ad5e554..4e93a641cd01 100644 --- a/pkgs/development/python-modules/ledgerblue/default.nix +++ b/pkgs/development/python-modules/ledgerblue/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "ledgerblue"; - version = "0.1.50"; + version = "0.1.53"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0SzUy0mPEbgeoOKEa9UtrjAQafrauKl1wvsONyosJNk="; + hash = "sha256-j5FCQnp+MNrJ8zgYeLRuWF+Gdq0FwJeBYyJALb+H8So="; }; build-system = [ From 02288621a8119760e297b1b28f347a8ccd8a0655 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 9 May 2024 21:49:11 +0100 Subject: [PATCH 209/209] wireless-regdb: 2024.01.23 -> 2024.05.08 Changes: https://git.kernel.org/pub/scm/linux/kernel/git/wens/wireless-regdb.git/log/?h=master-2024-05-08 --- pkgs/data/misc/wireless-regdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix index 284e6f524de5..fa2db6f82251 100644 --- a/pkgs/data/misc/wireless-regdb/default.nix +++ b/pkgs/data/misc/wireless-regdb/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "wireless-regdb"; - version = "2024.01.23"; + version = "2024.05.08"; src = fetchurl { url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-yKYcms92+n60I56J9kDe4+hwmNn2m001GMnGD8bSDFU="; + hash = "sha256-mu4dhuvrs2O3FL7JQbKCDzHjt/Gkhd3J/L2ZhcfT58Q="; }; dontBuild = true;