From be55458d12afc09f38f8ace6cd3bbc3014de70c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Wed, 21 Aug 2024 14:02:45 +0200 Subject: [PATCH 01/45] rustdesk-flutter: 1.2.7 -> 1.3.0 --- pkgs/by-name/ru/rustdesk-flutter/Cargo.lock | 405 ++++-------------- pkgs/by-name/ru/rustdesk-flutter/package.nix | 27 +- .../ru/rustdesk-flutter/pubspec.lock.json | 6 +- 3 files changed, 105 insertions(+), 333 deletions(-) diff --git a/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock b/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock index a2851b5295be..cb2a54f8a663 100644 --- a/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock +++ b/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock @@ -123,7 +123,7 @@ checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" [[package]] name = "android-wakelock" version = "0.1.0" -source = "git+https://github.com/21pages/android-wakelock#d0292e5a367e627c4fa6f1ca6bdfad005dca7d90" +source = "git+https://github.com/rustdesk-org/android-wakelock#d0292e5a367e627c4fa6f1ca6bdfad005dca7d90" dependencies = [ "jni 0.21.1", "log", @@ -224,7 +224,7 @@ checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "arboard" version = "3.4.0" -source = "git+https://github.com/rustdesk-org/arboard#27b4e503caa70ec6306e5270461429f2cf907ad6" +source = "git+https://github.com/rustdesk-org/arboard#a04bdb1b368a99691822c33bf0f7ed497d6a7a35" dependencies = [ "clipboard-win", "core-graphics 0.23.2", @@ -234,24 +234,13 @@ dependencies = [ "objc2-app-kit", "objc2-foundation", "parking_lot", - "resvg", + "serde 1.0.203", + "serde_derive", "windows-sys 0.48.0", "wl-clipboard-rs", "x11rb 0.13.1", ] -[[package]] -name = "arrayref" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" - -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - [[package]] name = "async-broadcast" version = "0.5.1" @@ -987,11 +976,14 @@ dependencies = [ [[package]] name = "clipboard-master" version = "4.0.0-beta.6" -source = "git+https://github.com/rustdesk-org/clipboard-master#5268c7b3d7728699566ad863da0911f249706f8c" +source = "git+https://github.com/rustdesk-org/clipboard-master#4fb62e5b62fb6350d82b571ec7ba94b3cd466695" dependencies = [ "objc", "objc-foundation", "objc_id", + "wayland-client", + "wayland-protocols", + "wayland-protocols-wlr", "windows-win", "wl-clipboard-rs", "x11-clipboard 0.9.2", @@ -1000,9 +992,9 @@ dependencies = [ [[package]] name = "clipboard-win" -version = "5.3.1" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad" +checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" dependencies = [ "error-code", ] @@ -1166,17 +1158,25 @@ name = "core-foundation" version = "0.9.3" source = "git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd#7d593d016175755e492a92ef89edca68ac3bd5cd" dependencies = [ - "core-foundation-sys 0.8.6 (git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd)", + "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", + "libc", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc", ] [[package]] name = "core-foundation-sys" version = "0.8.6" -source = "git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd#7d593d016175755e492a92ef89edca68ac3bd5cd" -dependencies = [ - "objc2-encode 2.0.0-pre.2", -] +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "core-graphics" @@ -1204,6 +1204,19 @@ dependencies = [ "objc2-encode 2.0.0-pre.2", ] +[[package]] +name = "core-graphics" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" +dependencies = [ + "bitflags 1.3.2", + "core-foundation 0.9.4", + "core-graphics-types 0.1.3", + "foreign-types 0.5.0", + "libc", +] + [[package]] name = "core-graphics-types" version = "0.1.2" @@ -1215,6 +1228,17 @@ dependencies = [ "objc2-encode 2.0.0-pre.2", ] +[[package]] +name = "core-graphics-types" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation 0.9.4", + "libc", +] + [[package]] name = "coreaudio-rs" version = "0.11.3" @@ -1486,12 +1510,6 @@ dependencies = [ "dasp_sample", ] -[[package]] -name = "data-url" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" - [[package]] name = "dbus" version = "0.9.7" @@ -1651,7 +1669,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.7.4", + "libloading 0.8.4", ] [[package]] @@ -2041,12 +2059,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "float-cmp" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" - [[package]] name = "flume" version = "0.11.0" @@ -2103,29 +2115,6 @@ dependencies = [ "libm", ] -[[package]] -name = "fontconfig-parser" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d" -dependencies = [ - "roxmltree 0.19.0", -] - -[[package]] -name = "fontdb" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e32eac81c1135c1df01d4e6d4233c47ba11f6a6d07f33e0bba09d18797077770" -dependencies = [ - "fontconfig-parser", - "log", - "memmap2", - "slotmap", - "tinyvec", - "ttf-parser", -] - [[package]] name = "foreign-types" version = "0.3.2" @@ -3047,8 +3036,8 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hwcodec" -version = "0.6.0" -source = "git+https://github.com/21pages/hwcodec#89879f2f02c6f74e88a4a43744a1153aec5b7e7f" +version = "0.7.0" +source = "git+https://github.com/rustdesk-org/hwcodec#6abd1898f3a03481ed0c038507b5218d6ea94267" dependencies = [ "bindgen 0.59.2", "cc", @@ -3173,16 +3162,10 @@ dependencies = [ "tiff", ] -[[package]] -name = "imagesize" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" - [[package]] name = "impersonate_system" version = "0.1.0" -source = "git+https://github.com/21pages/impersonate-system#2f429010a5a10b1fe5eceb553c6672fd53d20167" +source = "git+https://github.com/rustdesk-org/impersonate-system#2f429010a5a10b1fe5eceb553c6672fd53d20167" dependencies = [ "cc", ] @@ -3422,16 +3405,6 @@ dependencies = [ "unicode-segmentation", ] -[[package]] -name = "kurbo" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e5aa9f0f96a938266bdb12928a67169e8d22c6a786fda8ed984b85e6ba93c3c" -dependencies = [ - "arrayvec", - "smallvec", -] - [[package]] name = "lazy_static" version = "1.5.0" @@ -3518,7 +3491,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" dependencies = [ "cfg-if 1.0.0", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] @@ -3693,7 +3666,7 @@ dependencies = [ [[package]] name = "machine-uid" version = "0.3.0" -source = "git+https://github.com/21pages/machine-uid#381ff579c1dc3a6c54db9dfec47c44bcb0246542" +source = "git+https://github.com/rustdesk-org/machine-uid#381ff579c1dc3a6c54db9dfec47c44bcb0246542" dependencies = [ "bindgen 0.59.2", "cc", @@ -3737,15 +3710,6 @@ version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" -[[package]] -name = "memmap2" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" -dependencies = [ - "libc", -] - [[package]] name = "memoffset" version = "0.6.5" @@ -3807,14 +3771,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "mouce" -version = "0.2.1" -source = "git+https://github.com/rustdesk-org/mouce.git#177625a395cd8fa73964714d0039535cb9b47893" -dependencies = [ - "glob", -] - [[package]] name = "muda" version = "0.13.5" @@ -4692,15 +4648,9 @@ version = "0.7.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" dependencies = [ - "siphasher 0.2.3", + "siphasher", ] -[[package]] -name = "pico-args" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" - [[package]] name = "pin-project" version = "1.1.5" @@ -5025,6 +4975,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "quick-xml" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4" +dependencies = [ + "memchr", +] + [[package]] name = "quote" version = "0.6.13" @@ -5374,31 +5333,6 @@ dependencies = [ "winreg 0.50.0", ] -[[package]] -name = "resvg" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "944d052815156ac8fa77eaac055220e95ba0b01fa8887108ca710c03805d9051" -dependencies = [ - "gif", - "jpeg-decoder", - "log", - "pico-args", - "rgb", - "svgtypes", - "tiny-skia", - "usvg", -] - -[[package]] -name = "rgb" -version = "0.8.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7439be6844e40133eda024efd85bf07f59d0dd2f59b10c00dd6cfb92cc5c741" -dependencies = [ - "bytemuck", -] - [[package]] name = "ring" version = "0.17.8" @@ -5423,18 +5357,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "roxmltree" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" - -[[package]] -name = "roxmltree" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" - [[package]] name = "rpassword" version = "2.1.0" @@ -5532,7 +5454,7 @@ dependencies = [ [[package]] name = "rustdesk" -version = "1.2.7" +version = "1.3.0" dependencies = [ "android-wakelock", "android_logger", @@ -5578,7 +5500,6 @@ dependencies = [ "libpulse-simple-binding", "mac_address", "magnum-opus", - "mouce", "num_cpus", "objc", "objc_id", @@ -5630,7 +5551,7 @@ dependencies = [ [[package]] name = "rustdesk-portable-packer" -version = "1.2.7" +version = "1.3.0" dependencies = [ "brotli", "dirs 5.0.1", @@ -5813,22 +5734,6 @@ version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" -[[package]] -name = "rustybuzz" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfb9cf8877777222e4a3bc7eb247e398b56baba500c38c1c46842431adc8b55c" -dependencies = [ - "bitflags 2.6.0", - "bytemuck", - "smallvec", - "ttf-parser", - "unicode-bidi-mirroring", - "unicode-ccc", - "unicode-properties", - "unicode-script", -] - [[package]] name = "ryu" version = "1.0.18" @@ -5865,7 +5770,7 @@ dependencies = [ [[package]] name = "sciter-rs" version = "0.5.57" -source = "git+https://github.com/open-trade/rust-sciter?branch=dyn#fab913b7c2e779b05c249b0c5de5a08759b2c15d" +source = "git+https://github.com/open-trade/rust-sciter?branch=dyn#5322f3a755a0e6bf999fbc60d1efc35246c0f821" dependencies = [ "lazy_static", "libc", @@ -6119,27 +6024,12 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" -[[package]] -name = "simplecss" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a11be7c62927d9427e9f40f3444d5499d868648e2edbc4e2116de69e7ec0e89d" -dependencies = [ - "log", -] - [[package]] name = "siphasher" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" -[[package]] -name = "siphasher" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" - [[package]] name = "slab" version = "0.4.9" @@ -6149,15 +6039,6 @@ dependencies = [ "autocfg 1.3.0", ] -[[package]] -name = "slotmap" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" -dependencies = [ - "version_check", -] - [[package]] name = "smallvec" version = "1.13.2" @@ -6228,15 +6109,6 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82" -[[package]] -name = "strict-num" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" -dependencies = [ - "float-cmp", -] - [[package]] name = "strsim" version = "0.8.0" @@ -6298,16 +6170,6 @@ version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" -[[package]] -name = "svgtypes" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fae3064df9b89391c9a76a0425a69d124aee9c5c28455204709e72c39868a43c" -dependencies = [ - "kurbo", - "siphasher 1.0.1", -] - [[package]] name = "syn" version = "0.15.44" @@ -6359,7 +6221,7 @@ dependencies = [ [[package]] name = "sysinfo" version = "0.29.10" -source = "git+https://github.com/rustdesk-org/sysinfo#f45dcc6510d48c3a1401c5a33eedccc8899f67b2" +source = "git+https://github.com/rustdesk-org/sysinfo?branch=rlim_max#90b1705d909a4902dbbbdea37ee64db17841077d" dependencies = [ "cfg-if 1.0.0", "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -6553,11 +6415,11 @@ dependencies = [ [[package]] name = "tfc" -version = "0.6.1" -source = "git+https://github.com/rustdesk-org/The-Fat-Controller#9dd86151525fd010dc93f6bc9b6aedd1a75cc342" +version = "0.7.0" +source = "git+https://github.com/rustdesk-org/The-Fat-Controller?branch=history/rebase_upstream_20240722#de9c8ba480f166a9fc90aaa47bb0e84b443ea9c6" dependencies = [ "anyhow", - "core-graphics 0.22.3", + "core-graphics 0.23.2", "unicode-segmentation", "winapi 0.3.9", "x11 2.19.0", @@ -6647,32 +6509,6 @@ dependencies = [ "time-core", ] -[[package]] -name = "tiny-skia" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" -dependencies = [ - "arrayref", - "arrayvec", - "bytemuck", - "cfg-if 1.0.0", - "log", - "png", - "tiny-skia-path", -] - -[[package]] -name = "tiny-skia-path" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93" -dependencies = [ - "arrayref", - "bytemuck", - "strict-num", -] - [[package]] name = "tinyvec" version = "1.6.1" @@ -6964,12 +6800,6 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" -[[package]] -name = "ttf-parser" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8" - [[package]] name = "typenum" version = "1.17.0" @@ -7042,18 +6872,6 @@ version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" -[[package]] -name = "unicode-bidi-mirroring" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23cb788ffebc92c5948d0e997106233eeb1d8b9512f93f41651f52b6c5f5af86" - -[[package]] -name = "unicode-ccc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df77b101bcc4ea3d78dafc5ad7e4f58ceffe0b2b16bf446aeb50b6cb4157656" - [[package]] name = "unicode-ident" version = "1.0.12" @@ -7069,30 +6887,12 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-properties" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" - -[[package]] -name = "unicode-script" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" - [[package]] name = "unicode-segmentation" version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" -[[package]] -name = "unicode-vo" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" - [[package]] name = "unicode-width" version = "0.1.13" @@ -7155,33 +6955,6 @@ dependencies = [ "log", ] -[[package]] -name = "usvg" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84ea542ae85c715f07b082438a4231c3760539d902e11d093847a0b22963032" -dependencies = [ - "base64 0.22.1", - "data-url", - "flate2", - "fontdb", - "imagesize", - "kurbo", - "log", - "pico-args", - "roxmltree 0.20.0", - "rustybuzz", - "simplecss", - "siphasher 1.0.1", - "strict-num", - "svgtypes", - "tiny-skia-path", - "unicode-bidi", - "unicode-script", - "unicode-vo", - "xmlwriter", -] - [[package]] name = "utf16string" version = "0.2.0" @@ -7269,7 +7042,7 @@ dependencies = [ [[package]] name = "wallpaper" version = "3.2.0" -source = "git+https://github.com/21pages/wallpaper.rs#ce4a0cd3f58327c7cc44d15a63706fb0c022bacf" +source = "git+https://github.com/rustdesk-org/wallpaper.rs#ce4a0cd3f58327c7cc44d15a63706fb0c022bacf" dependencies = [ "dirs 5.0.1", "enquote", @@ -7374,9 +7147,9 @@ checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wayland-backend" -version = "0.3.4" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34e9e6b6d4a2bb4e7e69433e0b35c7923b95d4dc8503a84d25ec917a4bbfdf07" +checksum = "f90e11ce2ca99c97b940ee83edbae9da2d56a08f9ea8158550fd77fa31722993" dependencies = [ "cc", "downcast-rs", @@ -7388,9 +7161,9 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.3" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e63801c85358a431f986cffa74ba9599ff571fc5774ac113ed3b490c19a1133" +checksum = "7e321577a0a165911bdcfb39cf029302479d7527b517ee58ab0f6ad09edf0943" dependencies = [ "bitflags 2.6.0", "rustix 0.38.34", @@ -7400,9 +7173,9 @@ dependencies = [ [[package]] name = "wayland-protocols" -version = "0.32.1" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83d0f1056570486e26a3773ec633885124d79ae03827de05ba6c85f79904026c" +checksum = "62989625a776e827cc0f15d41444a3cea5205b963c3a25be48ae1b52d6b4daaa" dependencies = [ "bitflags 2.6.0", "wayland-backend", @@ -7412,9 +7185,9 @@ dependencies = [ [[package]] name = "wayland-protocols-wlr" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7dab47671043d9f5397035975fe1cac639e5bca5cc0b3c32d09f01612e34d24" +checksum = "fd993de54a40a40fbe5601d9f1fbcaef0aebcc5fda447d7dc8f6dcbaae4f8953" dependencies = [ "bitflags 2.6.0", "wayland-backend", @@ -7425,20 +7198,20 @@ dependencies = [ [[package]] name = "wayland-scanner" -version = "0.31.2" +version = "0.31.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67da50b9f80159dec0ea4c11c13e24ef9e7574bd6ce24b01860a175010cea565" +checksum = "d7b56f89937f1cf2ee1f1259cf2936a17a1f45d8f0aa1019fae6d470d304cfa6" dependencies = [ "proc-macro2 1.0.86", - "quick-xml 0.31.0", + "quick-xml 0.34.0", "quote 1.0.36", ] [[package]] name = "wayland-sys" -version = "0.31.2" +version = "0.31.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "105b1842da6554f91526c14a2a2172897b7f745a805d62af4ce698706be79c12" +checksum = "43676fe2daf68754ecf1d72026e4e6c15483198b5d24e888b74d3f22f887a148" dependencies = [ "dlib", "log", @@ -7458,7 +7231,7 @@ dependencies = [ [[package]] name = "webm" version = "1.1.0" -source = "git+https://github.com/21pages/rust-webm#d2c4d3ac133c7b0e4c0f656da710b48391981e64" +source = "git+https://github.com/rustdesk-org/rust-webm#d2c4d3ac133c7b0e4c0f656da710b48391981e64" dependencies = [ "webm-sys", ] @@ -7466,7 +7239,7 @@ dependencies = [ [[package]] name = "webm-sys" version = "1.0.4" -source = "git+https://github.com/21pages/rust-webm#d2c4d3ac133c7b0e4c0f656da710b48391981e64" +source = "git+https://github.com/rustdesk-org/rust-webm#d2c4d3ac133c7b0e4c0f656da710b48391981e64" dependencies = [ "cc", ] @@ -8180,12 +7953,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "xmlwriter" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" - [[package]] name = "zbus" version = "3.15.2" diff --git a/pkgs/by-name/ru/rustdesk-flutter/package.nix b/pkgs/by-name/ru/rustdesk-flutter/package.nix index bb333266e533..5e03551d2e30 100644 --- a/pkgs/by-name/ru/rustdesk-flutter/package.nix +++ b/pkgs/by-name/ru/rustdesk-flutter/package.nix @@ -4,6 +4,7 @@ , copyDesktopItems , fetchFromGitHub , flutter316 +, ffmpeg , gst_all_1 , fuse3 , libXtst @@ -25,7 +26,7 @@ flutterRustBridge = rustPlatform.buildRustPackage rec { pname = "flutter_rust_bridge_codegen"; - version = "1.80.1"; # https://github.com/rustdesk/rustdesk/blob/1.2.7/.github/workflows/bridge.yml#L10 + version = "1.80.1"; # https://github.com/rustdesk/rustdesk/blob/1.3.0/.github/workflows/bridge.yml#L10 src = fetchFromGitHub { owner = "fzyzcjy"; @@ -43,19 +44,20 @@ in flutter316.buildFlutterApplication rec { pname = "rustdesk"; - version = "1.2.7"; + version = "1.3.0"; src = fetchFromGitHub { owner = "rustdesk"; repo = "rustdesk"; rev = version; - hash = "sha256-o4YFixxKTCtL0umIkO64Etn3JnXIro3RYWcyV0RBJyg="; + hash = "sha256-pDGURsF0eft2BkuXOzaMtNCHp9VFgZZh4bbNRa5NDII="; }; strictDeps = true; + env.VCPKG_ROOT = "/homeless-shelter"; # idk man, makes the build go since https://github.com/21pages/hwcodec/commit/1873c34e3da070a462540f61c0b782b7ab15dc84 # Configure the Flutter/Dart build sourceRoot = "${src.name}/flutter"; - # curl https://raw.githubusercontent.com/rustdesk/rustdesk/1.2.7/flutter/pubspec.lock | yq > pubspec.lock.json + # curl https://raw.githubusercontent.com/rustdesk/rustdesk/1.3.0/flutter/pubspec.lock | yq > pubspec.lock.json pubspecLock = lib.importJSON ./pubspec.lock.json; gitHashes = { dash_chat_2 = "sha256-J5Bc6CeCoRGN870aNEVJ2dkQNb+LOIZetfG2Dsfz5Ow="; @@ -75,28 +77,27 @@ in flutter316.buildFlutterApplication rec { lockFile = ./Cargo.lock; outputHashes = { "android-wakelock-0.1.0" = "sha256-09EH/U1BBs3l4galQOrTKmPUYBgryUjfc/rqPZhdYc4="; - "arboard-3.4.0" = "sha256-bFpxyJ9Ykx2Y8iFr/JG9DFbf3FL9RzcM+vUfZ4mQ+1o="; + "arboard-3.4.0" = "sha256-lZIG5z115ExR6DcUut1rk9MrYFzSyCYH9kNGIikOPJM="; "cacao-0.4.0-beta2" = "sha256-U5tCLeVxjmZCm7ti1u71+i116xmozPaR69pCsA4pxrM="; - "clipboard-master-4.0.0-beta.6" = "sha256-FddUlvOuG2ClcDDAaVcVXZQlQ1CACeCHuudULUC0F00="; + "clipboard-master-4.0.0-beta.6" = "sha256-GZyzGMQOZ0iwGNZa/ZzFp8gU2tQVWZBpAbim8yb6yZA="; "confy-0.4.0-2" = "sha256-V7BCKISrkJIxWC3WT5+B5Vav86YTQvdO9TO6A++47FU="; "core-foundation-0.9.3" = "sha256-iB4OVmWZhuWbs9RFWvNc+RNut6rip2/50o5ZM6c0c3g="; "evdev-0.11.5" = "sha256-aoPmjGi/PftnH6ClEWXHvIj0X3oh15ZC1q7wPC1XPr0="; - "hwcodec-0.6.0" = "sha256-pnpowWQRjeoS6RapTXsqU6ybKA2N+xzleTl82gh+u0s="; + "hwcodec-0.7.0" = "sha256-pfzcaD7h/U5ou+P7qRLR56iXOkm043rF74y+Q0FsVLo="; "impersonate_system-0.1.0" = "sha256-pIV7s2qGoCIUrhaRovBDCJaGQ/pMdJacDXJmeBpkcyI="; "keepawake-0.4.3" = "sha256-cqSpkq/PCz+5+ZUyPy5hF6rP3fBzuZDywyxMUQ50Rk4="; "machine-uid-0.3.0" = "sha256-rEOyNThg6p5oqE9URnxSkPtzyW8D4zKzLi9pAnzTElE="; "magnum-opus-0.4.0" = "sha256-T4qaYOl8lCK1h9jWa9KqGvnVfDViT9Ob5R+YgnSw2tg="; - "mouce-0.2.1" = "sha256-0+k5dQeM4CCeYcvG8PzJ3YVjMZresmUPmVaPYvTV4gY="; "pam-0.7.0" = "sha256-o47tVoFlW9RiL7O8Lvuwz7rMYQHO+5TG27XxkAdHEOE="; "pam-sys-1.0.0-alpha4" = "sha256-5HIErVWnanLo5054NgU+DEKC2wwyiJ8AHvbx0BGbyWo="; "parity-tokio-ipc-0.7.3-4" = "sha256-PKw2Twd2ap+tRrQxqg8T1FvpoeKn0hvBqn1Z44F1LcY="; "rdev-0.5.0-2" = "sha256-KrzNa4sKyuVw3EV/Ec9VBNRyJy7QFR2Gu4c2WkltwUw="; "reqwest-0.11.23" = "sha256-kEUT+gs4ziknDiGdPMLnj5pmxC5SBpLopZ8jZ34GDWc="; "rust-pulsectl-0.2.12" = "sha256-8jXTspWvjONFcvw9/Z8C43g4BuGZ3rsG32tvLMQbtbM="; - "sciter-rs-0.5.57" = "sha256-NQPDlMQ0sGY8c9lBMlplT82sNjbgJy2m/+REnF3fz8M="; - "sysinfo-0.29.10" = "sha256-O2zJGQdtXNiIwatmyIB6bu5eVyv1JS/IHkv//BDCpcY="; + "sciter-rs-0.5.57" = "sha256-5Nd9npdx8yQJEczHv7WmSmrE1lBfvp5z7BubTbYBg3E="; + "sysinfo-0.29.10" = "sha256-/UsFAvlWs/F7X1xT+97Fx+pnpCguoPHU3hTynqYMEs4="; "tao-0.25.0" = "sha256-kLmx1z9Ybn/hDt2OcszEjtZytQIE+NKTIn9zNr9oEQk="; - "tfc-0.6.1" = "sha256-ukxJl7Z+pUXCjvTsG5Q0RiXocPERWGsnAyh3SIWm0HU="; + "tfc-0.7.0" = "sha256-4plK8ttbHsBPat3/rS+4RhGzirq2Ked2wrU8cQEU1zo="; "tokio-socks-0.5.2-1" = "sha256-i1dfNatqN4dinMcyAdLhj9hJWVsT10OWpCXsxl7pifI="; "tray-icon-0.14.3" = "sha256-dSX7LucZaLplRrh6zLwmFzyZN4ZtwIXzAEdZzlu3gQg="; "wallpaper-3.2.0" = "sha256-p9NRmusdA0wvF6onp1UTL0/4t7XnEAc19sqyGDnfg/Q="; @@ -126,6 +127,7 @@ in flutter316.buildFlutterApplication rec { ]; buildInputs = [ + ffmpeg fuse3 gst_all_1.gst-plugins-base gst_all_1.gstreamer @@ -155,6 +157,9 @@ in flutter316.buildFlutterApplication rec { ''; preBuild = '' + # Disable static linking of ffmpeg since https://github.com/21pages/hwcodec/commit/1873c34e3da070a462540f61c0b782b7ab15dc84ΒΆ + sed -i 's/static=//g' /build/cargo-vendor-dir/hwcodec-*/build.rs + # Build the Flutter/Rust bridge bindings cat < bridge.yml rust_input: diff --git a/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json b/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json index 143905911352..a077b296731b 100644 --- a/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json +++ b/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json @@ -416,7 +416,7 @@ "description": { "path": ".", "ref": "HEAD", - "resolved-ref": "336308d86ec8b9640504a371b50ba500eb779363", + "resolved-ref": "80b063b9d4e015f62e17f42a5aa0b3d20a365926", "url": "https://github.com/rustdesk-org/rustdesk_desktop_multi_window" }, "source": "git", @@ -468,7 +468,7 @@ "path": ".", "ref": "24cb88413fa5181d949ddacbb30a65d5c459e7d9", "resolved-ref": "24cb88413fa5181d949ddacbb30a65d5c459e7d9", - "url": "https://github.com/21pages/dynamic_layouts.git" + "url": "https://github.com/rustdesk-org/dynamic_layouts.git" }, "source": "git", "version": "0.0.1+1" @@ -635,7 +635,7 @@ "path": ".", "ref": "38951317afe79d953ab25733667bd96e172a80d3", "resolved-ref": "38951317afe79d953ab25733667bd96e172a80d3", - "url": "https://github.com/21pages/flutter_gpu_texture_renderer" + "url": "https://github.com/rustdesk-org/flutter_gpu_texture_renderer" }, "source": "git", "version": "0.0.1" From 5c1ed3ad5a60913877eea7713b645703526b4f51 Mon Sep 17 00:00:00 2001 From: s1341 Date: Wed, 2 Aug 2023 15:19:04 +0300 Subject: [PATCH 02/45] kasmweb: 1.12.0 -> 1.15.0 --- .../services/web-apps/kasmweb/default.nix | 47 ++++---- .../web-apps/kasmweb/initialize_kasmweb.sh | 109 ++++++++++-------- pkgs/servers/web-apps/kasmweb/default.nix | 6 +- 3 files changed, 88 insertions(+), 74 deletions(-) diff --git a/nixos/modules/services/web-apps/kasmweb/default.nix b/nixos/modules/services/web-apps/kasmweb/default.nix index 0d78025ecf0f..a5f2e85dd24a 100644 --- a/nixos/modules/services/web-apps/kasmweb/default.nix +++ b/nixos/modules/services/web-apps/kasmweb/default.nix @@ -19,14 +19,14 @@ in user = lib.mkOption { default = "kasmweb"; type = lib.types.str; - description = lib.mdDoc '' + description = '' Username to use for the postgres database. ''; }; password = lib.mkOption { default = "kasmweb"; type = lib.types.str; - description = lib.mdDoc '' + description = '' password to use for the postgres database. ''; }; @@ -124,38 +124,31 @@ in }; config = lib.mkIf cfg.enable { - systemd.services = { "init-kasmweb" = { wantedBy = [ "docker-kasm_db.service" + "podman-kasm_db.service" ]; - before = [ - "docker-kasm_db.service" - "docker-kasm_redis.service" - "docker-kasm_db_init.service" - "docker-kasm_api.service" - "docker-kasm_agent.service" - "docker-kasm_manager.service" - "docker-kasm_share.service" - "docker-kasm_guac.service" - "docker-kasm_proxy.service" - ]; + wants = ["network-online.target"]; + after = ["network-online.target"]; serviceConfig = { Type = "oneshot"; + TimeoutStartSec = 300; ExecStart = pkgs.substituteAll { src = ./initialize_kasmweb.sh; isExecutable = true; - binPath = lib.makeBinPath [ pkgs.docker pkgs.openssl pkgs.gnused ]; + binPath = lib.makeBinPath [ pkgs.docker pkgs.openssl pkgs.gnused pkgs.yq-go ]; runtimeShell = pkgs.runtimeShell; kasmweb = pkgs.kasmweb; - postgresUser = cfg.postgres.user; - postgresPassword = cfg.postgres.password; + postgresUser = "postgres"; + postgresPassword = "postgres"; inherit (cfg) datastorePath sslCertificate sslCertificateKey redisPassword + networkSubnet defaultUserPassword defaultAdminPassword defaultManagerToken @@ -167,12 +160,14 @@ in }; virtualisation = { + oci-containers.backend = "docker"; oci-containers.containers = { kasm_db = { - image = "postgres:12-alpine"; + image = "postgres:16-alpine"; + autoStart = true; environment = { - POSTGRES_PASSWORD = cfg.postgres.password; - POSTGRES_USER = cfg.postgres.user; + POSTGRES_PASSWORD = "postgres"; + POSTGRES_USER = "postgres"; POSTGRES_DB = "kasm"; }; volumes = [ @@ -185,6 +180,7 @@ in kasm_db_init = { image = "kasmweb/api:${pkgs.kasmweb.version}"; user = "root:root"; + autoStart = true; volumes = [ "${cfg.datastorePath}/:/opt/kasm/current/" "kasmweb_api_data:/tmp" @@ -197,6 +193,7 @@ in kasm_redis = { image = "redis:5-alpine"; entrypoint = "/bin/sh"; + autoStart = true; cmd = [ "-c" "redis-server --requirepass ${cfg.redisPassword}" @@ -205,6 +202,7 @@ in }; kasm_api = { image = "kasmweb/api:${pkgs.kasmweb.version}"; + autoStart = false; user = "root:root"; volumes = [ "${cfg.datastorePath}/:/opt/kasm/current/" @@ -215,15 +213,17 @@ in }; kasm_manager = { image = "kasmweb/manager:${pkgs.kasmweb.version}"; + autoStart = false; user = "root:root"; volumes = [ "${cfg.datastorePath}/:/opt/kasm/current/" ]; - dependsOn = [ "kasm_db" "kasm_api" ]; + dependsOn = [ "kasm_db_init" "kasm_db" "kasm_api" ]; extraOptions = [ "--network=kasm_default_network" "--userns=host" "--read-only"]; }; kasm_agent = { image = "kasmweb/agent:${pkgs.kasmweb.version}"; + autoStart = false; user = "root:root"; volumes = [ "${cfg.datastorePath}/:/opt/kasm/current/" @@ -236,15 +236,17 @@ in }; kasm_share = { image = "kasmweb/share:${pkgs.kasmweb.version}"; + autoStart = false; user = "root:root"; volumes = [ "${cfg.datastorePath}/:/opt/kasm/current/" ]; - dependsOn = [ "kasm_db" "kasm_redis" ]; + dependsOn = [ "kasm_db_init" "kasm_db" "kasm_redis" ]; extraOptions = [ "--network=kasm_default_network" "--userns=host" "--read-only" ]; }; kasm_guac = { image = "kasmweb/kasm-guac:${pkgs.kasmweb.version}"; + autoStart = false; user = "root:root"; volumes = [ "${cfg.datastorePath}/:/opt/kasm/current/" @@ -254,6 +256,7 @@ in }; kasm_proxy = { image = "kasmweb/nginx:latest"; + autoStart = false; ports = [ "${cfg.listenAddress}:${toString cfg.listenPort}:443" ]; user = "root:root"; volumes = [ diff --git a/nixos/modules/services/web-apps/kasmweb/initialize_kasmweb.sh b/nixos/modules/services/web-apps/kasmweb/initialize_kasmweb.sh index dbf043b98693..232fbf34028b 100644 --- a/nixos/modules/services/web-apps/kasmweb/initialize_kasmweb.sh +++ b/nixos/modules/services/web-apps/kasmweb/initialize_kasmweb.sh @@ -11,12 +11,39 @@ mkdir -p @datastorePath@/conf/nginx/containers.d chmod -R a+rw @datastorePath@/conf ln -sf @kasmweb@/www @datastorePath@ +cat >@datastorePath@/init_seeds.sh </dev/null || docker network create kasm_default_network --subnet @networkSubnet@ -if docker volume inspect kasmweb_db >/dev/null; then +if [ -e @datastorePath@/ids.env ]; then source @datastorePath@/ids.env - echo 'echo "skipping database init"' > @datastorePath@/init_seeds.sh - echo 'while true; do sleep 10 ; done' >> @datastorePath@/init_seeds.sh else API_SERVER_ID=$(cat /proc/sys/kernel/random/uuid) MANAGER_ID=$(cat /proc/sys/kernel/random/uuid) @@ -30,43 +57,10 @@ else mkdir -p @datastorePath@/certs openssl req -x509 -nodes -days 1825 -newkey rsa:2048 -keyout @datastorePath@/certs/kasm_nginx.key -out @datastorePath@/certs/kasm_nginx.crt -subj "/C=US/ST=VA/L=None/O=None/OU=DoFu/CN=$(hostname)/emailAddress=none@none.none" 2> /dev/null - docker volume create kasmweb_db + mkdir -p @datastorePath@/file_mappings + + docker volume create kasmweb_db || true rm @datastorePath@/.done_initing_data - cat >@datastorePath@/init_seeds.sh <&1 | grep -v UserWarning - /usr/bin/kasm_server.so --cfg \ - /opt/kasm/current/conf/app/api.app.config.yaml \ - --populate-production \ - --seed-file \ - /opt/kasm/current/conf/database/seed_data/default_agents.yaml \ - 2>&1 | grep -v UserWarning - /usr/bin/kasm_server.so --cfg \ - /opt/kasm/current/conf/app/api.app.config.yaml \ - --populate-production \ - --seed-file \ - /opt/kasm/current/conf/database/seed_data/default_connection_proxies.yaml \ - 2>&1 | grep -v UserWarning - /usr/bin/kasm_server.so --cfg \ - /opt/kasm/current/conf/app/api.app.config.yaml \ - --populate-production \ - --seed-file \ - /opt/kasm/current/conf/database/seed_data/default_images_amd64.yaml \ - 2>&1 | grep -v UserWarning - touch /opt/kasm/current/.done_initing_data - while true; do sleep 10 ; done -else - echo "skipping database init" - while true; do sleep 10 ; done -fi -EOF fi chmod +x @datastorePath@/init_seeds.sh @@ -77,11 +71,14 @@ if [ -e @sslCertificate@ ]; then cp @sslCertificateKey@ @datastorePath@/certs/kasm_nginx.key fi +yq -i '.server.zone_name = "'default'"' @datastorePath@/conf/app/api.app.config.yaml +yq -i '(.zones.[0]) .zone_name = "'default'"' @datastorePath@/conf/database/seed_data/default_properties.yaml + sed -i -e "s/username.*/username: @postgresUser@/g" \ -e "s/password.*/password: @postgresPassword@/g" \ -e "s/host.*db/host: kasm_db/g" \ -e "s/ssl: true/ssl: false/g" \ - -e "s/redisPassword.*/redisPassword: @redisPassword@/g" \ + -e "s/redis_password.*/redis_password: @redisPassword@/g" \ -e "s/server_hostname.*/server_hostname: kasm_api/g" \ -e "s/server_id.*/server_id: $API_SERVER_ID/g" \ -e "s/manager_id.*/manager_id: $MANAGER_ID/g" \ @@ -93,22 +90,36 @@ sed -i -e "s/ token:.*/ token: \"@defaultManagerToken@\"/g" \ -e "s/server_id.*/server_id: $SERVER_ID/g" \ @datastorePath@/conf/app/agent.app.config.yaml +# Generate a salt and hash for the desired passwords. Update the yaml +ADMIN_SALT=$(cat /proc/sys/kernel/random/uuid) +ADMIN_HASH=$(printf @defaultAdminPassword@${ADMIN_SALT} | sha256sum | cut -c-64) +USER_SALT=$(cat /proc/sys/kernel/random/uuid) +USER_HASH=$(printf @defaultUserPassword@${USER_SALT} | sha256sum | cut -c-64) -sed -i -e "s/password: admin.*/password: \"@defaultAdminPassword@\"/g" \ - -e "s/password: user.*/password: \"@defaultUserPassword@\"/g" \ - -e "s/default-manager-token/@defaultManagerToken@/g" \ - -e "s/default-registration-token/@defaultRegistrationToken@/g" \ - -e "s/upstream_auth_address:.*/upstream_auth_address: 'proxy'/g" \ +yq -i '(.users.[] | select(.username=="admin@kasm.local") | .salt) = "'${ADMIN_SALT}'"' @datastorePath@/conf/database/seed_data/default_properties.yaml +yq -i '(.users.[] | select(.username=="admin@kasm.local") | .pw_hash) = "'${ADMIN_HASH}'"' @datastorePath@/conf/database/seed_data/default_properties.yaml + +yq -i '(.users.[] | select(.username=="user@kasm.local") | .salt) = "'${USER_SALT}'"' @datastorePath@/conf/database/seed_data/default_properties.yaml +yq -i '(.users.[] | select(.username=="user@kasm.local") | .pw_hash) = "'${USER_HASH}'"' @datastorePath@/conf/database/seed_data/default_properties.yaml + +yq -i '(.settings.[] | select(.name=="token") | select(.category == "manager")) .value = "'@defaultManagerToken@'"' @datastorePath@/conf/database/seed_data/default_properties.yaml + +yq -i '(.settings.[] | select(.name=="registration_token") | select(.category == "auth")) .value = "'@defaultRegistrationToken@'"' @datastorePath@/conf/database/seed_data/default_properties.yaml + +sed -i -e "s/upstream_auth_address:.*/upstream_auth_address: 'proxy'/g" \ @datastorePath@/conf/database/seed_data/default_properties.yaml sed -i -e "s/GUACTOKEN/@defaultGuacToken@/g" \ -e "s/APIHOSTNAME/proxy/g" \ @datastorePath@/conf/app/kasmguac.app.config.yaml -sed -i -e "s/GUACTOKEN/@defaultGuacToken@/g" \ - -e "s/APIHOSTNAME/proxy/g" \ - @datastorePath@/conf/database/seed_data/default_connection_proxies.yaml - sed -i "s/00000000-0000-0000-0000-000000000000/$SERVER_ID/g" \ @datastorePath@/conf/database/seed_data/default_agents.yaml + +while [ ! -e @datastorePath@/.done_initing_data ]; do + sleep 10; +done + +systemctl restart docker-kasm_proxy.service + diff --git a/pkgs/servers/web-apps/kasmweb/default.nix b/pkgs/servers/web-apps/kasmweb/default.nix index f83db6baddc5..9c40fab2b95d 100644 --- a/pkgs/servers/web-apps/kasmweb/default.nix +++ b/pkgs/servers/web-apps/kasmweb/default.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation rec { pname = "kasmweb"; - version = "1.12.0"; - build = "d4fd8a"; + version = "1.15.0"; + build = "06fdc8"; src = fetchzip { url = "https://kasm-static-content.s3.amazonaws.com/kasm_release_${version}.${build}.tar.gz"; - sha256 = "sha256-dCjWmI8gYtoMiMHVNgTg2ZROHXvT4ulynNvnKfMxURo="; + sha256 = "sha256-7z5lc4QEpQQdVGMEMc04wXlJTK5VXJ4rufZmDEflJLw="; }; dontConfigure = true; From e1abf9bfed8933d977d25b234999ae48a6dba632 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Wed, 21 Aug 2024 14:21:23 +0200 Subject: [PATCH 03/45] rustdesk-flutter: Make build reproducible --- .../rustdesk-flutter/make-build-reproducible.patch | 13 +++++++++++++ pkgs/by-name/ru/rustdesk-flutter/package.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/by-name/ru/rustdesk-flutter/make-build-reproducible.patch diff --git a/pkgs/by-name/ru/rustdesk-flutter/make-build-reproducible.patch b/pkgs/by-name/ru/rustdesk-flutter/make-build-reproducible.patch new file mode 100644 index 000000000000..15cde84b25f7 --- /dev/null +++ b/pkgs/by-name/ru/rustdesk-flutter/make-build-reproducible.patch @@ -0,0 +1,13 @@ +diff --git a/libs/hbb_common/src/lib.rs b/libs/hbb_common/src/lib.rs +index 15ef310..f3ac940 100644 +--- a/libs/hbb_common/src/lib.rs ++++ b/libs/hbb_common/src/lib.rs +@@ -218,7 +218,7 @@ pub fn gen_version() { + } + } + // generate build date +- let build_date = format!("{}", chrono::Local::now().format("%Y-%m-%d %H:%M")); ++ let build_date = "1970-01-01 00:00"; + file.write_all( + format!("#[allow(dead_code)]\npub const BUILD_DATE: &str = \"{build_date}\";\n").as_bytes(), + ) diff --git a/pkgs/by-name/ru/rustdesk-flutter/package.nix b/pkgs/by-name/ru/rustdesk-flutter/package.nix index 5e03551d2e30..aa403cc04b9e 100644 --- a/pkgs/by-name/ru/rustdesk-flutter/package.nix +++ b/pkgs/by-name/ru/rustdesk-flutter/package.nix @@ -149,6 +149,8 @@ in flutter316.buildFlutterApplication rec { ''; patchFlags = [ "-p1" "-d" ".." ]; + patches = [ ./make-build-reproducible.patch ]; + postPatch = '' substituteInPlace ../Cargo.toml --replace-fail ", \"staticlib\", \"rlib\"" "" # The supplied Cargo.lock doesn't work with our fetcher so copy over the fixed version From 096a5c44505765a35eefe8b40ec3b8bfa5efce30 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Thu, 22 Aug 2024 17:44:26 +0000 Subject: [PATCH 04/45] komac: add HeitorAugustoLN as a maintainer --- pkgs/by-name/ko/komac/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ko/komac/package.nix b/pkgs/by-name/ko/komac/package.nix index 53dcc93d7b14..20169092225e 100644 --- a/pkgs/by-name/ko/komac/package.nix +++ b/pkgs/by-name/ko/komac/package.nix @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage { homepage = "https://github.com/russellbanks/Komac"; changelog = "https://github.com/russellbanks/Komac/releases/tag/${src.rev}"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ kachick ]; + maintainers = with maintainers; [ kachick HeitorAugustoLN ]; mainProgram = "komac"; }; } From 5c2e6db0d4cd9449676a9f66a51b641246ee73bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Aug 2024 05:37:11 +0000 Subject: [PATCH 05/45] thunderbirdPackages.thunderbird-115: 115.13.0 -> 115.14.0 --- .../networking/mailreaders/thunderbird/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 85ff6c8e5087..659be8238880 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -50,8 +50,8 @@ in rec { thunderbird = thunderbird-128; thunderbird-115 = common { - version = "115.13.0"; - sha512 = "98ee23f684aa7a166878459a6a217bf3bcc4ddd8fa8ebbd0a1d2d66392ec1ebff67dbad55d145cdd0771539f127d91c4137211cf4efc80e450e6a34c95e8529c"; + version = "115.14.0"; + sha512 = "b12e1302d6be94dd88bee6dd069d3fec944bfce95e1afc1d72c14cc188d952fd5a85f0e70575317250701ac89498d876f3384b022957689fabcef61ad7d78c29"; updateScript = callPackage ./update.nix { attrPath = "thunderbirdPackages.thunderbird-115"; From 7034c34fd0512aaae5161c5f99f6f7688f59511e Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Tue, 27 Aug 2024 16:15:45 +0000 Subject: [PATCH 06/45] komac: 2.2.1 -> 2.5.0 --- pkgs/by-name/ko/komac/package.nix | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ko/komac/package.nix b/pkgs/by-name/ko/komac/package.nix index 20169092225e..ce803cbcde26 100644 --- a/pkgs/by-name/ko/komac/package.nix +++ b/pkgs/by-name/ko/komac/package.nix @@ -7,15 +7,17 @@ , darwin , testers , komac +, dbus +, zstd }: let - version = "2.2.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "russellbanks"; repo = "Komac"; rev = "v${version}"; - hash = "sha256-dPX8/JUQ+vugd+M/jIjBf4/sNbac0FVQ0obhyAAGI84="; + hash = "sha256-X+LZ6D7MTt/0k4hLvk7TVKiL174QDdxwPKu01MyREYw="; }; in rustPlatform.buildRustPackage { @@ -23,16 +25,25 @@ rustPlatform.buildRustPackage { pname = "komac"; - cargoHash = "sha256-CDPN90X3m/9FRLolAVCIcAuajZbB5OAgLcFXq2ICS8g="; + cargoHash = "sha256-VBfXD1IF6D1z28dzXfKRz3/Hh2KRxcsYRRDV8e/Akww="; - nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = [ + dbus openssl + zstd ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; + env = { + OPENSSL_NO_VENDOR = true; + YRX_REGENERATE_MODULES_RS = "no"; + ZSTD_SYS_USE_PKG_CONFIG = true; + }; + passthru.tests.version = testers.testVersion { inherit version; From 26ed90f28f2d4ed425aa17702dd2832ed78c73fd Mon Sep 17 00:00:00 2001 From: eljamm Date: Sun, 25 Aug 2024 17:30:55 +0100 Subject: [PATCH 07/45] naja: 0-unstable-2024-07-21 -> 0-unstable-2024-08-27, fix darwin Co-authored-by: Cosima Neidahl --- pkgs/by-name/na/naja/package.nix | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/na/naja/package.nix b/pkgs/by-name/na/naja/package.nix index dd0903a21f29..ba20cacf8d0c 100644 --- a/pkgs/by-name/na/naja/package.nix +++ b/pkgs/by-name/na/naja/package.nix @@ -15,20 +15,20 @@ }: stdenv.mkDerivation { pname = "naja"; - version = "0-unstable-2024-07-21"; + version = "0-unstable-2024-08-27"; src = fetchFromGitHub { owner = "najaeda"; repo = "naja"; - rev = "8c068f3bd1bbd57b851547f191a58a375fd35cda"; - hash = "sha256-aUYPJGr4D5n92fp0namPT6I/gMRZoF7YHnB7GoRzwYI="; + rev = "ca7a544d16abb31d6992e702ccbd97be3a644c08"; + hash = "sha256-lmgXv2nmmjKph0Tf9ZvV3kQBtbiGXYA7jrE77cgM+KU="; fetchSubmodules = true; }; outputs = [ - "dev" - "lib" "out" + "lib" + "dev" ]; strictDeps = true; @@ -51,10 +51,14 @@ stdenv.mkDerivation { tbb_2021_11 ]; - cmakeFlags = [ - (lib.cmakeBool "CPPTRACE_USE_EXTERNAL_LIBDWARF" true) - (lib.cmakeBool "CPPTRACE_USE_EXTERNAL_ZSTD" true) - ]; + cmakeFlags = + [ + (lib.cmakeBool "CPPTRACE_USE_EXTERNAL_LIBDWARF" true) + (lib.cmakeBool "CPPTRACE_USE_EXTERNAL_ZSTD" true) + ] + ++ lib.optionals stdenv.isDarwin [ + (lib.cmakeFeature "CMAKE_OSX_DEPLOYMENT_TARGET" "10.14") # For aligned allocation + ]; doCheck = true; @@ -67,7 +71,5 @@ stdenv.mkDerivation { ]; mainProgram = "naja_edit"; platforms = lib.platforms.all; - # "aligned deallocation function of type [...] is only available on macOS 10.13 or newer" even with 11.0 SDK - broken = stdenv.hostPlatform.isDarwin; }; } From 0e050307f9a0a5722f149e0a9c56a62fc65d068b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 Aug 2024 08:03:38 +0000 Subject: [PATCH 08/45] pyright: 1.1.377 -> 1.1.378 --- pkgs/by-name/py/pyright/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/py/pyright/package.nix b/pkgs/by-name/py/pyright/package.nix index 5f24f8e592bc..b520b2e502b0 100644 --- a/pkgs/by-name/py/pyright/package.nix +++ b/pkgs/by-name/py/pyright/package.nix @@ -1,13 +1,13 @@ { lib, buildNpmPackage, fetchFromGitHub, runCommand, jq }: let - version = "1.1.377"; + version = "1.1.378"; src = fetchFromGitHub { owner = "Microsoft"; repo = "pyright"; rev = "${version}"; - hash = "sha256-OvdA3IFUdeBEU97+F9C86k6PDGOYggExj+ZoIt77PuI="; + hash = "sha256-GFrVnMGYR57IKUybAuVyriwgOLfPBwf7H9NjJNvsTNE="; }; patchedPackageJSON = runCommand "package.json" { } '' @@ -37,7 +37,7 @@ let pname = "pyright-internal"; inherit version src; sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-nvqg0145zW+4uvgoATWqzexQVmUBmateowxd6E14Tl8="; + npmDepsHash = "sha256-Osz5c0HeJG1CgGiLuNUfIc5jvpY35a+y496JMt3FD+I="; dontNpmBuild = true; installPhase = '' runHook preInstall @@ -51,7 +51,7 @@ buildNpmPackage rec { inherit version src; sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-aTBk8O6yEwOt1N/WaFOOfPZvfILZ5x7E2vm9N7+qth4="; + npmDepsHash = "sha256-XvswAKYGRoydha+areiXfGN6nXQObQmOWKp49Rhmbv0="; postPatch = '' chmod +w ../../ From 40ff7b87a1bf9a27f4556fb5fdd22897ebaa2792 Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 28 Aug 2024 10:38:04 +0800 Subject: [PATCH 09/45] qt6packages.qtwayland: Update wayland.xml to version 1.23.0 --- pkgs/development/libraries/qt-6/modules/qtwayland.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/qt-6/modules/qtwayland.nix b/pkgs/development/libraries/qt-6/modules/qtwayland.nix index 8d2fad7cf9da..3a31d66142ee 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwayland.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwayland.nix @@ -35,5 +35,11 @@ qtModule { url = "https://invent.kde.org/qt/qt/qtwayland/-/commit/632127d7f1d86cba4dd17361f24f9fd70a0ae44c.diff"; sha256 = "sha256-1EIcMj6+yIpqXAGZB3ZbrwRkl4n1o7TVP2SC1Nu1t78="; }) + + # Update wayland.xml to version 1.23.0 + (fetchpatch { + url = "https://invent.kde.org/qt/qt/qtwayland/-/commit/c2f61bc47baacf2e6a44c6c3c4e4cbf0abfa4095.diff"; + sha256 = "sha256-ZcK/LT65oFvTzCukZB8aDYWH5L6RK5MOPs8VtpYQpq0="; + }) ]; } From a2a5c1948adbaf5bd8218477453c33c05c0f50da Mon Sep 17 00:00:00 2001 From: Mathew Polzin Date: Wed, 28 Aug 2024 10:31:59 -0500 Subject: [PATCH 10/45] ijq: add update script --- pkgs/by-name/ij/ijq/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ij/ijq/package.nix b/pkgs/by-name/ij/ijq/package.nix index 69514ad3c648..b9f9680608f9 100644 --- a/pkgs/by-name/ij/ijq/package.nix +++ b/pkgs/by-name/ij/ijq/package.nix @@ -6,6 +6,7 @@ installShellFiles, makeBinaryWrapper, scdoc, + nix-update-script, }: buildGoModule rec { @@ -43,6 +44,8 @@ buildGoModule rec { --prefix PATH : "${lib.makeBinPath [ jq ]}" ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Interactive wrapper for jq"; mainProgram = "ijq"; From 0e81bad0a3bd6bea35f019fde72d57085887c60f Mon Sep 17 00:00:00 2001 From: Mathew Polzin Date: Wed, 28 Aug 2024 10:33:15 -0500 Subject: [PATCH 11/45] ijq: 1.1.1 -> 1.1.2 https://git.sr.ht/~gpanders/ijq/refs/v1.1.2 --- pkgs/by-name/ij/ijq/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ij/ijq/package.nix b/pkgs/by-name/ij/ijq/package.nix index b9f9680608f9..7a4486a3c997 100644 --- a/pkgs/by-name/ij/ijq/package.nix +++ b/pkgs/by-name/ij/ijq/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "ijq"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromSourcehut { owner = "~gpanders"; repo = "ijq"; rev = "v${version}"; - hash = "sha256-rnSpXMadZW6I+7tIYqr1Cb4z00gdREsqin/r6OXaDMA="; + hash = "sha256-7vG9T+gC6HeSGwFDf3m7nM0hBz32n6ATiM30AKNC1Og="; }; vendorHash = "sha256-zRa8MPWFvcoVm+LstbSAl1VY3oWMujZPjWS/ti1VXjE="; From 42e9bdff8b5932d3f99274c98d1286a1e77ad1d4 Mon Sep 17 00:00:00 2001 From: Enric Morales Date: Wed, 28 Aug 2024 15:53:21 +0000 Subject: [PATCH 12/45] basedpyright: 1.17.0 -> 1.17.1 --- pkgs/by-name/ba/basedpyright/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix index e61571c20c22..5933a1921b28 100644 --- a/pkgs/by-name/ba/basedpyright/package.nix +++ b/pkgs/by-name/ba/basedpyright/package.nix @@ -11,13 +11,13 @@ }: let - version = "1.17.0"; + version = "1.17.1"; src = fetchFromGitHub { owner = "detachhead"; repo = "basedpyright"; rev = "refs/tags/v${version}"; - hash = "sha256-GVdUxuUgnM4yr0gW+NDKYFk0Roc/U4eG/OFK8QR/vvw="; + hash = "sha256-mFY0GvVGiozxd04ktSoqcezBwXkOAeIWTgNnv1zB74A="; }; patchedPackageJSON = runCommand "package.json" { } '' @@ -47,7 +47,7 @@ let pname = "pyright-internal"; inherit version src; sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-ODN7FRAw9pd/CnVQrnnl/hNng+byDr1Rb3EFCOT0EQI="; + npmDepsHash = "sha256-IJMK/YhTldOr3Gh4ewlVLUSt3PlhIjilxB7QBJpdu80="; dontNpmBuild = true; # Uncomment this flag when using unreleased peer dependencies # npmFlags = [ "--legacy-peer-deps" ]; @@ -94,7 +94,7 @@ buildNpmPackage rec { inherit version src; sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-YdqbfA5Bb7s1iT8TzSc1fpy6QCtXfazjTQmUGsC9j2Y="; + npmDepsHash = "sha256-TmJrh/Pya7jXhMQyCz6wwCCP0gzTTKFNUKF+vBq22U0="; postPatch = '' chmod +w ../../ From 06f5e564ddf02a10cee9196e512070820c0f9d35 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 Aug 2024 16:44:14 +0000 Subject: [PATCH 13/45] yara-x: 0.6.0 -> 0.7.0 --- pkgs/by-name/ya/yara-x/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ya/yara-x/package.nix b/pkgs/by-name/ya/yara-x/package.nix index 9a6c0bb415ad..dad01808b4c6 100644 --- a/pkgs/by-name/ya/yara-x/package.nix +++ b/pkgs/by-name/ya/yara-x/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "yara-x"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "VirusTotal"; repo = "yara-x"; rev = "refs/tags/v${version}"; - hash = "sha256-KcUBaEn28hNpy1d+uqGQZUlZKCnaLcrB8th9KXHXnuQ="; + hash = "sha256-nzTksznwyLncQO2c2+ZI0Bn9kNXl6GthFCrkz3ihS3w="; }; - cargoHash = "sha256-9W68Lm1Jc1GZ7wcS0FROZYGZkrzKn9wVBKdqlBjVOxk="; + cargoHash = "sha256-+0aroLCmi2HPILCxLBFzjtHPpe6f6AMkoPdH5CjoyEo="; nativeBuildInputs = [ cmake installShellFiles ]; From 29114fd65856fcf6d1bf57d1efa0b4f42995d58b Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Wed, 28 Aug 2024 13:02:19 -0400 Subject: [PATCH 14/45] zed-editor: 0.149.6 -> 0.150.4 --- pkgs/by-name/ze/zed-editor/Cargo.lock | 2 +- pkgs/by-name/ze/zed-editor/package.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/Cargo.lock b/pkgs/by-name/ze/zed-editor/Cargo.lock index 7d0f9ac4819a..35727b4b24ca 100644 --- a/pkgs/by-name/ze/zed-editor/Cargo.lock +++ b/pkgs/by-name/ze/zed-editor/Cargo.lock @@ -13839,7 +13839,7 @@ dependencies = [ [[package]] name = "zed" -version = "0.149.6" +version = "0.150.4" dependencies = [ "activity_indicator", "anyhow", diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 29d665722acd..004074cb7ef2 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -35,13 +35,13 @@ assert withGLES -> stdenv.isLinux; rustPlatform.buildRustPackage rec { pname = "zed"; - version = "0.149.6"; + version = "0.150.4"; src = fetchFromGitHub { owner = "zed-industries"; repo = "zed"; rev = "refs/tags/v${version}"; - hash = "sha256-YWXK5heCCw6eXhc1Fh7eIC0tzszC86FP3ovzkCYkdtc="; + hash = "sha256-dMhsKaqEWyjPjxaSYrz6zAvOzDbWrsPh6oKRu+D57cM="; fetchSubmodules = true; }; From 15a69cfd1a36c8e3e3e7b5ca2c9e0ac6347a8d51 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 Aug 2024 18:03:48 +0000 Subject: [PATCH 15/45] qovery-cli: 1.2.4 -> 1.2.5 --- pkgs/tools/admin/qovery-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index 8af9bb861256..eeb8e724745c 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "qovery-cli"; - version = "1.2.4"; + version = "1.2.5"; src = fetchFromGitHub { owner = "Qovery"; repo = "qovery-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-bTlbrL2pP6KB2g3bMsvyT24/7Sc4I707KL3hJktsWpA="; + hash = "sha256-RoHQXlfdVJVumgr/Ruph0O79vSf162fwj8R+MrRnmXY="; }; vendorHash = "sha256-z7O0IAXGCXV63WjaRG+7c7q/rlqkV12XWNLhsduvk6s="; From 183b20e9bc8c163a696b90f8cd8c69b1f1de9c4e Mon Sep 17 00:00:00 2001 From: Jan Likar Date: Wed, 28 Aug 2024 20:04:58 +0200 Subject: [PATCH 16/45] kdash: 0.6.0 -> 0.6.1 Due to a breaking change in Rust compiler 1.80.0 cargo-clone cannot be built. See NixOS#332957. Version 0.6.1 includes a fix for this issue and several dependency updates. Changelog: https://github.com/kdash-rs/kdash/blob/main/CHANGELOG.md --- pkgs/development/tools/kdash/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/kdash/default.nix b/pkgs/development/tools/kdash/default.nix index 73746875247d..52558724fb0f 100644 --- a/pkgs/development/tools/kdash/default.nix +++ b/pkgs/development/tools/kdash/default.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "kdash"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "kdash-rs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XY6aBqLHbif3RsytNm7JnDXspICJuhS7SJ+ApwTeqX4="; + sha256 = "sha256-IpF5uXRxHBmfWkBBJjNvDsyQG5nzFjKbCmmGpG3howo="; }; nativeBuildInputs = [ perl python3 pkg-config ]; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl xorg.xcbutil ] ++ lib.optional stdenv.isDarwin AppKit; - cargoHash = "sha256-ODQf+Fvil+oBJcM38h1HdrcgtJw0b65f5auLuZtUgik="; + cargoHash = "sha256-jm0UCKDy6TrogMPavB86lvk8yKZXubTGGbApk+oP2RQ="; meta = with lib; { description = "A simple and fast dashboard for Kubernetes"; From b63a3e750ddc6e6e0ba383a43b778abeffb63680 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 28 Aug 2024 20:43:47 +0200 Subject: [PATCH 17/45] osc: update to version 1.9.1 --- pkgs/development/python-modules/osc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/osc/default.nix b/pkgs/development/python-modules/osc/default.nix index ba8840da2fdc..f794b91fb0cb 100644 --- a/pkgs/development/python-modules/osc/default.nix +++ b/pkgs/development/python-modules/osc/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "osc"; - version = "1.8.3"; + version = "1.9.1"; format = "setuptools"; src = fetchFromGitHub { owner = "openSUSE"; repo = "osc"; rev = version; - hash = "sha256-SREq0rZuCiILBG4RdvtxkTOGKJuYBS3GypLZnSdBvVI="; + hash = "sha256-03EDarU7rmsiE96IYHXFuPtD8nWur0qwj8NDzSj8OX0="; }; buildInputs = [ bashInteractive ]; # needed for bash-completion helper From 3d0ae8c633227e4e416c8660d7e66b5f7343105e Mon Sep 17 00:00:00 2001 From: Marc Jakobi Date: Wed, 28 Aug 2024 15:22:24 +0200 Subject: [PATCH 18/45] luaPackages.lz-n: 2.2.0 -> 2.5.2 --- pkgs/development/lua-modules/generated-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index be61cfb5d3d2..918df81e4ecf 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -2469,14 +2469,14 @@ buildLuarocksPackage { lz-n = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "lz.n"; - version = "2.2.0-1"; + version = "2.5.2-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lz.n-2.2.0-1.rockspec"; - sha256 = "0ybdmsv7lxgmv5g8dmgsw8qa20lxxj8736814iw9hwynndwl7gck"; + url = "mirror://luarocks/lz.n-2.5.2-1.rockspec"; + sha256 = "1sr6yhkq5bwp8bkqx206cr8ignz5z82a6j1dw4qgwdlvzs5kr0vs"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/lz.n/archive/v2.2.0.zip"; - sha256 = "16z7q6jp53gjmj2vn5vy2bv5x8p18hlxs28apsw59nk0wwz1s9s4"; + url = "https://github.com/nvim-neorocks/lz.n/archive/v2.5.2.zip"; + sha256 = "0pkw6wrrkzv6vl9jxx7qlr8yjghnkr1s7jy66dsw5yzfb8gz8kpd"; }; disabled = luaOlder "5.1"; From 58408ce69996bb00999893dd3361834bae1dfc9b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 Aug 2024 20:37:35 +0000 Subject: [PATCH 19/45] python312Packages.asana: 5.0.9 -> 5.0.10 --- pkgs/development/python-modules/asana/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix index 95e3889e05a3..1dd20ac22d82 100644 --- a/pkgs/development/python-modules/asana/default.nix +++ b/pkgs/development/python-modules/asana/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "asana"; - version = "5.0.9"; + version = "5.0.10"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "asana"; repo = "python-asana"; rev = "refs/tags/v${version}"; - hash = "sha256-7qJdPIk2xSF909chvjwT9zdSQ6NA6cgwefJGaBw1BQY="; + hash = "sha256-nuBvRqrs00OIY3UzN7bF5dB15TZqeE43o1BIpBaJZcQ="; }; build-system = [ setuptools ]; From 3bdb21ef9a7c1e816b06acfa5b1c0fc242ea7e8b Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 28 Aug 2024 23:09:53 +0200 Subject: [PATCH 20/45] rabbit: 2.1.0 -> 2.2.0 Diff: https://github.com/natarajan-chidambaram/RABBIT/compare/refs/tags/2.1.0...2.2.0 --- pkgs/by-name/ra/rabbit/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ra/rabbit/package.nix b/pkgs/by-name/ra/rabbit/package.nix index 0ae3c134fe9f..7806d49558c8 100644 --- a/pkgs/by-name/ra/rabbit/package.nix +++ b/pkgs/by-name/ra/rabbit/package.nix @@ -5,19 +5,21 @@ python3.pkgs.buildPythonApplication rec { pname = "rabbit"; - version = "2.1.0"; + version = "2.2.0"; pyproject = true; src = fetchFromGitHub { owner = "natarajan-chidambaram"; repo = "RABBIT"; rev = "refs/tags/${version}"; - hash = "sha256-l5k5wPEd6/x7xHc+GlnoyTry7GRTnzNiTLxrLAZFVzQ="; + hash = "sha256-diy94QhgLHLvkb1kKhGDxiHAyQ43BNJUXjHFYahEDpw="; }; pythonRelaxDeps = [ "numpy" + "scikit-learn" "scipy" + "tqdm" ]; build-system = [ @@ -26,6 +28,7 @@ python3.pkgs.buildPythonApplication rec { ]; dependencies = with python3.pkgs; [ + joblib numpy pandas python-dateutil @@ -34,7 +37,6 @@ python3.pkgs.buildPythonApplication rec { scipy tqdm urllib3 - xgboost ]; pythonImportsCheck = [ "rabbit" ]; From f35d073046ca290717578e8f9726d5e87266ac0d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 29 Aug 2024 03:45:11 +0200 Subject: [PATCH 21/45] esphome: 2024.8.0 -> 2024.8.1 https://github.com/esphome/esphome/releases/tag/2024.8.1 --- pkgs/tools/misc/esphome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 08dc73433d3d..a2979ab67d82 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -21,14 +21,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2024.8.0"; + version = "2024.8.1"; pyproject = true; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-OI4WjuHSnOIKDIM/8LC1E8TwJRgrhGMjmyzyTFgrIM0="; + hash = "sha256-wjvbnqlhg4AHJLQvjWysDXBjECc1sV5ilx1jk8IzILw="; }; nativeBuildInputs = with python.pkgs; [ From 5165a5b2fcf1872986965d15389d7a60846386fe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Aug 2024 03:18:35 +0000 Subject: [PATCH 22/45] python312Packages.tesla-fleet-api: 0.7.3 -> 0.7.4 --- pkgs/development/python-modules/tesla-fleet-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tesla-fleet-api/default.nix b/pkgs/development/python-modules/tesla-fleet-api/default.nix index a06f880b8cc7..1efd28a3041e 100644 --- a/pkgs/development/python-modules/tesla-fleet-api/default.nix +++ b/pkgs/development/python-modules/tesla-fleet-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tesla-fleet-api"; - version = "0.7.3"; + version = "0.7.4"; pyproject = true; disabled = pythonOlder "3.10"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Teslemetry"; repo = "python-tesla-fleet-api"; rev = "refs/tags/v${version}"; - hash = "sha256-P5cU5TZ2zWVIkFp4USjofA6mOshG9IdjhYLXnY2z9fY="; + hash = "sha256-lZuluzOiqqeDFf+DrX0/KNbsUKanUn2xglp3HW0ITso="; }; build-system = [ setuptools ]; From 4858b86101f7a43338d4c89a6f8c0722010ec7d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Aug 2024 03:20:17 +0000 Subject: [PATCH 23/45] lammps: 2Aug2023_update3 -> 2Aug2023_update4 --- .../science/molecular-dynamics/lammps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix index 2474998450cb..30253dfe493a 100644 --- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix +++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix @@ -46,14 +46,14 @@ stdenv.mkDerivation (finalAttrs: { # LAMMPS has weird versioning convention. Updates should go smoothly with: # nix-update --commit lammps --version-regex 'stable_(.*)' - version = "2Aug2023_update3"; + version = "2Aug2023_update4"; pname = "lammps"; src = fetchFromGitHub { owner = "lammps"; repo = "lammps"; rev = "stable_${finalAttrs.version}"; - hash = "sha256-jx0hkiYxQlnE2sa4WTvluEgphF//sNbK91VGAQJMwjw="; + hash = "sha256-4y41kRO1iKFoCDVe6Dap4njcFa3z+9acKomoxOL7ipI="; }; preConfigure = '' cd cmake From 55760e4c10d56283412fff70f047b26379b76e54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 22 Aug 2024 14:57:02 +0200 Subject: [PATCH 24/45] hydra: rename from hydra_unstable There is no stable hydra package --- maintainers/scripts/haskell/hydra-report.hs | 2 +- nixos/modules/services/continuous-integration/hydra/default.nix | 2 +- nixos/tests/hydra/default.nix | 2 +- pkgs/development/tools/misc/hydra/{unstable.nix => default.nix} | 2 +- pkgs/top-level/aliases.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/release-haskell.nix | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) rename pkgs/development/tools/misc/hydra/{unstable.nix => default.nix} (99%) diff --git a/maintainers/scripts/haskell/hydra-report.hs b/maintainers/scripts/haskell/hydra-report.hs index debf684abf50..ebcb576d5521 100755 --- a/maintainers/scripts/haskell/hydra-report.hs +++ b/maintainers/scripts/haskell/hydra-report.hs @@ -1,6 +1,6 @@ #! /usr/bin/env nix-shell #! nix-shell -p "haskellPackages.ghcWithPackages (p: [p.aeson p.req])" -#! nix-shell -p hydra-unstable +#! nix-shell -p hydra #! nix-shell -i runhaskell {- diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index b516c3d6192c..be7dffa72f38 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -97,7 +97,7 @@ in ''; }; - package = mkPackageOption pkgs "hydra_unstable" { }; + package = mkPackageOption pkgs "hydra" { }; hydraURL = mkOption { type = types.str; diff --git a/nixos/tests/hydra/default.nix b/nixos/tests/hydra/default.nix index 98c3c6fbae9f..0f5092f19653 100644 --- a/nixos/tests/hydra/default.nix +++ b/nixos/tests/hydra/default.nix @@ -11,7 +11,7 @@ let inherit (import ./common.nix { inherit system; }) baseConfig; hydraPkgs = { - inherit (pkgs) hydra_unstable; + inherit (pkgs) hydra; }; makeHydraTest = with pkgs.lib; name: package: makeTest { diff --git a/pkgs/development/tools/misc/hydra/unstable.nix b/pkgs/development/tools/misc/hydra/default.nix similarity index 99% rename from pkgs/development/tools/misc/hydra/unstable.nix rename to pkgs/development/tools/misc/hydra/default.nix index 5305c9854f9d..d198bdaa4a23 100644 --- a/pkgs/development/tools/misc/hydra/unstable.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -243,7 +243,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { inherit nix perlDeps; - tests.basic = nixosTests.hydra.hydra_unstable; + tests.basic = nixosTests.hydra.hydra; }; meta = with lib; { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 42922aa6f19c..32ef3afdf33a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -649,7 +649,7 @@ mapAliases ({ hip-nvidia = throw "'hip-nvidia' has been removed in favor of 'rocmPackages.clr'"; # Added 2023-10-08 hll2390dw-cups = throw "The hll2390dw-cups package was dropped since it was unmaintained."; # Added 2024-06-21 ht-rust = xh; # Added 2021-02-13 - hydra-unstable = hydra_unstable; # added 2022-05-10 + hydra_unstable = hydra; # Added 2024-08-22 hydron = throw "hydron has been removed as the project has been archived upstream since 2022 and is affected by a severe remote code execution vulnerability"; hyper-haskell = throw "'hyper-haskell' has been removed. reason: has been broken for a long time and depends on an insecure electron version"; # Added 2024-03-14 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d7124449ad84..58b148d10075 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20764,7 +20764,7 @@ with pkgs; hwloc = callPackage ../development/libraries/hwloc { }; - hydra_unstable = callPackage ../development/tools/misc/hydra/unstable.nix { nix = nixVersions.nix_2_22; }; + hydra = callPackage ../development/tools/misc/hydra { nix = nixVersions.nix_2_22; }; hydra-cli = callPackage ../development/tools/misc/hydra-cli { }; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 7774800660e6..4977efe4a458 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -4,7 +4,7 @@ https://hydra.nixos.org/jobset/nixpkgs/haskell-updates. To debug this expression you can use `hydra-eval-jobs` from - `pkgs.hydra_unstable` which prints the jobset description + `pkgs.hydra` which prints the jobset description to `stdout`: $ hydra-eval-jobs -I . pkgs/top-level/release-haskell.nix From 5cbda496f5b909d0bd0b643ef850aad185e0e04a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 8 Aug 2024 13:28:01 +0200 Subject: [PATCH 25/45] hydra: 2024-08-20 -> 2024-08-21 --- pkgs/development/tools/misc/hydra/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index d198bdaa4a23..95dd5dca6f2a 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -124,13 +124,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "hydra"; - version = "2024-08-20"; + version = "2024-08-21"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "4bb2f08be14ff86d57b94b520a6cd2181efaee36"; - hash = "sha256-NzsqjLSobba4BJ5FS3vccC9rAH0OE9XI97geGj0KHts="; + rev = "9ee3c6aea2d8f96cd45429297ccdf015f8a1c209"; + hash = "sha256-k0EsitHNP4Mpm0wEZ+3n4WXo5TN64wH0DNTfFTf6YpI="; }; patches = [ From 0c454e93171f0fcb4d0edf4a7c7c0ab34ad5ae31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 8 Aug 2024 11:38:55 +0200 Subject: [PATCH 26/45] nixos/hydra: use configured compression in hydra-compress-logs service --- .../services/continuous-integration/hydra/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index be7dffa72f38..ffee95fefc4b 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -466,6 +466,7 @@ in requires = [ "hydra-init.service" ]; after = [ "hydra-init.service" ]; restartTriggers = [ hydraConf ]; + path = [ pkgs.zstd ]; environment = env // { PGPASSFILE = "${baseDir}/pgpass-queue-runner"; HYDRA_DBI = "${env.HYDRA_DBI};application_name=hydra-notify"; @@ -500,10 +501,15 @@ in # logs automatically after a step finishes, but this doesn't work # if the queue runner is stopped prematurely. systemd.services.hydra-compress-logs = - { path = [ pkgs.bzip2 ]; + { path = [ pkgs.bzip2 pkgs.zstd ]; script = '' - find /var/lib/hydra/build-logs -type f -name "*.drv" -mtime +3 -size +0c | xargs -r bzip2 -v -f + set -eou pipefail + compression=$(sed -nr 's/compress_build_logs_compression = ()/\1/p' ${baseDir}/hydra.conf) + if [[ $compression == zstd ]]; then + compression="zstd --rm" + fi + find ${baseDir}/build-logs -type f -name "*.drv" -mtime +3 -size +0c | xargs -r $compression --force --quiet ''; startAt = "Sun 01:45"; }; From 13348a54090de8ee0dd18185a714a689f75f022d Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 29 Aug 2024 13:53:22 +1000 Subject: [PATCH 27/45] hydra: 2024-08-21 -> 0-unstable-2024-08-27 Diff: https://github.com/NixOS/hydra/compare/9ee3c6aea2d8f96cd45429297ccdf015f8a1c209...2d79b0a4da9e2a8ff97c1173aa56fe92e1f4629b --- pkgs/development/tools/misc/hydra/default.nix | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index 95dd5dca6f2a..1b6bf433ce81 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -1,6 +1,5 @@ { stdenv , lib -, fetchpatch2 , nix , perlPackages , buildEnv @@ -124,27 +123,15 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "hydra"; - version = "2024-08-21"; + version = "0-unstable-2024-08-27"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "9ee3c6aea2d8f96cd45429297ccdf015f8a1c209"; - hash = "sha256-k0EsitHNP4Mpm0wEZ+3n4WXo5TN64wH0DNTfFTf6YpI="; + rev = "2d79b0a4da9e2a8ff97c1173aa56fe92e1f4629b"; + hash = "sha256-ZU8/LzdZ0nbUxVxTsRZyMpTGEtps9oG0Yx2cpS9J8I4="; }; - patches = [ - (fetchpatch2 { - url = "https://github.com/NixOS/hydra/commit/916531dc9ccee52e6dab256232933fcf6d198158.patch"; - hash = "sha256-JOtlYr+K934UIqHvfLMd/jfRRU+Tci0kvtyhOvlwxEs="; - }) - (fetchpatch2 { - name = "CVE-2024-45049.patch"; - url = "https://github.com/NixOS/hydra/commit/f73043378907c2c7e44f633ad764c8bdd1c947d5.patch"; - hash = "sha256-IS6GCuRLW+ULDD7udpGX2tO85bV2gGOX6DLLw3NTkJU="; - }) - ]; - buildInputs = [ unzip libpqxx From 47155b11eacdfd4477ffb0b4f555958c5a1cbebc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Aug 2024 04:53:20 +0000 Subject: [PATCH 28/45] ferretdb: 1.23.1 -> 1.24.0 --- pkgs/servers/nosql/ferretdb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/nosql/ferretdb/default.nix b/pkgs/servers/nosql/ferretdb/default.nix index 2eac2d689d72..318c86db7c55 100644 --- a/pkgs/servers/nosql/ferretdb/default.nix +++ b/pkgs/servers/nosql/ferretdb/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "ferretdb"; - version = "1.23.1"; + version = "1.24.0"; src = fetchFromGitHub { owner = "FerretDB"; repo = "FerretDB"; rev = "v${version}"; - hash = "sha256-Y4mMh/3I2ajXnHCR9PQXvuUA/BVIfgNrnAIU0/o7QFw="; + hash = "sha256-WMejspnk2PvJhvNGi4h+DF+fzipuOMcS1QWim5DnAhQ="; }; postPatch = '' @@ -20,7 +20,7 @@ buildGoModule rec { echo nixpkgs > build/version/package.txt ''; - vendorHash = "sha256-qBEaL0+sBcT8PTet4Znm4OPHFy+UcIuvwI2ywyv4nDc="; + vendorHash = "sha256-GT6e9yd6LF6GFlGBWVAmcM6ysB/6cIGLbnM0hxfX5TE="; CGO_ENABLED = 0; From 747060f364ec15070e1a1d1dbfa39a2dda000e84 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 29 Aug 2024 13:32:33 +1000 Subject: [PATCH 29/45] hydra: move to pkgs/by-name --- .../misc/hydra/default.nix => by-name/hy/hydra/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{development/tools/misc/hydra/default.nix => by-name/hy/hydra/package.nix} (100%) diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/by-name/hy/hydra/package.nix similarity index 100% rename from pkgs/development/tools/misc/hydra/default.nix rename to pkgs/by-name/hy/hydra/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 58b148d10075..5cb56b8f7520 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20764,7 +20764,7 @@ with pkgs; hwloc = callPackage ../development/libraries/hwloc { }; - hydra = callPackage ../development/tools/misc/hydra { nix = nixVersions.nix_2_22; }; + hydra = callPackage ../by-name/hy/hydra/package.nix { nix = nixVersions.nix_2_22; }; hydra-cli = callPackage ../development/tools/misc/hydra-cli { }; From 77feb16bb558f5e0a686afb326fa8235c6105ccd Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 26 Aug 2024 08:58:35 +0300 Subject: [PATCH 30/45] mesa: 24.1.6 -> 24.2.1 --- pkgs/development/libraries/mesa/common.nix | 16 +++++++------- .../libraries/mesa/darwin-build-fix.patch | 13 +++++++++++ pkgs/development/libraries/mesa/darwin.nix | 14 ++++++++++-- pkgs/development/libraries/mesa/default.nix | 22 +++++++++---------- 4 files changed, 44 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/libraries/mesa/darwin-build-fix.patch diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix index 5628ca1b49e0..666da7fb9915 100644 --- a/pkgs/development/libraries/mesa/common.nix +++ b/pkgs/development/libraries/mesa/common.nix @@ -1,18 +1,18 @@ -{ lib, fetchurl }: +{ lib, fetchFromGitLab }: # When updating this package, please verify at least these build (assuming x86_64-linux): # nix build .#mesa .#pkgsi686Linux.mesa .#pkgsCross.aarch64-multiplatform.mesa .#pkgsMusl.mesa # Ideally also verify: # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa rec { pname = "mesa"; - version = "24.1.6"; + version = "24.2.1"; - src = fetchurl { - urls = [ - "https://archive.mesa3d.org/mesa-${version}.tar.xz" - "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" - ]; - hash = "sha256-2pTAkI1WYkZzabae2CNtoeFXcUGm59JRcam/Vjg7NOg="; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "mesa"; + repo = "mesa"; + rev = "mesa-${version}"; + hash = "sha256-1aOK5M4Xe1FnmouOIoyafrvnxyoGpNK8wLVDC8yO4p0="; }; meta = { diff --git a/pkgs/development/libraries/mesa/darwin-build-fix.patch b/pkgs/development/libraries/mesa/darwin-build-fix.patch new file mode 100644 index 000000000000..f253169b1594 --- /dev/null +++ b/pkgs/development/libraries/mesa/darwin-build-fix.patch @@ -0,0 +1,13 @@ +diff --git a/src/glx/glxext.c b/src/glx/glxext.c +index eee9f040151..289691db26b 100644 +--- a/src/glx/glxext.c ++++ b/src/glx/glxext.c +@@ -800,7 +800,7 @@ AllocAndFetchScreenConfigs(Display * dpy, struct glx_display * priv, Bool zink, + + #if defined(GLX_USE_APPLE) + if (psc == NULL && priv->driswDisplay) { +- psc = priv->driswDisplay->createScreen(i, priv); ++ psc = priv->driswDisplay->createScreen(i, priv, driver_name_is_inferred); + } + #endif + diff --git a/pkgs/development/libraries/mesa/darwin.nix b/pkgs/development/libraries/mesa/darwin.nix index aeeb8ab7648b..5be2a27f74e9 100644 --- a/pkgs/development/libraries/mesa/darwin.nix +++ b/pkgs/development/libraries/mesa/darwin.nix @@ -2,9 +2,11 @@ { lib, stdenv, - fetchurl, + fetchFromGitLab, bison, flex, + libxml2, + llvmPackages, meson, ninja, pkg-config, @@ -14,10 +16,14 @@ zlib, }: let - common = import ./common.nix { inherit lib fetchurl; }; + common = import ./common.nix { inherit lib fetchFromGitLab; }; in stdenv.mkDerivation { inherit (common) pname version src meta; + patches = [ + ./darwin-build-fix.patch + ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ @@ -29,9 +35,12 @@ in stdenv.mkDerivation { python3Packages.packaging python3Packages.python python3Packages.mako + python3Packages.pyyaml ]; buildInputs = [ + libxml2 # should be propagated from libllvm + llvmPackages.libllvm Xplugin xorg.libX11 xorg.libXext @@ -46,6 +55,7 @@ in stdenv.mkDerivation { "--datadir=${placeholder "out"}/share" (lib.mesonEnable "glvnd" false) (lib.mesonEnable "shared-glapi" true) + (lib.mesonEnable "llvm" true) ]; # Don't need this on Darwin. diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index b1d5b0ad84f9..ca75bc6a8cf1 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -5,8 +5,7 @@ , elfutils , expat , fetchCrate -, fetchurl -, fetchpatch +, fetchFromGitLab , file , flex , glslang @@ -45,12 +44,12 @@ , galliumDrivers ? [ "d3d12" # WSL emulated GPU (aka Dozen) "iris" # new Intel (Broadwell+) - "kmsro" # special "render only" driver for GPUs without a display controller + "llvmpipe" # software renderer "nouveau" # Nvidia - "radeonsi" # new AMD (GCN+) "r300" # very old AMD "r600" # less old AMD - "swrast" # software renderer (aka LLVMPipe) + "radeonsi" # new AMD (GCN+) + "softpipe" # older software renderer "svga" # VMWare virtualized GPU "virgl" # QEMU virtualized GPU (aka VirGL) "zink" # generic OpenGL over Vulkan, experimental @@ -104,8 +103,8 @@ let } { pname = "proc-macro2"; - version = "1.0.70"; - hash = "sha256-e4ZgyZUTu5nAtaH5QVkLelqJQX/XPj/rWkzf/g2c+1g="; + version = "1.0.86"; + hash = "sha256-9fYAlWRGVIwPp8OKX7Id84Kjt8OoN2cANJ/D9ZOUUZE="; } { pname = "quote"; @@ -114,8 +113,8 @@ let } { pname = "syn"; - version = "2.0.39"; - hash = "sha256-Mjen2L/omhVbhU/+Ao65mogs3BP3fY+Bodab3uU63EI="; + version = "2.0.68"; + hash = "sha256-nGLBbxR0DFBpsXMngXdegTm/o13FBS6QsM7TwxHXbgQ="; } { pname = "unicode-ident"; @@ -133,7 +132,7 @@ let needNativeCLC = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; - common = import ./common.nix { inherit lib fetchurl; }; + common = import ./common.nix { inherit lib fetchFromGitLab; }; in stdenv.mkDerivation { inherit (common) pname version src meta; @@ -275,6 +274,7 @@ in stdenv.mkDerivation { python3Packages.pycparser python3Packages.mako python3Packages.ply + python3Packages.pyyaml jdupes # Use bin output from glslang to not propagate the dev output at # the build time with the host glslang. @@ -368,7 +368,7 @@ in stdenv.mkDerivation { done # add RPATH here so Zink can find libvulkan.so - patchelf --add-rpath ${vulkan-loader}/lib $drivers/lib/dri/zink_dri.so + patchelf --add-rpath ${vulkan-loader}/lib $out/lib/libgallium*.so ''; env.NIX_CFLAGS_COMPILE = toString ([ From 21859b8e59c6baa906fece02e1ce6bf41f75e0cd Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 28 Aug 2024 23:19:13 +0200 Subject: [PATCH 31/45] open-webui: 0.3.15 -> 0.3.16 Diff: https://github.com/open-webui/open-webui/compare/v0.3.15...v0.3.16 Changelog: https://github.com/open-webui/open-webui/blob/v0.3.16/CHANGELOG.md --- pkgs/by-name/op/open-webui/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index ab25f18fff90..7fc0530e6cf5 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -7,19 +7,19 @@ }: let pname = "open-webui"; - version = "0.3.15"; + version = "0.3.16"; src = fetchFromGitHub { owner = "open-webui"; repo = "open-webui"; rev = "v${version}"; - hash = "sha256-e326Dxuu9cdpPV/T4arDSBqT1agnXdV5ysrIRyhF8ws="; + hash = "sha256-AxD7WHL5fGM0CBKi7zc/gmoSJQBohDh0HgIDU1/BQ7w="; }; frontend = buildNpmPackage { inherit pname version src; - npmDepsHash = "sha256-exkFrKBwTtN18pPNcFG1fYBoWASHsnCHYYVWkCFd0z0="; + npmDepsHash = "sha256-Ik+wXymso3jdKXQgLydnhhWvpHl0d82pwYSmUR0yfPE="; # Disabling `pyodide:fetch` as it downloads packages during `buildPhase` # Until this is solved, running python packages from the browser will not work. @@ -91,6 +91,7 @@ python3.pkgs.buildPythonApplication rec { langchain-community langfuse markdown + nltk openai opencv4 openpyxl From 88b71e50e0af0986d9a70d60911d1e9a6eb4dc75 Mon Sep 17 00:00:00 2001 From: Alexander Kiselyov Date: Tue, 27 Aug 2024 15:10:13 +0300 Subject: [PATCH 32/45] paraview: 5.12.1 -> 5.13.0 --- pkgs/applications/graphics/paraview/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index f8afeb1f828b..4ff64094af80 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -26,13 +26,13 @@ }: let - version = "5.12.1"; + version = "5.13.0"; docFiles = [ (fetchurl { url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${lib.versions.majorMinor version}&type=data&os=Sources&downloadFile=ParaViewTutorial-${version}.pdf"; name = "Tutorial.pdf"; - hash = "sha256-ETA799peqP9RAjcqPBwVb8egKfQJAuIXNgso+k8o50Q="; + hash = "sha256-hoCa/aTy2mmsPHP3Zm0hLZlZKbtUMpjUlc2rFKKChco="; }) (fetchurl { url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${lib.versions.majorMinor version}&type=data&os=Sources&downloadFile=ParaViewGettingStarted-${version}.pdf"; @@ -42,7 +42,7 @@ let (fetchurl { url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${lib.versions.majorMinor version}&type=data&os=Sources&downloadFile=ParaViewCatalystGuide-${version}.pdf"; name = "CatalystGuide.pdf"; - hash = "sha256-imRW70lGQX7Gy0AavIHQMVhnn9E2FPpiCdCKt7Jje4w="; + hash = "sha256-t1lJ1Wiswhdxovt2O4sXTXfFxshDiZZVdnkXt/+BQn8="; }) ]; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { owner = "paraview"; repo = "paraview"; rev = "v${version}"; - hash = "sha256-jbqMqj3D7LTwQ+hHIPscCHw4TfY/BR2HuVmMYom2+dA="; + hash = "sha256-JRSuvBON2n0UnbrFia4Qmf6eYb1Mc+Z7dIcXSeUhpIc="; fetchSubmodules = true; }; From 9587086e8df771988dd69e75d3265a84a471d5e4 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 29 Aug 2024 08:58:29 +0200 Subject: [PATCH 33/45] protobuf_28: init at 28.0 --- pkgs/development/libraries/protobuf/28.nix | 9 +++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 11 insertions(+) create mode 100644 pkgs/development/libraries/protobuf/28.nix diff --git a/pkgs/development/libraries/protobuf/28.nix b/pkgs/development/libraries/protobuf/28.nix new file mode 100644 index 000000000000..215182b3f45e --- /dev/null +++ b/pkgs/development/libraries/protobuf/28.nix @@ -0,0 +1,9 @@ +{ callPackage, ... }@args: + +callPackage ./generic.nix ( + { + version = "28.0"; + hash = "sha256-dAyXtBPeZAhmAOWbG1Phh57fqMmkH2AbDUr+8A+irJQ="; + } + // args +) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f232039d14d8..2f3d6c214971 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23174,6 +23174,7 @@ with pkgs; inherit ({ + protobuf_28 = callPackage ../development/libraries/protobuf/28.nix { }; protobuf_27 = callPackage ../development/libraries/protobuf/27.nix { }; protobuf_26 = callPackage ../development/libraries/protobuf/26.nix { }; protobuf_25 = callPackage ../development/libraries/protobuf/25.nix { }; @@ -23188,6 +23189,7 @@ with pkgs; abseil-cpp = abseil-cpp_202103; }; }) + protobuf_28 protobuf_27 protobuf_26 protobuf_25 From 416d4d536a3a51ed195d0b6bdb58ed92432ab6a3 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 29 Aug 2024 09:47:16 +0300 Subject: [PATCH 34/45] qt6.qtwayland: unbork For some reason qtwayland doesn't fail to configure if it can't find wayland-scanner, and instead just builds nothing, so this wasn't noticed before. Propagating wayland-scanner both ways because we need both the tool in /bin and the protocols in cmake's search path. --- pkgs/development/libraries/qt-6/modules/qtwayland.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-6/modules/qtwayland.nix b/pkgs/development/libraries/qt-6/modules/qtwayland.nix index 8d2fad7cf9da..26764899b96f 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwayland.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwayland.nix @@ -2,6 +2,7 @@ , qtbase , qtdeclarative , wayland +, wayland-scanner , pkg-config , libdrm , fetchpatch @@ -9,8 +10,11 @@ qtModule { pname = "qtwayland"; - propagatedBuildInputs = [ qtbase qtdeclarative ]; - propagatedNativeBuildInputs = [ wayland ]; + # wayland-scanner needs to be propagated as both build + # (for the wayland-scanner binary) and host (for the + # actual wayland.xml protocol definition) + propagatedBuildInputs = [ qtbase qtdeclarative wayland-scanner ]; + propagatedNativeBuildInputs = [ wayland wayland-scanner ]; buildInputs = [ wayland libdrm ]; nativeBuildInputs = [ pkg-config ]; From f54ba77fd39caeae11cc1dd5e4f6720192beb25f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 29 Aug 2024 09:39:55 +0200 Subject: [PATCH 35/45] python312Packages.cyclopts: 2.9.8 -> 2.9.9 Diff: https://github.com/BrianPugh/cyclopts/compare/refs/tags/v2.9.8...v2.9.9 Changelog: https://github.com/BrianPugh/cyclopts/releases/tag/v2.9.9 --- pkgs/development/python-modules/cyclopts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix index 9e0aea624be9..5948f958438e 100644 --- a/pkgs/development/python-modules/cyclopts/default.nix +++ b/pkgs/development/python-modules/cyclopts/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "cyclopts"; - version = "2.9.8"; + version = "2.9.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "BrianPugh"; repo = "cyclopts"; rev = "refs/tags/v${version}"; - hash = "sha256-smrx8YSVp3Jr+BAM9ZOfOVS9HOwPveBLHFmcs5ZhQ1M="; + hash = "sha256-gU/oqFrOzA6PQTwwGS9si19F+LIondO3MozNDwPDtgs="; }; build-system = [ From 7d94d645e1b9ea38818644ae0517e89265e23a61 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Aug 2024 08:40:17 +0000 Subject: [PATCH 36/45] ironicclient: 5.7.0 -> 5.8.0 --- .../python-modules/python-ironicclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-ironicclient/default.nix b/pkgs/development/python-modules/python-ironicclient/default.nix index 2936c3ec2f4c..80e72572d134 100644 --- a/pkgs/development/python-modules/python-ironicclient/default.nix +++ b/pkgs/development/python-modules/python-ironicclient/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "python-ironicclient"; - version = "5.7.0"; + version = "5.8.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Blx0pr73uZA8eHd2iZ9WY+aozBFWsQhWpxoQKtjtJSk="; + hash = "sha256-hv7cI1hIZijKhoJxfrxp7hApcfEX2jUmudPilVLslC4="; }; build-system = [ From ca4c19629f72271e48762402344930eba6d44056 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Aug 2024 08:41:29 +0000 Subject: [PATCH 37/45] heatclient: 3.5.0 -> 4.0.0 --- pkgs/development/python-modules/python-heatclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-heatclient/default.nix b/pkgs/development/python-modules/python-heatclient/default.nix index b8d4563a4d33..ac13fca2c722 100644 --- a/pkgs/development/python-modules/python-heatclient/default.nix +++ b/pkgs/development/python-modules/python-heatclient/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "python-heatclient"; - version = "3.5.0"; + version = "4.0.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-B1F40HYHFF91mkxwySR/kqCvlwLLtBgqwUvw2byOc9g="; + hash = "sha256-ozpv4yyu8lmWmKg2iGMMN8IJ29zr87Gj73dn5QMgifI="; }; build-system = [ From 63b302156f40f3a2ed5dafb8ff4d61a4e5a60817 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 24 Aug 2024 14:44:21 -0400 Subject: [PATCH 38/45] mesa: only build with valgrind if available on host platform (#337065) --- pkgs/development/libraries/mesa/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index ca75bc6a8cf1..39ed2e004bc2 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -40,6 +40,7 @@ , xorg , zstd , enablePatentEncumberedCodecs ? true +, enableValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light , galliumDrivers ? [ "d3d12" # WSL emulated GPU (aka Dozen) @@ -214,6 +215,7 @@ in stdenv.mkDerivation { # meson auto_features enables this, but we do not want it (lib.mesonEnable "android-libbacktrace" false) (lib.mesonEnable "microsoft-clc" false) # Only relevant on Windows (OpenCL 1.2 API on top of D3D12) + (lib.mesonEnable "valgrind" enableValgrind) ] ++ lib.optionals enablePatentEncumberedCodecs [ (lib.mesonOption "video-codecs" "all") ] ++ lib.optionals needNativeCLC [ @@ -247,13 +249,14 @@ in stdenv.mkDerivation { python3Packages.python # for shebang spirv-llvm-translator udev - valgrind-light vulkan-loader wayland wayland-protocols xcbutilkeysyms xorgproto zstd + ] ++ lib.optionals enableValgrind [ + valgrind-light ]; depsBuildBuild = [ From 78b39adcda474047097229e0c6ef0125ede136bd Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 29 Aug 2024 11:11:39 +0200 Subject: [PATCH 39/45] mongodb-ce: 7.0.12 -> 7.0.14 --- pkgs/by-name/mo/mongodb-ce/package.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/mo/mongodb-ce/package.nix b/pkgs/by-name/mo/mongodb-ce/package.nix index 9debda7181af..ba527df39564 100644 --- a/pkgs/by-name/mo/mongodb-ce/package.nix +++ b/pkgs/by-name/mo/mongodb-ce/package.nix @@ -15,24 +15,24 @@ }: let - version = "7.0.12"; + version = "7.0.14"; srcs = version: { "x86_64-linux" = { url = "https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu2204-${version}.tgz"; - hash = "sha256-Kgq66rOBKgNIVw6bvzNrpnGRxyoBCP0AWnfzs9ReVVk="; + hash = "sha256-tM+MquEIeFE17Mi4atjtbfXW77hLm5WlDsui/CRs4IQ="; }; "aarch64-linux" = { url = "https://fastdl.mongodb.org/linux/mongodb-linux-aarch64-ubuntu2204-${version}.tgz"; - hash = "sha256-OLxPpAYFicWrqRJo3cNIG5Y0S6MIMd2vW8bluQkqnyk="; + hash = "sha256-4XiHv6JKopZ/3xrXwT+nvQ2OsbkhL79uwBCnOOMaNlc="; }; "x86_64-darwin" = { url = "https://fastdl.mongodb.org/osx/mongodb-macos-x86_64-${version}.tgz"; - hash = "sha256-sKfg1EpRQ7L2rgJArRHQLrawU8bh42liih5GR2/3jok="; + hash = "sha256-mw9w/qz3xBVC7n0JBeL4CQsJ1bhBPwyQeUBsCa/XosA="; }; "aarch64-darwin" = { url = "https://fastdl.mongodb.org/osx/mongodb-macos-arm64-${version}.tgz"; - hash = "sha256-XkFSuKKxgSRoyzzrPYamE/44FV8ol125nqDOB9EnSMM="; + hash = "sha256-iAX4szgBzQe5ARjCXlB7DeIcatQms3X75J6Jb/xXXQ4="; }; }; in @@ -49,10 +49,8 @@ stdenv.mkDerivation (finalAttrs: { dontStrip = true; buildInputs = [ - # This is to avoid the following error: - # ./result/bin/mongod: /nix/store/y6w7agm3aw5p96q7vsgzivba0dqq3rd0-curl-8.8.0/lib/libcurl.so.4: no version information available (required by ./result/bin/mongod) - # When running `mongod --version` - # See https://discourse.nixos.org/t/patchelf-and-libcurl-no-version-information-available/24453 + # Remove this after https://github.com/NixOS/nixpkgs/pull/336712 + # has landed in `nixpkgs-unstable` (curl.overrideAttrs (old: { configureFlags = old.configureFlags ++ [ "--enable-versioned-symbols" ]; })).dev @@ -90,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: { NEW_VERSION=$(curl -s "https://api.github.com/repos/mongodb/mongo/tags?per_page=1000" | jq -r 'first(.[] | .name | select(startswith("r7.0")) | select(contains("rc") | not) | .[1:])') # Check if the new version is available for download, if not, exit - AVAILABLE=$(curl -s https://www.mongodb.com/try/download/community-edition/releases | pup 'h3:not([id]) text{}' | grep "$NEW_VERSION") + curl -s https://www.mongodb.com/try/download/community-edition/releases | pup 'h3:not([id]) text{}' | grep "$NEW_VERSION" if [[ "${version}" = "$NEW_VERSION" ]]; then echo "The new version same as the old version." From dd6c0ee128ae96cbb32855741ec85576a1368c1c Mon Sep 17 00:00:00 2001 From: "Matthieu C." <886074+teto@users.noreply.github.com> Date: Tue, 27 Aug 2024 20:05:08 +0200 Subject: [PATCH 40/45] novops: add autocompletion --- pkgs/by-name/no/novops/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/no/novops/package.nix b/pkgs/by-name/no/novops/package.nix index 326b9c3be266..a254f734178a 100644 --- a/pkgs/by-name/no/novops/package.nix +++ b/pkgs/by-name/no/novops/package.nix @@ -4,6 +4,7 @@ , pkg-config , openssl , stdenv +, installShellFiles , libiconv , darwin }: @@ -29,6 +30,7 @@ rustPlatform.buildRustPackage rec { ]; nativeBuildInputs = [ + installShellFiles pkg-config # required for openssl-sys ]; @@ -38,6 +40,13 @@ rustPlatform.buildRustPackage rec { "--lib" ]; + postInstall = '' + installShellCompletion --cmd novops \ + --bash <($out/bin/novops completion bash) \ + --fish <($out/bin/novops completion fish) \ + --zsh <($out/bin/novops completion zsh) + ''; + meta = with lib; { description = "Cross-platform secret & config manager for development and CI environments"; homepage = "https://github.com/PierreBeucher/novops"; From f7b65f2290ee7f2838f5b57a8d833e41afcf0419 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 29 Aug 2024 10:02:16 +0000 Subject: [PATCH 41/45] home-assistant-custom-components.solis-sensor: init at 3.6.0 --- .../custom-components/default.nix | 2 ++ .../solis-sensor/default.nix | 28 +++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/servers/home-assistant/custom-components/solis-sensor/default.nix diff --git a/pkgs/servers/home-assistant/custom-components/default.nix b/pkgs/servers/home-assistant/custom-components/default.nix index 7d6f885481d9..409c39f5154b 100644 --- a/pkgs/servers/home-assistant/custom-components/default.nix +++ b/pkgs/servers/home-assistant/custom-components/default.nix @@ -58,6 +58,8 @@ smartthinq-sensors = callPackage ./smartthinq-sensors {}; + solis-sensor = callPackage ./solis-sensor {}; + somweb = callPackage ./somweb {}; spook = callPackage ./spook {}; diff --git a/pkgs/servers/home-assistant/custom-components/solis-sensor/default.nix b/pkgs/servers/home-assistant/custom-components/solis-sensor/default.nix new file mode 100644 index 000000000000..544223b43080 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/solis-sensor/default.nix @@ -0,0 +1,28 @@ +{ + lib, + fetchFromGitHub, + buildHomeAssistantComponent, + aiofiles, +}: + +buildHomeAssistantComponent rec { + owner = "hultenvp"; + domain = "solis"; + version = "3.6.0"; + + src = fetchFromGitHub { + owner = "hultenvp"; + repo = "solis-sensor"; + rev = "v${version}"; + sha256 = "sha256-DIUhUN1UfyXptaldJBsQEsImEnQqi4zFFKp70yXxDSk="; + }; + + dependencies = [ aiofiles ]; + + meta = with lib; { + description = "Home Assistant integration for the SolisCloud PV Monitoring portal via SolisCloud API"; + homepage = "https://github.com/hultenvp/solis-sensor"; + license = licenses.asl20; + maintainers = with maintainers; [ jnsgruk ]; + }; +} From d2c685846db4edeaba68d691b7484c5020cede29 Mon Sep 17 00:00:00 2001 From: Burgess Chang Date: Thu, 29 Aug 2024 18:18:56 +0800 Subject: [PATCH 42/45] guile-git: 0.7.0 -> 0.8.0 (#338074) Signed-off-by: Burgess Chang --- pkgs/development/guile-modules/guile-git/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/guile-modules/guile-git/default.nix b/pkgs/development/guile-modules/guile-git/default.nix index d2f6e8e5b2cb..b91d13a63745 100644 --- a/pkgs/development/guile-modules/guile-git/default.nix +++ b/pkgs/development/guile-modules/guile-git/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "guile-git"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitLab { owner = "guile-git"; repo = pname; rev = "v${version}"; - hash = "sha256-7xKs5Biq9HHOJbNILLU1oX8oPuEbti0uLMiobKz//bU="; + hash = "sha256-EZ2uGyk1K2YCl/U7EzTKri6CEe8CGDRy4pNRVjp7ZZY="; }; strictDeps = true; @@ -48,4 +48,3 @@ stdenv.mkDerivation rec { platforms = guile.meta.platforms; }; } - From 407d44efd9ca845d326c3685ec5d8fbdb12cf5cb Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 29 Aug 2024 14:13:18 +0300 Subject: [PATCH 43/45] gst_all_1.gst-vaapi: add wayland-scanner --- pkgs/development/libraries/gstreamer/vaapi/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index a341f4df4efd..db154403ffb3 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -8,6 +8,7 @@ , libva , wayland , wayland-protocols +, wayland-scanner , libdrm , udev , xorg @@ -42,7 +43,7 @@ stdenv.mkDerivation rec { pkg-config python3 bzip2 - wayland + wayland-scanner ] ++ lib.optionals enableDocumentation [ hotdoc ]; From 497a5c66c32f628a9f3af8ab638ae0741ab75e90 Mon Sep 17 00:00:00 2001 From: eljamm Date: Tue, 2 Jul 2024 15:32:16 +0100 Subject: [PATCH 44/45] taler-wallet-core: init at 0.12.12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Atemu Adapted from https://github.com/ngi-nix/ngipkgs/blob/4dfe0968fc1c00d728231826614f2297d5bf3a88/pkgs/by-name/taler-wallet-core/package.nix Co-authored-by: Robert SchΓΌtz --- pkgs/by-name/ta/taler-wallet-core/package.nix | 110 ++++++++++++++++++ 1 file changed, 110 insertions(+) create mode 100644 pkgs/by-name/ta/taler-wallet-core/package.nix diff --git a/pkgs/by-name/ta/taler-wallet-core/package.nix b/pkgs/by-name/ta/taler-wallet-core/package.nix new file mode 100644 index 000000000000..7e1434e64aed --- /dev/null +++ b/pkgs/by-name/ta/taler-wallet-core/package.nix @@ -0,0 +1,110 @@ +{ + lib, + stdenv, + esbuild, + buildGoModule, + fetchFromGitHub, + fetchgit, + srcOnly, + removeReferencesTo, + nodejs, + pnpm, + python3, + git, + jq, + zip, +}: +let + nodeSources = srcOnly nodejs; + esbuild' = esbuild.override { + buildGoModule = + args: + buildGoModule ( + args + // rec { + version = "0.19.9"; + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + hash = "sha256-GiQTB/P+7uVGZfUaeM7S/5lGvfHlTl/cFt7XbNfE0qw="; + }; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + } + ); + }; + customPython = python3.withPackages (p: [ p.setuptools ]); +in +stdenv.mkDerivation (finalAttrs: { + pname = "taler-wallet-core"; + version = "0.12.12"; + + src = fetchgit { + url = "https://git.taler.net/wallet-core.git"; + rev = "v${finalAttrs.version}"; + hash = "sha256-36P74gRFSdDzyas/OFyjdwnoIT3sjVmSs/N4ozld7sE="; + }; + + nativeBuildInputs = [ + customPython + nodejs + pnpm.configHook + git + jq + zip + ]; + + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) pname version src; + hash = "sha256-7az1wJ6BK9nPKirtW/fmXo3013JCPf+TNk/aG/mGTfo="; + }; + + buildInputs = [ nodejs ]; + + # Make a fake git repo with a commit. + # Without this, the package does not build. + postUnpack = '' + git init -b master + git config user.email "root@localhost" + git config user.name "root" + git commit --allow-empty -m "Initial commit" + ''; + + postPatch = '' + patchShebangs packages/*/*.mjs + substituteInPlace pnpm-lock.yaml \ + --replace-fail "esbuild: 0.12.29" "esbuild: ${esbuild'.version}" + ''; + + preConfigure = '' + ./bootstrap + ''; + + # After the pnpm configure, we need to build the binaries of all instances + # of better-sqlite3. It has a native part that it wants to build using a + # script which is disallowed. + # Adapted from mkYarnModules. + preBuild = '' + for f in $(find -path '*/node_modules/better-sqlite3' -type d); do + (cd "$f" && ( + npm run build-release --offline --nodedir="${nodeSources}" + find build -type f -exec \ + ${lib.getExe removeReferencesTo} \ + -t "${nodeSources}" {} \; + )) + done + ''; + + env.ESBUILD_BINARY_PATH = lib.getExe esbuild'; + + meta = { + homepage = "https://git.taler.net/wallet-core.git/"; + description = "CLI wallet for GNU Taler written in TypeScript and Anastasis Web UI"; + license = lib.licenses.gpl3Plus; + maintainers = [ + # maintained by the team working on NGI-supported software, no group for this yet + ]; + platforms = lib.platforms.linux; + mainProgram = "taler-wallet-cli"; + }; +}) From 54eb3902561d24b0f2aad1a2ecf0fa0ca7ed95c4 Mon Sep 17 00:00:00 2001 From: Atemu Date: Tue, 25 Jun 2024 19:12:05 +0200 Subject: [PATCH 45/45] libeufin: init at 0.11.3 Co-authored-by: eljamm Adapted from https://github.com/ngi-nix/ngipkgs/blob/a9de64c60a167f74524102b773496b4531b23294/pkgs/by-name/libeufin/package.nix --- pkgs/by-name/li/libeufin/deps.json | 1374 ++++++++++++++++++++++++++ pkgs/by-name/li/libeufin/package.nix | 129 +++ 2 files changed, 1503 insertions(+) create mode 100644 pkgs/by-name/li/libeufin/deps.json create mode 100644 pkgs/by-name/li/libeufin/package.nix diff --git a/pkgs/by-name/li/libeufin/deps.json b/pkgs/by-name/li/libeufin/deps.json new file mode 100644 index 000000000000..13eee51c0fd7 --- /dev/null +++ b/pkgs/by-name/li/libeufin/deps.json @@ -0,0 +1,1374 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://plugins.gradle.org/m2": { + "com/fasterxml#oss-parent/38": { + "pom": "sha256-yD+PRd/cqNC2s2YcYLP4R4D2cbEuBvka1dHBodH5Zug=" + }, + "com/fasterxml#oss-parent/41": { + "pom": "sha256-r2UPpN1AC8V2kyC87wjtk4E/NJyr6CE9RprK+72UXYo=" + }, + "com/fasterxml#oss-parent/48": { + "pom": "sha256-EbuiLYYxgW4JtiOiAHR0U9ZJGmbqyPXAicc9ordJAU8=" + }, + "com/fasterxml/jackson#jackson-base/2.12.7": { + "pom": "sha256-F55U/ibI1N/pJf7jHUqH0cwl+LfgCUik5laxIp4rdq4=" + }, + "com/fasterxml/jackson#jackson-bom/2.12.7": { + "pom": "sha256-GVVDL22K8ygG2C2CGP7f5L47s+I9WadNgUSf/HS/e9E=" + }, + "com/fasterxml/jackson#jackson-bom/2.14.1": { + "pom": "sha256-eP35nlBQ/EhfQRfauMzL+2+mxoOF6184oJtlU3HUpsw=" + }, + "com/fasterxml/jackson#jackson-parent/2.12": { + "pom": "sha256-YqocFnmt4J8XPb8bbDLTXFXnWAAjj9XkjxOqQzfAh1s=" + }, + "com/fasterxml/jackson#jackson-parent/2.14": { + "pom": "sha256-CQat2FWuOfkjV9Y/SFiJsI/KTEOl/kM1ItdTROB1exk=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.12.7": { + "jar": "sha256-PKzvcUqJ89aLafoRJjr6VaaqL97x//k97SLKoWtUaHw=", + "module": "sha256-udQUijW0OBPvz4AbJj7+jpyvHXWfbT6c/xIXrUs0uRQ=", + "pom": "sha256-u7b3aEXxQjrbJwnPw2M4OlKR/Blf407OEoYn/j9Z/dA=" + }, + "com/fasterxml/jackson/core#jackson-core/2.12.7": { + "jar": "sha256-OYemozUEbiJuVrgdaWaPtakbFV6n/ZawhRrbt9SsHKY=", + "module": "sha256-B0jdOm9PbdgkSwkZ8RQPWw9oQm8LCkq2n7z1au+XnKw=", + "pom": "sha256-hmQUWI/gqPtzQbqph/b+4FZxuYWeKMMstjvFKfQqY6k=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.12.7.1": { + "jar": "sha256-P1BMrEBc4GbVZl/2lUFITVMi81rHp+xhBM+GoBAI4C0=", + "module": "sha256-00wrIwGY2LLTmirRRxDWySJxwHhIxDKkDh1HFZSiKaY=", + "pom": "sha256-BXeRSYclRKUn7oo4VYqRcJeVMvSAb0/jz4k6EHaKj7I=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-xml/2.12.7": { + "jar": "sha256-udi0WaP98IcES8TzYWOxhaCtsISpOQ3422J7EVCH76A=", + "module": "sha256-bxysptOpUrBBDJgcx7yLkG2d/V9EazYUQLkq1yVfg88=", + "pom": "sha256-G45KhlzmFyf9DuDR7sJWvoXfklfqNj83/N4/DlZEol8=" + }, + "com/fasterxml/jackson/module#jackson-module-jaxb-annotations/2.12.7": { + "jar": "sha256-hGhu9Umr8FPuNjKSWwJL4/MwvG809+Fm8FN3mef5Db0=", + "module": "sha256-wDgW20RCyzvDuEg3XZte4z0cjjmZnT6e/eVHzq8U20A=", + "pom": "sha256-9sHbW2XrT34FtcQu6/fXwzBtwn8gRkGreobv9+UCsWs=" + }, + "com/fasterxml/jackson/module#jackson-module-kotlin/2.12.7": { + "jar": "sha256-f0WUsO31GzPYnBpUV3vOqz46hbg3PORiLySxJKsyC7Y=", + "module": "sha256-KFgSNtUkPvn4QIbqYSnl+onOmomANlBHJ+tP0gthWN8=", + "pom": "sha256-n3uQJAkenbt/rP6uXhDF1a2TvRMste4UFlRfn6+Rf24=" + }, + "com/fasterxml/jackson/module#jackson-modules-base/2.12.7": { + "pom": "sha256-EhnfADQxBTWu+hl6YsSgr7gjqIIu1Ch9F3kDElMmoVw=" + }, + "com/fasterxml/woodstox#woodstox-core/6.2.4": { + "jar": "sha256-X6c01QUPCXQFqAECLQk3e7yB6BHvmhfNAnntMnn0laU=", + "pom": "sha256-EOfKWazmMwqKqW4zMs+Sn8BmcWnei0EvvPxfOgFMVNE=" + }, + "com/github/johnrengelman#shadow/8.1.1": { + "jar": "sha256-CEGXVVWQpTuyG1lQijMwVZ9TbdtEjq/R7GdfVGIDb88=", + "module": "sha256-nQ87SqpniYcj6vbF6c0nOHj5V03azWSqNwJDYgzgLko=", + "pom": "sha256-Mu55f8hDI3xM5cSeX0FSxYoIlK/OCg6SY25qLU/JjDU=" + }, + "com/github/johnrengelman/shadow#com.github.johnrengelman.shadow.gradle.plugin/8.1.1": { + "pom": "sha256-PLOIa5ffbgZvEIwxayGfJiyXw8st9tp4kn5kXetkPLA=" + }, + "com/sun/activation#all/1.2.1": { + "pom": "sha256-NgiDv2RIbs7xYbjygvZQNTbdGmcNU6Coccj7IBcOZ5U=" + }, + "commons-io#commons-io/2.11.0": { + "jar": "sha256-lhsvbYfbrMXVSr9Fq3puJJX4m3VZiWLYxyPOqbwhCQg=", + "pom": "sha256-LgFv1+MkS18sIKytg02TqkeQSG7h5FZGQTYaPoMe71k=" + }, + "io/fabric8#kubernetes-client-bom/5.12.2": { + "pom": "sha256-6qA8FpVlaNVKa6Q31J1Ay/DdjpOXf5hDGCQldrZQvDs=" + }, + "io/netty#netty-bom/4.1.86.Final": { + "pom": "sha256-EnFsH+ZM9b2qcETTfROq46iIIbkdR5hCDEanR2kXiv0=" + }, + "jakarta/activation#jakarta.activation-api/1.2.1": { + "jar": "sha256-iwoPUvqLBcVDGSGgY+2GbvqkHa3y46fuPhlh8rDZZFs=", + "pom": "sha256-QlhcsH3afyOqBOteCUAGGUSiRqZ609FpQvvlaf8DzTE=" + }, + "jakarta/platform#jakarta.jakartaee-bom/9.0.0": { + "pom": "sha256-kZA9Ddh23sZ/i5I/EzK6cr8pWwa9OX0Y868ZMHzhos4=" + }, + "jakarta/platform#jakartaee-api-parent/9.0.0": { + "pom": "sha256-9l3PFLbh2RSOGYo5D6/hVfrKCTJT3ekAMH8+DqgsrTs=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api-parent/2.3.2": { + "pom": "sha256-FaVbfVN8n5lwrq0o0q+XwFn2X/YQL3a70p8SR92Kbfs=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api/2.3.2": { + "jar": "sha256-aRVjBAeb3u2fwK47OTifGbPMS6REO8gFCJlTlOrXQuo=", + "pom": "sha256-tTeziNurTMBpC50vsMdBJNZyUxc0VnrPblMTDqsTGtY=" + }, + "org/apache#apache/23": { + "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" + }, + "org/apache#apache/27": { + "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk=" + }, + "org/apache/ant#ant-launcher/1.10.13": { + "jar": "sha256-zXaVs7+2lkq3G2oLMdrWAAWud/5QITI2Rnmqzwj3eXA=", + "pom": "sha256-ApkvvDgFU1bzyU0B6qJJmcsCoJuqnB/fXqx2t8MVY8o=" + }, + "org/apache/ant#ant-parent/1.10.13": { + "pom": "sha256-blv8hwgiFD8f+7LG8I7EiHctsxSlKDMC9IFLEms0aTk=" + }, + "org/apache/ant#ant/1.10.13": { + "jar": "sha256-vvv8eedE6Yks+n25bfO26C3BfSVxr0KqQnl2/CIpmDg=", + "pom": "sha256-J5NR7tkLj3QbtIyVvmHD7CRU48ipr7Q7zB0LrB3aE3o=" + }, + "org/apache/commons#commons-parent/52": { + "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" + }, + "org/apache/logging#logging-parent/7": { + "pom": "sha256-5YkR3J/GsXOhDlqp7bk8eZStBmAnBd0Gftz8bh6eFys=" + }, + "org/apache/logging/log4j#log4j-api/2.20.0": { + "jar": "sha256-L0PupnnqZvFMoPE/7CqGAKwST1pSMdy034OT7dy5dVA=", + "pom": "sha256-zUWDKj1s0hlENcDWPKAV8ZSWjy++pPKRVTv3r7hOFjc=" + }, + "org/apache/logging/log4j#log4j-bom/2.20.0": { + "pom": "sha256-+LtpLpWmt72mAehxAJWOg9AGG38SMlC2gSiUOhlenaE=" + }, + "org/apache/logging/log4j#log4j-core/2.20.0": { + "jar": "sha256-YTffhIza7Z9NUHb3VRPGyF2oC5U/TnrMo4CYt3B2P1U=", + "pom": "sha256-3nGsEAVR9KB3rsrQd70VPnHfeqacMELXZRbMXM4Ice4=" + }, + "org/apache/logging/log4j#log4j/2.20.0": { + "pom": "sha256-mje0qPZ+jUG8JHNxejAhYz1qPD8xBXnbmtC+PyRlnGk=" + }, + "org/codehaus/groovy#groovy-bom/3.0.14": { + "pom": "sha256-JODptzjecRjennNWD/0GA0u1zwfKE6fgNFnoi6nRric=" + }, + "org/codehaus/plexus#plexus-utils/3.5.1": { + "jar": "sha256-huAlXUyHnGG0gz7X8TEk6LtnnfR967EnMm59t91JoHs=", + "pom": "sha256-lP9o7etIIE0SyZGJx2cWTTqfd4oTctHc4RpBRi5iNvI=" + }, + "org/codehaus/plexus#plexus/10": { + "pom": "sha256-u6nFIQZLnKEyzpfMHMfrSvwtvjK8iMuHLIjpn2FiMB8=" + }, + "org/codehaus/woodstox#stax2-api/4.2.1": { + "jar": "sha256-Z4Vn5ItRpCxlxpnyZlOa09Z21LGlsK19iezoudV3JXk=", + "pom": "sha256-edpBDIwPRqP46K2zDWwkzNYGW272v96HvZfpiB6gouc=" + }, + "org/eclipse/ee4j#project/1.0.2": { + "pom": "sha256-dJWgenl+iOQ8O8GodCG9ix/FXjIpH6GOTjLYAx3chz8=" + }, + "org/eclipse/ee4j#project/1.0.5": { + "pom": "sha256-kWtHlNjYIgpZo/32pk2+eUrrIzleiIuBrjaptaLFkaY=" + }, + "org/eclipse/ee4j#project/1.0.6": { + "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0=" + }, + "org/eclipse/jetty#jetty-bom/9.4.50.v20221201": { + "pom": "sha256-TN5uUz1gHq+LZazulWt3BsGBkvJ1XQI9fo0Zu31bOUM=" + }, + "org/jdom#jdom2/2.0.6.1": { + "jar": "sha256-CyD0XjoP2PDRLNxTFrBndukCsTZdsAEYh2+RdcYPMCw=", + "pom": "sha256-VXleEBi4rmR7k3lnz4EKmbCFgsI3TnhzwShzTIyRS/M=" + }, + "org/jetbrains#annotations/23.0.0": { + "jar": "sha256-ew8ZckCCy/y8ZuWr6iubySzwih6hHhkZM+1DgB6zzQU=", + "pom": "sha256-yUkPZVEyMo3yz7z990P1P8ORbWwdEENxdabKbjpndxw=" + }, + "org/jetbrains/dokka#dokka-core/1.9.20": { + "jar": "sha256-EhizoInIX41byc7lNGp4f2QUPW/HtPBLBRtqW3Sv3IY=", + "module": "sha256-w+z7y6JqmLbouDusckOZKz6d/jilB9d6UnvL5E75ua0=", + "pom": "sha256-N9LsB2+hsvlR92bUjxHVHXOrjlNwkGy/XXnMPkbRjxI=" + }, + "org/jetbrains/dokka#dokka-gradle-plugin/1.9.20": { + "jar": "sha256-7dbOLDEoeI2k6lPe3sB/8LhI6p+mg8Ywv3k1Vw+7QhA=", + "module": "sha256-RMEY9JsqY95tLAdVYixHNKhVGviWx9ZAuEDSGL4M2CA=", + "pom": "sha256-cmyCm7TGy1h9pYYJVLLxJN8NQ9W/LxaQ7Rk9r2JSGGI=" + }, + "org/jetbrains/dokka#org.jetbrains.dokka.gradle.plugin/1.9.20": { + "pom": "sha256-J7WLy2erfv8EO20nz2Oo9C18bx3AlzoQ53gDTXIrDpw=" + }, + "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { + "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", + "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" + }, + "org/jetbrains/kotlin#kotlin-android-extensions/1.9.23": { + "jar": "sha256-Yf12SPkx/06b2/9JvwmHcFdj+7qce7ALJkgRo20RGsE=", + "pom": "sha256-0+vFk7FzrT4tHiVgtpwzFKRpDI2jJ0ch6DqWrtwWEaA=" + }, + "org/jetbrains/kotlin#kotlin-build-tools-api/1.9.23": { + "jar": "sha256-gvhH4lRXtGSDfv7x2oUC7JJTLedAbnkgUWbODs9PxSE=", + "pom": "sha256-CWkjtiXJfGZzZ5ZsxM6Sv5TE6f98U8sdOEhgEax1DVg=" + }, + "org/jetbrains/kotlin#kotlin-compiler-embeddable/1.9.23": { + "jar": "sha256-zJQGSXS/nr9ZlF4xIXzy0WoM66rySH6wdI/By9F4eUM=", + "pom": "sha256-WLI81NgtWqkWpcnMmbMhjuxVaWBoova3C+3fbDaR/RU=" + }, + "org/jetbrains/kotlin#kotlin-compiler-runner/1.9.23": { + "jar": "sha256-yFlaPhcRx0U8f5YKrxKhcNtL2j1vy6Sf/I4yy/0ADKE=", + "pom": "sha256-KebjEpGbdf6aOHjflRHPQhDcJuWTQcsu4iSDt7Tgcv4=" + }, + "org/jetbrains/kotlin#kotlin-daemon-client/1.9.23": { + "jar": "sha256-5jFUJUkZ/XBv6ZN8SNuTfqkGimMfht5lWlFLwWIPmI0=", + "pom": "sha256-X70GastuQIU5gCdsaDUWmSj2Zqt8RlEsJvJMnQMIF9M=" + }, + "org/jetbrains/kotlin#kotlin-daemon-embeddable/1.9.23": { + "jar": "sha256-bztmG5gmetJOL4+3rV0Gvn0u1hpdBcJn9OTKp433g9k=", + "pom": "sha256-WFRgOL5Go4NmOFPRMd12xPsnQ4MLqXt0sno1zxAtPQI=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/1.9.23": { + "jar": "sha256-HaitBgpbw4KwTxVycdPNrWgwcUovTfSvfEAIjUuSIWQ=", + "pom": "sha256-69aRc06Qr9Wj6PoqkTrw+Q6YL4a6IYWhcDIqGwiQpgU=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/1.9.23": { + "jar": "sha256-WTzAhC1fwJe5XgpgK/+Mekifc3Q7hzywuO7JL86KQVs=", + "module": "sha256-zmi7IanW8gt7DnKf4y+aVHu2SyXjEPD14vcMUJ1n7cQ=", + "pom": "sha256-WMjnhsjGUvTpgqQlh5FZTL4L+JKiaGCVTKa1Ue7mN+8=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/1.9.23/gradle82": { + "jar": "sha256-WTzAhC1fwJe5XgpgK/+Mekifc3Q7hzywuO7JL86KQVs=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/1.9.23": { + "jar": "sha256-i7/a0U08PFCzK/a/4PHHAnvlQoXEba95gnz5O1y0PX8=", + "pom": "sha256-x0cp9NYFkAEhZptBEO1FuvVeB1q1O2OmQrkLOv95NCI=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/1.9.23": { + "jar": "sha256-jRr4djLZUUjxIqn6CuKQPBnub6t9AeAX924NLJoCLCA=", + "module": "sha256-G+uiuitRE94FM+UV4X9W1TZOm1QiX/MftNj+yfcV2Cw=", + "pom": "sha256-KemtQ1rc9Q/ljTiQ65lePyuNdQEZqaEsIfwwo2DNCOA=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-model/1.9.23": { + "jar": "sha256-Pljfrl5D/Ig2X1LfOjRCCMAQDJdacqlKLEoJ9mHTIxc=", + "module": "sha256-Evmlol5YCDEXnl2jBJoBMRi9B2zeCkUuZo8qsWCaz70=", + "pom": "sha256-sh8qITWUXCtLatLIi+Dnl1WH9HVgiTnn23sG2CfQNXg=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin/1.9.23": { + "module": "sha256-YL2BUHBNWByO6tTBlAh26LAor+ixS0lAEMUJIEclRKc=", + "pom": "sha256-TgznuA0cN7kRzb/kFf77ZdzvGCalGLF3vWAvlaloqMU=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin/1.9.23/gradle82": { + "jar": "sha256-vMdKB8ad0RyUsmCx7ophiWlinMrqwubqCnedo8P37D8=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/1.9.23": { + "module": "sha256-1yNF4lW/IKOperXQEIa2CMXX0M8/Z3inHoXKy61BQlo=", + "pom": "sha256-2Ive7tm5RMrHGM3PKUD4FdgiXuzNIb7KB93QgfDSQow=" + }, + "org/jetbrains/kotlin#kotlin-klib-commonizer-api/1.9.23": { + "jar": "sha256-XfEWTbHDRdhtChqkFJCeNnr7l4L+P7yvDir3qL9iuDk=", + "pom": "sha256-sSWp19ccGThHr5KiJxxlUbPSl1VFSxyF03SySudVwz4=" + }, + "org/jetbrains/kotlin#kotlin-native-utils/1.9.23": { + "jar": "sha256-X9AUhb1z5he+VWv/SZL/ASquufDZwAhPN8tdiKO8rYQ=", + "pom": "sha256-eCaL6luL9QqV7nYxKuNjzAvWqt1d9HQwrBNaIG7467Y=" + }, + "org/jetbrains/kotlin#kotlin-project-model/1.9.23": { + "jar": "sha256-j8s85RKrtFLX1DHbssMS1cRQXRdiSTtRsQavwUfZk2c=", + "pom": "sha256-nvSy89nZ9Zqwwr9+uO92MgUUmTjg540qIxxHiSHHl0U=" + }, + "org/jetbrains/kotlin#kotlin-scripting-common/1.9.23": { + "jar": "sha256-ii5Wfz2/Nz5hwBrNeIRjHshThGWrjul4rGMpb4zJr0Y=", + "pom": "sha256-/CiXW5TcQMDZD9EXXiKxtka60sY368+fT2qy1Oe8XdU=" + }, + "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/1.9.23": { + "jar": "sha256-e4A5/wt3nVVs7QCSMDWr0TNPDl8qiHlhgtArpF+SbSA=", + "pom": "sha256-7Y6//r5Ume1iSG+oGBJ7td1QHXTEq5XFfnwB7z+NuWg=" + }, + "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/1.9.23": { + "jar": "sha256-kOU90S9i3NgjQ8EsDLMUrc/wy8OYjtsRjR5miZYOnWM=", + "pom": "sha256-923kmO12xGroZlZnmAf3J2EiPD+hChExgyAGpKs5Xe0=" + }, + "org/jetbrains/kotlin#kotlin-scripting-jvm/1.9.23": { + "jar": "sha256-0/yn7JUf94Jvl6dZifjcr/YM+eHna73CIO33eDdqbmQ=", + "pom": "sha256-4u8r+y628hp7croS7cWaFQx/IXbCssVP4uhg7oAjDYc=" + }, + "org/jetbrains/kotlin#kotlin-serialization/1.9.23": { + "module": "sha256-HgxSwYSenFBVDtog62tKVoTfjao9Ch0oEytUeiY/AX0=", + "pom": "sha256-8NXaRS3RR2HgRTqOOvT3AmH3s3zDMwAuYd5p3iOKaIU=" + }, + "org/jetbrains/kotlin#kotlin-serialization/1.9.23/gradle82": { + "jar": "sha256-H0s1sl/VpvsXt0k5luFzu0+J3ZzI8NjghJkDzBoBogQ=" + }, + "org/jetbrains/kotlin#kotlin-tooling-core/1.9.23": { + "jar": "sha256-iTjrl+NjINqj5vsqYP0qBbIy/0pVcXPFAZ8EW4gy2fQ=", + "pom": "sha256-fiA0VIj7v1uf6ZeHNgvT7HRKb+qRppm9EbVhwygbB9g=" + }, + "org/jetbrains/kotlin#kotlin-util-io/1.9.23": { + "jar": "sha256-em3OQOeKy+Zvx9Z463Qch3hFo8/Rx2xNK7+OyEXS2Sk=", + "pom": "sha256-rNHyN4Ce4nWpwJ5EAt1FOdBN7DaMCQbsecP4A6vwZ8g=" + }, + "org/jetbrains/kotlin#kotlin-util-klib/1.9.23": { + "jar": "sha256-5AGLa4+8keTQo3q4HAUKgTloaAdRCM2FCCuSXHnTvG0=", + "pom": "sha256-+z5FhH1dIS5MK120RFGQPJ4fDjL2mH4fWbnMEcTDiYo=" + }, + "org/jetbrains/kotlin/jvm#org.jetbrains.kotlin.jvm.gradle.plugin/1.9.23": { + "pom": "sha256-WLZeZTaFOa3P34XUv/KcpJUc9ceroM7wp4MMkTlPzk8=" + }, + "org/jetbrains/kotlin/plugin/serialization#org.jetbrains.kotlin.plugin.serialization.gradle.plugin/1.9.23": { + "pom": "sha256-35/uhYzdH4SamCIcPNE09eQeujRHhkBkrVASc95pyyw=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.7.3": { + "pom": "sha256-Tl0ZAOY3nvP1lw0EqPMFKa3IL4WejMEHwhzoFJ72ZsQ=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.5.0": { + "module": "sha256-yIXdAoEHbFhDgm3jF+PLzcPYhZ2+71OuHPrNG5xg+W4=", + "pom": "sha256-U2IuA3eN+EQPwBIgGjW7S9/kAWTv7GErvvze7LL/wqs=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.7.3": { + "jar": "sha256-GrOsw48+c1XE+dHsYhB6RvpzyJnzBw0FXl1Dc9/mfhI=", + "module": "sha256-NNbumbdqwGK1FVW0pwvhg0n+VWbaeaGQYU8XHIC2U44=", + "pom": "sha256-dThYdT3su7I5c0PiuHHwYvaXgS6UIuQcnuRqZrk+7jA=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.7.3": { + "module": "sha256-f7FiOWWU7CjhtqRBG0V5SadnD14SAZF2d04f1rlHG78=", + "pom": "sha256-7W6wOYcXA14p8cHWCk4927iYWPPbnge1etdZ03Ta6Ck=" + }, + "org/junit#junit-bom/5.7.2": { + "module": "sha256-87zrHFndT2mT9DBN/6WAFyuN9lp2zTb6T9ksBXjSitg=", + "pom": "sha256-zRSqqGmZH4ICHFhdVw0x/zQry6WLtEIztwGTdxuWSHs=" + }, + "org/junit#junit-bom/5.9.1": { + "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=", + "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw=" + }, + "org/ow2#ow2/1.5.1": { + "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" + }, + "org/ow2/asm#asm-commons/9.4": { + "jar": "sha256-DBKKnsPzPJiVknL20WzxQke1CPWJUVdLzb0rVtYyY2Q=", + "pom": "sha256-tCyiq8+IEXdqXdwCkPIQbX8xP4LHiw3czVzOTGOjUXk=" + }, + "org/ow2/asm#asm-tree/9.4": { + "jar": "sha256-xC1HnPJFZqIesgr37q7vToa9tKiGMGz3L0g7ZedbKs8=", + "pom": "sha256-x+nvk73YqzYwMs5TgvzGTQAtbFicF1IzI2zSmOUaPBY=" + }, + "org/ow2/asm#asm/9.4": { + "jar": "sha256-OdDis9xFr2Wgmwl5RXUKlKEm4FLhJPk0aEQ6HQ4V84E=", + "pom": "sha256-SDdR5I+y0fQ8Ya06sA/6Rm7cAzPY/C/bWibpXTKYI5Q=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/springframework#spring-framework-bom/5.3.24": { + "module": "sha256-GZbh9hfLA/p26hGFD+Kh4gsOMKEEa6bV2zvbv0QRP84=", + "pom": "sha256-U1ITVmu77+Jjag1OjdGnOt5hLiQwyP/TENzCo7O5ukE=" + }, + "org/vafer#jdependency/2.8.0": { + "jar": "sha256-v9LMfhv8eKqDtEwKVL8s3jikOC7CRyivaD2Y3GvngZI=", + "pom": "sha256-EBhn8/npJlei74mjELYE1D0JDJuQqj4LBS3NFqO78y0=" + } + }, + "https://repo.maven.apache.org/maven2": { + "ch/qos/logback#logback-classic/1.5.3": { + "jar": "sha256-tf6W/VZV+Usbyogdtc4WQ9CLnb3Ni2/jYeMuRXjVYTs=", + "pom": "sha256-a1TxNgVxhl+cbEvsDkhUiE63o268ZGWlKpYGU6iwZ8Y=" + }, + "ch/qos/logback#logback-core/1.5.3": { + "jar": "sha256-eFRQelmtXFgijcS8Pas9eSJTl/XvJDDts6zlREXgER8=", + "pom": "sha256-sZGeCDrFrpwZZq+FnI/FEgTIW384Nf5pnF7eZtQv2Bg=" + }, + "ch/qos/logback#logback-parent/1.5.3": { + "pom": "sha256-DFvLSOq4iEJD6SEv0+XzOME4PitMsa8xMyCZQfgtCk8=" + }, + "com/fasterxml#oss-parent/38": { + "pom": "sha256-yD+PRd/cqNC2s2YcYLP4R4D2cbEuBvka1dHBodH5Zug=" + }, + "com/fasterxml#oss-parent/41": { + "pom": "sha256-r2UPpN1AC8V2kyC87wjtk4E/NJyr6CE9RprK+72UXYo=" + }, + "com/fasterxml/jackson#jackson-base/2.12.7": { + "pom": "sha256-F55U/ibI1N/pJf7jHUqH0cwl+LfgCUik5laxIp4rdq4=" + }, + "com/fasterxml/jackson#jackson-bom/2.12.7": { + "pom": "sha256-GVVDL22K8ygG2C2CGP7f5L47s+I9WadNgUSf/HS/e9E=" + }, + "com/fasterxml/jackson#jackson-parent/2.12": { + "pom": "sha256-YqocFnmt4J8XPb8bbDLTXFXnWAAjj9XkjxOqQzfAh1s=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.12.7": { + "jar": "sha256-PKzvcUqJ89aLafoRJjr6VaaqL97x//k97SLKoWtUaHw=", + "module": "sha256-udQUijW0OBPvz4AbJj7+jpyvHXWfbT6c/xIXrUs0uRQ=", + "pom": "sha256-u7b3aEXxQjrbJwnPw2M4OlKR/Blf407OEoYn/j9Z/dA=" + }, + "com/fasterxml/jackson/core#jackson-core/2.12.7": { + "jar": "sha256-OYemozUEbiJuVrgdaWaPtakbFV6n/ZawhRrbt9SsHKY=", + "module": "sha256-B0jdOm9PbdgkSwkZ8RQPWw9oQm8LCkq2n7z1au+XnKw=", + "pom": "sha256-hmQUWI/gqPtzQbqph/b+4FZxuYWeKMMstjvFKfQqY6k=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.12.7.1": { + "jar": "sha256-P1BMrEBc4GbVZl/2lUFITVMi81rHp+xhBM+GoBAI4C0=", + "module": "sha256-00wrIwGY2LLTmirRRxDWySJxwHhIxDKkDh1HFZSiKaY=", + "pom": "sha256-BXeRSYclRKUn7oo4VYqRcJeVMvSAb0/jz4k6EHaKj7I=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-xml/2.12.7": { + "jar": "sha256-udi0WaP98IcES8TzYWOxhaCtsISpOQ3422J7EVCH76A=", + "module": "sha256-bxysptOpUrBBDJgcx7yLkG2d/V9EazYUQLkq1yVfg88=", + "pom": "sha256-G45KhlzmFyf9DuDR7sJWvoXfklfqNj83/N4/DlZEol8=" + }, + "com/fasterxml/jackson/module#jackson-module-jaxb-annotations/2.12.7": { + "jar": "sha256-hGhu9Umr8FPuNjKSWwJL4/MwvG809+Fm8FN3mef5Db0=", + "module": "sha256-wDgW20RCyzvDuEg3XZte4z0cjjmZnT6e/eVHzq8U20A=", + "pom": "sha256-9sHbW2XrT34FtcQu6/fXwzBtwn8gRkGreobv9+UCsWs=" + }, + "com/fasterxml/jackson/module#jackson-module-kotlin/2.12.7": { + "jar": "sha256-f0WUsO31GzPYnBpUV3vOqz46hbg3PORiLySxJKsyC7Y=", + "module": "sha256-KFgSNtUkPvn4QIbqYSnl+onOmomANlBHJ+tP0gthWN8=", + "pom": "sha256-n3uQJAkenbt/rP6uXhDF1a2TvRMste4UFlRfn6+Rf24=" + }, + "com/fasterxml/jackson/module#jackson-modules-base/2.12.7": { + "pom": "sha256-EhnfADQxBTWu+hl6YsSgr7gjqIIu1Ch9F3kDElMmoVw=" + }, + "com/fasterxml/woodstox#woodstox-core/6.2.4": { + "jar": "sha256-X6c01QUPCXQFqAECLQk3e7yB6BHvmhfNAnntMnn0laU=", + "pom": "sha256-EOfKWazmMwqKqW4zMs+Sn8BmcWnei0EvvPxfOgFMVNE=" + }, + "com/github/ajalt/clikt#clikt-jvm/4.2.2": { + "jar": "sha256-DEkQ6MU/TtWj11g0+RcrnrGcfDAL4vFljvgKiRdWLjE=", + "module": "sha256-t7xsmPLS4XOdnkOglZrdzpjosuxIvTSSaJGFTJ3ySJc=", + "pom": "sha256-ibGmH+a8ul7YhGNRPr72ZW3r/mXOc02JAInjNEi8eo0=" + }, + "com/github/ajalt/colormath#colormath-jvm/3.3.1": { + "jar": "sha256-JhMoNBXi4SZhaX3HKVra2g9g7Bfs/K8+8cTuD9t4iRM=", + "module": "sha256-K/dgVNyyOnblJlGQa8aiUFW6btBa/ja3kggwnyvokk8=", + "pom": "sha256-5neriCzRIBZKj0diPoqP3AGS1cdk4jQsS6P3777xOrI=" + }, + "com/github/ajalt/colormath#colormath/3.3.1": { + "jar": "sha256-uAv0eqNH23e34PtFGK9+hCUgJ8R+LEQ8OLBPqXnYuX0=", + "module": "sha256-AdTWjQLyoy0wMkcviLHSweDIv6s73TTgA9ssAxnq0Lo=", + "pom": "sha256-gMVPKp3C6yFQELVmlVAvb1Gseh8rFX8t5vT/OSBxuIk=" + }, + "com/github/ajalt/mordant#mordant-jvm/2.2.0": { + "jar": "sha256-L6WeW4GvzHG2q2EosnZ2/8YR0KPBguvA5DezZmq1YgE=", + "module": "sha256-pBEiZJIyB65iFkJJi1cvpoimOHmheofC37dgUS71OfI=", + "pom": "sha256-7kQyTDf8M0oNmj8qn83usit+RyaePq7Ad67OtE6dpeI=" + }, + "com/github/ajalt/mordant#mordant/2.2.0": { + "jar": "sha256-aFf/hhBGGgwN8XMYxYmLhichc8rOx2ojCcHCpYMFOFw=", + "module": "sha256-PZssDh6kPGPNyZu+qao4tUOmyMiJUo69Kl5OU+I0Hic=", + "pom": "sha256-wQN/2QjFbifYOyz1aECrgETj24rgvwvqFM2SAJdWfZQ=" + }, + "com/itextpdf#barcodes/8.0.3": { + "jar": "sha256-R0KqmKk1JTnfzrkkoYmnFfi7AFrosiCd+UWfHEo6S6k=", + "pom": "sha256-G46+1Eg5/ZabY5GfBSfyfCTK+182UnyScaeWlnFE1tI=" + }, + "com/itextpdf#bouncy-castle-connector/8.0.3": { + "jar": "sha256-DOFzJ7x4zfnXNQxc07lD3tpW55C/V+2t+7URENI5fC0=", + "pom": "sha256-O/vYVHEY2pnAUPKLZaez0KldBzw3cu3MsL8Yn+6AEsc=" + }, + "com/itextpdf#commons/8.0.3": { + "jar": "sha256-LwdPt7X7ycjYFT5SrcbJfqWXbvsQWNj/I1/lmuFnCPU=", + "pom": "sha256-XnXXshdQoOQ2/jgVeBY9cCrftcgOKp4cfwr7YnAzYFE=" + }, + "com/itextpdf#font-asian/8.0.3": { + "jar": "sha256-G6R2sTgg5LxmH1eC37O9HQ/DHdeVXWalZ6QS/J+3uIU=", + "pom": "sha256-eCnurFi9ZnGqttz1GfOSgCa6ljjY/0zbn62J2z1ptDA=" + }, + "com/itextpdf#forms/8.0.3": { + "jar": "sha256-W7Yrs7UkzCNuQBjQKn9P8cYwotjHxcQN7vG8yTTs82M=", + "pom": "sha256-z8D6s59hUBSC9Z9JjrlUUHeJ+lYlz+W2YLlbpSOwc/w=" + }, + "com/itextpdf#hyph/8.0.3": { + "jar": "sha256-mZE203RplM15th3DhohcDvE421/V+B1Pz5ZnVg1gv/o=", + "pom": "sha256-vK5P5UPEgnwoK13MAuj4pleeZyMrYJPLMBNMb2OP0oY=" + }, + "com/itextpdf#io/8.0.3": { + "jar": "sha256-EhbRvm+OchmRMCCtSzWB9EJsrHDSwJpX4e48Gt+WBi0=", + "pom": "sha256-s41UJtlvCTE/WS/Fw3Tnvuwnm8iZo+MgySstBfz3vS8=" + }, + "com/itextpdf#itext-core/8.0.3": { + "pom": "sha256-+tpwjS/dLMIUtk4NXKjAZGq2nNWhlAJ3bPZOMWR0UFc=" + }, + "com/itextpdf#kernel/8.0.3": { + "jar": "sha256-Z2+1IKARpcrBrl3WHQ4Kps+x17tt8QpQdSRuph/L554=", + "pom": "sha256-PK/xJ9cm21FZroT/MBfITJFEBr7uEa8z2mtuN/zmZzw=" + }, + "com/itextpdf#layout/8.0.3": { + "jar": "sha256-WBU+ZyK07RZX6pD+bsHThzQTzvfOCUBWW8MHsXdqMlE=", + "pom": "sha256-BQgvvdUt2GsStFwE8xtbJySsZhu98yYWQHVy3U0yFtM=" + }, + "com/itextpdf#pdfa/8.0.3": { + "jar": "sha256-e4ODUZA0nAZAur2nYUz9Gm94VlnDZD1/AW6rIEG2QlU=", + "pom": "sha256-yfbJv/IRi3uKxySTeD2ZjvO+dmNYMnp8zeXbhGVBBHQ=" + }, + "com/itextpdf#pdfua/8.0.3": { + "jar": "sha256-riwweVpcBNvlp5Pc89uuVmEpr5HgpBxkbKx0/fef+p8=", + "pom": "sha256-N1VCL2ecSmQPnHfX9MGqba0igonoPbfYXLvDcOb7sdk=" + }, + "com/itextpdf#root/8.0.3": { + "pom": "sha256-NMRtXuf3mn5U7xQIvgVEbdZkeHiF4VhzktNkxyKTyiI=" + }, + "com/itextpdf#sign/8.0.3": { + "jar": "sha256-jptunXFW7iOj/LCIOdq9TZbJ91kTl37TaoPUN9EH+4U=", + "pom": "sha256-A5W3Jehz+ODO/+GJRHC8BG0BvdKKPZXXOBXvITD+dA8=" + }, + "com/itextpdf#styled-xml-parser/8.0.3": { + "jar": "sha256-xBSIy3lkNyVJODa1oD3702HDcbkC+M3k6Xq4AqvflDA=", + "pom": "sha256-qf2Z+W7UQbo7FvPHAZRtwkzhZkN5bIhL9v6+fMYfA7k=" + }, + "com/itextpdf#svg/8.0.3": { + "jar": "sha256-86vrCetewNRDFyl3D6Ga5pWTPw78DqThh5+GlYYighw=", + "pom": "sha256-JsKo077u2NfIm7KPHpF1ghDT0vS3T2Pk3DXzcGxWksU=" + }, + "com/kohlschutter#kohlschutter-parent-multirelease/1.6.7": { + "pom": "sha256-2x0Pgt2IaDGIXPS1xc8nLdTHjzOdQBHnY1PojsIZHPA=" + }, + "com/kohlschutter#kohlschutter-parent/1.6.7": { + "pom": "sha256-52NpBTS3jqI4xCs3beSo53eqrD5525+SQiDemqpVL4o=" + }, + "com/kohlschutter/junixsocket#junixsocket-common/2.9.0": { + "jar": "sha256-HxH+VKffsOQQ4k54fTO0jAfn9P5lFPSbY9YP17R3B4c=", + "pom": "sha256-CQyX5oCk5VdZGEDizxIq6qo/y7iyZCJ5dg1SJkaaCu0=" + }, + "com/kohlschutter/junixsocket#junixsocket-core/2.9.0": { + "pom": "sha256-GHfVzE0bCiwH/oCqYbVn99NgAm527Ob6l0SuRjUmJJI=" + }, + "com/kohlschutter/junixsocket#junixsocket-native-common/2.9.0": { + "jar": "sha256-A+nB2+kg5BJod4JbvkZrxjU7lAF/rP4zfFf0qMqn6sM=", + "pom": "sha256-sWaGFaHMzgEvJD2v7kMU5S4ZqcBWZuaqNr0zxZXIFQg=" + }, + "com/kohlschutter/junixsocket#junixsocket/2.9.0": { + "pom": "sha256-Let6FG+mmbcyUNW8Zmk8Rbk0uKkZsRitD8CO5LfK25o=" + }, + "com/sun/activation#all/1.2.1": { + "pom": "sha256-NgiDv2RIbs7xYbjygvZQNTbdGmcNU6Coccj7IBcOZ5U=" + }, + "com/typesafe#config/1.4.3": { + "jar": "sha256-itpMGFznJBZxLWPgta/cXwCcDN9AXl8m7+zfFWql37Y=", + "pom": "sha256-tn6vqd0iD/h9ANumiACDpSlqXgxsAxA/XUuOHaEDD/M=" + }, + "com/zaxxer#HikariCP/5.1.0": { + "jar": "sha256-pHpu5iN5aU7lLDADbwkxty+a7iqAHVkDQe2CvYOeITQ=", + "pom": "sha256-M0sOCm5lucZJw/6Wc5ZjpEEOGpF2ZTgC5ZVJO4YYLyw=" + }, + "commons-codec#commons-codec/1.11": { + "jar": "sha256-5ZnVMY6Xqkj0ITaikn5t+k6Igd/w5sjjEJ3bv/Ude30=", + "pom": "sha256-wecUDR3qj981KLwePFRErAtUEpcxH0X5gGwhPsPumhA=" + }, + "commons-logging#commons-logging/1.2": { + "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", + "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" + }, + "io/ktor#ktor-client-apache-jvm/2.3.9": { + "jar": "sha256-5l8SqMndypg5N7vwICSq443Gm+AuTmwLvUtU8shwEI4=", + "module": "sha256-CSE5Uo3OYnbwDLsW3RCWw1UdUy/Jeic6+Fq/y0IQHUY=", + "pom": "sha256-1IJajV6ZwtFwuu/BpitDMP2xWcf+GPRHt/qBIu6eEh8=" + }, + "io/ktor#ktor-client-apache/2.3.9": { + "jar": "sha256-Wkb9vED9LXglmIPEzG6vO14pDdB9HEbqiO6j1I9QV3I=", + "module": "sha256-LUChb1ElZpknesEMFyVt/hC7tO3A5OcnPH2X1nYYy0U=", + "pom": "sha256-7zur2sPplaxsQJwFv8zyYNA+obT9WKIKTLk6p3mCxDI=" + }, + "io/ktor#ktor-client-cio-jvm/2.3.9": { + "jar": "sha256-SuFHjJWrOAnjrMkuwBNx4sqWKUnuFNm1VvbBmlr+Rdo=", + "module": "sha256-u5y2B4PuKX8yCaAzgUYtxKXCses18epy1xZiV1qQhng=", + "pom": "sha256-0Q/azlH/i04aWVe5vYrNs28rZonyFumq122jtKEbXHQ=" + }, + "io/ktor#ktor-client-cio/2.3.9": { + "jar": "sha256-vTqw/pFlL+KLl5wgDI0x7oZv8Jj6D0q0koQiJ5aN/84=", + "module": "sha256-uz6qXhnsZrJNVELvpNkGPIL6k+Fx18cXgYZUtvVR3LI=", + "pom": "sha256-K3uIGypGh9t27DlwPt3Ju0DDRhdvYzBeyoK4WrYMW2k=" + }, + "io/ktor#ktor-client-core-jvm/2.3.9": { + "jar": "sha256-eMjFnRnlvx27SOI4svssmOtn2MSyh97Xa8fwmJFhpHw=", + "module": "sha256-E7+2qQSvKKL694Re4sxj6Fcf6Bq4pkS7tBeXB8pnbl0=", + "pom": "sha256-VnMYeVWFIOb+wTB1w1nW0xpQb654OJwqCmabYdqlrrQ=" + }, + "io/ktor#ktor-client-core/2.3.9": { + "jar": "sha256-E/nV7COKqNoX8sCAUA0GipY6OKMaFkFQl7hA5fjDv/Y=", + "module": "sha256-+0XhKFAtCqjPS6ha2ovd+6EMDeHnGwv019eCZuoZUVo=", + "pom": "sha256-30e0Stir/E5PCOexj8EUCw/Pu/cAL0XaNwTguOnKI/w=" + }, + "io/ktor#ktor-client-mock-jvm/2.3.9": { + "jar": "sha256-ez//yB72EiihlWnQgZVkdbwndpx4dPqWHWZm7YV4LQU=", + "module": "sha256-Lu/lsISt/IJ/8jVzwDLCm+XjpspMIKZJ/RFFl0dCOGY=", + "pom": "sha256-pDVyP5A60+kaFa1jnLUK6Yzi2xXzmKrnsmUISL+CIsQ=" + }, + "io/ktor#ktor-events-jvm/2.3.9": { + "jar": "sha256-QGw59U3lHZQ+8LTcLthWTh2dAvoBXeL6BWI4AML2HIM=", + "module": "sha256-WgYQ9dxhmiBfONZzUqD20qXnFY2GHlf/XHpp/6cEWNE=", + "pom": "sha256-2Zq3wheCmWAaJG53BPx1dSUWZ1NeiDgpNSKrDpzSOcs=" + }, + "io/ktor#ktor-events/2.3.9": { + "jar": "sha256-qfTivW7ALrt5prOcEEr++k281IA7ufrV2e1XCTRX8G0=", + "module": "sha256-MvAB55ymxBYrsipIRvIdGBEPloEgtpay74LosYzAz5g=", + "pom": "sha256-73GICXQmgLF8GA8zKJa5nMACeLKjWgztz110+1xwNLI=" + }, + "io/ktor#ktor-http-cio-jvm/2.3.9": { + "jar": "sha256-rgF0pMgUvtrXgVgRUwvo9q748C9DobzDQFdJ545M0nE=", + "module": "sha256-bIXTiBs3zKDrJ6b4VgKqXJJ02B1hMwahMZ6+DhxxMds=", + "pom": "sha256-jPnYSgxnG5aDJltROn80OR7iqvuBx6Zjz06OPAEd56s=" + }, + "io/ktor#ktor-http-cio/2.3.9": { + "jar": "sha256-gHWsxhXDR76RNDI84n5q+FaBdlDG6P+Ctz2sYq4Tr4Y=", + "module": "sha256-Pakptk01EA79n4MwCtgX1X/IpAibPzOG2AA5l33MsGc=", + "pom": "sha256-lGX9WjX4RxqIwSGlHniLHYnnZvbNQoWztwuGDF6JVyQ=" + }, + "io/ktor#ktor-http-jvm/2.3.9": { + "jar": "sha256-dqYd7yephR18Yt14IeKf+a+ipj1INBW9FkMj3n7jSeE=", + "module": "sha256-IrcQgRcCWBdZv8xXfrPgbm1D0XYUqqyyrMBRKDecsAw=", + "pom": "sha256-rv8ur5x8vlXmoj+qDV39MKx+etJvF90oaOh7+wayfRg=" + }, + "io/ktor#ktor-http/2.3.9": { + "jar": "sha256-9PADOhT6whJBqLu+HFzxkzvRA+3I6eJ37j7gwcvTRkI=", + "module": "sha256-4AxlLf6stQVYvnqM8uGTZLN05WFVtk3TODyDMQR1S1U=", + "pom": "sha256-2OL7EPMr9EKkUZT2jzKkAoiyKUdtwaAgBy+9W9nE4DM=" + }, + "io/ktor#ktor-io-jvm/2.3.9": { + "jar": "sha256-SevXoWUuOsqfBGLQVK90nd+tj2z1q3LViiw3nLTwFQE=", + "module": "sha256-zxJVkHt8mOzh2leM7kledvwVW30jTmgTGPUjBpKYt7E=", + "pom": "sha256-2skMC2W7UywojCeem8Bn8cg++PVse0Xg90p1294vVuw=" + }, + "io/ktor#ktor-io/2.3.9": { + "jar": "sha256-skZKEoTyY57muhpCVDIsxUsFMmWHpG+AFUy9tXAYC7I=", + "module": "sha256-yGRM0vkYYzcM5UZfYUkzKcovxHUx5rtrOs+i3kjm92g=", + "pom": "sha256-jtSz4Y2gP4h0GusTT60B03I2V0Prm7xa7s2h3RWdTJA=" + }, + "io/ktor#ktor-network-jvm/2.3.9": { + "jar": "sha256-VUVPmTFzkbxW3l4lhpKWw4KTCgrqpolfeozdCdV0Lws=", + "module": "sha256-Fn1KWTPwdruL65rf3tPl28FfftmdNqCp/sOgYStE0AM=", + "pom": "sha256-eXvPIxERoaqhvlTIP+yrZ9hqfOP3E3oGrh7+eKXypP0=" + }, + "io/ktor#ktor-network-tls-certificates-jvm/2.3.9": { + "jar": "sha256-XGU09dhpi9v/sCBkSp9upScz/zyPocvXIgEXXTXifKE=", + "module": "sha256-SgJSd9ojCII8byxwuwl7d9L1u4xk1yDYMliLrAjFsJo=", + "pom": "sha256-LU9Hp8ilTW/+eSt1IglZ1DtDJZDWpZnjPVh6odV137Y=" + }, + "io/ktor#ktor-network-tls-certificates/2.3.9": { + "jar": "sha256-Wkb9vED9LXglmIPEzG6vO14pDdB9HEbqiO6j1I9QV3I=", + "module": "sha256-nAYZSvWQIZHtkBEL0p+fPkXyQzEDhj4iMWu+s2adPIc=", + "pom": "sha256-rrvURSwUGpAVA+hgqDxMWNoCJthlk9RzOCmbPOuhqDg=" + }, + "io/ktor#ktor-network-tls-jvm/2.3.9": { + "jar": "sha256-LZZLZ9uwkrzDdTBH1kMlYOWLCmiG4rA57jG4c3y/Fb0=", + "module": "sha256-MK82tFgqXViZ0QE6W2mB6qe1ka7aG+UEbrOcLl/d20o=", + "pom": "sha256-ghkBoh8LS5f/2/ayFSJgNGwn2KCQcf/REIBoCZ759ek=" + }, + "io/ktor#ktor-network-tls/2.3.9": { + "jar": "sha256-pQkzuB2+4tWiAAC4Oc0hjNs9q/bmvDUVMsSM1qLJpqc=", + "module": "sha256-GALL81QNcXAJMtDIvncSysm6DCBjpadaEAtlYnF1f1s=", + "pom": "sha256-lcrYB/KXVVW8X51b0s8Uf0GIGi+HZ/rOuNgUb5rQ5gI=" + }, + "io/ktor#ktor-network/2.3.9": { + "jar": "sha256-1plp96O6Vc6tQ6phJHQgdihREclRsaBOilUsPek0ydg=", + "module": "sha256-HWJ+/Oa1PyC5AXhdTZR7D/sA9Y5OCatpzA+fzJKmQ3w=", + "pom": "sha256-xNkuWQsPrkpBmBXGWLVJhBNwmSZrCEV5OBu2M+lK5Sg=" + }, + "io/ktor#ktor-serialization-jvm/2.3.9": { + "jar": "sha256-NMC5ioiIY7KVWZWB1aTSgRaeLwIePRX8CVAkEzg24q8=", + "module": "sha256-5jt5N2oVWSHGXaS4oYt4wub04dglxILNvGG99cZYIMw=", + "pom": "sha256-uQ/i6vohNFqx8+gXpHDawsrSh662d/SS0B678AL4pwU=" + }, + "io/ktor#ktor-serialization-kotlinx-json-jvm/2.3.9": { + "jar": "sha256-8njCQLvzHVd89tlh4pworJXgt8Eadr8HhS6G2aBGV9Q=", + "module": "sha256-F425CwFVXBL129EpoJcb4j4ddUpITFXLBtE8STh4/hs=", + "pom": "sha256-XxowM98duq6qHfhsOmQB8eYpM2hMxI8R0dVVbNB3kIg=" + }, + "io/ktor#ktor-serialization-kotlinx-jvm/2.3.9": { + "jar": "sha256-euEM1OzG2axbSaE9LVS+nEWSwU57m/TagGfkeGW+L2g=", + "module": "sha256-xibOr0JjuMmQ+Cd/RqqcaG6DVPmDmrOnYMUYKobgDGo=", + "pom": "sha256-r6XRgy1CtHCr1eShGwkG9glqNA/JjbHF4J5YzbHGT+4=" + }, + "io/ktor#ktor-serialization-kotlinx/2.3.9": { + "jar": "sha256-+lu+kbBqPGUW1olfbvKp15rAEJO5jDKAzCv/+kgktQg=", + "module": "sha256-T1vTZOu7WCuLp3da0VWXlNpEx+9emscNOhZJjiFRnAc=", + "pom": "sha256-G0drsy5X3it27TzMV8CF8BGBRS8sz+NV5ZY3OFmspGo=" + }, + "io/ktor#ktor-serialization/2.3.9": { + "jar": "sha256-I/oFsvofdMi+5JsvpNCmzRaXdvXLw7e00I5nfmr7n14=", + "module": "sha256-C4PT1kZjRvF7XTedtnnVQajoUMzD21Nq7Zrn2SFviFw=", + "pom": "sha256-I3i4QBnk0BZAgpTWf6mTO1igD9aK1lGpHE+pCir2osQ=" + }, + "io/ktor#ktor-server-call-logging-jvm/2.3.9": { + "jar": "sha256-8ReX1t//aPCf/ZIIWS6DZG8u4tFmn50dj5bNEn1UbEU=", + "module": "sha256-mhwATq8PiPesMIWLpxtOuvMAr85YjLQRQo8uyLTObu8=", + "pom": "sha256-g7XbG1sDinuF+u81bhRlEh2ismuqseaw3o7TFLY8U40=" + }, + "io/ktor#ktor-server-call-logging/2.3.9": { + "jar": "sha256-9bcBSzx89lyNPJHPmlMZ2NvmMC36i3K1JdgM/j4rYVo=", + "module": "sha256-09CuUJIDuoc66HwO8rvNECF7SH0+xcO6LpJkfdii3f8=", + "pom": "sha256-9zy4LsFORUsRDxd6FcC58GXxgXRPIOpTD9n2dfWbrf4=" + }, + "io/ktor#ktor-server-content-negotiation-jvm/2.3.9": { + "jar": "sha256-9KdgPmXbnRtkXOQz2XHQxAc3umraSs9DZFaEJw8dAO8=", + "module": "sha256-xL9rA7ju59qa6x2G9JULposNx8quDQqYjUJUcc+mfAw=", + "pom": "sha256-tojZVBvuNn7hQdkAh5NJEF5Uvvug1g3AJl9LaUKSvwM=" + }, + "io/ktor#ktor-server-core-jvm/2.3.9": { + "jar": "sha256-e9modsIMbJSlqOQtavgrBZP6B0YeQPIEkKAeYPgoqO4=", + "module": "sha256-Y2GIxyhp8Nu4XwT35mZSICN/ewXmKXbrYnUBNrut7c4=", + "pom": "sha256-bGjP/o2jBoJVXf6ld62FhqAvZuIYLvAsC4zCs5LwD1o=" + }, + "io/ktor#ktor-server-core/2.3.9": { + "jar": "sha256-PztUA1uh8KXfyq3LoJd62JDVDEUa7iLVPvTVa1Om/O4=", + "module": "sha256-Fj9IyooZ1Kq+2pjL4TkjLGNLCQD1A3JTYdUQZZjsJkc=", + "pom": "sha256-1+GcZ3Jf/3R2N/bJMHymzieRLI7txSN5BYqSa5gXrVM=" + }, + "io/ktor#ktor-server-cors-jvm/2.3.9": { + "jar": "sha256-VQPmblnQ7lMqTPylNPXq3U4Py8NNrPVl9gwWUl9bqlk=", + "module": "sha256-HQQf0CYpOBq/sHZa1IwPxXbrl0tk0wK7sPhBKopKePI=", + "pom": "sha256-Rm7YjuyzUMoKvVR7N5HC6Ge+0hCZScv/0JeSFRhhccw=" + }, + "io/ktor#ktor-server-forwarded-header-jvm/2.3.9": { + "jar": "sha256-/IoV82DN/+/ywjgP9rZILCLgAEPg4Jcpqj/VZm7xXj4=", + "module": "sha256-l7C9he5/0SznYtlos+YfnVXZKH4zN6lXsT8Cn7z886Y=", + "pom": "sha256-9buBXtGYei6DpUVatAvICq/siv/1GfoHP6J75nqHV7c=" + }, + "io/ktor#ktor-server-host-common-jvm/2.3.9": { + "jar": "sha256-ZnjXBW4NHIGuejYjV1WnQifdwJ2/ZYf4bsiJtOSEzSo=", + "module": "sha256-vvIgNRiFDxiGexyDLlbYqQHVwAGUx3uzHVqIAIh01IM=", + "pom": "sha256-RBt5kWGklte2R36K4yJbmpPRTf/Gke+Hg2IWmuWupS0=" + }, + "io/ktor#ktor-server-host-common/2.3.9": { + "jar": "sha256-rszGWDfMza0w0iSK/EGgMmYW4PtIEQ7MdC9FxHAueng=", + "module": "sha256-Q04xG2CeqDemcU60U2nMGeBvBd6zf7ujpF3g4Upn0LY=", + "pom": "sha256-azz8PS+aJcC3uwFNsF4/+KInj6iPPwiLjbEOUx6ise0=" + }, + "io/ktor#ktor-server-netty-jvm/2.3.9": { + "jar": "sha256-FntLW+0rNoGKJj0F1qpLD4Bv/Ic7ToJQmMh1Z9XeLU0=", + "module": "sha256-xmn+zYnO0VctNJ/Qbn2L2/4w7EfLWE0l/QroF22jQdw=", + "pom": "sha256-z2KtTmcCj/pSG6PU9hczv13IV57UQvUauhihnOka6W0=" + }, + "io/ktor#ktor-server-status-pages-jvm/2.3.9": { + "jar": "sha256-n3Lh38EPziT/6vWd+67e1YTo6zxeTKd/cD4zUFsw7iQ=", + "module": "sha256-dJoDEkT4Nppg8rHjvNEV3rPoRYA+6Wx4RJ04tp3b+48=", + "pom": "sha256-6qGtbgZNXlPms9itUci2cd03e5fsO61kkLs43zmWtbY=" + }, + "io/ktor#ktor-server-test-host-jvm/2.3.9": { + "jar": "sha256-PfVriXUzxE7cOQd4DoK5kjiuwZUveoW0Bhje+LWkXps=", + "module": "sha256-RT1n7Ady/VgZHMyW0PeKBzBTG8vMzeUk1jCJkAmCrxw=", + "pom": "sha256-RK1HKGa1aPrxBI4gRtbEbXNeZeAvRbgTSihxQ6oanVc=" + }, + "io/ktor#ktor-server-websockets-jvm/2.3.9": { + "jar": "sha256-20QCh8dMWH1FdKq4cDN2NeHhXzwyoXW/wWExubah7wk=", + "module": "sha256-npDU+qKlPdjuhil6qlqhhR/4ihxGpqO5FMDe9gFWP1A=", + "pom": "sha256-6QfSltly5BLAIAIDbhL6fFBwggBtpiRVBGdssNaFczc=" + }, + "io/ktor#ktor-server-websockets/2.3.9": { + "jar": "sha256-nVtef+NqQTIuIYDZ2E8d0Auyqqaw6+mzE51vv5MVYqo=", + "module": "sha256-0LHgcGjAbWynJTtFBymDfkJwCbpHYt7vpGMVPVK2PWU=", + "pom": "sha256-SSaCZw4i6CAV1+zWscMQXndlXU3rYn1fxB2budnV09U=" + }, + "io/ktor#ktor-test-dispatcher-jvm/2.3.9": { + "jar": "sha256-hy09SmOD6qA+O1szMJuP7MFKPGsK7bqPVtgLwy0OyYM=", + "module": "sha256-jr32NE4zoRWdiGYZkW+Jb0xGY/3SHUD0x8m49rRmuVc=", + "pom": "sha256-f2elTFfEiVOt7AHLTxdsk9pWwEbh/oN6uGJf4fWVUuY=" + }, + "io/ktor#ktor-test-dispatcher/2.3.9": { + "jar": "sha256-m1L5EwHLh9TSOmp8/mzYXlGTXSI8HKf+RF+UwNuee3E=", + "module": "sha256-vcCkosbfASSOKI4iqTQOhEHdpgtiGKjRBhEzNdyuOF0=", + "pom": "sha256-tMa8akOax89+KnU3ekA4a8jXDgE3PL+pyNswbhA4jSk=" + }, + "io/ktor#ktor-utils-jvm/2.3.9": { + "jar": "sha256-mH/r2kVD7/sdDg1ZBbLut7t3fJ9DLjnRIkFTxcbyNfE=", + "module": "sha256-Mwl+WxKFnjPIJYrZedrsZbdH6Dp/4z4qan51n8tVvGc=", + "pom": "sha256-sSbiYOBihXUK2TJHX0prVfxlHKw4XsQpDoz7mK1ejGY=" + }, + "io/ktor#ktor-utils/2.3.9": { + "jar": "sha256-uK8HnGG3oes6r5PipsehqhZjFyIIpmUJPNJpBuBJ6GQ=", + "module": "sha256-dkr1rxi1+CwLssTTS8cqhT1IANOfFl+oF34hfuDZ9Vo=", + "pom": "sha256-GiP4cvHRdU7rHCzq/d1JSShxrTpiCSMnIgTCDud4X4g=" + }, + "io/ktor#ktor-websocket-serialization-jvm/2.3.9": { + "jar": "sha256-jBCWBmWwSj67G/c3tYz/bWV58vHKKUtQdPO1buewn3c=", + "module": "sha256-Av42GI6AIQzW5Xhve3Fz5ApWdfkmuQrYWjM2cOdIaI8=", + "pom": "sha256-s05A9L0hUpspQOHCuS6fVQy52DaPes/jEfSQvmmmjgc=" + }, + "io/ktor#ktor-websocket-serialization/2.3.9": { + "jar": "sha256-JCEwwgnDIoLZ8g7EnlfXSBihpyiADs2QLe7dzwURgMU=", + "module": "sha256-i2RUwpnw6wl9BFKo4mSfuiDCerE26As7zySHuKFxoXc=", + "pom": "sha256-2EWa4JTKJNbQ0VOQCz3ZsKrmJMvgE1MKqdwUhJK6Qxc=" + }, + "io/ktor#ktor-websockets-jvm/2.3.9": { + "jar": "sha256-rlniIJf1vDfrBWpf4NarGVKiVGjVfuSNCKlTsEmsOMo=", + "module": "sha256-qNVObtccVsXhVWErhYYwBYvV8vdmUc1u35775UQBP9M=", + "pom": "sha256-rqUJP2K2HwCJe0PjleNt2qrBM74A40ML1a1tsSng9uc=" + }, + "io/ktor#ktor-websockets/2.3.9": { + "jar": "sha256-XdKULp+AhVyqGFXiShT3DxqHWcg3tFTplRdqPMl3QVg=", + "module": "sha256-uhRGT5h1Nik+ztLdI07ztLUQKqhbKOnG2T+rSB7GFTU=", + "pom": "sha256-Gk52XnvtAwaY8phvbgzlsT94IGVj4RurRr77r7B0/PQ=" + }, + "io/netty#netty-buffer/4.1.106.Final": { + "jar": "sha256-1QZ72+R21jy0MpOCKDKnSafDijjBxRYQfHPSV8Ob7SE=", + "pom": "sha256-2gY34YJ9Uw2h2PQwsObNaT7Ee32qBnQrKKw02xy1RqY=" + }, + "io/netty#netty-codec-http/4.1.106.Final": { + "jar": "sha256-uhd6A63Fh/pj6W8duunEb/JfWTl+o02WC0XgXQKWAm4=", + "pom": "sha256-DE+4Y7F3o8Z9NhZistW8Gx43Vgubamtxfbc+lnlW2Ro=" + }, + "io/netty#netty-codec-http2/4.1.106.Final": { + "jar": "sha256-wrgh1XpzPNZx6iqwZCACsX4KK4kATKAmxuro9Tgc+B4=", + "pom": "sha256-JZlznLzUACvwLSkABPTYxyvdhZ2VOyGAR7HvdW55jEY=" + }, + "io/netty#netty-codec/4.1.106.Final": { + "jar": "sha256-k4Y9/WkPes58JuTICP3CR4CtrUZbPNy3zj/HPEIt928=", + "pom": "sha256-NA+IHwoS9itNCY+bcQo0fASTjV/z38wvw8pw1X7a70s=" + }, + "io/netty#netty-common/4.1.106.Final": { + "jar": "sha256-X/vgG9hFYXqRbeNhMBDV/aV8XraUFH040E95Hpg01cM=", + "pom": "sha256-4ayZMJpA1e76IEs6GBXHIcuS5K5t1UHsIoRQ2cnUgA0=" + }, + "io/netty#netty-handler/4.1.106.Final": { + "jar": "sha256-WpGa2Ittnp8IwwaZgLxlamKSagDmui2lhZqg7k4gLkQ=", + "pom": "sha256-lhoCD6DBskT1io9MYS+egEEokLlgO/WTzmiUKaRlC0Y=" + }, + "io/netty#netty-parent/4.1.106.Final": { + "pom": "sha256-eV8c7NBEHGSvry5vEN+yHCRtRI9sQ1cFHt6mjpw+s2U=" + }, + "io/netty#netty-resolver/4.1.106.Final": { + "jar": "sha256-QElYuPBZDuUmAT0BHNI1Tat4rbqtdD19RE2zOj+eq6w=", + "pom": "sha256-phbG6XmPmDwsK0BiFDvaWM8tD2mGnZ00yMJiPdZMXXc=" + }, + "io/netty#netty-transport-classes-epoll/4.1.106.Final": { + "jar": "sha256-676g9nii85R+sgC+Az7X/lUwZ+Octd9Ldp0bn8aimHI=", + "pom": "sha256-kancuAlsq6lJCbohCze/4/M7qjAuZXAap/4nnWlRzGc=" + }, + "io/netty#netty-transport-classes-kqueue/4.1.106.Final": { + "jar": "sha256-9o7UQlABZcajhz4HMeG2IIS0L4QtD0dmdHSA7x/Jdj4=", + "pom": "sha256-5VnP7dwvVFIUCbLypQY8gXefTgvpcG/+2QR0B3xBHU4=" + }, + "io/netty#netty-transport-native-epoll/4.1.106.Final": { + "jar": "sha256-ZgOaFRY1MCriM9/Rh9kcfddzoRrM0Sc1wWU7gndOd/A=", + "pom": "sha256-U51mdWvcdwISzdMD7mJMrY2xbu9KgZiyqOKEg+ljb04=" + }, + "io/netty#netty-transport-native-kqueue/4.1.106.Final": { + "jar": "sha256-FC/1C6Wcdbv2c6bBQ53Prjy3RprbgQXcP7ZqpAVRpK4=", + "pom": "sha256-BuxVaGByijbJpVnBVpIl5kzOGvQPqZ7T3GdZgmHMlOs=" + }, + "io/netty#netty-transport-native-unix-common/4.1.106.Final": { + "jar": "sha256-9S1LOMVxBmv6rpZKeGf6k38OVPtf9GfFdstlCiCoVOg=", + "pom": "sha256-h19sn7JG3Vygm8Lc/LF4wpsBxx6lE/M3jm/Osp1KCjo=" + }, + "io/netty#netty-transport/4.1.106.Final": { + "jar": "sha256-I+qaOQCbQenQqhUVswc6+e5NpOFsLoabWqiqnxCdQlE=", + "pom": "sha256-qyxCFnnBmSuuT3UyvpdpbK5L9g5pbwskf/vPunrynM4=" + }, + "it/unimi/dsi#fastutil-core/8.5.12": { + "jar": "sha256-8xwg9bBjEvPV4G5hYKMuJ02BmqbOvydSiya2tcDB3xk=", + "pom": "sha256-g5JDu+YWEfk3uwtdmzHQyOCWx9DWeZIs9u05+Cxu4NI=" + }, + "jakarta/activation#jakarta.activation-api/1.2.1": { + "jar": "sha256-iwoPUvqLBcVDGSGgY+2GbvqkHa3y46fuPhlh8rDZZFs=", + "pom": "sha256-QlhcsH3afyOqBOteCUAGGUSiRqZ609FpQvvlaf8DzTE=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api-parent/2.3.2": { + "pom": "sha256-FaVbfVN8n5lwrq0o0q+XwFn2X/YQL3a70p8SR92Kbfs=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api/2.3.2": { + "jar": "sha256-aRVjBAeb3u2fwK47OTifGbPMS6REO8gFCJlTlOrXQuo=", + "pom": "sha256-tTeziNurTMBpC50vsMdBJNZyUxc0VnrPblMTDqsTGtY=" + }, + "junit#junit/4.13.2": { + "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", + "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" + }, + "net/bytebuddy#byte-buddy-agent/1.10.9": { + "jar": "sha256-+9BS0tTNFvcHVHxGhiHGt/uELH7Ihm0BLsvGF43h85Q=", + "pom": "sha256-GZB0lfvBwjFsjrrXbwe5bRAf6xp+PAm/4VJv0/xu7J0=" + }, + "net/bytebuddy#byte-buddy-agent/1.14.9": { + "jar": "sha256-Ee0QfUt45V+MPTQlBJQ3UIGim8ElofXFbbWCzN1Ig18=", + "pom": "sha256-qxHpogIx0YZqfUA16wsAdbgDYNjN3F0KNzw5WE6c0kc=" + }, + "net/bytebuddy#byte-buddy-parent/1.10.9": { + "pom": "sha256-k9nTgHec0XaMUrS87oLL+u3vmkow3oeuBrRB4WNP04w=" + }, + "net/bytebuddy#byte-buddy-parent/1.14.9": { + "pom": "sha256-Zrg0IlHTXyBj5pMW9juvywVjQv516SHA9GXC2WWTU14=" + }, + "net/bytebuddy#byte-buddy/1.10.9": { + "jar": "sha256-B7nKbi+XDLA/SyVlHfHy/OJx1JG0TgQJgniHeG9pLU0=", + "pom": "sha256-QIgdSUiocRWTRicPNpRbwpAlV3xstX9qXdDHwiIGnaw=" + }, + "net/bytebuddy#byte-buddy/1.14.9": { + "jar": "sha256-N3NS4lMoK/hvcxrJDtiDSOj0CmPOAzwAqFmC3n55Dm8=", + "pom": "sha256-LWdykQ0WFpvUySKeijZc9U4ZK8Ygy8+n+EJx9dEV6BU=" + }, + "net/java/dev/jna#jna-platform/5.9.0": { + "jar": "sha256-GQO8bYfzq5ICOVe5H0WpyOs1FbrQMDVs6XcgHlFBtyQ=", + "pom": "sha256-C9pdmOS+kmHwnN+u5vokWYh5CDTX/K3I4v3ZPH1kGCU=" + }, + "net/java/dev/jna#jna/5.13.0": { + "jar": "sha256-ZtT4GaBipRodVie//CP6xV0Wd/Dgof66FEqr3WcKZLs=", + "pom": "sha256-9RXCV4F49FJH7Mp6nh2xCVMbHELyQk4lPO6w9rjUI3Q=" + }, + "net/java/dev/jna#jna/5.9.0": { + "pom": "sha256-a8i4RZFQtZ6VmPPa2a0kWh7yFQ0IJYEBcYTrFj5ZKCk=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache#apache/17": { + "pom": "sha256-OYBEt0tacZMmviGK4IEk5eLzMYq114/hmdUE78Lg1D8=" + }, + "org/apache#apache/18": { + "pom": "sha256-eDEwcoX9R1u8NrIK4454gvEcMVOx1ZMPhS1E7ajzPBc=" + }, + "org/apache#apache/21": { + "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" + }, + "org/apache/commons#commons-parent/34": { + "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w=" + }, + "org/apache/commons#commons-parent/42": { + "pom": "sha256-zTE0lMZwtIPsJWlyrxaYszDlmPgHACNU63ZUefYEsJw=" + }, + "org/apache/httpcomponents#httpasyncclient/4.1.5": { + "jar": "sha256-DBh3SJqdG6T6UPbPyrEdESNhiFjLMdVq+qta/dUGTZk=", + "pom": "sha256-beSudsiSFXUj62TD2bFNvHSnWGNrQO5MxkVqwRmYKXU=" + }, + "org/apache/httpcomponents#httpclient/4.5.13": { + "jar": "sha256-b+kCalZsalABYIzz/DIZZkH2weXhmG0QN8zb1fMe90M=", + "pom": "sha256-eOua2nSSn81j0HrcT0kjaEGkXMKdX4F79FgB9RP9fmw=" + }, + "org/apache/httpcomponents#httpcomponents-asyncclient/4.1.5": { + "pom": "sha256-6QGB4oDAJx/zE3QTQ+bwVAX66IJwL0WkzibewBbNnJ8=" + }, + "org/apache/httpcomponents#httpcomponents-client/4.5.13": { + "pom": "sha256-nLpZTAjbcnHQwg6YRdYiuznmlYORC0Xn1d+C9gWNTdk=" + }, + "org/apache/httpcomponents#httpcomponents-core/4.4.15": { + "pom": "sha256-YNQ3J6YXSATIrhf5PpzGMuR/PEEQpMVLn6/IzZqMpQk=" + }, + "org/apache/httpcomponents#httpcomponents-parent/11": { + "pom": "sha256-qQH4exFcVQcMfuQ+//Y+IOewLTCvJEOuKSvx9OUy06o=" + }, + "org/apache/httpcomponents#httpcore-nio/4.4.15": { + "jar": "sha256-RO4+231eltPm0AJjyDivI90s5nVUEpcU6jCuRHupW5I=", + "pom": "sha256-qCfxVd4Zzdjzd7hLOEuXFL5ubZUuY4XQ9NZDfCR/YqM=" + }, + "org/apache/httpcomponents#httpcore/4.4.15": { + "jar": "sha256-PLrtCIxJmhD5bd5Y853A55hRcavYgTjKFlWocgEbsUI=", + "pom": "sha256-Kaz+qoqIu2IPw0Nxows9QDKNxaecx0kCz0RsCUPBvms=" + }, + "org/bouncycastle#bcpkix-jdk18on/1.77": { + "jar": "sha256-Gsf+jv1bLzjNwWW+WgZ1c0/kSAjauScHIB8DpTXW8bg=", + "pom": "sha256-j7CSbwLixLLcUuR+uwk/kvHTu28UnCpcyl4qZI0sSY0=" + }, + "org/bouncycastle#bcprov-jdk18on/1.77": { + "jar": "sha256-2ruYwk1yybn1hWM9HfnFzVjZrTc9DNaBNn5qYDpJXVg=", + "pom": "sha256-rROCz80DvN2L4TkTwC9E/UadCnalPPLK71vhgK3DayM=" + }, + "org/bouncycastle#bcutil-jdk18on/1.77": { + "jar": "sha256-lHZzvLxajd4tL6aIpbdZjQym4qdKfqMM2T8E9rOtaPg=", + "pom": "sha256-Fj36ZjL/uSinBcqDciNQys6knM1iPOc2RaXMOw+p5ug=" + }, + "org/checkerframework#checker-qual/3.42.0": { + "jar": "sha256-zK7dM68LeJTZ8vO2RPTRnkOSjjKQLmGsTRB3eDD1qsc=", + "module": "sha256-4PpiK33mPq4RBH726RtMKtDx8OE8uQP/UggKR/V6V0Y=", + "pom": "sha256-v1/KqycvVMvPG753w72WPIIcmrrSBYcIvwvtPIdUlMo=" + }, + "org/codehaus/woodstox#stax2-api/4.2.1": { + "jar": "sha256-Z4Vn5ItRpCxlxpnyZlOa09Z21LGlsK19iezoudV3JXk=", + "pom": "sha256-edpBDIwPRqP46K2zDWwkzNYGW272v96HvZfpiB6gouc=" + }, + "org/eclipse/ee4j#project/1.0.2": { + "pom": "sha256-dJWgenl+iOQ8O8GodCG9ix/FXjIpH6GOTjLYAx3chz8=" + }, + "org/eclipse/ee4j#project/1.0.5": { + "pom": "sha256-kWtHlNjYIgpZo/32pk2+eUrrIzleiIuBrjaptaLFkaY=" + }, + "org/eclipse/jetty#jetty-parent/21": { + "pom": "sha256-eXLp7G84UqjuHuXU0Q3Mnc1gd7El+TWqlrNnpsgjN/U=" + }, + "org/eclipse/jetty/alpn#alpn-api/1.1.3.v20160715": { + "jar": "sha256-B76ZdYtpnhlPcPuXhNlCAtxsmCEod4KePXKwIPJmBXY=", + "pom": "sha256-FrRveqUg7VDUR4oM9ndjje3AFDtCNMJ48WDLS9JUgq8=" + }, + "org/freemarker#freemarker/2.3.32": { + "jar": "sha256-BNZewb3mzqIONJXV5475ard02ZNkNIYdMlS9iOfpT5I=", + "pom": "sha256-B6B+Lq8JdgIrVAVnx99iJxK5oDk6bF9tIOb/FXkiKgE=" + }, + "org/fusesource#fusesource-pom/1.12": { + "pom": "sha256-xA2WDarc73sBwbHGZXr7rE//teUxaPj8sLKLhOb9zKE=" + }, + "org/fusesource/jansi#jansi/2.4.1": { + "jar": "sha256-Ll53Wp3Fj/prvWqm8JnWL4ti3N60w8O7vlzyMBvC3ME=", + "pom": "sha256-P5jZeaTTVZ+HefuwBLNK51Fq+t9RDhHffMPNBz6xuzs=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains#annotations/23.0.0": { + "jar": "sha256-ew8ZckCCy/y8ZuWr6iubySzwih6hHhkZM+1DgB6zzQU=", + "pom": "sha256-yUkPZVEyMo3yz7z990P1P8ORbWwdEENxdabKbjpndxw=" + }, + "org/jetbrains#markdown-jvm/0.5.2": { + "jar": "sha256-cmSER3JgpVLcfBmwnUZWxIrjsQ2yclAA4YLWFZUptG4=", + "module": "sha256-fzA2ZgQteNJMVVEgyIJHjDCaIo7pK1G9ca2/+knDO1A=", + "pom": "sha256-D58z0tjpkbt1C7VZ2q1YtsVH5raHQAA4Jne3XFtYpG0=" + }, + "org/jetbrains#markdown/0.5.2": { + "jar": "sha256-HGsba7nOgwSLhkiZCsHTQnv6z+vI5Y4y7pBD3dDcOio=", + "module": "sha256-bpFAGmpLbnc1auIzdjDoovLcQawmG3BbOpZv/GI/I+Q=", + "pom": "sha256-mH5hITw/ERPsyi/8I6b0hpvuig+zCR8n3xvfq1KMhSg=" + }, + "org/jetbrains/dokka#all-modules-page-plugin/1.9.20": { + "jar": "sha256-l6FkXFrUKNN72nqMy/8xHyfAEdAUincdchFnj5qmVsU=", + "module": "sha256-5ppgwoB44BoaFSdIs3M32r2RhmB0bS7rv3HexQYDjRs=", + "pom": "sha256-t6gKNfwDIkaUQN+1eMvKPG8U727NVX+nxkKkhSj776Y=" + }, + "org/jetbrains/dokka#analysis-kotlin-descriptors/1.9.20": { + "jar": "sha256-Nq+ECbvk2mov81ZFwntqdoeIQEQ4mLVgWh2avXVclow=", + "pom": "sha256-WO9jQY0yViRqjpkfKV8q/N7WefqS/LgpdOJt7Vy2Vkc=" + }, + "org/jetbrains/dokka#analysis-markdown/1.9.20": { + "jar": "sha256-uiEg/wNxXhsmXRgLXVT4j+itp1jXljlQXPoCNfc1wQk=", + "module": "sha256-/qwu1TYem5odag9q1jAZrxMIZXlABtWoRSiYw2rAF2A=", + "pom": "sha256-kpPTl50NqDO40F+/cuEZnF2VuWMexl/ut1y7uPhBtyg=" + }, + "org/jetbrains/dokka#dokka-base/1.9.20": { + "jar": "sha256-xr/alBtH0NpGuAQtweOvYs3G9Kdrv9kJQ9p8max0d4M=", + "module": "sha256-IDrGkj+sD1j2YisCrXGeIuBOr4m7sZ2opyDdVP7m8Ik=", + "pom": "sha256-hkh3sGo3jO4h4u+aDclp6pCjK/KYviAnS5LM9q/fKow=" + }, + "org/jetbrains/dokka#dokka-core/1.9.20": { + "jar": "sha256-EhizoInIX41byc7lNGp4f2QUPW/HtPBLBRtqW3Sv3IY=", + "module": "sha256-w+z7y6JqmLbouDusckOZKz6d/jilB9d6UnvL5E75ua0=", + "pom": "sha256-N9LsB2+hsvlR92bUjxHVHXOrjlNwkGy/XXnMPkbRjxI=" + }, + "org/jetbrains/dokka#gfm-plugin/1.9.20": { + "jar": "sha256-f5qvOPhLGwZGeCfnNvOkmeMefUg8unKHy77MU9WE8y8=", + "module": "sha256-0cPvGZtJZTQ/TdEpr+tujKF+iAoQ0jPd6dyN+hOGvxs=", + "pom": "sha256-JGElNBZW5N+87fgk3sSbT9KDzgn8iRr+RbarIoz2Ntc=" + }, + "org/jetbrains/dokka#gfm-template-processing-plugin/1.9.20": { + "jar": "sha256-04wGZ1R7bI7K/AUNH967Cq5nnatHxb3Xs938btQXHKg=", + "module": "sha256-mjhaQy+qWiK2SAewLkK2RBJMBRiX5DX7Hh8GR3Jh+jQ=", + "pom": "sha256-1ND/ZwqyZ3P8/KQXd9b87ZlZLw00I2EvbJGcb1+dZu4=" + }, + "org/jetbrains/dokka#jekyll-plugin/1.9.20": { + "jar": "sha256-iduNwnd+N1HeLw0FNxZbRmxUThnD9BBClRc3E23bGu4=", + "module": "sha256-kojGi60yAH7eXDkmvkhAeu46mW/xtNTg2Pl0sancfXM=", + "pom": "sha256-9IWudDvcJYU0o5Cl28iwanJiTZtJdVA6JZHE4eA6f5o=" + }, + "org/jetbrains/dokka#jekyll-template-processing-plugin/1.9.20": { + "jar": "sha256-cmnUZPPlAuFUBosmvtYS5fkQn3j+JHn5F0xtC8Qq6CY=", + "module": "sha256-P83z3bPpEvoFBXD0rL10ASc1vZqQ1HEE3WRnxfPcf1M=", + "pom": "sha256-UnZTelL3jYHat+c2hCikLqqYemAPNzmyUeJsCEOm3QY=" + }, + "org/jetbrains/dokka#templating-plugin/1.9.20": { + "jar": "sha256-5dJx2ACr4mtAzTJrsbgz+agl4jcYuDDhTTnpFy9Fv4I=", + "module": "sha256-+THUhm1wio69b+1YRA8qLI2tN1oxRUc3v+ezMlIWijw=", + "pom": "sha256-87lBCuL3huImPl4+/JXTn0ZckTdc2GxKEE9h9rE4m4I=" + }, + "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { + "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", + "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" + }, + "org/jetbrains/kotlin#kotlin-build-common/1.9.23": { + "jar": "sha256-IoJaHv4VSRN9GBPtedycyvVLSoonAKSsf3CNxmAki68=", + "pom": "sha256-2ePH5h9YSUkAFP6BC/wQSp6aRNVl7RhsWGu7P0/D0/s=" + }, + "org/jetbrains/kotlin#kotlin-build-tools-api/1.9.23": { + "jar": "sha256-gvhH4lRXtGSDfv7x2oUC7JJTLedAbnkgUWbODs9PxSE=", + "pom": "sha256-CWkjtiXJfGZzZ5ZsxM6Sv5TE6f98U8sdOEhgEax1DVg=" + }, + "org/jetbrains/kotlin#kotlin-build-tools-impl/1.9.23": { + "jar": "sha256-6sLwRmWHGVWn0K5FcZad8rCOfTN7LxIhAGb9PuAfWYE=", + "pom": "sha256-/OLyPE6fBzshdovfVqMa2W0zjNwD0FoVekWl/bL/7bE=" + }, + "org/jetbrains/kotlin#kotlin-compiler-embeddable/1.9.23": { + "jar": "sha256-zJQGSXS/nr9ZlF4xIXzy0WoM66rySH6wdI/By9F4eUM=", + "pom": "sha256-WLI81NgtWqkWpcnMmbMhjuxVaWBoova3C+3fbDaR/RU=" + }, + "org/jetbrains/kotlin#kotlin-compiler-runner/1.9.23": { + "jar": "sha256-yFlaPhcRx0U8f5YKrxKhcNtL2j1vy6Sf/I4yy/0ADKE=", + "pom": "sha256-KebjEpGbdf6aOHjflRHPQhDcJuWTQcsu4iSDt7Tgcv4=" + }, + "org/jetbrains/kotlin#kotlin-daemon-client/1.9.23": { + "jar": "sha256-5jFUJUkZ/XBv6ZN8SNuTfqkGimMfht5lWlFLwWIPmI0=", + "pom": "sha256-X70GastuQIU5gCdsaDUWmSj2Zqt8RlEsJvJMnQMIF9M=" + }, + "org/jetbrains/kotlin#kotlin-daemon-embeddable/1.9.23": { + "jar": "sha256-bztmG5gmetJOL4+3rV0Gvn0u1hpdBcJn9OTKp433g9k=", + "pom": "sha256-WFRgOL5Go4NmOFPRMd12xPsnQ4MLqXt0sno1zxAtPQI=" + }, + "org/jetbrains/kotlin#kotlin-klib-commonizer-embeddable/1.9.23": { + "jar": "sha256-uAo4tLuB+wPQ8wdHPQMtc7J3j6drA0Y4floQ3YM9co4=", + "pom": "sha256-iLBAO2Z/cVJX6gDXdiFkkzggk+727vUBslU6HVIHG2g=" + }, + "org/jetbrains/kotlin#kotlin-reflect/1.6.10": { + "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=", + "pom": "sha256-V5BVJCdKAK4CiqzMJyg/a8WSWpNKBGwcxdBsjuTW1ak=" + }, + "org/jetbrains/kotlin#kotlin-reflect/1.8.22": { + "jar": "sha256-ZVgl+mURIg/tDK5arU3+oqv5j9EPCud+uNr2q/zQ8Cc=", + "pom": "sha256-KeHqCKPTq0gtH9/UH76TRZEt9Gbbr6+0sS0YN8cr4yg=" + }, + "org/jetbrains/kotlin#kotlin-reflect/1.9.22": { + "jar": "sha256-d/MRyhOEgR1Rn9o4n8sSaL2qBY1gUEbg7edsA7DfPpc=", + "pom": "sha256-xxLjWN97kxi2j1RjlxsIhnODf8DKQoXRw4LIEC7da18=" + }, + "org/jetbrains/kotlin#kotlin-script-runtime/1.9.23": { + "jar": "sha256-dRN+QUoaW0tNCQ+BLQ416zC08MkjpT1pWFRWuyT8Hfg=", + "pom": "sha256-LWx0sGpUDpicq9BTChbnZYGQUl8vTVpDq5sa/nQU/F8=" + }, + "org/jetbrains/kotlin#kotlin-scripting-common/1.9.23": { + "jar": "sha256-ii5Wfz2/Nz5hwBrNeIRjHshThGWrjul4rGMpb4zJr0Y=", + "pom": "sha256-/CiXW5TcQMDZD9EXXiKxtka60sY368+fT2qy1Oe8XdU=" + }, + "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/1.9.23": { + "jar": "sha256-e4A5/wt3nVVs7QCSMDWr0TNPDl8qiHlhgtArpF+SbSA=", + "pom": "sha256-7Y6//r5Ume1iSG+oGBJ7td1QHXTEq5XFfnwB7z+NuWg=" + }, + "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/1.9.23": { + "jar": "sha256-kOU90S9i3NgjQ8EsDLMUrc/wy8OYjtsRjR5miZYOnWM=", + "pom": "sha256-923kmO12xGroZlZnmAf3J2EiPD+hChExgyAGpKs5Xe0=" + }, + "org/jetbrains/kotlin#kotlin-scripting-jvm/1.9.23": { + "jar": "sha256-0/yn7JUf94Jvl6dZifjcr/YM+eHna73CIO33eDdqbmQ=", + "pom": "sha256-4u8r+y628hp7croS7cWaFQx/IXbCssVP4uhg7oAjDYc=" + }, + "org/jetbrains/kotlin#kotlin-serialization-compiler-plugin-embeddable/1.9.23": { + "jar": "sha256-5YFdkGHmX984M/2neljFYPXu4uanONL7F5VA2Fj8efw=", + "pom": "sha256-Z4yRlsaPLbNOgRSEk1sVIGZL7K/AYiSTgDi8nWP4tAI=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.8.20": { + "pom": "sha256-YFWRuJs3ISfmspxpMl+i9qjEb0aMRdCUEOeOtZ/IChc=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.8.22": { + "pom": "sha256-pysR3wi1Mi16Xo5iB4nuPkz+846GxDDn0RO/qeVMWB4=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.22": { + "module": "sha256-+Tyemr+NUtjo/Y6FGqgC7OxVEyFhxK7ufTzZJL95QkY=", + "pom": "sha256-10k21oh1ZK63EOhCmLVCB/U+m88jpSrSv6IsIIZ3V2c=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.23": { + "module": "sha256-hjnwBfqZd67wjDL8jnonedoi7iYkZNcnMpiq/Ug3Fc0=", + "pom": "sha256-OuBxRYdw47aGCafTGet5emeJ9fBAyqQUQJgJmGhb5PY=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.20": { + "jar": "sha256-rx7EDDuVGv3MDCoBc8e4F2PFKBwtW6+/CoVEokxdzAw=", + "pom": "sha256-NiLRBleM3cwKnsIPjOgV9/Sf9UL2QCKNIUH8r4BhawY=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.22": { + "jar": "sha256-BV9cskKH+hBhAJlae0erkhJrgegy6HX1+izwvVVpPQs=", + "pom": "sha256-T5WKqZPVmE+PXr7UFGVipfOp9pW2BJyfKHOBN5ytqzM=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.0": { + "jar": "sha256-t5eaeqyUBV8Nnx/TtHzl/+HLYDKoQrqfvnGG8IUokXg=", + "pom": "sha256-wRB08MiYqYuGPGFEcdQ409+Soewzgqbjf5NdfXGVS1o=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.10": { + "jar": "sha256-rGNhv5rR7TgsIQPZcSxHzewWYjK0kD7VluiHawaBybc=", + "pom": "sha256-x/pnx5YTILidhaPKWaLhjCxlhQhFWV3K5LRq9pRe3NU=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.20": { + "jar": "sha256-45i2eXdiJxi/GP+ZtznH2doGDzP7RYouJSAyIcFq8BA=", + "pom": "sha256-OkYiFKM26ZVod2lTGx43sMgdjhDJlJzV6nrh14A6AjI=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.22": { + "jar": "sha256-QZiw6vCQpPJbb35aWVgfQxS6jJ9s0dE+6dNI5l7Y9wc=", + "pom": "sha256-ko8hhyF0djE8uBbUgHC8dlSqO5pa6B0/xfjCecyPjZ4=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.0": { + "jar": "sha256-pZ+iT98f+1lLrs2/D9EAEPl3zqECNtSH/jRkl3pzd/o=", + "pom": "sha256-ZNWY3YjiUEZnMeIDBKtvBsu7urfuMitHA7a1n4gcT5I=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.10": { + "jar": "sha256-pMdNlNZM4avlN2D+A4ndlB9vxVjQ2rNeR8CFoR7IDyg=", + "pom": "sha256-X0uU3TBlp3ZMN/oV3irW2B9A1Z+Msz8X0YHGOE+3py4=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.9.22": { + "jar": "sha256-ar4UbCeGQTi4dMzM/l9TTj65I8maG3tdRUlO5WlPPgo=", + "module": "sha256-9IIxS1B5wUVfb7DUJXp0XRAcYSTOlhUiuob53JCQHkc=", + "pom": "sha256-zOLxUoXsgHijd0a1cwigVAQt1cwlQgxD9zt4V8JGjwM=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.9.23": { + "jar": "sha256-iRDMI4gH2G71UMsfCxDdXtQLNaTsGlJSX3YK7ehOrTc=", + "module": "sha256-UZUZOzfc2touHAqw1RLEIrKtdq81V4Q6G5w0gPTnHQ4=", + "pom": "sha256-wm0n8mcQrUDiPu2f/gpkuFkejBPSI8ypDFk+5j87KKs=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.9.23/all": { + "jar": "sha256-zsOLwzAucqiq+c3kNrWpBx7gMx4q0F6E2LuJczTX6dQ=" + }, + "org/jetbrains/kotlin#kotlin-test-annotations-common/1.9.23": { + "jar": "sha256-8oGeK8nvB4cHkS/GcRZYC1OBtXbpVqCl5YZ3lYbrHq4=", + "pom": "sha256-JP1yLc/scsUlL75SKWtRz+mLWdJ8PuzpYYqJn7DQwrA=" + }, + "org/jetbrains/kotlin#kotlin-test-common/1.9.23": { + "jar": "sha256-+bdW+OFU7Rhf1yHRgolH8Cc8PF1fD3KboOdXDFPFiHI=", + "pom": "sha256-OVCJx1yFu9QVYoZed77yx6pbFW9RU46BKsoRU79Ub/E=" + }, + "org/jetbrains/kotlin#kotlin-test-junit/1.9.23": { + "jar": "sha256-WVql9FsSU9gixqy13iEqGwSFWAGuH4B++RGHS7I7gu4=", + "module": "sha256-HshhoTOmmnTRutGTyAf5vy2YCE5Vkz7JIoDvjnxlP0M=", + "pom": "sha256-wQ+vw+yTk/mO/MwcLksQeiaHPCEJGsewMuVvsBSRrlY=" + }, + "org/jetbrains/kotlin#kotlin-test/1.9.23": { + "jar": "sha256-AKbs6XF7Mdf4G5pKfaVkQM/SiJqi7jtExTXWSZ9AA1E=", + "module": "sha256-/29gcCHEY4269aZw21kOboq5BPPx3OClrpOcXoQddGk=", + "pom": "sha256-gFqvBB1F6PmioIaCuyS/Ckei0PzN5UkgNp4iAQ9P2Ew=" + }, + "org/jetbrains/kotlinx#atomicfu/0.20.2": { + "module": "sha256-LJleDoPFg+ElcG+6P+hRcAINF6iPidYpSlPNi9fEw4Q=", + "pom": "sha256-fZSYii/6cay7jKEEhQ/sG+Je8YCeOlEPAOvUo8C1vPc=" + }, + "org/jetbrains/kotlinx#atomicfu/0.20.2/all": { + "jar": "sha256-KpHxC4JtP+vEfCtmTiaGFXV8MREUI5eH9dw3SB/exEE=" + }, + "org/jetbrains/kotlinx#atomicfu/0.23.1": { + "jar": "sha256-fbhmDr5LkbtHjts2FsTjpQulnAfcpRfR4ShMA/6GrFc=", + "module": "sha256-Pokf5ja1UQgZIQD884saObzRwlM+I8Ri/AdkTur8sg8=", + "pom": "sha256-aIt5ABn0F87APmldZWexc7o7skGJVBZi8U/2ZEG1Pas=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.7.1": { + "pom": "sha256-uSWqmIxApceqDHeyE3P+sYw5QUkmvVHHbvRENPW66cI=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.7.3": { + "pom": "sha256-Tl0ZAOY3nvP1lw0EqPMFKa3IL4WejMEHwhzoFJ72ZsQ=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.8.0": { + "pom": "sha256-Ejnp2+E5fNWXE0KVayURvDrOe2QYQuQ3KgiNz6i5rVU=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.5.0": { + "jar": "sha256-eNbMcTX4TWkv83Uvz9H6G74JQNffcGUuTx6u7Ax4r7s=", + "module": "sha256-yIXdAoEHbFhDgm3jF+PLzcPYhZ2+71OuHPrNG5xg+W4=", + "pom": "sha256-U2IuA3eN+EQPwBIgGjW7S9/kAWTv7GErvvze7LL/wqs=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.7.1": { + "jar": "sha256-dJbP/dPrEBCazdocMhL2rHgVeJ4JOA3J4szexJbbo/w=", + "module": "sha256-2x/gEQ+oK1ZdMy050/PmLB3H62I4Mz47FeQ3f6VuOcs=", + "pom": "sha256-hcGdsQ28RIoEZjzftHgkPtoKjWsSfxCPGZVbFtSJs10=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.7.3": { + "jar": "sha256-GrOsw48+c1XE+dHsYhB6RvpzyJnzBw0FXl1Dc9/mfhI=", + "module": "sha256-NNbumbdqwGK1FVW0pwvhg0n+VWbaeaGQYU8XHIC2U44=", + "pom": "sha256-dThYdT3su7I5c0PiuHHwYvaXgS6UIuQcnuRqZrk+7jA=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.8.0": { + "jar": "sha256-mGCQahk3SQv187BtLw4Q70UeZblbJp8i2vaKPR9QZcU=", + "module": "sha256-/2oi2kAECTh1HbCuIRd+dlF9vxJqdnlvVCZye/dsEig=", + "pom": "sha256-pWM6vVNGfOuRYi2B8umCCAh3FF4LduG3V4hxVDSIXQs=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.7.1": { + "module": "sha256-qcwMK+48b8S6jQ51Oj8+cOGB2l3zolie5U6SgHszrM8=", + "pom": "sha256-BGsBD8eg5D0r/HOp3nZ13lVBAGy86WFjEhdGA01p1yM=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.7.1/all": { + "jar": "sha256-t9U3DtDlSVIAOxNZWme5fO0/hz2Rn13fvlD81JnL8Kc=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.7.3": { + "module": "sha256-f7FiOWWU7CjhtqRBG0V5SadnD14SAZF2d04f1rlHG78=", + "pom": "sha256-7W6wOYcXA14p8cHWCk4927iYWPPbnge1etdZ03Ta6Ck=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.8.0": { + "jar": "sha256-IKpDS2qTDqZtLmGwDe764J/qPTL5ZA0uDCcTEogOCt0=", + "module": "sha256-FE7s1TZd4+MNe0YibAWAUeOZVbXBieMfpMfP+5nWILo=", + "pom": "sha256-yglaS/iLR0+trOgzLBCXC3nLgBu/XfBHo5Ov4Ql28yE=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-debug/1.7.1": { + "jar": "sha256-UzPLuaF/1FZC8/Bf8SQAbNZ0NUlBPC9To1z5rNEUHpE=", + "module": "sha256-AeRqdLiVP/LovNqfCNdLjBcI6VxaDYcKdIACA288LQA=", + "pom": "sha256-MjPHSkqNioWksCh/aWIKSSMmq9iIfT6AxhzApQTHcls=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-debug/1.8.0": { + "jar": "sha256-Zy1UU0UXCoyrgoeygZRL55DWdUWXK+vdVKor9MhsxT8=", + "module": "sha256-piquUrrd+ncw5Wey6kHzYOoQqbN8FiJDqNIaWnySHGI=", + "pom": "sha256-EZPR60nUsUgNqlrGIBctfcmZFidM2Ra+NpQVLA5vb3w=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-jdk8/1.7.1": { + "jar": "sha256-uW9xRbpptI9JQFNMuOGcfhWcRUQ+J8NoIWJhSLoXEPI=", + "module": "sha256-sJV+aTzxwefUrWJGqm4weV2/S/t1jB5LMv25wkQJuXM=", + "pom": "sha256-x3kWU2lOpaVLnN1HCAgtv7i9apeKX0IYSxFBz7SjDnU=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-jdk8/1.8.0": { + "jar": "sha256-2EGf2zy6quxAfmKrFL5WQ20edrW/MyRMV2VWH8E/0Gs=", + "module": "sha256-HKyxz+5adTBFR1rzCF+4DcnMzjA3VKnVIApB3/W+AOk=", + "pom": "sha256-4ZIahLHW5/k6SUgCfRhUHXWjDi6KZNem5DEAMZVR8r0=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-slf4j/1.7.1": { + "jar": "sha256-+7QMp+VaeAF/6siXGAvmT1YqLreBxqP2ybsv+I2SIj8=", + "module": "sha256-I8EQcq7URvsrZsj57aP4mWbe09mP9bnfCg3LeTwBX/o=", + "pom": "sha256-HEWyu0XLYIIjT06yJj46XBxzQ4Rm6NUlr2gZCxbIklM=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-slf4j/1.8.0": { + "jar": "sha256-t9Trh6u1yDwoItyliI3DXi3X4JL4oBaKvww2gwFpjhs=", + "module": "sha256-gYS3Uh1HsiIXNR6xaUF+0K9mfHFQ61Loo7o6/uk/zWw=", + "pom": "sha256-PBPSiLo3agdLxeH5MSp5hMyYloD6ZXisHuMuhnj06RM=" + }, + "org/jetbrains/kotlinx#kotlinx-html-jvm/0.9.1": { + "jar": "sha256-to85zZrXtG3goOd+f1kI1OdmHz0MhdLZFxVD/NWxVvs=", + "module": "sha256-yic/19Bs3g8yr4MjBwCr2bD1c7mErohHzpDj3F0NE1M=", + "pom": "sha256-CwfOpOggKjkGxUbxfi5akjR2rKhZ01TnnocfKehL0pc=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-bom/1.5.1": { + "pom": "sha256-iLPXUHk1rZMqoao9sVF0NJ12iDoGzCwkthnZm4qwewI=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-core-jvm/1.5.1": { + "jar": "sha256-pAU6NavrWb9wfXlIJFVW/o3DeenP7QiK7AgTTImWBdQ=", + "module": "sha256-9f9aY8GLCdhaN5Lm/tcooq07pyL4GhFxj8QWDflXrEU=", + "pom": "sha256-XQ3dpcR3TtUVQkMzNKluNs8hd5h3eAjCpY1/CLHUKOQ=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-core/1.5.1": { + "module": "sha256-9V/lzh319wlKmo0QNrj3bOdQvImRd0Fg2lZ4TqXlhxs=", + "pom": "sha256-u3XOgDi/QxBDf37XEbn1DFA2/URJyD6PS82RCgvUsxU=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-core/1.5.1/all": { + "jar": "sha256-C5rBEssP4lEwdtw3odxMPFcR0GyqR8cwSlZohT850BI=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-json-jvm/1.5.1": { + "jar": "sha256-b8ELBW4QBpY6uyufw5Pc1OOEJTWLbxYoXo9j00Kf/SE=", + "module": "sha256-/6eWooex6Ya7mse4HBfrqNysMNUiQMM9XlicF1uggPk=", + "pom": "sha256-90mH/1adthY7Yd3GLVXjjn8JFh+ejxXyjbRSGWtzLTI=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-json/1.5.1": { + "module": "sha256-Sc1MAGoAGNtElIjEAO86IlejPn3w/FPCGSzo7RULwj0=", + "pom": "sha256-MYDroHos5F+dV+t2/qZM/jO/mU26eDHEiuo1aZfgldI=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-json/1.5.1/all": { + "jar": "sha256-9/FQf3Nui2ZSCe//t7VWlECFBTsLybno3zDV0jK3ZlY=" + }, + "org/jsoup#jsoup/1.16.1": { + "jar": "sha256-HxFXJlQN33GVjBS8UX6/xJz0gekc2Rew+s6E8BJy6QE=", + "pom": "sha256-bMUH9jBTbyBb3iwbOMPFkHUR3i17GkRL6dY41GFPJDw=" + }, + "org/junit#junit-bom/5.10.0": { + "module": "sha256-6z7mEnYIAQaUqJgFbnQH0RcpYAOrpfXbgB30MLmIf88=", + "pom": "sha256-4AbdiJT5/Ht1/DK7Ev5e2L5lZn1bRU+Z4uC4xbuNMLM=" + }, + "org/junit#junit-bom/5.10.1": { + "module": "sha256-IbCvz//i7LN3D16wCuehn+rulOdx+jkYFzhQ2ueAZ7c=", + "pom": "sha256-IcSwKG9LIAaVd/9LIJeKhcEArIpGtvHIZy+6qzN7w/I=" + }, + "org/mockito#mockito-bom/5.5.0": { + "pom": "sha256-U8DSPp0xhzL7IFrt+rKcB/srOtUMd80ep1InLiCjjqc=" + }, + "org/postgresql#postgresql/42.7.3": { + "jar": "sha256-omRMv7obqhRf9+jI71gqbu16fsTKeS9/BUEivex1Ymg=", + "pom": "sha256-wqy2hFfZlqjkntB3flklW3RlCXZSOVHxAa25QHXhWIU=" + }, + "org/slf4j#slf4j-api/1.7.36": { + "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=", + "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ=" + }, + "org/slf4j#slf4j-api/2.0.12": { + "jar": "sha256-p5UCuKvfvXIoRqJ2kSJqQIhoLW01ZU+bgOKpzKz37Uc=", + "pom": "sha256-Udh5pZmPWCJ0Dc9VIsDtaXGtXEpeowtw9bVGCT5rQmM=" + }, + "org/slf4j#slf4j-bom/2.0.12": { + "pom": "sha256-SH70mE1wFY9Yw3zodmkxukx+VzdYZYhLdWORv9bQDDk=" + }, + "org/slf4j#slf4j-parent/1.7.36": { + "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI=" + }, + "org/slf4j#slf4j-parent/2.0.12": { + "pom": "sha256-fGvEdX5NSZJN3w/sX1zkAvg6bGzz4QUtGVsSgqeFVd4=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "uk/org/webcompere#system-stubs-core/2.1.6": { + "jar": "sha256-3fwxmZiGbCWONnTTsanIfnZ049mwLaofTXUmATywhFM=", + "pom": "sha256-SnIy8ZqLYl1GupI24+3d7Zb2SFUF17QtTSdxQ0hzcic=" + }, + "uk/org/webcompere#system-stubs-parent/2.1.6": { + "pom": "sha256-pWWDCYZXTi4/RKbyKrejtMCNeSczAWTYtyRbjbmZVmQ=" + } + } +} diff --git a/pkgs/by-name/li/libeufin/package.nix b/pkgs/by-name/li/libeufin/package.nix new file mode 100644 index 000000000000..5fc7b75bcf2c --- /dev/null +++ b/pkgs/by-name/li/libeufin/package.nix @@ -0,0 +1,129 @@ +{ + lib, + stdenv, + fetchgit, + python3, + jdk17_headless, + gradle, + makeWrapper, + postgresql, + postgresqlTestHook, +}: +let + customPython = python3.withPackages (p: [ p.setuptools ]); +in +stdenv.mkDerivation (finalAttrs: { + pname = "libeufin"; + version = "0.11.3"; + + src = fetchgit { + url = "https://git.taler.net/libeufin.git/"; + rev = "v${finalAttrs.version}"; + hash = "sha256-6bMYcpxwL1UJXt0AX6R97C0Orwqb7E+TZO2Sz1qode8="; + fetchSubmodules = true; + leaveDotGit = true; # required for correct submodule fetching + # Delete .git folder for reproducibility (otherwise, the hash changes unexpectedly after fetching submodules) + # Save the HEAD short commit hash in a file so it can be retrieved later for versioning. + postFetch = '' + pushd $out + git rev-parse --short HEAD > ./common/src/main/resources/HEAD.txt + rm -rf .git + popd + ''; + }; + + patchPhase = '' + runHook prePatch + + # The .git folder had to be deleted. Read hash from file instead of using the git command. + substituteInPlace build.gradle \ + --replace-fail "commandLine 'git', 'rev-parse', '--short', 'HEAD'" 'commandLine "cat", "$projectDir/common/src/main/resources/HEAD.txt"' + + # Gradle projects provide a .module metadata file as artifact. This artifact is used by gradle + # to download dependencies to the cache when needed, but do not provide the jar for the + # offline installation for our build phase. Since we make an offline Maven repo, we have to + # substitute the gradle deps for their maven counterpart to retrieve the .jar artifacts. + for dir in common bank nexus testbench; do + substituteInPlace $dir/build.gradle \ + --replace-fail ':$ktor_version' '-jvm:$ktor_version' \ + --replace-fail ':$clikt_version' '-jvm:$clikt_version' + done + + runHook postPatch + ''; + + preConfigure = '' + cp build-system/taler-build-scripts/configure ./configure + ''; + + mitmCache = gradle.fetchDeps { + inherit (finalAttrs) pname; + data = ./deps.json; + }; + + # this is required for using mitm-cache on Darwin + __darwinAllowLocalNetworking = true; + + gradleFlags = [ "-Dorg.gradle.java.home=${jdk17_headless}" ]; + gradleBuildTask = [ + "bank:installShadowDist" + "nexus:installShadowDist" + ]; + + nativeBuildInputs = [ + customPython + jdk17_headless + gradle + makeWrapper + ]; + + installPhase = '' + runHook preInstall + + make install-nobuild + + for exe in libeufin-nexus libeufin-bank ; do + wrapProgram $out/bin/$exe \ + --set JAVA_HOME ${jdk17_headless.home} \ + --prefix PATH : $out/bin \ + --prefix PATH : ${lib.makeBinPath [ jdk17_headless ]} \ + + done + + runHook postInstall + ''; + + # Tests need a database to run + nativeCheckInputs = [ + postgresql + postgresqlTestHook + ]; + + env = { + PGUSER = "nixbld"; + PGDATABASE = "libeufincheck"; + postgresqlTestUserOptions = "LOGIN SUPERUSER"; + }; + + gradleCheckTask = [ + "common:test" + "bank:test" + "nexus:test" + "testbench:test" + ]; + + # TODO: tests are currently failing + doCheck = false; + + meta = { + homepage = "https://git.taler.net/libeufin.git/"; + description = "Integration and sandbox testing for FinTech APIs and data formats"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ atemu ]; + mainProgram = "libeufin-bank"; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryBytecode # mitm cache + ]; + }; +})