From 803d2e92b2e015f13564bebcfd080eaf8fe57e13 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Sep 2024 14:38:44 +0000 Subject: [PATCH 01/86] proj: 9.4.1 -> 9.5.0 --- pkgs/development/libraries/proj/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index 615d2590c023..217399deb1c3 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "proj"; - version = "9.4.1"; + version = "9.5.0"; src = fetchFromGitHub { owner = "OSGeo"; repo = "PROJ"; rev = finalAttrs.version; - hash = "sha256-sLlG9NNHST9d0G5hV1tOGpTSv4rbUxERW3kwGC+t1iU="; + hash = "sha256-j7Bvv8F9wxrcQlquRa7Pdj5HTUJhwo8Wc1/JbULkUhM="; }; patches = [ From 494502306d4eb9c264d638bd53b43f6554468802 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Tue, 1 Oct 2024 09:46:34 +0200 Subject: [PATCH 02/86] python3Packages.pyproj: 3.6.1 -> 3.7.0 --- pkgs/development/python-modules/pyproj/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix index 4b3a6fedd030..56cbbf37bc7b 100644 --- a/pkgs/development/python-modules/pyproj/default.nix +++ b/pkgs/development/python-modules/pyproj/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "pyproj"; - version = "3.6.1"; + version = "3.7.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "pyproj4"; repo = "pyproj"; rev = "refs/tags/${version}"; - hash = "sha256-ynAhu89VpvtQJRkIeVyffQHhd+OvWSiZzaI/7nd6fXA="; + hash = "sha256-uCoWmJ0xtbJ/DHts5+9KR6d6p8vmZqDrI4RFjXQn2fM="; }; # force pyproj to use ${proj} @@ -37,12 +37,6 @@ buildPythonPackage rec { proj = proj; projdev = proj.dev; }) - - # fix test failure caused by update of EPSG DB - (fetchpatch { - url = "https://github.com/pyproj4/pyproj/commit/3f7c7e5bcec33d9b2f37ceb03c484ea318dff3ce.patch"; - hash = "sha256-0J8AlInuhFDAYIBJAJ00XbqIanJY/D8xPVwlOapmLDE="; - }) ]; nativeBuildInputs = [ cython ]; From c0f03388ef332178a95b6cb807d37ee6ff9c5694 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Tue, 1 Oct 2024 13:33:41 +0200 Subject: [PATCH 03/86] gdal: disable test failing with proj 9.5 --- pkgs/development/libraries/gdal/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 6bddc8c6b5e5..02d983b9f495 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -98,6 +98,11 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/OSGeo/gdal/commit/40c3212fe4ba93e5176df4cd8ae5e29e06bb6027.patch"; sha256 = "sha256-D55iT6E/YdpSyfN7KUDTh1gdmIDLHXW4VC5d6D9B7ls="; }) + # disable test failing with proj 9.5 + (fetchpatch { + url = "https://github.com/OSGeo/gdal/commit/bb9e5c0ec3e45b0f3e60c4d284e4082550448480.patch"; + hash = "sha256-TpjlxTH/51aRZkogpJuiNlfz3RLCe80wQVD4i+5m+Pw="; + }) ]; nativeBuildInputs = [ From 053473838f47d06c366db4c6aa9f0449b29b53b0 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 14 Oct 2024 01:05:38 +0200 Subject: [PATCH 04/86] webdav: 5.3.0 -> 5.4.0 Diff: https://github.com/hacdias/webdav/compare/v5.3.0...v5.4.0 --- pkgs/servers/webdav/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/webdav/default.nix b/pkgs/servers/webdav/default.nix index c1c72db242dc..44cbe1e1d62e 100644 --- a/pkgs/servers/webdav/default.nix +++ b/pkgs/servers/webdav/default.nix @@ -2,16 +2,16 @@ buildGo123Module rec { pname = "webdav"; - version = "5.3.0"; + version = "5.4.0"; src = fetchFromGitHub { owner = "hacdias"; repo = "webdav"; rev = "v${version}"; - sha256 = "sha256-F7ehl7Q/66ah6/N06U8Ld3bUjuF5tpJlNS/aWEorQaI="; + sha256 = "sha256-fZhzU2Buy/MScJNZeq/bMU5WhYCVVMaOF63SODe/+sQ="; }; - vendorHash = "sha256-FvTDqGr3B05osuJvLj7J04JMeamZc/X6YeLY24ej7Ak="; + vendorHash = "sha256-d8WauJ1i429dr79iHgrbFRZCmx+W6OobSINy8aNGG6w="; meta = with lib; { description = "Simple WebDAV server"; From bd0359397108fa4e5cce3053f7609de0204f4aa7 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Mon, 14 Oct 2024 19:40:29 +0200 Subject: [PATCH 05/86] python3Packages.libarchive-c: apply patch fixing a test with recent `libarchive` versions --- pkgs/development/python-modules/libarchive-c/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/libarchive-c/default.nix b/pkgs/development/python-modules/libarchive-c/default.nix index 5338d892df34..6859fa08574f 100644 --- a/pkgs/development/python-modules/libarchive-c/default.nix +++ b/pkgs/development/python-modules/libarchive-c/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch, libarchive, glibcLocales, mock, @@ -21,6 +22,14 @@ buildPythonPackage rec { sha256 = "sha256-CO9llPIbVTuE74AeohrMAu5ICkuT/MorRlYEEFne6Uk="; }; + patches = [ + (fetchpatch { + name = "fix-tests-with-recent-libarchive.patch"; + url = "https://github.com/Changaco/python-libarchive-c/commit/a56e9402c76c2fb9631651de7bae07b5fbb0b624.patch"; + hash = "sha256-OLwJQurEFAmwZJbQfhkibrR7Rcnc9vpWwBuhKxgmT7g="; + }) + ]; + LC_ALL = "en_US.UTF-8"; postPatch = '' From 105d59fd6a3a62975648f1a68800b7876e75cc95 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 19 Oct 2024 15:16:56 +0200 Subject: [PATCH 06/86] open-watcom-v2: 0-unstable-2024-05-14 -> 0-unstable-2024-10-13 --- pkgs/development/compilers/open-watcom/v2.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/open-watcom/v2.nix b/pkgs/development/compilers/open-watcom/v2.nix index ddd62872d451..8ad74c00ec87 100644 --- a/pkgs/development/compilers/open-watcom/v2.nix +++ b/pkgs/development/compilers/open-watcom/v2.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "${passthru.prettyName}-unwrapped"; # nixpkgs-update: no auto update - version = "0-unstable-2024-05-14"; + version = "0-unstable-2024-10-13"; src = fetchFromGitHub { owner = "open-watcom"; repo = "open-watcom-v2"; - rev = "d3733a7fca1d02ad91b58b377ecb38e1293889db"; - hash = "sha256-gDrmm7hd07lv0KhkP7Bys5qCuCCH+t/XvlftCYlCyI8="; + rev = "f0a6465832643ba08b7f94fb814c552804fb395b"; + hash = "sha256-rT3z0KrkCZ78SbsK2CEHfvJa1TEnRH2kwhzZhi8fZDo="; }; postPatch = '' From 27a3bf032506f24054d422b81673257cae56bccd Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Sat, 19 Oct 2024 17:42:57 +0000 Subject: [PATCH 07/86] keyguard: 1.6.2 -> 1.6.3 --- pkgs/by-name/ke/keyguard/deps.json | 334 +++++++++++++-------------- pkgs/by-name/ke/keyguard/package.nix | 6 +- 2 files changed, 170 insertions(+), 170 deletions(-) diff --git a/pkgs/by-name/ke/keyguard/deps.json b/pkgs/by-name/ke/keyguard/deps.json index e4537313413f..d1b62fc29aae 100644 --- a/pkgs/by-name/ke/keyguard/deps.json +++ b/pkgs/by-name/ke/keyguard/deps.json @@ -1045,8 +1045,8 @@ "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" }, - "org/jetbrains/compose#org.jetbrains.compose.gradle.plugin/1.7.0-rc01": { - "pom": "sha256-DhiM4cMSP5VblKXKW1jG4GXihQT0aApwC+ZdUQfrFGc=" + "org/jetbrains/compose#org.jetbrains.compose.gradle.plugin/1.7.0": { + "pom": "sha256-+aUsGbpqYxZ/gnuysLo8caiIRbUNYy7CFO8j09D+NAE=" }, "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", @@ -1707,13 +1707,13 @@ "module": "sha256-X8dNSe1IImBLtiMbgqZoSnycSi5TAsB5SFbcnqL/4PA=", "pom": "sha256-WjUR8QbYW0UjQSY4346LURnS6EQCbRG1hzpqlenq8xA=" }, - "com/microsoft/signalr#signalr/8.0.8": { - "jar": "sha256-5pQWQ7AtKPuEGNQfsa9FftAZq9NpM2EIjZ/h1hzWXjs=", - "pom": "sha256-9G8bpHX16l3sHtG4mkV8yYGskuVleum0pUx5bwaQNQI=" + "com/microsoft/signalr#signalr/8.0.10": { + "jar": "sha256-mI7x2yzYbu4935tvt6Tj2PH0e6K+lKOYIzteCTpjuF8=", + "pom": "sha256-C+qG0/ymoU3odX9NWp6CVTOj4J+pxATItLJ866v8aKA=" }, - "com/microsoft/signalr/messagepack#signalr-messagepack/8.0.8": { - "jar": "sha256-zlrZy8K6EcgkkfXs3k2BNa4i2qTB3o507ThUakTGKN8=", - "pom": "sha256-BCJCMKiI6uFFcmsd5dHeHmxx0H6Ew2Ol5eKFQuDXPzE=" + "com/microsoft/signalr/messagepack#signalr-messagepack/8.0.10": { + "jar": "sha256-n+Snsmlp783g7D9Pr6WsNzNrYUl8e/zMqebbnhUHV50=", + "pom": "sha256-dRkpAi42IS1Ys6CcI7MND69ltlElqUxOz9Sgw0R8q4E=" }, "com/nulab-inc#zxcvbn/1.9.0": { "jar": "sha256-OO+uurCRROsfTUyf9lDnnfh1qNbEU5wQWweaYGu32zQ=", @@ -2610,267 +2610,267 @@ "jar": "sha256-ew8ZckCCy/y8ZuWr6iubySzwih6hHhkZM+1DgB6zzQU=", "pom": "sha256-yUkPZVEyMo3yz7z990P1P8ORbWwdEENxdabKbjpndxw=" }, - "org/jetbrains/androidx/lifecycle#lifecycle-common/2.8.3-rc01": { + "org/jetbrains/androidx/lifecycle#lifecycle-common/2.8.3": { "jar": "sha256-lzcRGdyeJgTqeMVDMwf/DxRy6IYt19/vXK3ob0IW7co=", - "module": "sha256-s1NkHzy88bsIMGsECZzVXdjLCEbeph/VfHZKPcHPagY=", - "pom": "sha256-aw2RW/tuu1gsmq33twU+W68zvMcwxFr6cCaaz6sv5AA=" + "module": "sha256-5JuLch7lfaXG+S0aivzDvCcuJblDHcJWwSrrawMhurE=", + "pom": "sha256-52FqxzlaU7v36UnOhS7Rr0Bzk5+NwhxY9O/1meAWkMY=" }, - "org/jetbrains/androidx/lifecycle#lifecycle-runtime-compose-desktop/2.8.3-rc01": { + "org/jetbrains/androidx/lifecycle#lifecycle-runtime-compose-desktop/2.8.3": { "jar": "sha256-weUaJG5p4jfofSib4Ivr2NQG/+n/YKEl6PIHLbYRmWY=", - "module": "sha256-jB8h9qz1Duyh0bJEubt8E0XpoL/iZ8lTj9xnRr6DaME=", - "pom": "sha256-oi/mutH7OYytvY5RoJPUu4mvICT4KBo32xWGdpnuS3s=" + "module": "sha256-ftq2glUQ+28CDc0pDS5Z5EZpYM55g9j+0arRwcwlOgU=", + "pom": "sha256-3oQAyt0q08lXhEGdyH+sNu8E2tFIGCQmKtuTB0ksmGk=" }, - "org/jetbrains/androidx/lifecycle#lifecycle-runtime-compose/2.8.3-rc01": { + "org/jetbrains/androidx/lifecycle#lifecycle-runtime-compose/2.8.3": { "jar": "sha256-vKChLI38r39zQPaueEeHVboKrLX9Amzaqu0ETR6i0dM=", - "module": "sha256-4g+/7uNPpLogIgjFh1r+BZsFEWPgPJtC6A/mWSxJzhM=", - "pom": "sha256-AZ0y7f4f6NMsxLBZFWJc+IUdP0CahY08FX9/KsP4Ae0=" + "module": "sha256-G5XG+23rwAEIPjOJRd5yxUe2ZSDxEY5G3XsuarqZhqE=", + "pom": "sha256-6rBzZerUBu/WAlH50jaJfSkFOjnQZ3OvkdjAdMGTBJY=" }, - "org/jetbrains/androidx/lifecycle#lifecycle-runtime/2.8.3-rc01": { + "org/jetbrains/androidx/lifecycle#lifecycle-runtime/2.8.3": { "jar": "sha256-oFTwYuKeqeEbC/wOcjyMMmHxM61wv9e2SYvLVqakFxE=", - "module": "sha256-O45TsaRsz2Ugsf+jF9xRaLgmgFoNCi+wUfmNmlfC+iE=", - "pom": "sha256-RhCbjUL5LbukHLxCbP6XPPFmZ89ljPE8P/8xn/nBAtY=" + "module": "sha256-0GDrglEvHdCEbcJabjvoR5y7uI7XbuW4KOldzTXH6R8=", + "pom": "sha256-afzhSdyS2GswVk4ZAdZDNQWi/9ATIDxEj7FNQUBQJlE=" }, - "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel/2.8.3-rc01": { + "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel/2.8.3": { "jar": "sha256-aFRIUvdm0yJNbF4MfGG4Pg1xUGOvM6JtVu5iaIco37w=", - "module": "sha256-IlPYvswJR77h3Bk5IA7qN9/Vb1rKy1lgUH9MQgzXOG8=", - "pom": "sha256-pMbbdwNPwAzb1D00BkOAlluIFbLR2uuGgHo/Om9B6n8=" + "module": "sha256-C97hP9XDeEeYwpHraD2vz6sWQEA0nn6t2SOLo9XTKIE=", + "pom": "sha256-+LCPTAjUufxBcNjR+aIDEpGk0K9yzodSLPwsl5LMANo=" }, - "org/jetbrains/compose#compose-gradle-plugin/1.7.0-rc01": { - "jar": "sha256-bvxr0H9YF4MAEnxcv0COfkn//9WrDwSjRvIP7bfiNJs=", - "module": "sha256-ED6ebSTwIXal5ECkHea+Yst5Sa8ZRMJZMxnNLWW3PoM=", - "pom": "sha256-DNBQFbYoWKmAMKbcvoE29PNr9SiJKt1Qj5lg9yIg+DQ=" + "org/jetbrains/compose#compose-gradle-plugin/1.7.0": { + "jar": "sha256-F7ch4W8bXBAaduFvbz0rw//+rit5zD759BhW7Y7B85I=", + "module": "sha256-BgNU2R7hwMVPCgs8GjzutD7Uv8qjm7O9JgbbhYaragg=", + "pom": "sha256-o+Zmvd7k+urvSEO7TZET2yxjKpeX3TjuHUYa8lk1H2g=" }, - "org/jetbrains/compose#gradle-plugin-internal-jdk-version-probe/1.7.0-rc01": { - "jar": "sha256-hwY7ymKmu3QYPx6lTUquicbq85uNmRXWhbP13KQ9w8M=", - "module": "sha256-UIF0Jv7rrPUqYtOiABDiBgNcHxtWnv6dyddm7JuLcxI=", - "pom": "sha256-mVJyA8/us/F3Ducx+Mt/7Lghu3vvTuGQJHNokw6QPI4=" + "org/jetbrains/compose#gradle-plugin-internal-jdk-version-probe/1.7.0": { + "jar": "sha256-IV3fOk357eYF4cgjSA6zkOZK47RCh9MGyYvUD/iaYuQ=", + "module": "sha256-j86qapHAzzYaZkd/j1+SVfEMbglErzABHeJYSuoohz4=", + "pom": "sha256-JuhmPnnXa/BIj8w/JeFK/poQlJlAPu4vKrlvu+z0WnM=" }, - "org/jetbrains/compose#org.jetbrains.compose.gradle.plugin/1.7.0-rc01": { - "pom": "sha256-yH0dLbJbKFf7k8/J3UlEjiinHuVcBQF66r7e/l4Sz0Q=" + "org/jetbrains/compose#org.jetbrains.compose.gradle.plugin/1.7.0": { + "pom": "sha256-9vpXaz9lXUXmgnqrC0sOaMOXr4hr/axkcd9jacqecu8=" }, - "org/jetbrains/compose/animation#animation-core-desktop/1.7.0-rc01": { + "org/jetbrains/compose/animation#animation-core-desktop/1.7.0": { "jar": "sha256-SbWk6POl6EcCRQMlwBdWiNVcShKXPPwaGjbmTxj9+NU=", - "module": "sha256-RYbeapNWeBBUb4zo4ffgAwPyc3CFBYPWoI6izwiTAoo=", - "pom": "sha256-XJi0WxWJ4gYJiTJwXexx4NqqN4SqrrAvKPTEN6lt8+k=" + "module": "sha256-dUjThL4ILmK3T835lfj78lJcrMtGEU17H/zkIAO5Glw=", + "pom": "sha256-up2FWwjkrEa8OaiVih2ummFqQwTiyoVwiVsileelCAU=" }, - "org/jetbrains/compose/animation#animation-core/1.7.0-rc01": { + "org/jetbrains/compose/animation#animation-core/1.7.0": { "jar": "sha256-ln8031R8dRUQ4aeez1B/KpkP4soFTJ7IVhEI1rzvS58=", - "module": "sha256-vp3LogRf1hTHeaQiYiIMTJWHxTD/HRHlsX2DIUch9xk=", - "pom": "sha256-Q6JVlvPmaASXAHUBsXTNL26sXi3Hd5Dn5fZvUXD/8D0=" + "module": "sha256-NP5zUz8vp9by6JeWNiLDdvWYLrpGkvW+1zNK1K+HcQc=", + "pom": "sha256-0PJC/klRLsOP3UEzWbLdy9PIQ/+LMKhV8zO9Op+wPLQ=" }, - "org/jetbrains/compose/animation#animation-desktop/1.7.0-rc01": { + "org/jetbrains/compose/animation#animation-desktop/1.7.0": { "jar": "sha256-XkDy/HvIy0IkPPp9c8YxoXs9mHSvaIQa0+93j3BmO+M=", - "module": "sha256-PJNWJ1GJcHceBH3Th2cb85ARdiv14BUDBiaveSXUPkA=", - "pom": "sha256-o3tmzL73XZYymilLLN8iulU8tDWh31wPnUnai9+x/mg=" + "module": "sha256-vkvwxfvDqIynp6tHVOhCk07URUlh8m3S+0mqF7ZhnrI=", + "pom": "sha256-FSFz0u3LvcFx4sZkYuXqlT7IkwpykPyQF5cUHoXFiTA=" }, - "org/jetbrains/compose/animation#animation/1.7.0-rc01": { + "org/jetbrains/compose/animation#animation/1.7.0": { "jar": "sha256-uyegrYK2UqtzRMhFUDi2HKwUwx6CFovdgfz59apL3tI=", - "module": "sha256-nnUikVPJFi7KhzbL/sOhEJWG+7NcSppCTnly9KwmlBo=", - "pom": "sha256-F5uPmPkeUR0E8F/7KdNn/rYHEELgkXjKEw5gls0SoSA=" + "module": "sha256-kTPWeIulfh1cAk09qH+euuIvoatcwIsDD5HS4uFZdmE=", + "pom": "sha256-L//BVM1KS/txnyNExZYS7x+gCdi1DKcTfJqLGFyiru4=" }, - "org/jetbrains/compose/annotation-internal#annotation/1.7.0-rc01": { + "org/jetbrains/compose/annotation-internal#annotation/1.7.0": { "jar": "sha256-sqg9fABDcJ5TdcAeILKOvuRG87gq7EiLa6zvMFOW02E=", - "module": "sha256-IiVtV1K8/YyU8Qelizb6u6jhvjhzzstaZaPCI2Tvims=", - "pom": "sha256-Ta9/eHj/I3dZMq4sZbjFBiIcjR4p6dczxDKDczQl/r0=" + "module": "sha256-qUleTa2IlUVTYZnS6T7DUvZZkwUKVPdPRiMv2f3ymKs=", + "pom": "sha256-0oFVMe34ol4GEsYsuwZ5PTHekRdAyi8R3Lzgl6n1WYQ=" }, - "org/jetbrains/compose/collection-internal#collection/1.7.0-rc01": { + "org/jetbrains/compose/collection-internal#collection/1.7.0": { "jar": "sha256-4+BM9dHyfZujbGhkg11TUcY3ONPQL2FXmd28XB0L/AM=", - "module": "sha256-jpPZCcGPNIZ9n9L65s9IQIuDI8MVtD6gsMXANjTk5ac=", - "pom": "sha256-5u7v4NewO9uDYDhkP2QwoBuTZBkoAA1RcuIGr1kU6bA=" + "module": "sha256-PS/V3z5VZdnA4cA8XdIjYizyiRVXIIYjJKME1SL3gEc=", + "pom": "sha256-YSpPsvay2ouT3ew6D21esxF2NhE+/aOt3/tV1iUJnv8=" }, - "org/jetbrains/compose/components#components-resources-android/1.7.0-rc01": { - "module": "sha256-EQ2buHW+eOfn0WBDwEdcttYDOdMml0c3vl6sx38y4/o=", - "pom": "sha256-c4OoehM2u1yLejJIP9zVELqS5jq8u9SW3yh/GDkyJH8=" + "org/jetbrains/compose/components#components-resources-android/1.7.0": { + "module": "sha256-1w7u1mCwPnCWFQwj6EPdZXWby7w2EwD0/ooyhT6CcSQ=", + "pom": "sha256-pIG3PAFB7EJjfzbXyesFyrJSUR6mhEFafpm7Oo7QTbM=" }, - "org/jetbrains/compose/components#components-resources-desktop/1.7.0-rc01": { + "org/jetbrains/compose/components#components-resources-desktop/1.7.0": { "jar": "sha256-FYS3Oejxhp5PNAUZ3JhNSkRYKoDvMj5lWZndsY3ZVMI=", - "module": "sha256-vqnjWi83+RW2BNJUanZwcNbq7Uf3ttIyhsQWKuz0jXw=", - "pom": "sha256-3jPhAW6Rn/sihFLkYVCrBjHU9EuUlrLEFALhYGrp5m8=" + "module": "sha256-EzcdzRsTOPruGm88RmUXgHfMpKQV4tI0dkmDqKzJkxg=", + "pom": "sha256-vUT3nsuxa8W9OQmbXGsMZ80C0aa+UJFDhBeUxWIxXRM=" }, - "org/jetbrains/compose/components#components-resources/1.7.0-rc01": { + "org/jetbrains/compose/components#components-resources/1.7.0": { "jar": "sha256-ArSt70Ju6JvXt9YaMmO09jW/eDbEjMuvJo25Ay+OAdI=", - "module": "sha256-cbuIM07Qg6ipU5WkFIuhe7qsNpMEWuYnpuEYRJzpoBA=", - "pom": "sha256-ThIGyeMgztgz2PeJoWcddYuD0kcj04UfUC4C+b/N/tc=" + "module": "sha256-SwnDQyZRdrenG7ChlMQpwhfOxF+Ncy9oZLtVuiJlJ8Q=", + "pom": "sha256-k40+o5fKQkmfjPSMySntJf2Zwp4E3tgWiT6ct8yN46w=" }, - "org/jetbrains/compose/desktop#desktop-jvm-linux-x64/1.7.0-rc01": { - "pom": "sha256-oeRfB7rF+Y34Cm6WYQpYZQOEJHRLg/ke13S2hCOZkIk=" + "org/jetbrains/compose/desktop#desktop-jvm-linux-x64/1.7.0": { + "pom": "sha256-2/9VPqXxybksnQwdoeEr983HeciyDY+m/CotdzXJpnY=" }, - "org/jetbrains/compose/desktop#desktop-jvm/1.7.0-rc01": { + "org/jetbrains/compose/desktop#desktop-jvm/1.7.0": { "jar": "sha256-YsgWBzGVzAEZ3B1msXhUS9t3Lvi+5IeZVFKMZ5ixfr4=", - "module": "sha256-CqUZiGcmcUdTPbrHXg68EZXDG3ERbEWeSo7yqVqgb1Q=", - "pom": "sha256-kYpR7OweckYnsGA2rHE6bnGpSLaUrY/jnIZkZUefn/w=" + "module": "sha256-Fl1IccnE3fepQGDfGDhdfsuzzefe543VqcfoC50GzZY=", + "pom": "sha256-Yh0NwEq1O74WPK6jTcSTGtMLjdSGLaJiqcacwBwnRPI=" }, - "org/jetbrains/compose/desktop#desktop/1.7.0-rc01": { - "module": "sha256-T+nDnbGj/OtkSyr78WPdVrfNHSGk4tY8ZjPPZI71Db4=", - "pom": "sha256-lqgkWE0NhMRi4FzAe5LJkuwNmAAkMonblgm+wBnlemI=" + "org/jetbrains/compose/desktop#desktop/1.7.0": { + "module": "sha256-MoK+qppv1rF8cjwisP+buHTi+Pvyu6B05D06P0FA8zc=", + "pom": "sha256-DidG/5FAzfY6or6Fzp40ciEZpGqfjaxzmrfmd++PRB8=" }, - "org/jetbrains/compose/foundation#foundation-desktop/1.7.0-rc01": { + "org/jetbrains/compose/foundation#foundation-desktop/1.7.0": { "jar": "sha256-nHUjEw15XuzenL87rqBNMOVnzRG3nnPT2ozgMdiyVug=", - "module": "sha256-LSNstwbX4aMzmBiC86z5YU6lqzxRXS4Ue+rViF4AGNk=", - "pom": "sha256-kbOPkdy5tLAroxFOja4HkmJLqovlvmj7C+sP4FN6ab0=" + "module": "sha256-KAvYX2tc6qK0ZjsNCQW+BBBuene86+Levy9YUOyhXaM=", + "pom": "sha256-eIJ76xavjp63Q9mdsGwvNFdPchxM5wiZZk+1gqFJfgI=" }, - "org/jetbrains/compose/foundation#foundation-layout-desktop/1.7.0-rc01": { + "org/jetbrains/compose/foundation#foundation-layout-desktop/1.7.0": { "jar": "sha256-0shnwT/2Yy+YgOZ9q6sukwAHsAi5silQ/CzAdQCOzrY=", - "module": "sha256-ArK7GVO7OP7fULNoQZv7o1gYaBed7qRZ9ElQ2QuDYv0=", - "pom": "sha256-soxkTIbRU5XYGXNdRLXJ9R4UOetqHtVua0mw7OPYcC4=" + "module": "sha256-+L/EbEm87ysEcgDQVrb1+ypMxnK75yq6xEdgxw+ITHc=", + "pom": "sha256-5LnUN0tJ2iugyII9LxZT52zNwrNgMvgBlIO2GDwGQFo=" }, - "org/jetbrains/compose/foundation#foundation-layout/1.7.0-rc01": { + "org/jetbrains/compose/foundation#foundation-layout/1.7.0": { "jar": "sha256-QrUOJHLNXuGTKbS+FTDOc3/YT5S23mOKiXJypeK9Quk=", - "module": "sha256-4W/xyoXEZLss3kaRRGxJptukpkUWhqDXiY8fOdN0tD0=", - "pom": "sha256-n/KPOk6um1kIjeLiagUSWt8FSjUOpN2I5wD87DOT7Ws=" + "module": "sha256-v5mKtVotRpq9vDtM/FsjC6cXO6XX683caFiIHTlv9X4=", + "pom": "sha256-01z1/2PMSisctkVO8XxyOqvUdmZbiiNU4eK8vHuqCYI=" }, - "org/jetbrains/compose/foundation#foundation/1.7.0-rc01": { + "org/jetbrains/compose/foundation#foundation/1.7.0": { "jar": "sha256-ELOhv9YPC28MgEeiN9M1YMvx/AIeCU1z8GxPPyhldCQ=", - "module": "sha256-On4CXwkWuAsUzqUQ9KGT1/AuH1qCsVL9nAYeXjZfHXk=", - "pom": "sha256-eebzRpd/b9orQCZ3A2VwvERZGzAMrpC9Yd3W1tDdyOY=" + "module": "sha256-dBAoLbTrKC401OCdYUGEXmnYMzyZz53EK7Zdcy6oK+g=", + "pom": "sha256-TZE4B6HjVXgvg7UKR8pfJRMSJh9sTmXO2dXlLuXPEKg=" }, - "org/jetbrains/compose/material#material-desktop/1.7.0-rc01": { + "org/jetbrains/compose/material#material-desktop/1.7.0": { "jar": "sha256-JCX2UAVWD2XtcyGy+CCQeeTFMIWv/INj6G6CNilE9EI=", - "module": "sha256-jU2kUQbZwzchFz/eWkDBAKGohgLUmEOldYIIkgyODEI=", - "pom": "sha256-iWncacdjxR76YmYWwdldLFR4ZK8ULcR6X8SG3A8HUcM=" + "module": "sha256-z0mlF+Gh3u9XPp2oDp8pAfqGAPFCaUcWgt8UCL3QeM4=", + "pom": "sha256-CzPMG/qial+9yYnPjOqH9FyYEg2GxQzd2sylEy6tl98=" }, - "org/jetbrains/compose/material#material-icons-core-desktop/1.7.0-rc01": { + "org/jetbrains/compose/material#material-icons-core-desktop/1.7.0": { "jar": "sha256-vPbIU7bbL/FI0tOq07en6lTZP8e0Lgr9hA622vGhxoE=", - "module": "sha256-yAV+ZSYDvUMajK4Lva6v/pi3mYWezeTrz6rWmD9TKMY=", - "pom": "sha256-A6sRbuVGTxfrOp9Ccxb1h0H+QuHOMZQ3/zCpZQIq6d0=" + "module": "sha256-JnGO9Uo/fB6pwaxLXsH/oGqsnhpv8/F7L5pbNmdtg14=", + "pom": "sha256-ngyYssNFfv3xRGpgILVsROKKdX7gXMFszf0P0d8kG6w=" }, - "org/jetbrains/compose/material#material-icons-core/1.7.0-rc01": { + "org/jetbrains/compose/material#material-icons-core/1.7.0": { "jar": "sha256-3loMJ34VmMEh0sRgbMA73/69BZ4ys0lN37hMCNUdpwE=", - "module": "sha256-oGYnQ0OpNDaCC4vsc0DC7cBMtek21Th/3cmg0cxMv+I=", - "pom": "sha256-u0eiA3nxX+jrStlHCyD03RykYQ23Kq8jaZdoIqA6cpI=" + "module": "sha256-rMLAqyILaqDk4sIEqZBy6xDmMQBHKP4iOHJmDBSmEmQ=", + "pom": "sha256-C+Mv5zjA4Zh1w3VbFwTR/MtVGEda0EjvwhgE4Or3J/M=" }, - "org/jetbrains/compose/material#material-icons-extended-desktop/1.7.0-rc01": { + "org/jetbrains/compose/material#material-icons-extended-desktop/1.7.0": { "jar": "sha256-3FXTg9yoJ541ORflxak9GSqV58pPkm7lXuC0Yn+Z2GA=", - "module": "sha256-fJUkFx1HLSEYZqpx1J4CDEJiFQO2qp+O8IDUyoorsHA=", - "pom": "sha256-vQWIz5QZmd2pxW99KdhWMRVZfFKcyFdWi/sWaH8XqmE=" + "module": "sha256-PCQq3pH6pwW5STITE/wOR1zWPDnfwQpSM4icS/IbIco=", + "pom": "sha256-Cb230io3hD8ya1SVbY9yV4rNG76qgcODLXZ7V0Y7R7Y=" }, - "org/jetbrains/compose/material#material-icons-extended/1.7.0-rc01": { + "org/jetbrains/compose/material#material-icons-extended/1.7.0": { "jar": "sha256-nnUXmWRicyD/GxtzAmklR01GX+t6idYpX40vZNxNQ6Y=", - "module": "sha256-kyKTZ4AVNk+C9/eMii+GFdkrFRqKdUG/6yCtaggKkhM=", - "pom": "sha256-NsT2Q6Ixc0xUuzCwvUj16lUZpq/KyRheLr0hj2160yU=" + "module": "sha256-t/96BSTuY06QLWhcDik95fvfT/cpwa+zAebWcdcV3V4=", + "pom": "sha256-pp8HAfEwGjtwKeIuvWsIeyrsai53MCVuy6DC6KeAy9E=" }, - "org/jetbrains/compose/material#material-ripple-desktop/1.7.0-rc01": { + "org/jetbrains/compose/material#material-ripple-desktop/1.7.0": { "jar": "sha256-xfa9+yKaF5SoOO0fMfcpmjtRYAS+/+GovMp1OqJovgk=", - "module": "sha256-CvZsjtNuO5pQNguAu8UwMXB2CcAJcmCWExA+Gjom7vs=", - "pom": "sha256-Vvnsc/psxp8lXdrjdBEu/pbdmrgGuQaxMxrtxGDaxbo=" + "module": "sha256-B7kC5jjctznI+4cth4H32ggofar8YFtqQzjeCb9x2fI=", + "pom": "sha256-vSRBYXCH26PSjg6Q7r6hxafI/Ihzq4HfgC7fA1/blag=" }, - "org/jetbrains/compose/material#material-ripple/1.7.0-rc01": { + "org/jetbrains/compose/material#material-ripple/1.7.0": { "jar": "sha256-k4lak+wU/hmING03mgx3S3qk0usrFPIKfTp2vVDkgbg=", - "module": "sha256-nc5BoF//ShcXCzLrFDUq4R7gEukvlIBcs4fwdgIMSf8=", - "pom": "sha256-Ep+lXHsomu7XWTbS5Z9OXfga+ojGTo/BUzeiSZJc2Rk=" + "module": "sha256-3+f+laqzsdT/a4UqAVYeW7cAHnYI2A82bBGKLwf4VcA=", + "pom": "sha256-2fXtFA8I/nzleLHGPpsbDmiQY96bsiXzd3lqSRivPVg=" }, - "org/jetbrains/compose/material#material/1.7.0-rc01": { + "org/jetbrains/compose/material#material/1.7.0": { "jar": "sha256-lp++L0SKCBxkQOiNKP8Kn8aTEYd8+FhTxfntc7jTUhs=", - "module": "sha256-u7DqOnaUTH9VWOWyLlHcBYth//4OH8Cs9cd+xFRfhuo=", - "pom": "sha256-okxn6wenYZfuCpNG7WhNzkKznsZg2TkMSpVCYfEw+5U=" + "module": "sha256-YPeQ2HDp+mhWiW756079/xM3wg0A+eyxGMKO2I3bQA8=", + "pom": "sha256-/PuHxleHr+0Z+kRiPX49FTKDsHPLpRXojeVR96G7wIs=" }, - "org/jetbrains/compose/material3#material3-desktop/1.7.0-rc01": { + "org/jetbrains/compose/material3#material3-desktop/1.7.0": { "jar": "sha256-k+/2Ln8fmEHoqoGS6JJwO+th/QtiUBG7xbtBcIKkUSU=", - "module": "sha256-Sg/XXF1WOlaanyEMe4Q8AXPqq+Z5GSbKFlfJOtGwrlM=", - "pom": "sha256-RGUG3Xfa7woLZm1YLErWxp+OwFsHcMOq9RRruiDOtoo=" + "module": "sha256-HAWjsEfXmxXlL2sLPaxRjdx48PZh3Aay8BHoLGXN9q0=", + "pom": "sha256-PPKkVpDzATxXojGcHZ5cpRIQmPOSDABr7J9Ths6389s=" }, - "org/jetbrains/compose/material3#material3/1.7.0-rc01": { + "org/jetbrains/compose/material3#material3/1.7.0": { "jar": "sha256-Mk531GpPg+IzZBT0AfjwWss9wXAItC36HqwAmSyFI5M=", - "module": "sha256-PrvGvAuFAoFuOD/xI8FxBZeNd9oPhOU6qo+OKkKCc7Q=", - "pom": "sha256-Gk2DiWXlGt3ahDiOvDcHMXKJaDxj+XQuc4sPz4MUxUs=" + "module": "sha256-lRdR4h5adj2J3tqHe2uwVH2xCn2d/CI8fxJI5x67y0Y=", + "pom": "sha256-U5TAiRfK3SgZ5LjvSVM9JXZgATW8PLtRF4qHxJ0s8Io=" }, - "org/jetbrains/compose/runtime#runtime-desktop/1.7.0-rc01": { + "org/jetbrains/compose/runtime#runtime-desktop/1.7.0": { "jar": "sha256-duMlBUe5yjyxpJwnKTOyXLO8y8m6Endd1hYaY9mqfPE=", - "module": "sha256-1+RmZ/vY8kGpYVcYN+EPkhOWTa/b7sjykyJQbMzehtc=", - "pom": "sha256-y9CfKxQp8BKN5ANhqD9UVLFi9IDGxfyebCfY99XCthQ=" + "module": "sha256-ZiqUSgPejSp9CbfiWeWtnsuwtXVLlTT96Bmu8JMtyqE=", + "pom": "sha256-7Uf+L55XEcEsa80nuhngjnRo4YwEtsKzJvvu39O/5/c=" }, - "org/jetbrains/compose/runtime#runtime-saveable-desktop/1.7.0-rc01": { + "org/jetbrains/compose/runtime#runtime-saveable-desktop/1.7.0": { "jar": "sha256-QwY2O+kOqr50uQDbTDLtHxXHVI5bMKcJPE7kDENrm4w=", - "module": "sha256-cr/7j+sIlkzTVjFqx50Dd6z9VAcJqyzl8OCbi2rsm9o=", - "pom": "sha256-vWVnP8T2lDeM80XTHPxKbBwntpJH+kWaF253Cg5lMAo=" + "module": "sha256-i+IsKSWAu1xT1OvKUmSgp1wyhuHnHjfiu9K7BjOFMyc=", + "pom": "sha256-kUeE0ejiOF053MYSE2t28DGUVJCt8RH74f3A63JPO8o=" }, - "org/jetbrains/compose/runtime#runtime-saveable/1.7.0-rc01": { + "org/jetbrains/compose/runtime#runtime-saveable/1.7.0": { "jar": "sha256-mDxRgBZ4q5xRf0n5h1ld/VLveJaN5tqE5veXYqVWtn4=", - "module": "sha256-WDzBZ1wzQNiNP6MSkvFevhLhuIrzrSgV7t1id4saMc8=", - "pom": "sha256-Wx/s4MuYYCuQfbpJc3CVxXUTLC8UsEtRb/3BW3yFyT0=" + "module": "sha256-830dEuwBLS/VOcZ+iu+6NxIfRnYoUGS30ZEcbLRGdbI=", + "pom": "sha256-MPe7+pWMvZEZSt9vYnx1K5tssUAzRJIk+KLKnryZXF4=" }, - "org/jetbrains/compose/runtime#runtime/1.7.0-rc01": { + "org/jetbrains/compose/runtime#runtime/1.7.0": { "jar": "sha256-XITDuxwbY2rjYDCg+Y1GKa+inhkqnHj1fyLOLI/2vJY=", - "module": "sha256-dyFNkMwOWKAxAgouIj2pGxtkKdOeM4uE64DAtg9tSVs=", - "pom": "sha256-V2Zsw9hnmsfZ8uQFye8XEc9VzzzBg7zaiCTfg/H0//Y=" + "module": "sha256-zUi/uatY5vDly8/o5Axn4ntnd2zbmWjN4IWnlhPFWe4=", + "pom": "sha256-tX39Qom2JiHOJHc4nx+BVWewBJxOmIGD9MgkO2XUTjo=" }, - "org/jetbrains/compose/ui#ui-desktop/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui-desktop/1.7.0": { "jar": "sha256-suyv6mByBEYkxLZt4B1Ikf2cgLJohbA87QNszOrMDic=", - "module": "sha256-v/ZSTdddb6iuLLz8XH/GInpsNwGW6DKf7JkerXQGATI=", - "pom": "sha256-snL9R2+VvGpehXDX7e4bE8Dz9D2BTY/LvQrb06IQaX0=" + "module": "sha256-TV6orRcBQeQUghzsZ0xUR+gBIkSnj+OF61Aa36KxTHA=", + "pom": "sha256-gNOSOqqiGJwOKWqL0auC+sazT3ZusrFp7zT7VRVzVTE=" }, - "org/jetbrains/compose/ui#ui-geometry-desktop/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui-geometry-desktop/1.7.0": { "jar": "sha256-S4bJYcC0vOeZUyn9V9Qznt4Ry3XX7JC8G5kTOWrdsw8=", - "module": "sha256-1pRVpNXjdJVGFbF1XYr8EhmErhndiUgMlp3M42y2Ghg=", - "pom": "sha256-qk/nLiiYYqNX1MilAyc01SoZWDR6ggI5EE5JiJvJ+2M=" + "module": "sha256-bNyw2SFZYEUO3WyuUWFI7MwiRqO2CFNiomCBbSJJWzk=", + "pom": "sha256-fsSL7vLrhj/TFEfA5slWtNmnq3vGdOA3Mw9oBQtZRz8=" }, - "org/jetbrains/compose/ui#ui-geometry/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui-geometry/1.7.0": { "jar": "sha256-UPK8AERD9Pnvdfc4MOel6O8PB+VM9cR4p6q5xUAiVbM=", - "module": "sha256-274k9tBmxfeK+Z3+06wmnZuEbo2q56srCAU35q9h+j0=", - "pom": "sha256-hY6EBF7fboMxaEuUWXMt/nhgTwgdebwfATMoeoiykXc=" + "module": "sha256-FMOoC5/cUWvQMDAASGT7twMe/WVHYqtkF20LBj+cqUw=", + "pom": "sha256-QZsfystvNZCc+3voBwlNVjSQVri3Y9fN7W53EFGJ2NE=" }, - "org/jetbrains/compose/ui#ui-graphics-desktop/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui-graphics-desktop/1.7.0": { "jar": "sha256-T7cOhyevDG4NRNj0v/ZduTQqlceZahgImP7XFxZ4fbg=", - "module": "sha256-FhhaeZVW5gWEEQdiLHs6vhLrk9GYv95/fCyQMxD+j5M=", - "pom": "sha256-/vboXilQor+eGL+TYv2FrePxDn3CB1/1z6bWph5GMZA=" + "module": "sha256-iWWfOKlCpyNVehbNgtn4ctWFAiAblV8x3pWfTQeiau0=", + "pom": "sha256-f6b2IRLSDeHL3q7VDpCR78eb+BmB6RAWuZmIVs6VtKw=" }, - "org/jetbrains/compose/ui#ui-graphics/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui-graphics/1.7.0": { "jar": "sha256-2KtnsO/p8bbsBSup42sNgqKKA7CYedT8C+g7ntNdenw=", - "module": "sha256-vzleESVEpZLbbxYC06+q/Zt776Tv83vsq1G6RwfCu40=", - "pom": "sha256-a9pT7eJznGrFZu+S1lFFjGyQpP560CliKPhjW40l2w4=" + "module": "sha256-NSg3gfVnVU8VJmAJFFYA09nVwW762HNFjwNV9MAmnAs=", + "pom": "sha256-4cNg3cpYhZFuZ/VvCvA/s++/ZQDxVXq+h3+5C78QHKk=" }, - "org/jetbrains/compose/ui#ui-text-desktop/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui-text-desktop/1.7.0": { "jar": "sha256-gOB+TKc597YSL2PpoX5oU7lHIg7LEYD43K9BnQ5GiZY=", - "module": "sha256-YlJfMGOUP0GZ8CsD2DXBSMQaU7u6KdjmSnfkM307Byc=", - "pom": "sha256-VkQNuzYlcgr3He0kYg1xAjp306sFr0nKCHuaGctCrzc=" + "module": "sha256-9PZVvGr1y4ru+J2OiL61CRJzlbVkuRgVp80Z0/2zfQk=", + "pom": "sha256-rb2Ei969/SWsriJ297EtIza/QGdarCnDzTZIHqIA7eQ=" }, - "org/jetbrains/compose/ui#ui-text/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui-text/1.7.0": { "jar": "sha256-j/miuMk7AofY+oN9WwkXkjFoy5feoa2hqNSqe7F8nxU=", - "module": "sha256-J8hk90eS75BmAVO+HSpnY3opns5AyCqFl1WZb3LyUYE=", - "pom": "sha256-+OK7AD0uDDfEVLsyLoIUyfXOskBcRWcwFVQPDlhy6Xo=" + "module": "sha256-ImJh7g6SCP5Igat+pR2e5vbz1RnBWx1rFUJb98FtWTo=", + "pom": "sha256-JNbJDk5Hb1IDxkD2sxZl7BiwIPAfLxZNz3dnVa1wYhM=" }, - "org/jetbrains/compose/ui#ui-tooling-preview-desktop/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui-tooling-preview-desktop/1.7.0": { "jar": "sha256-xc+tCxJel42RX4tMOGMLxdVI5Z/ooOg4wMyEKDxgWUM=", - "module": "sha256-3stx7FZXMW21YmrSgZwqUUmu68t6B3pCax1Ea2ZrWd4=", - "pom": "sha256-ZZg7EuCBIJOqpn0V4apd15UxagBIpBXLQu9d37w4Yb4=" + "module": "sha256-v5EB4n48dWgCKkjaGOF7LdiIe4LN6dHQMjFummDH948=", + "pom": "sha256-lKYRZropAXUomq3Xtu5RSZ3l/gO/xuSCCeD9tagfHm0=" }, - "org/jetbrains/compose/ui#ui-tooling-preview/1.7.0-rc01": { - "module": "sha256-rU2dfmzOklGPa+78Q00OV72CbkP82cTr9esy0dFLRR0=", - "pom": "sha256-jlVF/i8dHW7MiMqmZGwTfcWb0Ug7Xl80SIEmU8Kxblg=" + "org/jetbrains/compose/ui#ui-tooling-preview/1.7.0": { + "module": "sha256-vxGYhRsMn71B1NrnhLB9W8GJ10mpeeeTPZlJ7pRDca8=", + "pom": "sha256-InPHq9mcpAqDjqEBFrZh3ETnMHv97VkeJj0UMWnvUi4=" }, - "org/jetbrains/compose/ui#ui-uikit/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui-uikit/1.7.0": { "jar": "sha256-GhOzmt860nZ/ln92S6Cg0u0qLQnu8xDyLSwDBNe9pss=", - "module": "sha256-CoF+c2gCKMmt4blbqqwuFb5PtHHldun/Sh5U4OK4D2Q=", - "pom": "sha256-n3fVs6X93gCO0Y4LrJHxtWoXa1d0oWdSY9VvnW85uSE=" + "module": "sha256-VxLoIbC5bdlwAcQY7Kn//A6kabpF7ng7uJfRgBiPPyA=", + "pom": "sha256-Nreuwus6pSUI+00PJFLFTWhQUzCBQt4/VuQxeC/eXAM=" }, - "org/jetbrains/compose/ui#ui-unit-desktop/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui-unit-desktop/1.7.0": { "jar": "sha256-WYtS4lftZ0FFaUuXkKc4OpD+0uxxVLoJrOSqmDxlsaI=", - "module": "sha256-SMkO45UYCnBQUkPZXBF00RBd7aMu0LdvAYH6JSpP46s=", - "pom": "sha256-ZnvHUoW6szo4GP1SdDxEOlSRYaUzKp6FCHX1MGoLcqI=" + "module": "sha256-OcvNe7cG50of60dPMyN3Yp2++MXhOXEu4UmbaPigL0Y=", + "pom": "sha256-H2Xl5/BcnA16opnEaxRn6hCZfWGjzxlpSisxMv9xQKo=" }, - "org/jetbrains/compose/ui#ui-unit/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui-unit/1.7.0": { "jar": "sha256-QdpdYcVod7W10B4qK8uWfL+vTUXBoaoSTAYBx6PedOc=", - "module": "sha256-r21Xb5itOKii83kpdZVfcMp7TDwUIxL8CYGFI/qwyqM=", - "pom": "sha256-ufLkqP7L2gzGW3zT87uoOuiRFSLFZxRjEz+R54GDskc=" + "module": "sha256-gHp2IZXLdkSswLTc4hNI7S/d1BY/Sj0BqcTtHPyPdpo=", + "pom": "sha256-kHISejq/Lk2t0bxv/2fur35nvk1i7MqZmxF71+ciOaM=" }, - "org/jetbrains/compose/ui#ui-util-desktop/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui-util-desktop/1.7.0": { "jar": "sha256-Fh3Mc7kp2mHO5QBF6W+wLxYzw28You84tcLETDhga1I=", - "module": "sha256-ISnvDx+9M55KCFLZZoXtIRPT6svC7N2O8cSa6IMTeUU=", - "pom": "sha256-FQFMK1TjTPCEqOHTFQHkXaDV6IsYuPTRi7XHkHub49s=" + "module": "sha256-cbDYKrQiAZ/AbpsSDyTqmSTFm8D1tc6W/iDUye8Zdmg=", + "pom": "sha256-DlkctYsmNXdtlnpyrb6aOvb8Q8db2SCodxVlE3kE+uQ=" }, - "org/jetbrains/compose/ui#ui-util/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui-util/1.7.0": { "jar": "sha256-cMKLKyQxS0t3mMq2qy+v53tHyS3qIvD8Il/lx5rHn3Y=", - "module": "sha256-3MuHSqbfBu18tQh9AvXkRTZzrVIvQWPcduCg0MgkIyU=", - "pom": "sha256-+qWMzWnZ3+lY8DNRqjOFNt2VSbo8rCgF4cRyv9T0VOw=" + "module": "sha256-dnIxUWYxsugkOSHP2cFIhifjjLIEidOXNFHyagkGLtY=", + "pom": "sha256-Y4m+v3a9SXezAteFEOukGIGipqplqyP0eYJCSUDtS2M=" }, "org/jetbrains/compose/ui#ui/1.6.11": { "module": "sha256-Z5lkk+C/fOHwl4SUz9hM8kKEUQfktYcxHpO72XMLJFI=", "pom": "sha256-TfLxK8+p2L2aVwxn6OT7UlIcDmhFHAVGHFc6SUXuST0=" }, - "org/jetbrains/compose/ui#ui/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui/1.7.0": { "jar": "sha256-nyVs9/d8fUtm+Muexe4JWSAKuQvQwJ1vXtEsmQKlhPg=", - "module": "sha256-yT2jcwfka12NtpMPqB1qj7pF3qUt8DxG/OcHk0DvkOo=", - "pom": "sha256-j5PTiO+cIkJ+SJKXulobQjhc9NU9bsz92LUrbX4Dfdg=" + "module": "sha256-xb2CXBAf7xnylq2gc7yfRJidpOgoMM/03NPBfEGtfJc=", + "pom": "sha256-zXIIZEtdLIv8p5ThqA+n6Kwp3/WLidKeoDDYPxB1EOA=" }, "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", diff --git a/pkgs/by-name/ke/keyguard/package.nix b/pkgs/by-name/ke/keyguard/package.nix index 75e7e438343c..5929e48efba7 100644 --- a/pkgs/by-name/ke/keyguard/package.nix +++ b/pkgs/by-name/ke/keyguard/package.nix @@ -34,13 +34,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "keyguard"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "AChep"; repo = "keyguard-app"; - rev = "eb36b853a7ac67a0f72d5684e6751d41969b07dd"; - hash = "sha256-tMNc8OlYsiYmVtac2jngvrFZjgI7eNFVIxXUfIJUdK4="; + rev = "8f6d527a42f13c6bdcee2ca3f133dd19751fc37a"; + hash = "sha256-llr+792hzifV5vP0e7AKWhW3OtYcyAhzXPR45Do62ug="; }; inherit gradleBuildTask gradleUpdateTask desktopItems; From 2d852e6c0a390b843871869ae8f0277968d5cfad Mon Sep 17 00:00:00 2001 From: Emilio Barradas Date: Sat, 19 Oct 2024 18:33:12 -0400 Subject: [PATCH 08/86] vscode-extensions.biomejs.biome: 2024.5.251958 -> 2024.10.131712 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index f8fc458aef28..ae103cfaeca8 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -697,8 +697,8 @@ let mktplcRef = { name = "biome"; publisher = "biomejs"; - version = "2024.5.251958"; - hash = "sha256-Pxbvj6e3nRwuLKmPEtE02JdHmZbyuXNh4T+FZKjBkWo="; + version = "2024.10.131712"; + hash = "sha256-wslaPz0YwavLgP/gLXDIKsk2dvVmFgkSDCI9OfpKwwI="; }; meta = { changelog = "https://github.com/biomejs/biome-vscode/blob/main/CHANGELOG.md"; From ff9e913d0b44689d5acbca871fdc2c6fcf0beade Mon Sep 17 00:00:00 2001 From: Ivan Bastrakov Date: Sun, 20 Oct 2024 13:30:07 +0300 Subject: [PATCH 09/86] vscode-extensions.vscode-icons-team.vscode-icons: 12.8.0 -> 12.9.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index f8fc458aef28..09bb7116f0f8 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -5194,8 +5194,8 @@ let mktplcRef = { name = "vscode-icons"; publisher = "vscode-icons-team"; - version = "12.8.0"; - hash = "sha256-2+Wf0AL9C5xOQCjA9maMt/W/kviNuiyMfaOFDU82KxM="; + version = "12.9.0"; + hash = "sha256-ULjZlbGcVbPiokfnx7d4z7cmVVEfy2d+SUch80rZRA4="; }; meta = { description = "Bring real icons to your Visual Studio Code"; From 080adc466f1cf4fe279cfc03e6e2cc0b40f7c6a2 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Sun, 20 Oct 2024 15:34:20 +0200 Subject: [PATCH 10/86] imhex: unpin fmt --- pkgs/by-name/im/imhex/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/im/imhex/package.nix b/pkgs/by-name/im/imhex/package.nix index 2e4ad286a1a0..e8d0a11330f8 100644 --- a/pkgs/by-name/im/imhex/package.nix +++ b/pkgs/by-name/im/imhex/package.nix @@ -19,7 +19,7 @@ python3, jansson, curl, - fmt_8, + fmt, nlohmann_json, yara, rsync, @@ -97,7 +97,7 @@ stdenv'.mkDerivation (finalAttrs: { curl dbus file - fmt_8 + fmt glfw3 gtk3 jansson From 0e349d6abd74c2c66b4e4034a506da8c10ae1a80 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 20 Oct 2024 22:04:34 +0200 Subject: [PATCH 11/86] webdav: 5.4.0 -> 5.4.1 Diff: https://github.com/hacdias/webdav/compare/v5.4.0...v5.4.1 --- pkgs/servers/webdav/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/webdav/default.nix b/pkgs/servers/webdav/default.nix index 44cbe1e1d62e..328345779ff9 100644 --- a/pkgs/servers/webdav/default.nix +++ b/pkgs/servers/webdav/default.nix @@ -2,17 +2,19 @@ buildGo123Module rec { pname = "webdav"; - version = "5.4.0"; + version = "5.4.1"; src = fetchFromGitHub { owner = "hacdias"; repo = "webdav"; rev = "v${version}"; - sha256 = "sha256-fZhzU2Buy/MScJNZeq/bMU5WhYCVVMaOF63SODe/+sQ="; + sha256 = "sha256-Sm8xnQ6f4Xi4mGTf1rL65wXub6u1zQtCqUjc2caKwpE="; }; vendorHash = "sha256-d8WauJ1i429dr79iHgrbFRZCmx+W6OobSINy8aNGG6w="; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Simple WebDAV server"; homepage = "https://github.com/hacdias/webdav"; From 1ef1cac17cb1c06a05370cdbe4e656bbb34d6267 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 20 Oct 2024 22:11:18 +0200 Subject: [PATCH 12/86] webdav: add pbsds to maintainers --- pkgs/servers/webdav/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/webdav/default.nix b/pkgs/servers/webdav/default.nix index 328345779ff9..70a6be77339a 100644 --- a/pkgs/servers/webdav/default.nix +++ b/pkgs/servers/webdav/default.nix @@ -19,7 +19,10 @@ buildGo123Module rec { description = "Simple WebDAV server"; homepage = "https://github.com/hacdias/webdav"; license = licenses.mit; - maintainers = with maintainers; [ pmy ]; + maintainers = with maintainers; [ + pmy + pbsds + ]; mainProgram = "webdav"; }; } From 4161ea40cfbc5f876e787b694ee9b703aa0fa2d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Oct 2024 03:53:43 +0000 Subject: [PATCH 13/86] iosevka-bin: 31.7.1 -> 31.9.1 --- pkgs/data/fonts/iosevka/bin.nix | 2 +- pkgs/data/fonts/iosevka/variants.nix | 180 +++++++++++++-------------- 2 files changed, 91 insertions(+), 91 deletions(-) diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index b4b0eb5f17ef..487599099be6 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -17,7 +17,7 @@ let in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "31.7.1"; + version = "31.9.1"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index ad740d88b3f9..d0cfe77b39f2 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,93 +1,93 @@ # This file was autogenerated. DO NOT EDIT! { - Iosevka = "0xpzsmvcvcf6c57bllg1yxylrvlm31gjpn9ilr7qz8bl7jz3z9rm"; - IosevkaAile = "0ar4wmsjdqh9a52k4vn9krpz7ii3bddnprqjyvpi9f1ybpxj74q1"; - IosevkaCurly = "1q9wqrhyk3636gy2yrkdc9l8wqiza3n5d6slx9h7529x8c6r64gb"; - IosevkaCurlySlab = "03an8nyg1xkv9l1fndk7agwkbg3s1kvwj342h3zj1klwi9bjz28b"; - IosevkaEtoile = "0qi8v8vzqifyxzzwqdx5kyvx11f1x8vgrk9104cb75xmslfa1wrg"; - IosevkaSlab = "0kmz8qywds7jr3wiy02p2c3r2y1bs0ibj7w6wa0kkkm82kk5v4b1"; - IosevkaSS01 = "091i0x9l589iq4f4mnkw26417vck6vhwnf2d68slv7xsss4jqpyw"; - IosevkaSS02 = "0dlsnglcbqpnpycqxq2aqgn80q6lrj50vrmgr71n051ix5mx5czl"; - IosevkaSS03 = "1y1l0rhbn55dd2scaffvk2fa6gap8rh4wb2lvi5a93z278ajcc7q"; - IosevkaSS04 = "01wgjwk77nb7f55zkdb6k897cv5rkx2q3va4r9rhj3z6aragp59c"; - IosevkaSS05 = "1w9wbwwzqf9812kd4q0g3z93f4qy6jn418m79d8s9bh132nm9jl4"; - IosevkaSS06 = "0s1cl8i7nv7yxynspix5mkl0db1vrlik5yiqs47ih8a82rm6zgmj"; - IosevkaSS07 = "0rssrgkfzr2pnycnjx2ny88sgcw4haqh5mmbyjnqm412602v57l1"; - IosevkaSS08 = "11yhnwymkr8m4si9ph2knk44rk7r87sjab0g2w8lhiamlcrps49a"; - IosevkaSS09 = "1mfv68s88zxvjcg90ha7cdhwhhlqv77b4iz7z991gmd34dd2n22l"; - IosevkaSS10 = "14j5mn7ry45f6vyzrq6v1qcssdz7s99d2hmpn3hh4gyn18hzadix"; - IosevkaSS11 = "0q3ksgh8y9mldr85k6l9q3p86yr13mcdvbwrrr2jy17kqjfms6yz"; - IosevkaSS12 = "1lh1vfv4q1ghdnxnk45hdqpp3pp7wr6pcv2b8k2rpjpv0w8wkz7b"; - IosevkaSS13 = "1vpkv053skbib9jgp75002gsisc2fpakwilh97sxnfyz47vqf6vk"; - IosevkaSS14 = "1q73a2wkdzd51s2bpjysh6k5scsqj089vphj68i1r3xzig5zg73d"; - IosevkaSS15 = "08qj500y20l4jzjd8qbdsifavi7hw1l136d2iqal2m18hy7kbvf3"; - IosevkaSS16 = "1ifmk9j4az7g3rlxdswxc2cz1hbn2nxmrh3ysi9gsjzppfayi4wn"; - IosevkaSS17 = "02abk8imd7kz1m4mq7c1sv13pm6d98l53qrh0291f3z5gpq6mdmw"; - IosevkaSS18 = "0ia83ijbq9bishj6gwij7sszp75bqwz1h30bxkavlxk5gfb770q1"; - SGr-Iosevka = "1n6v930a42wbx6bb1cyh6wvy2m885w60hlan9kgps682f8108h57"; - SGr-IosevkaCurly = "19r0swn7wz0h5m2f4vf2sk1lrdvrnv4nlr0hikb3mh6fylglwffv"; - SGr-IosevkaCurlySlab = "1xygrs9x8j9lm2n400i8m0i5vgwiq75vq4hm3712hkx2dx1kjycf"; - SGr-IosevkaFixed = "0nl380k30l4gn327kp51vwzlqh9j39w6frhmrxbmdcblnz1sc5md"; - SGr-IosevkaFixedCurly = "05aagifx30xzb9rmylx8k4jvpr8wgzi2dmc2ili40yk06jw97py1"; - SGr-IosevkaFixedCurlySlab = "1blad2s6kzz64c5fri50fqwivy8qxzkfxjg73wqyjzhmwbf5am1d"; - SGr-IosevkaFixedSlab = "1f0zqrd193w0lpzbl24ldr7wbbag3v6ahkch5jzad2f931fi62vl"; - SGr-IosevkaFixedSS01 = "1nyvwab562a0c5f1gjqw4wwq3lkizz1zi0bpg3dbfk72kzwlx31n"; - SGr-IosevkaFixedSS02 = "1k2lkf5cxxbp2rimv97c6bqq2fqkz4iwhvqh2bp3jw4jsxrqragc"; - SGr-IosevkaFixedSS03 = "0c679d897k6jdwwsrmj57v6q08ns6brrn6pp53m1fs4v8vsy7gq8"; - SGr-IosevkaFixedSS04 = "1zcv64yivzflr106vi9a0nzxl93d68d2pp07dlfc7acd86ps90j1"; - SGr-IosevkaFixedSS05 = "1g45312ly0zr1hsgdv1nhj2slrign6lddnxxalnbpi065qcgxzdb"; - SGr-IosevkaFixedSS06 = "0ahpvw9z573xd437m0vdyh7bh68z7frisjrm4r02a2nd0bc8rfva"; - SGr-IosevkaFixedSS07 = "06a5gfzf2a8ci8qvxfr8m0pj4avg5fggfdfs51lwn5n1rjqv3jms"; - SGr-IosevkaFixedSS08 = "00x0rz0j6l5lnb1bnly3dswazgxpdx5gd3ggihxcwvkjfarbs12y"; - SGr-IosevkaFixedSS09 = "089qlqa9hrfq1dwdnj29kr3r60n95gsnqqcgx1y87nw8xxaj1l8c"; - SGr-IosevkaFixedSS10 = "1g1xic30x6sb5jkg9ws1ymk1530402m60v6bsl9l164hj5wbfsjh"; - SGr-IosevkaFixedSS11 = "0rpbr95k2xzg7gilljhrx2jhwxaqg6v7hfxj3mrjid5jjphrw43v"; - SGr-IosevkaFixedSS12 = "1iz5apwf4700r63gicqcbic77f0dp1fhnqaxigrmhsyxwff8b31m"; - SGr-IosevkaFixedSS13 = "1igwj2ikfamrdd6nbmdy72sdrk7k2v1j32yny9bl5wx13dw7575b"; - SGr-IosevkaFixedSS14 = "00032jy2vls5f0frpnpbiiw8i2v1qj84hy1wcksgy4j357vw4lpf"; - SGr-IosevkaFixedSS15 = "1kpgkvq022gb3j33kr9b97ays0wvc5wl23n9cvq9ij8j3wbs4z3k"; - SGr-IosevkaFixedSS16 = "0bnc7y6ma9mi5xwy7csn9h75ahv3g8ggkfhr02qn34qm2dbmif1n"; - SGr-IosevkaFixedSS17 = "1d62jfwrpvh735jlvk812ymmly2qhkpn38s0gh48m28whgwvrhcw"; - SGr-IosevkaFixedSS18 = "18954hkad2b8pbp9f33f7ml4rzgkxl2hnjdc69zhav76lxd6369x"; - SGr-IosevkaSlab = "0lvx0ghvy17b6jzpc88kj0p1symf4vqahlc6wa2w4jsb2csc9d2l"; - SGr-IosevkaSS01 = "1b54d5g50k8hl3hnhmng4amayh5wmbvvkzq48mld6zwlfr1fadkd"; - SGr-IosevkaSS02 = "0bg9y4fr812ax34kmdz727ib67dghpbsim7a57isc897x0igcbnj"; - SGr-IosevkaSS03 = "01rsg0f8nxzl7i0w0sfp0sdrd1ab7p4qdadan486jaarxbjd6kx7"; - SGr-IosevkaSS04 = "1l36xjs0pm83i1azx0s2y541x6b83b1dw9ghf5ajgll29sz0gnlx"; - SGr-IosevkaSS05 = "0fj2jd65yhbxs9f2sadzpdm05d5api9ffqjx8a9hdc291ykl3sw6"; - SGr-IosevkaSS06 = "105g5p9rvr8cfiqf4wbjsly8616jm49bx088ddgj4jyli1msjh8k"; - SGr-IosevkaSS07 = "0lci5wa9q8bk57d0c99r86nhxh17qw4s0mh8yismnb0hqcknhfly"; - SGr-IosevkaSS08 = "1v56yda5w45mi9hmbdswqa4dmscf728a2bj0lf3ai9zcprfnc8d3"; - SGr-IosevkaSS09 = "0bgn9q6r1a3799nawhgzws9rm7mzibiz4ya2x4qkmawzzi1rdgjs"; - SGr-IosevkaSS10 = "19nqp295cdq7k1zlh8nd42wa3m11ql7112v746vvwq5bpr79dn8c"; - SGr-IosevkaSS11 = "0jr9j8c51fh3dp8mqiimr4lhnvznpn2q3swz2zyc8jlmbyga02ad"; - SGr-IosevkaSS12 = "176mby5agqa7fll9wq16dws98nn7igfx72fni1f509hq5k7xygsp"; - SGr-IosevkaSS13 = "0a53868nnwgql2sf909ybpdibjii8w89bp0kc8xymx7v9i2m4iyf"; - SGr-IosevkaSS14 = "11m4v27sf6qif6069nm71dfnksp7bldkvlx9bbvyn0y6lg9n1pfl"; - SGr-IosevkaSS15 = "00wr61nlf091gkwh5kdx8wp75y0vi2dlra91m89b4w6592vwffk4"; - SGr-IosevkaSS16 = "0b1fqrcx65ajanc433gyscw15ra230z8gs5kh0ahhkwqwz1al0lq"; - SGr-IosevkaSS17 = "1xsvga76x8p87ws386gmz28nghw3ybr1rck722a5wzzlz5z51p3m"; - SGr-IosevkaSS18 = "0w97ayi3jsb3313bw9dr9xb1l5lx6d26rc5yw0y9c9ph180f9afy"; - SGr-IosevkaTerm = "0b5y4gg149271gmf255hr8lp1n2qxafp5k1gi7h7rpnnndaimj1g"; - SGr-IosevkaTermCurly = "1izpf2sb0zv2kfqm1zb1ambicydqbis202n36rxn3b3sfa41hnwy"; - SGr-IosevkaTermCurlySlab = "03dbzgp0g0767aym5rshbjvzbhff8gpg90zl9sqrrfgmwav9yqd6"; - SGr-IosevkaTermSlab = "1amaimpr84q36gf2ma31d5ss57g84d8rw4bzg7058kd801yc1y53"; - SGr-IosevkaTermSS01 = "1pj4bb7q9bjwnss2353ldw599f8sns28vc8h8n33sq9xqrna9fbd"; - SGr-IosevkaTermSS02 = "1rgwyhzzpllprs2rmkrsc8xknsc4gzi3h0cv96qnx9jvd9ixyq67"; - SGr-IosevkaTermSS03 = "1c682qaj6bzyrwq4yc9bxn8y6yza9hn0c3hpj5g62akwk50dvkg9"; - SGr-IosevkaTermSS04 = "02rgpbb2wn3aibkkpfi2sxy751bwmf7azkv44xdalhyb6hz7vfgv"; - SGr-IosevkaTermSS05 = "187kwn9g81rpq71w58hdi27ngl1zby550xx85a2dz00w7j1l1qy3"; - SGr-IosevkaTermSS06 = "13k91ha10yymh5wcnf45sh1d51rgnlrzdg9bdh4r86122mq2pvl9"; - SGr-IosevkaTermSS07 = "16mq7mbcrqvpmwl6zgbs8r4w5b1r0m01i6iiwv20x74ay9pkglmv"; - SGr-IosevkaTermSS08 = "0npiqvw4ai9mq9ix0hfrq86h3y828g284nw2q4dgqpcpvhm8kxq5"; - SGr-IosevkaTermSS09 = "105p6x8chm9lsapb6ccpvhbrhaackdscjqi5j04hadkf4kxp7cn4"; - SGr-IosevkaTermSS10 = "023bgny097p8n58npf7f3y7shxgyfgqh5yy67lc64gwi3bw8lwb6"; - SGr-IosevkaTermSS11 = "1lkkkcqpgcfs3j3vdr3nryaxhycgz67d58zd54mpkxj3hicag1i9"; - SGr-IosevkaTermSS12 = "18d53273x83sq7nm6mi810y74i57nlz46vxxybdjbfp3i74rl14q"; - SGr-IosevkaTermSS13 = "1vi5i12l7pp2ishk8wdn2rpbxhmmvjqla6zcn5grq9i3ki92hbaf"; - SGr-IosevkaTermSS14 = "0p5pzcmhg4wbmr8kp2ydhrprnw7ll9wvvsni05347s3vg7scd7al"; - SGr-IosevkaTermSS15 = "11grinpbmd0qpkqs31qg20bdd1y35570ja8ifx8pfh0j91x97q1f"; - SGr-IosevkaTermSS16 = "1mbqzfaxqi1l406wjjnz34nhlsgxj4jsayybdwv12nv7v8fbyalj"; - SGr-IosevkaTermSS17 = "138jbkicfrqgqg04am8fwvjr5zmjxx22ik1ss4iivgl0grr07ysf"; - SGr-IosevkaTermSS18 = "0glfd94lv7pl52apfxks0ic6w66347c4hxm57phylfmmvd163zd0"; + Iosevka = "1nma01k7v4dhq0w84l5qdxakl6ajhf76g54lm5xb0yggarl9fn3y"; + IosevkaAile = "0lqcwmal97ddfzvi6zdrcxygmi0rszmrmlqpc49fn01yl0gkb4p1"; + IosevkaCurly = "0xncws9cgjjhz120nvkxikc7kqj1vqqwghb1sx7kcfjqh5rkngna"; + IosevkaCurlySlab = "1srfhrr44wp208xw0z4z16jsmh4saaszglgpsxyyhgkdmdzpn0w4"; + IosevkaEtoile = "1aw89ig62wfm80655ib07xwpn17skvqwd4rpwq7xk6ryz6jnlgrr"; + IosevkaSlab = "1dj2blr87jn3cxb2y2mybk359bvgj7kni34adha722mp039z8di8"; + IosevkaSS01 = "18y79gghmkhi26kzv9r28z0wgcc9ybca7jdqwlc5wb0vky5w9wq4"; + IosevkaSS02 = "1lxggf53dmxcsj333ibp3lm6cpzlwldf4irkm5kimxw0z8gph8xq"; + IosevkaSS03 = "0ywfxjdhssdlddgpr48crff3pkpp5rm0kshmkib2gmy5xgyhf7dr"; + IosevkaSS04 = "13970rb1kasn65rjw318zga6q677wj9bx0p7bp6cy31dmg0v6mp7"; + IosevkaSS05 = "0ckfw0kajrmw6nxyjivdkizxbf9fxjdlwczs2lxn2vjbapy4c7kf"; + IosevkaSS06 = "1rx065pwwaf99riz4b8104y1kgsn69bqf03832wicr5809knvsnj"; + IosevkaSS07 = "074nyqi46rls2nxfczq4m48xkx777dnw96zrhy6m01lly07xhpny"; + IosevkaSS08 = "04vapfj8jx6c9799z4fqcabm7y7xbcbnm8x1bamimchbk23xwy1d"; + IosevkaSS09 = "1n56r4c1glwssv4jwgls88x6wnxv9j6k8myzf2fwy4cci5s2d5as"; + IosevkaSS10 = "0ndambz7fz38s7x99lxqjjgkykwrml7wpf2svb9vw2wnyiiwzn69"; + IosevkaSS11 = "1fm5aihz9dvvp5viir1b9wb80zhaxfl3w9w5siniprq46y31cmys"; + IosevkaSS12 = "1fjd73xxdch5rfw2k2330np994pcv2xrzf1l12b585maj3l926p2"; + IosevkaSS13 = "03kyf09gpn5rp0l71gh1680nlh0cc7jlak0kzplv2bfg1wwkh5x8"; + IosevkaSS14 = "0jhyjcq1x28fdbnqij71z8cd3ww7pj0bih4wbs7jmj87xvxn94zm"; + IosevkaSS15 = "16im03mgs6c8nmaxs1p986mzsk78fhxyqcla75hajbj6i5j6j5iz"; + IosevkaSS16 = "1jfcyb0dkwb9dxby4kap1vc5kfzap2fxgjgan5437pxrjlkmmnkd"; + IosevkaSS17 = "11hdwspxlh9wa3jcph9zgcgm8r5w7jrazv1bny3n7d9ikw7i7jh6"; + IosevkaSS18 = "0g6qq8q5hnsv55kkdv3hsdvs6n5plpkyawlhdrm76qlrg7iw1ii3"; + SGr-Iosevka = "1f628x5pchva8c10b5w8x5cl89p28p3ir6c0m5l524kq6b4qxspf"; + SGr-IosevkaCurly = "09hv8pbikmmx17gmb32mbjpak9818qqvknln88ssdra2b7sh88a9"; + SGr-IosevkaCurlySlab = "11kxz7lzm38lg725ws7yh87zh5jnwqw4938l8bxw1pjxj4jyhbi7"; + SGr-IosevkaFixed = "08kd556v0wbsdcz1i83bzv29wsklw0h1jiridh1kjdwn73xdnaj2"; + SGr-IosevkaFixedCurly = "1r6iyxmnr84p44f1jbj8x2w8ki9fxflmv15zvhv3ikbfar9ypp86"; + SGr-IosevkaFixedCurlySlab = "016qfwdv5173c7b11h9df8dz9xywfzcds2sd869bsp5i5g6im76j"; + SGr-IosevkaFixedSlab = "1zwg86v81wwvrgvc4hy96s6rj5i4p67i4waj5c120in7hghlc6rm"; + SGr-IosevkaFixedSS01 = "0ihn36hfrsqbv3r365wy5z5wf5j464683vhdi5nk8vyq5b7x1hps"; + SGr-IosevkaFixedSS02 = "14z624mshjdgxm77h5c1xg44qnwjn9m6bx9ymzia7hxwpl3xsbf9"; + SGr-IosevkaFixedSS03 = "0nbvfqsfcsj26scd5ia2rvnj6qh8pg9wv8q9avidc5f6dsq4sy5z"; + SGr-IosevkaFixedSS04 = "073x2v0cghn3fp6ycfk16wn4vbqrgqwc4h2ky9gx3ndpf6fy5znh"; + SGr-IosevkaFixedSS05 = "0jnzf55jjx04zb33zasxyjshk4zbabnfcdb0pr5q400wj9qnnv6s"; + SGr-IosevkaFixedSS06 = "19gdzg4phs5cc0gj3zrhh9113infq8amwcizfq1mhsb7z1fqg48f"; + SGr-IosevkaFixedSS07 = "1rv2w9h5fwwdk6zq6ra9pmh4f7pdq87ydcwp11hhcjlk0iln1602"; + SGr-IosevkaFixedSS08 = "0lqm6c5b9y2crq694g00ryrq5j197yhlqvqk7ss494xv3vscrmsa"; + SGr-IosevkaFixedSS09 = "0v0w5vwgl3x84sqmw6wjam6inygchx1z9ax6km8hxlwjx4by9m32"; + SGr-IosevkaFixedSS10 = "0mfh0wr9ixgjp32i9hbhp0x8v3afwgplprivwl7qbgn18arr1ff8"; + SGr-IosevkaFixedSS11 = "03d4vwr9d4dw9dk9s0x3jsb9bahy69rz3lqq8zwyny1ipkdbynx6"; + SGr-IosevkaFixedSS12 = "0pvr9m1jdn2m0w1gx9rvyhphg1bd7s3jjibj3nbb8qmsx32rw347"; + SGr-IosevkaFixedSS13 = "1jvy36qqghjnv3grry6cpwhqsj0x0cdi2izqqin0pfa304r56pc6"; + SGr-IosevkaFixedSS14 = "1l0cb9my5xg5f13kyp3v9fs65wj66rx5asirqv339qbhw0hg5sp3"; + SGr-IosevkaFixedSS15 = "0b590zg0mrcv4rf51rcnah654rsicvw0j6v2dqgjvm7x62pkiks5"; + SGr-IosevkaFixedSS16 = "0ij7xv0d1d1s8g7qcchrhbv088zcvr2ircm8dqg7pkwwla31342y"; + SGr-IosevkaFixedSS17 = "1rnvxq37lvwf0y3fd7cq9qk78gh3vbw380a7a82r0qqypynid47m"; + SGr-IosevkaFixedSS18 = "0g24q74z7vrbl21ljmibf9ay4mz5m568fs6nagli4fd5q6nag6p3"; + SGr-IosevkaSlab = "0fzcs3xg36fd6kbq3gzrirc6qw9jakq4gkc480kxa8hvmcyqn30a"; + SGr-IosevkaSS01 = "1w9nmgqcwa8zhmwprbw9wsd9y0q0g8v1nrg54b8hcnhfqj0hqqxg"; + SGr-IosevkaSS02 = "1g30im488cql8nzkqmirpz0sa0w67s2qfjyiz5fcpsdim6dg90vx"; + SGr-IosevkaSS03 = "00yfkypnvgkpvsghwvn19nyjcirk8rpjhly9y1bkmvlz0x6ljhyq"; + SGr-IosevkaSS04 = "0wx2zcq2wrar4bxvv0asqhmh1yvaf0nknpk78bvdrawprylcwmam"; + SGr-IosevkaSS05 = "0p1xibl1aklyyxdfkhp8rb6c49b7832h8k89yqw17y1yw0n8pfl4"; + SGr-IosevkaSS06 = "05zry2qy3q7jkhpj233j2wpc66rr4dm02xly7wsn9vhalx178jgk"; + SGr-IosevkaSS07 = "0an7sp8dh4x8vnnvgvp49iskryh5z4npmn47vi3jxl6vpl70flx0"; + SGr-IosevkaSS08 = "198pywx83ciwfvhcgy7r7zw0hmm1xh4ccjq6h7spg8ca7x87sc0c"; + SGr-IosevkaSS09 = "1vpqzmkyjn1k0rlpq7q2yky3a3l0yczlsvvi8pvfhgpcxsrmvgsr"; + SGr-IosevkaSS10 = "0p75b9w9ljjcz16p4dv5phyhwdhxgb6kkpdpn1xpibbxifrcp400"; + SGr-IosevkaSS11 = "0hdwkn69g4h93l64b5dn6kmqlnrm8pnl5721k25vjac631yzjpig"; + SGr-IosevkaSS12 = "0rlr2wh9h650ax4ngf37ch3l90f641fxq81h31qbcxi1798sd5ds"; + SGr-IosevkaSS13 = "1qf69czsqd52580xwqpr4wvx88wi8csf1cxyjwv6h44gzfx5ka89"; + SGr-IosevkaSS14 = "1jyml7xkbsdi22q3c0l6527q1ii97qyfj3h2dwxcly2v0jx22l0n"; + SGr-IosevkaSS15 = "0yssy3vrmgfqachms20b6gl52lkk0drxrvwnyizc9lc96fx1x4a3"; + SGr-IosevkaSS16 = "1hll0l63d300047jwh7m81djqf7mgg0gdv1gw7dynl8rpp8iqwxw"; + SGr-IosevkaSS17 = "1rf3m48h396ql9m6i8c3gnxy0q7a9l8xk3xrwcnf2pidghgnwj5f"; + SGr-IosevkaSS18 = "15cp4y4221vggd3q6202z1r46fkdrn81j33bskwaq3vqn4ykrpvx"; + SGr-IosevkaTerm = "18kscgr1398zdzqdy7m693lw8gh9r3wrzw9gg62ksdbcbwn16im4"; + SGr-IosevkaTermCurly = "1v8y7km35hmkm8fx08szjwkxpykyd88nfvwi15jiajc4gbsl3hvy"; + SGr-IosevkaTermCurlySlab = "026bg6q5v8n4wfaw0mbrscylxqwfs5m727dvv734km110p5dvx1j"; + SGr-IosevkaTermSlab = "034chas42avxrkw2s5x08bwydarazk9h50blv3vraj66qzw2vngx"; + SGr-IosevkaTermSS01 = "17va6zc2wjn2nm7ixdv11mjmxcnkr5yca8af6prnfdkdmdaxp1zd"; + SGr-IosevkaTermSS02 = "1mvisnjn3gj2zs6g5n856mkixyhc6bspv9zcknb51am2s9n8mv5b"; + SGr-IosevkaTermSS03 = "00pigslzg8fwdg51qs8096w14b8dgycgsm3j4ab6xpp5hshvna5a"; + SGr-IosevkaTermSS04 = "01jjg7hjz0y8nc8cijlfc8zp1b49hby0ihwv1yk7skhs9gvr99rp"; + SGr-IosevkaTermSS05 = "07ykxm73445a7i8693zdsp5d1rjmccq7bysj90y73lky5f1w1bc4"; + SGr-IosevkaTermSS06 = "17rdmamd4p469kw7nwxcdaih8ps7n0jrlwkni4n4vfib28pcym9r"; + SGr-IosevkaTermSS07 = "0vgh7g9xyl52gb63hw09mszmkya7afvizhddni6mff7f5xdzy1mh"; + SGr-IosevkaTermSS08 = "0s524hhg64jfwbgifariasv4cd425alscspkc2d02d0gf4d4czbb"; + SGr-IosevkaTermSS09 = "15w06z0mkph0cpkw5xyzn53dpmc11p7c2nya35m72harwdvpawsv"; + SGr-IosevkaTermSS10 = "0b4z99b2mqa11avkiyamy9kzchp1x09lyhglc9d10qm94phi75iw"; + SGr-IosevkaTermSS11 = "1xnnmpx01i2diz9qvmfb0gc0injdqk9n41c0ci93lpvk3rxjvcs7"; + SGr-IosevkaTermSS12 = "1kbfbdjcnaxh3s6q5b3pwy8bknvz0av5s0h4hvq6qnrvvrdrdr4f"; + SGr-IosevkaTermSS13 = "1rnxy0zbl8pc4ph2zpjcc101vbb2ss2pvxx4h32gvkx5j0sk1cfl"; + SGr-IosevkaTermSS14 = "0k1v9jl52j37fq86p3gwpf31qa1a6alj18hi2bbv5ybzya7m8pp8"; + SGr-IosevkaTermSS15 = "1c6mw04h1zgjdnzlim553za899gc07gnhianw499dv3yi87p012q"; + SGr-IosevkaTermSS16 = "0aggw8hn5g3cvlxcdsyjcxq1ygrmrjq2xjsvwkmvdsfpfhsp1zsa"; + SGr-IosevkaTermSS17 = "191jy9j3bm7xnp7w9mq5kllf96vwhzvyq1nfcdd0ly773a3bjg4a"; + SGr-IosevkaTermSS18 = "10dbr3r4jxb9jq82hxhwqsxd8hrhjw626hv6i6g368g73x68sxk2"; } From 3362ec86928df9fde167abcb2d4683bbe4c53085 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 25 Sep 2024 11:25:04 +0200 Subject: [PATCH 14/86] nixosTests.nixos-rebuild-target-host: Use modular entrypoint Modernize it. This allows the test to be extended, and pkgs to be reused (later) to speed up evaluations a bit. I believe this also makes it run on darwin hosts, but my linux-builder's disk is too small to fit the massive closure of this test. (cherry picked from commit 8c06d2cf667106dd440e7c140e70051dc1c321cb) --- nixos/tests/all-tests.nix | 2 +- nixos/tests/nixos-rebuild-target-host.nix | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 0934c25ff9d6..753cefb9bbe0 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -700,7 +700,7 @@ in { nixos-generate-config = handleTest ./nixos-generate-config.nix {}; nixos-rebuild-install-bootloader = handleTestOn ["x86_64-linux"] ./nixos-rebuild-install-bootloader.nix {}; nixos-rebuild-specialisations = handleTestOn ["x86_64-linux"] ./nixos-rebuild-specialisations.nix {}; - nixos-rebuild-target-host = handleTest ./nixos-rebuild-target-host.nix {}; + nixos-rebuild-target-host = runTest ./nixos-rebuild-target-host.nix; nixpkgs = pkgs.callPackage ../modules/misc/nixpkgs/test.nix { inherit evalMinimalConfig; }; nixseparatedebuginfod = handleTest ./nixseparatedebuginfod.nix {}; node-red = handleTest ./node-red.nix {}; diff --git a/nixos/tests/nixos-rebuild-target-host.nix b/nixos/tests/nixos-rebuild-target-host.nix index 4a210f94fd22..88a0317656d2 100644 --- a/nixos/tests/nixos-rebuild-target-host.nix +++ b/nixos/tests/nixos-rebuild-target-host.nix @@ -1,8 +1,12 @@ -import ./make-test-python.nix ({ pkgs, ... }: { +{ hostPkgs, ... }: { name = "nixos-rebuild-target-host"; + # TODO: remove overlay from nixos/modules/profiles/installation-device.nix + # make it a _small package instead, then remove pkgsReadOnly = false;. + node.pkgsReadOnly = false; + nodes = { - deployer = { lib, ... }: let + deployer = { lib, pkgs, ... }: let inherit (import ./ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey; in { imports = [ ../modules/profiles/installation-device.nix ]; @@ -71,13 +75,13 @@ import ./make-test-python.nix ({ pkgs, ... }: { StrictHostKeyChecking=no ''; - targetConfigJSON = pkgs.writeText "target-configuration.json" + targetConfigJSON = hostPkgs.writeText "target-configuration.json" (builtins.toJSON nodes.target.system.build.targetConfig); - targetNetworkJSON = pkgs.writeText "target-network.json" + targetNetworkJSON = hostPkgs.writeText "target-network.json" (builtins.toJSON nodes.target.system.build.networkConfig); - configFile = hostname: pkgs.writeText "configuration.nix" '' + configFile = hostname: hostPkgs.writeText "configuration.nix" '' { lib, modulesPath, ... }: { imports = [ (modulesPath + "/virtualisation/qemu-vm.nix") @@ -140,4 +144,4 @@ import ./make-test-python.nix ({ pkgs, ... }: { deployer.succeed(f"mkdir -p {tmp_dir}") deployer.succeed(f"TMPDIR={tmp_dir} nixos-rebuild switch -I nixos-config=/root/configuration-1.nix --target-host root@target &>/dev/console") ''; -}) +} From d6ea7646295ce12b5a721ee2cd8e497213a5bc5f Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 25 Sep 2024 11:37:57 +0200 Subject: [PATCH 15/86] nixosTests.nixos-rebuild-specialisations: Use modular entrypoint Modernize it. This allows the test to be extended, and pkgs to be reused (later) to speed up evaluations a bit. I believe this also makes it run on darwin hosts, but my linux-builder's disk is too small to fit the massive closure of this test. (cherry picked from commit 1396a03bee18a0993a4f3e97fda8938ff61c2918) --- nixos/tests/all-tests.nix | 2 +- nixos/tests/nixos-rebuild-specialisations.nix | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 753cefb9bbe0..504aabae0d99 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -699,7 +699,7 @@ in { nixops = handleTest ./nixops/default.nix {}; nixos-generate-config = handleTest ./nixos-generate-config.nix {}; nixos-rebuild-install-bootloader = handleTestOn ["x86_64-linux"] ./nixos-rebuild-install-bootloader.nix {}; - nixos-rebuild-specialisations = handleTestOn ["x86_64-linux"] ./nixos-rebuild-specialisations.nix {}; + nixos-rebuild-specialisations = runTestOn ["x86_64-linux"] ./nixos-rebuild-specialisations.nix; nixos-rebuild-target-host = runTest ./nixos-rebuild-target-host.nix; nixpkgs = pkgs.callPackage ../modules/misc/nixpkgs/test.nix { inherit evalMinimalConfig; }; nixseparatedebuginfod = handleTest ./nixseparatedebuginfod.nix {}; diff --git a/nixos/tests/nixos-rebuild-specialisations.nix b/nixos/tests/nixos-rebuild-specialisations.nix index ab67bbaba676..f12d0fc48ce9 100644 --- a/nixos/tests/nixos-rebuild-specialisations.nix +++ b/nixos/tests/nixos-rebuild-specialisations.nix @@ -1,6 +1,10 @@ -import ./make-test-python.nix ({ pkgs, ... }: { +{ hostPkgs, ... }: { name = "nixos-rebuild-specialisations"; + # TODO: remove overlay from nixos/modules/profiles/installation-device.nix + # make it a _small package instead, then remove pkgsReadOnly = false;. + node.pkgsReadOnly = false; + nodes = { machine = { lib, pkgs, ... }: { imports = [ @@ -32,7 +36,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { testScript = let - configFile = pkgs.writeText "configuration.nix" '' + configFile = hostPkgs.writeText "configuration.nix" '' { lib, pkgs, ... }: { imports = [ ./hardware-configuration.nix @@ -119,4 +123,4 @@ import ./make-test-python.nix ({ pkgs, ... }: { machine.fail("nixos-rebuild boot --specialisation foo") machine.fail("nixos-rebuild boot -c foo") ''; -}) +} From df4376d0fd3ffcc8848e40adda3ceeaf6ba1db72 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 25 Sep 2024 11:06:45 +0200 Subject: [PATCH 16/86] nixosTests.nixos-rebuild-target-host: Explain fix for switch-to-configuration-ng --- nixos/tests/nixos-rebuild-target-host.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/tests/nixos-rebuild-target-host.nix b/nixos/tests/nixos-rebuild-target-host.nix index 88a0317656d2..0e4c3e5f3999 100644 --- a/nixos/tests/nixos-rebuild-target-host.nix +++ b/nixos/tests/nixos-rebuild-target-host.nix @@ -28,7 +28,8 @@ system.build.privateKey = snakeOilPrivateKey; system.build.publicKey = snakeOilPublicKey; - # needed to provide STC implementation for target + # We don't switch on `deployer`, but we need it to have the dependencies + # available, to be picked up by system.includeBuildDependencies above. system.switch.enable = true; }; @@ -61,6 +62,7 @@ system.build = { inherit targetConfig; }; + system.switch.enable = true; networking.hostName = "target"; } From a17b815fc96a59535c2663421b8b7a5439e9502b Mon Sep 17 00:00:00 2001 From: Jakuzure Nonon Date: Tue, 22 Oct 2024 11:44:04 +0200 Subject: [PATCH 17/86] glasskube: 0.23.0 -> 0.25.0 --- pkgs/by-name/gl/glasskube/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/gl/glasskube/package.nix b/pkgs/by-name/gl/glasskube/package.nix index f4b03a4b8d27..a6c5f54f814e 100644 --- a/pkgs/by-name/gl/glasskube/package.nix +++ b/pkgs/by-name/gl/glasskube/package.nix @@ -8,12 +8,12 @@ }: let - version = "0.23.0"; + version = "0.25.0"; gitSrc = fetchFromGitHub { owner = "glasskube"; repo = "glasskube"; rev = "refs/tags/v${version}"; - hash = "sha256-X9XXQ/Ke3toXLIkSCzGrypd1lKDfslpJ96zmDHBDbl8="; + hash = "sha256-456kMO7KappYI2FuHA8g+uhkJNCGCxb/9zmleZqu6SQ="; }; web-bundle = buildNpmPackage rec { inherit version; @@ -21,7 +21,7 @@ let src = gitSrc; - npmDepsHash = "sha256-9BicZfnrJEFrtaJ0uGmLnnY99KplnL8qdmG5FMo70uI="; + npmDepsHash = "sha256-XKPFT8eyZmDhNbuCpTzGYeg5QdhgpVhHkj8AGSlh6WU="; dontNpmInstall = true; @@ -41,7 +41,7 @@ in buildGo123Module rec { src = gitSrc; - vendorHash = "sha256-xpN/5VmRPFQegP+ORpb875N/+AKgxiqyZWk4Px+SCZ4="; + vendorHash = "sha256-oly6SLgXVyvKQQuPrb76LYngoDPNLjTAs4gWCT3/kew="; CGO_ENABLED = 0; From f6f6d58c841e6c5c6dc56fbfa8cd2858aff18a28 Mon Sep 17 00:00:00 2001 From: aleksana Date: Tue, 22 Oct 2024 18:06:48 +0800 Subject: [PATCH 18/86] screentest: unstable-2021-05-10 -> 3.0 --- pkgs/by-name/sc/screentest/package.nix | 41 ++++++++++++-------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/pkgs/by-name/sc/screentest/package.nix b/pkgs/by-name/sc/screentest/package.nix index 6d671f608903..df4922afb922 100644 --- a/pkgs/by-name/sc/screentest/package.nix +++ b/pkgs/by-name/sc/screentest/package.nix @@ -1,43 +1,40 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, intltool -, pkg-config -, gtk2 +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + wrapGAppsHook3, }: stdenv.mkDerivation (finalAttrs: { pname = "screentest"; - version = "unstable-2021-05-10"; + version = "3.0"; src = fetchFromGitHub { owner = "TobiX"; repo = "screentest"; - rev = "780e6cbbbbd6ba93e246e7747fe593b40c4e2747"; - hash = "sha256-TJ47c77vQ/aRBJ2uEiFLuAR4dd4CMEo+iAAx0HCFbmA="; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-dbag1EAD+6+srfu/eqSl3CWlZtSopioQjyBQRJcUggA="; }; strictDeps = true; nativeBuildInputs = [ - autoreconfHook - intltool + meson + ninja pkg-config - gtk2 # for autoconf macros + wrapGAppsHook3 ]; - buildInputs = [ - gtk2 - ]; - - meta = with lib; { + meta = { description = "Simple screen testing tool"; mainProgram = "screentest"; homepage = "https://github.com/TobiX/screentest"; - changelog = "https://github.com/TobiX/screentest/blob/${finalAttrs.src.rev}/NEWS"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ evils ]; - platforms = platforms.unix; + changelog = "https://github.com/TobiX/screentest/blob/${finalAttrs.version}/NEWS"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ evils ]; + platforms = lib.platforms.unix; }; }) From 196f5c8560a084149a06ad5bbce9ba0b7c63d9e6 Mon Sep 17 00:00:00 2001 From: aleksana Date: Tue, 22 Oct 2024 18:47:57 +0800 Subject: [PATCH 19/86] scite: move to pkgs/by-name --- .../editors/scite/default.nix => by-name/sc/scite/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/editors/scite/default.nix => by-name/sc/scite/package.nix} (100%) diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/by-name/sc/scite/package.nix similarity index 100% rename from pkgs/applications/editors/scite/default.nix rename to pkgs/by-name/sc/scite/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 982de17fe824..a70b319c462d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32239,8 +32239,6 @@ with pkgs; sc-im = callPackage ../applications/misc/sc-im { }; - scite = callPackage ../applications/editors/scite { }; - scli = callPackage ../applications/misc/scli { }; scribus_1_5 = libsForQt5.callPackage ../applications/office/scribus/default.nix { }; From ee3099b5aaa913b8701f59c0c64ff1e490b72f5e Mon Sep 17 00:00:00 2001 From: aleksana Date: Tue, 22 Oct 2024 19:22:26 +0800 Subject: [PATCH 20/86] scite: 5.2.2 -> 5.5.3 --- pkgs/by-name/sc/scite/package.nix | 61 ++++++++++++++++++++----------- 1 file changed, 39 insertions(+), 22 deletions(-) diff --git a/pkgs/by-name/sc/scite/package.nix b/pkgs/by-name/sc/scite/package.nix index 9c230a2984eb..e8b2c0ba9b50 100644 --- a/pkgs/by-name/sc/scite/package.nix +++ b/pkgs/by-name/sc/scite/package.nix @@ -1,17 +1,31 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk2 }: +{ + lib, + stdenv, + fetchurl, + pkg-config, + wrapGAppsHook3, +}: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "scite"; - version = "5.2.2"; + version = "5.5.3"; src = fetchurl { - url = "https://www.scintilla.org/scite522.tgz"; - sha256 = "1q46clclx8r0b8zbq2zi89sygszgqf9ra5l83r2fs0ghvjgh2cxd"; + url = "https://www.scintilla.org/scite${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}.tgz"; + hash = "sha256-MtXy8a4MzdJP8Rf6otc+Zu+KfYSJnmmXfBS8RVBBbOY="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 ]; - sourceRoot = "scintilla/gtk"; + nativeBuildInputs = [ + pkg-config + wrapGAppsHook3 + ]; + + sourceRoot = "scite/gtk"; + + makeFlags = [ + "GTK3=1" + "prefix=${placeholder "out"}" + ]; CXXFLAGS = [ # GCC 13: error: 'intptr_t' does not name a type @@ -19,24 +33,27 @@ stdenv.mkDerivation { "-include system_error" ]; - buildPhase = '' - make - cd ../../lexilla/src - make - cd ../../scite/gtk - make prefix=$out/ + preBuild = '' + pushd ../../scintilla/gtk + make ''${makeFlags[@]} + popd + + pushd ../../lexilla/src + make ''${makeFlags[@]} + popd ''; - installPhase = '' - make install prefix=$out/ - ''; + enableParallelBuilding = true; - meta = with lib; { + meta = { homepage = "https://www.scintilla.org/SciTE.html"; description = "SCIntilla based Text Editor"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = [ maintainers.rszibele ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + rszibele + aleksana + ]; mainProgram = "SciTE"; }; -} +}) From b8c539e68ff46a0a51cedfece6cb2874672d9bec Mon Sep 17 00:00:00 2001 From: "Samuel Hierholzer (Adfinis AG)" Date: Tue, 22 Oct 2024 09:17:39 +0200 Subject: [PATCH 21/86] oil: replace with oils-for-unix --- pkgs/by-name/oi/oil/package.nix | 58 --------------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 58 deletions(-) delete mode 100644 pkgs/by-name/oi/oil/package.nix diff --git a/pkgs/by-name/oi/oil/package.nix b/pkgs/by-name/oi/oil/package.nix deleted file mode 100644 index 3cce7d592fee..000000000000 --- a/pkgs/by-name/oi/oil/package.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ stdenv, lib, fetchurl, symlinkJoin, withReadline ? true, readline }: - -let - readline-all = symlinkJoin { - name = "readline-all"; paths = [ readline readline.dev ]; - }; -in -stdenv.mkDerivation rec { - pname = "oil"; - version = "0.22.0"; - - src = fetchurl { - url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - hash = "sha256-RS5/1Ci2hqp1LP65viuU+fz3upqyLgrlcKh83PeCJC4="; - }; - - postPatch = '' - patchShebangs build - ''; - - preInstall = '' - mkdir -p $out/bin - ''; - - strictDeps = true; - buildInputs = lib.optional withReadline readline; - # As of 0.20.0 the build generates an error on MacOS (using clang version 16.0.6 in the builder), - # whereas running it outside of Nix with clang version 15.0.0 generates just a warning. The shell seems to - # work just fine though, so we disable the error here. - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types"; - configureFlags = [ - "--datarootdir=${placeholder "out"}" - ] ++ lib.optionals withReadline [ - "--with-readline" - "--readline=${readline-all}" - ]; - - # Stripping breaks the bundles by removing the zip file from the end. - dontStrip = true; - - meta = { - description = "New unix shell - Python version"; - homepage = "https://www.oilshell.org/"; - - license = with lib.licenses; [ - psfl # Includes a portion of the python interpreter and standard library - asl20 # Licence for Oil itself - ]; - - platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ melkor333 ]; - changelog = "https://www.oilshell.org/release/${version}/changelog.html"; - }; - - passthru = { - shellPath = "/bin/osh"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 2014b9ce30fc..efb1d553037c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -826,6 +826,7 @@ mapAliases { o = orbiton; # Added 2023-04-09 oathToolkit = oath-toolkit; # Added 2022-04-04 oauth2_proxy = throw "'oauth2_proxy' has been renamed to/replaced by 'oauth2-proxy'"; # Converted to throw 2024-10-17 + oil = lib.warn "Oil has been replaced with the faster native C++ version and renamed to 'oils-for-unix'. See also https://github.com/oils-for-unix/oils/wiki/Oils-Deployments" oils-for-unix; # Added 2024-10-22 onevpl-intel-gpu = lib.warn "onevpl-intel-gpu has been renamed to vpl-gpu-rt" vpl-gpu-rt; # Added 2024-06-04 opencv2 = throw "opencv2 has been removed as it is obsolete and was not used by any other package; please migrate to OpenCV 4"; # Added 2024-08-20 opencv3 = throw "opencv3 has been removed as it is obsolete and was not used by any other package; please migrate to OpenCV 4"; # Added 2024-08-20 From 2202e9bc060aa547963c3d144cee1dc5abd7d715 Mon Sep 17 00:00:00 2001 From: "Samuel Hierholzer (Adfinis AG)" Date: Tue, 22 Oct 2024 09:17:55 +0200 Subject: [PATCH 22/86] oils-for-unix: 0.22.0 -> 0.23.0 --- pkgs/by-name/oi/oils-for-unix/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/oi/oils-for-unix/package.nix b/pkgs/by-name/oi/oils-for-unix/package.nix index 67dbc80e8afc..b33c93ac6d4f 100644 --- a/pkgs/by-name/oi/oils-for-unix/package.nix +++ b/pkgs/by-name/oi/oils-for-unix/package.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { pname = "oils-for-unix"; - version = "0.22.0"; + version = "0.23.0"; src = fetchurl { url = "https://www.oilshell.org/download/oils-for-unix-${version}.tar.gz"; - hash = "sha256-etZK2VH6qbj9MQ/BffCpMpHgQat1MRrKG8hcu/p61F8="; + hash = "sha256-ydNcp4tKCO6vrIvGQ54rtAvM0zcNsiJkh/rtY0ihdSE="; }; postPatch = '' From 30d7a3f7b6627c684f0af3846a31118b644815c5 Mon Sep 17 00:00:00 2001 From: aleksana Date: Tue, 22 Oct 2024 19:39:51 +0800 Subject: [PATCH 23/86] jalv: move to pkgs/by-name --- .../audio/jalv/default.nix => by-name/ja/jalv/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/audio/jalv/default.nix => by-name/ja/jalv/package.nix} (100%) diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/by-name/ja/jalv/package.nix similarity index 100% rename from pkgs/applications/audio/jalv/default.nix rename to pkgs/by-name/ja/jalv/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 982de17fe824..3227959181d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30229,8 +30229,6 @@ with pkgs; jaeles = callPackage ../tools/security/jaeles { }; - jalv = callPackage ../applications/audio/jalv { }; - jameica = callPackage ../applications/office/jameica { inherit (darwin.apple_sdk.frameworks) Cocoa; }; From 1f3dcfb1a928850c96f62dc18887df2db0f6ce9f Mon Sep 17 00:00:00 2001 From: aleksana Date: Tue, 22 Oct 2024 19:40:16 +0800 Subject: [PATCH 24/86] jalv: format with nixfmt-rfc-style --- pkgs/by-name/ja/jalv/package.nix | 35 +++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ja/jalv/package.nix b/pkgs/by-name/ja/jalv/package.nix index b17460e4e2e7..3c60f9c6413d 100644 --- a/pkgs/by-name/ja/jalv/package.nix +++ b/pkgs/by-name/ja/jalv/package.nix @@ -1,7 +1,21 @@ -{ lib, stdenv, fetchurl, gtk2, libjack2, lilv, lv2, pkg-config, python3 -, serd, sord , sratom, suil, wafHook }: +{ + lib, + stdenv, + fetchurl, + gtk2, + libjack2, + lilv, + lv2, + pkg-config, + python3, + serd, + sord, + sratom, + suil, + wafHook, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "jalv"; version = "1.6.6"; @@ -10,9 +24,20 @@ stdenv.mkDerivation rec { sha256 = "sha256-ktFBeBtmQ3MgfDQ868XpuM7UYfryb9zLld8AB7BjnhY="; }; - nativeBuildInputs = [ pkg-config wafHook ]; + nativeBuildInputs = [ + pkg-config + wafHook + ]; buildInputs = [ - gtk2 libjack2 lilv lv2 python3 serd sord sratom suil + gtk2 + libjack2 + lilv + lv2 + python3 + serd + sord + sratom + suil ]; meta = with lib; { From 424872f4a1c91a741d86ac9a9f80ccf9e15e61d8 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Tue, 22 Oct 2024 17:04:52 +0530 Subject: [PATCH 25/86] gummy: move to by-name --- .../misc/gummy/default.nix => by-name/gu/gummy/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/misc/gummy/default.nix => by-name/gu/gummy/package.nix} (100%) diff --git a/pkgs/tools/misc/gummy/default.nix b/pkgs/by-name/gu/gummy/package.nix similarity index 100% rename from pkgs/tools/misc/gummy/default.nix rename to pkgs/by-name/gu/gummy/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d7f8ed8d05a5..8d6e48cad8e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37081,8 +37081,6 @@ with pkgs; gummi = callPackage ../applications/misc/gummi { }; - gummy = callPackage ../tools/misc/gummy { }; - hashpump = callPackage ../tools/misc/hashpump { }; hck = callPackage ../tools/text/hck { }; From fc5b713c20aa29309f55c491a0a761303b7358e7 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Tue, 22 Oct 2024 17:09:05 +0530 Subject: [PATCH 26/86] gummy: add update script, use cmakeFeature --- pkgs/by-name/gu/gummy/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gu/gummy/package.nix b/pkgs/by-name/gu/gummy/package.nix index 628d5e9e7d16..7761ece19897 100644 --- a/pkgs/by-name/gu/gummy/package.nix +++ b/pkgs/by-name/gu/gummy/package.nix @@ -14,6 +14,7 @@ , fmt , nlohmann_json , spdlog +, nix-update-script }: stdenv.mkDerivation (finalAttrs: { @@ -46,8 +47,10 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DUDEV_DIR=${placeholder "out"}/lib/udev" - "-DUDEV_RULES_DIR=${placeholder "out"}/lib/udev/rules.d" + (lib.mapAttrsToList lib.cmakeFeature { + "UDEV_DIR" = "${placeholder "out"}/lib/udev"; + "UDEV_RULES_DIR" = "${placeholder "out"}/lib/udev/rules.d"; + }) ]; # Fixes the "gummy start" command, without this it cannot find the binary. @@ -65,6 +68,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; + passthru.updateScript = nix-update-script { }; meta = with lib; { homepage = "https://codeberg.org/fusco/gummy"; From 2bbb02137226b75e81658c584513993f17f88e1c Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Tue, 22 Oct 2024 11:40:36 +0000 Subject: [PATCH 27/86] gummy: 0.6.0 -> 0.6.1 --- pkgs/by-name/gu/gummy/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gu/gummy/package.nix b/pkgs/by-name/gu/gummy/package.nix index 7761ece19897..2b34d02d5b0a 100644 --- a/pkgs/by-name/gu/gummy/package.nix +++ b/pkgs/by-name/gu/gummy/package.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "gummy"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "fusco"; repo = "gummy"; rev = finalAttrs.version; - hash = "sha256-kATieFf+dEpcYgSEPoETacP7R+u2dOrg7rOhIkNQ1uE="; + hash = "sha256-ic+kTBoirMX6g79NdNoeFbNNo1LYg/z+nlt/GAB6UyQ="; }; nativeBuildInputs = [ From ca0aa4dabc25b5320909501cb6835a63be6db698 Mon Sep 17 00:00:00 2001 From: aleksana Date: Tue, 22 Oct 2024 20:03:31 +0800 Subject: [PATCH 28/86] jalv: 1.6.6 -> 1.6.8 --- pkgs/by-name/ja/jalv/package.nix | 71 ++++++++++++++++++++------------ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 47 insertions(+), 26 deletions(-) diff --git a/pkgs/by-name/ja/jalv/package.nix b/pkgs/by-name/ja/jalv/package.nix index 3c60f9c6413d..f801039fb069 100644 --- a/pkgs/by-name/ja/jalv/package.nix +++ b/pkgs/by-name/ja/jalv/package.nix @@ -1,50 +1,69 @@ { lib, stdenv, - fetchurl, - gtk2, + fetchFromGitHub, + libsForQt5, libjack2, lilv, lv2, + meson, + ninja, pkg-config, - python3, + portaudio, serd, sord, sratom, suil, - wafHook, + wrapGAppsHook3, + useJack ? true, + useQt ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jalv"; - version = "1.6.6"; + version = "1.6.8"; - src = fetchurl { - url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; - sha256 = "sha256-ktFBeBtmQ3MgfDQ868XpuM7UYfryb9zLld8AB7BjnhY="; + src = fetchFromGitHub { + owner = "drobilla"; + repo = "jalv"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-MAQoc+WcuoG6Psa44VRaZ2TWB2LBpvf6EmqbUZPUf38="; }; nativeBuildInputs = [ + meson + ninja pkg-config - wafHook - ]; - buildInputs = [ - gtk2 - libjack2 - lilv - lv2 - python3 - serd - sord - sratom - suil + ] ++ lib.optionals (!useQt) [ wrapGAppsHook3 ] ++ lib.optionals useQt [ libsForQt5.wrapQtAppsHook ]; + + buildInputs = + [ + lilv + lv2 + portaudio + serd + sord + sratom + suil + ] + ++ lib.optionals (!useJack) [ portaudio ] + ++ lib.optionals useJack [ libjack2 ] + ++ lib.optionals useQt [ libsForQt5.qtbase ]; + + mesonFlags = [ + (lib.mesonEnable "portaudio" (!useJack)) + (lib.mesonEnable "jack" useJack) + (lib.mesonEnable "gtk2" false) + (lib.mesonEnable "gtk3" (!useQt)) + (lib.mesonEnable "qt5" useQt) ]; - meta = with lib; { + meta = { description = "Simple but fully featured LV2 host for Jack"; homepage = "http://drobilla.net/software/jalv"; - license = licenses.isc; - maintainers = [ ]; - platforms = platforms.linux; + license = lib.licenses.isc; + mainProgram = if useQt then "jalv.qt5" else "jalv.gtk3"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3227959181d3..daab9a286474 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30229,6 +30229,8 @@ with pkgs; jaeles = callPackage ../tools/security/jaeles { }; + jalv-qt = jalv.override { useQt = true; }; + jameica = callPackage ../applications/office/jameica { inherit (darwin.apple_sdk.frameworks) Cocoa; }; From e39a50ebaa74e9f5bd1ca73fdf1975e4749ff1f1 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 22 Oct 2024 20:32:38 +0800 Subject: [PATCH 29/86] pantheon.wingpanel-indicator-power: 8.0.0 -> 8.0.1 https://github.com/elementary/wingpanel-indicator-power/compare/8.0.0...8.0.1 --- .../pantheon/desktop/wingpanel-indicators/power/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix index 74bd1be5f24e..7c4e18d7bebb 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-power"; - version = "8.0.0"; + version = "8.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-RelK4HIyTQ6kXi7/K8U33sKIrDrhA3IFVnnvX4x88UQ="; + sha256 = "sha256-zMvw96uRr9hrgXck+OhMiPku9qu8/zUtusiaJLUcuys="; }; patches = [ From bce77b92c607c68fda5606294317c3625671897e Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 22 Oct 2024 09:33:01 -0500 Subject: [PATCH 30/86] teams-for-linux: 1.11.0 -> 1.11.2 --- pkgs/by-name/te/teams-for-linux/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix index 547af6be14c3..fd30eb96dde8 100644 --- a/pkgs/by-name/te/teams-for-linux/package.nix +++ b/pkgs/by-name/te/teams-for-linux/package.nix @@ -15,16 +15,16 @@ buildNpmPackage rec { pname = "teams-for-linux"; - version = "1.11.0"; + version = "1.11.2"; src = fetchFromGitHub { owner = "IsmaelMartinez"; repo = "teams-for-linux"; rev = "refs/tags/v${version}"; - hash = "sha256-UNe4stYEOTcQc+ap1/v9EXjHTwKvLYd4t8EPuojDyqw="; + hash = "sha256-fSZ94Px0NuxUZqc9cHE6czG/VzNsWp+UXllq7kEQvtI="; }; - npmDepsHash = "sha256-OpoPXcSiHnK4UYFimY+yOM6M3dAOcvZ82DdGc++oNLM="; + npmDepsHash = "sha256-MfPdOqxiMDsvxsS3yWukRokDitqWQpTpK407xVX461o="; nativeBuildInputs = [ makeWrapper From edbaf29b2ae0e34bdc92df725454975c00358094 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 22 Oct 2024 10:49:20 -0500 Subject: [PATCH 31/86] teams-for-linux: add versionCheckProgramArg Don't waste time calling --help --- pkgs/by-name/te/teams-for-linux/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix index fd30eb96dde8..5150860c7a8c 100644 --- a/pkgs/by-name/te/teams-for-linux/package.nix +++ b/pkgs/by-name/te/teams-for-linux/package.nix @@ -109,6 +109,8 @@ buildNpmPackage rec { passthru.updateScript = nix-update-script { }; + versionCheckProgramArg = [ "--version" ]; + meta = { description = "Unofficial Microsoft Teams client for Linux"; mainProgram = "teams-for-linux"; From 2e30c260270a0dd3f2ee956ca99d0c5583a1d372 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 19 Oct 2024 20:02:05 -0500 Subject: [PATCH 32/86] rustdesk: 1.3.0 -> 1.3.1 --- pkgs/by-name/ru/rustdesk/Cargo.lock | 986 ++++++++++++--------------- pkgs/by-name/ru/rustdesk/package.nix | 16 +- 2 files changed, 445 insertions(+), 557 deletions(-) diff --git a/pkgs/by-name/ru/rustdesk/Cargo.lock b/pkgs/by-name/ru/rustdesk/Cargo.lock index 6ebeb4201503..406c1525a8f8 100644 --- a/pkgs/by-name/ru/rustdesk/Cargo.lock +++ b/pkgs/by-name/ru/rustdesk/Cargo.lock @@ -17,12 +17,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -[[package]] -name = "adler2" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" - [[package]] name = "aes" version = "0.8.4" @@ -54,7 +48,7 @@ dependencies = [ "cfg-if 1.0.0", "once_cell", "version_check", - "zerocopy 0.7.35", + "zerocopy 0.7.34", ] [[package]] @@ -101,13 +95,12 @@ checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "alsa" -version = "0.9.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed7572b7ba83a31e20d1b48970ee402d2e3e0537dcfe0a3ff4d6eb7508617d43" +checksum = "37fe60779335388a88c01ac6c3be40304d1e349de3ada3b15f7808bb90fa9dce" dependencies = [ "alsa-sys", "bitflags 2.6.0", - "cfg-if 1.0.0", "libc", ] @@ -175,9 +168,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.15" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", @@ -190,33 +183,33 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.8" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" -version = "0.2.5" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.4" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -231,17 +224,17 @@ checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "arboard" version = "3.4.0" -source = "git+https://github.com/rustdesk-org/arboard#a04bdb1b368a99691822c33bf0f7ed497d6a7a35" +source = "git+https://github.com/rustdesk-org/arboard#747ab2d9b40a5c9c5102051cf3b0bb38b4845e60" dependencies = [ "clipboard-win", "core-graphics 0.23.2", - "image 0.25.2", + "image 0.25.1", "log", "objc2 0.5.2", "objc2-app-kit", "objc2-foundation", "parking_lot", - "serde 1.0.209", + "serde 1.0.203", "serde_derive", "windows-sys 0.48.0", "wl-clipboard-rs", @@ -272,9 +265,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.12" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" +checksum = "cd066d0b4ef8ecb03a55319dc13aa6910616d0f44008a045bb1835af830abff5" dependencies = [ "flate2", "futures-core", @@ -285,13 +278,13 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.13.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" +checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" dependencies = [ "async-task", "concurrent-queue", - "fastrand 2.1.1", + "fastrand 2.1.0", "futures-lite 2.3.0", "slab", ] @@ -330,9 +323,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.4" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" dependencies = [ "async-lock 3.4.0", "cfg-if 1.0.0", @@ -340,11 +333,11 @@ dependencies = [ "futures-io", "futures-lite 2.3.0", "parking", - "polling 3.7.3", + "polling 3.7.2", "rustix 0.38.34", "slab", "tracing", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -391,17 +384,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] name = "async-signal" -version = "0.2.10" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" +checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" dependencies = [ - "async-io 2.3.4", + "async-io 2.3.3", "async-lock 3.4.0", "atomic-waker", "cfg-if 1.0.0", @@ -410,7 +403,7 @@ dependencies = [ "rustix 0.38.34", "signal-hook-registry", "slab", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -421,13 +414,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -501,7 +494,7 @@ dependencies = [ "cc", "cfg-if 1.0.0", "libc", - "miniz_oxide 0.7.4", + "miniz_oxide", "object", "rustc-demangle", ] @@ -546,7 +539,7 @@ dependencies = [ "log", "peeking_take_while", "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "regex", "rustc-hash", "shlex", @@ -568,11 +561,11 @@ dependencies = [ "peeking_take_while", "prettyplease", "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "regex", "rustc-hash", "shlex", - "syn 2.0.76", + "syn 2.0.68", "which", ] @@ -589,11 +582,11 @@ dependencies = [ "lazy_static", "lazycell", "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "regex", "rustc-hash", "shlex", - "syn 2.0.76", + "syn 2.0.68", ] [[package]] @@ -614,7 +607,7 @@ version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" dependencies = [ - "serde 1.0.209", + "serde 1.0.203", ] [[package]] @@ -623,8 +616,8 @@ version = "2.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afb15541e888071f64592c0b4364fdff21b7cb0a247f984296699351963a8721" dependencies = [ - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -730,9 +723,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.17.0" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fd4c6dcc3b0aea2f5c0b4b82c2b15fe39ddbc76041a310848f4706edf76bb31" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" [[package]] name = "byteorder" @@ -740,19 +733,13 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" -[[package]] -name = "byteorder-lite" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" - [[package]] name = "bytes" -version = "1.7.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" dependencies = [ - "serde 1.0.209", + "serde 1.0.203", ] [[package]] @@ -821,13 +808,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.14" +version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d2eb3cd3d1bf4529e31c215ee6f93ec5a3d536d9f578f93d9d33ee19562932" +checksum = "779e6b7d17797c0b42023d417228c02889300190e700cb074c3438d9c541d332" dependencies = [ "jobserver", "libc", - "shlex", + "once_cell", ] [[package]] @@ -890,7 +877,7 @@ dependencies = [ "js-sys", "num-traits 0.2.19", "wasm-bindgen", - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -924,7 +911,7 @@ checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", - "libloading 0.8.5", + "libloading 0.8.4", ] [[package]] @@ -944,18 +931,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.16" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" +checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.15" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" +checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708" dependencies = [ "anstream", "anstyle", @@ -965,9 +952,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" +checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" [[package]] name = "clipboard" @@ -984,7 +971,7 @@ dependencies = [ "parking_lot", "percent-encoding", "rand 0.8.5", - "serde 1.0.209", + "serde 1.0.203", "serde_derive", "thiserror", "utf16string", @@ -1029,9 +1016,9 @@ dependencies = [ [[package]] name = "cmake" -version = "0.1.51" +version = "0.1.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" +checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" dependencies = [ "cc", ] @@ -1044,7 +1031,7 @@ checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" dependencies = [ "bitflags 1.3.2", "block", - "cocoa-foundation 0.1.2", + "cocoa-foundation", "core-foundation 0.9.4", "core-graphics 0.22.3", "foreign-types 0.3.2", @@ -1060,7 +1047,7 @@ checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" dependencies = [ "bitflags 1.3.2", "block", - "cocoa-foundation 0.1.2", + "cocoa-foundation", "core-foundation 0.9.4", "core-graphics 0.23.2", "foreign-types 0.5.0", @@ -1068,22 +1055,6 @@ dependencies = [ "objc", ] -[[package]] -name = "cocoa" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79398230a6e2c08f5c9760610eb6924b52aa9e7950a619602baba59dcbbdbb2" -dependencies = [ - "bitflags 2.6.0", - "block", - "cocoa-foundation 0.2.0", - "core-foundation 0.10.0", - "core-graphics 0.24.0", - "foreign-types 0.5.0", - "libc", - "objc", -] - [[package]] name = "cocoa-foundation" version = "0.1.2" @@ -1098,20 +1069,6 @@ dependencies = [ "objc", ] -[[package]] -name = "cocoa-foundation" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14045fb83be07b5acf1c0884b2180461635b433455fa35d1cd6f17f1450679d" -dependencies = [ - "bitflags 2.6.0", - "block", - "core-foundation 0.10.0", - "core-graphics-types 0.2.0", - "libc", - "objc", -] - [[package]] name = "color_quant" version = "1.1.0" @@ -1120,9 +1077,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "colorchoice" -version = "1.0.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] name = "combine" @@ -1149,7 +1106,7 @@ version = "0.4.0-2" source = "git+https://github.com/rustdesk-org/confy#83db9ec19a2f97e9718aef69e4fc5611bb382479" dependencies = [ "directories-next", - "serde 1.0.209", + "serde 1.0.203", "thiserror", "toml 0.5.11", ] @@ -1186,8 +1143,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "unicode-xid 0.2.5", + "quote 1.0.36", + "unicode-xid 0.2.4", ] [[package]] @@ -1207,7 +1164,7 @@ 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", + "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc", ] @@ -1217,33 +1174,15 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ - "core-foundation-sys 0.8.7", - "libc", -] - -[[package]] -name = "core-foundation" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" -dependencies = [ - "core-foundation-sys 0.8.7", + "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", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "core-graphics" @@ -1284,19 +1223,6 @@ dependencies = [ "libc", ] -[[package]] -name = "core-graphics" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1" -dependencies = [ - "bitflags 2.6.0", - "core-foundation 0.10.0", - "core-graphics-types 0.2.0", - "foreign-types 0.5.0", - "libc", -] - [[package]] name = "core-graphics-types" version = "0.1.2" @@ -1319,17 +1245,6 @@ dependencies = [ "libc", ] -[[package]] -name = "core-graphics-types" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" -dependencies = [ - "bitflags 2.6.0", - "core-foundation 0.10.0", - "libc", -] - [[package]] name = "coreaudio-rs" version = "0.11.3" @@ -1337,7 +1252,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace" dependencies = [ "bitflags 1.3.2", - "core-foundation-sys 0.8.7", + "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "coreaudio-sys", ] @@ -1357,7 +1272,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "873dab07c8f743075e57f524c583985fbaf745602acbe916a01539364369a779" dependencies = [ "alsa", - "core-foundation-sys 0.8.7", + "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "coreaudio-rs", "dasp_sample", "jni 0.21.1", @@ -1375,9 +1290,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.13" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] @@ -1452,12 +1367,12 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.4.5" +version = "3.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3" +checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345" dependencies = [ - "nix 0.29.0", - "windows-sys 0.59.0", + "nix 0.28.0", + "windows-sys 0.52.0", ] [[package]] @@ -1660,7 +1575,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "syn 1.0.109", ] @@ -1760,7 +1675,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.5", + "libloading 0.8.4", ] [[package]] @@ -1794,7 +1709,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a09ac8bb8c16a282264c379dffba707b9c998afc7506009137f3c6136888078" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "syn 1.0.109", ] @@ -1823,7 +1738,7 @@ checksum = "7f3f119846c823f9eafcf953a8f6ffb6ed69bf6240883261a7f13b634579a51f" dependencies = [ "lazy_static", "regex", - "serde 1.0.209", + "serde 1.0.203", "strsim 0.10.0", ] @@ -1852,7 +1767,7 @@ dependencies = [ "cc", "hbb_common", "lazy_static", - "serde 1.0.209", + "serde 1.0.203", "serde_derive", "thiserror", ] @@ -1891,7 +1806,7 @@ dependencies = [ "objc", "pkg-config", "rdev", - "serde 1.0.209", + "serde 1.0.203", "serde_derive", "tfc", "unicode-segmentation", @@ -1923,8 +1838,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -1934,7 +1849,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" dependencies = [ "enumflags2_derive", - "serde 1.0.209", + "serde 1.0.203", ] [[package]] @@ -1944,8 +1859,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -2064,7 +1979,7 @@ dependencies = [ "flume", "half", "lebe", - "miniz_oxide 0.7.4", + "miniz_oxide", "rayon-core", "smallvec", "zune-inflate", @@ -2081,9 +1996,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fdeflate" @@ -2106,14 +2021,14 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.24" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if 1.0.0", "libc", - "libredox", - "windows-sys 0.59.0", + "redox_syscall 0.4.1", + "windows-sys 0.52.0", ] [[package]] @@ -2124,12 +2039,12 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.33" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", - "miniz_oxide 0.8.0", + "miniz_oxide", ] [[package]] @@ -2232,8 +2147,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -2366,7 +2281,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.1.1", + "fastrand 2.1.0", "futures-core", "futures-io", "parking", @@ -2380,8 +2295,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -2655,7 +2570,7 @@ dependencies = [ "proc-macro-crate 0.1.5", "proc-macro-error", "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "syn 1.0.109", ] @@ -2669,8 +2584,8 @@ dependencies = [ "proc-macro-crate 2.0.2", "proc-macro-error", "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -2902,8 +2817,8 @@ dependencies = [ "proc-macro-crate 1.3.1", "proc-macro-error", "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -2985,9 +2900,9 @@ dependencies = [ "regex", "rustls-pki-types", "rustls-platform-verifier", - "serde 1.0.209", + "serde 1.0.203", "serde_derive", - "serde_json 1.0.127", + "serde_json 1.0.118", "socket2 0.3.19", "sodiumoxide", "sysinfo", @@ -3001,7 +2916,7 @@ dependencies = [ "url", "uuid", "winapi 0.3.9", - "zstd 0.13.2", + "zstd 0.13.1", ] [[package]] @@ -3128,21 +3043,21 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hwcodec" version = "0.7.0" -source = "git+https://github.com/rustdesk-org/hwcodec#6abd1898f3a03481ed0c038507b5218d6ea94267" +source = "git+https://github.com/rustdesk-org/hwcodec#f74410edec91435252b8394c38f8eeca87ad2a26" dependencies = [ "bindgen 0.59.2", "cc", "log", - "serde 1.0.209", + "serde 1.0.203", "serde_derive", - "serde_json 1.0.127", + "serde_json 1.0.118", ] [[package]] name = "hyper" -version = "0.14.30" +version = "0.14.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" +checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" dependencies = [ "bytes", "futures-channel", @@ -3196,7 +3111,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", - "core-foundation-sys 0.8.7", + "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", @@ -3242,12 +3157,12 @@ dependencies = [ [[package]] name = "image" -version = "0.25.2" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" +checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" dependencies = [ "bytemuck", - "byteorder-lite", + "byteorder", "num-traits 0.2.19", "png", "tiff", @@ -3277,14 +3192,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", ] [[package]] name = "indexmap" -version = "2.4.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -3347,11 +3262,11 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" -version = "0.4.13" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ - "hermit-abi 0.4.0", + "hermit-abi 0.3.9", "libc", "windows-sys 0.52.0", ] @@ -3364,9 +3279,9 @@ checksum = "06d198e9919d9822d5f7083ba8530e04de87841eaf21ead9af8f2304efd57c89" [[package]] name = "is_terminal_polyfill" -version = "1.70.1" +version = "1.70.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" [[package]] name = "itertools" @@ -3436,9 +3351,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.32" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] @@ -3454,9 +3369,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -3492,7 +3407,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a" dependencies = [ "bitflags 2.6.0", - "serde 1.0.209", + "serde 1.0.203", "unicode-segmentation", ] @@ -3540,9 +3455,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.158" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libdbus-sys" @@ -3577,12 +3492,12 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.5" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" +checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" dependencies = [ "cfg-if 1.0.0", - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -3647,7 +3562,6 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.6.0", "libc", - "redox_syscall 0.5.3", ] [[package]] @@ -3692,9 +3606,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.20" +version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" +checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" dependencies = [ "cc", "libc", @@ -3702,6 +3616,12 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "line-wrap" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e" + [[package]] name = "linux-raw-sys" version = "0.3.8" @@ -3845,15 +3765,6 @@ dependencies = [ "simd-adler32", ] -[[package]] -name = "miniz_oxide" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" -dependencies = [ - "adler2", -] - [[package]] name = "mio" version = "0.8.11" @@ -3866,25 +3777,13 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "mio" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" -dependencies = [ - "hermit-abi 0.3.9", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.52.0", -] - [[package]] name = "muda" -version = "0.14.1" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba8ac4080fb1e097c2c22acae467e46e4da72d941f02e82b67a87a2a89fa38b1" +checksum = "86b959f97c97044e4c96e32e1db292a7d594449546a3c6b77ae613dc3a5b5145" dependencies = [ - "cocoa 0.26.0", + "cocoa 0.25.0", "crossbeam-channel", "dpi", "gtk", @@ -3894,7 +3793,7 @@ dependencies = [ "once_cell", "png", "thiserror", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -3956,7 +3855,7 @@ dependencies = [ "jni-sys", "log", "ndk-sys 0.5.0+25.2.9519653", - "num_enum 0.7.3", + "num_enum 0.7.2", "thiserror", ] @@ -4143,7 +4042,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "syn 1.0.109", ] @@ -4154,8 +4053,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -4217,11 +4116,11 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" dependencies = [ - "num_enum_derive 0.7.3", + "num_enum_derive 0.7.2", ] [[package]] @@ -4232,20 +4131,20 @@ checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "syn 1.0.109", ] [[package]] name = "num_enum_derive" -version = "0.7.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ "proc-macro-crate 2.0.2", "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -4423,9 +4322,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.3" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" dependencies = [ "memchr", ] @@ -4461,9 +4360,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "openssl" -version = "0.10.66" +version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ "bitflags 2.6.0", "cfg-if 1.0.0", @@ -4481,8 +4380,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -4493,9 +4392,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.103" +version = "0.9.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", @@ -4548,18 +4447,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092" dependencies = [ "log", - "serde 1.0.209", + "serde 1.0.203", "windows-sys 0.52.0", ] [[package]] name = "os_pipe" -version = "1.2.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffd2b0a5634335b135d5728d84c5e0fd726954b87111f7506a61c502280d982" +checksum = "29d73ba8daf8fac13b0501d1abeddcfe21ba7401ada61a819144b6c2a4f32209" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -4568,9 +4467,9 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38731fa859ef679f1aec66ca9562165926b442f298467f76f5990f431efe87dc" dependencies = [ - "serde 1.0.209", + "serde 1.0.203", "serde_derive", - "serde_json 1.0.127", + "serde_json 1.0.118", ] [[package]] @@ -4601,7 +4500,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c94f3b9b97df3c6d4e51a14916639b24e02c7d15d1dba686ce9b1118277cb811" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "syn 1.0.109", ] @@ -4676,9 +4575,9 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.5.3", + "redox_syscall 0.5.2", "smallvec", - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -4786,8 +4685,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -4804,12 +4703,12 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.4" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" dependencies = [ "atomic-waker", - "fastrand 2.1.1", + "fastrand 2.1.0", "futures-io", ] @@ -4821,14 +4720,15 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "plist" -version = "1.7.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" +checksum = "d9d34169e64b3c7a80c8621a48adaf44e0cf62c78a9b25dd9dd35f1881a17cf9" dependencies = [ - "base64 0.22.1", + "base64 0.21.7", "indexmap", - "quick-xml 0.32.0", - "serde 1.0.209", + "line-wrap", + "quick-xml 0.31.0", + "serde 1.0.203", "time 0.3.36", ] @@ -4842,7 +4742,7 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.7.4", + "miniz_oxide", ] [[package]] @@ -4863,9 +4763,9 @@ dependencies = [ [[package]] name = "polling" -version = "3.7.3" +version = "3.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" dependencies = [ "cfg-if 1.0.0", "concurrent-queue", @@ -4873,7 +4773,7 @@ dependencies = [ "pin-project-lite", "rustix 0.38.34", "tracing", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -4884,12 +4784,9 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.20" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" -dependencies = [ - "zerocopy 0.7.35", -] +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "pretty-hex" @@ -4899,12 +4796,12 @@ checksum = "bc5c99d529f0d30937f6f4b8a86d988047327bb88d04d2c4afc356de74722131" [[package]] name = "prettyplease" -version = "0.2.22" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" +checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" dependencies = [ "proc-macro2 1.0.86", - "syn 2.0.76", + "syn 2.0.68", ] [[package]] @@ -4953,7 +4850,7 @@ checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "syn 1.0.109", "version_check", ] @@ -4965,7 +4862,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "version_check", ] @@ -4989,9 +4886,9 @@ dependencies = [ [[package]] name = "protobuf" -version = "3.5.1" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bcc343da15609eaecd65f8aa76df8dc4209d325131d8219358c0aaaebab0bf6" +checksum = "df67496db1a89596beaced1579212e9b7c53c22dca1d9745de00ead76573d514" dependencies = [ "bytes", "once_cell", @@ -5001,9 +4898,9 @@ dependencies = [ [[package]] name = "protobuf-codegen" -version = "3.5.1" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4d0cde5642ea4df842b13eb9f59ea6fafa26dcb43e3e1ee49120e9757556189" +checksum = "eab09155fad2d39333d3796f67845d43e29b266eea74f7bc93f153f707f126dc" dependencies = [ "anyhow", "once_cell", @@ -5016,9 +4913,9 @@ dependencies = [ [[package]] name = "protobuf-parse" -version = "3.5.1" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b0e9b447d099ae2c4993c0cbb03c7a9d6c937b17f2d56cfc0b1550e6fcfdb76" +checksum = "1a16027030d4ec33e423385f73bb559821827e9ec18c50e7874e4d6de5a4e96f" dependencies = [ "anyhow", "indexmap", @@ -5032,9 +4929,9 @@ dependencies = [ [[package]] name = "protobuf-support" -version = "3.5.1" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0766e3675a627c327e4b3964582594b0e8741305d628a98a5de75a1d15f99b9" +checksum = "70e2d30ab1878b2e72d1e2fc23ff5517799c9929e2cf81a8516f9f4dcf2b9cf3" dependencies = [ "thiserror", ] @@ -5089,9 +4986,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.32.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" dependencies = [ "memchr", ] @@ -5116,9 +5013,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.37" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2 1.0.86", ] @@ -5300,11 +5197,11 @@ dependencies = [ [[package]] name = "rdev" version = "0.5.0-2" -source = "git+https://github.com/rustdesk-org/rdev#b3434caee84c92412b45a2f655a15ac5dad33488" +source = "git+https://github.com/rustdesk-org/rdev#d4c1759926d693ba269e2cb8cf9f87b13e424e4e" dependencies = [ "cocoa 0.24.1", "core-foundation 0.9.4", - "core-foundation-sys 0.8.7", + "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.22.3", "dispatch", "enum-map", @@ -5313,7 +5210,7 @@ dependencies = [ "lazy_static", "libc", "log", - "mio 0.8.11", + "mio", "strum 0.24.1", "strum_macros 0.24.3", "widestring", @@ -5350,18 +5247,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.3" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" dependencies = [ "bitflags 2.6.0", ] [[package]] name = "redox_users" -version = "0.4.6" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ "getrandom", "libredox", @@ -5370,9 +5267,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.6" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", @@ -5435,15 +5332,15 @@ dependencies = [ "rustls 0.21.12", "rustls-native-certs 0.6.3", "rustls-pemfile 1.0.4", - "serde 1.0.209", - "serde_json 1.0.127", + "serde 1.0.203", + "serde_json 1.0.118", "serde_urlencoded", "sync_wrapper", "system-configuration", "tokio", "tokio-native-tls", "tokio-rustls 0.24.1", - "tokio-socks 0.5.2", + "tokio-socks 0.5.1", "tokio-util", "tower-service", "url", @@ -5575,7 +5472,7 @@ dependencies = [ [[package]] name = "rustdesk" -version = "1.3.0" +version = "1.3.1" dependencies = [ "android-wakelock", "android_logger", @@ -5587,7 +5484,7 @@ dependencies = [ "cfg-if 1.0.0", "chrono", "cidr-utils", - "clap 4.5.16", + "clap 4.5.8", "clipboard", "clipboard-master", "cocoa 0.24.1", @@ -5607,6 +5504,7 @@ dependencies = [ "flutter_rust_bridge", "fon", "fruitbasket", + "gtk", "hbb_common", "hex", "hound", @@ -5616,11 +5514,12 @@ dependencies = [ "jni 0.21.1", "keepawake", "lazy_static", - "libloading 0.8.5", + "libloading 0.8.4", "libpulse-binding", "libpulse-simple-binding", "mac_address", "magnum-opus", + "nix 0.29.0", "num_cpus", "objc", "objc_id", @@ -5641,9 +5540,9 @@ dependencies = [ "samplerate", "sciter-rs", "scrap", - "serde 1.0.209", + "serde 1.0.203", "serde_derive", - "serde_json 1.0.127", + "serde_json 1.0.118", "serde_repr", "sha2", "shared_memory", @@ -5652,6 +5551,7 @@ dependencies = [ "system_shutdown", "tao", "tauri-winrt-notification", + "termios", "totp-rs", "tray-icon", "url", @@ -5672,7 +5572,7 @@ dependencies = [ [[package]] name = "rustdesk-portable-packer" -version = "1.3.0" +version = "1.3.1" dependencies = [ "brotli", "dirs 5.0.1", @@ -5738,15 +5638,15 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.12" +version = "0.23.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402" dependencies = [ "log", "once_cell", "ring", "rustls-pki-types", - "rustls-webpki 0.102.6", + "rustls-webpki 0.102.4", "subtle", "zeroize", ] @@ -5765,12 +5665,12 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.7.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04182dffc9091a404e0fc069ea5cd60e5b866c3adf881eff99a32d048242dffa" +checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" dependencies = [ "openssl-probe", - "rustls-pemfile 2.1.3", + "rustls-pemfile 2.1.2", "rustls-pki-types", "schannel", "security-framework", @@ -5787,9 +5687,9 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.3" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ "base64 0.22.1", "rustls-pki-types", @@ -5797,25 +5697,25 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.8.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] name = "rustls-platform-verifier" -version = "0.3.4" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afbb878bdfdf63a336a5e63561b1835e7a8c91524f51621db870169eac84b490" +checksum = "3e3beb939bcd33c269f4bf946cc829fcd336370267c4a927ac0399c84a3151a1" dependencies = [ "core-foundation 0.9.4", - "core-foundation-sys 0.8.7", + "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "jni 0.19.0", "log", "once_cell", - "rustls 0.23.12", - "rustls-native-certs 0.7.2", + "rustls 0.23.10", + "rustls-native-certs 0.7.0", "rustls-platform-verifier-android", - "rustls-webpki 0.102.6", + "rustls-webpki 0.102.4", "security-framework", "security-framework-sys", "webpki-roots 0.26.3", @@ -5824,9 +5724,9 @@ dependencies = [ [[package]] name = "rustls-platform-verifier-android" -version = "0.1.1" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" +checksum = "84e217e7fdc8466b5b35d30f8c0a30febd29173df4a3a0c2115d306b9c4117ad" [[package]] name = "rustls-webpki" @@ -5840,9 +5740,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.102.6" +version = "0.102.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" dependencies = [ "ring", "rustls-pki-types", @@ -5935,8 +5835,8 @@ dependencies = [ "pkg-config", "quest", "repng", - "serde 1.0.209", - "serde_json 1.0.127", + "serde 1.0.203", + "serde_json 1.0.118", "target_build_utils", "tracing", "webm", @@ -5955,13 +5855,13 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.11.1" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" dependencies = [ - "bitflags 2.6.0", + "bitflags 1.3.2", "core-foundation 0.9.4", - "core-foundation-sys 0.8.7", + "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc", "num-bigint", "security-framework-sys", @@ -5969,11 +5869,11 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.1" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" dependencies = [ - "core-foundation-sys 0.8.7", + "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc", ] @@ -5991,22 +5891,22 @@ checksum = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af" [[package]] name = "serde" -version = "1.0.209" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.209" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -6023,14 +5923,13 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.127" +version = "1.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" +checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4" dependencies = [ "itoa 1.0.11", - "memchr", "ryu", - "serde 1.0.209", + "serde 1.0.203", ] [[package]] @@ -6040,17 +5939,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] name = "serde_spanned" -version = "0.6.7" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ - "serde 1.0.209", + "serde 1.0.203", ] [[package]] @@ -6062,7 +5961,7 @@ dependencies = [ "form_urlencoded", "itoa 1.0.11", "ryu", - "serde 1.0.209", + "serde 1.0.203", ] [[package]] @@ -6207,7 +6106,7 @@ dependencies = [ "ed25519", "libc", "libsodium-sys", - "serde 1.0.209", + "serde 1.0.203", ] [[package]] @@ -6269,7 +6168,7 @@ checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c" dependencies = [ "heck 0.3.3", "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "syn 1.0.109", ] @@ -6281,7 +6180,7 @@ checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ "heck 0.4.1", "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "rustversion", "syn 1.0.109", ] @@ -6310,18 +6209,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.76" +version = "2.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525" +checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "unicode-ident", ] @@ -6346,7 +6245,7 @@ version = "0.29.10" source = "git+https://github.com/rustdesk-org/sysinfo?branch=rlim_max#90b1705d909a4902dbbbdea37ee64db17841077d" dependencies = [ "cfg-if 1.0.0", - "core-foundation-sys 0.8.7", + "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc", "ntapi", "once_cell", @@ -6371,7 +6270,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" dependencies = [ - "core-foundation-sys 0.8.7", + "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc", ] @@ -6459,7 +6358,7 @@ version = "0.1.2" source = "git+https://github.com/rustdesk-org/tao?branch=dev#288c219cb0527e509590c2b2d8e7072aa9feb2d3" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "syn 1.0.109", ] @@ -6471,9 +6370,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "target-lexicon" -version = "0.12.16" +version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "target_build_utils" @@ -6498,15 +6397,14 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.12.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if 1.0.0", - "fastrand 2.1.1", - "once_cell", + "fastrand 2.1.0", "rustix 0.38.34", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -6539,7 +6437,7 @@ dependencies = [ [[package]] name = "tfc" version = "0.7.0" -source = "git+https://github.com/rustdesk-org/The-Fat-Controller?branch=history/rebase_upstream_20240722#87a6450f17659edba0cad669d9b57e8775479917" +source = "git+https://github.com/rustdesk-org/The-Fat-Controller?branch=history/rebase_upstream_20240722#de9c8ba480f166a9fc90aaa47bb0e84b443ea9c6" dependencies = [ "anyhow", "core-graphics 0.23.2", @@ -6550,22 +6448,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -6611,7 +6509,7 @@ dependencies = [ "num-conv", "num_threads", "powerfmt", - "serde 1.0.209", + "serde 1.0.203", "time-core", "time-macros", ] @@ -6634,9 +6532,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.8.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" dependencies = [ "tinyvec_macros", ] @@ -6649,31 +6547,32 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.39.3" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", "libc", - "mio 1.0.2", + "mio", + "num_cpus", "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2 0.5.7", "tokio-macros", - "windows-sys 0.52.0", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.4.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -6702,11 +6601,23 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.12", + "rustls 0.23.10", "rustls-pki-types", "tokio", ] +[[package]] +name = "tokio-socks" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0" +dependencies = [ + "either", + "futures-util", + "thiserror", + "tokio", +] + [[package]] name = "tokio-socks" version = "0.5.2-1" @@ -6723,18 +6634,6 @@ dependencies = [ "tokio-util", ] -[[package]] -name = "tokio-socks" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f" -dependencies = [ - "either", - "futures-util", - "thiserror", - "tokio", -] - [[package]] name = "tokio-util" version = "0.7.11" @@ -6758,7 +6657,7 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ - "serde 1.0.209", + "serde 1.0.203", ] [[package]] @@ -6767,7 +6666,7 @@ version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ - "serde 1.0.209", + "serde 1.0.203", "serde_spanned", "toml_datetime", "toml_edit 0.19.15", @@ -6779,7 +6678,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" dependencies = [ - "serde 1.0.209", + "serde 1.0.203", "serde_spanned", "toml_datetime", "toml_edit 0.20.2", @@ -6791,7 +6690,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" dependencies = [ - "serde 1.0.209", + "serde 1.0.203", ] [[package]] @@ -6801,7 +6700,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ "indexmap", - "serde 1.0.209", + "serde 1.0.203", "serde_spanned", "toml_datetime", "winnow", @@ -6814,7 +6713,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" dependencies = [ "indexmap", - "serde 1.0.209", + "serde 1.0.203", "serde_spanned", "toml_datetime", "winnow", @@ -6822,9 +6721,9 @@ dependencies = [ [[package]] name = "totp-rs" -version = "5.6.0" +version = "5.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17b2f27dad992486c26b4e7455f38aa487e838d6d61b57e72906ee2b8c287a90" +checksum = "6c4ae9724c5888c0417d2396037ed3b60665925624766416e3e342b6ba5dbd3f" dependencies = [ "base32", "constant_time_eq 0.2.6", @@ -6838,9 +6737,9 @@ dependencies = [ [[package]] name = "tower-service" -version = "0.3.3" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" @@ -6860,8 +6759,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -6885,10 +6784,10 @@ dependencies = [ [[package]] name = "tray-icon" -version = "0.15.1" -source = "git+https://github.com/tauri-apps/tray-icon#759f6a74fdcbcd979d3d39a2c9c2bc6a54e5e739" +version = "0.14.3" +source = "git+https://github.com/tauri-apps/tray-icon#d4078696edba67b0ab42cef67e6a421a0332c96f" dependencies = [ - "core-graphics 0.24.0", + "core-graphics 0.23.2", "crossbeam-channel", "dirs 5.0.1", "libappindicator", @@ -6899,7 +6798,7 @@ dependencies = [ "once_cell", "png", "thiserror", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -7029,9 +6928,9 @@ checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" [[package]] name = "unicode-xid" -version = "0.2.5" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "untrusted" @@ -7048,7 +6947,7 @@ dependencies = [ "form_urlencoded", "idna", "percent-encoding", - "serde 1.0.209", + "serde 1.0.203", ] [[package]] @@ -7100,9 +6999,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.10.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" dependencies = [ "getrandom", ] @@ -7133,9 +7032,9 @@ checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" [[package]] name = "version_check" -version = "0.9.5" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "virtual_display" @@ -7203,35 +7102,34 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if 1.0.0", - "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.43" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -7241,32 +7139,32 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ - "quote 1.0.37", + "quote 1.0.36", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wayland-backend" @@ -7327,7 +7225,7 @@ checksum = "d7b56f89937f1cf2ee1f1259cf2936a17a1f45d8f0aa1019fae6d470d304cfa6" dependencies = [ "proc-macro2 1.0.86", "quick-xml 0.34.0", - "quote 1.0.37", + "quote 1.0.36", ] [[package]] @@ -7343,9 +7241,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.70" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -7456,11 +7354,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.9" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -7541,7 +7439,7 @@ dependencies = [ "windows-core 0.52.0", "windows-implement", "windows-interface", - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -7551,7 +7449,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" dependencies = [ "windows-core 0.54.0", - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -7569,7 +7467,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -7579,7 +7477,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" dependencies = [ "windows-result", - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -7589,8 +7487,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12168c33176773b86799be25e2a2ba07c7aab9968b37541f1094dbd7a60c8946" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -7600,8 +7498,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d8dc32e0095a7eeccebd0e3f09e9509365ecb3fc6ac4d6f5f14a3f6392942d1" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -7610,7 +7508,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" dependencies = [ - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -7648,16 +7546,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -dependencies = [ - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -7692,18 +7581,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -7712,7 +7601,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515" dependencies = [ - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -7738,9 +7627,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -7768,9 +7657,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -7798,15 +7687,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" [[package]] name = "windows_i686_gnullvm" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -7834,9 +7723,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -7864,9 +7753,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -7882,9 +7771,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -7912,9 +7801,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" @@ -8077,12 +7966,12 @@ checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" [[package]] name = "xdg-home" -version = "1.3.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" +checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -8113,7 +8002,7 @@ dependencies = [ "once_cell", "ordered-stream", "rand 0.8.5", - "serde 1.0.209", + "serde 1.0.203", "serde_repr", "sha1", "static_assertions", @@ -8134,7 +8023,7 @@ checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "regex", "syn 1.0.109", "zvariant_utils", @@ -8146,7 +8035,7 @@ version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" dependencies = [ - "serde 1.0.209", + "serde 1.0.203", "static_assertions", "zvariant", ] @@ -8163,12 +8052,11 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.35" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" dependencies = [ - "byteorder", - "zerocopy-derive 0.7.35", + "zerocopy-derive 0.7.34", ] [[package]] @@ -8178,19 +8066,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] name = "zerocopy-derive" -version = "0.7.35" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -8230,11 +8118,11 @@ dependencies = [ [[package]] name = "zstd" -version = "0.13.2" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" +checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" dependencies = [ - "zstd-safe 7.2.1", + "zstd-safe 7.1.0", ] [[package]] @@ -8249,18 +8137,18 @@ dependencies = [ [[package]] name = "zstd-safe" -version = "7.2.1" +version = "7.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" +checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" dependencies = [ "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.13+zstd.1.5.6" +version = "2.0.11+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" +checksum = "75652c55c0b6f3e6f12eb786fe1bc960396bf05a1eb3bf1f3691c3610ac2e6d4" dependencies = [ "cc", "pkg-config", @@ -8284,7 +8172,7 @@ dependencies = [ "byteorder", "enumflags2", "libc", - "serde 1.0.209", + "serde 1.0.203", "static_assertions", "zvariant_derive", ] @@ -8297,7 +8185,7 @@ checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "syn 1.0.109", "zvariant_utils", ] @@ -8309,6 +8197,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "syn 1.0.109", ] diff --git a/pkgs/by-name/ru/rustdesk/package.nix b/pkgs/by-name/ru/rustdesk/package.nix index b038c6c38333..ed94f97802dc 100644 --- a/pkgs/by-name/ru/rustdesk/package.nix +++ b/pkgs/by-name/ru/rustdesk/package.nix @@ -37,26 +37,26 @@ rustPlatform.buildRustPackage rec { pname = "rustdesk"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "rustdesk"; repo = "rustdesk"; rev = version; - hash = "sha256-pDGURsF0eft2BkuXOzaMtNCHp9VFgZZh4bbNRa5NDII="; + hash = "sha256-PioaSdvgJ9oXC5DAbl+em7rxcGx1om9+sjCMdrvox90="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "android-wakelock-0.1.0" = "sha256-09EH/U1BBs3l4galQOrTKmPUYBgryUjfc/rqPZhdYc4="; - "arboard-3.4.0" = "sha256-lZIG5z115ExR6DcUut1rk9MrYFzSyCYH9kNGIikOPJM="; + "arboard-3.4.0" = "sha256-xuMfMakHVj/zjiUr6PVFy+aNQxwsXtAAFlTYxUt12fU="; "cacao-0.4.0-beta2" = "sha256-U5tCLeVxjmZCm7ti1u71+i116xmozPaR69pCsA4pxrM="; "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.7.0" = "sha256-pfzcaD7h/U5ou+P7qRLR56iXOkm043rF74y+Q0FsVLo="; + "hwcodec-0.7.0" = "sha256-SswZI2BJ4pRXT379cziJlisPsc5sOiOiDqJ5WaPETnA="; "impersonate_system-0.1.0" = "sha256-pIV7s2qGoCIUrhaRovBDCJaGQ/pMdJacDXJmeBpkcyI="; "keepawake-0.4.3" = "sha256-cqSpkq/PCz+5+ZUyPy5hF6rP3fBzuZDywyxMUQ50Rk4="; "machine-uid-0.3.0" = "sha256-rEOyNThg6p5oqE9URnxSkPtzyW8D4zKzLi9pAnzTElE="; @@ -64,15 +64,15 @@ rustPlatform.buildRustPackage rec { "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="; + "rdev-0.5.0-2" = "sha256-G+PvnA5mZyN080uoI5CGj/dQ9B1J4h5iYd7214MKBR8="; "reqwest-0.11.23" = "sha256-kEUT+gs4ziknDiGdPMLnj5pmxC5SBpLopZ8jZ34GDWc="; "rust-pulsectl-0.2.12" = "sha256-8jXTspWvjONFcvw9/Z8C43g4BuGZ3rsG32tvLMQbtbM="; "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.7.0" = "sha256-VAoOadgGajWjW7q1RCwmQ5gMmaA1oeZBSiL1tYSuIEI="; + "tfc-0.7.0" = "sha256-4plK8ttbHsBPat3/rS+4RhGzirq2Ked2wrU8cQEU1zo="; "tokio-socks-0.5.2-1" = "sha256-i1dfNatqN4dinMcyAdLhj9hJWVsT10OWpCXsxl7pifI="; - "tray-icon-0.15.1" = "sha256-DvTVAsE3dB+o89SFk3RPRt5JzaWjPl4nlvC77zsVN/s="; + "tray-icon-0.14.3" = "sha256-dSX7LucZaLplRrh6zLwmFzyZN4ZtwIXzAEdZzlu3gQg="; "wallpaper-3.2.0" = "sha256-p9NRmusdA0wvF6onp1UTL0/4t7XnEAc19sqyGDnfg/Q="; "webm-1.1.0" = "sha256-p4BMej7yvb8c/dJynRWZmwo2hxAAY96Qx6Qx2DbT8hE="; "x11-2.19.0" = "sha256-GDCeKzUtvaLeBDmPQdyr499EjEfT6y4diBMzZVEptzc="; @@ -83,7 +83,7 @@ rustPlatform.buildRustPackage rec { postPatch = '' # Overwrite cargo.lock because the one in the upstream repo has duplicates entries. # It should probably be removed in the next rustdesk update (if they fix their cargoLock) - ln -fs ${./Cargo.lock} Cargo.lock + cp ${./Cargo.lock} Cargo.lock ''; desktopItems = [ From 2cf171f9fceed8d24fd935e4e466bbc6dfe4c71d Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 20 Oct 2024 14:30:45 -0500 Subject: [PATCH 33/86] rustdesk: mark darwin bad platforms Requires some more work to support darwin, marking as a bad platform, for now. --- pkgs/by-name/ru/rustdesk/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ru/rustdesk/package.nix b/pkgs/by-name/ru/rustdesk/package.nix index ed94f97802dc..a1f5b2491020 100644 --- a/pkgs/by-name/ru/rustdesk/package.nix +++ b/pkgs/by-name/ru/rustdesk/package.nix @@ -189,5 +189,6 @@ rustPlatform.buildRustPackage rec { leixb ]; mainProgram = "rustdesk"; + badPlatforms = lib.platforms.darwin; }; } From 60663a0da3e9244223693b3bc3f7db4d63f6afae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Oct 2024 17:59:50 +0000 Subject: [PATCH 34/86] python312Packages.diffsync: 2.0.0 -> 2.0.1 --- pkgs/development/python-modules/diffsync/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/diffsync/default.nix b/pkgs/development/python-modules/diffsync/default.nix index 28ea4eb3a9f5..fbfb03ca6802 100644 --- a/pkgs/development/python-modules/diffsync/default.nix +++ b/pkgs/development/python-modules/diffsync/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "diffsync"; - version = "2.0.0"; + version = "2.0.1"; format = "pyproject"; src = fetchFromGitHub { owner = "networktocode"; repo = "diffsync"; rev = "refs/tags/v${version}"; - hash = "sha256-4LS18FPrnGE1tM0pFzAw0+ajDaw9g7MCgIwS2ptrX9c="; + hash = "sha256-T3kcZcRm28WeXZTXBBCpaMxjgB0KmqvWO4gdILH5hCA="; }; nativeBuildInputs = [ From 06ed20ba2d302918ebd8d3a150182043de04cba7 Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Tue, 22 Oct 2024 11:08:47 -0700 Subject: [PATCH 35/86] hotspot: 1.5.0 -> 1.5.1 --- .../development/tools/analysis/hotspot/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/analysis/hotspot/default.nix b/pkgs/development/tools/analysis/hotspot/default.nix index f769ac1b28c6..7aa3f922e291 100644 --- a/pkgs/development/tools/analysis/hotspot/default.nix +++ b/pkgs/development/tools/analysis/hotspot/default.nix @@ -7,7 +7,6 @@ , wrapQtAppsHook , elfutils , fetchFromGitHub -, fetchpatch , kconfigwidgets , kddockwidgets , ki18n @@ -28,25 +27,16 @@ stdenv.mkDerivation rec { pname = "hotspot"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "KDAB"; repo = "hotspot"; rev = "refs/tags/v${version}"; - hash = "sha256-FJkDPWqNwoWg/15tvMnwke7PVtWVuqT0gtJBFQE0qZ4="; + hash = "sha256-O2wp19scyHIwIY2AzKmPmorGXDH249/OhSg+KtzOYhI="; fetchSubmodules = true; }; - patches = [ - # Backport stuck UI bug fix - # FIXME: remove in next update - (fetchpatch { - url = "https://github.com/KDAB/hotspot/commit/7639dee8617dba9b88182c7ff4887e8d3714ac98.patch"; - hash = "sha256-aAo9uEy+MBztMhnC5jB08moZBeRCENU22R39pqSBXOY="; - }) - ]; - nativeBuildInputs = [ cmake extra-cmake-modules From 6801c836ec46d6160bd9c709e44ae03ee1ae0f23 Mon Sep 17 00:00:00 2001 From: luftmensch-luftmensch Date: Tue, 22 Oct 2024 20:13:11 +0200 Subject: [PATCH 36/86] mpvScripts.modernx-zydezu: 0.3.7 -> 0.3.8 --- pkgs/applications/video/mpv/scripts/modernx-zydezu.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix b/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix index 4d36bdc4a892..96436449e621 100644 --- a/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix +++ b/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix @@ -7,14 +7,14 @@ }: buildLua (finalAttrs: { pname = "modernx-zydezu"; - version = "0.3.7"; + version = "0.3.8"; scriptPath = "modernx.lua"; src = fetchFromGitHub { owner = "zydezu"; repo = "ModernX"; rev = finalAttrs.version; - hash = "sha256-slJYbhjNrzwq5rl83HV0Uy7BUK/bbltWSyH0198kSqw="; + hash = "sha256-dHjEmE/m5lAF3XyyebO/23BLmoS5sfSoNZuTtJv/JEA="; }; postInstall = '' From 6f217b2d15a12efb168c407762c2255ea10ebd42 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Tue, 22 Oct 2024 22:50:04 +0200 Subject: [PATCH 37/86] got: 0.103 -> 0.104 --- pkgs/by-name/go/got/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/got/package.nix b/pkgs/by-name/go/got/package.nix index d872cd796042..1cb5cfa9efc4 100644 --- a/pkgs/by-name/go/got/package.nix +++ b/pkgs/by-name/go/got/package.nix @@ -27,11 +27,11 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "got"; - version = "0.103"; + version = "0.104"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${finalAttrs.version}.tar.gz"; - hash = "sha256-MkBek/NTpU+rylSS5abFQl8Vm3phRFCQkpnI3INJKHg="; + hash = "sha256-sy14eSC8SXUhOVoGvrB9f0+StpN5WGMiS2BJ09ZpyMk="; }; nativeBuildInputs = [ pkg-config bison ] From 301fa6de2d68d31f095cd9f55a1f77996a10d909 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Oct 2024 21:52:20 +0000 Subject: [PATCH 38/86] python312Packages.truststore: 0.9.1 -> 0.9.2 --- pkgs/development/python-modules/truststore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/truststore/default.nix b/pkgs/development/python-modules/truststore/default.nix index 820d823f8146..a4a6830d83d0 100644 --- a/pkgs/development/python-modules/truststore/default.nix +++ b/pkgs/development/python-modules/truststore/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "truststore"; - version = "0.9.1"; + version = "0.9.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "sethmlarson"; repo = "truststore"; rev = "refs/tags/v${version}"; - hash = "sha256-BP88oQ363XFuRMKZqW8wSm1wl5upU+yEgmwktv65JOU="; + hash = "sha256-BSJneLxwgnD8IJ8IJM43WhmlII5N3qic96SBquMdMnc="; }; build-system = [ flit-core ]; From 496dd9586bc0cea0f813d27b036fd6fb380faba0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Oct 2024 21:52:23 +0000 Subject: [PATCH 39/86] subxt: 0.37.0 -> 0.37.1 --- pkgs/development/tools/subxt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/subxt/default.nix b/pkgs/development/tools/subxt/default.nix index 73907cac3731..40fbd86b5927 100644 --- a/pkgs/development/tools/subxt/default.nix +++ b/pkgs/development/tools/subxt/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "subxt"; - version = "0.37.0"; + version = "0.37.1"; src = fetchFromGitHub { owner = "paritytech"; repo = "subxt"; rev = "v${version}"; - hash = "sha256-GD4P+SXl9hyv0CxOximOMz+Gzi85kPahsiz0wHRqSWk="; + hash = "sha256-lCDjqvdjiQktyFAp3KuFHehwapd3BiLxMSLsNK+wDDo="; }; - cargoHash = "sha256-luKtu9g+NtlwRhC1icpIxkBvP3GtggpKoj7Sx4anLAM="; + cargoHash = "sha256-RmeV2EYHGbMMAeerQkHcYav+RIVY68Tj66zjcFgjUfQ="; # Only build the command line client cargoBuildFlags = [ "--bin" "subxt" ]; From 52cd5fa20c0df77fcde1ad4010f43b9c63e0ff1b Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 23 Oct 2024 00:23:58 +0200 Subject: [PATCH 40/86] webdav: 5.4.1 -> 5.4.2 Diff: https://github.com/hacdias/webdav/compare/v5.4.1...v5.4.2 --- pkgs/servers/webdav/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/webdav/default.nix b/pkgs/servers/webdav/default.nix index 70a6be77339a..312ae182466c 100644 --- a/pkgs/servers/webdav/default.nix +++ b/pkgs/servers/webdav/default.nix @@ -2,13 +2,13 @@ buildGo123Module rec { pname = "webdav"; - version = "5.4.1"; + version = "5.4.2"; src = fetchFromGitHub { owner = "hacdias"; repo = "webdav"; rev = "v${version}"; - sha256 = "sha256-Sm8xnQ6f4Xi4mGTf1rL65wXub6u1zQtCqUjc2caKwpE="; + sha256 = "sha256-a1XAlmEW8gNTgVZiJ200CP/wvbwvyv4Lc3L6KP/4Mik="; }; vendorHash = "sha256-d8WauJ1i429dr79iHgrbFRZCmx+W6OobSINy8aNGG6w="; From 24d4a5f16674921f6130dcf04511853c7585aa85 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 23 Oct 2024 01:11:09 +0200 Subject: [PATCH 41/86] miracle-wm: 0.3.6 -> 0.3.7 --- pkgs/by-name/mi/miracle-wm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/miracle-wm/package.nix b/pkgs/by-name/mi/miracle-wm/package.nix index 2a6ff5f5c53e..5b2e897ae7e3 100644 --- a/pkgs/by-name/mi/miracle-wm/package.nix +++ b/pkgs/by-name/mi/miracle-wm/package.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "miracle-wm"; - version = "0.3.6"; + version = "0.3.7"; src = fetchFromGitHub { owner = "mattkae"; repo = "miracle-wm"; rev = "v${finalAttrs.version}"; - hash = "sha256-fK/g6DhcxJMvxujZDZXs1yXRu2FGZQKmhxw7/czAQiY="; + hash = "sha256-31S7Mfz3LIOAmDUl6jbr3kSP2BdLaM0M4xMZ8FHhLH0="; }; patches = [ From c7e65ec9364b9a7faf3f81bf94b15df965f29dbf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Oct 2024 23:21:44 +0000 Subject: [PATCH 42/86] qxmpp: 1.8.1 -> 1.8.2 --- pkgs/development/libraries/qxmpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qxmpp/default.nix b/pkgs/development/libraries/qxmpp/default.nix index 98b4c0a2b7c7..20730810d9cd 100644 --- a/pkgs/development/libraries/qxmpp/default.nix +++ b/pkgs/development/libraries/qxmpp/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "qxmpp"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "qxmpp-project"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Tp3SDOoUAnAvwkID6U63TkeLy6Is+sWn7Oy0nT1f/LQ="; + sha256 = "sha256-fxTlxlnqttZZWRkt+vo4MJJz7DR/FMXcOqUv+/nlV18="; }; nativeBuildInputs = [ From 11b4a96d419b40929fba8fd7bd5ad131a25cfe0d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Oct 2024 23:21:55 +0000 Subject: [PATCH 43/86] fanbox-dl: 0.23.1 -> 0.23.2 --- pkgs/by-name/fa/fanbox-dl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fa/fanbox-dl/package.nix b/pkgs/by-name/fa/fanbox-dl/package.nix index a1989988b4f5..d47bff2b72cc 100644 --- a/pkgs/by-name/fa/fanbox-dl/package.nix +++ b/pkgs/by-name/fa/fanbox-dl/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fanbox-dl"; - version = "0.23.1"; + version = "0.23.2"; src = fetchFromGitHub { owner = "hareku"; repo = "fanbox-dl"; rev = "v${version}"; - hash = "sha256-EO1J90uH2J8EI51qGzIQyl4BbSwijkEi5ZQENgSMEm8="; + hash = "sha256-JARIY6z912XDvZ6JviLMP8OZLOIzUPLuJtWGpKcqwvY="; }; - vendorHash = "sha256-GD5uxa5XWhlHHBztTpDKCTSym2pdkr/or6aGl9qF29U="; + vendorHash = "sha256-l/mgjCqRzidJ1QxH8bKGa7ZnRZVOqkuNifgEyFVU7fA="; # pings websites during testing doCheck = false; From 0cf4af90813d31923d775d5f319c6f24cf8afc1b Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 22 Oct 2024 18:40:40 -0500 Subject: [PATCH 44/86] teams-for-linux: electron 30 -> electron 32 Looks like upstream bumped electron version, already. --- pkgs/by-name/te/teams-for-linux/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix index 5150860c7a8c..77f8cf6e5f8b 100644 --- a/pkgs/by-name/te/teams-for-linux/package.nix +++ b/pkgs/by-name/te/teams-for-linux/package.nix @@ -5,7 +5,7 @@ fetchFromGitHub, alsa-utils, copyDesktopItems, - electron_30, + electron_32, makeDesktopItem, makeWrapper, nix-update-script, @@ -42,7 +42,7 @@ buildNpmPackage rec { buildPhase = '' runHook preBuild - cp -r ${electron_30.dist} electron-dist + cp -r ${electron_32.dist} electron-dist chmod -R u+w electron-dist npm exec electron-builder -- \ @@ -50,7 +50,7 @@ buildNpmPackage rec { -c.npmRebuild=true \ -c.asarUnpack="**/*.node" \ -c.electronDist=electron-dist \ - -c.electronVersion=${electron_30.version} + -c.electronVersion=${electron_32.version} runHook postBuild ''; @@ -72,7 +72,7 @@ buildNpmPackage rec { popd # Linux needs 'aplay' for notification sounds - makeWrapper '${lib.getExe electron_30}' "$out/bin/teams-for-linux" \ + makeWrapper '${lib.getExe electron_32}' "$out/bin/teams-for-linux" \ --prefix PATH : ${ lib.makeBinPath [ alsa-utils From cfca7a3f8fa3cecf21393b4895730ef766560d70 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Oct 2024 23:55:36 +0000 Subject: [PATCH 45/86] oxker: 0.7.2 -> 0.8.0 --- pkgs/applications/misc/oxker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/oxker/default.nix b/pkgs/applications/misc/oxker/default.nix index ca2b0c033ee9..fba55f73ca7c 100644 --- a/pkgs/applications/misc/oxker/default.nix +++ b/pkgs/applications/misc/oxker/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "oxker"; - version = "0.7.2"; + version = "0.8.0"; src = fetchCrate { inherit pname version; - hash = "sha256-Qh/mUEfCvrOrUHJ1kEWb3BLBmMyP/MzUyfFoB+eYj9w="; + hash = "sha256-5FZDHKYv3/ZEzb0tsI7wxydDU0p7zwfhSG2i4UScf6s="; }; - cargoHash = "sha256-VYA5Y6CjhKx3MgQ0pyOO7vw44cKykRjlgUZopgR9pYo="; + cargoHash = "sha256-7SMIN6Nu9W6t27+YoCbJt0HCkNhw/ZU6pn6qRYvrgT8="; meta = with lib; { description = "Simple tui to view & control docker containers"; From a25c6096ce818ae430bec94e9907a49f52d441eb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Oct 2024 23:55:48 +0000 Subject: [PATCH 46/86] rambox: 2.4.0 -> 2.4.1 --- .../networking/instant-messengers/rambox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index d8f898ef11c8..52ee8d79266a 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -2,11 +2,11 @@ let pname = "rambox"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { url = "https://github.com/ramboxapp/download/releases/download/v${version}/Rambox-${version}-linux-x64.AppImage"; - hash = "sha256-x9GDiSkkO0zYx/veB6xSr6/9/SW6JRTGAASlvWd/P0c="; + hash = "sha256-ndFv5rNTWyqrGGC8t1JNR+bQC0Jsit4I9p4ng7h/gcU="; }; desktopItem = (makeDesktopItem { From 62bd0f25e35dc93ebdebed6dbcae03e53f8f395d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Oct 2024 23:56:08 +0000 Subject: [PATCH 47/86] sendme: 0.17.0 -> 0.18.0 --- pkgs/by-name/se/sendme/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/se/sendme/package.nix b/pkgs/by-name/se/sendme/package.nix index f277c2a007c3..376de9713c14 100644 --- a/pkgs/by-name/se/sendme/package.nix +++ b/pkgs/by-name/se/sendme/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "sendme"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = pname; rev = "v${version}"; - hash = "sha256-YnabQ8YHDsFYu5RX3E2NvPARsl+qn4688q9KxZ5Fegc="; + hash = "sha256-gPuzwJtQdQDFVuWYoH/TGSf+Fp++UvK9D7mL41p9eOk="; }; - cargoHash = "sha256-yD40QKceLjtq80K6I98bT27sCAkCnkRkfE3m4eGjueU="; + cargoHash = "sha256-ML+USTwdMLyLcc3Fzu/eD7J7s7Sa1lEOZm/txjZv31E="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ From c7c044a1c0bf5bce3ae2052cc3ebc62e5e8abf43 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Oct 2024 23:57:16 +0000 Subject: [PATCH 48/86] tar2ext4: 0.12.7 -> 0.12.8 --- pkgs/tools/filesystems/tar2ext4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/tar2ext4/default.nix b/pkgs/tools/filesystems/tar2ext4/default.nix index a4173de6cb22..ddc27c1029e2 100644 --- a/pkgs/tools/filesystems/tar2ext4/default.nix +++ b/pkgs/tools/filesystems/tar2ext4/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tar2ext4"; - version = "0.12.7"; + version = "0.12.8"; src = fetchFromGitHub { owner = "microsoft"; repo = "hcsshim"; rev = "v${version}"; - sha256 = "sha256-ObNBeHmQ4VqnZdUbKxLxuXeRw2jVPQxroO2HK4Wp8tg="; + sha256 = "sha256-20+y7wFV3HxkrS1qHNq2neIc826HU5AXzuqqS7Ll2gg="; }; sourceRoot = "${src.name}/cmd/tar2ext4"; From 410df2cbe198df237ef16a1c3f43455f701ea563 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Oct 2024 01:28:03 +0000 Subject: [PATCH 49/86] api-linter: 1.67.3 -> 1.67.4 --- pkgs/by-name/ap/api-linter/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ap/api-linter/package.nix b/pkgs/by-name/ap/api-linter/package.nix index 0e82446e666a..526137ae4293 100644 --- a/pkgs/by-name/ap/api-linter/package.nix +++ b/pkgs/by-name/ap/api-linter/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "api-linter"; - version = "1.67.3"; + version = "1.67.4"; src = fetchFromGitHub { owner = "googleapis"; repo = "api-linter"; rev = "v${version}"; - hash = "sha256-uyupDoLLF1lqYaufBsSNDjKVGF0JsRnephkq4Hk3aMU="; + hash = "sha256-zHJE3sau2KAbPNafUw2+OPFI5RRomqzr1QMEB1vfq3I="; }; - vendorHash = "sha256-+dyoWK5iXH480c+akg26BCF/J8lKQoATVqZUfqMa080="; + vendorHash = "sha256-rZn3SYcuFay2pjGad+NhEf8dmzonsvO7M4OQovT8otg="; subPackages = [ "cmd/api-linter" ]; From 36d0fea01050169424bf5025988cdbc087664031 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Oct 2024 01:29:32 +0000 Subject: [PATCH 50/86] alacritty: 0.13.2 -> 0.14.0 --- pkgs/applications/terminal-emulators/alacritty/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index 33691aaef491..2dfee198c06e 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -49,16 +49,16 @@ let in rustPlatform.buildRustPackage rec { pname = "alacritty"; - version = "0.13.2"; + version = "0.14.0"; src = fetchFromGitHub { owner = "alacritty"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-MrlzAZWLgfwIoTdxY+fjWbrv7tygAjnxXebiEgwOM9A="; + hash = "sha256-ZhkuuxTx2y8vOfxfpDpJAyNyDdRWab0pqyDdbOCQ2XE="; }; - cargoHash = "sha256-7HPTELRlmyjj7CXNbgqrzxW548BgbxybWi+tT3rOCX0="; + cargoHash = "sha256-T+/G2z7H/egJ/IlP3KA31jydg1CmFdLW8bLYSf/yWck="; nativeBuildInputs = [ cmake From 8669525fbc8e64bafac563ca7346ad87318431c5 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Tue, 22 Oct 2024 18:39:50 -0700 Subject: [PATCH 51/86] python312Packages.openai: 1.51.0 -> 1.52.1 Diff: https://github.com/openai/openai-python/compare/refs/tags/v1.51.0...v1.52.1 Changelog: https://github.com/openai/openai-python/releases/tag/v1.52.1 --- pkgs/development/python-modules/openai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 3a58661778e8..3777a84bdb7f 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pname = "openai"; - version = "1.51.0"; + version = "1.52.1"; pyproject = true; disabled = pythonOlder "3.7.1"; @@ -44,7 +44,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-VwsW7wVNSVlZg+RJoQ3C9AuqHL5dFO+f9pyfUbRbrSM="; + hash = "sha256-TTbwhs7rXWIJWOU5bC0wGjXZkBpfBAXb4ycOR9xjTpw="; }; build-system = [ From e0bec7a25ba4f35cfb36841a3e646eddfc988dca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Oct 2024 01:52:26 +0000 Subject: [PATCH 52/86] fn-cli: 0.6.34 -> 0.6.35 --- pkgs/applications/networking/cluster/fn-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/fn-cli/default.nix b/pkgs/applications/networking/cluster/fn-cli/default.nix index f699a53552ae..2aea823dd472 100644 --- a/pkgs/applications/networking/cluster/fn-cli/default.nix +++ b/pkgs/applications/networking/cluster/fn-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fn"; - version = "0.6.34"; + version = "0.6.35"; src = fetchFromGitHub { owner = "fnproject"; repo = "cli"; rev = version; - hash = "sha256-rbZySF7DrBN37YIetFXZE/aPSRex5cQnV8FZ0KDQ71k="; + hash = "sha256-ohT4h9w6gaOk6C3O8eUBcmXHRSzL2mcRO8RnNY8htso="; }; vendorHash = null; From 9780b6cae703189806ba50e25e5785ab3e91a220 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 22 Oct 2024 21:03:27 -0500 Subject: [PATCH 53/86] vimPlugins.advanced-git-search-nvim: enable nvimRequireCheck --- pkgs/applications/editors/vim/plugins/overrides.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index d977d0ac9df1..d09ca51133fd 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -149,8 +149,7 @@ in vim-fugitive vim-rhubarb ]; - # TODO: enable after https://github.com/NixOS/nixpkgs/pull/342240 merged - # nvimRequireCheck = "advanced_git_search.utils"; + nvimRequireCheck = "advanced_git_search.utils"; }; animation-nvim = super.animation-nvim.overrideAttrs { From 49183563b9eafc57a5c207c8115c3bd276a98d54 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 22 Oct 2024 21:03:47 -0500 Subject: [PATCH 54/86] vimPlugins.ChatGPT-nvim: enable nvimRequireCheck --- pkgs/applications/editors/vim/plugins/overrides.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index d09ca51133fd..d4902cfd4394 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -235,8 +235,7 @@ in plenary-nvim telescope-nvim ]; - # TODO: enable after https://github.com/NixOS/nixpkgs/pull/342240 merged - # nvimRequireCheck = "chatgpt"; + nvimRequireCheck = "chatgpt"; }; clang_complete = super.clang_complete.overrideAttrs { From dcd92be686f4f21dec06f9bae4dc2db2495eb946 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 22 Oct 2024 21:04:00 -0500 Subject: [PATCH 55/86] vimPlugins.nvim-navbuddy: enable nvimRequireCheck --- pkgs/applications/editors/vim/plugins/overrides.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index d4902cfd4394..36b595b4d022 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1586,8 +1586,7 @@ in nvim-lspconfig nvim-navic ]; - # TODO: enable after https://github.com/NixOS/nixpkgs/pull/342240 merged - # nvimRequireCheck = "nvim-navbuddy"; + nvimRequireCheck = "nvim-navbuddy"; }; vim-mediawiki-editor = super.vim-mediawiki-editor.overrideAttrs { From 7ecc12891c3102db6dd61668b1e35f2c754bfc46 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Oct 2024 02:28:53 +0000 Subject: [PATCH 56/86] bundletool: 1.17.1 -> 1.17.2 --- pkgs/by-name/bu/bundletool/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bu/bundletool/package.nix b/pkgs/by-name/bu/bundletool/package.nix index da40101e5523..58bdfaa70c97 100644 --- a/pkgs/by-name/bu/bundletool/package.nix +++ b/pkgs/by-name/bu/bundletool/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "bundletool"; - version = "1.17.1"; + version = "1.17.2"; src = fetchurl { url = "https://github.com/google/bundletool/releases/download/${finalAttrs.version}/bundletool-all-${finalAttrs.version}.jar"; - sha256 = "sha256-RYgerRM4iHLYLEJVsZVIi3/DPyysWpqXewr8XpI2dZI="; + sha256 = "sha256-LUrZCPrqZAR8HMnLdH5qpmfGqxkuCWB70WtnJGqM1q4="; }; dontUnpack = true; From 407385358b78a9ae8175c9f1618e465ae7b5fb3f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Oct 2024 03:02:56 +0000 Subject: [PATCH 57/86] wxsqlite3: 4.9.11 -> 4.9.12 --- pkgs/development/libraries/wxsqlite3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix index 7ad997e6d6da..f06af1417de8 100644 --- a/pkgs/development/libraries/wxsqlite3/default.nix +++ b/pkgs/development/libraries/wxsqlite3/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "wxsqlite3"; - version = "4.9.11"; + version = "4.9.12"; src = fetchFromGitHub { owner = "utelle"; repo = "wxsqlite3"; rev = "v${version}"; - hash = "sha256-aX1YU35ATL+f18tGIba6cgNYZvYm3TshHsN7RFD+vI4="; + hash = "sha256-WiOAF1yg18W4Vyyy+rzRe87GQTemvn32bexit4M/HjE="; }; nativeBuildInputs = [ autoreconfHook ]; From 565e36889a0a65d0837a6d29729b365250ecf612 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Oct 2024 03:03:24 +0000 Subject: [PATCH 58/86] kubernetes-polaris: 9.4.1 -> 9.5.0 --- pkgs/tools/security/kubernetes-polaris/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/kubernetes-polaris/default.nix b/pkgs/tools/security/kubernetes-polaris/default.nix index ecda1966fcad..87ae92cd9e75 100644 --- a/pkgs/tools/security/kubernetes-polaris/default.nix +++ b/pkgs/tools/security/kubernetes-polaris/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubernetes-polaris"; - version = "9.4.1"; + version = "9.5.0"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "polaris"; rev = version; - sha256 = "sha256-CVc/ZMF/3HBDPjny81Pj26eSnBuTRjXgkso34kZSex4="; + sha256 = "sha256-6dbp9gdobgL6afu+mzsqVBFQKT8lgxhKiEhQXN4Z5UY="; }; vendorHash = "sha256-X0GPKR6l1v5312hOmelrcqp4KT3LwsGkvKoqUfEM0uU="; From 9c90179eb2748ea8eadf1e91e3feed1782cc20d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Oct 2024 04:04:50 +0000 Subject: [PATCH 59/86] coursier: 2.1.13 -> 2.1.14 --- pkgs/development/tools/coursier/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index cbd3fbcc02da..3f3cbad38827 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { pname = "coursier"; - version = "2.1.13"; + version = "2.1.14"; src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - hash = "sha256-AGHpJaKhu9/rzWPfNWzJPdp/jpQOm28BGAcXuwyNNxE="; + hash = "sha256-yAWU0ruaNAlYTPujPOjmoXgH0iVmYnZeIqn3+fN2P60="; }; dontUnpack = true; From 67bbfbc70742b6eb2d0931e8d1e3f1441cdd9961 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Wed, 23 Oct 2024 08:08:05 +0200 Subject: [PATCH 60/86] athens: 0.15.2 -> 0.15.3 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/at/athens/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/at/athens/package.nix b/pkgs/by-name/at/athens/package.nix index 2cdd671c7504..4b4958c643b7 100644 --- a/pkgs/by-name/at/athens/package.nix +++ b/pkgs/by-name/at/athens/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "athens"; - version = "0.15.2"; + version = "0.15.3"; src = fetchFromGitHub { owner = "gomods"; repo = "athens"; rev = "v${version}"; - hash = "sha256-Ikm9nznJhd5ZrkJyh3ny1SZeuWVs5xgT4fpWKhVbuDA="; + hash = "sha256-iRuy3z5GCsuTnIQuPkzyTvMSMlYTqf3Do7uqgERTXn0="; }; vendorHash = "sha256-cK23BIGh/BK1OHHrI++PD1h7lCN7NZfV1Yfirs8vC5A="; From 25c65f3fe0b597e1d16d230af871b7dd5f0fd831 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Wed, 23 Oct 2024 08:51:28 +0200 Subject: [PATCH 61/86] uplosi: 0.3.0 -> 0.3.1 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/up/uplosi/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/up/uplosi/package.nix b/pkgs/by-name/up/uplosi/package.nix index 074bf872f987..b1283ee26342 100644 --- a/pkgs/by-name/up/uplosi/package.nix +++ b/pkgs/by-name/up/uplosi/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "uplosi"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "edgelesssys"; repo = pname; rev = "v${version}"; - hash = "sha256-AtsFZ92WkVkH8fd0Xa0D6/PR84/dtOH6gpM4mtn32Hk="; + hash = "sha256-MsZ4Bl8sW1dZUB9cYPsaLtc8P8RRx4hafSbNB4vXqi4="; }; vendorHash = "sha256-o7PPgW3JL47G6Na5n9h3RasRMfU25FD1U/wCMaydRmc="; From d6ee0a54fbc6a47549d6311fc490228a63792994 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 23 Oct 2024 09:49:54 +0200 Subject: [PATCH 62/86] python312Packages.cf-xarray: 0.9.5 -> 0.10.0 Diff: https://github.com/xarray-contrib/cf-xarray/compare/refs/tags/v0.9.5...v0.10.0 Changelog: https://github.com/xarray-contrib/cf-xarray/releases/tag/v0.10.0 --- pkgs/development/python-modules/cf-xarray/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cf-xarray/default.nix b/pkgs/development/python-modules/cf-xarray/default.nix index a60f3f0e4aef..3cee465537b2 100644 --- a/pkgs/development/python-modules/cf-xarray/default.nix +++ b/pkgs/development/python-modules/cf-xarray/default.nix @@ -16,7 +16,7 @@ rich, shapely, - # checks + # tests dask, pytestCheckHook, scipy, @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "cf-xarray"; - version = "0.9.5"; + version = "0.10.0"; pyproject = true; src = fetchFromGitHub { owner = "xarray-contrib"; repo = "cf-xarray"; rev = "refs/tags/v${version}"; - hash = "sha256-Rz0E7GBaN/7zb0dqAxo0SJ4Bd+eQuOOv6x1WubIUh6A="; + hash = "sha256-lAVH2QGdMyU5A6QTLKujeAh8n1AkCsAtdyKQEqLahTk="; }; build-system = [ From 1fffa85934f80fbe76078784e58b4a3bbbe10cea Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Wed, 23 Oct 2024 10:56:26 +0300 Subject: [PATCH 63/86] gajim: fix missing metadata As suggested by https://gitlab.archlinux.org/archlinux/packaging/packages/gajim/-/commit/ff670fcc620442b1ddd0955a1e62bd5a7f21e97b#9b9baac1eb9b72790eef5540a1685306fc43fd6c_47_38 --- .../networking/instant-messengers/gajim/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 1772fb7a9cd7..29d22aa5049b 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -47,6 +47,14 @@ python3.pkgs.buildPythonApplication rec { dontWrapGApps = true; + preBuild = '' + python make.py build --dist unix + ''; + + postInstall = '' + python make.py install --dist unix --prefix=$out + ''; + preFixup = '' makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; From 75a18af20aa3d7b804140c4468fbc395392335a0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 23 Oct 2024 10:00:36 +0200 Subject: [PATCH 64/86] python312Packages.tencentcloud-sdk-python: 3.0.1253 -> 3.0.1254 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1253...3.0.1254 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1254/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 0631b8fc6da3..0a37723f120a 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1253"; + version = "3.0.1254"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-UQeh2VTIIuTvvJ3+GfY0pfSFLyc2KCg0i5qlglhBAJY="; + hash = "sha256-W7HoyWUVN0peKFVeYpoOaPyMLezWEeasN3GcAxc9dUw="; }; build-system = [ setuptools ]; From 04fd03db80297ccc8248891d4af47ced17f47609 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 23 Oct 2024 10:05:55 +0200 Subject: [PATCH 65/86] python312Packages.tencentcloud-sdk-python: 3.0.1254 -> 3.0.1255 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1254...3.0.1255 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1255/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 0a37723f120a..48e6a50d93da 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1254"; + version = "3.0.1255"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-W7HoyWUVN0peKFVeYpoOaPyMLezWEeasN3GcAxc9dUw="; + hash = "sha256-l0k8fyQ4ba+9uyQiIAsPKTKjmZ0p/QIlC0seqP6LBZY="; }; build-system = [ setuptools ]; From 1203480a1a0a999d444cbe94af3e10b0f2d5fbf6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 23 Oct 2024 10:09:07 +0200 Subject: [PATCH 66/86] nuclei: 3.3.4 -> 3.3.5 Diff: https://github.com/projectdiscovery/nuclei/compare/refs/tags/v3.3.4...v3.3.5 Changelog: https://github.com/projectdiscovery/nuclei/releases/tag/v3.3.5 --- pkgs/tools/security/nuclei/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 083d605e5864..6f9eb684c200 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nuclei"; - version = "3.3.4"; + version = "3.3.5"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei"; rev = "refs/tags/v${version}"; - hash = "sha256-wY7OninwYrFuP681Xffsv25XnOw8xWp3QAvrpTibnvk="; + hash = "sha256-L8HOuPENnyM56ac1dqJRCYzqN9wRnGt4RoF8BZji0Z0="; }; - vendorHash = "sha256-V/L6trRaCfV1qLKw1MsRWIh+RwAcoafvSW8zgA41maQ="; + vendorHash = "sha256-ZGFzZ/WpiVChtvMJQH3lR4k2it1KF0QwrMQchQz5XYw="; proxyVendor = true; # hash mismatch between Linux and Darwin subPackages = [ "cmd/nuclei/" ]; From 17c9065f0e443641058ced9575f47c9cab2009e9 Mon Sep 17 00:00:00 2001 From: Jonathan Zielinski Date: Wed, 23 Oct 2024 10:58:11 +0200 Subject: [PATCH 67/86] morph: 1.7.0 -> 1.8.0 --- pkgs/tools/package-management/morph/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/morph/default.nix b/pkgs/tools/package-management/morph/default.nix index b5f6535c96ba..7dc6d9f8dfa2 100644 --- a/pkgs/tools/package-management/morph/default.nix +++ b/pkgs/tools/package-management/morph/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "morph"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "dbcdk"; repo = "morph"; rev = "v${version}"; - hash = "sha256-0CHmjqPxBgALGZYjfJFLoLBnoI0U7oZ8WyCtu1bkzZg="; + hash = "sha256-IqWtVklzSq334cGgLx/13l329g391oDW50MZWyO6l08="; }; - vendorHash = "sha256-KV+djwUYNfD7NqmYkanRVeKj2lAGfMjJhCUSRiC4/yM="; + vendorHash = "sha256-zQlMtbXgrH83zrcIoOuFhb2tYCeQ1pz4UQUvRIsLMCE="; nativeBuildInputs = [ makeWrapper ]; From a82d860870e4b6f68e0016355c22dc7f2be01ea4 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 23 Oct 2024 12:27:02 +0300 Subject: [PATCH 68/86] aliases: add more Steam stuff that was removed In case people are using it for whatever reason. Fixes #350562. --- pkgs/top-level/aliases.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 339c3095d45b..08cc3c563c8e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1083,7 +1083,10 @@ mapAliases { steamArch = throw "`steamPackages.steamArch` has been removed as it's no longer applicable"; steam = lib.warn "`steamPackages.steam` has been moved to top level as `steam-unwrapped`" steam-unwrapped; steam-fhsenv = lib.warn "`steamPackages.steam-fhsenv` has been moved to top level as `steam`" steam; + steam-fhsenv-small = lib.warn "`steamPackages.steam-fhsenv-small` has been moved to top level as `steam`; there is no longer a -small variant" steam; steam-fhsenv-without-steam = lib.warn "`steamPackages.steam-fhsenv-without-steam` has been moved to top level as `steam-fhsenv-without-steam`" steam-fhsenv-without-steam; + steam-runtime = throw "`steamPackages.steam-runtime` has been removed, as it's no longer supported or necessary"; + steam-runtime-wrapped = throw "`steamPackages.steam-runtime-wrapped` has been removed, as it's no longer supported or necessary"; steamcmd = lib.warn "`steamPackages.steamcmd` has been moved to top level as `steamcmd`" steamcmd; }; steam-small = steam; # Added 2024-09-12 From 00c33287da82dd1b443941a6d6b0b749b97a8a24 Mon Sep 17 00:00:00 2001 From: Kiskae Date: Tue, 22 Oct 2024 20:40:38 +0200 Subject: [PATCH 69/86] linuxPackages.nvidiaPackages.production: 550.120 -> 550.127.05 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index ee5aa5e8eaea..52925f1ace94 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -39,12 +39,12 @@ rec { stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest; production = generic { - version = "550.120"; - sha256_64bit = "sha256-gBkoJ0dTzM52JwmOoHjMNwcN2uBN46oIRZHAX8cDVpc="; - sha256_aarch64 = "sha256-dzTEUuSIWKEuAMhsL9QkR7CCHpm6m9ZwtGSpSKqwJdc="; - openSha256 = "sha256-O3OrGGDR+xrpfyPVQ04aM3eGI6aWuZfRzmaPjMfnGIg="; - settingsSha256 = "sha256-fPfIPwpIijoUpNlAUt9C8EeXR5In633qnlelL+btGbU="; - persistencedSha256 = "sha256-ztEemWt0VR+cQbxDmMnAbEVfThdvASHni4SJ0dTZ2T4="; + version = "550.127.05"; + sha256_64bit = "sha256-04TzT10qiWvXU20962ptlz2AlKOtSFocLuO/UZIIauk="; + sha256_aarch64 = "sha256-3wsGqJvDf8io4qFSqbpafeHHBjbasK5i/W+U6TeEeBY="; + openSha256 = "sha256-r0zlWPIuc6suaAk39pzu/tp0M++kY2qF8jklKePhZQQ="; + settingsSha256 = "sha256-cUSOTsueqkqYq3Z4/KEnLpTJAryML4Tk7jco/ONsvyg="; + persistencedSha256 = "sha256-8nowXrL6CRB3/YcoG1iWeD4OCYbsYKOOPE374qaa4sY="; }; latest = selectHighestVersion production (generic { From bb15ce73f3e8f64740021eece52b9d87305b2857 Mon Sep 17 00:00:00 2001 From: Benno Bielmeier Date: Wed, 23 Oct 2024 13:26:20 +0200 Subject: [PATCH 70/86] keepassxc: add mainProgram attribute --- pkgs/applications/misc/keepassxc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/keepassxc/default.nix b/pkgs/applications/misc/keepassxc/default.nix index 914884a9aa2b..b5b246526063 100644 --- a/pkgs/applications/misc/keepassxc/default.nix +++ b/pkgs/applications/misc/keepassxc/default.nix @@ -146,6 +146,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://keepassxc.org/"; license = licenses.gpl2Plus; + mainProgram = "keepassxc"; maintainers = with maintainers; [ blankparticle ]; platforms = platforms.linux ++ platforms.darwin; }; From 50b000c301400b913cd1707129bb5972d9d61e54 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Oct 2024 09:23:57 +0000 Subject: [PATCH 71/86] terraform-providers.postgresql: 1.23.0 -> 1.24.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 74cf9083d7da..d14e2cf76c47 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -994,13 +994,13 @@ "vendorHash": "sha256-pbJk35O8EowCa2dgLCrPDgakR0EJVaAnEvePGnrl/YQ=" }, "postgresql": { - "hash": "sha256-v/88uUvILQT0uHRgfwMuLQWw0ma2ELT691kQ9GVjr/A=", + "hash": "sha256-ldiMHcA0uJa7z5qx8ATuu7wn6W7HTLXEw3CG9rGnU/4=", "homepage": "https://registry.terraform.io/providers/cyrilgdn/postgresql", "owner": "cyrilgdn", "repo": "terraform-provider-postgresql", - "rev": "v1.23.0", + "rev": "v1.24.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-fHNXJGyOWGF7Dwfk14GWmLXSIENsshIHbxkF7iQJNuI=" + "vendorHash": "sha256-2DWYW/NoNqchnfxEPBCFstzGuFKwXAXVmS9RqRWViWo=" }, "powerdns": { "hash": "sha256-NtJs2oNJbjUYNFsbrfo2RYhqOlKA15GJt9gi1HuTIw0=", From 11172e5167bade363e0ca823e353d83eaa3662e7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Oct 2024 09:41:47 +0000 Subject: [PATCH 72/86] terraform-providers.bigip: 1.22.4 -> 1.22.5 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d14e2cf76c47..db6057d758c4 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -162,11 +162,11 @@ "vendorHash": null }, "bigip": { - "hash": "sha256-ny/FjAStb4qUzVeAkkqgKDb5lzmR6e0J1RaG6CWBrYg=", + "hash": "sha256-7Km+FqUyCCFzVmSpg4m7FuWs3MF+mKqPxEQApQqe35M=", "homepage": "https://registry.terraform.io/providers/F5Networks/bigip", "owner": "F5Networks", "repo": "terraform-provider-bigip", - "rev": "v1.22.4", + "rev": "v1.22.5", "spdx": "MPL-2.0", "vendorHash": null }, From c778861ff8fd7978cb7ac8226b32f497a52d6413 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Thu, 10 Oct 2024 00:51:03 +0800 Subject: [PATCH 73/86] nezha-agent: 0.18.5 -> 0.20.2 --- pkgs/by-name/ne/nezha-agent/package.nix | 45 ++++++++++++++++++------- 1 file changed, 33 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ne/nezha-agent/package.nix b/pkgs/by-name/ne/nezha-agent/package.nix index 629b906d822e..9dbdb0848eef 100644 --- a/pkgs/by-name/ne/nezha-agent/package.nix +++ b/pkgs/by-name/ne/nezha-agent/package.nix @@ -1,45 +1,66 @@ { lib, buildGoModule, + stdenv, fetchFromGitHub, nezha-agent, + versionCheckHook, testers, }: buildGoModule rec { pname = "nezha-agent"; - version = "0.18.5"; + version = "0.20.2"; src = fetchFromGitHub { owner = "nezhahq"; repo = "agent"; rev = "refs/tags/v${version}"; - hash = "sha256-LmWfs3aL+1lsX4ix2FjDP5g+A0wgcfziXdw5SaKlAdk="; + hash = "sha256-BM3FhCf9zfccC2xC/Fhz2/andZmPYsJojMRUA3M9NOQ="; }; - vendorHash = "sha256-frPAhiexFSt+KobMbf32h8xv7HMcPl5koEgSs8Nz3cs="; + vendorHash = "sha256-q6/265vVg6jCnDvs825nni8QFHkJpQz4xxC9MlJH2do="; ldflags = [ "-s" "-w" "-X main.version=${version}" + "-X main.arch=${stdenv.hostPlatform.system}" ]; - # The test failed due to a geoip request in the sandbox. Remove it to avoid network requirement - preCheck = '' - rm ./pkg/monitor/myip_test.go + checkFlags = + let + # Skip tests that require network access + skippedTests = [ + "TestLookupIP" + "TestGeoIPApi" + "TestFetchGeoIP" + "TestCloudflareDetection" + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; + + postInstall = '' + pushd $out/bin + mv agent nezha-agent + + # for compatibility + ln -sr nezha-agent agent + popd ''; - passthru.tests = { - version = testers.testVersion { - package = nezha-agent; - command = "${nezha-agent}/bin/agent -v"; - }; - }; + doInstallCheck = true; + + versionCheckProgramArg = "-v"; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; meta = { description = "Agent of Nezha Monitoring"; homepage = "https://github.com/nezhahq/agent"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ moraxyc ]; + mainProgram = "nezha-agent"; }; } From 61567875e5d112d5e6708da52d850a0b7a0d0556 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Sat, 19 Oct 2024 18:36:04 +0800 Subject: [PATCH 74/86] nixos/nezha-agent: add some options for new features --- .../services/monitoring/nezha-agent.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/nezha-agent.nix b/nixos/modules/services/monitoring/nezha-agent.nix index 7ebbc7f2f329..6b8d0f58177e 100644 --- a/nixos/modules/services/monitoring/nezha-agent.nix +++ b/nixos/modules/services/monitoring/nezha-agent.nix @@ -31,6 +31,20 @@ in Enable GPU monitoring. ''; }; + temperature = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Enable temperature monitoring. + ''; + }; + useIPv6CountryCode = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Use ipv6 countrycode to report location. + ''; + }; disableCommandExecute = lib.mkOption { type = lib.types.bool; default = true; @@ -96,7 +110,7 @@ in startLimitBurst = 3; script = lib.concatStringsSep " " ( [ - "${cfg.package}/bin/agent" + "${lib.getExe cfg.package}" "--disable-auto-update" "--disable-force-update" "--password $(cat ${cfg.passwordFile})" @@ -109,6 +123,8 @@ in ++ lib.optional cfg.skipProcess "--skip-procs" ++ lib.optional cfg.tls "--tls" ++ lib.optional cfg.gpu "--gpu" + ++ lib.optional cfg.temperature "--temperature" + ++ lib.optional cfg.useIPv6CountryCode "--use-ipv6-countrycode" ); wantedBy = [ "multi-user.target" ]; }; From 2b35a6bd33e4b54864683c52a2711314e58cd9ff Mon Sep 17 00:00:00 2001 From: Daniel Fahey Date: Wed, 23 Oct 2024 11:56:04 +0100 Subject: [PATCH 75/86] linuxKernel.kernels.linux_zen: 6.11.2-zen1 -> v6.11.5-zen1 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index afca9bb2a44e..65988d74359c 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -5,9 +5,9 @@ let variants = { # ./update-zen.py zen zen = { - version = "6.11.2"; #zen + version = "6.11.5"; #zen suffix = "zen1"; #zen - sha256 = "1pwhdx8dcih0q3xj2hndd9vmz1xclrp4dw9yk0p1hi03mb634s40"; #zen + sha256 = "1w342k54ns6rwkk13l9f7h0qzikn6hbnb2ydxyqalrmll8n2g237"; #zen isLqx = false; }; # ./update-zen.py lqx From d0037e9629d95b367202b9c7872f502f66d9c023 Mon Sep 17 00:00:00 2001 From: Daniel Fahey Date: Wed, 23 Oct 2024 11:58:30 +0100 Subject: [PATCH 76/86] linuxKernel.kernels.linux_lqx: 6.11.2-lqx1 -> v6.11.5-lqx1 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 65988d74359c..5f222cae02fa 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -12,9 +12,9 @@ let }; # ./update-zen.py lqx lqx = { - version = "6.11.2"; #lqx + version = "6.11.5"; #lqx suffix = "lqx1"; #lqx - sha256 = "0q5zdzb26azshn1n8fc5zy5n2sa7sz3q4khkjivafz6pyli1wfl8"; #lqx + sha256 = "0ql7nw6sph4ai44n66c7l06aj4ibhdy45415yzgibin1jg9rqa6d"; #lqx isLqx = true; }; }; From ff63c60b99868cee5b883cd2d0d5a74594fe6edb Mon Sep 17 00:00:00 2001 From: Daniel Fahey Date: Wed, 23 Oct 2024 13:05:11 +0100 Subject: [PATCH 77/86] linuxKernel.kernels.linux_zen: remove deprecated config opts re: `Z3FOLD` --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 5f222cae02fa..f4eda83e6f64 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -83,8 +83,6 @@ let HZ = freeform "1000"; HZ_1000 = yes; - # Alternative zpool for zswap - Z3FOLD = yes; } // lib.optionalAttrs (isLqx) { # Google's BBRv3 TCP congestion Control TCP_CONG_BBR = yes; @@ -101,7 +99,6 @@ let # Swap storage is compressed with LZ4 using zswap ZSWAP_COMPRESSOR_DEFAULT_LZ4 = lib.mkOptionDefault yes; ZSWAP_COMPRESSOR_DEFAULT_ZSTD = lib.mkDefault no; - ZSWAP_ZPOOL_DEFAULT_Z3FOLD = yes; # Fix error: unused option: XXX. CFS_BANDWIDTH = lib.mkForce (option no); From ddb45dcd05b23978988f177313824e67e27d06b7 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Mon, 21 Oct 2024 12:03:11 +0200 Subject: [PATCH 78/86] qgis: don't build with grass by default Update nixos/doc/manual/release-notes/rl-2411.section.md Co-authored-by: zi3m5f <113244000+zi3m5f@users.noreply.github.com> --- nixos/doc/manual/release-notes/rl-2411.section.md | 2 ++ pkgs/applications/gis/qgis/default.nix | 2 +- pkgs/applications/gis/qgis/ltr.nix | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 527922434033..7582da403778 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -754,6 +754,8 @@ - `services.localtimed.enable = true` will now set `time.timeZone = null`. This is to avoid silently shadowing a user's explicitly defined timezone without recognition on the user's part. +- `qgis` and `qgis-ltr` are now built without `grass` by default. `grass` support can be enabled with `qgis.override { withGrass = true; }`. + ## Detailed migration information {#sec-release-24.11-migration} ### `sound` options removal {#sec-release-24.11-migration-sound} diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index c90a372681a3..06e2cbef1f24 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -7,7 +7,7 @@ , libsForQt5 # unwrapped package parameters -, withGrass ? true +, withGrass ? false , withWebKit ? false }: let diff --git a/pkgs/applications/gis/qgis/ltr.nix b/pkgs/applications/gis/qgis/ltr.nix index 56a15dbd7ddb..a588ac6dbd6a 100644 --- a/pkgs/applications/gis/qgis/ltr.nix +++ b/pkgs/applications/gis/qgis/ltr.nix @@ -7,7 +7,7 @@ , libsForQt5 # unwrapped package parameters -, withGrass ? true +, withGrass ? false , withWebKit ? false }: let From 8b633537b6b31e51072496035af0c6aa6a8986aa Mon Sep 17 00:00:00 2001 From: Chuang Zhu Date: Wed, 23 Oct 2024 22:29:37 +0800 Subject: [PATCH 79/86] pipeline: init at 2.0.2 --- pkgs/by-name/pi/pipeline/Cargo.lock | 2646 ++++++++++++++++++++++++++ pkgs/by-name/pi/pipeline/package.nix | 103 + 2 files changed, 2749 insertions(+) create mode 100644 pkgs/by-name/pi/pipeline/Cargo.lock create mode 100644 pkgs/by-name/pi/pipeline/package.nix diff --git a/pkgs/by-name/pi/pipeline/Cargo.lock b/pkgs/by-name/pi/pipeline/Cargo.lock new file mode 100644 index 000000000000..10492b6110b8 --- /dev/null +++ b/pkgs/by-name/pi/pipeline/Cargo.lock @@ -0,0 +1,2646 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anstream" +version = "0.6.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" + +[[package]] +name = "anstyle-parse" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-stream" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "backtrace" +version = "0.3.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "bytes" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" + +[[package]] +name = "cairo-rs" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a0ea147c94108c9613235388f540e4d14c327f7081c9e471fc8ee8a2533e69" +dependencies = [ + "bitflags 2.6.0", + "cairo-sys-rs", + "glib", + "libc", +] + +[[package]] +name = "cairo-sys-rs" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "428290f914b9b86089f60f5d8a9f6e440508e1bcff23b25afd51502b0a2da88f" +dependencies = [ + "glib-sys", + "libc", + "system-deps 7.0.2", +] + +[[package]] +name = "cc" +version = "1.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" +dependencies = [ + "shlex", +] + +[[package]] +name = "cfg-expr" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" +dependencies = [ + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cfg-expr" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "345c78335be0624ed29012dc10c49102196c6882c12dde65d9f35b02da2aada8" +dependencies = [ + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "serde", + "wasm-bindgen", + "windows-targets 0.52.6", +] + +[[package]] +name = "clapper" +version = "0.1.0" +source = "git+https://gitlab.gnome.org/JanGernert/clapper-rs.git#530b6fd53a60563d8038f7a1d9d735d6dc496adb" +dependencies = [ + "bitflags 2.6.0", + "clapper-sys", + "gio", + "glib", + "gstreamer", + "libc", +] + +[[package]] +name = "clapper-gtk" +version = "0.1.0" +source = "git+https://gitlab.gnome.org/JanGernert/clapper-rs.git#530b6fd53a60563d8038f7a1d9d735d6dc496adb" +dependencies = [ + "bitflags 2.6.0", + "clapper", + "clapper-gtk-sys", + "gdk4", + "gio", + "glib", + "gtk4", + "libc", +] + +[[package]] +name = "clapper-gtk-sys" +version = "0.0.1" +source = "git+https://gitlab.gnome.org/JanGernert/clapper-rs.git#530b6fd53a60563d8038f7a1d9d735d6dc496adb" +dependencies = [ + "clapper-sys", + "gio-sys", + "glib-sys", + "gtk4-sys", + "libc", + "system-deps 7.0.2", +] + +[[package]] +name = "clapper-sys" +version = "0.0.1" +source = "git+https://gitlab.gnome.org/JanGernert/clapper-rs.git#530b6fd53a60563d8038f7a1d9d735d6dc496adb" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "gstreamer-sys", + "libc", + "system-deps 6.2.2", +] + +[[package]] +name = "colorchoice" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "csv" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" +dependencies = [ + "csv-core", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "csv-core" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" +dependencies = [ + "memchr", +] + +[[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core", + "quote", + "syn", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", + "serde", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "encoding_rs" +version = "0.8.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "env_filter" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" +dependencies = [ + "log", + "regex", +] + +[[package]] +name = "env_logger" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "humantime", + "log", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "fallible-iterator" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" + +[[package]] +name = "fallible-streaming-iterator" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" + +[[package]] +name = "fastrand" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" + +[[package]] +name = "field-offset" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" +dependencies = [ + "memoffset", + "rustc_version", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "gdk-pixbuf" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8730751991b97419fc3f0c2dca2c9e45b48edf46e48e0f965964ecf33889812f" +dependencies = [ + "gdk-pixbuf-sys", + "gio", + "glib", + "libc", +] + +[[package]] +name = "gdk-pixbuf-sys" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ffbf649fd5b1c8c0f0feeb015b7533c3ef92da2887fb95ddd338bc2b1644a7c" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps 7.0.2", +] + +[[package]] +name = "gdk4" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b7d7237c1487ed4b300aac7744efcbf1319e12d60d7afcd6f505414bd5b5dea" +dependencies = [ + "cairo-rs", + "gdk-pixbuf", + "gdk4-sys", + "gio", + "glib", + "libc", + "pango", +] + +[[package]] +name = "gdk4-sys" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a67576c8ec012156d7f680e201a807b4432a77babb3157e0555e990ab6bcd878" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "pkg-config", + "system-deps 7.0.2", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gettext-rs" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a6716b8a0db461a2720b850ba1623e5b69e4b1aa0224cf5e1fb23a0fe49e65c" +dependencies = [ + "gettext-sys", + "locale_config", +] + +[[package]] +name = "gettext-sys" +version = "0.21.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7b8797f28f2dabfbe2caadb6db4f7fd739e251b5ede0a2ba49e506071edcf67" +dependencies = [ + "cc", + "temp-dir", +] + +[[package]] +name = "gimli" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" + +[[package]] +name = "gio" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcacaa37401cad0a95aadd266bc39c72a131d454fc012f6dfd217f891d76cc52" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "gio-sys", + "glib", + "libc", + "pin-project-lite", + "smallvec", +] + +[[package]] +name = "gio-sys" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5237611e97e9b86ab5768adc3eef853ae713ea797aa3835404acdfacffc9fb38" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 7.0.2", + "windows-sys 0.52.0", +] + +[[package]] +name = "glib" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c1ea829497810f8e87f5ee6d05c4879af641704add879e6b6080607cceeefe4" +dependencies = [ + "bitflags 2.6.0", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "futures-util", + "gio-sys", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "memchr", + "smallvec", +] + +[[package]] +name = "glib-macros" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "951aa19c5e89555c0ca5e94ee874b24b2594ece8412b387bd84ee3266b8a3ea0" +dependencies = [ + "heck", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "glib-sys" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92eee4531c1c9abba945d19378b205031b5890e1f99c319ba0503b6e0c06a163" +dependencies = [ + "libc", + "system-deps 7.0.2", +] + +[[package]] +name = "gobject-sys" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa3d1dcd8a1eb2e7c22be3d5e792b14b186f3524f79b25631730f9a8c169d49a" +dependencies = [ + "glib-sys", + "libc", + "system-deps 7.0.2", +] + +[[package]] +name = "graphene-rs" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80aac87f74e81c0e13433e892a047237abdc37945c86887f5eed905038356e69" +dependencies = [ + "glib", + "graphene-sys", + "libc", +] + +[[package]] +name = "graphene-sys" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc2f91ecd32989efad60326cc20a8fb252bd2852239a08e4e70cde8c100de9ca" +dependencies = [ + "glib-sys", + "libc", + "pkg-config", + "system-deps 7.0.2", +] + +[[package]] +name = "gsk4" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3cf2091e1af185b347b3450817d93dea6fe435df7abd4c2cd7fb5bcb4cfda8" +dependencies = [ + "cairo-rs", + "gdk4", + "glib", + "graphene-rs", + "gsk4-sys", + "libc", + "pango", +] + +[[package]] +name = "gsk4-sys" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6aa69614a26d8760c186c3690f1b0fbb917572ca23ef83137445770ceddf8cde" +dependencies = [ + "cairo-sys-rs", + "gdk4-sys", + "glib-sys", + "gobject-sys", + "graphene-sys", + "libc", + "pango-sys", + "system-deps 7.0.2", +] + +[[package]] +name = "gstreamer" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683e15f8cc3a1a2646d9fe2181a58b7abb4c166256d8d15cce368e420c741140" +dependencies = [ + "cfg-if", + "futures-channel", + "futures-core", + "futures-util", + "glib", + "gstreamer-sys", + "itertools", + "libc", + "muldiv", + "num-integer", + "num-rational", + "once_cell", + "option-operations", + "paste", + "pin-project-lite", + "smallvec", + "thiserror", +] + +[[package]] +name = "gstreamer-sys" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9c9005b55dd2b1784645963c1ec409f9d420a56f6348d0ae69c2eaff584bcc3" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 7.0.2", +] + +[[package]] +name = "gtk4" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4fe572bf318e5dbc6f5a2f8a25d853f1ae3f42768c0b08af6ca20a18f4057e1" +dependencies = [ + "cairo-rs", + "field-offset", + "futures-channel", + "gdk-pixbuf", + "gdk4", + "gio", + "glib", + "graphene-rs", + "gsk4", + "gtk4-macros", + "gtk4-sys", + "libc", + "pango", +] + +[[package]] +name = "gtk4-macros" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9e7b362c8fccd2712297903717d65d30defdab2b509bc9d209cbe5ffb9fabaf" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "gtk4-sys" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1114a207af8ada02cf4658a76692f4190f06f093380d5be07e3ca8b43aa7c666" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk4-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "graphene-sys", + "gsk4-sys", + "libc", + "pango-sys", + "system-deps 7.0.2", +] + +[[package]] +name = "h2" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap 2.5.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashlink" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" +dependencies = [ + "hashbrown 0.14.5", +] + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "http" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyper" +version = "0.14.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "serde", +] + +[[package]] +name = "indexmap" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +dependencies = [ + "equivalent", + "hashbrown 0.14.5", +] + +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "js-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "libadwaita" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ff9c222b5c783729de45185f07b2fec2d43a7f9c63961e777d3667e20443878" +dependencies = [ + "gdk4", + "gio", + "glib", + "gtk4", + "libadwaita-sys", + "libc", + "pango", +] + +[[package]] +name = "libadwaita-sys" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c44d8bdbad31d6639e1f20cc9c1424f1a8e02d751fc28d44659bf743fb9eca6" +dependencies = [ + "gdk4-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk4-sys", + "libc", + "pango-sys", + "system-deps 7.0.2", +] + +[[package]] +name = "libc" +version = "0.2.158" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + +[[package]] +name = "libsqlite3-sys" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f" +dependencies = [ + "pkg-config", + "vcpkg", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "locale_config" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" +dependencies = [ + "lazy_static", + "objc", + "objc-foundation", + "regex", + "winapi", +] + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mime_guess" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "miniz_oxide" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi", + "libc", + "wasi", + "windows-sys 0.52.0", +] + +[[package]] +name = "muldiv" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0" + +[[package]] +name = "native-tls" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +dependencies = [ + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "object" +version = "0.36.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "openssl" +version = "0.10.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "option-operations" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c26d27bb1aeab65138e4bf7666045169d1717febcc9ff870166be8348b223d0" +dependencies = [ + "paste", +] + +[[package]] +name = "pango" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5764e5a174a5a0ec054fe5962ce6d4fc7052e2d0dcc23bbc77202b40a4a403d3" +dependencies = [ + "gio", + "glib", + "libc", + "pango-sys", +] + +[[package]] +name = "pango-sys" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd317e1de76b14b3d3efe05518c08b360327f1ab7fec150473a89ffcad4b072d" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 7.0.2", +] + +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.52.6", +] + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piped-openapi-sdk" +version = "1.0.0" +source = "git+https://gitlab.com/schmiddi-on-mobile/piped-rs#47e962fae9563e9a4b5a97756a448146b2b02413" +dependencies = [ + "reqwest", + "serde", + "serde_derive", + "serde_json", + "serde_with", + "url", + "uuid", +] + +[[package]] +name = "pipeline-api" +version = "0.1.0" +source = "git+https://gitlab.com/schmiddi-on-mobile/pipeline-backend?rev=1b0071771bfb40abf7b462ceae65f804ef4f884d#1b0071771bfb40abf7b462ceae65f804ef4f884d" +dependencies = [ + "futures", + "log", + "pipeline-core", +] + +[[package]] +name = "pipeline-core" +version = "0.1.0" +source = "git+https://gitlab.com/schmiddi-on-mobile/pipeline-backend?rev=1b0071771bfb40abf7b462ceae65f804ef4f884d#1b0071771bfb40abf7b462ceae65f804ef4f884d" +dependencies = [ + "async-stream", + "chrono", + "futures", + "url", +] + +[[package]] +name = "pipeline-provider-peertube" +version = "0.1.0" +source = "git+https://gitlab.com/schmiddi-on-mobile/pipeline-backend?rev=1b0071771bfb40abf7b462ceae65f804ef4f884d#1b0071771bfb40abf7b462ceae65f804ef4f884d" +dependencies = [ + "async-stream", + "chrono", + "futures", + "pipeline-core", + "reqwest", + "serde", + "serde_json", + "url", +] + +[[package]] +name = "pipeline-provider-piped" +version = "0.1.0" +source = "git+https://gitlab.com/schmiddi-on-mobile/pipeline-backend?rev=1b0071771bfb40abf7b462ceae65f804ef4f884d#1b0071771bfb40abf7b462ceae65f804ef4f884d" +dependencies = [ + "async-stream", + "chrono", + "futures", + "log", + "piped-openapi-sdk", + "pipeline-core", + "reqwest", + "tokio", + "url", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "proc-macro-crate" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" +dependencies = [ + "toml_edit", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "redox_syscall" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "regex" +version = "1.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "reqwest" +version = "0.11.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +dependencies = [ + "base64 0.21.7", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "mime_guess", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "system-configuration", + "tokio", + "tokio-native-tls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg", +] + +[[package]] +name = "rusqlite" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae" +dependencies = [ + "bitflags 2.6.0", + "chrono", + "fallible-iterator", + "fallible-streaming-iterator", + "hashlink", + "libsqlite3-sys", + "smallvec", + "url", +] + +[[package]] +name = "rusqlite_migration" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55709bc01054c69e2f1cefdc886642b5e6376a8db3c86f761be0c423eebf178b" +dependencies = [ + "log", + "rusqlite", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustc_version" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.38.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f55e80d50763938498dd5ebb18647174e0c76dc38c5505294bb224624f30f36" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.7", +] + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "schannel" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "security-framework" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" + +[[package]] +name = "serde" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.128" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_with" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" +dependencies = [ + "base64 0.13.1", + "chrono", + "hex", + "indexmap 1.9.3", + "serde", + "serde_json", + "serde_with_macros", + "time", +] + +[[package]] +name = "serde_with_macros" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "syn" +version = "2.0.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "system-deps" +version = "6.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" +dependencies = [ + "cfg-expr 0.15.8", + "heck", + "pkg-config", + "toml", + "version-compare", +] + +[[package]] +name = "system-deps" +version = "7.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "070a0a5e7da2d24be457809c4b3baa57a835fd2829ad8b86f9a049052fe71031" +dependencies = [ + "cfg-expr 0.16.0", + "heck", + "pkg-config", + "toml", + "version-compare", +] + +[[package]] +name = "target-lexicon" +version = "0.12.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" + +[[package]] +name = "temp-dir" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" + +[[package]] +name = "tempfile" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +dependencies = [ + "cfg-if", + "fastrand", + "once_cell", + "rustix", + "windows-sys 0.59.0", +] + +[[package]] +name = "thiserror" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tinyvec" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.40.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys 0.52.0", +] + +[[package]] +name = "tokio-macros" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.22.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +dependencies = [ + "indexmap 2.5.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "tubefeeder" +version = "2.0.2" +dependencies = [ + "chrono", + "clapper", + "clapper-gtk", + "csv", + "env_logger", + "futures", + "gdk4", + "gettext-rs", + "glib", + "gtk4", + "libadwaita", + "log", + "once_cell", + "pipeline-api", + "pipeline-core", + "pipeline-provider-peertube", + "pipeline-provider-piped", + "reqwest", + "rusqlite", + "rusqlite_migration", + "serde", + "serde_json", + "tokio", + "url", +] + +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "url" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "uuid" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +dependencies = [ + "getrandom", + "serde", +] + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version-compare" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +dependencies = [ + "cfg-if", + "once_cell", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" + +[[package]] +name = "web-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winnow" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] diff --git a/pkgs/by-name/pi/pipeline/package.nix b/pkgs/by-name/pi/pipeline/package.nix new file mode 100644 index 000000000000..4aef16227c27 --- /dev/null +++ b/pkgs/by-name/pi/pipeline/package.nix @@ -0,0 +1,103 @@ +{ + lib, + stdenv, + rustPlatform, + cargo, + rustc, + fetchFromGitLab, + gtk4, + libadwaita, + openssl, + meson, + ninja, + pkg-config, + wrapGAppsHook4, + glib, + appstream-glib, + desktop-file-utils, + blueprint-compiler, + sqlite, + clapper, + gst_all_1, + gtuber, + glib-networking, + gnome, + webp-pixbuf-loader, + librsvg, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "pipeline"; + version = "2.0.2"; + + src = fetchFromGitLab { + owner = "schmiddi-on-mobile"; + repo = "pipeline"; + rev = "v${finalAttrs.version}"; + hash = "sha256-8LKd7zZuwo/HtxFo8x8UpO1Y8/DnTZmaOYrc9NmnIrc="; + }; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + outputHashes = { + "clapper-0.1.0" = "sha256-IFFqfSq2OpzfopQXSYfnJ68HGLY+rvcLqk7NTdDd+28="; + "piped-openapi-sdk-1.0.0" = "sha256-UFzMYYqCzO6KyJvjvK/hBJtz3FOuSC2gWjKp72WFEGk="; + "pipeline-api-0.1.0" = "sha256-h094ZAJOqX9QC1EUAtzIVztudhndXglkYLcFbH/mpqQ="; + }; + }; + + nativeBuildInputs = [ + meson + ninja + cargo + rustPlatform.cargoSetupHook + rustc + pkg-config + wrapGAppsHook4 + glib + appstream-glib + desktop-file-utils + blueprint-compiler + ]; + + buildInputs = [ + gtk4 + libadwaita + openssl + sqlite + clapper + + gst_all_1.gstreamer + gst_all_1.gst-libav + gst_all_1.gst-plugins-base + (gst_all_1.gst-plugins-good.override { gtkSupport = true; }) + gst_all_1.gst-plugins-bad + gtuber + glib-networking # For GIO_EXTRA_MODULES. Fixes "TLS support is not available" + ]; + + # Pull in WebP support for YouTube avatars. + # In postInstall to run before gappsWrapperArgsHook. + postInstall = '' + export GDK_PIXBUF_MODULE_FILE="${ + gnome._gdkPixbufCacheBuilder_DO_NOT_USE { + extraLoaders = [ + webp-pixbuf-loader + librsvg + ]; + } + }" + ''; + + passthru.updateScript = nix-update-script { attrPath = finalAttrs.pname; }; + + meta = { + description = "Watch YouTube and PeerTube videos in one place"; + homepage = "https://mobile.schmidhuberj.de/pipeline"; + mainProgram = "tubefeeder"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ chuangzhu ]; + platforms = lib.platforms.linux; + }; +}) From 2af5e7026e896cd11c515062f8810e285c2587e5 Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com> Date: Mon, 21 Oct 2024 00:49:01 +0300 Subject: [PATCH 80/86] janus-gateway: fix build --- pkgs/servers/janus-gateway/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/janus-gateway/default.nix b/pkgs/servers/janus-gateway/default.nix index 9a0ecad23dd4..3d44258dd70f 100644 --- a/pkgs/servers/janus-gateway/default.nix +++ b/pkgs/servers/janus-gateway/default.nix @@ -44,6 +44,9 @@ stdenv.mkDerivation rec { makeFlags = [ "BORINGSSL_LIBS=-L${lib.getLib boringssl}/lib" + # Linking with CXX because boringssl static libraries depend on C++ stdlib. + # Upstream issue: https://www.github.com/meetecho/janus-gateway/issues/3456 + "CCLD=${stdenv.cc.targetPrefix}c++" ]; outputs = [ "out" "dev" "doc" "man" ]; From e0fb473795943afa07358de90efaaeb6be5623e6 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 23 Oct 2024 16:30:52 +0200 Subject: [PATCH 81/86] janus-gateway: reformat with nixfmt-rfc-style --- pkgs/servers/janus-gateway/default.nix | 58 ++++++++++++++++++++++---- 1 file changed, 50 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/janus-gateway/default.nix b/pkgs/servers/janus-gateway/default.nix index 3d44258dd70f..f757429fbca1 100644 --- a/pkgs/servers/janus-gateway/default.nix +++ b/pkgs/servers/janus-gateway/default.nix @@ -1,7 +1,26 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gengetopt -, glib, libconfig, libnice, jansson, boringssl, zlib, srtp, libuv -, libmicrohttpd, curl, libwebsockets, sofia_sip, libogg, libopus -, usrsctp, ffmpeg +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + pkg-config, + gengetopt, + glib, + libconfig, + libnice, + jansson, + boringssl, + zlib, + srtp, + libuv, + libmicrohttpd, + curl, + libwebsockets, + sofia_sip, + libogg, + libopus, + usrsctp, + ffmpeg, }: let @@ -24,11 +43,29 @@ stdenv.mkDerivation rec { sha256 = "sha256-3o9XxxTlWppq1mFgIUjstUFz6bT44mvBJa4FBgcc4Pc="; }; - nativeBuildInputs = [ autoreconfHook pkg-config gengetopt ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + gengetopt + ]; buildInputs = [ - glib libconfig libnice jansson boringssl zlib srtp libuv libmicrohttpd - curl libwebsockets_janus sofia_sip libogg libopus usrsctp ffmpeg + glib + libconfig + libnice + jansson + boringssl + zlib + srtp + libuv + libmicrohttpd + curl + libwebsockets_janus + sofia_sip + libogg + libopus + usrsctp + ffmpeg ]; enableParallelBuilding = true; @@ -49,7 +86,12 @@ stdenv.mkDerivation rec { "CCLD=${stdenv.cc.targetPrefix}c++" ]; - outputs = [ "out" "dev" "doc" "man" ]; + outputs = [ + "out" + "dev" + "doc" + "man" + ]; postInstall = '' moveToOutput share/janus "$doc" From ff111f8105bf28d23615ee8bcf42b420553a5b6e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 23 Oct 2024 16:32:37 +0200 Subject: [PATCH 82/86] janus-gateway: move to by-name --- .../default.nix => by-name/ja/janus-gateway/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{servers/janus-gateway/default.nix => by-name/ja/janus-gateway/package.nix} (100%) diff --git a/pkgs/servers/janus-gateway/default.nix b/pkgs/by-name/ja/janus-gateway/package.nix similarity index 100% rename from pkgs/servers/janus-gateway/default.nix rename to pkgs/by-name/ja/janus-gateway/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5cb22997c57..ab4ea015106b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24362,8 +24362,6 @@ with pkgs; ircdHybrid = callPackage ../servers/irc/ircd-hybrid { }; - janus-gateway = callPackage ../servers/janus-gateway { }; - janusgraph = callPackage ../servers/nosql/janusgraph { }; jboss = callPackage ../servers/http/jboss { }; From b79d605f737267765d3dba54049d0baae5fa5da0 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Wed, 23 Oct 2024 15:38:57 +0100 Subject: [PATCH 83/86] factorio: 2.0.8 -> 2.0.9 --- pkgs/by-name/fa/factorio/versions.json | 32 +++++++++++++------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/fa/factorio/versions.json b/pkgs/by-name/fa/factorio/versions.json index 273ba332e646..6389b381e74a 100644 --- a/pkgs/by-name/fa/factorio/versions.json +++ b/pkgs/by-name/fa/factorio/versions.json @@ -14,14 +14,14 @@ }, "stable": { "candidateHashFilenames": [ - "factorio_linux_2.0.8.tar.xz" + "factorio_linux_2.0.9.tar.xz" ], - "name": "factorio_alpha_x64-2.0.8.tar.xz", + "name": "factorio_alpha_x64-2.0.9.tar.xz", "needsAuth": true, - "sha256": "94ea36a5b9103369df7158a8281039dd2f1d7fa7bb3a2d854c715250dd73e185", + "sha256": "34c21cd3cbe91b65483786ccb4467b5d4766c748cbbddd2ce3b30d319d163e3b", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.8/alpha/linux64", - "version": "2.0.8" + "url": "https://factorio.com/get-download/2.0.9/alpha/linux64", + "version": "2.0.9" } }, "demo": { @@ -62,14 +62,14 @@ }, "stable": { "candidateHashFilenames": [ - "factorio-space-age_linux_2.0.8.tar.xz" + "factorio-space-age_linux_2.0.9.tar.xz" ], - "name": "factorio_expansion_x64-2.0.8.tar.xz", + "name": "factorio_expansion_x64-2.0.9.tar.xz", "needsAuth": true, - "sha256": "408eae824daa761564b1ea7b81925efe05298cbaffd120eea235341ac05a6a60", + "sha256": "6369d23550a7a721d3de1d34253e8321ee601fa759d1fb5efac9abc28aa7509d", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.8/expansion/linux64", - "version": "2.0.8" + "url": "https://factorio.com/get-download/2.0.9/expansion/linux64", + "version": "2.0.9" } }, "headless": { @@ -87,15 +87,15 @@ }, "stable": { "candidateHashFilenames": [ - "factorio-headless_linux_2.0.8.tar.xz", - "factorio_headless_x64_2.0.8.tar.xz" + "factorio-headless_linux_2.0.9.tar.xz", + "factorio_headless_x64_2.0.9.tar.xz" ], - "name": "factorio_headless_x64-2.0.8.tar.xz", + "name": "factorio_headless_x64-2.0.9.tar.xz", "needsAuth": false, - "sha256": "d9594c4d552a3e4f965b188a4774da8c8b010fc23ddb0efc63b1d94818dde1ca", + "sha256": "f499077b3e2c1313452c350f1faf17db31cae2a0fa738f69166e97c3caa3c86d", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.8/headless/linux64", - "version": "2.0.8" + "url": "https://factorio.com/get-download/2.0.9/headless/linux64", + "version": "2.0.9" } } } From f3138af886348f963187150f2941b8ec306c6c63 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 23 Oct 2024 16:43:28 +0200 Subject: [PATCH 84/86] janus-gateway: 1.2.3 -> 1.2.4 --- pkgs/by-name/ja/janus-gateway/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ja/janus-gateway/package.nix b/pkgs/by-name/ja/janus-gateway/package.nix index f757429fbca1..dadd67e735cf 100644 --- a/pkgs/by-name/ja/janus-gateway/package.nix +++ b/pkgs/by-name/ja/janus-gateway/package.nix @@ -34,13 +34,13 @@ in stdenv.mkDerivation rec { pname = "janus-gateway"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "meetecho"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3o9XxxTlWppq1mFgIUjstUFz6bT44mvBJa4FBgcc4Pc="; + sha256 = "sha256-oUX9PxiNdmrC03p+DAGkxD+mbi2jzuCgwlgd2JZ4Gwo="; }; nativeBuildInputs = [ From c42b24b3f47358008f10acd373ee0a779aee8e64 Mon Sep 17 00:00:00 2001 From: andre4ik3 Date: Wed, 23 Oct 2024 19:14:34 +0400 Subject: [PATCH 85/86] nixos/apple-touchbar: init module (#350219) --- .../manual/release-notes/rl-2411.section.md | 2 + nixos/modules/hardware/apple-touchbar.nix | 43 +++++++++++++++++++ nixos/modules/module-list.nix | 1 + 3 files changed, 46 insertions(+) create mode 100644 nixos/modules/hardware/apple-touchbar.nix diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index e1dc21875b0d..747765727379 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -190,6 +190,8 @@ - [Zapret](https://github.com/bol-van/zapret), a DPI bypass tool. Available as [services.zapret](option.html#opt-services.zapret). +- [tiny-dfr](https://github.com/WhatAmISupposedToPutHere/tiny-dfr), a dynamic function row daemon for the Touch Bar found on some Apple laptops. Available as [hardware.apple.touchBar.enable](options.html#opt-hardware.apple.touchBar.enable). + ## Backward Incompatibilities {#sec-release-24.11-incompatibilities} - The `sound` options have been removed or renamed, as they had a lot of unintended side effects. See [below](#sec-release-24.11-migration-sound) for details. diff --git a/nixos/modules/hardware/apple-touchbar.nix b/nixos/modules/hardware/apple-touchbar.nix new file mode 100644 index 000000000000..700ef173a907 --- /dev/null +++ b/nixos/modules/hardware/apple-touchbar.nix @@ -0,0 +1,43 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.hardware.apple.touchBar; + format = pkgs.formats.toml { }; + cfgFile = format.generate "config.toml" cfg.settings; +in +{ + options.hardware.apple.touchBar = { + enable = lib.mkEnableOption "support for the Touch Bar on some Apple laptops using tiny-dfr"; + package = lib.mkPackageOption pkgs "tiny-dfr" { }; + + settings = lib.mkOption { + type = format.type; + default = { }; + description = '' + Configuration for tiny-dfr. See [example configuration][1] for available options. + + [1]: https://github.com/WhatAmISupposedToPutHere/tiny-dfr/blob/master/share/tiny-dfr/config.toml + ''; + example = lib.literalExpression '' + { + MediaLayerDefault = true; + ShowButtonOutlines = false; + EnablePixelShift = true; + } + ''; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.packages = [ cfg.package ]; + services.udev.packages = [ cfg.package ]; + + environment.etc."tiny-dfr/config.toml".source = cfgFile; + systemd.services.tiny-dfr.restartTriggers = [ cfgFile ]; + }; +} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e84580f8f0f1..53a8648b900b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -48,6 +48,7 @@ ./config/zram.nix ./hardware/acpilight.nix ./hardware/all-firmware.nix + ./hardware/apple-touchbar.nix ./hardware/bladeRF.nix ./hardware/brillo.nix ./hardware/ckb-next.nix From 2b2950fbc0ae8690f1f06d9a3c665c13ba84f02b Mon Sep 17 00:00:00 2001 From: Redhawk <77415970+Redhawk18@users.noreply.github.com> Date: Wed, 23 Oct 2024 11:53:38 -0400 Subject: [PATCH 86/86] edopro: init at 40.1.4 (#342365) Co-authored-by: Cosima Neidahl --- pkgs/by-name/ed/edopro/deps.nix | 14 + .../ed/edopro/ocgcore-lua-symbols.patch | 29 ++ pkgs/by-name/ed/edopro/package.nix | 318 ++++++++++++++++++ pkgs/by-name/ed/edopro/update.py | 119 +++++++ 4 files changed, 480 insertions(+) create mode 100644 pkgs/by-name/ed/edopro/deps.nix create mode 100644 pkgs/by-name/ed/edopro/ocgcore-lua-symbols.patch create mode 100644 pkgs/by-name/ed/edopro/package.nix create mode 100755 pkgs/by-name/ed/edopro/update.py diff --git a/pkgs/by-name/ed/edopro/deps.nix b/pkgs/by-name/ed/edopro/deps.nix new file mode 100644 index 000000000000..6ca795ffab29 --- /dev/null +++ b/pkgs/by-name/ed/edopro/deps.nix @@ -0,0 +1,14 @@ +# This is automatically generated by the update script. +# DO NOT MANUALLY EDIT. +{ + assets-hash = "sha256-vZhkWJ1ZoNEwdc5kM1S0hyXnWmupiTOanCi9DCuqw/k="; + edopro-version = "40.1.4"; + edopro-rev = "c713e23491a1e55c9d8e91257e5f2b5873696b9b"; + edopro-hash = "sha256-2E1cjG0FONu/fbr67/3qRCKQ1W/wPznClEWsMa1FAzo="; + irrlicht-version = "1.9.0-unstable-2023-02-18"; + irrlicht-rev = "7edde28d4f8c0c3589934c398a3a441286bb7c22"; + irrlicht-hash = "sha256-Q2tNiYE/enZPqA5YhUe+Tkvmqtmmz2E0OqTRUDnt+UA="; + ocgcore-version = "0-unstable-2022-09-15"; + ocgcore-rev = "4a872ad7686e0d00ee4c1c051e90fc07c40613d4"; + ocgcore-hash = "sha256-s3DOHrZilRUy6fbXObNiLRinxpdHY99vDOmS/ZfOI78="; +} diff --git a/pkgs/by-name/ed/edopro/ocgcore-lua-symbols.patch b/pkgs/by-name/ed/edopro/ocgcore-lua-symbols.patch new file mode 100644 index 000000000000..253051ebf0f7 --- /dev/null +++ b/pkgs/by-name/ed/edopro/ocgcore-lua-symbols.patch @@ -0,0 +1,29 @@ +From 41e750142b44465f3af197b7e2f0d6f54fc48c2d Mon Sep 17 00:00:00 2001 +From: OPNA2608 +Date: Mon, 21 Oct 2024 17:42:24 +0200 +Subject: [PATCH] Mark Lua symbols as C symbols + +Otherwise linking against our Lua built by a C-compiler fails due to the symbols being resolved as C++ symbols. +--- + interpreter.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/interpreter.h b/interpreter.h +index 6c405a1..c471ecb 100644 +--- a/interpreter.h ++++ b/interpreter.h +@@ -9,9 +9,11 @@ + #define INTERPRETER_H_ + + // Due to longjmp behaviour, we must build Lua as C++ to avoid UB ++extern "C" { + #include + #include + #include ++} + + #include "common.h" + #include +-- +2.44.1 + diff --git a/pkgs/by-name/ed/edopro/package.nix b/pkgs/by-name/ed/edopro/package.nix new file mode 100644 index 000000000000..89dd0acf3d86 --- /dev/null +++ b/pkgs/by-name/ed/edopro/package.nix @@ -0,0 +1,318 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchzip, + makeWrapper, + premake5, + writeShellScriptBin, + runCommandLocal, + symlinkJoin, + imagemagick, + bzip2, + curl, + flac, + # Use fmt 10+ after release 40.1.4+ + fmt_9, + freetype, + libevent, + libgit2, + libGL, + libGLU, + libjpeg, + libpng, + libvorbis, + libX11, + libxkbcommon, + libXxf86vm, + lua5_3, + mono, + nlohmann_json, + openal, + SDL2, + sqlite, + wayland, + egl-wayland, + covers_url ? "https://pics.projectignis.org:2096/pics/cover/{}.jpg", + fields_url ? "https://pics.projectignis.org:2096/pics/field/{}.png", + # While ygoprodeck has higher quality images, "spamming" of their api results in a ban. + # Thats why this link can change since it's compiled into the program, However it will + # download assets when needed so it is unlikely to get banned. Unless you search the + # card list with no filters of any kind. When testing use ProjectIgnis' website instead. + pics_url ? "https://images.ygoprodeck.com/images/cards/{}.jpg", +}: +let + archLabel = + { + "x86_64-linux" = "x64"; + "aarch64-linux" = "arm64"; + } + .${stdenv.hostPlatform.system} + or (throw "${stdenv.hostPlatform.system} is an unsupported arch label for edopro"); + + deps = import ./deps.nix; +in +let + assets = fetchzip { + url = "https://github.com/ProjectIgnis/edopro-assets/releases/download/${deps.edopro-version}/ProjectIgnis-EDOPro-${deps.edopro-version}-linux.tar.gz"; + hash = deps.assets-hash; + }; + + irrlicht-edopro = stdenv.mkDerivation { + pname = "irrlicht-edopro"; + version = deps.irrlicht-version; + + src = fetchFromGitHub { + owner = "edo9300"; + repo = "irrlicht1-8-4"; + rev = deps.irrlicht-rev; + hash = deps.irrlicht-hash; + }; + + buildInputs = [ + libGLU + libX11 + libxkbcommon + libXxf86vm + wayland + ]; + + enableParallelBuilding = true; + buildFlags = [ + "NDEBUG=1" + ]; + makeFlags = [ + "-C" + "source/Irrlicht" + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,include} + cp lib/Linux/libIrrlicht.a $out/bin + cp -r include/* $out/include + + runHook postInstall + ''; + }; + + ocgcore = stdenv.mkDerivation { + pname = "ygopro-core"; + version = deps.ocgcore-version; + + src = fetchFromGitHub { + owner = "edo9300"; + repo = "ygopro-core"; + rev = deps.ocgcore-rev; + hash = deps.ocgcore-hash; + fetchSubmodules = true; + }; + + patches = [ + ./ocgcore-lua-symbols.patch + ]; + + nativeBuildInputs = [ premake5 ]; + + buildInputs = [ lua5_3 ]; + + preBuild = '' + premake5 gmake2 \ + --lua-path="${lua5_3}" + ''; + + enableParallelBuilding = true; + buildFlags = [ + "verbose=true" + "config=release" + "ocgcoreshared" + ]; + makeFlags = [ + "-C" + "build" + ]; + + installPhase = '' + runHook preInstall + + install -Dm644 -t $out/lib bin/release/libocgcore${stdenv.hostPlatform.extensions.sharedLibrary} + + runHook postInstall + ''; + }; + + edopro = stdenv.mkDerivation { + pname = "edopro"; + version = deps.edopro-version; + + src = fetchFromGitHub { + owner = "edo9300"; + repo = "edopro"; + rev = deps.edopro-rev; + hash = deps.edopro-hash; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + makeWrapper + premake5 + ]; + + buildInputs = [ + bzip2 + curl + flac + fmt_9 + freetype + irrlicht-edopro + libevent + libgit2 + libjpeg + libpng + libvorbis + lua5_3 + nlohmann_json + ocgcore + openal + SDL2 + sqlite + ]; + + # nixpkgs' gcc stack currently appears to not support LTO + postPatch = '' + substituteInPlace premake5.lua \ + --replace-fail 'flags "LinkTimeOptimization"' 'removeflags "LinkTimeOptimization"' + ''; + + preBuild = '' + premake5 gmake2 \ + --architecture=${archLabel} \ + --covers=\"${covers_url}\" \ + --fields=\"${fields_url}\" \ + --pics=\"${pics_url}\" \ + --prebuilt-core="${lib.getLib ocgcore}/lib" \ + --sound=sfml + ''; + + enableParallelBuilding = true; + env = { + # remove after release 40.1.4+ + # https://discord.com/channels/170601678658076672/792223685112889344/1286043823293599785 + CXXFLAGS = "-include cstdint"; + LDFLAGS = "-I ${irrlicht-edopro}/include -L ${irrlicht-edopro}/bin"; + }; + buildFlags = [ + "verbose=true" + "config=release_${archLabel}" + "ygopro" + ]; + makeFlags = [ + "-C" + "build" + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp bin/${archLabel}/release/ygopro $out/bin + wrapProgram $out/bin/ygopro \ + --prefix PATH : ${lib.makeBinPath [ mono ]} \ + --prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + libGL + libX11 + libxkbcommon + libXxf86vm + sqlite + wayland + egl-wayland + ] + } + + runHook postInstall + ''; + }; + + edopro-script = + let + assetsToCopy = lib.concatStringsSep "," [ + # Needed if we download files from ProjectIgnis' website or any https only website. + "cacert.pem" + "config" + "deck" + "COPYING.txt" + "expansions" + "lflists" + "notices" + "puzzles" + "fonts" + "script" + "skin" + "sound" + "textures" + "WindBot" + ]; + in + writeShellScriptBin "edopro" '' + set -eu + EDOPRO_DIR="''${XDG_DATA_HOME:-$HOME/.local/share}/edopro" + + if [ ! -d $EDOPRO_DIR ]; then + mkdir -p $EDOPRO_DIR + cp -r --no-preserve=all ${assets}/{${assetsToCopy}} $EDOPRO_DIR + chmod -R go-rwx $EDOPRO_DIR + + rm $EDOPRO_DIR/config/io.github.edo9300.EDOPro.desktop.in + fi + + exec ${edopro}/bin/ygopro -C $EDOPRO_DIR $@ + ''; + + edopro-desktop = runCommandLocal "io.github.edo9300.EDOPro.desktop" { } '' + cp ${assets}/config/io.github.edo9300.EDOPro.desktop.in desktop-template + + sed '/Path=/d' -i desktop-template + sed 's/Exec=.*/Exec=EDOPro/' -i desktop-template + sed 's/Icon=.*/Icon=EDOPro/' -i desktop-template + + install -D desktop-template $out/share/applications/io.github.edo9300.EDOPro.desktop + ''; +in +symlinkJoin { + name = "edopro-application-${deps.edopro-version}"; + version = deps.edopro-version; + paths = [ + edopro-script + edopro-desktop + ]; + + postBuild = '' + mkdir -p $out/share/icons/hicolor/256x256/apps/ + ${imagemagick}/bin/magick \ + ${assets}/textures/AppIcon.png \ + -resize 256x256 \ + $out/share/icons/hicolor/256x256/apps/EDOPro.png + ''; + + passthru.updateScript = ./update.py; + + meta = { + description = "Bleeding-edge automatic duel simulator, a fork of the YGOPro client"; + homepage = "https://projectignis.github.io"; + changelog = "https://github.com/edo9300/edopro/releases"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ + OPNA2608 + redhawk + ]; + mainProgram = "edopro"; + # This is likely a very easy app to port if you're interested. + # We just have no way to test on other platforms. + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; + }; +} diff --git a/pkgs/by-name/ed/edopro/update.py b/pkgs/by-name/ed/edopro/update.py new file mode 100755 index 000000000000..05976976773d --- /dev/null +++ b/pkgs/by-name/ed/edopro/update.py @@ -0,0 +1,119 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i python -p nix-prefetch-github python3Packages.githubkit +import json +import subprocess + +from githubkit import GitHub, UnauthAuthStrategy +from githubkit.versions.latest.models import ( + Commit, + ContentSubmodule, + Tag, +) + +DEPS_PATH: str = "./pkgs/by-name/ed/edopro/deps.nix" + +with GitHub(UnauthAuthStrategy()) as github: + edopro: Tag = github.rest.repos.list_tags("edo9300", "edopro").parsed_data[0] + + ocgcore_submodule: ContentSubmodule = github.rest.repos.get_content( + "edo9300", "edopro", "ocgcore" + ).parsed_data + + ocgcore: Commit = github.rest.repos.get_commit( + "edo9300", "ygopro-core", ocgcore_submodule.sha + ).parsed_data + + # This dep is not versioned in anyway and is why we check below to see if this is a new version. + irrlicht: Commit = github.rest.repos.list_commits( + "edo9300", "irrlicht1-8-4" + ).parsed_data[0] + + irrlicht: Commit = github.rest.repos.get_commit( + "edo9300", "irrlicht1-8-4", "7edde28d4f8c0c3589934c398a3a441286bb7c22" + ).parsed_data + + +edopro_working_version: str = "" +try: + with open(DEPS_PATH, "r") as file: + for line in file.readlines(): + if "edopro-version" in line: + edopro_working_version = line.split('"')[1] +except FileNotFoundError: + print("Error: Dep file not found.") + exit(2) + +if edopro_working_version == "": + print("Working version is unbound") + exit(5) + +if edopro_working_version == edopro.name: + print("Version is updated") + exit(0) + + +def get_hash(owner: str, repo: str, rev: str, submodule: bool = False) -> str: + args: list[str] = ["nix-prefetch-github", owner, repo, "--rev", rev] + + if submodule: + args.append("--fetch-submodules") + + out: subprocess.CompletedProcess = subprocess.run(args, capture_output=True) + out_json = json.loads(out.stdout.decode()) + + return out_json["hash"] + + +edopro_hash = get_hash("edo9300", "edopro", edopro.commit.sha, submodule=True) +ocgcore_hash = get_hash("edo9300", "ygopro-core", ocgcore.sha) +irrlicht_hash = get_hash("edo9300", "irrlicht1-8-4", irrlicht.sha) + +asset_legacy_hash: str = ( + subprocess.run( + [ + "nix-prefetch-url", + f"https://github.com/ProjectIgnis/edopro-assets/releases/download/{edopro.name}/ProjectIgnis-EDOPro-{edopro.name}-linux.tar.gz", + "--unpack", + ], + capture_output=True, + ) + .stdout.decode() + .strip() +) +asset_hash: str = ( + subprocess.run( + [ + "nix", + "--extra-experimental-features", + "nix-command", + "hash", + "to-sri", + "--type", + "sha256", + asset_legacy_hash, + ], + capture_output=True, + ) + .stdout.decode() + .strip() +) + + +with open(DEPS_PATH, "w") as file: + contents = f"""# This is automatically generated by the update script. +# DO NOT MANUALLY EDIT. +{{ + assets-hash = "{asset_hash}"; + edopro-version = "{edopro.name}"; + edopro-rev = "{edopro.commit.sha}"; + edopro-hash = "{edopro_hash}"; + irrlicht-version = "{"1.9.0-unstable-" + irrlicht.commit.committer.date.split("T")[0]}"; + irrlicht-rev = "{irrlicht.sha}"; + irrlicht-hash = "{irrlicht_hash}"; + ocgcore-version = "{"0-unstable-" + ocgcore.commit.committer.date.split("T")[0]}"; + ocgcore-rev = "{ocgcore.sha}"; + ocgcore-hash = "{ocgcore_hash}"; +}} +""" + + file.write(contents)