From 0725e430e245ff3ca8a28b4131a030638b564921 Mon Sep 17 00:00:00 2001 From: uku Date: Fri, 24 May 2024 15:58:42 +0200 Subject: [PATCH 001/298] maintainers: add uku3lig --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2dd8f636e90b..df8f40063cc2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -21156,6 +21156,13 @@ githubId = 12422133; name = "Chromo-residuum-opec"; }; + uku3lig = { + name = "uku"; + email = "hi@uku.moe"; + matrix = "@uku:m.uku.moe"; + github = "uku3lig"; + githubId = 61147779; + }; ulrikstrid = { email = "ulrik.strid@outlook.com"; github = "ulrikstrid"; From 6a9525eac08442f2d2b0fbea8ba55270e013104d Mon Sep 17 00:00:00 2001 From: Raroh73 <96078496+Raroh73@users.noreply.github.com> Date: Mon, 29 Jul 2024 11:33:04 +0200 Subject: [PATCH 002/298] commafeed: 4.3.3 -> 4.6.0 --- pkgs/by-name/co/commafeed/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/co/commafeed/package.nix b/pkgs/by-name/co/commafeed/package.nix index 61cad3e9682e..297d36ddb179 100644 --- a/pkgs/by-name/co/commafeed/package.nix +++ b/pkgs/by-name/co/commafeed/package.nix @@ -1,5 +1,6 @@ { lib, + biome, buildNpmPackage, fetchFromGitHub, jre, @@ -9,13 +10,13 @@ writeText, }: let - version = "4.3.3"; + version = "4.6.0"; src = fetchFromGitHub { owner = "Athou"; repo = "commafeed"; rev = version; - hash = "sha256-y0gTmtlDg7sdunG1ne/3WkFx2KQkTGRlfYpXBHFFh2o="; + hash = "sha256-Qc2l/CSVK+8k7b3RZA8hQsGTq29OvkDMbMzHcnPm/yE="; }; frontend = buildNpmPackage { @@ -25,7 +26,9 @@ let sourceRoot = "${src.name}/commafeed-client"; - npmDepsHash = "sha256-fye7MPWXUeFCMgcnesspd1giGG/ZldiOv00fjtXZSb4="; + npmDepsHash = "sha256-bQShz6dmE9IZ9to5Z2DScncc/WVJnX1tRCm8XQJNmiU="; + + nativeBuildInputs = [ biome ]; installPhase = '' runHook preInstall @@ -49,7 +52,7 @@ maven.buildMavenPackage { pname = "commafeed"; - mvnHash = "sha256-LDZv3CBc/FpVMKmZ+kqfBdkTbqZcJMRqeXN35t4rwJI="; + mvnHash = "sha256-7nm8Cz05Qa44TMC0ioklvKAXQnE9J2wUDZFXLQt2A1w="; mvnParameters = lib.escapeShellArgs [ "-Dskip.installnodenpm" From aed489629d565e4a6c87e8676a342ffc55012ab6 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Sun, 4 Aug 2024 03:51:48 +0700 Subject: [PATCH 003/298] techmino: add update script --- pkgs/by-name/te/techmino/ccloader.nix | 3 ++- pkgs/by-name/te/techmino/libcoldclear.nix | 8 ++------ pkgs/by-name/te/techmino/package.nix | 10 ++++++++-- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/te/techmino/ccloader.nix b/pkgs/by-name/te/techmino/ccloader.nix index 3fe632a93785..38a4b32c821a 100644 --- a/pkgs/by-name/te/techmino/ccloader.nix +++ b/pkgs/by-name/te/techmino/ccloader.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { owner = "26F-Studio"; repo = "cold_clear_ai_love2d_wrapper"; rev = version; - hash = "sha256-zfTSMWqjFrAKW5m+9q3K2Je8bbSyhC6pC/vPAWDGCNg="; + fetchSubmodules = true; + hash = "sha256-sguV+Dw+etZH43tXZYL46NAdsI/qvyvGWCPUiTEjhy4="; }; buildInputs = [ libcoldclear luajit ]; diff --git a/pkgs/by-name/te/techmino/libcoldclear.nix b/pkgs/by-name/te/techmino/libcoldclear.nix index 4160e0bdcb87..516f5c4dd9cd 100644 --- a/pkgs/by-name/te/techmino/libcoldclear.nix +++ b/pkgs/by-name/te/techmino/libcoldclear.nix @@ -1,6 +1,7 @@ { lib , rustPlatform , fetchFromGitHub +, ccloader }: let @@ -17,12 +18,7 @@ rustPlatform.buildRustPackage { pname = "libcoldclear"; version = "0.1.0"; - src = fetchFromGitHub { - owner = "26F-Studio"; - repo = "cold-clear"; - rev = "1564ce9ad14aa60f32bf9a5120594933b3501548"; - hash = "sha256-6fZpKHEJ0dsOTp755GLnxa/befCUJhjqA3Zna5UkKVo="; - }; + src = "${ccloader.src}/cold-clear"; # remove workspace cargo.toml so we don't load all of workspace's deps postPatch = '' diff --git a/pkgs/by-name/te/techmino/package.nix b/pkgs/by-name/te/techmino/package.nix index 8b49abd69340..638509cbe555 100644 --- a/pkgs/by-name/te/techmino/package.nix +++ b/pkgs/by-name/te/techmino/package.nix @@ -6,7 +6,9 @@ , makeDesktopItem , love , luajit -, libcoldclear ? callPackage ./libcoldclear.nix { } +, writeShellScript +, nix-update +, libcoldclear ? callPackage ./libcoldclear.nix { inherit ccloader; } , ccloader ? callPackage ./ccloader.nix { inherit libcoldclear luajit; } }: @@ -39,7 +41,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ love ccloader ]; dontUnpack = true; @@ -62,6 +63,11 @@ stdenv.mkDerivation rec { passthru = { inherit ccloader libcoldclear; + updateScript = writeShellScript "update-script.sh" '' + if ${lib.getExe nix-update} techmino | grep "Packages updated"; then + ${lib.getExe nix-update} techmino.ccloader + fi + ''; }; meta = with lib; { From 9c984efbec2cbbc7ee0baf0c2b41a12cbe817915 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Thu, 8 Aug 2024 17:56:08 +0000 Subject: [PATCH 004/298] techmino: 0.17.17 -> 0.17.21 --- pkgs/by-name/te/techmino/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/te/techmino/package.nix b/pkgs/by-name/te/techmino/package.nix index 638509cbe555..3d15feeb49fd 100644 --- a/pkgs/by-name/te/techmino/package.nix +++ b/pkgs/by-name/te/techmino/package.nix @@ -33,11 +33,11 @@ in stdenv.mkDerivation rec { inherit pname; - version = "0.17.17"; + version = "0.17.21"; src = fetchurl { url = "https://github.com/26F-Studio/Techmino/releases/download/v${version}/Techmino_Bare.love"; - hash = "sha256-ExVdS2QXSRVMlRhrjD/Plo7fhQ3uUBHlwv6y91/S3uA="; + hash = "sha256-8gMIyNP1FS52LnbpQ+G9XNtK3rQruzkMDRz7Gk9LZcQ="; }; nativeBuildInputs = [ makeWrapper ]; From 09850cda27f7bd43647f63bf776556075883446f Mon Sep 17 00:00:00 2001 From: FlyingWombat <25214020+FlyingWombat@users.noreply.github.com> Date: Mon, 29 Jul 2024 17:23:51 -0600 Subject: [PATCH 005/298] av1an: vapoursynth support Corrected wrapper entries: - Need to override vapoursynth with `vapoursynth.withPlugins` for av1an to be able to use VS plugins. Changed PYTHON_PATH accordingly. Passing `pkgs.vapoursynth` to `python3Packages.makePythonPath` makes an incorrect path entry, resulting in segfault when the program is run. - Need LD_LIBRARY_PATH to use VS plugins (e.g. ffms2 and lsmash, the recommended chunking method). Otherwise get e.g. `Error: FFMS2 is not installed, but it was specified as the chunk method`. - Need vapoursynth in PATH to use VS based chunking methods or VS script as input. At least, `vspipe` binary needs to be visible in PATH. Add mkvtoolnix option; it is the recommended concatenation method. --- pkgs/by-name/av/av1an/package.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/av/av1an/package.nix b/pkgs/by-name/av/av1an/package.nix index ec3a4d66ae8b..1333ce81c8b4 100644 --- a/pkgs/by-name/av/av1an/package.nix +++ b/pkgs/by-name/av/av1an/package.nix @@ -5,7 +5,7 @@ testers, av1an-unwrapped, ffmpeg, - python3Packages, + python3, libaom, svt-av1, rav1e, @@ -13,6 +13,8 @@ x264, x265, libvmaf, + vapoursynth, + mkvtoolnix-cli, withAom ? true, # AV1 reference encoder withSvtav1 ? false, # AV1 encoder/decoder (focused on speed and correctness) withRav1e ? false, # AV1 encoder (focused on speed and safety) @@ -20,6 +22,7 @@ withX264 ? true, # H.264/AVC encoder withX265 ? true, # H.265/HEVC encoder withVmaf ? false, # Perceptual video quality assessment algorithm + withMkvtoolnix ? true, # mkv editor, recommended concatenation method }: # av1an requires at least one encoder assert lib.assertMsg (lib.elem true [ @@ -40,19 +43,24 @@ symlinkJoin { postBuild = let runtimePrograms = - [ (ffmpeg.override { inherit withVmaf; }) ] + [ + vapoursynth + (ffmpeg.override { inherit withVmaf; }) + ] ++ lib.optional withAom libaom ++ lib.optional withSvtav1 svt-av1 ++ lib.optional withRav1e rav1e ++ lib.optional withVpx libvpx ++ lib.optional withX264 x264 ++ lib.optional withX265 x265 - ++ lib.optional withVmaf libvmaf; + ++ lib.optional withVmaf libvmaf + ++ lib.optional withMkvtoolnix mkvtoolnix-cli; in '' wrapProgram $out/bin/av1an \ + --prefix LD_LIBRARY_PATH : ${vapoursynth}/lib \ --prefix PATH : ${lib.makeBinPath runtimePrograms} \ - --prefix PYTHONPATH : ${python3Packages.makePythonPath [ python3Packages.vapoursynth ]} + --prefix PYTHONPATH : ${vapoursynth}/${python3.sitePackages} ''; passthru = { From c6ede05a87d84a2a5a3589e2d75b0123faf17061 Mon Sep 17 00:00:00 2001 From: GetPsyched Date: Mon, 12 Aug 2024 09:37:26 +0530 Subject: [PATCH 006/298] atlauncher: build from source --- pkgs/by-name/at/atlauncher/deps.json | 1278 ++++++++++++++++++++++++ pkgs/by-name/at/atlauncher/package.nix | 72 +- 2 files changed, 1321 insertions(+), 29 deletions(-) create mode 100644 pkgs/by-name/at/atlauncher/deps.json diff --git a/pkgs/by-name/at/atlauncher/deps.json b/pkgs/by-name/at/atlauncher/deps.json new file mode 100644 index 000000000000..5ebd36a13cc5 --- /dev/null +++ b/pkgs/by-name/at/atlauncher/deps.json @@ -0,0 +1,1278 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https:/": { + "jitpack.io/com/github/ATLauncher/gradle-macappbundle#build/d22f8cdb94": { + "jar": "sha256-rBqYi12MUWdwuNbFSlYO0tREzcDpfXI3VRPVV/DRZ+c=", + "module": "sha256-JlSHpEtQuOO3/qIdidXBZ21IjieA7PE2b0ui7aimdxc=", + "pom": "sha256-ySbX7ZLlXt7l+JcGEqV/peu6T+h7oJp6s/d95XQdIVo=" + }, + "jitpack.io/com/github/ATLauncher/gradle-macappbundle#edu.sc.seis.macAppBundle.gradle.plugin/d22f8cdb94": { + "pom": "sha256-9LZJTFfyVUyMXTgn2ifGyXEPLfPJ6tmlY8qSWEO0YmU=" + }, + "jitpack.io/com/github/MCRcortex#nekodetector/Version-1.1-pre": { + "jar": "sha256-5K2d2tmaNRavJFLe9oIv1RxNUoSUsWbZla7B0Z+4f9U=", + "module": "sha256-NCI+ztVps3ogtEyQTwowxHLTZCzaGuKHF4xQItu/Ejg=", + "pom": "sha256-pdiFUkilkUhJCwxup4WHMPCu9aPmzg0LmuVZ18Z5ODo=" + }, + "jitpack.io/com/github/RyanTheAllmighty/gettext#gettext-gradle-plugin/aab5c30bf8": { + "jar": "sha256-S6XyAGm5/VXtmttMQBoNSkZ1cKNw0WKPVnLl0GxyTjw=", + "pom": "sha256-ozcVak/AVSDRcUwozKhEC5crmdQwI1NUJso7nGu5qOg=" + }, + "jitpack.io/com/github/RyanTheAllmighty/gettext#gettext-lib/88ae68d897": { + "jar": "sha256-W/Er53HJryRvdlo/Vh4XQFu6TSD5OTwTxSYt7Sv9QMs=", + "pom": "sha256-nbYGMqdReKL4Po10G3MWrloZWQLK8zUd3YqLKs/8TZI=" + }, + "jitpack.io/com/github/RyanTheAllmighty/gettext#gettext-lib/aab5c30bf8": { + "jar": "sha256-5ZE5ZDU4P3vhzmlAOVxAZynMBrkJfxPsTKVH+b/MxRE=", + "pom": "sha256-AdGzI8W4ciDR49kasH/2Bh0XVpY8Ve/MFj+LI3pJHR4=" + }, + "jitpack.io/com/github/Vatuu#discord-rpc/1.6.2": { + "jar": "sha256-nTR5RBRKtdd34W1ui+EI3gxb9fbIz08uBOXS3Wn7tU4=", + "pom": "sha256-TWqqjVQWL2EeeD9I7+HngsFOv5WuZifEfKc9s1PVVdo=" + }, + "jitpack.io/com/gitlab/doomsdayrs#rxswing/a5749ad421": { + "jar": "sha256-XZIGfC5TCNjiXwHdEdpxBSGWJu8aHt5RLkHYJey0nbc=", + "module": "sha256-TAPDjgy5Byv7Vh43y9xE1VmAcq62/FGCh6NX+8Ir7lk=", + "pom": "sha256-7Grt6dk72Csvb8zMKtflZte6wdf4SjDUynirA/OF1fM=" + }, + "libraries.minecraft.net/com/mojang#authlib/1.5.21": { + "jar": "sha256-znqchuvr8wuJkpAm9KCjxYzg9NR5N9bcCGrk/Qx3VEo=", + "pom": "sha256-1ZKDxzA7QuQWUY2PXCZYlSlcEWkP2NNgefGgTGpWsXw=" + }, + "plugins.gradle.org/m2/com/adarshr#gradle-test-logger-plugin/3.2.0": { + "jar": "sha256-LW0Bksjs90nVxLHkUz/P2WXrsuteW9G+6qpLEJYdldg=", + "pom": "sha256-bQ61NlUv5CUhW5L7YX/UP3RSCt05QDQUE3oVEkBPEFA=" + }, + "plugins.gradle.org/m2/com/adarshr/test-logger#com.adarshr.test-logger.gradle.plugin/3.2.0": { + "pom": "sha256-ql6amsMp1l5VI+RgyVfUmalqo/FUJzQoxENCxB57BBk=" + }, + "plugins.gradle.org/m2/com/apollographql/apollo#com.apollographql.apollo.gradle.plugin/2.5.14": { + "pom": "sha256-+Ww0HGI0gfly9FQurzIE3rd3NerlFYjOQrY0LUzfmcE=" + }, + "plugins.gradle.org/m2/com/github/ben-manes#gradle-versions-plugin/0.47.0": { + "jar": "sha256-H3CAteTQM5/dUJhSa+YDtPCVFaR/EirBUVCZzRWNg88=", + "module": "sha256-VYVMhFmwZESD+Gh53gvsIcwx9GsgfNizpF5TdKxngl4=", + "pom": "sha256-lO3mIRlM2G49tapNmGwedJroqjkSrN9xP5pTyKh9E5Q=" + }, + "plugins.gradle.org/m2/com/github/ben-manes/versions#com.github.ben-manes.versions.gradle.plugin/0.47.0": { + "pom": "sha256-+Mn7dWyfcAjGRFsFTbe7g9aJAp09tHjdYZqa7cwnCgw=" + }, + "plugins.gradle.org/m2/com/github/johnrengelman#shadow/8.1.1": { + "jar": "sha256-CEGXVVWQpTuyG1lQijMwVZ9TbdtEjq/R7GdfVGIDb88=", + "module": "sha256-nQ87SqpniYcj6vbF6c0nOHj5V03azWSqNwJDYgzgLko=", + "pom": "sha256-Mu55f8hDI3xM5cSeX0FSxYoIlK/OCg6SY25qLU/JjDU=" + }, + "plugins.gradle.org/m2/com/github/johnrengelman/shadow#com.github.johnrengelman.shadow.gradle.plugin/8.1.1": { + "pom": "sha256-PLOIa5ffbgZvEIwxayGfJiyXw8st9tp4kn5kXetkPLA=" + }, + "plugins.gradle.org/m2/de/undercouch/download#de.undercouch.download.gradle.plugin/5.4.0": { + "pom": "sha256-6wbtSRqHmov6z2CGiCpS/hh9J17a+DUN0eoMmMQS6Jw=" + }, + "plugins.gradle.org/m2/edu/sc/seis#macAppBundle/2.3.0": { + "jar": "sha256-RaQcBHwRecgPk0+WBIlWK8yD9CjWMcLUC2qzf93XlEQ=", + "pom": "sha256-Bz+N8ig5R6YJRDDWt0iJ8xSjOW+6zOTAfqlTI+uecbY=" + }, + "plugins.gradle.org/m2/edu/sc/seis/launch4j#edu.sc.seis.launch4j.gradle.plugin/3.0.3": { + "pom": "sha256-Os140q2vOhpbu95A1j3H9vFCTge+OmzytMhvP5E2RKU=" + }, + "plugins.gradle.org/m2/edu/sc/seis/launch4j#launch4j/3.0.3": { + "jar": "sha256-nKdCRA20uwEgYWQXxHE500jaDntn3KVB+wKfR3Yjdjo=", + "module": "sha256-Cjj1r5mHEEhY1lPn0qwfv7kdHDfqDqU7qTf3lC1E4vs=", + "pom": "sha256-hXI2OQ+LV4qlENBxsf2+k8/UKKcbyie2JDliKah7PGQ=" + }, + "plugins.gradle.org/m2/edu/sc/seis/macAppBundle#edu.sc.seis.macAppBundle.gradle.plugin/2.3.0": { + "pom": "sha256-aIm5UVUoqdAZ6vQ1FQTUkj0fIZz34HuRZKnYERmdBsw=" + }, + "plugins.gradle.org/m2/gradle/plugin/org/cadixdev/gradle#licenser/0.6.1": { + "jar": "sha256-w2sPCJOeiD8o0b9WgNvxxNYCSiIuN5dXiaJTcC05JmI=", + "pom": "sha256-BPOApmghda+dW1ux+P7ULbtdoscHNpd0D/RfJn5MDtw=" + }, + "plugins.gradle.org/m2/org/cadixdev/licenser#org.cadixdev.licenser.gradle.plugin/0.6.1": { + "pom": "sha256-R5s2fGaOTTg5LrH+WVD4tOq6CFe0hym9oxIiIhX74MM=" + }, + "raw.githubusercontent": { + "com/tofi86/universalJavaApplicationStub/404f5c1b008d6296065de7a93406b387c9f3dce1/src/universalJavaApplicationStub": "sha256-Sb0xuQ1Bsa/S0OR2Nv6iRh9dFsKlXgFH/YLXcwVRQVE=" + }, + "repo.maven.apache.org/maven2/com/apollographql/apollo#apollo-api-jvm/2.5.14": { + "jar": "sha256-ik9oiadu00lo72+aZMPpSyarUmFJR65dQjexoMFj2kY=", + "module": "sha256-UjgMwRILvKZlPCrJHqBq6+z8S8JsqPUV/GH174tgX0E=", + "pom": "sha256-B1cZPGRU3KS8qiGATDsYfLF6ZhxFy20HRbv3J8tFkkA=" + }, + "repo.maven.apache.org/maven2/com/apollographql/apollo#apollo-api/2.5.14": { + "module": "sha256-aCVcba2dnxtyH11LvYGOogtdkEMpTU76vW+ZkdI/3IE=", + "pom": "sha256-ua2D9n7+u+1w/Xo4Q6xu40aXPMJyIdqG4i/JwcjcD1w=" + }, + "repo.maven.apache.org/maven2/com/apollographql/apollo#apollo-gradle-plugin/2.5.14": { + "jar": "sha256-xolghlRAe5uPk217j8CgLcTvhqEubaVgAkQTbJ+vq0M=", + "module": "sha256-UCBR7CzahYmZRozuBYi1AJZDkCAjp4a/MBERzEENVGA=", + "pom": "sha256-BADiKaboAKDcR+Smb0HtYvPR91qAz8kCcXhR0+VqR6o=" + }, + "repo.maven.apache.org/maven2/com/apollographql/apollo#apollo-http-cache-api/2.5.14": { + "jar": "sha256-Qca5bmMQxRJ9LmG3cP84u/3I0Yz95G/F640Z/QZpRlw=", + "module": "sha256-9DW1mK+1e/Zj59xx6DXNPFSWtx4IaqpE/jEItadtmto=", + "pom": "sha256-6l/favLiCLRel35kgoX421G/wuITRwWyPYpjYoi6tvA=" + }, + "repo.maven.apache.org/maven2/com/apollographql/apollo#apollo-http-cache/2.5.14": { + "jar": "sha256-PEbhbdRZfbTLqShL0jEBFEs3P7izUEY9JW8OykPkjg8=", + "module": "sha256-HGZ+KrdHJCg6Yuf5ILvuQoEgPT27l/wOp4Lmnb7vA90=", + "pom": "sha256-pUq2o/vxpNP4IcrW5dEwUg9/ggOEuFYf3M6f4UHf0nA=" + }, + "repo.maven.apache.org/maven2/com/apollographql/apollo#apollo-normalized-cache-api-jvm/2.5.14": { + "jar": "sha256-vO01dy6yqLrzGYufZJ7ENTawccRxfoKAj2BOsf0PDPg=", + "module": "sha256-QVaMITERZQZZu+VphkN8S8P8mY5IZ3rMGkAuuDOO0BU=", + "pom": "sha256-MBBuZ/Ul07Qp2+Xho9c68Xvc25czmfiwWud4nQ89TM8=" + }, + "repo.maven.apache.org/maven2/com/apollographql/apollo#apollo-normalized-cache-api/2.5.14": { + "module": "sha256-gTBeMIcINbqp4CpF/E5TO8Mg9jSnKs49bC7KtTRMBjU=", + "pom": "sha256-HIccETIq3dAHgDUoTti34Yxa5jjdXD4wiYt5PkCqleo=" + }, + "repo.maven.apache.org/maven2/com/apollographql/apollo#apollo-normalized-cache-jvm/2.5.14": { + "jar": "sha256-6kNfiztqub0KZUzBG7di5sTandhb0O3+i+o2ELzOWaI=", + "module": "sha256-HJW8E/g0ptk3Xq8smD1S0ent1GeJNkd0i94gGV5mO+M=", + "pom": "sha256-TTOHbwMJCYQXF7edrXrtS5MU9KWvqKL1GtBnmg/fZic=" + }, + "repo.maven.apache.org/maven2/com/apollographql/apollo#apollo-normalized-cache/2.5.14": { + "module": "sha256-Fpsg4WzmNwCZDGnlmlx0DFx8+8z7lv60Lkx7thQ410I=", + "pom": "sha256-ao3ZFBX1vESFDzaky32DEcTmJNEdVbQp7ROa+4yCit0=" + }, + "repo.maven.apache.org/maven2/com/apollographql/apollo#apollo-runtime/2.5.14": { + "jar": "sha256-svVruDVJmTutF/nujXrosNin7NGCo/BO0wwyHqW0vHQ=", + "module": "sha256-pOMsFT5jX7lgFaBK2JbAqzMkyxjv9CFicPmW07FjwLI=", + "pom": "sha256-k/cVpVv+AiUlqEnAhbuvvX8S04By7fYLh+Lhn7+TbT8=" + }, + "repo.maven.apache.org/maven2/com/apollographql/apollo#apollo-rx3-support/2.5.14": { + "jar": "sha256-sHZg8rYqymFjBiL90cy73W1zCcGpjhdBEi5DxvCRV9s=", + "module": "sha256-VnUaIcuCllQzInsCKAEzUSqiKplxEuIyWdkASuK5OZ0=", + "pom": "sha256-Ww5yoXMIwc+dld6zMz5VBi+/5razxalgmH2hfhzrAFA=" + }, + "repo.maven.apache.org/maven2/com/apollographql/apollo#com.apollographql.apollo.gradle.plugin/2.5.14": { + "pom": "sha256-jrv1c+8UAZu4n9/HQnfCBRHVyeEHR10dP8X/O4LVKuY=" + }, + "repo.maven.apache.org/maven2/com/benasher44#uuid-jvm/0.2.0": { + "jar": "sha256-/YBhY1na/dyoW/WGkelJgQ6UGJ2bs8EZ0AL4XGzVk4Q=", + "module": "sha256-UoG7jLvCZCKgfEBeSP1JULZU2Qwe08bNWbFrU+fJ4Hs=", + "pom": "sha256-9ujJ/xbl9o7PsOke2r7s/9lEYh5ZGKlsbAczGmiyg9A=" + }, + "repo.maven.apache.org/maven2/com/benasher44#uuid/0.2.0": { + "module": "sha256-QNZuutBWPPBK7ScOhmAjCHLER8wMoJ5D4ZpOfOIUw1A=", + "pom": "sha256-jrkHIhN74rupW7ioLd0Q6Nxp9ENCuK5tUYBHc4F6M/U=" + }, + "repo.maven.apache.org/maven2/com/ethlo/time#itu/1.7.0": { + "jar": "sha256-Vc60GMnoE4xPz2LiE8TIFNieioTIJ9OVQHy+y6XXkec=", + "pom": "sha256-gIZwS+Wqp8UulyZmz0nHr+6bOZu6O6nNJraAXE/N6Bg=" + }, + "repo.maven.apache.org/maven2/com/fasterxml#oss-parent/48": { + "pom": "sha256-EbuiLYYxgW4JtiOiAHR0U9ZJGmbqyPXAicc9ordJAU8=" + }, + "repo.maven.apache.org/maven2/com/fasterxml#oss-parent/49": { + "pom": "sha256-bfHMCoZSQhAIiUNBLJcbQqumidGwaNuf05Htmhk4cjU=" + }, + "repo.maven.apache.org/maven2/com/fasterxml/jackson#jackson-base/2.14.1": { + "pom": "sha256-GAFdG6y6mhRiWovxlBH1v62C0AYN83snvQLngTLEZ24=" + }, + "repo.maven.apache.org/maven2/com/fasterxml/jackson#jackson-bom/2.14.1": { + "pom": "sha256-eP35nlBQ/EhfQRfauMzL+2+mxoOF6184oJtlU3HUpsw=" + }, + "repo.maven.apache.org/maven2/com/fasterxml/jackson#jackson-parent/2.14": { + "pom": "sha256-CQat2FWuOfkjV9Y/SFiJsI/KTEOl/kM1ItdTROB1exk=" + }, + "repo.maven.apache.org/maven2/com/fasterxml/jackson/core#jackson-annotations/2.14.1": { + "jar": "sha256-0lW0uGP/jscUqPlvpVw0Yh1D27grgtP1dHZJakwJ4ec=", + "module": "sha256-JnpoC7csvXUsdreeuQiuDAq+sRT8scIKlnjwN4iYues=", + "pom": "sha256-id8WI4ax7eg6iATpCDlw0aYr310caenpkUdhtGf4CIM=" + }, + "repo.maven.apache.org/maven2/com/fasterxml/jackson/core#jackson-core/2.14.1": { + "jar": "sha256-ARQYfilrNMkxwb+eWoQVK2K/q30YL1Yj85gtwto15SY=", + "module": "sha256-fIuANfkA8/HL2wa4x53CsYsR9q+hOwt0cZzuNJ/0wyk=", + "pom": "sha256-dHse68uLbe8o+u7cCSN0jxwVP8aksNjjsLyo3l/aY38=" + }, + "repo.maven.apache.org/maven2/com/fasterxml/jackson/core#jackson-databind/2.14.1": { + "jar": "sha256-QjoMgG3ks/petKKGmDBeOjd3xzHhvPobLzo3YMe253M=", + "module": "sha256-2BeXfIprCq7aUZ+yp7jcugKzjDwnICT62jLFzOfj08s=", + "pom": "sha256-etsj1tdG7c+UbRwGKxmP+aAmwOIrMHuNXXnB4IU4xjU=" + }, + "repo.maven.apache.org/maven2/com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.14.1": { + "jar": "sha256-nhV+JiXthVq3OveRXiVvaCOZOjCYL0kjycqCu3UqAwM=", + "module": "sha256-VanyBdnMgeilSjgYNbspbniFWR0Dx0BGd6EuEvJJeoo=", + "pom": "sha256-MLlX5y4J2kuXIn4AFluOTmupgXTK3JcJHDRlLihi4cI=" + }, + "repo.maven.apache.org/maven2/com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.14.1": { + "pom": "sha256-+jI/nD8sJtfMzU4hNgkQRRVNRdwcFmHU+HakcfVix1k=" + }, + "repo.maven.apache.org/maven2/com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.14.1": { + "jar": "sha256-C2U2E/UdbhU5bStlzP7JU5sqtHHFhC9bEaxId8vVH3I=", + "module": "sha256-/Tb5c/sUISE7KMjOFXtoj0oKO+9gll/wzohQDtbJIh4=", + "pom": "sha256-yRM4B2Gdzeb1Jc1UNJZSk/0BcUccj4R+D6GVu6GttNc=" + }, + "repo.maven.apache.org/maven2/com/fasterxml/jackson/module#jackson-modules-java8/2.14.1": { + "pom": "sha256-CyfB7lgSDFHyo4cXwseUr/qa91wSNNcpe5zkLof8Il4=" + }, + "repo.maven.apache.org/maven2/com/fasterxml/uuid#java-uuid-generator/4.1.0": { + "jar": "sha256-u0s3BtLxXF5eYCPu0lG87hOPoVK+NUdJ9W/sAccmhnk=", + "pom": "sha256-5TZK+P0X73rgJVElx+Qy1w0YW/Uy6cLzOSWZSeendSQ=" + }, + "repo.maven.apache.org/maven2/com/formdev#flatlaf-extras/3.1.1": { + "jar": "sha256-3l09TZ+oX+pOPEOv1+iCfr5cAF8+H/rVTT4/QJofZtM=", + "module": "sha256-5N/Q1zK+EUS7BJWdNkSwvvzvLAa6MNQj5Cp34hcLmMQ=", + "pom": "sha256-jFE9cIGiz2SOOUG/LTDo/NJ4y7I3FZqbWn2fCNaeXBo=" + }, + "repo.maven.apache.org/maven2/com/formdev#flatlaf/3.1.1": { + "jar": "sha256-Jk75UoYnUQyiDzxoDE46wBKbysI1uNTZ8BQmHzzW1W8=", + "module": "sha256-pyoFwWAhh9DRfKh+1W9IjgzCtVpPiK0LAfgejZlnX4I=", + "pom": "sha256-X6tw379yYFHCJtgn2zQfND00aPKlm3Qw1hQKSJMsi+8=" + }, + "repo.maven.apache.org/maven2/com/formdev#svgSalamander/1.1.3": { + "jar": "sha256-y7Z73jhascHpgy9UkSmCxp/GDIHCRINdB/Q8pORhDrA=", + "pom": "sha256-Cz+GlIGr8x9f9fQ4apYLTeYY4AQgLPHXsowlRf9Qoy8=" + }, + "repo.maven.apache.org/maven2/com/github/cliftonlabs#json-simple/3.0.2": { + "jar": "sha256-/aZamtDhrAyImHEG6Jqk2LKiSV5+BCNx76g4E/ZbcpU=", + "pom": "sha256-sNrLFHnNTb4IENGqM1vw+5vDxP9VNpyHWXumj1h5/k8=" + }, + "repo.maven.apache.org/maven2/com/github/hypfvieh#dbus-java-parent/3.3.2": { + "pom": "sha256-f3IGVDpJy9AvxUbGukYJGeQFwDxaRyNCvF0WQs7WGOI=" + }, + "repo.maven.apache.org/maven2/com/github/hypfvieh#dbus-java/3.3.2": { + "jar": "sha256-avCJp4anMpzhH1cjO0EwLa9+DcQGiffy4LCfpr7gCEU=", + "pom": "sha256-BWRd/O/aPsk7ZdigneVvQfT33DjnqG7nqL5MDZOXhT8=" + }, + "repo.maven.apache.org/maven2/com/github/java-json-tools#btf/1.3": { + "jar": "sha256-Z8PkYutQgH9OCl9N7jBLvxfNmGpC7l6wsvTJv2TRMNk=", + "pom": "sha256-qb8bOVbm1Gy99zeRKOsXMs3hrGVAl5RNxlobbcQlcPA=" + }, + "repo.maven.apache.org/maven2/com/github/java-json-tools#jackson-coreutils-equivalence/1.0": { + "jar": "sha256-60qa19gD+whL/895PIqB9R10W21DjChHDvnVql+4oYI=", + "pom": "sha256-0Vd8uaSY6Et0+ADXdRiQb/ErXT4vKJ2SqTauCU6sxeE=" + }, + "repo.maven.apache.org/maven2/com/github/java-json-tools#jackson-coreutils/2.0": { + "jar": "sha256-FrOqvTqeslZV3aQz41+b2cfBqnmRQncC9fEfAAgT27A=", + "pom": "sha256-jZ7pOk/dXSvYDrqUonoTDWBo8/heSI61vxSUOHEc6eo=" + }, + "repo.maven.apache.org/maven2/com/github/java-json-tools#json-patch/1.13": { + "jar": "sha256-H3lNJWlltT7zfnC1VQXi7QDdwBhNROLo4f3OWjysx94=", + "pom": "sha256-59lec35Uwo1EuFv2Qw8VNvZEZU1pQr2ogzM4r5aWSw8=" + }, + "repo.maven.apache.org/maven2/com/github/java-json-tools#json-schema-core/1.2.14": { + "jar": "sha256-yFmUL92inCbMsr6DqEU6Ew3jX95viK4Yl4VRa10U+Bw=", + "pom": "sha256-pR/BAI6VN7vFJbpywl4Lz4LzXxscwwfC53jS7fO9V18=" + }, + "repo.maven.apache.org/maven2/com/github/java-json-tools#json-schema-validator/2.2.14": { + "jar": "sha256-zZ48WZuzIpZRf9OsOL7qxwnwpquBstQolJXQNhulmJk=", + "pom": "sha256-W8HTDGddkv+DV3ldOvN172JqvffrMjS2TahmKqEeqZs=" + }, + "repo.maven.apache.org/maven2/com/github/java-json-tools#msg-simple/1.2": { + "jar": "sha256-vvQRG5k6Wz5hSNj1hWIczqwqGInNvDREixFjLg2Kmo8=", + "pom": "sha256-bvPzUgcukUz6FzkzRoXyotAAJRL8Ul+kEtSQ1FCUMKM=" + }, + "repo.maven.apache.org/maven2/com/github/java-json-tools#uri-template/0.10": { + "jar": "sha256-OTb2fY59+j7t7+RQ/1iHF0kwiYLGuLcGU1qIQ5HfT7A=", + "pom": "sha256-MXithX0gGmwpZy4rFGrAuj7MUlNquZaUpGuxJfoBxrk=" + }, + "repo.maven.apache.org/maven2/com/github/jnr#jffi/1.3.9": { + "jar": "sha256-1zwPAKXOnb88teW7JpGjJso4giBeyaBs65AGU3En5mE=", + "pom": "sha256-zEqmwymkRXqBhdvE2iH17AYuIiWux5wgCDsg11ESehw=" + }, + "repo.maven.apache.org/maven2/com/github/jnr#jffi/1.3.9/native": { + "jar": "sha256-vd/kYNUoxopx0NTJ0wEi8o9vGC+eu0vo9l5wkMTKiBw=" + }, + "repo.maven.apache.org/maven2/com/github/jnr#jnr-a64asm/1.0.0": { + "jar": "sha256-U65ep/pcKE6Ceao0jnud5FSLDK4Qv9BY+iF8eRh15M8=", + "pom": "sha256-ndnCmco+ySh9suwmVxpcxhHcIaGk9dLvElWpJPrOR6g=" + }, + "repo.maven.apache.org/maven2/com/github/jnr#jnr-constants/0.10.3": { + "jar": "sha256-phew2EY9PqNkNb0WERE97bN0kVev0iaZCKswbJkq7+0=", + "pom": "sha256-5s/r5K5E3pah7I7j/z6xE07Uk7ChWymoZj45tv2rp6I=" + }, + "repo.maven.apache.org/maven2/com/github/jnr#jnr-enxio/0.32.13": { + "jar": "sha256-08ATbrAXYJIhDVyHDb4w8dkrQ9c+6bHkqGHijGRgUnw=", + "pom": "sha256-pcrvbflKJYBULdQsZzN004RQ2W+82Od8mOaoX4ln/Tk=" + }, + "repo.maven.apache.org/maven2/com/github/jnr#jnr-ffi/2.2.11": { + "jar": "sha256-qcC955JRTZLonxneBBLF4m7nLbWYkUAkKykCpDt6x/U=", + "pom": "sha256-i+JCWRyszLbK6dpwD0Nz3a0Adg6NpnlpepgSi7QqX3s=" + }, + "repo.maven.apache.org/maven2/com/github/jnr#jnr-posix/3.1.15": { + "jar": "sha256-w47PzNJOXyHxemLkXVvUVIQsXbF+1CsBuGj5IG0Omec=", + "pom": "sha256-qjwjbl+8bsNl5MgR7OpNvKdZGFHOx8eh32syTE6wgqM=" + }, + "repo.maven.apache.org/maven2/com/github/jnr#jnr-unixsocket/0.38.17": { + "jar": "sha256-mPYscZs0gUV/Jf0l4lAqznqQ1F91olVOvPy2vgsWGhc=", + "pom": "sha256-3oSBWeFSRkTp8cV0r39Gt1Hm5TDzWifutMhT6R6hwuE=" + }, + "repo.maven.apache.org/maven2/com/github/jnr#jnr-x86asm/1.0.2": { + "jar": "sha256-OfNnW5EObpuTgl+ChL7J9K0wRM0gpvfI/54vhpXr8h4=", + "pom": "sha256-6oYs472WzLjKNrjp57rvLaP7v73CVrrqqMioc5EQdOc=" + }, + "repo.maven.apache.org/maven2/com/github/oshi#oshi-core/6.4.4": { + "jar": "sha256-Qj70zXIge3OpGXvVw1FMOzNqcG5E8t+9Hp2hT3UTXc4=", + "pom": "sha256-LQP0hyNVDZCjSpqrK8EAY2jRaaxvpQnLAbHbKbueOFo=" + }, + "repo.maven.apache.org/maven2/com/github/oshi#oshi-parent/6.4.4": { + "pom": "sha256-jNu7z13zPmIDXCUQWKKb7LK6e9R+LjqsDtyKrvfl+dA=" + }, + "repo.maven.apache.org/maven2/com/github/stephenc/jcip#jcip-annotations/1.0-1": { + "jar": "sha256-T8z/g4Kq/FiZYsTtsmL2qlleNPHhHmEFfRxqluj8cyM=", + "pom": "sha256-aMKlqm6PNFdDCT5StbngGQuk1aUhXApZtNfTNkcgjLs=" + }, + "repo.maven.apache.org/maven2/com/google/code/findbugs#jsr305/2.0.1": { + "pom": "sha256-AsEsPCrhLdR1IZ/2kcgqTZ6iH0S8WUoYEpW/bUPc+7A=" + }, + "repo.maven.apache.org/maven2/com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "repo.maven.apache.org/maven2/com/google/code/gson#gson-parent/2.10.1": { + "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM=" + }, + "repo.maven.apache.org/maven2/com/google/code/gson#gson/2.10.1": { + "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=", + "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc=" + }, + "repo.maven.apache.org/maven2/com/google/errorprone#error_prone_annotations/2.18.0": { + "jar": "sha256-nmgUy3GBaYik/RsHqZOo8hu3BY1SLBYrHehJ4ZvqVK4=", + "pom": "sha256-kgE1eX3MpZF7WlwBdkKljTQKTNG80S9W+JKlZjvXvdw=" + }, + "repo.maven.apache.org/maven2/com/google/errorprone#error_prone_parent/2.18.0": { + "pom": "sha256-R/Iumce/RmOR3vFvg3eYXl07pvW7z2WFNkSAVRPhX60=" + }, + "repo.maven.apache.org/maven2/com/google/guava#failureaccess/1.0.1": { + "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=", + "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk=" + }, + "repo.maven.apache.org/maven2/com/google/guava#guava-parent/26.0-android": { + "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" + }, + "repo.maven.apache.org/maven2/com/google/guava#guava-parent/32.1.1-jre": { + "pom": "sha256-BqpdGsBo8vgJUw8/9T+1yMlAFSolNiPQtTxPU/WhOj0=" + }, + "repo.maven.apache.org/maven2/com/google/guava#guava/32.1.1-jre": { + "jar": "sha256-kfu6N/HIslHPnqnn06Np63nrHmpd8dS79IPdA4B0AoE=", + "module": "sha256-pY+TjSOeaYtZs8OcrVgO/Ro/1MoTq5KzBCbUJFLE7z4=", + "pom": "sha256-LJBx19FSKwx2IFfDToub+uOZJ6DrdVw2qnZRlyGHDXs=" + }, + "repo.maven.apache.org/maven2/com/google/j2objc#j2objc-annotations/2.8": { + "jar": "sha256-8CqV+hpele2z7YWf0Pt99wnRIaNSkO/4t03OKrf01u0=", + "pom": "sha256-N/h3mLGDhRE8kYv6nhJ2/lBzXvj6hJtYAMUZ1U2/Efg=" + }, + "repo.maven.apache.org/maven2/com/googlecode/libphonenumber#libphonenumber-parent/8.11.1": { + "pom": "sha256-X12sUXT4TGCi6Z56g8eCb3NJgfvCDqHUN/em/Piq2hY=" + }, + "repo.maven.apache.org/maven2/com/googlecode/libphonenumber#libphonenumber/8.11.1": { + "jar": "sha256-9DDJI5TCBT8WhxWFPaltmZlulONOWikbl8XIalrWKpg=", + "pom": "sha256-irUVuq10qC2rsC6+nm8XLUj0r+0KyAxn7aKIRqbN7dA=" + }, + "repo.maven.apache.org/maven2/com/jayway/jsonpath#json-path/2.7.0": { + "jar": "sha256-3oLw5GAu6gGH3zZ3mujPwWU7bZIBJWdK9NNl0LyllQg=", + "pom": "sha256-F5akBRkEB7LqzgQlhmlKmy/w2XuCAJ016VyeIVDN0Mc=" + }, + "repo.maven.apache.org/maven2/com/jcraft#jzlib/1.1.3": { + "jar": "sha256-ibE2D0Bzgb9h/eQRAZ2MvQCeuxDP9xXzZpAXoDECdWA=", + "pom": "sha256-7bZyUWCFVq2VhNAORrXvOOzxJG1XHA+A8k9QsoWp9oI=" + }, + "repo.maven.apache.org/maven2/com/lmax#disruptor/3.4.4": { + "jar": "sha256-FSTtMfE7yr7hthRuZ74wxjF8uU/NDHwvfHofPoIIfFE=", + "pom": "sha256-34QNrLNYveyOnBZAlyHksOsFJGF9QkJt9yg3b8WHQi8=" + }, + "repo.maven.apache.org/maven2/com/networknt#json-schema-validator/1.0.76": { + "jar": "sha256-CbdNrjzp+L4eeUm979MWQt3aWD4us1ZDnSn5QRMB6uA=", + "pom": "sha256-+gTgetjg62RK7LCU6USfD7GSxne3ywqurvL1ndq6UHc=" + }, + "repo.maven.apache.org/maven2/com/nimbusds#nimbus-jose-jwt/9.28": { + "jar": "sha256-7bukLZl+N6zws2zk1anErIjv2ILOVwfzXnUZaul2LkU=", + "pom": "sha256-5rSewLgGmFClCxkWO1b8eoiyU6D2R7Su5uH7mAGnsnU=" + }, + "repo.maven.apache.org/maven2/com/nytimes/android#cache/2.0.2": { + "jar": "sha256-AyLQrW+wm6xEH8wBJyuVbUvrUbHkLdaPm4prCoH1uLU=", + "pom": "sha256-+YA4MgoWLGV7SllvKp9pmkHY2Wg/F/6XQgMdoNT3rjM=" + }, + "repo.maven.apache.org/maven2/com/samskivert#jmustache/1.15": { + "jar": "sha256-GuuWudwXvClUC4wzQujpHul01cYEFl7NRp3XawQcJQw=", + "pom": "sha256-Z77EYiZJjJBFuqct8cnH9mG4XOObYni2TWign0Xry1k=" + }, + "repo.maven.apache.org/maven2/com/sangupta#murmur/1.0.0": { + "jar": "sha256-Mmj1Ag+5oi0slAwazBDllj2IxFLbMdn0YQo0LOftGio=", + "pom": "sha256-iR3ql2IvUijfrV1DCHUq9kJ9GgbfxrRIwuC2vrNwO1Q=" + }, + "repo.maven.apache.org/maven2/com/squareup/moshi#moshi-kotlin/1.12.0": { + "jar": "sha256-HENsB8FZzRrwMrt5NRpIqY5/eBrIB8/4tXEamZtWZt8=", + "module": "sha256-KnvKZtbM8WhVy1oKp8lRWPaIklomPv5MIEsjclSGH6E=", + "pom": "sha256-gwdSmAK8nLCHd24CabvdaSBG+kpz8ZDVgUpaj5JmJ24=" + }, + "repo.maven.apache.org/maven2/com/squareup/moshi#moshi/1.12.0": { + "jar": "sha256-7pCR4dGlkm+ptN8mQsH7e7lq7Ahjm2IZwZ4LhyTUJHU=", + "module": "sha256-uGqTFURxITGVpEL4XKBG55oAHG1EbEHU0WiTbahW6+I=", + "pom": "sha256-YbyUJDqTc9mUini25xAAl161EPtvf0aoHq/N3TgeR3k=" + }, + "repo.maven.apache.org/maven2/com/squareup/okhttp3#okhttp-tls/4.11.0": { + "jar": "sha256-SuTHCSwBeBhSRQabkSdGX9V8dkSF81ev7USlxIoFNf0=", + "module": "sha256-2m5O5qfdybnUZusr5ScBAmsXms2wClyso08uXTdeSMI=", + "pom": "sha256-0SYiMcXxtb/bVe/7+SXas1/dWlNFEvhsSd3HIGY/IEg=" + }, + "repo.maven.apache.org/maven2/com/squareup/okhttp3#okhttp/4.11.0": { + "jar": "sha256-7o9r1s0SVwE9dIMw9MoUdjip+8tS+ziNWsk89TQIdF0=", + "module": "sha256-VnwltR13eWF0Q5GE11JBK6l+2f22X8cYQNvFVjvrj6g=", + "pom": "sha256-ei1Cezixfgdtpk7o0hAuZIiNyyOK7l4tukp3UslKP94=" + }, + "repo.maven.apache.org/maven2/com/squareup/okio#okio-jvm/3.2.0": { + "jar": "sha256-tkK670xXAFXeTLPRZnsrFtztkB/4BmNFoGNpGqBgJaQ=", + "module": "sha256-p3jzkIXtar/NaHESmGxjhapXrC2IQLIdlGs8IJXzDqQ=", + "pom": "sha256-XEUflKdr6oYbbvK/hOj1cgBUWWjIZVWr3+0Tx8otSJ0=" + }, + "repo.maven.apache.org/maven2/com/squareup/okio#okio-multiplatform/2.9.0": { + "module": "sha256-JA9DK32vz1cfuOx8s48eiQiPFsjN92gq9Wt3I5FKw2A=", + "pom": "sha256-NywwDgfKvA3u89B/QoPQfESwoS89XoV9WYT5UYCPdsY=" + }, + "repo.maven.apache.org/maven2/com/squareup/okio#okio/3.2.0": { + "module": "sha256-aB9c7BcN5FuVST6e5wWGjrNa34mO4G+W4i0ZclDBsQQ=", + "pom": "sha256-i0b1jZua6xF4Nh1YpoZfTa1mWTDF/3tV4LqmHvOpcqE=" + }, + "repo.maven.apache.org/maven2/com/sun/activation#all/2.0.1": { + "pom": "sha256-ZI1dYrYVP0LxkM7S1ucMHmRCVQyc/rZvvuCWHGYWssw=" + }, + "repo.maven.apache.org/maven2/com/sun/activation#jakarta.activation/2.0.1": { + "jar": "sha256-ueJLfdbgdJVWLqllMb4xMMltuk144d/Yitu96/QzKHE=", + "pom": "sha256-igaFktsI5oUyBP8LYlowFDjjw26l8a5lur/tIIUCeBo=" + }, + "repo.maven.apache.org/maven2/com/sun/mail#all/1.6.2": { + "pom": "sha256-S36Dqpt31l4AfpfLUPm4nNt1T6rxZBHl/ZTR49q3brM=" + }, + "repo.maven.apache.org/maven2/com/sun/mail#mailapi/1.6.2": { + "jar": "sha256-03wPiO+llzzLQQD0zEmu41EM0BqyUBLR8IWxt5iuLrs=", + "pom": "sha256-PPiVwnXN1NlmmFtwGYwVAaTl/UqfbYGDiGJKm24oCMA=" + }, + "repo.maven.apache.org/maven2/com/sun/xml/bind#jaxb-bom-ext/4.0.1": { + "pom": "sha256-q7S3Gd3TFWhM1/W/iebXU2XC4I8wCVmsbF9SyjioLxk=" + }, + "repo.maven.apache.org/maven2/com/sun/xml/bind#jaxb-core/4.0.1": { + "jar": "sha256-EIaQnLEwQzA52OKGW/Mxr2KNmSvO8QqV9y3BIasCB3U=", + "pom": "sha256-GmaseJTWVDkAz/EMuxD0hZ68DoQHbYPpP1ybc8wx3lY=" + }, + "repo.maven.apache.org/maven2/com/sun/xml/bind#jaxb-impl/4.0.1": { + "jar": "sha256-2XplOnj4z5pt6azznU7ZHaOQe/7XSOhzCmLDD58+ycE=", + "pom": "sha256-rywz0zS9LjOZLR+fQqSItix5SdweJqpEJ5kMUn4vbZ0=" + }, + "repo.maven.apache.org/maven2/com/sun/xml/bind/mvn#jaxb-bundles/4.0.1": { + "pom": "sha256-sBFLQhIwN6zURDEpu2pdhvCVtdzSLt7wGrGpNvxRcIk=" + }, + "repo.maven.apache.org/maven2/com/sun/xml/bind/mvn#jaxb-parent/4.0.1": { + "pom": "sha256-URxR71bIkbZ15LYenyNqUDCVLBBy/5RgQBgXoQRT+K4=" + }, + "repo.maven.apache.org/maven2/com/thoughtworks/xstream#xstream-parent/1.4.20": { + "pom": "sha256-ERiJ4wIWWg9EpU3k23BSUNHeDckbp4oZih0ieDRL7uc=" + }, + "repo.maven.apache.org/maven2/com/thoughtworks/xstream#xstream/1.4.20": { + "jar": "sha256-h98PC+V8kgN9ARD7siWjC2UXAtwnVlPSha/P7zG8LoE=", + "pom": "sha256-c9gezjnpSh0tf80BhGYqo9QQa/6XCbeTlkiS4+f0/cQ=" + }, + "repo.maven.apache.org/maven2/com/tunnelvisionlabs#antlr4-master/4.7.3": { + "pom": "sha256-5KRpWtziLRuHurCavYZ3vnAzbd+63YbTnIAsAMRctro=" + }, + "repo.maven.apache.org/maven2/com/tunnelvisionlabs#antlr4-runtime/4.7.3": { + "jar": "sha256-X08MQDHkuDyzae8A9JCc229isR49JT+DphhNgMXrMVc=", + "pom": "sha256-jcFqM2Rg2Fc4wPw+JKyUwGNwmwHZFYOOBV/PaAFgXV0=" + }, + "repo.maven.apache.org/maven2/commons-beanutils#commons-beanutils/1.9.4": { + "jar": "sha256-fZOMgXiQKARcCMBl6UvnX8KAUnYg1b1itRnVg4UyNoo=", + "pom": "sha256-w1zKe2HUZ42VeMvAuQG4cXtTmr+SVEQdp4uP5g3gZNA=" + }, + "repo.maven.apache.org/maven2/commons-codec#commons-codec/1.15": { + "jar": "sha256-s+n21jp5AQm/DQVmEfvtHPaQVYJt7+uYlKcTadJG7WM=", + "pom": "sha256-yG7hmKNaNxVIeGD0Gcv2Qufk2ehxR3eUfb5qTjogq1g=" + }, + "repo.maven.apache.org/maven2/commons-codec#commons-codec/1.9": { + "jar": "sha256-rRnSYBw6vwuUa1w6QRPiJqjB4zBeOVuQATt43ZSnI84=", + "pom": "sha256-5e/PA5zZCWiMIB3FR5sUT9bwHw5AJSt/xefS4bXAeZA=" + }, + "repo.maven.apache.org/maven2/commons-collections#commons-collections/3.2.2": { + "jar": "sha256-7urpF5FxRKaKdB1MDf9mqlxcX9hVk/8he87T/Iyng7g=", + "pom": "sha256-1dgfzCiMDYxxHDAgB8raSqmiJu0aES1LqmTLHWMiFws=" + }, + "repo.maven.apache.org/maven2/commons-io#commons-io/2.11.0": { + "jar": "sha256-lhsvbYfbrMXVSr9Fq3puJJX4m3VZiWLYxyPOqbwhCQg=", + "pom": "sha256-LgFv1+MkS18sIKytg02TqkeQSG7h5FZGQTYaPoMe71k=" + }, + "repo.maven.apache.org/maven2/commons-io#commons-io/2.4": { + "jar": "sha256-zGpB3D6qzJ5ECmvQ0okLINNrTuQI/i1nEi8yi7bgFYE=", + "pom": "sha256-srXdRs+Zj6Ym62+KHBFPYWfI05JpQWTmJTPliY6bMfI=" + }, + "repo.maven.apache.org/maven2/commons-logging#commons-logging/1.2": { + "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", + "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" + }, + "repo.maven.apache.org/maven2/de/undercouch#gradle-download-task/5.4.0": { + "jar": "sha256-JsVNuzwLnvITSpqanOcC6qyjbsFUnB3NJVv5SiRqjlQ=", + "module": "sha256-ttq8wyBMhKj4+Eh00qFkQ6thI2PP5SfBAngVuxJ7+sE=", + "pom": "sha256-jlGpL1k66bZZxEYWIcTymIP4l+EC1SIWZFmBsbQJiYU=" + }, + "repo.maven.apache.org/maven2/de/undercouch/download#de.undercouch.download.gradle.plugin/5.4.0": { + "pom": "sha256-4NrTSpBgtpqatLk0VkOHq5IW2hwphf4BVrQNgfTYMAE=" + }, + "repo.maven.apache.org/maven2/io/fabric8#kubernetes-client-bom/5.12.2": { + "pom": "sha256-6qA8FpVlaNVKa6Q31J1Ay/DdjpOXf5hDGCQldrZQvDs=" + }, + "repo.maven.apache.org/maven2/io/github/classgraph#classgraph/4.8.154": { + "jar": "sha256-8LBLXXexjtow8h+NHDXNbiuMsv8PmsRuc71yekdW39E=", + "pom": "sha256-Irh7X4jt0O1kE2d4w9XluyqenqONrkg8+pOoAn3Qgd0=" + }, + "repo.maven.apache.org/maven2/io/github/x-stream#mxparser/1.2.2": { + "jar": "sha256-ru7iOjMD2BG8qHkOp/JbU0MUhhwDz/Ntr9zCGAlp65c=", + "pom": "sha256-I1AiQk4S8zGB9iraGcxEKAGbaXZXw8OSzjVxYKQi+qg=" + }, + "repo.maven.apache.org/maven2/io/netty#netty-bom/4.1.86.Final": { + "pom": "sha256-EnFsH+ZM9b2qcETTfROq46iIIbkdR5hCDEanR2kXiv0=" + }, + "repo.maven.apache.org/maven2/io/netty#netty-buffer/4.1.86.Final": { + "jar": "sha256-5C4V9HyGUmax+qbgOOv9fdrc+fSunmYX7dSIHb1Kvog=", + "pom": "sha256-AuVYTl+waYU7QYqRQ15Xdxp2efcf8Ex6K+UXzdOGZF0=" + }, + "repo.maven.apache.org/maven2/io/netty#netty-codec-http/4.1.86.Final": { + "jar": "sha256-P2zrMRLPz3twVF61ERIgzlfbVNWT8j9kw4MzuyLEC4Q=", + "pom": "sha256-Gk2fY66Da5YHWhrQ/QBLUOAerjgqx6BnqPGhtnn/v14=" + }, + "repo.maven.apache.org/maven2/io/netty#netty-codec-http2/4.1.86.Final": { + "jar": "sha256-6Ojijmq2u5ia7ZBHeJIgRfOIz7QgvB6zer9N+IAdsWc=", + "pom": "sha256-E79xRBBCtPvWvrk+VMLnVy11UUJy6JCerJxYxFM4RNE=" + }, + "repo.maven.apache.org/maven2/io/netty#netty-codec-socks/4.1.86.Final": { + "jar": "sha256-g4ovRmeOhKu37XZiR9A4y4Xfr8SA/4wsXkLZHZnF/00=", + "pom": "sha256-qmEWU5aTLf+2bzyVEX8jx+jGUjx9G6uBH9k0SVhJij8=" + }, + "repo.maven.apache.org/maven2/io/netty#netty-codec/4.1.86.Final": { + "jar": "sha256-BFaEC1yFHa1sq4gc0amtXZFttl2BBIFF3x2abQMyW+o=", + "pom": "sha256-6PLkDv2+igJXYhulUNlS53RK1wlXf+ITQXsvya8zJUI=" + }, + "repo.maven.apache.org/maven2/io/netty#netty-common/4.1.86.Final": { + "jar": "sha256-o1o/FufNRcXYUpqj53AtTvOzYhPqMy21l0TqNI/Crpk=", + "pom": "sha256-PhYyrWMX3D24rTt3V9I/l3lXHXKNvGrUAyoZqItQ64k=" + }, + "repo.maven.apache.org/maven2/io/netty#netty-handler-proxy/4.1.86.Final": { + "jar": "sha256-uBL+fXLIT7yE5TtPJnZNgvdrBqZfMx8PvZVDqnPhj5E=", + "pom": "sha256-6KOsTrx3EaCm5UZS2DK1uUiCdlFtPpGyaGKGxxEwafc=" + }, + "repo.maven.apache.org/maven2/io/netty#netty-handler/4.1.86.Final": { + "jar": "sha256-5ptCKSkpsnjcUi4lF33ffFQCVIS1WHn4InNJrfvhwE0=", + "pom": "sha256-MtNruk2l9kv9vau0PHGVXnzQ6dZ5BTHU0/6XiCp+YKs=" + }, + "repo.maven.apache.org/maven2/io/netty#netty-parent/4.1.86.Final": { + "pom": "sha256-HZIrfai+sQMcrCpfr89xnOZyyyy2nuzJw4PzCswWUBM=" + }, + "repo.maven.apache.org/maven2/io/netty#netty-resolver/4.1.86.Final": { + "jar": "sha256-diihMJ1/JEPcQdiSOn8mnimBuWFvgKmZ63JkrmvL/bo=", + "pom": "sha256-q/IkL64IwCALGC91P6pvP0g+wdpt2waO5xfwTOBCB/k=" + }, + "repo.maven.apache.org/maven2/io/netty#netty-tcnative-boringssl-static/2.0.56.Final": { + "jar": "sha256-eS2vMLQmGm6uvmUsFxqq4Qr/GBoomT7GWUJtiefzafg=", + "pom": "sha256-jiXf4zBSV9HHQ1tgk6oqvu8yXN3rAjgxYaRqHF+QcOc=" + }, + "repo.maven.apache.org/maven2/io/netty#netty-tcnative-classes/2.0.56.Final": { + "jar": "sha256-7t6Afw3V6xrXTqGuEJRDBjHaY/zeANTcIOsM0Ei7CsM=", + "pom": "sha256-XvARmSCV3II/sBw7MUKMSmypKnvem7jyetY4DqolYjY=" + }, + "repo.maven.apache.org/maven2/io/netty#netty-tcnative-parent/2.0.56.Final": { + "pom": "sha256-PuDTYrA0q7bTmnEE8G7g0fruIz9MrTVQwwuFKFeaPWE=" + }, + "repo.maven.apache.org/maven2/io/netty#netty-transport-native-unix-common/4.1.86.Final": { + "jar": "sha256-7CbQOgZWV5HVfpl/eTZ37k0/xHspC3lRiYwuzQIy8RU=", + "pom": "sha256-HLTiJ560F+3OKE9xvflhQYMmTyLwUNxTcm9W3w9SC5U=" + }, + "repo.maven.apache.org/maven2/io/netty#netty-transport/4.1.86.Final": { + "jar": "sha256-9nJtzVTkkitGs7T0RntEOnCjDrCKYmIMj+UC2MuALJ8=", + "pom": "sha256-hc9ax3wb90xRqFFVexdXE560zS0KW2HK4oSfRvy1ldo=" + }, + "repo.maven.apache.org/maven2/io/prometheus#parent/0.16.0": { + "pom": "sha256-citVEZCXsE1xFHnftg3VSye1kgoa63cCAnxEohX/xZY=" + }, + "repo.maven.apache.org/maven2/io/prometheus#simpleclient/0.16.0": { + "jar": "sha256-IsN08jf3vE/bHw7C2jecC6AOaa0v/otq3lQ9cwYtN38=", + "pom": "sha256-/sCA0HqxWHXZccSugflR2mG1z/mZHPUOUwuo/KR3CXM=" + }, + "repo.maven.apache.org/maven2/io/prometheus#simpleclient_common/0.16.0": { + "jar": "sha256-66bsJs5+QMu4cl4F+4Mkep9PRJRbnnUi4zdd3me58Fk=", + "pom": "sha256-d/ARCc4VB710Q+InJzdnSydST6rLDcuW47jt4LarnrY=" + }, + "repo.maven.apache.org/maven2/io/prometheus#simpleclient_httpserver/0.16.0": { + "jar": "sha256-yrh94QtqR0FRzO68O2NDKalz/7YCzm7+8sD9l6kDZcg=", + "pom": "sha256-PGR/1vVhohsZ7ZcdBBn9Ri2fg/k0e8ChBaHCie6qqsQ=" + }, + "repo.maven.apache.org/maven2/io/prometheus#simpleclient_tracer/0.16.0": { + "pom": "sha256-OBK7IrlfgbTDRg6eTnXDunL6ReRDqfzlMghCqr0OmcI=" + }, + "repo.maven.apache.org/maven2/io/prometheus#simpleclient_tracer_common/0.16.0": { + "jar": "sha256-6Ep4SsjiTxgu5i2oC2tcgUB3S3W/pL+cw9O4OQ22JfY=", + "pom": "sha256-X5AHXOz80RKB3pzLSJaNEhKyRnDWhP/IQEQaUq6HXv8=" + }, + "repo.maven.apache.org/maven2/io/prometheus#simpleclient_tracer_otel/0.16.0": { + "jar": "sha256-oqhMWb7zeWu3+cbyrot96LkFMT7ygYCsPef/Yd1o3z8=", + "pom": "sha256-frl58dwz6L5OWtFDDlQJcYpBeDwmd5qzEFJg9rQ20EY=" + }, + "repo.maven.apache.org/maven2/io/prometheus#simpleclient_tracer_otel_agent/0.16.0": { + "jar": "sha256-etK7QN90p3LZ9URaPQNXm0nWs3pH1ekPbPP1ns9BrQY=", + "pom": "sha256-VSj4WIQ1SulNm8BnR+f1iS0JLAtVBVrnBWZo6gyhznw=" + }, + "repo.maven.apache.org/maven2/io/reactivex/rxjava3#rxjava/3.1.6": { + "jar": "sha256-NGgr0+xvBDxd77WJotGBE7o+LSNy3UAXRPjkgVwdtjg=", + "module": "sha256-xLSmhqW/xXqx3ud42SR1l8LtzDU3d2nbtMWuPQV000Q=", + "pom": "sha256-sfaISn2fJzghY7nkaKlfKNtls7j2tIhVieZ6C7zjw1E=" + }, + "repo.maven.apache.org/maven2/io/sentry#sentry/6.25.0": { + "jar": "sha256-QkQ2zF0SuRoCxvrazTDaf74NPcfoprvSygQEWMLw68w=", + "pom": "sha256-xMKzUiPvr/ZFvCRUcAqtmn+WcZjYDr3hLzDsbB0uq60=" + }, + "repo.maven.apache.org/maven2/io/swagger#swagger-annotations/1.6.9": { + "jar": "sha256-fvhZdOXYL8q9DavSxFXNgDeLNtd03gF86shCo6T6ZPg=", + "pom": "sha256-6BtJB3W1C6snD7sLb7wKoda0wHS6GFuwUrjsMTFIPmk=" + }, + "repo.maven.apache.org/maven2/io/swagger#swagger-compat-spec-parser/1.0.64": { + "jar": "sha256-zkFPC8rqxSFq7q/Wivre+J/TPc4m+Zba3uDGO5UWPAM=", + "pom": "sha256-DK2rKrdbuIf3HmIl5RiL9KxTiWKHQ+JQrCsUwwOaCfo=" + }, + "repo.maven.apache.org/maven2/io/swagger#swagger-core/1.6.9": { + "jar": "sha256-QPtMcZBJR65H+f/P6+3v3mMNiUfhwbtmdDu8QPB7ngE=", + "pom": "sha256-3y2nBUrbCjZR1NQ87aKblNXd0Fhz0tgU1OSXe6cPSek=" + }, + "repo.maven.apache.org/maven2/io/swagger#swagger-models/1.6.9": { + "jar": "sha256-zwtTERHMwCqAE3nXQ8jjPwL7x5BpiqIOYsYvR22oyVo=", + "pom": "sha256-YNg3lgDJP0qyFYkWJ6cednc+KiSitd1n/DkkWSjxv2s=" + }, + "repo.maven.apache.org/maven2/io/swagger#swagger-parser-project/1.0.64": { + "pom": "sha256-tMVYXqpLuz2i3XNVaP4YdG+8DwhTzXRjF9tQoRRN6eQ=" + }, + "repo.maven.apache.org/maven2/io/swagger#swagger-parser/1.0.64": { + "jar": "sha256-IgYs5/fEO7UodTpc8I/3tZ6A0e4hHxP92+rn3aaQsyg=", + "pom": "sha256-Y7RH9HoMcUh8xP5tcIuXilfa32WaxvjnwjUPbmD5ryM=" + }, + "repo.maven.apache.org/maven2/io/swagger#swagger-project/1.6.9": { + "pom": "sha256-bSqxGVAq0G+Apf8NdBzwshPFYXC1F2H8WRGuzY9RJEE=" + }, + "repo.maven.apache.org/maven2/io/swagger/core/v3#swagger-annotations/2.2.8": { + "jar": "sha256-Cvzf5Kd3X8zlHRBbj3yMpRRnbBa+pXFCNQPYOHd/Ed0=", + "pom": "sha256-VhgFAUOpHf/pVfAn7PDg75Z310EbGyXBRsoZUXgQ2Zo=" + }, + "repo.maven.apache.org/maven2/io/swagger/core/v3#swagger-core/2.2.8": { + "jar": "sha256-c4Japfb0d8Y340xwIQspV7jpBL8PXA0yuqoqN9LDOiM=", + "pom": "sha256-cwB0DaF4EVy0TpD+lk91x5UNgEm0n7br4tsXxwFDzE0=" + }, + "repo.maven.apache.org/maven2/io/swagger/core/v3#swagger-models/2.2.8": { + "jar": "sha256-s3I3ROAu1TADsWLViUqeF8QQxTOrKmlwtDCSHln032Y=", + "pom": "sha256-p20h2UwizuLWBXr7py8sdDxwA7x1e3IXhY+E84CTXdE=" + }, + "repo.maven.apache.org/maven2/io/swagger/core/v3#swagger-project/2.2.8": { + "pom": "sha256-a17siOJKC8vQFj9ZEErvDwBtJ+S7CGG9ypgCW2f9lFc=" + }, + "repo.maven.apache.org/maven2/io/swagger/parser/v3#swagger-parser-core/2.1.10": { + "jar": "sha256-dWGrUJ6XLPu1LNmROSwuOQvBPQ/1+/ykJWDTBaG2UJM=", + "pom": "sha256-lZbs9gLG/YGLNEOz68v0pN4cijVATcgL73aWsog0CW8=" + }, + "repo.maven.apache.org/maven2/io/swagger/parser/v3#swagger-parser-project/2.1.10": { + "pom": "sha256-R8bWO70ZDgOdpigmdcSWWTfnr7Tg8EHU9gPS0PIH5hM=" + }, + "repo.maven.apache.org/maven2/io/swagger/parser/v3#swagger-parser-v2-converter/2.1.10": { + "jar": "sha256-mAr5/FK/ftv8QMlUZViP3Nz1Bt2nqQYn/qnhBvBcI+s=", + "pom": "sha256-9Oqs2CxPfKPy3+D+CT6EQs4vsC3TRSKIW2wr40KFm4o=" + }, + "repo.maven.apache.org/maven2/io/swagger/parser/v3#swagger-parser-v3/2.1.10": { + "jar": "sha256-sa24NH67Y8+SsHt5v8sHWAzsCDQID13MNTz+8UHFr/c=", + "pom": "sha256-ultheoFp1/obMPnRwt3q3Cd25b9vSp3Ycshwj9n67rk=" + }, + "repo.maven.apache.org/maven2/io/swagger/parser/v3#swagger-parser/2.1.10": { + "jar": "sha256-AyreTvUvSxReAlKLhog9Ftf6siz0iHkXKPxk0/mvxKM=", + "pom": "sha256-4KEdmSQXRe3uUvmuOfVVLICg29b5+wah1q5nF+KDxyY=" + }, + "repo.maven.apache.org/maven2/jakarta/activation#jakarta.activation-api/2.1.0": { + "jar": "sha256-VujZlAlf5JwoE4xgKRSC9m8Y0SrCtyDpOGl9zmoxNcc=", + "pom": "sha256-hw0qdcyS4K7Dfo0WNxBVLTVDGJ6B6cqQCaMl33YMKwY=" + }, + "repo.maven.apache.org/maven2/jakarta/platform#jakarta.jakartaee-bom/9.0.0": { + "pom": "sha256-kZA9Ddh23sZ/i5I/EzK6cr8pWwa9OX0Y868ZMHzhos4=" + }, + "repo.maven.apache.org/maven2/jakarta/platform#jakartaee-api-parent/9.0.0": { + "pom": "sha256-9l3PFLbh2RSOGYo5D6/hVfrKCTJT3ekAMH8+DqgsrTs=" + }, + "repo.maven.apache.org/maven2/jakarta/validation#jakarta.validation-api/2.0.2": { + "jar": "sha256-tC1CQo89kiyJKpCfoEMofVd8DFsWWtm31WjOv4f8nqQ=", + "pom": "sha256-Oy5Oh3+3C6+h2tdcDemZxFYTEoLUcbpR3z25bDt02pI=" + }, + "repo.maven.apache.org/maven2/jakarta/xml/bind#jakarta.xml.bind-api-parent/3.0.1": { + "pom": "sha256-nx+11KAun4/dYu876rlLj+p7gWQ3SMhvaKMfQPd0rVY=" + }, + "repo.maven.apache.org/maven2/jakarta/xml/bind#jakarta.xml.bind-api-parent/4.0.0": { + "pom": "sha256-4lW43VYeity88NHHus2uynK5Cr9BPy5//TSBd4rhCZA=" + }, + "repo.maven.apache.org/maven2/jakarta/xml/bind#jakarta.xml.bind-api/3.0.1": { + "jar": "sha256-uPtL7j/1tcHvdxRNhBExYBjXu9Qfzx7eBkb3l4VGuGc=", + "pom": "sha256-onPayXQUEv2dzM6ZESmHBteJ5YLcs1GXB19v0qWw6+o=" + }, + "repo.maven.apache.org/maven2/jakarta/xml/bind#jakarta.xml.bind-api/4.0.0": { + "jar": "sha256-V+N5atV1NkAIj1+dPFPBg/LCULfa2QUp6j4ZpVFaoSI=", + "pom": "sha256-a9atlG7ZyKRKJrYKX8zM/M9fyMy/v/SQS1kXs8aUACs=" + }, + "repo.maven.apache.org/maven2/javax/servlet#javax.servlet-api/4.0.1": { + "jar": "sha256-g6A92HfTZ0V28Np7kHVchSSvCZzPBgf8YaqXFTWtfGA=", + "pom": "sha256-FAVeYVW4oqYype7GoeW+DAoLo4D36T+ctMuPfk+Vm/E=" + }, + "repo.maven.apache.org/maven2/joda-time#joda-time/2.12.5": { + "jar": "sha256-EGKEEey0DEY0GWxUTzRoGr3u+CbzdwljV0M9H5oTW8Y=", + "pom": "sha256-QHV6ykQ5qWmPR1jyBsPFNxO1nNxVAd6W0WGKhPb/bH4=" + }, + "repo.maven.apache.org/maven2/junit#junit/4.13.2": { + "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", + "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" + }, + "repo.maven.apache.org/maven2/net/bytebuddy#byte-buddy-agent/1.12.19": { + "jar": "sha256-OnAkDefNzeBOfFBMIyfXA1ucJa4CBogeO/TmeYonPtg=", + "pom": "sha256-taLP9kNoHeFof8QKzSUf7v38oj5nPgSfs8NpK1NSbUs=" + }, + "repo.maven.apache.org/maven2/net/bytebuddy#byte-buddy-parent/1.12.19": { + "pom": "sha256-cqtv70CegSkh9HKLPEtu9PpTvCX6uwSI/CyuNnNotU0=" + }, + "repo.maven.apache.org/maven2/net/bytebuddy#byte-buddy/1.12.19": { + "jar": "sha256-AwcEE55G8yw40nBg7e6eBnawoP/4qL5TRhUVFUuop74=", + "pom": "sha256-Q1+4Zkqpt+EgyN1scH1Or6ZC+iYt/21eP3HcJcaeies=" + }, + "repo.maven.apache.org/maven2/net/freeutils#jlhttp/2.6": { + "jar": "sha256-HMFbUBezgFWM4q0uCvwrqW3iYXK6rXjCpwulXFRoV4A=", + "pom": "sha256-BaYFDFndeVRC+3zdZFjXUrJg6FOWbYovsNXiCXEo6Ug=" + }, + "repo.maven.apache.org/maven2/net/freeutils#parent/1.3": { + "pom": "sha256-xouwWtmH1kcR6aU+/0ODO87EiMepPuRyfTOJEpsBc2Q=" + }, + "repo.maven.apache.org/maven2/net/iharder#base64/2.3.9": { + "jar": "sha256-8aDjWe7imlk5w15f3txXTdfoygZbBW/BSysp4+081U0=", + "pom": "sha256-3CpFvNCQU+bgD4tgOpFwz/20GMBV3TWrbrsJ1WgtYns=" + }, + "repo.maven.apache.org/maven2/net/java#jvnet-parent/1": { + "pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78=" + }, + "repo.maven.apache.org/maven2/net/java#jvnet-parent/3": { + "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" + }, + "repo.maven.apache.org/maven2/net/java/dev/jna#jna-platform/5.13.0": { + "jar": "sha256-R017iPbpcAm27B2YwwJN2VwjGHxl2r+8NTMbysPRc90=", + "pom": "sha256-Y7IMivBXyYGW+HieGiGm3d8Cqo84XmsEtLT58N8lcGY=" + }, + "repo.maven.apache.org/maven2/net/java/dev/jna#jna/5.13.0": { + "jar": "sha256-ZtT4GaBipRodVie//CP6xV0Wd/Dgof66FEqr3WcKZLs=", + "pom": "sha256-9RXCV4F49FJH7Mp6nh2xCVMbHELyQk4lPO6w9rjUI3Q=" + }, + "repo.maven.apache.org/maven2/net/javacrumbs/json-unit#json-unit-core/2.36.0": { + "jar": "sha256-a1j8/G2tlI6YMwzlmDUrOjnEndyPbZ9aCYPpL8h1hwU=", + "pom": "sha256-k2b/YXpssLQW3sOJQ13+q5AIsgj2lIvSVj8uAgQ5dTM=" + }, + "repo.maven.apache.org/maven2/net/javacrumbs/json-unit#json-unit-parent/2.36.0": { + "pom": "sha256-xZA74bIcEdkTIEXwxbQKQqEdX0iub0+ORtLExeVscnw=" + }, + "repo.maven.apache.org/maven2/net/minidev#accessors-smart/2.4.7": { + "jar": "sha256-71EDQp8QH34/9i86GCNCcgQ56upD0u7TEZu6dwuyAqk=", + "pom": "sha256-WNvy07GUT0rbSSvQXSWM0OVW6r/5oU3qnUEBo04FguA=" + }, + "repo.maven.apache.org/maven2/net/minidev#json-smart/2.4.7": { + "jar": "sha256-KMF+0WrCLmhFdD/R6EMh7fXXc1/CFuRO4mnRBr89gUY=", + "pom": "sha256-6QFccydoKXJRxB74wMnD1HGslQl2iAmKlUx18eIwPrI=" + }, + "repo.maven.apache.org/maven2/net/sf/jopt-simple#jopt-simple/5.0.4": { + "jar": "sha256-3ybMWPI19HfbB/dTulo6skPr5Xidn4ns9o3WLqmmbCg=", + "pom": "sha256-amd2O3avzZyAuV5cXiR4LRjMGw49m0VK0/h1THa3aBU=" + }, + "repo.maven.apache.org/maven2/net/sf/launch4j#launch4j/3.50": { + "pom": "sha256-1716EuPm1bR/Ou0p/4g89cTKnie3GWkQZnkzH6N+xy0=" + }, + "repo.maven.apache.org/maven2/net/sf/launch4j#launch4j/3.50/core": { + "jar": "sha256-2U8eT20fHhl9Es7vpwot75OMzxbig+mjx0Cmb/WGvW8=" + }, + "repo.maven.apache.org/maven2/net/sf/launch4j#launch4j/3.50/workdir-linux64": { + "jar": "sha256-/uvoOrT+Q5F+qn3/Jy3uDvP6hUvWgzRDRDDgjjoS8zA=" + }, + "repo.maven.apache.org/maven2/org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "repo.maven.apache.org/maven2/org/apache#apache/16": { + "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4=" + }, + "repo.maven.apache.org/maven2/org/apache#apache/19": { + "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8=" + }, + "repo.maven.apache.org/maven2/org/apache#apache/21": { + "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" + }, + "repo.maven.apache.org/maven2/org/apache#apache/23": { + "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" + }, + "repo.maven.apache.org/maven2/org/apache#apache/27": { + "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk=" + }, + "repo.maven.apache.org/maven2/org/apache#apache/29": { + "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c=" + }, + "repo.maven.apache.org/maven2/org/apache#apache/9": { + "pom": "sha256-SUbmClR8jtpp87wjxbbw2tz4Rp6kmx0dp940rs/PGN0=" + }, + "repo.maven.apache.org/maven2/org/apache/ant#ant-launcher/1.10.13": { + "jar": "sha256-zXaVs7+2lkq3G2oLMdrWAAWud/5QITI2Rnmqzwj3eXA=", + "pom": "sha256-ApkvvDgFU1bzyU0B6qJJmcsCoJuqnB/fXqx2t8MVY8o=" + }, + "repo.maven.apache.org/maven2/org/apache/ant#ant-parent/1.10.13": { + "pom": "sha256-blv8hwgiFD8f+7LG8I7EiHctsxSlKDMC9IFLEms0aTk=" + }, + "repo.maven.apache.org/maven2/org/apache/ant#ant/1.10.13": { + "jar": "sha256-vvv8eedE6Yks+n25bfO26C3BfSVxr0KqQnl2/CIpmDg=", + "pom": "sha256-J5NR7tkLj3QbtIyVvmHD7CRU48ipr7Q7zB0LrB3aE3o=" + }, + "repo.maven.apache.org/maven2/org/apache/commons#commons-compress/1.23.0": { + "jar": "sha256-wmfxcWDp72YrTXi38p3KfIKxXFz/LLaphl70qz3Vt4c=", + "pom": "sha256-WdwSFAa6notbUSvO9FcTUf7R+QK5Oc9SfYk7f3KUVMk=" + }, + "repo.maven.apache.org/maven2/org/apache/commons#commons-digester3/3.2": { + "jar": "sha256-HBUOPS30tCN7R+KP6iB5+w2jJFeNXMpqX+0uN6Ygguw=", + "pom": "sha256-W7ihmK21l8MCBLTxwzb9s9KBZTZAPprTNJqyAAMuVEU=" + }, + "repo.maven.apache.org/maven2/org/apache/commons#commons-lang3/3.12.0": { + "jar": "sha256-2RnZBEhsA3+NGTQS2gyS4iqfokIwudZ6V4VcXDHH6U4=", + "pom": "sha256-gtMfHcxFg+/9dE6XkWWxbaZL+GvKYj/F0bA+2U9FyFo=" + }, + "repo.maven.apache.org/maven2/org/apache/commons#commons-parent/22": { + "pom": "sha256-+4xeVeMKet20/yEIWKDo0klO1nV7vhkBLamdUVhsPLs=" + }, + "repo.maven.apache.org/maven2/org/apache/commons#commons-parent/25": { + "pom": "sha256-RnrmUEQuh2hnN5CU51GN/dZ9IsU1Lr05gIyEJZ6XkLo=" + }, + "repo.maven.apache.org/maven2/org/apache/commons#commons-parent/32": { + "pom": "sha256-5NJYr4sv9AMhSNQVN53veHB4mmAD6AV28VBLEPJrS+g=" + }, + "repo.maven.apache.org/maven2/org/apache/commons#commons-parent/34": { + "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w=" + }, + "repo.maven.apache.org/maven2/org/apache/commons#commons-parent/39": { + "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac=" + }, + "repo.maven.apache.org/maven2/org/apache/commons#commons-parent/47": { + "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc=" + }, + "repo.maven.apache.org/maven2/org/apache/commons#commons-parent/52": { + "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" + }, + "repo.maven.apache.org/maven2/org/apache/commons#commons-parent/54": { + "pom": "sha256-AA2Bh5UrIjcC/eKW33mVY/Nd6CznKttOe/FXNCN4++M=" + }, + "repo.maven.apache.org/maven2/org/apache/commons#commons-parent/56": { + "pom": "sha256-VgxwUd3HaOE3LkCHlwdk5MATkDxdxutSwph3Nw2uJpQ=" + }, + "repo.maven.apache.org/maven2/org/apache/commons#commons-text/1.10.0": { + "jar": "sha256-dwzZA/p7YE0ffve6F/hBCGZylLK0eL6O0a87/7SuABg=", + "pom": "sha256-OI3VI0i6GEKqOK64l8kdJwsUZh64daIP2YAxU1qydWc=" + }, + "repo.maven.apache.org/maven2/org/apache/httpcomponents#httpclient/4.5.13": { + "jar": "sha256-b+kCalZsalABYIzz/DIZZkH2weXhmG0QN8zb1fMe90M=", + "pom": "sha256-eOua2nSSn81j0HrcT0kjaEGkXMKdX4F79FgB9RP9fmw=" + }, + "repo.maven.apache.org/maven2/org/apache/httpcomponents#httpcomponents-client/4.5.13": { + "pom": "sha256-nLpZTAjbcnHQwg6YRdYiuznmlYORC0Xn1d+C9gWNTdk=" + }, + "repo.maven.apache.org/maven2/org/apache/httpcomponents#httpcomponents-core/4.4.13": { + "pom": "sha256-xVTnAI5FF8fvVOAFzIt09Mh6VKDqLG9Xvl0Fad9Rk2s=" + }, + "repo.maven.apache.org/maven2/org/apache/httpcomponents#httpcomponents-parent/11": { + "pom": "sha256-qQH4exFcVQcMfuQ+//Y+IOewLTCvJEOuKSvx9OUy06o=" + }, + "repo.maven.apache.org/maven2/org/apache/httpcomponents#httpcore/4.4.13": { + "jar": "sha256-4G6J1AlDJF/Po57FN82/zjdirs3o+cWXeA0rAMK0NCQ=", + "pom": "sha256-j4Etn6e3Kj1Kp/glJ4kypd80S0Km2DmJBYeUMaG/mpc=" + }, + "repo.maven.apache.org/maven2/org/apache/logging#logging-parent/7": { + "pom": "sha256-5YkR3J/GsXOhDlqp7bk8eZStBmAnBd0Gftz8bh6eFys=" + }, + "repo.maven.apache.org/maven2/org/apache/logging/log4j#log4j-api/2.20.0": { + "jar": "sha256-L0PupnnqZvFMoPE/7CqGAKwST1pSMdy034OT7dy5dVA=", + "pom": "sha256-zUWDKj1s0hlENcDWPKAV8ZSWjy++pPKRVTv3r7hOFjc=" + }, + "repo.maven.apache.org/maven2/org/apache/logging/log4j#log4j-bom/2.20.0": { + "pom": "sha256-+LtpLpWmt72mAehxAJWOg9AGG38SMlC2gSiUOhlenaE=" + }, + "repo.maven.apache.org/maven2/org/apache/logging/log4j#log4j-core/2.20.0": { + "jar": "sha256-YTffhIza7Z9NUHb3VRPGyF2oC5U/TnrMo4CYt3B2P1U=", + "pom": "sha256-3nGsEAVR9KB3rsrQd70VPnHfeqacMELXZRbMXM4Ice4=" + }, + "repo.maven.apache.org/maven2/org/apache/logging/log4j#log4j/2.20.0": { + "pom": "sha256-mje0qPZ+jUG8JHNxejAhYz1qPD8xBXnbmtC+PyRlnGk=" + }, + "repo.maven.apache.org/maven2/org/apache/velocity#velocity-engine-core/2.3": { + "jar": "sha256-sIbO6P2Bg+JAtK/PVP447DPdjrDaQUY25b96pNmFZik=", + "pom": "sha256-1CQqYXQkPx5oBDRXG6TmoduuGZwLw1Cph9X7nDzh4NM=" + }, + "repo.maven.apache.org/maven2/org/apache/velocity#velocity-engine-parent/2.3": { + "pom": "sha256-TA5KkvaHDzmblG1bt4nRd+SkeUEUfD/dwubwY+nLlts=" + }, + "repo.maven.apache.org/maven2/org/apache/velocity#velocity-engine-scripting/2.3": { + "jar": "sha256-PspyQVbBrSBlVfBSx4POm2Cc567wLYW5AvdHxcdNUKU=", + "pom": "sha256-pURg2E/7W60V6jOgR47ZzOWGvxqpN0P3YHM96MBkaTE=" + }, + "repo.maven.apache.org/maven2/org/apache/velocity#velocity-master/4": { + "pom": "sha256-eirHPJDdEEtaB+bizQPpXsKNKfO4ME891//87LBJcS4=" + }, + "repo.maven.apache.org/maven2/org/apache/velocity/tools#velocity-tools-generic/3.1": { + "jar": "sha256-gljP3KoWEn81/+YQo/pPdrfr5RuIkixzxO45zo83jOU=", + "pom": "sha256-pvUMs/QTh1wDllImnSqJ+IeNDZ/IzGYvwTWRyiDYR1g=" + }, + "repo.maven.apache.org/maven2/org/apache/velocity/tools#velocity-tools-parent/3.1": { + "pom": "sha256-Wll7iNunlQkOdwFbzfU0YbQdRdotfRdk5Ozoswoib80=" + }, + "repo.maven.apache.org/maven2/org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "repo.maven.apache.org/maven2/org/assertj#assertj-core/3.17.2": { + "jar": "sha256-2al41VnQtSqH9Bmz2PW7E3uXxmH3viE04EmLRU5LmA4=", + "pom": "sha256-n3yDy/nAPZNYQT7rNDExhDZ6/o5dKRX1X5Eb49vhRgY=" + }, + "repo.maven.apache.org/maven2/org/assertj#assertj-parent-pom/2.2.1": { + "pom": "sha256-DtCwM3FLoeYkfT4T7/8FILdvi1TTM+jNsO5fNscphWA=" + }, + "repo.maven.apache.org/maven2/org/assertj#assertj-parent-pom/2.2.7": { + "pom": "sha256-DpRvSGuXLAgPwin2U3PRUQSvZnTGMP2fElxP1yEgdzs=" + }, + "repo.maven.apache.org/maven2/org/assertj#assertj-swing-junit/3.17.1": { + "jar": "sha256-5W/qUbeWkkBGDQJ6F/HHBLQ+TuykmoxXIG1XPaPjCHE=", + "pom": "sha256-v1t2qFRwpj6fuShvtCC80iSXySGVM6vou3D5sCoeLpY=" + }, + "repo.maven.apache.org/maven2/org/assertj#assertj-swing-parent-pom/3.17.1": { + "pom": "sha256-r1N8kNjGDMiis2NTz/777Dgk/9LsmVvCsqqIxOZ3J8s=" + }, + "repo.maven.apache.org/maven2/org/assertj#assertj-swing/3.17.1": { + "jar": "sha256-42RFQ41y2DzEgBXcs/FNmpfqpCxGY6mCbbK7UOTHcTs=", + "pom": "sha256-rkNavHruVk/+pSh32IPKViRLFBGtcYQqEPcbvv9+1es=" + }, + "repo.maven.apache.org/maven2/org/bouncycastle#bcpkix-jdk18on/1.72": { + "jar": "sha256-VqBUyxcNQfsfi6CylWiAYli3/+/cXpi3fvltR0Dz1rw=", + "pom": "sha256-KFuL5ZWHD2HXXniBsPtO3C0ao30KecT8j/Lczx2caf0=" + }, + "repo.maven.apache.org/maven2/org/bouncycastle#bcprov-jdk18on/1.72": { + "jar": "sha256-OSh/IginU9tBn1ylKdbIDwlGFKp015AzESazyca4X9o=", + "pom": "sha256-47ttnhNGz8Iw4JAPF35goSttviEqkuHNLPseSNTASDk=" + }, + "repo.maven.apache.org/maven2/org/bouncycastle#bcutil-jdk18on/1.72": { + "jar": "sha256-RTd/22VgqXHupyX1B9kf1rj70Hl9Yb/Ibyy2U8WBhqQ=", + "pom": "sha256-VwEEzKwN+inkb7ZAL35qchcCwlXe9DvjAcassYwl520=" + }, + "repo.maven.apache.org/maven2/org/checkerframework#checker-qual/3.33.0": { + "jar": "sha256-4xYlW7/Nn+UNFlMUuFq7KzPLKmapPEkdtkjkmKgsLeE=", + "module": "sha256-6FIddWJdQScsdn0mKhU6wWPMUFtmZEou9wX6iUn/tOU=", + "pom": "sha256-9VqSICenj92LPqFaDYv+P+xqXOrDDIaqivpKW5sN9gM=" + }, + "repo.maven.apache.org/maven2/org/codehaus/groovy#groovy-bom/3.0.14": { + "pom": "sha256-JODptzjecRjennNWD/0GA0u1zwfKE6fgNFnoi6nRric=" + }, + "repo.maven.apache.org/maven2/org/codehaus/plexus#plexus-utils/3.5.1": { + "jar": "sha256-huAlXUyHnGG0gz7X8TEk6LtnnfR967EnMm59t91JoHs=", + "pom": "sha256-lP9o7etIIE0SyZGJx2cWTTqfd4oTctHc4RpBRi5iNvI=" + }, + "repo.maven.apache.org/maven2/org/codehaus/plexus#plexus/10": { + "pom": "sha256-u6nFIQZLnKEyzpfMHMfrSvwtvjK8iMuHLIjpn2FiMB8=" + }, + "repo.maven.apache.org/maven2/org/commonmark#commonmark-parent/0.21.0": { + "pom": "sha256-qeGddPQOEj3jbHAaUlIg2r5eMjVDZUfbek/TwJi31Qs=" + }, + "repo.maven.apache.org/maven2/org/commonmark#commonmark/0.21.0": { + "jar": "sha256-gQhKcDUEb+MG8NvxbvV6aNCO5clwBOqGfmK120bpivs=", + "pom": "sha256-RhGg7TfAGTzGANRRrUxFfT0NVBxaxlbI2ANL0s0NB1g=" + }, + "repo.maven.apache.org/maven2/org/easytesting#fest-reflect/1.4.1": { + "jar": "sha256-wcoZ/PDNNVW698KvFHwErSK0OTq3Xl2wKE5RcPtVTBY=", + "pom": "sha256-HGUmEF/LVuFjU1Hi0DuO8coI4qOSrj+NRUK1L9DTpYM=" + }, + "repo.maven.apache.org/maven2/org/easytesting#fest-util/1.2.5": { + "jar": "sha256-e1L0061Bt+1x9baxGDMRO34IMmyO9w0t7fC0MMe6U0E=", + "pom": "sha256-odiCzcAADcrcZQzw8DXh6edCW/ipx57f1h0lzn8ODHo=" + }, + "repo.maven.apache.org/maven2/org/easytesting#fest/1.0.15": { + "pom": "sha256-EBz6z6cEL1sWQWoG7EIZjLeUIqv40R1I/xIXfznbIxc=" + }, + "repo.maven.apache.org/maven2/org/eclipse/angus#angus-activation-project/1.0.0": { + "pom": "sha256-xbpJl8zRYQNHMGsM23caRKv9qhhzIkogdZVQ4Q8inNU=" + }, + "repo.maven.apache.org/maven2/org/eclipse/angus#angus-activation/1.0.0": { + "jar": "sha256-43r/FH4Y7UjFCqn7eMyF50eMv9ASV7AtU9OhhtGDIkU=", + "pom": "sha256-L8eRQlvvS53yjp80ZAXMCeDqN369YQJjiNqEDGGhsPw=" + }, + "repo.maven.apache.org/maven2/org/eclipse/ee4j#project/1.0.5": { + "pom": "sha256-kWtHlNjYIgpZo/32pk2+eUrrIzleiIuBrjaptaLFkaY=" + }, + "repo.maven.apache.org/maven2/org/eclipse/ee4j#project/1.0.6": { + "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0=" + }, + "repo.maven.apache.org/maven2/org/eclipse/ee4j#project/1.0.7": { + "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" + }, + "repo.maven.apache.org/maven2/org/eclipse/jetty#jetty-bom/9.4.50.v20221201": { + "pom": "sha256-TN5uUz1gHq+LZazulWt3BsGBkvJ1XQI9fo0Zu31bOUM=" + }, + "repo.maven.apache.org/maven2/org/fusesource#fusesource-pom/1.12": { + "pom": "sha256-xA2WDarc73sBwbHGZXr7rE//teUxaPj8sLKLhOb9zKE=" + }, + "repo.maven.apache.org/maven2/org/fusesource/jansi#jansi/2.4.0": { + "jar": "sha256-bNkZkTI917L7KMqT16wSr1qGovUyeeKzWCezAxP9C58=", + "pom": "sha256-rECp8tDB7mMfw7CO+OLwvRS6IgEcp2/xvPZftWnq3zU=" + }, + "repo.maven.apache.org/maven2/org/glassfish/jaxb#jaxb-bom/4.0.1": { + "pom": "sha256-lSK+rNDHwC3Mi7VDMA6Eolu8wPfREPEwr3Z9yX1eP5Q=" + }, + "repo.maven.apache.org/maven2/org/hamcrest#hamcrest-core/1.3": { + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "repo.maven.apache.org/maven2/org/hamcrest#hamcrest-core/2.2": { + "jar": "sha256-CU9dkrS32ciiv1PMadNWJDronDSZRXvLS5L37Tv5WHk=", + "pom": "sha256-9/3i//UQGl/Do54ogQuRHC2iAt3CvVB2X4nnxv+M590=" + }, + "repo.maven.apache.org/maven2/org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "repo.maven.apache.org/maven2/org/hamcrest#hamcrest/2.2": { + "jar": "sha256-XmKEaonwXNeM2cGlU/NA0AJFg4DDIEVd0fj8VJeoocE=", + "pom": "sha256-s2E3N2xLP8923DN+KhvFtpGirBqpZqtdJiCak4EvpX0=" + }, + "repo.maven.apache.org/maven2/org/jdom#jdom2/2.0.6.1": { + "jar": "sha256-CyD0XjoP2PDRLNxTFrBndukCsTZdsAEYh2+RdcYPMCw=", + "pom": "sha256-VXleEBi4rmR7k3lnz4EKmbCFgsI3TnhzwShzTIyRS/M=" + }, + "repo.maven.apache.org/maven2/org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "repo.maven.apache.org/maven2/org/jetbrains/kotlin#kotlin-reflect/1.8.20": { + "jar": "sha256-Ux48P5sMRfmiHxZCF0RTBmoQZr7AGQJUpjMbMxgUq4s=", + "pom": "sha256-5D19CbkCpeM8I0r1O3YYTUkz9gkI0A4QSy7EA+4tQDU=" + }, + "repo.maven.apache.org/maven2/org/jetbrains/kotlin#kotlin-stdlib-common/1.6.20": { + "jar": "sha256-jaQKJSDTDcsQEhdv6T0k6C0Io+NGw34DQ7D7b2T2vgE=", + "pom": "sha256-PgTMk1HVzsQqRcBg+HM/bpTrx+NZExClGOBuiFB4mcg=" + }, + "repo.maven.apache.org/maven2/org/jetbrains/kotlin#kotlin-stdlib-common/1.8.21": { + "jar": "sha256-akTJ7MnXdU2elD+x41iMdNSj8Xhb5RB09J1sVyNoKnM=", + "pom": "sha256-4ZpVd8vOqJcolw21MzyCZMjGmuci7recv0HV8LDJrmU=" + }, + "repo.maven.apache.org/maven2/org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.6.20": { + "jar": "sha256-qi+i6BNVxNmN2X2iFpv0AfhCJhN49bHL6hqhGFXWdiA=", + "pom": "sha256-iBveiiNwhuKOA0KLTvMmj0SspfoajHb4lUdIRVyuvSE=" + }, + "repo.maven.apache.org/maven2/org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.21": { + "jar": "sha256-M9FI2w4R3r0NkGd9KCQrztkH+cd3MAAP1ZeGcIkDnYY=", + "pom": "sha256-m7EH1dXjkwvFl38AekPNILfSTZGxweUo6m7g8kjxTTY=" + }, + "repo.maven.apache.org/maven2/org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.6.20": { + "jar": "sha256-/asb8SDiteerbXiI6evAJOxrjKcpNhKWOV2rY0shNpU=", + "pom": "sha256-GEap+GBLC+HHGiEovb2diQJyAnlCf2ItK5pECsmjwwk=" + }, + "repo.maven.apache.org/maven2/org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.21": { + "jar": "sha256-PbdSowB08G7mxXmEqm8n2kT00rvH9UQmUfaYjxyyt9c=", + "pom": "sha256-ODnXKNfDCaXDaLAnC0S08ceHj/XKXTKpogT6o0kUWdg=" + }, + "repo.maven.apache.org/maven2/org/jetbrains/kotlin#kotlin-stdlib/1.6.20": { + "jar": "sha256-7rUcK2eyYjP9gdC8T4BE7ISXGIkJBXY87/2Eox4st5k=", + "pom": "sha256-oI6D3LDymFCYd94i1SZEZHbdsx6hx3Uw8sgfJNsWb5k=" + }, + "repo.maven.apache.org/maven2/org/jetbrains/kotlin#kotlin-stdlib/1.8.21": { + "jar": "sha256-BCoc0ayXbNz+XrY/HY4LC4kskkjhWmnIz7pJXVRupSo=", + "pom": "sha256-/gzZ4yGT5FMzP9Kx9XfmYvtavGkHECu5Z4F7wTEoD9c=" + }, + "repo.maven.apache.org/maven2/org/junit#junit-bom/5.5.2": { + "pom": "sha256-WklWKkcEVB5p1O4xbNfq9xHN23ytXQ+Ia/ih/pjWqcU=" + }, + "repo.maven.apache.org/maven2/org/junit#junit-bom/5.6.2": { + "module": "sha256-f0j4L1XvwfDMWVg8LUdKNBDiQXndLR0iFkUVzOM9dkM=", + "pom": "sha256-6K1gGzGBsjeHoY5x0mrIaknFbcX4VgZ2S8PFG15F/hM=" + }, + "repo.maven.apache.org/maven2/org/junit#junit-bom/5.7.1": { + "module": "sha256-mFTjiU1kskhSB+AEa8oHs9QtFp54L0+oyc4imnj67gQ=", + "pom": "sha256-C5sUo9YhBvr+jGinF7h7h60YaFiZRRt1PAT6QbaFd4Q=" + }, + "repo.maven.apache.org/maven2/org/junit#junit-bom/5.7.2": { + "module": "sha256-87zrHFndT2mT9DBN/6WAFyuN9lp2zTb6T9ksBXjSitg=", + "pom": "sha256-zRSqqGmZH4ICHFhdVw0x/zQry6WLtEIztwGTdxuWSHs=" + }, + "repo.maven.apache.org/maven2/org/junit#junit-bom/5.9.0": { + "module": "sha256-oFTq9QFrWLvN6GZgREp8DdPiyvhNKhrV/Ey1JZecGbk=", + "pom": "sha256-2D6H8Wds3kQZHuxc2mkEkjkvJpI7HkmBSMpznf7XUpU=" + }, + "repo.maven.apache.org/maven2/org/junit#junit-bom/5.9.1": { + "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=", + "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw=" + }, + "repo.maven.apache.org/maven2/org/junit#junit-bom/5.9.3": { + "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=", + "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc=" + }, + "repo.maven.apache.org/maven2/org/junit/jupiter#junit-jupiter-api/5.9.3": { + "jar": "sha256-2JXj7t9PobEN4xqRvlWjAbswe/GO8yWz+l2z+A7pLRw=", + "module": "sha256-ba7jABTiBFWh7MbW0LOsYERECtE+9CA5jikZCYDpuHo=", + "pom": "sha256-f3KVZWK+1JEdMhf5DeCw0kDdklb4V99aJLvrAVS0FBs=" + }, + "repo.maven.apache.org/maven2/org/junit/jupiter#junit-jupiter-engine/5.9.3": { + "jar": "sha256-tV4wSxzS6PEWwat3pdw+yoxNm0amnghLY6ylHN61Xw8=", + "module": "sha256-lY9TIPRbNNCmZ24W/1ScsBDhQm3KUs/bEFh2vM9Pdog=", + "pom": "sha256-D1/XZ2n95tJHMI+Dbf8TTItS9lpC5UuNCtoEFvMKc3o=" + }, + "repo.maven.apache.org/maven2/org/junit/platform#junit-platform-commons/1.9.3": { + "jar": "sha256-hRkVffgTwhDoX8FBS3QQnj2F9D1wklY+1wTEPEjw1eY=", + "module": "sha256-eWpB8nJB+2dgjwGazPTBw2cVe3MjinavhvbeuuNZnrQ=", + "pom": "sha256-4Xof3keC8vwjtC3sp1wLBWbVwphQ0DBr5lxdpzuAIXg=" + }, + "repo.maven.apache.org/maven2/org/junit/platform#junit-platform-engine/1.9.3": { + "jar": "sha256-DDlVPZoDUQdXIn9aHGzGUwKHsaMh7WJYRQZkh0qioWo=", + "module": "sha256-nQVThnLcRrITlxJjbv3B8Xg9Q5qhwktp0Ckrgci36o8=", + "pom": "sha256-HFq3/OvjpgEYOXm6r78vQOVUOIKnyiPp+etxkZWnR9U=" + }, + "repo.maven.apache.org/maven2/org/junit/vintage#junit-vintage-engine/5.9.3": { + "jar": "sha256-a8G0IoKu2LnszbQGMc9FABr4qzrZ0Nhc/4bEXoX8WdA=", + "module": "sha256-903In7pI9S/PzSKUFEQbDXn4Cz5tgTsAvIuXT1K0bZE=", + "pom": "sha256-FISWCrLBD3mXJlEWmJuzsY21XJKfrFn96nS4ssd5WkY=" + }, + "repo.maven.apache.org/maven2/org/mock-server#mockserver-client-java/5.15.0": { + "jar": "sha256-LMqrNKNYdlkALhh/PISJAtd8g55OrmxZRp4YUUnvGyY=", + "pom": "sha256-nVRRAJ9Q2bMQCStLyAFPz3+di/HYUbOfOzNPm4rmkfQ=" + }, + "repo.maven.apache.org/maven2/org/mock-server#mockserver-core/5.15.0": { + "jar": "sha256-dpZGoStLzGwK8eZiFsRYH4b5UkY4zvxn3vVJjNKeL7o=", + "pom": "sha256-DSwI3ATUdSuev1sSROKtV6+kSBJ/YZnqeeUYRAbpUYM=" + }, + "repo.maven.apache.org/maven2/org/mock-server#mockserver-netty/5.15.0": { + "jar": "sha256-EKBXpHdbami8aXQtEgBmt/cBOH7X5l9RioGYTqRaw6s=", + "pom": "sha256-1aN22L2gDxkgNt4fm6g89tTXvlFar4+GaN6u1pagCVU=" + }, + "repo.maven.apache.org/maven2/org/mock-server#mockserver/5.15.0": { + "pom": "sha256-tlNuOpSx7xwjGfX1Zwc1JL1YtvIh4vK1rLh57Bu5DJA=" + }, + "repo.maven.apache.org/maven2/org/mockito#mockito-core/4.11.0": { + "jar": "sha256-S5CWkMqyiMdh65TAvw6BRJbPOSHYr/rITNh3dFMDUeU=", + "pom": "sha256-K8LjyMizE/2sIx8jgiIlsHgx3ImdBnBy9J1fiuN+c5o=" + }, + "repo.maven.apache.org/maven2/org/mockito#mockito-inline/4.11.0": { + "jar": "sha256-7lLhwpmmMhhPuidKk3CZPgkUBCn15RbmxVcP1ldLKX8=", + "pom": "sha256-g+Y+nBxoitBSIUa0qneUjJlzrAGCnhAzZGI2lWGoA0Q=" + }, + "repo.maven.apache.org/maven2/org/mozilla#rhino/1.7.7.2": { + "jar": "sha256-XG2uBQzrcXdKX8gs5uPwOS2vD/qew1lvcNTQfuULiXA=", + "pom": "sha256-B2kGiYfBiVPlHUGeBi9AlW8egvOioUD+qITXxeb6lH8=" + }, + "repo.maven.apache.org/maven2/org/objenesis#objenesis-parent/3.3": { + "pom": "sha256-MFw4SqLx4cf+U6ltpBw+w1JDuX1CjSSo93mBjMEL5P8=" + }, + "repo.maven.apache.org/maven2/org/objenesis#objenesis/3.3": { + "jar": "sha256-At/QsEOaVZHjW3CO0vVHTrCUj1Or90Y36Vm45O9pv+s=", + "pom": "sha256-ugxA2iZpoEi24k73BmpHHw+8v8xQnmo+hWyk3fphStM=" + }, + "repo.maven.apache.org/maven2/org/opentest4j#opentest4j/1.2.0": { + "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", + "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" + }, + "repo.maven.apache.org/maven2/org/ow2#ow2/1.5": { + "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs=" + }, + "repo.maven.apache.org/maven2/org/ow2#ow2/1.5.1": { + "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" + }, + "repo.maven.apache.org/maven2/org/ow2/asm#asm-analysis/9.2": { + "jar": "sha256-h4++UhcxwHLRTS1luYOxvq5q0G/aAAe2qLroH3P0M8Q=", + "pom": "sha256-dzzBor/BTGxKl5xRoHXAI0oL9pT8Or5PrPRU83oUXxs=" + }, + "repo.maven.apache.org/maven2/org/ow2/asm#asm-commons/9.2": { + "jar": "sha256-vkzlMTiiOLtSLNeBz5Hzulzi9sqT7GLUahYqEnIl4KY=", + "pom": "sha256-AoJOg58qLw5ylZ/dMLSJckDwWvxD3kLXugsYQ3YBwHA=" + }, + "repo.maven.apache.org/maven2/org/ow2/asm#asm-commons/9.4": { + "jar": "sha256-DBKKnsPzPJiVknL20WzxQke1CPWJUVdLzb0rVtYyY2Q=", + "pom": "sha256-tCyiq8+IEXdqXdwCkPIQbX8xP4LHiw3czVzOTGOjUXk=" + }, + "repo.maven.apache.org/maven2/org/ow2/asm#asm-tree/9.2": { + "jar": "sha256-qr+b0jCRpOv8EJwfPufPPkuJ9rotP1HFJD8Ws8/64BE=", + "pom": "sha256-9h8+vqVSDd8Z9FKwPEJscjG92KgdesKHZctScSJaw3g=" + }, + "repo.maven.apache.org/maven2/org/ow2/asm#asm-tree/9.4": { + "jar": "sha256-xC1HnPJFZqIesgr37q7vToa9tKiGMGz3L0g7ZedbKs8=", + "pom": "sha256-x+nvk73YqzYwMs5TgvzGTQAtbFicF1IzI2zSmOUaPBY=" + }, + "repo.maven.apache.org/maven2/org/ow2/asm#asm-tree/9.5": { + "jar": "sha256-PDOmSBkQea6urrfBmkmxU5UvnkD+hvusUgVVTd2azZQ=", + "pom": "sha256-pyqq+N0FGJn6CJ54PsfUgnrE19GHYgHG3uy6qUoNyVY=" + }, + "repo.maven.apache.org/maven2/org/ow2/asm#asm-util/9.2": { + "jar": "sha256-/1s80zGuipqAR2goDamPUPQk/vI908eIuzIOCMlO5Zg=", + "pom": "sha256-3dBpE/FH1wrmjnpuQ1alWzPxTd5hYtv/K9DiiVgfGtI=" + }, + "repo.maven.apache.org/maven2/org/ow2/asm#asm/9.2": { + "jar": "sha256-udT+TXGTjfOIOfDspCqqpkz4sxPWeNoDbwyzyhmbR/U=", + "pom": "sha256-37EqGyJL8Bvh/WBAIEZviUJBvLZF3M45Xt2M1vilDfQ=" + }, + "repo.maven.apache.org/maven2/org/ow2/asm#asm/9.4": { + "jar": "sha256-OdDis9xFr2Wgmwl5RXUKlKEm4FLhJPk0aEQ6HQ4V84E=", + "pom": "sha256-SDdR5I+y0fQ8Ya06sA/6Rm7cAzPY/C/bWibpXTKYI5Q=" + }, + "repo.maven.apache.org/maven2/org/ow2/asm#asm/9.5": { + "jar": "sha256-ti6EtZgHKXUbBFjFNM8TZvcnVCu40VhiEzVoKkYPA1M=", + "pom": "sha256-LJzOuVHMZYbejZoWxnKtPkwwucMjAo16PDNmVg1WJ7E=" + }, + "repo.maven.apache.org/maven2/org/reactivestreams#reactive-streams/1.0.4": { + "jar": "sha256-91yll3ibPaxY9hhXuawuEDSmj6Zy2zUFWo+0UJ4yXyg=", + "pom": "sha256-VLoj2HotQ4VAyZ74eUoIVvxXOiVrSYZ4KDw8Z+8Yrag=" + }, + "repo.maven.apache.org/maven2/org/slf4j#slf4j-api/1.6.6": { + "pom": "sha256-cxmZMiteIokinNntRiTJQexXG3xh0qJ9alB+9zuXyho=" + }, + "repo.maven.apache.org/maven2/org/slf4j#slf4j-api/2.0.7": { + "jar": "sha256-XWKYuToZBcMs2mR4gIrBTC1KR+kVNeU8Qff+64XZRvQ=", + "pom": "sha256-LUA8zw4KAtXBqGZ7DiozyN/GA4qyh7lnHdaBwgUmeYE=" + }, + "repo.maven.apache.org/maven2/org/slf4j#slf4j-parent/1.6.6": { + "pom": "sha256-QrjCR2CP2OENW2Zs98gKW1nSseEoRQ97bZ0sIM+2sxs=" + }, + "repo.maven.apache.org/maven2/org/slf4j#slf4j-parent/2.0.7": { + "pom": "sha256-wYK7Ns068ck8FgPN/v54iRV9swuotYT0pEU1/NIuRec=" + }, + "repo.maven.apache.org/maven2/org/sonatype/oss#oss-parent/5": { + "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0=" + }, + "repo.maven.apache.org/maven2/org/sonatype/oss#oss-parent/6": { + "pom": "sha256-tDBtE+j1OSRYobMIZvHP8WGz0uaZmojQWe6jkyyKhJk=" + }, + "repo.maven.apache.org/maven2/org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "repo.maven.apache.org/maven2/org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "repo.maven.apache.org/maven2/org/springframework#spring-framework-bom/5.3.24": { + "module": "sha256-GZbh9hfLA/p26hGFD+Kh4gsOMKEEa6bV2zvbv0QRP84=", + "pom": "sha256-U1ITVmu77+Jjag1OjdGnOt5hLiQwyP/TENzCo7O5ukE=" + }, + "repo.maven.apache.org/maven2/org/tukaani#xz/1.9": { + "jar": "sha256-IRswbPxE+Plt86Cj3a91uoxSie7XfWDXL4ibuFX1NeU=", + "pom": "sha256-CTvhsDMxvOKTLWglw36YJy12Ieap6fuTKJoAJRi43Vo=" + }, + "repo.maven.apache.org/maven2/org/vafer#jdependency/2.8.0": { + "jar": "sha256-v9LMfhv8eKqDtEwKVL8s3jikOC7CRyivaD2Y3GvngZI=", + "pom": "sha256-EBhn8/npJlei74mjELYE1D0JDJuQqj4LBS3NFqO78y0=" + }, + "repo.maven.apache.org/maven2/org/xmlunit#xmlunit-core/2.9.1": { + "jar": "sha256-fnDyPU914F8O558Pa54Tts9R0082xfw6a4OUKd3h7+8=", + "pom": "sha256-0n5OKjEqIVR+82BcgS5+YMiuyWTn+WDlDU3Dy2azkBI=" + }, + "repo.maven.apache.org/maven2/org/xmlunit#xmlunit-parent/2.9.1": { + "pom": "sha256-1+RY+9XGRFBIeOX7zglLHTB402mn/uF93ezj0Zn9qsA=" + }, + "repo.maven.apache.org/maven2/org/xmlunit#xmlunit-placeholders/2.9.1": { + "jar": "sha256-H+OrnCfYNVl+031hZ8m7zLksLT0Buhr+7Cqta0Ny0+g=", + "pom": "sha256-8lixEzrsF0x2T84Rf12TjVBxfEFzVSIYKJUXmKF8qH8=" + }, + "repo.maven.apache.org/maven2/org/yaml#snakeyaml/1.33": { + "jar": "sha256-Ef9Fl4jwoteB9WpKhtfmkgLOus0Cc9UmnErp8C8/2PA=", + "pom": "sha256-6n1I/UUyGmAz2XzSiBhtSOXpLMDHBm5ziNfEzrSvWVc=" + }, + "repo.maven.apache.org/maven2/org/zeroturnaround#zt-zip/1.15": { + "jar": "sha256-egIaxh7b4ktfzIM5aWf3BxIE51cLktf0s/mH6Wylu5M=", + "pom": "sha256-ll/F/uIc+Ys81paoijiZqsjRiBsZlfZp+Jmvdtu2C2E=" + }, + "repo.maven.apache.org/maven2/xmlpull#xmlpull/1.1.3.1": { + "jar": "sha256-NOCO5iEWBxy7acDtcNFaelsgjWJ5jFnyEgu4kpMky2M=", + "pom": "sha256-jxD/2N8NPpgZyMyEAnCcaySLxTqVTvbkVHDZrjpXNfs=" + } + } +} diff --git a/pkgs/by-name/at/atlauncher/package.nix b/pkgs/by-name/at/atlauncher/package.nix index 254c2374e604..3337821922f8 100644 --- a/pkgs/by-name/at/atlauncher/package.nix +++ b/pkgs/by-name/at/atlauncher/package.nix @@ -1,9 +1,8 @@ { - copyDesktopItems, - fetchurl, + fetchFromGitHub, + gradle, jre, lib, - makeDesktopItem, makeWrapper, stdenvNoCC, @@ -24,23 +23,37 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "atlauncher"; version = "3.4.36.10"; - src = fetchurl { - url = "https://github.com/ATLauncher/ATLauncher/releases/download/v${finalAttrs.version}/ATLauncher-${finalAttrs.version}.jar"; - hash = "sha256-JZTiYcea5ik8a4RmNLxZcuea7spGWftUGRiRW2Ive7c="; + src = fetchFromGitHub { + owner = "ATLauncher"; + repo = "ATLauncher"; + rev = "v${finalAttrs.version}"; + hash = "sha256-EMV/M5W/acJaQJsi4COoRQC2YVfuJG9HGcwvGfakoNo="; }; - env.ICON = fetchurl { - url = "https://atlauncher.com/assets/images/logo.svg"; - hash = "sha256-XoqpsgLmkpa2SdjZvPkgg6BUJulIBIeu6mBsJJCixfo="; - }; - - dontUnpack = true; + postPatch = '' + # exclude UI tests + sed -i "/test {/a\ exclude '**/BasicLauncherUiTest.class'" build.gradle + ''; nativeBuildInputs = [ - copyDesktopItems + gradle makeWrapper ]; + mitmCache = gradle.fetchDeps { + inherit (finalAttrs) pname; + data = ./deps.json; + }; + + doCheck = true; + + gradleBuildTask = "shadowJar"; + + gradleFlags = [ + "--exclude-task" + "createExe" + ]; + installPhase = let runtimeLibraries = @@ -59,30 +72,28 @@ stdenvNoCC.mkDerivation (finalAttrs: { '' runHook preInstall - mkdir -p $out/bin $out/share/java - cp $src $out/share/java/ATLauncher.jar + mkdir -p $out/{bin,share/java} + cp build/libs/ATLauncher-${finalAttrs.version}.jar $out/share/java/ATLauncher.jar - makeWrapper ${jre}/bin/java $out/bin/atlauncher \ + makeWrapper ${lib.getExe jre} $out/bin/atlauncher \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeLibraries}" \ --add-flags "-jar $out/share/java/ATLauncher.jar" \ --add-flags "--working-dir \"\''${XDG_DATA_HOME:-\$HOME/.local/share}/ATLauncher\"" \ --add-flags "--no-launcher-update" - mkdir -p $out/share/icons/hicolor/scalable/apps - cp $ICON $out/share/icons/hicolor/scalable/apps/atlauncher.svg - runHook postInstall ''; - desktopItems = [ - (makeDesktopItem { - categories = [ "Game" ]; - desktopName = "ATLauncher"; - exec = "atlauncher"; - icon = "atlauncher"; - name = "atlauncher"; - }) - ]; + postInstall = + let + packagingDir = "${finalAttrs.src}/packaging/linux/_common"; + in + '' + install -D -m444 ${packagingDir}/atlauncher.desktop -t $out/share/applications + install -D -m444 ${packagingDir}/atlauncher.metainfo.xml -t $out/share/metainfo + install -D -m444 ${packagingDir}/atlauncher.png -t $out/share/pixmaps + install -D -m444 ${packagingDir}/atlauncher.svg -t $out/share/icons/hicolor/scalable/apps + ''; meta = { changelog = "https://github.com/ATLauncher/ATLauncher/blob/v${finalAttrs.version}/CHANGELOG.md"; @@ -93,6 +104,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { mainProgram = "atlauncher"; maintainers = with lib.maintainers; [ getpsyched ]; platforms = lib.platforms.all; - sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryBytecode # mitm cache + ]; }; }) From f7dccea6d9e4844fac7fa4aef7b5ed706c04e362 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Thu, 25 Jul 2024 22:36:51 +0200 Subject: [PATCH 007/298] lanraragi: 0.9.10 -> 0.9.21 --- pkgs/by-name/la/lanraragi/install.patch | 16 +++++++--------- pkgs/by-name/la/lanraragi/package.nix | 4 ++-- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/la/lanraragi/install.patch b/pkgs/by-name/la/lanraragi/install.patch index 1f99a38892b5..42138483389a 100644 --- a/pkgs/by-name/la/lanraragi/install.patch +++ b/pkgs/by-name/la/lanraragi/install.patch @@ -1,5 +1,5 @@ diff --git a/tools/install.pl b/tools/install.pl -index b7c7adb..a63de58 100644 +index f09218f..a63de58 100644 --- a/tools/install.pl +++ b/tools/install.pl @@ -9,6 +9,7 @@ use Config; @@ -10,7 +10,7 @@ index b7c7adb..a63de58 100644 #Vendor dependencies my @vendor_css = ( -@@ -90,34 +91,6 @@ if ( $ENV{HOMEBREW_FORMULA_PREFIX} ) { +@@ -90,32 +91,6 @@ if ( $ENV{HOMEBREW_FORMULA_PREFIX} ) { $cpanopt = " -l " . $ENV{HOMEBREW_FORMULA_PREFIX} . "/libexec"; } @@ -30,11 +30,9 @@ index b7c7adb..a63de58 100644 - -#Check for GhostScript -say("Checking for GhostScript..."); --if ( can_run('gs') ) { -- say("OK!"); --} else { -- warn 'NOT FOUND! PDF support will not work properly. Please install the "gs" tool.'; --} +-can_run('gs') +- or warn 'NOT FOUND! PDF support will not work properly. Please install the "gs" tool.'; +-say("OK!"); - -#Check for libarchive -say("Checking for libarchive..."); @@ -45,7 +43,7 @@ index b7c7adb..a63de58 100644 #Check for PerlMagick say("Checking for ImageMagick/PerlMagick..."); my $imgk; -@@ -137,37 +110,11 @@ if ($@) { +@@ -135,37 +110,11 @@ if ($@) { say("OK!"); } @@ -83,7 +81,7 @@ index b7c7adb..a63de58 100644 make_path getcwd . "/public/css/vendor"; make_path getcwd . "/public/css/webfonts"; make_path getcwd . "/public/js/vendor"; -@@ -214,19 +161,3 @@ sub cp_node_module { +@@ -212,19 +161,3 @@ sub cp_node_module { } diff --git a/pkgs/by-name/la/lanraragi/package.nix b/pkgs/by-name/la/lanraragi/package.nix index 91289c816b46..ff32a96d78fd 100644 --- a/pkgs/by-name/la/lanraragi/package.nix +++ b/pkgs/by-name/la/lanraragi/package.nix @@ -10,13 +10,13 @@ buildNpmPackage rec { pname = "lanraragi"; - version = "0.9.10"; + version = "0.9.21"; src = fetchFromGitHub { owner = "Difegue"; repo = "LANraragi"; rev = "v.${version}"; - hash = "sha256-mW2cVd+SPbjc/+b0KY3je1eqw5ZT/GKFruE4Y/eFdD4="; + hash = "sha256-2YdQeBW1MQiUs5nliloISaxG0yhFJ6ulkU/Urx8PN3Y="; }; patches = [ From ba654492e57f31043e49a4b60cbdc1231540bee1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Aug 2024 07:24:21 +0000 Subject: [PATCH 008/298] sublime-merge-dev: 2095 -> 2099 --- .../version-management/sublime-merge/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index 490a0c464404..72dd93f5d33f 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -11,9 +11,9 @@ in } { }; sublime-merge-dev = common { - buildVersion = "2095"; + buildVersion = "2099"; dev = true; - aarch64sha256 = "FmXz8VAWS7e0bB9NeXbihnhdhWMyNJJs6PNt+K2G0Bk="; - x64sha256 = "83Hw27RgGPgugpf4eMuWT6/MSQ2Q2VBCbaXoSGFtTPI="; + aarch64sha256 = "6rfUwzSBCJ3CRrL5E4+wBQ3FuB3PaAUCwh5pDtAbNKE="; + x64sha256 = "qIXDlsdaxY8wvky/ClwhZykZTVrUShsV56utb6BRCWQ="; } { }; } From e03a930dc3747085123a1043b99995852b79b08f Mon Sep 17 00:00:00 2001 From: DarkOnion0 Date: Tue, 13 Aug 2024 22:12:28 +0200 Subject: [PATCH 009/298] appflowy: 0.6.6 -> 0.6.7 https://github.com/AppFlowy-IO/AppFlowy/releases/tag/0.6.7 --- pkgs/applications/office/appflowy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index 1df4815b6a28..f92652c1df30 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -17,11 +17,11 @@ let rec { x86_64-linux = { urlSuffix = "linux-x86_64.tar.gz"; - hash = "sha256-2v7LF53UmVxFzoNHwv+B2zN7I6pSP66x32OplcIR7Fk="; + hash = "sha256-jEroFIe21sbqTlQoVw7HXJqv6BFKIx5ABF+CwKLDPZU="; }; x86_64-darwin = { urlSuffix = "macos-universal.zip"; - hash = "sha256-73Do2Jhso6GJsyDiSz3ACN8pEmZbuPNW3vjW3BFLhY4="; + hash = "sha256-o/4HeQIn6XfWA2tFqaSaenOKFYaCqeQK6SmHpNX70x0="; }; aarch64-darwin = x86_64-darwin; } @@ -29,7 +29,7 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "appflowy"; - version = "0.6.6"; + version = "0.6.7"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${finalAttrs.version}/AppFlowy-${finalAttrs.version}-${dist.urlSuffix}"; From a51b013a10a86228686be70c43fea44e813ae227 Mon Sep 17 00:00:00 2001 From: Dee Anzorge Date: Fri, 16 Aug 2024 17:04:48 +0200 Subject: [PATCH 010/298] streamlink: 6.8.3 -> 6.9.0 Changes: https://github.com/streamlink/streamlink/releases/tag/6.9.0 --- pkgs/applications/video/streamlink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 209023bb14ce..f7b4af74fd92 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -7,12 +7,12 @@ python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "6.8.3"; + version = "6.9.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-4/UaVnwIcDCS+R0El6P8Ku/jJ+/Ncl0D5m89zRHtm2g="; + hash = "sha256-LKmwsXuAvJ0JqEIsOQyzjYGa9VZkk5YL8hDY/uIhwX8="; }; patches = [ From 3887cb35500376e54a65aa76f6448a336f3fd71b Mon Sep 17 00:00:00 2001 From: DarkOnion0 Date: Thu, 15 Aug 2024 10:17:58 +0200 Subject: [PATCH 011/298] appflowy: 0.6.7 -> 0.6.7.1 https://github.com/AppFlowy-IO/AppFlowy/releases/tag/0.6.7.1 --- pkgs/applications/office/appflowy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index f92652c1df30..697655beea5d 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -17,11 +17,11 @@ let rec { x86_64-linux = { urlSuffix = "linux-x86_64.tar.gz"; - hash = "sha256-jEroFIe21sbqTlQoVw7HXJqv6BFKIx5ABF+CwKLDPZU="; + hash = "sha256-i4MJMGANi4wIS+I2P1MvfqW6ln88kfwZt818ky64cAk="; }; x86_64-darwin = { urlSuffix = "macos-universal.zip"; - hash = "sha256-o/4HeQIn6XfWA2tFqaSaenOKFYaCqeQK6SmHpNX70x0="; + hash = "sha256-0umUD+dkG+sutA5qJ4YP1ZmsccJxz1TgRbzZ/yC6rFg="; }; aarch64-darwin = x86_64-darwin; } @@ -29,7 +29,7 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "appflowy"; - version = "0.6.7"; + version = "0.6.7.1"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${finalAttrs.version}/AppFlowy-${finalAttrs.version}-${dist.urlSuffix}"; From 7e0e927e858c24d1b9a868e066dc0b93c690771c Mon Sep 17 00:00:00 2001 From: Stephen Huan Date: Sun, 18 Aug 2024 20:39:10 -0400 Subject: [PATCH 012/298] backintime: use --replace-fail and set mainProgram --- .../networking/sync/backintime/common.nix | 11 ++++++----- .../networking/sync/backintime/qt.nix | 18 +++++++++--------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix index 0a1a1d05dde4..747300ccf048 100644 --- a/pkgs/applications/networking/sync/backintime/common.nix +++ b/pkgs/applications/networking/sync/backintime/common.nix @@ -26,10 +26,10 @@ in stdenv.mkDerivation rec { preConfigure = '' cd common substituteInPlace configure \ - --replace "/.." "" \ - --replace "share/backintime" "${python'.sitePackages}/backintime" + --replace-fail "/.." "" \ + --replace-fail "share/backintime" "${python'.sitePackages}/backintime" substituteInPlace "backintime" \ - --replace "share" "${python'.sitePackages}" + --replace-fail "share" "${python'.sitePackages}" ''; dontAddPrefix = true; @@ -44,10 +44,11 @@ in stdenv.mkDerivation rec { description = "Simple backup tool for Linux"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ stephen-huan ]; - platforms = lib.platforms.all; + platforms = lib.platforms.linux; + mainProgram = "backintime"; longDescription = '' Back In Time is a simple backup tool (on top of rsync) for Linux - inspired from “flyback project” and “TimeVault”. The backup is + inspired from "flyback project" and "TimeVault". The backup is done by taking snapshots of a specified set of directories. ''; }; diff --git a/pkgs/applications/networking/sync/backintime/qt.nix b/pkgs/applications/networking/sync/backintime/qt.nix index 1580a51151a2..d0d4fa813017 100644 --- a/pkgs/applications/networking/sync/backintime/qt.nix +++ b/pkgs/applications/networking/sync/backintime/qt.nix @@ -24,23 +24,23 @@ mkDerivation { --prefix PATH : "${lib.getBin backintime-common}/bin:$PATH" substituteInPlace "$out/share/polkit-1/actions/net.launchpad.backintime.policy" \ - --replace "/usr/bin/backintime-qt" "$out/bin/backintime-qt" + --replace-fail "/usr/bin/backintime-qt" "$out/bin/backintime-qt" substituteInPlace "$out/share/applications/backintime-qt-root.desktop" \ - --replace "/usr/bin/backintime-qt" "backintime-qt" + --replace-fail "/usr/bin/backintime-qt" "backintime-qt" substituteInPlace "$out/share/backintime/qt/serviceHelper.py" \ - --replace "'which'" "'${lib.getBin which}/bin/which'" \ - --replace "/bin/su" "${lib.getBin su}/bin/su" \ - --replace "/usr/bin/backintime" "${lib.getBin backintime-common}/bin/backintime" \ - --replace "/usr/bin/nice" "${lib.getBin coreutils}/bin/nice" \ - --replace "/usr/bin/ionice" "${lib.getBin util-linux}/bin/ionice" + --replace-fail "'which'" "'${lib.getExe which}'" \ + --replace-fail "/bin/su" "${lib.getBin su}/bin/su" \ + --replace-fail "/usr/bin/backintime" "${lib.getExe backintime-common}" \ + --replace-fail "/usr/bin/nice" "${lib.getBin coreutils}/bin/nice" \ + --replace-fail "/usr/bin/ionice" "${lib.getBin util-linux}/bin/ionice" substituteInPlace "$out/share/dbus-1/system-services/net.launchpad.backintime.serviceHelper.service" \ - --replace "/usr/share/backintime" "$out/share/backintime" + --replace-fail "/usr/share/backintime" "$out/share/backintime" substituteInPlace "$out/bin/backintime-qt_polkit" \ - --replace "/usr/bin/backintime-qt" "$out/bin/backintime-qt" + --replace-fail "/usr/bin/backintime-qt" "$out/bin/backintime-qt" wrapProgram "$out/bin/backintime-qt_polkit" \ --prefix PATH : "${lib.getBin polkit}/bin:$PATH" From c85528c1acf698fd5edd5f7aa4349a78748b0a85 Mon Sep 17 00:00:00 2001 From: Stephen Huan Date: Sun, 18 Aug 2024 20:40:13 -0400 Subject: [PATCH 013/298] backintime: 1.4.3 -> 1.5.2 --- .../networking/sync/backintime/common.nix | 5 +++-- .../networking/sync/backintime/qt.nix | 16 +++++++++++----- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix index 747300ccf048..95594dc93cb7 100644 --- a/pkgs/applications/networking/sync/backintime/common.nix +++ b/pkgs/applications/networking/sync/backintime/common.nix @@ -7,13 +7,13 @@ let apps = lib.makeBinPath [ openssh python' cron rsync sshfs-fuse encfs ]; in stdenv.mkDerivation rec { pname = "backintime-common"; - version = "1.4.3"; + version = "1.5.2"; src = fetchFromGitHub { owner = "bit-team"; repo = "backintime"; rev = "v${version}"; - sha256 = "sha256-2q2Q4rnxXwVnfH1YEBwY35B2ctG9+qpOIAHqPOjjArg="; + sha256 = "sha256-yfCSTzCmhXDBC1vYqwgVjsYUtc5VO1VW74BmIB0hHfE="; }; nativeBuildInputs = [ makeWrapper gettext ]; @@ -24,6 +24,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "--python=${lib.getExe python'}" ]; preConfigure = '' + patchShebangs --build updateversion.sh cd common substituteInPlace configure \ --replace-fail "/.." "" \ diff --git a/pkgs/applications/networking/sync/backintime/qt.nix b/pkgs/applications/networking/sync/backintime/qt.nix index d0d4fa813017..136b91a0623c 100644 --- a/pkgs/applications/networking/sync/backintime/qt.nix +++ b/pkgs/applications/networking/sync/backintime/qt.nix @@ -1,19 +1,25 @@ -{ lib, mkDerivation, backintime-common, python3, polkit, which, su, coreutils, util-linux }: +{ lib, stdenv, backintime-common, python3, polkit, which, su, coreutils, util-linux, +wrapQtAppsHook, qtbase, qtwayland }: let - python' = python3.withPackages (ps: with ps; [ pyqt5 backintime-common packaging ]); + python' = python3.withPackages (ps: with ps; [ pyqt6 backintime-common packaging ]); in -mkDerivation { +stdenv.mkDerivation { inherit (backintime-common) - version src installFlags meta dontAddPrefix nativeBuildInputs; + version src installFlags meta dontAddPrefix; pname = "backintime-qt"; - buildInputs = [ python' backintime-common ]; + buildInputs = [ python' backintime-common qtbase qtwayland ]; + + nativeBuildInputs = backintime-common.nativeBuildInputs or [ ] ++ [ + wrapQtAppsHook + ]; configureFlags = [ "--python=${lib.getExe python'}" ]; preConfigure = '' + patchShebangs --build updateversion.sh cd qt substituteInPlace qttools_path.py \ --replace "__file__, os.pardir, os.pardir" '"${backintime-common}/${python'.sitePackages}/backintime"' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2a18fff0194..445d542b06a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29415,7 +29415,7 @@ with pkgs; backintime-common = callPackage ../applications/networking/sync/backintime/common.nix { }; - backintime-qt = libsForQt5.callPackage ../applications/networking/sync/backintime/qt.nix { }; + backintime-qt = qt6.callPackage ../applications/networking/sync/backintime/qt.nix { }; backintime = backintime-qt; From 162dd80fe94e6fbce85e351f8a1a14b74d8b8bc7 Mon Sep 17 00:00:00 2001 From: Stephen Huan Date: Sun, 18 Aug 2024 20:52:17 -0400 Subject: [PATCH 014/298] backintime: fix backintime-askpass --- pkgs/applications/networking/sync/backintime/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix index 95594dc93cb7..087b415c241f 100644 --- a/pkgs/applications/networking/sync/backintime/common.nix +++ b/pkgs/applications/networking/sync/backintime/common.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { substituteInPlace configure \ --replace-fail "/.." "" \ --replace-fail "share/backintime" "${python'.sitePackages}/backintime" - substituteInPlace "backintime" \ + substituteInPlace "backintime" "backintime-askpass" \ --replace-fail "share" "${python'.sitePackages}" ''; From cebbbf33c4a4bb90932f7f1fae0fa12ece9b95d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 Aug 2024 08:10:34 +0000 Subject: [PATCH 015/298] azure-static-sites-client: 1.0.026911 -> 19449a00c0269fefc8f29a6d01801c4b19308181 --- .../azure-static-sites-client/versions.json | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/pkgs/development/tools/azure-static-sites-client/versions.json b/pkgs/development/tools/azure-static-sites-client/versions.json index c2bd3989b8bc..8b5595ae40e7 100644 --- a/pkgs/development/tools/azure-static-sites-client/versions.json +++ b/pkgs/development/tools/azure-static-sites-client/versions.json @@ -1,25 +1,44 @@ [ { "version": "latest", - "buildId": "1.0.026911", - "publishDate": "2024-05-15T19:23:23.3973684Z", + "buildId": "19449a00c0269fefc8f29a6d01801c4b19308181", + "publishDate": "2024-08-06T04:39:59.0569065Z", "files": { "linux-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026911/linux/StaticSitesClient", - "sha": "e1d9e033c973a35f64b7e41b6a114bd8e48022c9c3f7676e79047e87245a874d" + "url": "https://swalocaldeploy.azureedge.net/downloads/19449a00c0269fefc8f29a6d01801c4b19308181/linux/StaticSitesClient", + "sha": "87b0852f6a839fcf8e7d76df78aea1d36b803bb4cc4610fa9cd9531ff53175f0" }, "win-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026911/windows/StaticSitesClient.exe", - "sha": "c67e5eed2b28fcf5c98348732653d1e2b37d842e6dde9a6b30322832c5d86fc7" + "url": "https://swalocaldeploy.azureedge.net/downloads/19449a00c0269fefc8f29a6d01801c4b19308181/windows/StaticSitesClient.exe", + "sha": "8d21e065a68a9aa983fdf95f6965b76f19286dba3dcc159d9af212b3fea31126" }, "osx-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026911/macOS/StaticSitesClient", - "sha": "18ca42a1b13db9b8b6db6bd8c77e65def56fa7bf3ce3fb1184e890d8cd7dd033" + "url": "https://swalocaldeploy.azureedge.net/downloads/19449a00c0269fefc8f29a6d01801c4b19308181/macOS/StaticSitesClient", + "sha": "a8d40d343d4135ccca4ebfd754d0e5c0d71821786a4d7c1b0d42c1b2679c80c1" } } }, { "version": "stable", + "buildId": "19449a00c0269fefc8f29a6d01801c4b19308181", + "publishDate": "2024-08-06T04:39:59.0569065Z", + "files": { + "linux-x64": { + "url": "https://swalocaldeploy.azureedge.net/downloads/19449a00c0269fefc8f29a6d01801c4b19308181/linux/StaticSitesClient", + "sha": "87b0852f6a839fcf8e7d76df78aea1d36b803bb4cc4610fa9cd9531ff53175f0" + }, + "win-x64": { + "url": "https://swalocaldeploy.azureedge.net/downloads/19449a00c0269fefc8f29a6d01801c4b19308181/windows/StaticSitesClient.exe", + "sha": "8d21e065a68a9aa983fdf95f6965b76f19286dba3dcc159d9af212b3fea31126" + }, + "osx-x64": { + "url": "https://swalocaldeploy.azureedge.net/downloads/19449a00c0269fefc8f29a6d01801c4b19308181/macOS/StaticSitesClient", + "sha": "a8d40d343d4135ccca4ebfd754d0e5c0d71821786a4d7c1b0d42c1b2679c80c1" + } + } + }, + { + "version": "backup", "buildId": "1.0.026911", "publishDate": "2024-05-15T19:23:23.3973684Z", "files": { @@ -36,24 +55,5 @@ "sha": "18ca42a1b13db9b8b6db6bd8c77e65def56fa7bf3ce3fb1184e890d8cd7dd033" } } - }, - { - "version": "backup", - "buildId": "1.0.026792", - "publishDate": "2024-05-03T18:31:36.0288058Z", - "files": { - "linux-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026792/linux/StaticSitesClient", - "sha": "a9dcd998d22a3476fb97fe1c446e83cc7f060a3a36cdb6757b828d0facc42347" - }, - "win-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026792/windows/StaticSitesClient.exe", - "sha": "15f03e3f91208db2ea4015c4fce0623a692da1a289f23a782578ab7bc8a810e2" - }, - "osx-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026792/macOS/StaticSitesClient", - "sha": "454b10f0351694ec3475a3d85b8746356932b2061a5be7e7fc093a6509cf000c" - } - } } ] From 4fde325bdb1820f69028117574991d5be604dda2 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Mon, 19 Aug 2024 01:40:12 -0500 Subject: [PATCH 016/298] nimlangserver: 1.2.0 -> 1.4.0 --- pkgs/by-name/ni/nimlangserver/package.nix | 48 ++++++++++++----------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/pkgs/by-name/ni/nimlangserver/package.nix b/pkgs/by-name/ni/nimlangserver/package.nix index 2a5f7d36e14d..bd8e00d25bc9 100644 --- a/pkgs/by-name/ni/nimlangserver/package.nix +++ b/pkgs/by-name/ni/nimlangserver/package.nix @@ -3,29 +3,31 @@ buildNimPackage, fetchFromGitHub, }: -buildNimPackage (final: prev: { - pname = "nimlangserver"; - version = "1.2.0"; +buildNimPackage ( + final: prev: rec { + pname = "nimlangserver"; + version = "1.4.0"; - # lock.json generated with github.com/daylinmorgan/nnl - lockFile = ./lock.json; + # lock.json generated with github.com/daylinmorgan/nnl + lockFile = ./lock.json; - src = fetchFromGitHub { - owner = "nim-lang"; - repo = "langserver"; - rev = "71b59bfa77dabf6b8b381f6e18a1d963a1a658fc"; - hash = "sha256-dznegEhRHvztrNhBcUhW83RYgJpduwdGLWj/tJ//K8c="; - }; - - doCheck = false; - - meta = with lib; - final.src.meta - // { - description = "Nim language server implementation (based on nimsuggest)"; - homepage = "https://github.com/nim-lang/langserver"; - license = licenses.mit; - mainProgram = "nimlangserver"; - maintainers = with maintainers; [daylinmorgan]; + src = fetchFromGitHub { + owner = "nim-lang"; + repo = "langserver"; + rev = "v${version}"; + hash = "sha256-mh+p8t8/mbZvgsJ930lXkcBdUjjioZoNyNZzwywAiUI="; }; -}) + + doCheck = false; + + meta = + final.src.meta + // (with lib; { + description = "Nim language server implementation (based on nimsuggest)"; + homepage = "https://github.com/nim-lang/langserver"; + license = licenses.mit; + mainProgram = "nimlangserver"; + maintainers = with maintainers; [ daylinmorgan ]; + }); + } +) From c28db0ac88719171d22d46dd8269a10c00914adf Mon Sep 17 00:00:00 2001 From: BarrOff <58253563+BarrOff@users.noreply.github.com> Date: Wed, 7 Aug 2024 23:23:32 +0200 Subject: [PATCH 017/298] maintainers: add BarrOff --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a886d93ae701..7c35d02c56bd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2249,6 +2249,11 @@ github = "barinov274"; githubId = 54442153; }; + BarrOff = { + name = "BarrOff"; + github = "BarrOff"; + githubId = 58253563; + }; barrucadu = { email = "mike@barrucadu.co.uk"; github = "barrucadu"; From a62ec9ed4870270039364f11d3a9fb94a4b7f775 Mon Sep 17 00:00:00 2001 From: BarrOff <58253563+BarrOff@users.noreply.github.com> Date: Wed, 21 Aug 2024 22:51:44 +0200 Subject: [PATCH 018/298] ypbind-mt: init at 2.7.2 --- pkgs/by-name/yp/ypbind-mt/package.nix | 45 +++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 pkgs/by-name/yp/ypbind-mt/package.nix diff --git a/pkgs/by-name/yp/ypbind-mt/package.nix b/pkgs/by-name/yp/ypbind-mt/package.nix new file mode 100644 index 000000000000..68db0f4aa9b0 --- /dev/null +++ b/pkgs/by-name/yp/ypbind-mt/package.nix @@ -0,0 +1,45 @@ +{ + stdenv, + lib, + fetchurl, + autoreconfHook, + libnsl, + libtirpc, + libxcrypt, + pkg-config, + rpcbind, + systemdLibs, +}: + +stdenv.mkDerivation rec { + pname = "ypbind-mt"; + version = "2.7.2"; + + src = fetchurl { + url = "https://github.com/thkukuk/ypbind-mt/releases/download/v${version}/ypbind-mt-${version}.tar.xz"; + hash = "sha256-Bk8vGFZzxUk9+D9kALeZ86NZ3lYRi2ujfEMnER8vzYs="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + libnsl + libtirpc + libxcrypt + rpcbind + systemdLibs + ]; + + meta = { + description = "Multithreaded daemon maintaining the NIS binding informations."; + homepage = "https://github.com/thkukuk/ypbind-mt"; + changelog = "https://github.com/thkukuk/ypbind-mt/blob/master/NEWS"; + license = lib.licenses.gpl2Plus; + mainProgram = "ypbind"; + maintainers = with lib.maintainers; [ BarrOff ]; + platforms = lib.platforms.linux; + }; +} From 8ba6d9159fa00a14d9b464e4f8aeac99568625f4 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Thu, 22 Aug 2024 10:33:37 +0200 Subject: [PATCH 019/298] python3Packages.sqids: 0.4.1 -> 0.5.0 https://github.com/sqids/sqids-python/blob/v0.5.0/CHANGELOG.md --- pkgs/development/python-modules/sqids/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/sqids/default.nix b/pkgs/development/python-modules/sqids/default.nix index c9e587555700..11ab9463a812 100644 --- a/pkgs/development/python-modules/sqids/default.nix +++ b/pkgs/development/python-modules/sqids/default.nix @@ -4,24 +4,28 @@ fetchPypi, pythonOlder, setuptools-scm, + hypothesis, pytestCheckHook, }: buildPythonPackage rec { pname = "sqids"; - version = "0.4.1"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-/8P7/vY0kb7ouUCpgGU4g0Xb77BtSeQVt6nkdcogD50="; + hash = "sha256-ZHeY59W/6yNuesRwnP1M2AhjCmxQ+AIF3xe0yT5WAUA="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + hypothesis + pytestCheckHook + ]; pythonImportsCheck = [ "sqids" ]; From ed1fbb695abbe6ccf4adaa4773f3623dda52a265 Mon Sep 17 00:00:00 2001 From: Eric Berquist Date: Thu, 22 Aug 2024 09:52:12 -0400 Subject: [PATCH 020/298] python3Packages.array-api-compat: refactor - use pytestFlagsArray instead of checkPhase to skip tests against cupy - remove unnecessary trivial nix-update-script for Python packages --- .../python-modules/array-api-compat/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/array-api-compat/default.nix b/pkgs/development/python-modules/array-api-compat/default.nix index 3f25d7763b9e..6de3c073b43a 100644 --- a/pkgs/development/python-modules/array-api-compat/default.nix +++ b/pkgs/development/python-modules/array-api-compat/default.nix @@ -14,7 +14,6 @@ config, cudaSupport ? config.cudaSupport, cupy, - nix-update-script, }: buildPythonPackage rec { @@ -45,13 +44,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "array_api_compat" ]; # CUDA (used via cupy) is not available in the testing sandbox - checkPhase = '' - runHook preCheck - python -m pytest -k 'not cupy' - runHook postCheck - ''; - - passthru.updateScript = nix-update-script { }; + pytestFlagsArray = [ + "-k" + "'not cupy'" + ]; meta = { homepage = "https://data-apis.org/array-api-compat"; From 14fa0288267a95c9f1978506fa43c959a15cb165 Mon Sep 17 00:00:00 2001 From: SharzyL Date: Thu, 22 Aug 2024 23:21:34 +0800 Subject: [PATCH 021/298] mlc: bump src --- pkgs/tools/system/mlc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/mlc/default.nix b/pkgs/tools/system/mlc/default.nix index 409738e4a353..524db47d8e3d 100644 --- a/pkgs/tools/system/mlc/default.nix +++ b/pkgs/tools/system/mlc/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://downloadmirror.intel.com/736634/mlc_v${version}.tgz"; - sha256 = "3vNI/CQwyY4KMFest1wkVYecsxigjXyGIUIKai979W4="; + sha256 = "EDa5V56qCPQxgCu4eddYiWDrk7vkYS0jisnG004L+jQ="; }; sourceRoot = "Linux"; From 05b20e0227aa32e8f3f37a57d133c2e9e07168b3 Mon Sep 17 00:00:00 2001 From: Matthieu Barthel Date: Thu, 22 Aug 2024 20:45:43 +0200 Subject: [PATCH 022/298] clipqr: 1.2.0 -> 1.3.0 --- pkgs/applications/misc/clipqr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/clipqr/default.nix b/pkgs/applications/misc/clipqr/default.nix index 969ce4c75dc6..18b276f2646f 100644 --- a/pkgs/applications/misc/clipqr/default.nix +++ b/pkgs/applications/misc/clipqr/default.nix @@ -18,13 +18,13 @@ buildGoModule rec { pname = "clipqr"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitLab { owner = "imatt-foss"; repo = "clipqr"; rev = "v${version}"; - hash = "sha256-gfKCuTZY9VsiXMlw6XX6YylMO4xGoLQU/5QvnDV7GbE="; + hash = "sha256-iuA6RqclMm1CWaiM1kpOpgfYvKaYGOIwFQkLr/nCL5M="; }; vendorHash = null; From 9c9405d81a6aa7c927b540c26fd8b69c3ebcd5ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 23 Aug 2024 12:00:03 +0200 Subject: [PATCH 023/298] dbeaver-bin: add webkitgkt and glib-networking for webbrowser support --- pkgs/by-name/db/dbeaver-bin/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index d741337c78b3..ff03897cebc2 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -11,6 +11,8 @@ gtk3, swt, glib, + webkitgtk, + glib-networking, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -64,11 +66,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { --prefix PATH : "${openjdk17}/bin" \ --set JAVA_HOME "${openjdk17.home}" \ --prefix CLASSPATH : "$out/dbeaver/plugins/*:${swt}/jars/swt.jar" \ + --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \ --prefix LD_LIBRARY_PATH : "$out/lib:${ lib.makeLibraryPath [ swt gtk3 glib + webkitgtk + glib-networking ] }" From 515d3439b3a8369241d62a7952e67d85159644c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Fri, 23 Aug 2024 23:16:16 +0200 Subject: [PATCH 024/298] pixelorama: 1.0.1 -> 1.0.2 https://github.com/Orama-Interactive/Pixelorama/releases/tag/v1.0.2 --- pkgs/by-name/pi/pixelorama/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pi/pixelorama/package.nix b/pkgs/by-name/pi/pixelorama/package.nix index dfe9abf9632f..16f0a3ed06a3 100644 --- a/pkgs/by-name/pi/pixelorama/package.nix +++ b/pkgs/by-name/pi/pixelorama/package.nix @@ -21,9 +21,9 @@ let preset = if stdenv.isLinux then - if stdenv.is64bit then "Linux/X11 64-bit" else "Linux/X11 32-bit" + if stdenv.is64bit then "Linux 64-bit" else "Linux 32-bit" else if stdenv.isDarwin then - "Mac OSX" + "macOS" else throw "unsupported platform"; @@ -31,13 +31,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "pixelorama"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "Orama-Interactive"; repo = "Pixelorama"; rev = "v${finalAttrs.version}"; - hash = "sha256-lfim5ZiykOhI1kgsu0ni2frUVHPRIPJdrGx6TuUQcSY="; + hash = "sha256-rFXUy6fvGKmB+aaNgiI+NNRG0xlj1migdetnU4iVDDQ="; }; strictDeps = true; From 4271b753b2c65d9e943ff3a1c9b5fc826f4750f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Fri, 23 Aug 2024 23:28:35 +0200 Subject: [PATCH 025/298] pixelorama: add aarch64-linux support --- pkgs/by-name/pi/pixelorama/package.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/pi/pixelorama/package.nix b/pkgs/by-name/pi/pixelorama/package.nix index 16f0a3ed06a3..889306ddd673 100644 --- a/pkgs/by-name/pi/pixelorama/package.nix +++ b/pkgs/by-name/pi/pixelorama/package.nix @@ -19,13 +19,14 @@ }: let + presets = { + "i686-linux" = "Linux 32-bit"; + "x86_64-linux" = "Linux 64-bit"; + "aarch64-linux" = "Linux ARM64"; + }; preset = - if stdenv.isLinux then - if stdenv.is64bit then "Linux 64-bit" else "Linux 32-bit" - else if stdenv.isDarwin then - "macOS" - else - throw "unsupported platform"; + presets.${stdenv.hostPlatform.system} + or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); godot_version_folder = lib.replaceStrings [ "-" ] [ "." ] godot_4.version; in @@ -95,6 +96,7 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "i686-linux" "x86_64-linux" + "aarch64-linux" ]; maintainers = with maintainers; [ felschr ]; mainProgram = "pixelorama"; From 9d8b60c697b7245d477984ab06f1a8943b65232a Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sat, 24 Aug 2024 16:03:45 +0200 Subject: [PATCH 026/298] schemaspy: add passthru.updateScript --- pkgs/development/tools/database/schemaspy/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/database/schemaspy/default.nix b/pkgs/development/tools/database/schemaspy/default.nix index 5e07beaff6f7..e8937c67b186 100644 --- a/pkgs/development/tools/database/schemaspy/default.nix +++ b/pkgs/development/tools/database/schemaspy/default.nix @@ -6,6 +6,7 @@ , fetchFromGitHub , graphviz , ensureNewerSourcesHook +, nix-update-script }: maven.buildMavenPackage rec { @@ -56,6 +57,8 @@ maven.buildMavenPackage rec { --prefix PATH : "$wrappedPath" ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { homepage = "https://schemaspy.org"; description = "Document your database simply and easily"; From eed465da4251973c72cd0bb2aa9fddfec86704c7 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sat, 24 Aug 2024 16:07:31 +0200 Subject: [PATCH 027/298] schemaspy: 6.1.0-SNAPSHOT -> 6.2.4 https://github.com/schemaspy/schemaspy/releases/tag/v6.2.4 https://github.com/schemaspy/schemaspy/compare/v6.1.0...v6.2.4 --- .../tools/database/schemaspy/default.nix | 43 +++++-------------- 1 file changed, 11 insertions(+), 32 deletions(-) diff --git a/pkgs/development/tools/database/schemaspy/default.nix b/pkgs/development/tools/database/schemaspy/default.nix index e8937c67b186..35bf84f28613 100644 --- a/pkgs/development/tools/database/schemaspy/default.nix +++ b/pkgs/development/tools/database/schemaspy/default.nix @@ -2,59 +2,39 @@ , maven , jre , makeWrapper -, git , fetchFromGitHub , graphviz -, ensureNewerSourcesHook , nix-update-script }: maven.buildMavenPackage rec { pname = "schemaspy"; - version = "6.1.1-SNAPSHOT"; + version = "6.2.4"; src = fetchFromGitHub { owner = "schemaspy"; repo = "schemaspy"; - rev = "110b1614f9ae4aec0e4dc4e8f0e7c647274d3af6"; - hash = "sha256-X5B34zGhD/NxcK8TQvwdk1NljGJ1HwfBp47ocbE4HiU="; + rev = "refs/tags/v${version}"; + hash = "sha256-yEqhLpGrJ4hki8o+u+bigVXv+3YvEb8TvHDTYsEl8z4="; }; - mvnParameters = "-Dmaven.test.skip=true"; - mvnFetchExtraArgs = { - nativeBuildInputs = [ - # the build system gets angry if it doesn't see git (even though it's not - # actually in a git repository) - git - maven - ]; - }; - mvnHash = "sha256-1x6cNt6t3FnjRNg8iNYflkyDnuPFXGKoxhVJWoz2jIU="; + mvnParameters = "-Dmaven.test.skip=true -Dmaven.buildNumber.skip=true"; + mvnHash = "sha256-LCPRiY/DDSUnLGnaFUS9PPKnh3TmSyAOqKfEKRLRjpg="; nativeBuildInputs = [ makeWrapper - git - - # springframework boot gets angry about 1970 sources - # fix from https://github.com/nix-community/mavenix/issues/25 - (ensureNewerSourcesHook { year = "1980"; }) ]; - wrappedPath = lib.makeBinPath [ - graphviz - ]; - - preBuild = '' - VERSION=${version} - SEMVER_STR=${version} - ''; - installPhase = '' - install -D target/${pname}-${version}.jar $out/share/java/${pname}-${version}.jar + runHook preInstall + + install -D target/${pname}-${version}-app.jar $out/share/java/${pname}-${version}.jar makeWrapper ${jre}/bin/java $out/bin/schemaspy \ --add-flags "-jar $out/share/java/${pname}-${version}.jar" \ - --prefix PATH : "$wrappedPath" + --prefix PATH : ${lib.makeBinPath [ graphviz ]} + + runHook postInstall ''; passthru.updateScript = nix-update-script { }; @@ -67,4 +47,3 @@ maven.buildMavenPackage rec { maintainers = with maintainers; [ jraygauthier ]; }; } - From 54eab3591479cafb28f17bf9abe99ce964578b0c Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sat, 24 Aug 2024 16:07:44 +0200 Subject: [PATCH 028/298] schemaspy: add anthonyroussel to maintainers --- pkgs/development/tools/database/schemaspy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/database/schemaspy/default.nix b/pkgs/development/tools/database/schemaspy/default.nix index 35bf84f28613..4ec90ebe8e46 100644 --- a/pkgs/development/tools/database/schemaspy/default.nix +++ b/pkgs/development/tools/database/schemaspy/default.nix @@ -44,6 +44,6 @@ maven.buildMavenPackage rec { description = "Document your database simply and easily"; mainProgram = "schemaspy"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ jraygauthier ]; + maintainers = with maintainers; [ jraygauthier anthonyroussel ]; }; } From 79eeb500d69231144d5ac3a65ce2c808e74cae0a Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sat, 24 Aug 2024 16:22:11 +0200 Subject: [PATCH 029/298] schemaspy: reformat and migrate to pkgs/by-name --- .../sc/schemaspy/package.nix} | 24 +++++++++++-------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 14 insertions(+), 12 deletions(-) rename pkgs/{development/tools/database/schemaspy/default.nix => by-name/sc/schemaspy/package.nix} (80%) diff --git a/pkgs/development/tools/database/schemaspy/default.nix b/pkgs/by-name/sc/schemaspy/package.nix similarity index 80% rename from pkgs/development/tools/database/schemaspy/default.nix rename to pkgs/by-name/sc/schemaspy/package.nix index 4ec90ebe8e46..4c5ac81c879a 100644 --- a/pkgs/development/tools/database/schemaspy/default.nix +++ b/pkgs/by-name/sc/schemaspy/package.nix @@ -1,10 +1,11 @@ -{ lib -, maven -, jre -, makeWrapper -, fetchFromGitHub -, graphviz -, nix-update-script +{ + lib, + fetchFromGitHub, + graphviz, + jre, + makeWrapper, + maven, + nix-update-script, }: maven.buildMavenPackage rec { @@ -39,11 +40,14 @@ maven.buildMavenPackage rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { homepage = "https://schemaspy.org"; description = "Document your database simply and easily"; mainProgram = "schemaspy"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ jraygauthier anthonyroussel ]; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ + jraygauthier + anthonyroussel + ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 004007fb0b72..9ede9d2fe2a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18899,8 +18899,6 @@ with pkgs; shellharden = callPackage ../development/tools/shellharden { }; - schemaspy = callPackage ../development/tools/database/schemaspy { }; - scenebuilder = callPackage ../development/tools/scenebuilder { }; scenic-view = callPackage ../development/tools/scenic-view { }; From bf28f8492d3f02f1d71ed85181c0356763d62a19 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Aug 2024 00:34:19 +0000 Subject: [PATCH 030/298] moon: 1.27.6 -> 1.27.10 --- pkgs/development/tools/build-managers/moon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/moon/default.nix b/pkgs/development/tools/build-managers/moon/default.nix index 849724b80148..9c3c2f532308 100644 --- a/pkgs/development/tools/build-managers/moon/default.nix +++ b/pkgs/development/tools/build-managers/moon/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "moon"; - version = "1.27.6"; + version = "1.27.10"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-oadbF1bXDaJPp6R7C6Ozm5NgFPmvPwgiPIDuRiNrWg8="; + hash = "sha256-RAOPF47uUgF8ORECr04YcngWacaKQrMlQaG9YnECVdc="; }; - cargoHash = "sha256-p3CBjdWOutEWIQMWS5nAYAsE9BQf2MViyoLIOD1OE/s="; + cargoHash = "sha256-pQvto1G0XptEaAStbOKd2q4nlt4sKpIYu7K9lqakkTk="; env = { RUSTFLAGS = "-C strip=symbols"; From c575666ce42f3d5c33608cade1c567b726ec2071 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 25 Aug 2024 12:14:06 +0200 Subject: [PATCH 031/298] facter: 4.6.1 -> 4.8.0 https://github.com/puppetlabs/facter/releases/tag/4.8.0 https://github.com/puppetlabs/facter/compare/4.6.1...4.8.0 --- pkgs/by-name/fa/facter/Gemfile.lock | 8 ++++---- pkgs/by-name/fa/facter/gemset.nix | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/fa/facter/Gemfile.lock b/pkgs/by-name/fa/facter/Gemfile.lock index d980285ae0f3..2e80bd9192b4 100644 --- a/pkgs/by-name/fa/facter/Gemfile.lock +++ b/pkgs/by-name/fa/facter/Gemfile.lock @@ -1,11 +1,11 @@ GEM remote: https://rubygems.org/ specs: - facter (4.6.1) + facter (4.8.0) hocon (~> 1.3) - thor (>= 1.0.1, < 2.0) + thor (>= 1.0.1, < 1.3) hocon (1.4.0) - thor (1.3.1) + thor (1.2.2) PLATFORMS ruby @@ -14,4 +14,4 @@ DEPENDENCIES facter BUNDLED WITH - 2.5.6 + 2.5.16 diff --git a/pkgs/by-name/fa/facter/gemset.nix b/pkgs/by-name/fa/facter/gemset.nix index 6f1cf7a2b8b0..2f70d6047e01 100644 --- a/pkgs/by-name/fa/facter/gemset.nix +++ b/pkgs/by-name/fa/facter/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pxpldfcf40dr9khra3sa131ij7gzd97bba2vpw89c785pl736a7"; + sha256 = "1130mzk90pi0y9fnraqqak7gcfg61dhx92axwnhchbpw09akfl09"; type = "gem"; }; - version = "4.6.1"; + version = "4.8.0"; }; hocon = { groups = ["default"]; @@ -25,9 +25,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vq1fjp45az9hfp6fxljhdrkv75cvbab1jfrwcw738pnsiqk8zps"; + sha256 = "0k7j2wn14h1pl4smibasw0bp66kg626drxb59z7rzflch99cd4rg"; type = "gem"; }; - version = "1.3.1"; + version = "1.2.2"; }; } From ef7577e015eb242a71ab19742d8e90e356f89046 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 25 Aug 2024 12:18:29 +0200 Subject: [PATCH 032/298] puppet-bolt: 3.28.0 -> 3.30.0 https://github.com/puppetlabs/bolt/compare/3.28.0...3.30.0 --- pkgs/by-name/pu/puppet-bolt/Gemfile.lock | 79 ++++++----- pkgs/by-name/pu/puppet-bolt/gemset.nix | 159 +++++++++++++++-------- 2 files changed, 147 insertions(+), 91 deletions(-) diff --git a/pkgs/by-name/pu/puppet-bolt/Gemfile.lock b/pkgs/by-name/pu/puppet-bolt/Gemfile.lock index a0156a8912e4..43c5bea6e0b7 100644 --- a/pkgs/by-name/pu/puppet-bolt/Gemfile.lock +++ b/pkgs/by-name/pu/puppet-bolt/Gemfile.lock @@ -5,24 +5,24 @@ GEM base64 nkf rexml - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.899.0) - aws-sdk-core (3.191.4) + aws-partitions (1.968.0) + aws-sdk-core (3.201.5) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.8) + aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) - aws-sdk-ec2 (1.444.0) - aws-sdk-core (~> 3, >= 3.191.0) - aws-sigv4 (~> 1.1) - aws-sigv4 (1.8.0) + aws-sdk-ec2 (1.470.0) + aws-sdk-core (~> 3, >= 3.201.0) + aws-sigv4 (~> 1.5) + aws-sigv4 (1.9.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) - bigdecimal (3.1.7) + bigdecimal (3.1.8) bindata (2.5.0) - bolt (3.28.0) + bolt (3.30.0) CFPropertyList (>= 2.2) addressable (~> 2.5) aws-sdk-ec2 (~> 1) @@ -45,13 +45,13 @@ GEM terminal-table (~> 3.0) winrm (~> 2.0) winrm-fs (~> 1.3) - builder (3.2.4) + builder (3.3.0) colored2 (3.1.2) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.4) connection_pool (2.4.1) - cri (2.15.11) + cri (2.15.12) deep_merge (1.2.2) - erubi (1.12.0) + erubi (1.13.0) facter (4.6.1) hocon (~> 1.3) thor (>= 1.0.1, < 2.0) @@ -73,16 +73,18 @@ GEM faraday-httpclient (1.0.1) faraday-multipart (1.0.4) multipart-post (~> 2) - faraday-net_http (1.0.1) + faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) faraday-retry (1.0.3) faraday_middleware (1.2.0) faraday (~> 1.0) - fast_gettext (2.3.0) - ffi (1.16.3) + fast_gettext (2.4.0) + prime + ffi (1.17.0) forwardable (1.3.3) + getoptlong (0.2.1) gettext (3.4.9) erubi locale (>= 2.0.5) @@ -101,31 +103,33 @@ GEM hiera-eyaml (3.4.0) highline optimist - highline (3.0.1) + highline (3.1.0) + reline hocon (1.4.0) httpclient (2.8.3) + io-console (0.7.2) jmespath (1.6.2) jwt (2.7.1) little-plugger (1.1.4) locale (2.1.4) log4r (1.1.10) - logging (2.3.1) + logging (2.4.0) little-plugger (~> 1.1) multi_json (~> 1.14) - minitar (0.9) + minitar (0.12.1) molinillo (0.8.0) multi_json (1.15.0) - multipart-post (2.4.0) + multipart-post (2.4.1) net-http-persistent (4.0.2) connection_pool (~> 2.2) net-scp (4.0.0) net-ssh (>= 2.6.5, < 8.0.0) - net-ssh (7.2.1) + net-ssh (7.2.3) net-ssh-krb (0.5.1) gssapi (~> 1.3.0) net-ssh (>= 2.0) nkf (0.2.0) - nori (2.7.0) + nori (2.7.1) bigdecimal optimist (3.1.0) orchestrator_client (0.7.0) @@ -134,12 +138,13 @@ GEM prime (0.1.2) forwardable singleton - public_suffix (5.0.4) - puppet (8.5.1) + public_suffix (6.0.1) + puppet (8.8.1) concurrent-ruby (~> 1.0) deep_merge (~> 1.0) facter (>= 4.3.0, < 5) - fast_gettext (>= 2.1, < 3) + fast_gettext (>= 2.1, < 4) + getoptlong (~> 0.2.0) locale (~> 2.1) multi_json (~> 1.13) puppet-resource_api (~> 1.5) @@ -158,7 +163,7 @@ GEM puppetfile-resolver (0.6.3) molinillo (~> 0.6) semantic_puppet (~> 1.0) - r10k (3.16.0) + r10k (3.16.2) colored2 (= 3.1.2) cri (>= 2.15.10) fast_gettext (>= 1.1.0, < 3.0.0) @@ -169,33 +174,39 @@ GEM minitar (~> 0.9) multi_json (~> 1.10) puppet_forge (>= 2.3.0, < 4.0.0) - racc (1.7.3) - rexml (3.2.6) + racc (1.8.1) + reline (0.5.9) + io-console (~> 0.5) + rexml (3.3.6) + strscan rgen (0.9.1) ruby2_keywords (0.0.5) ruby_smb (1.1.0) bindata rubyntlm windows_error - rubyntlm (0.6.3) + rubyntlm (0.6.5) + base64 rubyzip (2.3.2) scanf (1.0.0) semantic_puppet (1.1.0) singleton (0.2.0) + strscan (3.1.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) text (1.3.1) thor (1.3.1) unicode-display_width (2.5.0) windows_error (0.1.5) - winrm (2.3.6) + winrm (2.3.9) builder (>= 2.1.2) erubi (~> 1.8) gssapi (~> 1.2) gyoku (~> 1.0) httpclient (~> 2.2, >= 2.2.0.2) logging (>= 1.6.1, < 3.0) - nori (~> 2.0) + nori (~> 2.0, >= 2.7.1) + rexml (~> 3.0) rubyntlm (~> 0.6.0, >= 0.6.3) winrm-fs (1.3.5) erubi (~> 1.8) @@ -211,4 +222,4 @@ DEPENDENCIES bolt BUNDLED WITH - 2.5.6 + 2.5.16 diff --git a/pkgs/by-name/pu/puppet-bolt/gemset.nix b/pkgs/by-name/pu/puppet-bolt/gemset.nix index df8e2c3fb8ce..72746d92dc0d 100644 --- a/pkgs/by-name/pu/puppet-bolt/gemset.nix +++ b/pkgs/by-name/pu/puppet-bolt/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr"; + sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6"; type = "gem"; }; - version = "2.8.6"; + version = "2.8.7"; }; aws-eventstream = { groups = ["default"]; @@ -25,10 +25,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mydgvc5wn4adsic86907hzyfhgvzaq6nr394pnvk83ryv4zx77p"; + sha256 = "0m74rrlwv741wlp2imw5y93ybrzczx0r2jvcgp1v4zq299z3zy29"; type = "gem"; }; - version = "1.899.0"; + version = "1.968.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; @@ -36,10 +36,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dlalj0pw6nfmmfqddjj8b5rv6lq1hqdq19im3s8fjq5ln5ij8lr"; + sha256 = "0l5c37gvarb3p3zsip1p9mpmir0zdccp0aibgx9cy61im4pwaj0q"; type = "gem"; }; - version = "3.191.4"; + version = "3.201.5"; }; aws-sdk-ec2 = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -47,10 +47,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19gfcb07kvywx9ymdf80k4i3yc61h41cdxnygp7197h92ff4qxhv"; + sha256 = "0z7zk5z9zyqqljh8fxhq8ngp8pixbm85pa9ygpr0nmgdl2b1i7ff"; type = "gem"; }; - version = "1.444.0"; + version = "1.470.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -58,10 +58,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g3w27wzjy4si6kp49w10as6ml6g6zl3xrfqs5ikpfciidv9kpc4"; + sha256 = "0yf396fxashbqn0drbnvd9srxfg7w06v70q8kqpzi04zqchf6lvp"; type = "gem"; }; - version = "1.8.0"; + version = "1.9.1"; }; base64 = { groups = ["default"]; @@ -78,10 +78,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cq1c29zbkcxgdihqisirhcw76xc768z2zpd5vbccpq0l1lv76g7"; + sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558"; type = "gem"; }; - version = "3.1.7"; + version = "3.1.8"; }; bindata = { groups = ["default"]; @@ -99,20 +99,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1abj694v2asrlzpr68shy3whf73ajk6626zqy6mhmyy8qmg8i19h"; + sha256 = "0krs4mmy1db531gyibhzaxmghb606yjmqqyfghvriy7b9sgi6bq8"; type = "gem"; }; - version = "3.28.0"; + version = "3.30.0"; }; builder = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; + sha256 = "0pw3r2lyagsxkm71bf44v5b74f7l9r7di22brbyji9fwz791hya9"; type = "gem"; }; - version = "3.2.4"; + version = "3.3.0"; }; CFPropertyList = { dependencies = ["base64" "nkf" "rexml"]; @@ -140,10 +140,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2"; + sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl"; type = "gem"; }; - version = "1.2.3"; + version = "1.3.4"; }; connection_pool = { groups = ["default"]; @@ -160,10 +160,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bhsgnjav94mz5vf3305gxz1g34gm9kxvnrn1dkz530r8bpj0hr5"; + sha256 = "1rank6i9p2drwdcmhan6ifkzrz1v3mwpx47fwjl75rskxwjfkgwa"; type = "gem"; }; - version = "2.15.11"; + version = "2.15.12"; }; deep_merge = { groups = ["default"]; @@ -180,10 +180,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7"; + sha256 = "0qnd6ff4az22ysnmni3730c41b979xinilahzg86bn7gv93ip9pw"; type = "gem"; }; - version = "1.12.0"; + version = "1.13.0"; }; facter = { dependencies = ["hocon" "thor"]; @@ -263,10 +263,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; + sha256 = "10n6wikd442mfm15hd6gzm0qb527161w1wwch4h5m4iclkz2x6b3"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.2"; }; faraday-net_http_persistent = { groups = ["default"]; @@ -320,24 +320,25 @@ version = "1.2.0"; }; fast_gettext = { + dependencies = ["prime"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "112gsrqah2w03kgi9mjsn6hl74mrwckphf223h36iayc4djf4lq2"; + sha256 = "1gsz2ywvnms7b4w7bs4dg7cykhgx7z74fa7xy0sbw45a0v2c89px"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; ffi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd"; + sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi"; type = "gem"; }; - version = "1.16.3"; + version = "1.17.0"; }; forwardable = { groups = ["default"]; @@ -349,6 +350,16 @@ }; version = "1.3.3"; }; + getoptlong = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "198vy9dxyzibqdbw9jg8p2ljj9iknkyiqlyl229vz55rjxrz08zx"; + type = "gem"; + }; + version = "0.2.1"; + }; gettext = { dependencies = ["erubi" "locale" "prime" "racc" "text"]; groups = ["default"]; @@ -405,14 +416,15 @@ version = "3.4.0"; }; highline = { + dependencies = ["reline"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02ghhvigqbq4252gsi4w8a9klkdkybmbz29ghfp1y6sqzlcb466a"; + sha256 = "1sxqnaz6wvkwbwzsipwsqcg1zw2kn67x7l362whv87zl5133w60l"; type = "gem"; }; - version = "3.0.1"; + version = "3.1.0"; }; hocon = { groups = ["default"]; @@ -434,6 +446,16 @@ }; version = "2.8.3"; }; + io-console = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08d2lx42pa8jjav0lcjbzfzmw61b8imxr9041pva8xzqabrczp7h"; + type = "gem"; + }; + version = "0.7.2"; + }; jmespath = { groups = ["default"]; platforms = []; @@ -490,20 +512,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zflchpx4g8c110gjdcs540bk5a336nq6nmx379rdg56xw0pjd02"; + sha256 = "1jqcq2yxh973f3aw63nd3wxhqyhkncz3pf8v2gs3df0iqair725s"; type = "gem"; }; - version = "2.3.1"; + version = "2.4.0"; }; minitar = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "126mq86x67d1p63acrfka4zx0cx2r0vc93884jggxnrmmnzbxh13"; + sha256 = "0f307mpj4j0gp7iq77xj4p149f4krcvbll9rismng3jcijpbn79s"; type = "gem"; }; - version = "0.9"; + version = "0.12.1"; }; molinillo = { groups = ["default"]; @@ -530,10 +552,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1033p35166d9p97y4vajbbvr13pmkk9zwn7sylxpmk9jrpk8ri67"; + sha256 = "1a5lrlvmg2kb2dhw3lxcsv6x276bwgsxpnka1752082miqxd0wlq"; type = "gem"; }; - version = "2.4.0"; + version = "2.4.1"; }; net-http-persistent = { dependencies = ["connection_pool"]; @@ -562,10 +584,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i01340c4i144vvn3x54lc2rb77ch829qipl1rh6rqwm3yxzml9w"; + sha256 = "0sqbq5aks9xxnldbd2hy20ypnd59zcra98ql0r7jjc26s5rgc18n"; type = "gem"; }; - version = "7.2.1"; + version = "7.2.3"; }; net-ssh-krb = { dependencies = ["gssapi" "net-ssh"]; @@ -594,10 +616,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12wfv36jzc0978ij5c56nnfh5k8ax574njawigs98ysmp1x5s2ql"; + sha256 = "0qb84bbi74q0zgs09sdkq750jf2ri3lblbry0xi4g1ard4rwsrk1"; type = "gem"; }; - version = "2.7.0"; + version = "2.7.1"; }; optimist = { groups = ["default"]; @@ -636,21 +658,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m"; + sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31"; type = "gem"; }; - version = "5.0.4"; + version = "6.0.1"; }; puppet = { - dependencies = ["concurrent-ruby" "deep_merge" "facter" "fast_gettext" "locale" "multi_json" "puppet-resource_api" "scanf" "semantic_puppet"]; + dependencies = ["concurrent-ruby" "deep_merge" "facter" "fast_gettext" "getoptlong" "locale" "multi_json" "puppet-resource_api" "scanf" "semantic_puppet"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dhax5d40c03n0lffy10mvs0c3mgfqq1dsc3gb5ihgb2l1sbs0a7"; + sha256 = "0v2jqkan3nidifxdlpm7lk0ih5s8khl9ps0nz62wj3zlywck0wsi"; type = "gem"; }; - version = "8.5.1"; + version = "8.8.1"; }; puppet-resource_api = { dependencies = ["hocon"]; @@ -702,30 +724,42 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "198bar06xqap19j9y831j98ahd3w4ky2k0klwaa39sa1p6fpcjdi"; + sha256 = "1f9fwfmr44lbnx31fdiabm7sb41nsbf10awm96zl79clp8kafxcp"; type = "gem"; }; - version = "3.16.0"; + version = "3.16.2"; }; racc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; + sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa"; type = "gem"; }; - version = "1.7.3"; + version = "1.8.1"; }; - rexml = { + reline = { + dependencies = ["io-console"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; + sha256 = "0y6kyz7kcilwdpfy3saqfgnar38vr5ys9sp40ndffy6h1znxfbax"; type = "gem"; }; - version = "3.2.6"; + version = "0.5.9"; + }; + rexml = { + dependencies = ["strscan"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ik3in0957l9s6iwdm3nsk4za072cj27riiqgpx6zzcd22flbw3s"; + type = "gem"; + }; + version = "3.3.6"; }; rgen = { groups = ["default"]; @@ -759,14 +793,15 @@ version = "1.1.0"; }; rubyntlm = { + dependencies = ["base64"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b8hczk8hysv53ncsqzx4q6kma5gy5lqc7s5yx8h64x3vdb18cjv"; + sha256 = "1x8l0d1v88m40mby4jvgal46137cv8gga2lk7zlrxqlsp41380a7"; type = "gem"; }; - version = "0.6.3"; + version = "0.6.5"; }; rubyzip = { groups = ["default"]; @@ -808,6 +843,16 @@ }; version = "0.2.0"; }; + strscan = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01"; + type = "gem"; + }; + version = "3.1.0"; + }; terminal-table = { dependencies = ["unicode-display_width"]; groups = ["default"]; @@ -860,15 +905,15 @@ version = "0.1.5"; }; winrm = { - dependencies = ["builder" "erubi" "gssapi" "gyoku" "httpclient" "logging" "nori" "rubyntlm"]; + dependencies = ["builder" "erubi" "gssapi" "gyoku" "httpclient" "logging" "nori" "rexml" "rubyntlm"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nxf6a47d1xf1nvi7rbfbzjyyjhz0iakrnrsr2hj6y24a381sd8i"; + sha256 = "01jxpshw5kx5ha21ymaaj14vibv5bvm0dd80ccc6xl3jaxy7cszg"; type = "gem"; }; - version = "2.3.6"; + version = "2.3.9"; }; winrm-fs = { dependencies = ["erubi" "logging" "rubyzip" "winrm"]; From 0a8012c84abb9a73db59c54a73273247d8e1006b Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 25 Aug 2024 12:20:00 +0200 Subject: [PATCH 033/298] r10k: 4.0.1 -> 4.1.0 https://github.com/puppetlabs/r10k/compare/4.0.1...4.1.0 --- pkgs/by-name/r1/r10k/Gemfile.lock | 31 ++++++++------- pkgs/by-name/r1/r10k/gemset.nix | 64 +++++++++++++++++++++---------- 2 files changed, 61 insertions(+), 34 deletions(-) diff --git a/pkgs/by-name/r1/r10k/Gemfile.lock b/pkgs/by-name/r1/r10k/Gemfile.lock index 2fa564f46cbd..e82d217dbf37 100644 --- a/pkgs/by-name/r1/r10k/Gemfile.lock +++ b/pkgs/by-name/r1/r10k/Gemfile.lock @@ -1,16 +1,19 @@ GEM remote: https://rubygems.org/ specs: + base64 (0.2.0) colored2 (3.1.2) - cri (2.15.11) - erubi (1.12.0) - faraday (2.9.0) + cri (2.15.12) + erubi (1.13.0) + faraday (2.10.1) faraday-net_http (>= 2.0, < 3.2) + logger faraday-follow_redirects (0.3.0) faraday (>= 1, < 3) - faraday-net_http (3.1.0) + faraday-net_http (3.1.1) net-http - fast_gettext (2.3.0) + fast_gettext (2.4.0) + prime forwardable (1.3.3) gettext (3.4.9) erubi @@ -22,31 +25,33 @@ GEM fast_gettext (~> 2.1) gettext (~> 3.4) locale - jwt (2.7.1) + jwt (2.8.2) + base64 locale (2.1.4) log4r (1.1.10) - minitar (0.9) + logger (1.6.0) + minitar (0.12.1) multi_json (1.15.0) net-http (0.4.1) uri prime (0.1.2) forwardable singleton - puppet_forge (5.0.3) + puppet_forge (5.0.4) faraday (~> 2.0) faraday-follow_redirects (~> 0.3.0) - minitar + minitar (< 1.0.0) semantic_puppet (~> 1.0) - r10k (4.0.1) + r10k (4.1.0) colored2 (= 3.1.2) cri (>= 2.15.10) gettext-setup (>= 0.24, < 2.0) - jwt (>= 2.2.3, < 2.8.0) + jwt (>= 2.2.3, < 3) log4r (= 1.1.10) minitar (~> 0.9) multi_json (~> 1.10) puppet_forge (>= 4.1, < 6) - racc (1.7.3) + racc (1.8.1) semantic_puppet (1.1.0) singleton (0.2.0) text (1.3.1) @@ -59,4 +64,4 @@ DEPENDENCIES r10k BUNDLED WITH - 2.5.6 + 2.5.16 diff --git a/pkgs/by-name/r1/r10k/gemset.nix b/pkgs/by-name/r1/r10k/gemset.nix index d00446690566..dc0e87c20aea 100644 --- a/pkgs/by-name/r1/r10k/gemset.nix +++ b/pkgs/by-name/r1/r10k/gemset.nix @@ -1,4 +1,14 @@ { + base64 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; + type = "gem"; + }; + version = "0.2.0"; + }; colored2 = { groups = ["default"]; platforms = []; @@ -14,31 +24,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bhsgnjav94mz5vf3305gxz1g34gm9kxvnrn1dkz530r8bpj0hr5"; + sha256 = "1rank6i9p2drwdcmhan6ifkzrz1v3mwpx47fwjl75rskxwjfkgwa"; type = "gem"; }; - version = "2.15.11"; + version = "2.15.12"; }; erubi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7"; + sha256 = "0qnd6ff4az22ysnmni3730c41b979xinilahzg86bn7gv93ip9pw"; type = "gem"; }; - version = "1.12.0"; + version = "1.13.0"; }; faraday = { - dependencies = ["faraday-net_http"]; + dependencies = ["faraday-net_http" "logger"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qqb1rmk0f9m82iijjlqadh5yby1bhnr6svjk9vxdvh6f181988s"; + sha256 = "104s7n9505488p923cs0pl3jlgn4naam28clkm2885hrysizpjbb"; type = "gem"; }; - version = "2.9.0"; + version = "2.10.1"; }; faraday-follow_redirects = { dependencies = ["faraday"]; @@ -57,20 +67,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17w51yk4rrm9rpnbc3x509s619kba0jga3qrj4b17l30950vw9qn"; + sha256 = "0f49frpfdr8czwm2mjkfny4pini6fy49b6hamw4jrppl4vsg14ys"; type = "gem"; }; - version = "3.1.0"; + version = "3.1.1"; }; fast_gettext = { + dependencies = ["prime"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "112gsrqah2w03kgi9mjsn6hl74mrwckphf223h36iayc4djf4lq2"; + sha256 = "1gsz2ywvnms7b4w7bs4dg7cykhgx7z74fa7xy0sbw45a0v2c89px"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; forwardable = { groups = ["default"]; @@ -105,14 +116,15 @@ version = "1.1.0"; }; jwt = { + dependencies = ["base64"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16z11alz13vfc4zs5l3fk6n51n2jw9lskvc4h4prnww0y797qd87"; + sha256 = "04mw326i9vsdcqwm4bf0zvnqw237f8l7022nhlbmak92bqqpg62s"; type = "gem"; }; - version = "2.7.1"; + version = "2.8.2"; }; locale = { groups = ["default"]; @@ -134,15 +146,25 @@ }; version = "1.1.10"; }; + logger = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gpg8gzi0xwymw4aaq2iafcbx31i3xzkg3fb30mdxn1d4qhc3dqa"; + type = "gem"; + }; + version = "1.6.0"; + }; minitar = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "126mq86x67d1p63acrfka4zx0cx2r0vc93884jggxnrmmnzbxh13"; + sha256 = "0f307mpj4j0gp7iq77xj4p149f4krcvbll9rismng3jcijpbn79s"; type = "gem"; }; - version = "0.9"; + version = "0.12.1"; }; multi_json = { groups = ["default"]; @@ -182,10 +204,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "168w15y5rnsm6wspqxn0wg543r89cbajc8wky0sg9vzpgpr27176"; + sha256 = "0d65zri1nmpph8iki5iigdzfqd6rfyc1mlgdfhg69q3566rcff06"; type = "gem"; }; - version = "5.0.3"; + version = "5.0.4"; }; r10k = { dependencies = ["colored2" "cri" "gettext-setup" "jwt" "log4r" "minitar" "multi_json" "puppet_forge"]; @@ -193,20 +215,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g7bx9k112mnxpnasj59zaz2c7x51ia856b5q41kfr3i9y2q3k78"; + sha256 = "0k3fr2f0pwyrabs12wqig31f37sqrqs8qza7jrn01d6blvhvkrb4"; type = "gem"; }; - version = "4.0.1"; + version = "4.1.0"; }; racc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; + sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa"; type = "gem"; }; - version = "1.7.3"; + version = "1.8.1"; }; semantic_puppet = { groups = ["default"]; From f08553d2f90e1aa80408579afa52ad8ab04bcb83 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 25 Aug 2024 12:25:37 +0200 Subject: [PATCH 034/298] jetty_11: 11.0.22 -> 11.0.23 https://github.com/jetty/jetty.project/releases/tag/jetty-11.0.23 --- pkgs/servers/http/jetty/11.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/jetty/11.x.nix b/pkgs/servers/http/jetty/11.x.nix index e19e1b4dc130..144085433bb8 100644 --- a/pkgs/servers/http/jetty/11.x.nix +++ b/pkgs/servers/http/jetty/11.x.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "11.0.22"; - hash = "sha256-afFuUZ1csDuE60m+WKMriU/wObBZleTORLOCFU8qcJk="; + version = "11.0.23"; + hash = "sha256-ISsDetefL9ow5aZ7vcSG1BgGwBO0FtDrd741mi8ORiY="; } From b409a1c3bd334bb8940e024a611abe1f823ae9c7 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 25 Aug 2024 12:25:50 +0200 Subject: [PATCH 035/298] jetty_12: 12.0.11 -> 12.0.12 https://github.com/jetty/jetty.project/releases/tag/jetty-12.0.12 --- pkgs/servers/http/jetty/12.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/jetty/12.x.nix b/pkgs/servers/http/jetty/12.x.nix index 0bbcb76e03a3..a7039fa48932 100644 --- a/pkgs/servers/http/jetty/12.x.nix +++ b/pkgs/servers/http/jetty/12.x.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "12.0.11"; - hash = "sha256-5fZMHb2ZpkoAFY/v124F+99Kq9vZypSYrG8QmQ/RK6k="; + version = "12.0.12"; + hash = "sha256-CFdVT+AYK2KvXRzqMtTLz89BsXSuPolv+2u8EbTsil4="; } From ecf6cfcbc188e20a8461c9498a20d1b7811f5be6 Mon Sep 17 00:00:00 2001 From: Roland Coeurjoly Date: Sun, 25 Aug 2024 17:25:20 +0200 Subject: [PATCH 036/298] apt-offline: substitute --replace with --replace-fail --- pkgs/by-name/ap/apt-offline/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ap/apt-offline/package.nix b/pkgs/by-name/ap/apt-offline/package.nix index 124aadf1acb2..ba34dec6c0f8 100644 --- a/pkgs/by-name/ap/apt-offline/package.nix +++ b/pkgs/by-name/ap/apt-offline/package.nix @@ -23,10 +23,10 @@ python3Packages.buildPythonApplication { postPatch = '' substituteInPlace org.debian.apt.aptoffline.policy \ - --replace /usr/bin/ "$out/bin" + --replace-fail /usr/bin/ "$out/bin" substituteInPlace apt_offline_core/AptOfflineCoreLib.py \ - --replace /usr/bin/gpgv "${lib.getBin gnupg}/bin/gpgv" + --replace-fail /usr/bin/gpgv "${lib.getBin gnupg}/bin/gpgv" ''; postInstall = '' From f4c63df33c8e8e7ca5df9a6b1185400a1fcb0c8b Mon Sep 17 00:00:00 2001 From: Roland Coeurjoly Date: Sun, 25 Aug 2024 17:55:08 +0200 Subject: [PATCH 037/298] backgroundremover: substitute --replace with --replace-fail --- pkgs/by-name/ba/backgroundremover/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ba/backgroundremover/package.nix b/pkgs/by-name/ba/backgroundremover/package.nix index 3ee27b692393..1d16ec2071a7 100644 --- a/pkgs/by-name/ba/backgroundremover/package.nix +++ b/pkgs/by-name/ba/backgroundremover/package.nix @@ -29,7 +29,7 @@ let postPatch = '' substituteInPlace backgroundremover/bg.py backgroundremover/u2net/detect.py \ - --replace 'os.path.expanduser(os.path.join("~", ".u2net", model_name + ".pth"))' "os.path.join(\"$models\", model_name + \".pth\")" + --replace-fail 'os.path.expanduser(os.path.join("~", ".u2net", model_name + ".pth"))' "os.path.join(\"$models\", model_name + \".pth\")" ''; nativeBuildInputs = [ p.setuptools p.wheel ]; From 9496aef133a55ecb9a6d9464e16e43234291926a Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 26 Aug 2024 14:03:50 +0200 Subject: [PATCH 038/298] eiquadprog: init at v1.2.9 --- pkgs/by-name/ei/eiquadprog/package.nix | 38 ++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 pkgs/by-name/ei/eiquadprog/package.nix diff --git a/pkgs/by-name/ei/eiquadprog/package.nix b/pkgs/by-name/ei/eiquadprog/package.nix new file mode 100644 index 000000000000..9380e7f9d2bf --- /dev/null +++ b/pkgs/by-name/ei/eiquadprog/package.nix @@ -0,0 +1,38 @@ +{ + boost, + cmake, + eigen, + fetchFromGitHub, + jrl-cmakemodules, + lib, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "eiquadprog"; + version = "1.2.9"; + + src = fetchFromGitHub { + owner = "stack-of-tasks"; + repo = "eiquadprog"; + rev = "v${finalAttrs.version}"; + hash = "sha256-VqRx06sCCZrnB+NWm6Z9OMKzjKQIydGgKQU6fMY7phk="; + }; + + nativeBuildInputs = [ + cmake + jrl-cmakemodules + ]; + propagatedBuildInputs = [ eigen ]; + checkInputs = [ boost ]; + + doCheck = true; + + meta = { + description = "C++ reimplementation of eiquadprog"; + homepage = "https://github.com/stack-of-tasks/eiquadprog"; + changelog = "https://github.com/stack-of-tasks/eiquadprog/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ nim65s ]; + }; +}) From ee544db326ce1355f4807485a19f9265a8ed39a3 Mon Sep 17 00:00:00 2001 From: Arseniy Zorin Date: Mon, 26 Aug 2024 19:50:11 +0300 Subject: [PATCH 039/298] temporal-cli: tctl-next: 0.13.1 -> 1.0.0 --- .../networking/cluster/temporal-cli/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/temporal-cli/default.nix b/pkgs/applications/networking/cluster/temporal-cli/default.nix index e25092409c6f..3e36eda8e6b2 100644 --- a/pkgs/applications/networking/cluster/temporal-cli/default.nix +++ b/pkgs/applications/networking/cluster/temporal-cli/default.nix @@ -17,16 +17,16 @@ let tctl-next = buildGoModule rec { pname = "tctl-next"; - version = "0.13.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "temporalio"; repo = "cli"; rev = "v${version}"; - hash = "sha256-bh0UsXA5yHtvP9femOwEzVzmu1VLz2uZwoIHL/kI7kM="; + hash = "sha256-y0C2z2iMMQSG5+xGngZ98+ixIgbvaQxPdAWuPbEbBAY="; }; - vendorHash = "sha256-ziCJG722c32QAh9QmoC2E7TcLiC2InKwfdC9mkanTsU="; + vendorHash = "sha256-zhGqDHdVGg7eGnw5L3eSyXKBTjp85ir5zrtf7HbXmC0="; inherit overrideModAttrs; @@ -37,7 +37,7 @@ let ldflags = [ "-s" "-w" - "-X github.com/temporalio/cli/headers.Version=${version}" + "-X github.com/temporalio/cli/temporalcli.Version=${version}" ]; # Tests fail with x86 on macOS Rosetta 2 From 4fd353c08facc5b04a883a37c63e0de88e1db4eb Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Mon, 26 Aug 2024 17:36:13 -0400 Subject: [PATCH 040/298] yarg: init at 0.12.6 --- pkgs/by-name/ya/yarg/package.nix | 126 +++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) create mode 100644 pkgs/by-name/ya/yarg/package.nix diff --git a/pkgs/by-name/ya/yarg/package.nix b/pkgs/by-name/ya/yarg/package.nix new file mode 100644 index 000000000000..47c179af860f --- /dev/null +++ b/pkgs/by-name/ya/yarg/package.nix @@ -0,0 +1,126 @@ +{ + lib, + stdenv, + fetchzip, + autoPatchelfHook, + alsa-lib, + gtk3, + zlib, + dbus, + hidapi, + libGL, + libXcursor, + libXext, + libXi, + libXinerama, + libxkbcommon, + libXrandr, + libXScrnSaver, + libXxf86vm, + udev, + vulkan-loader, + wayland, # (not used by default, enable with SDL_VIDEODRIVER=wayland - doesn't support HiDPI) + makeDesktopItem, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "yarg"; + version = "0.12.6"; + + src = fetchzip { + url = "https://github.com/YARC-Official/YARG/releases/download/v${finalAttrs.version}/YARG_v${finalAttrs.version}-Linux-x86_64.zip"; + stripRoot = false; + hash = "sha256-Za+CnuSTfJZVdW0pWvGDnKcbhZsgtNPRWYj1qOA8+Zs="; + }; + + nativeBuildInputs = [ autoPatchelfHook ]; + + buildInputs = [ + # Load-time libraries (loaded from DT_NEEDED section in ELF binary) + alsa-lib + gtk3 + stdenv.cc.cc.lib + zlib + + # Run-time libraries (loaded with dlopen) + dbus + hidapi + libGL + libXcursor + libXext + libXi + libXinerama + libxkbcommon + libXrandr + libXScrnSaver + libXxf86vm + udev + vulkan-loader + wayland + ]; + + desktopItem = makeDesktopItem { + name = "yarg"; + desktopName = "YARG"; + comment = finalAttrs.meta.description; + icon = "yarg"; + exec = "yarg"; + categories = [ "Game" ]; + }; + + installPhase = '' + runHook preInstall + + install -Dm755 YARG "$out/bin/yarg" + install -Dm644 UnityPlayer.so "$out/libexec/yarg/UnityPlayer.so" + + mkdir -p "$out/share/pixmaps" + cp -r YARG_Data "$out/share/yarg" + ln -s "$out/share/yarg" "$out/bin/yarg_Data" + ln -s "$out/share/yarg/Resources/UnityPlayer.png" "$out/share/pixmaps/yarg.png" + install -Dm644 "$desktopItem/share/applications/yarg.desktop" "$out/share/applications/yarg.desktop" + + runHook postInstall + ''; + + # Patch required run-time libraries as load-time libraries + # + # Libraries found with: + # > strings UnityPlayer.so | grep '\.so' + # and: + # > LD_DEBUG=libs yarg + postFixup = '' + patchelf \ + --add-needed libasound.so.2 \ + --add-needed libdbus-1.so.3 \ + --add-needed libGL.so.1 \ + --add-needed libhidapi-hidraw.so.0 \ + --add-needed libpthread.so.0 \ + --add-needed libudev.so.1 \ + --add-needed libvulkan.so.1 \ + --add-needed libwayland-client.so.0 \ + --add-needed libwayland-cursor.so.0 \ + --add-needed libwayland-egl.so.1 \ + --add-needed libX11.so.6 \ + --add-needed libXcursor.so.1 \ + --add-needed libXext.so.6 \ + --add-needed libXi.so.6 \ + --add-needed libXinerama.so.1 \ + --add-needed libxkbcommon.so.0 \ + --add-needed libXrandr.so.2 \ + --add-needed libXss.so.1 \ + --add-needed libXxf86vm.so.1 \ + "$out/libexec/yarg/UnityPlayer.so" + ''; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Free, open-source, plastic guitar game"; + homepage = "https://yarg.in"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ kira-bruneau ]; + platforms = [ "x86_64-linux" ]; + }; +}) From 689d25d9638a45644ba5ad24e075a6e39e293ca4 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 26 Aug 2024 14:57:32 +0200 Subject: [PATCH 041/298] osqp-eigen: init at 0.8.1 --- pkgs/by-name/os/osqp-eigen/package.nix | 44 ++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 pkgs/by-name/os/osqp-eigen/package.nix diff --git a/pkgs/by-name/os/osqp-eigen/package.nix b/pkgs/by-name/os/osqp-eigen/package.nix new file mode 100644 index 000000000000..935bb0bfa659 --- /dev/null +++ b/pkgs/by-name/os/osqp-eigen/package.nix @@ -0,0 +1,44 @@ +{ + catch2, + cmake, + eigen, + fetchFromGitHub, + lib, + osqp, + stdenv, + valgrind, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "osqp-eigen"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "robotology"; + repo = "osqp-eigen"; + rev = "v${finalAttrs.version}"; + hash = "sha256-mN9oU+qXm+Kob8M4rtxv4qNSbXlFCqpN+s8dHedU8Mo="; + }; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_TESTING" true) + (lib.cmakeBool "OSQPEIGEN_RUN_Valgrind_tests" stdenv.isLinux) + ]; + + nativeBuildInputs = [ cmake ]; + propagatedBuildInputs = [ + eigen + osqp + ]; + checkInputs = [ catch2 ]; + nativeCheckInputs = lib.optional stdenv.isLinux valgrind; + + doCheck = true; + + meta = { + description = "Simple Eigen-C++ wrapper for OSQP library"; + homepage = "https://github.com/robotology/osqp-eigen"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ nim65s ]; + }; +}) From 396d1f10e642cafbdff950321dcb0b817a71b873 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 27 Aug 2024 01:11:10 +0200 Subject: [PATCH 042/298] tsid: init at 1.7.1 --- pkgs/by-name/ts/tsid/package.nix | 66 ++++++++++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 5 +++ 2 files changed, 71 insertions(+) create mode 100644 pkgs/by-name/ts/tsid/package.nix diff --git a/pkgs/by-name/ts/tsid/package.nix b/pkgs/by-name/ts/tsid/package.nix new file mode 100644 index 000000000000..054857f8b222 --- /dev/null +++ b/pkgs/by-name/ts/tsid/package.nix @@ -0,0 +1,66 @@ +{ + cmake, + doxygen, + eiquadprog, + fetchFromGitHub, + lib, + osqp-eigen, + pkg-config, + pinocchio, + proxsuite, + stdenv, + pythonSupport ? false, + python3Packages, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "tsid"; + version = "1.7.1"; + + src = fetchFromGitHub { + owner = "stack-of-tasks"; + repo = "tsid"; + rev = "v${finalAttrs.version}"; + hash = "sha256-id6OCOX01o41Z5kqzwvjYa5uoQZtzhRaFBuOBhbLcTA="; + }; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport) + (lib.cmakeBool "BUILD_WITH_OSQP" true) + (lib.cmakeBool "BUILD_WITH_PROXQP" true) + (lib.cmakeBool "INSTALL_DOCUMENTATION" true) + ]; + + outputs = [ + "doc" + "out" + ]; + + nativeBuildInputs = [ + doxygen + cmake + pkg-config + ] ++ lib.optional pythonSupport python3Packages.python; + + propagatedBuildInputs = + [ + eiquadprog + osqp-eigen + proxsuite + ] + ++ lib.optional (!pythonSupport) pinocchio ++ lib.optional pythonSupport python3Packages.pinocchio; + + doCheck = true; + # pythonImportsCheck, but in stdenv.mkDerivation + postInstall = lib.optionalString pythonSupport '' + PYTHONPATH=$out/${python3Packages.python.sitePackages}:$PYTHONPATH + python -c "import tsid" + ''; + + meta = { + description = "Efficient Task Space Inverse Dynamics (TSID) based on Pinocchio"; + homepage = "https://github.com/stack-of-tasks/tsid"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ nim65s ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f717a160919e..ad6482df0a21 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16030,6 +16030,11 @@ self: super: with self; { tsfresh = callPackage ../development/python-modules/tsfresh { }; + tsid = toPythonModule (pkgs.tsid.override { + pythonSupport = true; + python3Packages = self; + }); + tskit = callPackage ../development/python-modules/tskit { }; ttach = callPackage ../development/python-modules/ttach { }; From 5ab41fbc81f9e154cdc36def5420e079e89b72c8 Mon Sep 17 00:00:00 2001 From: goatastronaut0212 Date: Tue, 27 Aug 2024 08:07:24 +0700 Subject: [PATCH 043/298] unciv: 4.13.0-patch1 -> 4.13.2-redo --- pkgs/by-name/un/unciv/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/un/unciv/package.nix b/pkgs/by-name/un/unciv/package.nix index 4b93afa1c5c7..ff72272c6c53 100644 --- a/pkgs/by-name/un/unciv/package.nix +++ b/pkgs/by-name/un/unciv/package.nix @@ -10,6 +10,8 @@ , libXxf86vm }: let + version = "4.13.2-redo"; + desktopItem = makeDesktopItem { name = "unciv"; exec = "unciv"; @@ -20,7 +22,7 @@ let }; desktopIcon = fetchurl { - url = "https://github.com/yairm210/Unciv/blob/4.13.0-patch1/extraImages/Icons/Unciv%20icon%20v6.png?raw=true"; + url = "https://github.com/yairm210/Unciv/blob/${version}/extraImages/Icons/Unciv%20icon%20v6.png?raw=true"; hash = "sha256-Zuz+HGfxjGviGBKTiHdIFXF8UMRLEIfM8f+LIB/xonk="; }; @@ -33,7 +35,7 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "4.13.0-patch1"; + inherit version; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; From 045f6925423ff98ce43c669fc8145db3e5cdcf97 Mon Sep 17 00:00:00 2001 From: mksafavi Date: Wed, 3 Jul 2024 20:00:14 +0330 Subject: [PATCH 044/298] lms: 3.51.1 -> 3.56.0 --- pkgs/by-name/lm/lms/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lm/lms/package.nix b/pkgs/by-name/lm/lms/package.nix index 778414a5db32..1fac7a82299e 100644 --- a/pkgs/by-name/lm/lms/package.nix +++ b/pkgs/by-name/lm/lms/package.nix @@ -16,16 +16,17 @@ zlib, libSM, libICE, + stb, }: stdenv.mkDerivation rec { pname = "lms"; - version = "3.51.1"; + version = "3.56.0"; src = fetchFromGitHub { owner = "epoupon"; repo = "lms"; rev = "v${version}"; - hash = "sha256-5lEbrB218EVVHIzo1efvQYybut2OpfDKpLlRs0brhXg="; + hash = "sha256-o/wgh/PtFcTOmfl5H1cc1cTsWFvEnVQYhh4hPTnLNMU="; }; strictDeps = true; @@ -46,6 +47,7 @@ stdenv.mkDerivation rec { zlib libSM libICE + stb ]; postPatch = '' From 6b0fbdd01c541a6cb5b5515a00a8e1e44b29e4e8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Aug 2024 04:46:58 +0000 Subject: [PATCH 045/298] python312Packages.xdoctest: 1.1.6 -> 1.2.0 --- pkgs/development/python-modules/xdoctest/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/xdoctest/default.nix b/pkgs/development/python-modules/xdoctest/default.nix index 7965d1db3efa..db4865f48e29 100644 --- a/pkgs/development/python-modules/xdoctest/default.nix +++ b/pkgs/development/python-modules/xdoctest/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, setuptools, wheel, pytestCheckHook, @@ -10,16 +9,14 @@ buildPythonPackage rec { pname = "xdoctest"; - version = "1.1.6"; + version = "1.2.0"; pyproject = true; - disabled = pythonOlder "3.6"; - src = fetchFromGitHub { owner = "Erotemic"; repo = "xdoctest"; rev = "refs/tags/v${version}"; - hash = "sha256-L/RtD/e0ubW3j4623HQGfowXQYZjl7dDfwwbfxm3ll8="; + hash = "sha256-1c3wnQ30J2OfnBffzGfPPt9St8VpLGmFGbifzbw+cOc="; }; nativeBuildInputs = [ From 35409608ea3dd64e7cb4abecee8ebf8b5167cfbb Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Tue, 27 Aug 2024 15:41:24 +0200 Subject: [PATCH 046/298] google-amber: 2023-09-02 -> 2024-08-21 Update amber to get support for some newer extensions. Also add a test that runs with lavapipe. --- pkgs/tools/graphics/amber/default.nix | 74 ++++++++++++++++++++++----- 1 file changed, 60 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/graphics/amber/default.nix b/pkgs/tools/graphics/amber/default.nix index 9c9a43a49be4..0d86e5c75bfb 100644 --- a/pkgs/tools/graphics/amber/default.nix +++ b/pkgs/tools/graphics/amber/default.nix @@ -4,17 +4,20 @@ , pkg-config , cctools , makeWrapper +, mesa , python3 +, runCommand , vulkan-headers , vulkan-loader , vulkan-validation-layers }: let + # From https://github.com/google/amber/blob/main/DEPS glslang = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "81cc10a498b25a90147cccd6e8939493c1e9e20e"; - hash = "sha256-jTOxZ1nU7kvtdWjPzyIp/5ZeKw3JtYyqhlFeIE7CyX8="; + rev = "e8dd0b6903b34f1879520b444634c75ea2deedf5"; + hash = "sha256-B6jVCeoFjd2H6+7tIses+Kj8DgHS6E2dkVzQAIzDHEc="; }; lodepng = fetchFromGitHub { @@ -27,34 +30,34 @@ let shaderc = fetchFromGitHub { owner = "google"; repo = "shaderc"; - rev = "e72186b66bb90ed06aaf15cbdc9a053581a0616b"; - hash = "sha256-hd1IGsWksgAfB8Mq5yZOzSyNGxXsCJxb350pD/Gcskk="; + rev = "f59f0d11b80fd622383199c867137ededf89d43b"; + hash = "sha256-kHz8Io5GZDWv1FjPyBWRpnKhGygKhSU4L9zl/AKXZlU="; }; spirv-headers = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "d13b52222c39a7e9a401b44646f0ca3a640fbd47"; - hash = "sha256-bjiWGSmpEbydXtCLP8fRZfPBvdCzBoJxKXTx3BroQbg="; + rev = "5e3ad389ee56fca27c9705d093ae5387ce404df4"; + hash = "sha256-gjF5mVTXqU/GZzr2S6oKGChgvqqHcQSrEq/ePP2yJys="; }; spirv-tools = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "d87f61605b3647fbceae9aaa922fce0031afdc63"; - hash = "sha256-lB2i6wjehIFDOQdIPUvCy3zzcnJSsR5vNawPhGmb0es="; + rev = "9241a58a8028c49510bc174b6c970e3c2b4b8e51"; + hash = "sha256-0qHUpwNDJI2jV4h68QaTNPIwTPxwTt0iAUnMXqFCiJE="; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "amber"; - version = "unstable-2023-09-02"; + version = "unstable-2024-08-21"; src = fetchFromGitHub { owner = "google"; - repo = pname; - rev = "8e90b2d2f532bcd4a80069e3f37a9698209a21bc"; - hash = "sha256-LuNCND/NXoNbbTWv7RYQUkq2QXL1qXR27uHwFIz0DXg="; + repo = "amber"; + rev = "66399a35927606a435bf7a59756e87e6cb5a0013"; + hash = "sha256-PCO64zI/vzp4HyGz5WpeYpCBeaWjTvz1punWsTz1yiM="; }; buildInputs = [ @@ -92,10 +95,53 @@ stdenv.mkDerivation rec { --suffix VK_LAYER_PATH : ${vulkan-validation-layers}/share/vulkan/explicit_layer.d ''; + passthru.tests.lavapipe = runCommand "vulkan-cts-tests-lavapipe" { + nativeBuildInputs = [ finalAttrs.finalPackage mesa.llvmpipeHook ]; + } '' + cat > test.amber < SIZE 524288 FILL 0 + + PIPELINE compute kComputePipeline + ATTACH kComputeShader + BIND BUFFER kComputeBuffer AS storage DESCRIPTOR_SET 0 BINDING 3 + END # pipeline + + RUN kComputePipeline 256 256 1 + + # Four corners + EXPECT kComputeBuffer IDX 0 EQ 0 0 + EXPECT kComputeBuffer IDX 2040 EQ 255 0 + EXPECT kComputeBuffer IDX 522240 EQ 0 255 + EXPECT kComputeBuffer IDX 524280 EQ 255 255 + + # Center + EXPECT kComputeBuffer IDX 263168 EQ 128 128 + EOF + + amber test.amber + touch $out + ''; + meta = with lib; { description = "Multi-API shader test framework"; homepage = "https://github.com/google/amber"; license = licenses.asl20; maintainers = with maintainers; [ Flakebi ]; }; -} +}) From b0a59de1746ada067f545abe733a2d973d75b68b Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Tue, 27 Aug 2024 17:43:15 +0200 Subject: [PATCH 047/298] rgp: 2.1 -> 2.2 Version 2.2 was released: https://github.com/GPUOpen-Tools/radeon_gpu_profiler/releases/tag/v2.2 Qt was updated and supports wayland now (yay). Capturing and looking at the capture worked for me. --- pkgs/development/tools/rgp/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/rgp/default.nix b/pkgs/development/tools/rgp/default.nix index 96d938ad2040..4e9f750520f9 100644 --- a/pkgs/development/tools/rgp/default.nix +++ b/pkgs/development/tools/rgp/default.nix @@ -18,19 +18,20 @@ , libXi , libxkbcommon , ncurses +, wayland , zlib }: let - buildNum = "2024-04-18-1396"; + buildNum = "2024-06-26-1341"; in stdenv.mkDerivation { pname = "rgp"; - version = "2.1"; + version = "2.2"; src = fetchurl { url = "https://gpuopen.com/download/radeon-developer-tool-suite/RadeonDeveloperToolSuite-${buildNum}.tgz"; - hash = "sha256-mP5tmq252IsWYVRGNKVib8ZbM5M4srUKXJ3x2ff4YhM="; + hash = "sha256-mpm4hxWyunq6Z6kdSuk4jqnYOTuLFVe+XzXZvHJPf/Q="; }; nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; @@ -51,6 +52,7 @@ stdenv.mkDerivation { libXi libxkbcommon ncurses + wayland zlib ]; @@ -65,13 +67,11 @@ stdenv.mkDerivation { # makeWrapper is needed so that executables are started from the opt # directory, where qt.conf and other tools are. # Unset Qt theme, it does not work if the nixos Qt version is different from the packaged one. - # The packaged Qt version only supports X11, so enforce that. makeWrapper \ $out/opt/rgp/$prog \ $out/bin/$prog \ --unset QT_QPA_PLATFORMTHEME \ --unset QT_STYLE_OVERRIDE \ - --set QT_QPA_PLATFORM xcb \ --prefix LD_LIBRARY_PATH : $out/opt/rgp/lib done ''; From 8e567281727dbc90a1d844554a90f55b7ba84160 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 Aug 2024 11:37:50 +0000 Subject: [PATCH 048/298] zoom-us: 6.1.10.1400 -> 6.1.11.1545 --- .../instant-messengers/zoom-us/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index a5cf1a8b39c2..230825c93564 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -48,23 +48,23 @@ let # and often with different versions. We write them on three lines # like this (rather than using {}) so that the updater script can # find where to edit them. - versions.aarch64-darwin = "6.1.10.38818"; - versions.x86_64-darwin = "6.1.10.38818"; - versions.x86_64-linux = "6.1.10.1400"; + versions.aarch64-darwin = "6.1.11.39163"; + versions.x86_64-darwin = "6.1.11.39163"; + versions.x86_64-linux = "6.1.11.1545"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-E8r0bctM5whwEMppzO9hR3W+k+BmrV0gVx+J02KYmuk="; + hash = "sha256-xWeCiDhYPfTAJttXG5bCwhLu+bmHlcFF/s3+EACeph4="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-HMSBV/B/nTkcU8src6Wdz8uZnz455guSAMGm5ha7mIA="; + hash = "sha256-AB+QXx6r3raymVU7rEJ9dO4CqJI9tnRF3l61vuGnqpI="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-c3WywWmblz9Wg3RMtovCBcR/mYyaWkmuoCqqGvHBxwo="; + hash = "sha256-wkG/fYbn3EdbVJwZQI8EcRPmHFX+4zggmfM4sHUjD8I="; }; }; From f50034b1bb304341f1e8dd85d2e0f4988de24ea1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Aug 2024 04:34:01 +0000 Subject: [PATCH 049/298] vcpkg: 2024.07.12 -> 2024.08.23 --- pkgs/by-name/vc/vcpkg/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vc/vcpkg/package.nix b/pkgs/by-name/vc/vcpkg/package.nix index 98c040af0d25..703ff4d0600d 100644 --- a/pkgs/by-name/vc/vcpkg/package.nix +++ b/pkgs/by-name/vc/vcpkg/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "vcpkg"; - version = "2024.07.12"; + version = "2024.08.23"; src = fetchFromGitHub { owner = "microsoft"; repo = "vcpkg"; rev = finalAttrs.version; - hash = "sha256-WE+BeF9BYR9/Gmi60g6ApXsWQ2vch2N6XhH1A9HAHsc="; + hash = "sha256-cJOy7DG5Ea5cpnHvUiv70FV2ULrevs64Bu5eBJi9BLs="; leaveDotGit = true; postFetch = '' cd "$out" From e57c43ea71ffbd2931d508b4b5b67978ba7eed41 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 29 Aug 2024 16:01:22 +0200 Subject: [PATCH 050/298] python312Packages.mktestdocs: init at 0.2.1 --- .../python-modules/mktestdocs/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/mktestdocs/default.nix diff --git a/pkgs/development/python-modules/mktestdocs/default.nix b/pkgs/development/python-modules/mktestdocs/default.nix new file mode 100644 index 000000000000..94ecadee5fcb --- /dev/null +++ b/pkgs/development/python-modules/mktestdocs/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # tests + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "mktestdocs"; + version = "0.2.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "koaning"; + repo = "mktestdocs"; + rev = "refs/tags/${version}"; + hash = "sha256-snlt6SDiDYr04b2b2NgBC/1IBffpei034vFx3fnYUOc="; + }; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "mktestdocs" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { + description = "Run pytest against markdown files/docstrings"; + homepage = "https://github.com/koaning/mktestdocs"; + changelog = "https://github.com/koaning/mktestdocs/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5ca278ddb429..56fc15845232 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7916,6 +7916,8 @@ self: super: with self; { mkl-service = callPackage ../development/python-modules/mkl-service { }; + mktestdocs = callPackage ../development/python-modules/mktestdocs { }; + ml-collections = callPackage ../development/python-modules/ml-collections { }; ml-dtypes = callPackage ../development/python-modules/ml-dtypes { }; From 1ee08192eb3f769f43d35ae8987ec28993860443 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 31 Aug 2024 04:02:15 +0000 Subject: [PATCH 051/298] python312Packages.etils: 1.9.2 -> 1.9.3 --- pkgs/development/python-modules/etils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/etils/default.nix b/pkgs/development/python-modules/etils/default.nix index f1df16ed5933..401fbba09893 100644 --- a/pkgs/development/python-modules/etils/default.nix +++ b/pkgs/development/python-modules/etils/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "etils"; - version = "1.9.2"; + version = "1.9.3"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-FdzTWsDAzCQEtGrAhGrzzE6Hb9PYDzb1eVHifoudY3k="; + hash = "sha256-qjt6hF3jwbabMMoHBG6MT9LoXsvmBKpL8Y6pPnsxhPA="; }; nativeBuildInputs = [ flit-core ]; From f1705382585bb9d6fde673a6ce0d243b528127ca Mon Sep 17 00:00:00 2001 From: DarkOnion0 Date: Wed, 21 Aug 2024 10:03:11 +0200 Subject: [PATCH 052/298] appflowy: 0.6.7.1 -> 0.6.7.2 https://github.com/AppFlowy-IO/AppFlowy/releases/tag/0.6.7.2 --- pkgs/applications/office/appflowy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index 697655beea5d..132c894507cb 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -17,11 +17,11 @@ let rec { x86_64-linux = { urlSuffix = "linux-x86_64.tar.gz"; - hash = "sha256-i4MJMGANi4wIS+I2P1MvfqW6ln88kfwZt818ky64cAk="; + hash = "sha256-2hrrK3ACYPzkSDxhjOevO8yykwWjS9gARz3A0er7SO4="; }; x86_64-darwin = { urlSuffix = "macos-universal.zip"; - hash = "sha256-0umUD+dkG+sutA5qJ4YP1ZmsccJxz1TgRbzZ/yC6rFg="; + hash = "sha256-07u1KUfbYTBDFbmZK9ZHgutnhLMlcqQCg5l+z3ChTn0="; }; aarch64-darwin = x86_64-darwin; } @@ -29,7 +29,7 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "appflowy"; - version = "0.6.7.1"; + version = "0.6.7.2"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${finalAttrs.version}/AppFlowy-${finalAttrs.version}-${dist.urlSuffix}"; From 48f8b025284af069a7d35bbfd33cdfb543eb9d59 Mon Sep 17 00:00:00 2001 From: Cathal Mullan Date: Fri, 30 Aug 2024 15:19:51 +0100 Subject: [PATCH 053/298] pgcat: 1.1.1 -> 1.2.0 --- pkgs/servers/sql/pgcat/default.nix | 43 ++++++++++++++---------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/pkgs/servers/sql/pgcat/default.nix b/pkgs/servers/sql/pgcat/default.nix index 67665403c46d..49de401a75dd 100644 --- a/pkgs/servers/sql/pgcat/default.nix +++ b/pkgs/servers/sql/pgcat/default.nix @@ -1,22 +1,26 @@ -{ lib -, stdenv -, fetchFromGitHub -, rustPlatform -, darwin +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + darwin, + nix-update-script, + testers, + pgcat, }: rustPlatform.buildRustPackage rec { pname = "pgcat"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "postgresml"; repo = "pgcat"; rev = "v${version}"; - hash = "sha256-BERxdGgPk8POnhLsyy4lKV4LCoHsJTmv2OhAOz6CKKc="; + hash = "sha256-DHXUhAAOmPSt4aVp93I1y69of+MEboXJBZH50mzQTm8="; }; - cargoHash = "sha256-GwcqR8pEvz42NEmcuXpcoPdChzRBYsDEnllX62T8ulQ="; + cargoHash = "sha256-QqwUEbWKSUuxzYjWpVpQuKZDiNib1gM2eZJ4y7XIzXY="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security @@ -24,28 +28,21 @@ rustPlatform.buildRustPackage rec { checkFlags = [ # requires network access - "--skip=dns_cache::CachedResolver::lookup_ip" - "--skip=dns_cache::CachedResolver::new" - "--skip=dns_cache::CachedResolver" - "--skip=dns_cache::tests::has_changed" - "--skip=dns_cache::tests::incorrect_address" - "--skip=dns_cache::tests::lookup_ip" - "--skip=dns_cache::tests::new" - "--skip=dns_cache::tests::thread" - "--skip=dns_cache::tests::unknown_host" + "--skip=dns_cache" ]; - doInstallCheck = true; - installCheckPhase = '' - $out/bin/pgcat --version | grep "pgcat ${version}" - ''; + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { package = pgcat; }; + }; meta = with lib; { homepage = "https://github.com/postgresml/pgcat"; description = "PostgreSQL pooler with sharding, load balancing and failover support"; - license = with licenses; [mit]; + changelog = "https://github.com/postgresml/pgcat/releases"; + license = with licenses; [ mit ]; platforms = platforms.unix; - maintainers = with maintainers; [cathalmullan]; + maintainers = with maintainers; [ cathalmullan ]; mainProgram = "pgcat"; }; } From e236658b95508edb3dffe8a7b6ab3f6a1340630c Mon Sep 17 00:00:00 2001 From: Patka Date: Sun, 1 Sep 2024 13:06:11 +0200 Subject: [PATCH 054/298] _1password-gui: 8.10.36 -> 8.10.40, _1password-gui-beta: 8.10.38-13.BETA -> 8.10.44-21.BETA --- .../misc/1password-gui/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 9d9a9fd4eb60..f95d5d9a94d8 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -10,43 +10,43 @@ let pname = "1password"; - version = if channel == "stable" then "8.10.36" else "8.10.38-13.BETA"; + version = if channel == "stable" then "8.10.40" else "8.10.44-21.BETA"; sources = { stable = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; - hash = "sha256-yUSU0np6li5zLfFOnebpv0+s1UQ6BdgI+28OvcxS3H8="; + hash = "sha256-viY0SOUhrOvmue6Nolau356rIqwDo2nLzMilFFmNb9g="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz"; - hash = "sha256-KG0PJ/gwBd9+qYyraRqS/D58Y58VwLd8yCnYzPVWQAY="; + hash = "sha256-7lUZiS3TSsIVqPoN5A6YqyVaaaRI9BliT51FHkwOPyw="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - hash = "sha256-vYhmA9N1izPRo3HPDouOpjJzMwK7LkCHuyYxBGkIPKM="; + hash = "sha256-xK/B8J3VP8y1xw3KorzZzPf/LjYmYdOIjDECMJnVv6I="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - hash = "sha256-v1eCh/cOpA5XcmamAqreKHRQ+waoBQtvvmNO4wvFq6A="; + hash = "sha256-iqdK6K7dcypZFGseYal2KjOaqJtUjXeCzbDdx7pDv8A="; }; }; beta = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; - hash = "sha256-SeB1Em2WuYvslBv//TROYTAB1asYFhC22IwhcwGi+Qs="; + hash = "sha256-enorJfbn+xJVy1fG3wjhO3LkSsMncHA9/yA13kG+h4Y="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz"; - hash = "sha256-Ik5gL5FCxNANOKx/MSH7dCz3XEdLr7jxykaWhMQKUVw="; + hash = "sha256-EUnIIi6DB5kBVid9ExBpNApKItHnRKQziBy/GFt0xag="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - hash = "sha256-8cNxhRAOrn/A++APOMUxwrD3+a++ksRMzlmmnQ8J8/c="; + hash = "sha256-U14CjoUJUpd4wWidZz6xGErhHI/VPChqG8cwBTBYoYc="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - hash = "sha256-YkZbuCFvWHksLQYKJ3LQD2YDXj9qwHF4Gg8JbxBZsuc="; + hash = "sha256-DD1M2EFSHqG9OHX5Q/CmZLZIKYrBMS4cnX/6tLVi7H0="; }; }; }; From 3524ada1634aff5892d20527d863faf9ca08c809 Mon Sep 17 00:00:00 2001 From: Vladimir Samoylov Date: Sun, 1 Sep 2024 22:16:44 +0700 Subject: [PATCH 055/298] maintainers: add cageyv --- maintainers/maintainer-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 25802a260cff..a47807c64e3e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3177,6 +3177,15 @@ { fingerprint = "208A 2A66 8A2F CDE7 B5D3 8F64 CDDC 792F 6552 51ED"; } ]; }; + cageyv = { + email = "pingme@cageyv.dev"; + github = "cageyv"; + githubId = 51059484; + name = "Vladmir Samoylov"; + keys = [ + { fingerprint = "8916 F727 734E 77AB 437F A33A 19AB 76F5 CEE1 1392"; } + ]; + }; CaitlinDavitt = { email = "CaitlinDavitt@gmail.com"; github = "CaitlinDavitt"; From 3f5602bf9752f024ba541cdc73894dca76d1b003 Mon Sep 17 00:00:00 2001 From: Vladimir Samoylov Date: Sun, 1 Sep 2024 22:23:42 +0700 Subject: [PATCH 056/298] lprobe: init at 0.1.3 https://github.com/fivexl/lprobe/releases/tag/v0.1.3 --- pkgs/by-name/lp/lprobe/package.nix | 33 ++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pkgs/by-name/lp/lprobe/package.nix diff --git a/pkgs/by-name/lp/lprobe/package.nix b/pkgs/by-name/lp/lprobe/package.nix new file mode 100644 index 000000000000..e0f24d96a718 --- /dev/null +++ b/pkgs/by-name/lp/lprobe/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + libpcap, +}: + +buildGoModule rec { + pname = "lprobe"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "fivexl"; + repo = "lprobe"; + rev = "refs/tags/v${version}"; + hash = "sha256-q7lH0aLgQNM4jrrrq2ua+pt4/VknxlzKzDH5J4MwjfA="; + }; + + vendorHash = "sha256-B3lcE33Ny+XE7nK/QlVcV8yYgzYWNBfoecuL+AcavSk="; + + buildInputs = [ + libpcap + ]; + + meta = { + description = "A command-line tool to perform Local Health Check Probes inside Container Images (ECS, Docker)"; + homepage = "https://github.com/fivexl/lprobe"; + license = lib.licenses.asl20; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + maintainers = with lib.maintainers; [ cageyv ]; + mainProgram = "lprobe"; + }; +} From 8719eb45524dc38d0324b730e87edb4cb45c44ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 8 Aug 2024 05:15:46 -0700 Subject: [PATCH 057/298] python312Packages.blis: 0.7.11 -> 1.0.0 Diff: https://github.com/explosion/cython-blis/compare/v0.7.11...release-v1.0.0 Changelog: https://github.com/explosion/cython-blis/releases/tag/release-v1.0.0 --- .../python-modules/blis/default.nix | 39 ++++++++++++------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix index f6075a7e5bc6..cda35bcb9370 100644 --- a/pkgs/development/python-modules/blis/default.nix +++ b/pkgs/development/python-modules/blis/default.nix @@ -3,33 +3,41 @@ buildPythonPackage, fetchFromGitHub, setuptools, - cython_0, + cython, hypothesis, numpy, pytestCheckHook, pythonOlder, + blis, + numpy_2, gitUpdater, }: buildPythonPackage rec { pname = "blis"; - version = "0.7.11"; + version = "1.0.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "explosion"; repo = "cython-blis"; - rev = "refs/tags/v${version}"; - hash = "sha256-p8pzGZc5OiiGTvXULDgzsBC3jIhovTKUq3RtPnQ/+to="; + rev = "refs/tags/release-v${version}"; + hash = "sha256-XS6h2c+8BJ9pAvIX8340C4vRZEBRmEZc6/6tH7ooqNU="; }; postPatch = '' + # The commit pinning numpy to version 2 doesn't have any functional changes: + # https://github.com/explosion/cython-blis/pull/108 + # BLIS should thus work with numpy and numpy_2. + substituteInPlace pyproject.toml setup.py \ + --replace-fail "numpy>=2.0.0,<3.0.0" numpy + # See https://github.com/numpy/numpy/issues/21079 # has no functional difference as the name is only used in log output substituteInPlace blis/benchmark.py \ - --replace 'numpy.__config__.blas_ilp64_opt_info["libraries"]' '["dummy"]' + --replace-fail 'numpy.__config__.blas_ilp64_opt_info["libraries"]' '["dummy"]' ''; preCheck = '' @@ -37,12 +45,13 @@ buildPythonPackage rec { rm -rf ./blis ''; - nativeBuildInputs = [ + build-system = [ setuptools - cython_0 + cython + numpy ]; - propagatedBuildInputs = [ numpy ]; + dependencies = [ numpy ]; nativeCheckInputs = [ hypothesis @@ -52,16 +61,18 @@ buildPythonPackage rec { pythonImportsCheck = [ "blis" ]; passthru = { - # Do not update to BLIS 0.9.x until the following issue is resolved: - # https://github.com/explosion/thinc/issues/771#issuecomment-1255825935 - skipBulkUpdate = true; + tests = { + numpy_2 = blis.overridePythonAttrs (old: { + numpy = numpy_2; + }); + }; updateScript = gitUpdater { - rev-prefix = "v"; - ignoredVersions = "0\.9\..*"; + rev-prefix = "release-v"; }; }; meta = with lib; { + changelog = "https://github.com/explosion/cython-blis/releases/tag/release-v${version}"; description = "BLAS-like linear algebra library"; homepage = "https://github.com/explosion/cython-blis"; license = licenses.bsd3; From e5bec360ca7e1838a2e2dad528dd977ff0666536 Mon Sep 17 00:00:00 2001 From: QuincePie Date: Sun, 1 Sep 2024 10:46:42 -0500 Subject: [PATCH 058/298] dep-scan: 5.3.4 -> 5.4.3 --- pkgs/by-name/de/dep-scan/package.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/de/dep-scan/package.nix b/pkgs/by-name/de/dep-scan/package.nix index 930c37fc9dcc..1aac043fcf83 100644 --- a/pkgs/by-name/de/dep-scan/package.nix +++ b/pkgs/by-name/de/dep-scan/package.nix @@ -4,16 +4,28 @@ python3, }: +let + appthreat-vulnerability-db = ( + python3.pkgs.appthreat-vulnerability-db.overrideAttrs (oldAttrs: rec { + version = "5.7.3"; + src = oldAttrs.src.override { + rev = "refs/tags/v${version}"; + hash = "sha256-MrlgBUx3T2G46Pnah3obe5b4yKDzsAFVC/B7AHM0kZY="; + }; + }) + ); + +in python3.pkgs.buildPythonApplication rec { pname = "dep-scan"; - version = "5.3.4"; + version = "5.4.3"; pyproject = true; src = fetchFromGitHub { owner = "owasp-dep-scan"; repo = "dep-scan"; rev = "refs/tags/v${version}"; - hash = "sha256-5iMhl3Wcxwgq4Wr0TUcAuRnb2+y8DHBugnnkpcZfSAM="; + hash = "sha256-m0vDsCetOSfScu1eprrGaDJ1VuXxuNFBitK8N5GtfSQ="; }; build-system = with python3.pkgs; [ setuptools ]; From 1f03dd265f9277d7e21e01c8abba1ba0f4a907f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 1 Sep 2024 16:40:20 -0700 Subject: [PATCH 059/298] python312Packages.thinc: 8.2.3 -> 8.3.0 Changelog: https://github.com/explosion/thinc/releases/tag/v8.2.4 https://github.com/explosion/thinc/releases/tag/v8.2.5 https://github.com/explosion/thinc/releases/tag/v8.3.0 --- .../python-modules/thinc/default.nix | 46 ++++++++++--------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index 86700bd0aed2..b0754a32de76 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -16,7 +16,6 @@ mock, murmurhash, numpy, - plac, preshed, pydantic, pytestCheckHook, @@ -24,51 +23,59 @@ pythonOlder, setuptools, srsly, - tqdm, typing-extensions, wasabi, }: buildPythonPackage rec { pname = "thinc"; - version = "8.2.3"; - format = "setuptools"; + version = "8.3.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9a/FIikSqAvai9zslYNiorpTjXAn3I22FUhF0oWdynY="; + hash = "sha256-6zvtVPXADsmt2qogjFHM+gWUg9cxQM1RWqMzc3Fcblk="; }; postPatch = '' + # As per https://github.com/explosion/thinc/releases/tag/release-v8.3.0 no + # code changes were required for NumPy 2.0. Thus Thinc should be compatible + # with NumPy 1.0 and 2.0. + substituteInPlace pyproject.toml setup.cfg \ + --replace-fail "numpy>=2.0.0,<2.1.0" numpy substituteInPlace setup.cfg \ - --replace "preshed>=3.0.2,<3.1.0" "preshed" + --replace-fail "numpy>=2.0.1,<2.1.0" numpy ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ + blis + cymem + cython_0 + murmurhash + numpy + preshed + setuptools + ]; - buildInputs = - [ cython_0 ] - ++ lib.optionals stdenv.isDarwin [ - Accelerate - CoreFoundation - CoreGraphics - CoreVideo - ]; + buildInputs = lib.optionals stdenv.isDarwin [ + Accelerate + CoreFoundation + CoreGraphics + CoreVideo + ]; - propagatedBuildInputs = [ + dependencies = [ blis catalogue confection cymem murmurhash numpy - plac preshed pydantic srsly - tqdm wasabi ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; @@ -78,10 +85,7 @@ buildPythonPackage rec { pytestCheckHook ]; - # Add native extensions. preCheck = '' - export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH - # avoid local paths, relative imports wont resolve correctly mv thinc/tests tests rm -r thinc From 70dc44407d8b6127fcf094138a08701f26e3f60a Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 1 Sep 2024 20:24:56 -0400 Subject: [PATCH 060/298] python312Packages.hdf5plugin: 4.4.0 -> 5.0.0 --- .../python-modules/hdf5plugin/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/hdf5plugin/default.nix b/pkgs/development/python-modules/hdf5plugin/default.nix index fd7bff5d3e02..5e139ab76cce 100644 --- a/pkgs/development/python-modules/hdf5plugin/default.nix +++ b/pkgs/development/python-modules/hdf5plugin/default.nix @@ -2,21 +2,28 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, + py-cpuinfo, h5py, }: buildPythonPackage rec { pname = "hdf5plugin"; - version = "4.4.0"; - format = "setuptools"; + version = "5.0.0"; + pyproject = true; src = fetchFromGitHub { owner = "silx-kit"; repo = "hdf5plugin"; rev = "refs/tags/v${version}"; - hash = "sha256-MnqY1PyGzo31H696J9CekiA2rJrUYzUMDC3UJMZaFLA="; + hash = "sha256-6lEU8ZGJKazDqloel5QcaXAbNGzV1fAbAjYC/hFUOdI="; }; + build-system = [ + setuptools + py-cpuinfo + ]; + dependencies = [ h5py ]; checkPhase = '' From 7f57fc4424b1c6df1d4b4bff9daa9fa9fcc32faf Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 28 Aug 2024 10:07:57 +0800 Subject: [PATCH 061/298] deepin.dde-tray-loader: init at 0.0.5 --- .../deepin/core/dde-tray-loader/default.nix | 60 +++++++++++++++++++ pkgs/desktops/deepin/default.nix | 1 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/desktops/deepin/core/dde-tray-loader/default.nix diff --git a/pkgs/desktops/deepin/core/dde-tray-loader/default.nix b/pkgs/desktops/deepin/core/dde-tray-loader/default.nix new file mode 100644 index 000000000000..d5e7c1779ce6 --- /dev/null +++ b/pkgs/desktops/deepin/core/dde-tray-loader/default.nix @@ -0,0 +1,60 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + extra-cmake-modules, + pkg-config, + dtkwidget, + dde-qt-dbus-factory, + wayland, + wayland-scanner, + xorg, + libsForQt5, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dde-tray-loader"; + version = "0.0.5"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = "dde-tray-loader"; + rev = "${finalAttrs.version}"; + hash = "sha256-ssgDLBzDFDs8FgtMHwa2k+3E3wOc8i0sVvYiYkb7lyE="; + }; + + postPatch = '' + substituteInPlace plugins/dde-dock/CMakeLists.txt \ + --replace 'add_subdirectory("eye-comfort-mode")' " " + ''; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + pkg-config + libsForQt5.wrapQtAppsHook + libsForQt5.qttools + wayland-scanner + ]; + + buildInputs = [ + dtkwidget + dde-qt-dbus-factory + libsForQt5.qtbase + libsForQt5.qtwayland + libsForQt5.networkmanager-qt + libsForQt5.libdbusmenu + wayland + xorg.libXcursor + xorg.libXtst + ]; + + meta = { + description = "Tray plugins that integrated into task bar"; + homepage = "https://github.com/linuxdeepin/dde-tray-loader"; + license = with lib.licenses; [ gpl3Plus ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ rewine ]; + }; +}) diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 4280b290a3e6..52f917a9c996 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -62,6 +62,7 @@ let dde-widgets = callPackage ./core/dde-widgets { }; dde-shell = callPackage ./core/dde-shell { }; dde-grand-search = callPackage ./core/dde-grand-search { }; + dde-tray-loader = callPackage ./core/dde-tray-loader { }; #### Dtk Application deepin-album = callPackage ./apps/deepin-album { }; From bff2d3150f18dfff8a675cce8317786e56a0529f Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 28 Aug 2024 10:09:42 +0800 Subject: [PATCH 062/298] deepin.dde-shell: 0.0.23-unstable-2024-06-11 -> 0.0.43 --- .../deepin/core/dde-shell/default.nix | 26 +++++++++++-------- .../dde-shell/disable-plugins-use-qt5.diff | 18 ------------- .../deepin/core/dde-shell/only-use-qt6.diff | 26 ------------------- 3 files changed, 15 insertions(+), 55 deletions(-) delete mode 100644 pkgs/desktops/deepin/core/dde-shell/disable-plugins-use-qt5.diff delete mode 100644 pkgs/desktops/deepin/core/dde-shell/only-use-qt6.diff diff --git a/pkgs/desktops/deepin/core/dde-shell/default.nix b/pkgs/desktops/deepin/core/dde-shell/default.nix index 72696ba35214..4f4a3f0f71e6 100644 --- a/pkgs/desktops/deepin/core/dde-shell/default.nix +++ b/pkgs/desktops/deepin/core/dde-shell/default.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + fetchpatch, cmake, extra-cmake-modules, pkg-config, @@ -13,7 +14,7 @@ qt6Packages, qt6integration, qt6platform-plugins, - kdePackages, + dde-tray-loader, wayland, wayland-protocols, yaml-cpp, @@ -22,24 +23,27 @@ stdenv.mkDerivation (finalAttrs: { pname = "dde-shell"; - version = "0.0.23-unstable-2024-06-11"; + version = "0.0.43"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dde-shell"; - rev = "d68cc64ad2cd6978af2f34deb3ef48f991d54fc3"; - hash = "sha256-hVrdfbtcL3EJitiDghNSuGr5MX/VVT1J3tuY6wjwYcw="; + rev = finalAttrs.version; + hash = "sha256-wSk1gEJbTxKUPZ6DiTeVw2qyX+CwANA37ZP0tXnz0J0="; }; patches = [ - ./disable-plugins-use-qt5.diff ./fix-path-for-nixos.diff - ./only-use-qt6.diff # remove in next release + (fetchpatch { + name = "fix-libdock-plugin_so-contains-a-forbidden-reference.diff"; + url = "https://github.com/linuxdeepin/dde-shell/commit/bf9a0472bc44748a3c389d796d144dad6b13617b.patch"; + hash = "sha256-cP5zMsfPyi4FIR1OIbVSnn+Z+KqRuIK7a214VjVb/7w="; + }) ]; postPatch = '' - for file in $(grep -rl "/usr/lib/dde-dock/tmp"); do - substituteInPlace $file --replace-fail "/usr/lib/dde-dock/tmp" "/run/current-system/sw/lib/dde-dock/tmp" + for file in $(grep -rl "/usr/lib/dde-dock"); do + substituteInPlace $file --replace-fail "/usr/lib/dde-dock" "/run/current-system/sw/lib/dde-dock" done for file in $(grep -rl "/usr/lib/deepin-daemon"); do @@ -57,6 +61,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + dde-tray-loader dtk6declarative dtk6widget dde-qt-dbus-factory @@ -64,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { qt6Packages.qtwayland qt6Packages.qtsvg qt6platform-plugins - kdePackages.networkmanager-qt + qt6integration wayland wayland-protocols yaml-cpp @@ -77,8 +82,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DQML_INSTALL_DIR=${placeholder "out"}/${qt6Packages.qtbase.qtQmlPrefix}" ]; qtWrapperArgs = [ - # qt6integration must be placed before qtsvg in QT_PLUGIN_PATH - "--prefix QT_PLUGIN_PATH : ${qt6integration}/${qt6Packages.qtbase.qtPluginPrefix}" + "--prefix TRAY_LOADER_EXECUTE_PATH : ${dde-tray-loader}/libexec/trayplugin-loader" "--suffix DDE_SHELL_PLUGIN_PATH : /run/current-system/sw/lib/dde-shell" "--suffix DDE_SHELL_PACKAGE_PATH : /run/current-system/sw/share/dde-shell" ]; diff --git a/pkgs/desktops/deepin/core/dde-shell/disable-plugins-use-qt5.diff b/pkgs/desktops/deepin/core/dde-shell/disable-plugins-use-qt5.diff deleted file mode 100644 index 0e1107abc7dc..000000000000 --- a/pkgs/desktops/deepin/core/dde-shell/disable-plugins-use-qt5.diff +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/panels/dock/CMakeLists.txt b/panels/dock/CMakeLists.txt -index 1a20179..83c5ff2 100644 ---- a/panels/dock/CMakeLists.txt -+++ b/panels/dock/CMakeLists.txt -@@ -85,11 +85,11 @@ add_subdirectory(searchitem) - add_subdirectory(launcherItem) - add_subdirectory(showdesktop) - add_subdirectory(taskmanager) --add_subdirectory(tray) -+ add_subdirectory(tray) - add_subdirectory(multitaskview) - - # dock plugin load program --add_subdirectory(dockplugin) -+#add_subdirectory(dockplugin) - - # dock qml element(include Dock.xx defines and DockCompositor) - file( diff --git a/pkgs/desktops/deepin/core/dde-shell/only-use-qt6.diff b/pkgs/desktops/deepin/core/dde-shell/only-use-qt6.diff deleted file mode 100644 index cdfad415403e..000000000000 --- a/pkgs/desktops/deepin/core/dde-shell/only-use-qt6.diff +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/panels/dock/tray/CMakeLists.txt b/panels/dock/tray/CMakeLists.txt -index ed6da31..1a33d06 100644 ---- a/panels/dock/tray/CMakeLists.txt -+++ b/panels/dock/tray/CMakeLists.txt -@@ -10,7 +10,7 @@ endif() - - # project(dde-dock) - --find_package(DtkTools REQUIRED) -+find_package(Dtk6Tools REQUIRED) - - set(CMAKE_THREAD_LIBS_INIT "-lpthread") - set(CMAKE_HAVE_THREADS_LIBRARY 1) -diff --git a/panels/dock/tray/frame/CMakeLists.txt b/panels/dock/tray/frame/CMakeLists.txt -index b55aa48..0a397cb 100644 ---- a/panels/dock/tray/frame/CMakeLists.txt -+++ b/panels/dock/tray/frame/CMakeLists.txt -@@ -22,7 +22,7 @@ find_package(Qt6WaylandClient REQUIRED) - find_package(Dtk6Gui REQUIRED) - find_package(Dtk6Core REQUIRED) - find_package(Dtk6Widget REQUIRED) --find_package(DtkCMake REQUIRED) -+find_package(Dtk6CMake REQUIRED) - # find_package(dbusmenu-qt6 REQUIRED) - find_package(ECM REQUIRED NO_MODULE) - set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) From d0c90c5bd1e584c3f9f6f9c3118474c3404d969f Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 28 Aug 2024 11:25:33 +0800 Subject: [PATCH 063/298] deepin.dde-grand-search: 5.4.9 -> 5.5.2 --- .../deepin/core/dde-grand-search/default.nix | 14 +++++++------- .../patch-check-v23-interface.diff | 13 ------------- 2 files changed, 7 insertions(+), 20 deletions(-) delete mode 100644 pkgs/desktops/deepin/core/dde-grand-search/patch-check-v23-interface.diff diff --git a/pkgs/desktops/deepin/core/dde-grand-search/default.nix b/pkgs/desktops/deepin/core/dde-grand-search/default.nix index 2d07a478fec3..ab5cd2f03039 100644 --- a/pkgs/desktops/deepin/core/dde-grand-search/default.nix +++ b/pkgs/desktops/deepin/core/dde-grand-search/default.nix @@ -16,18 +16,20 @@ ffmpeg, ffmpegthumbnailer, pcre, + lucenepp, + boost, dbus, }: stdenv.mkDerivation rec { pname = "dde-grand-search"; - version = "5.4.9"; + version = "5.5.2"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-WybwV1QIuV7O1SSgQU1ABsMf5QW9KJ95YyIa8Tz8pJ0="; + hash = "sha256-6s6M0cL8gjq1B5tuIRGPi8D69p4T8hPJv5QvBIvsO1w="; }; nativeBuildInputs = [ @@ -48,13 +50,14 @@ stdenv.mkDerivation rec { ffmpeg ffmpegthumbnailer pcre + lucenepp + boost ]; patches = [ # This patch revert the commit e6735e7 # FIXME: why StartManager can't work, is dde-api-proxy still required? ./fix-dbus-path-for-daemon.diff - ./patch-check-v23-interface.diff ]; postPatch = '' @@ -69,10 +72,7 @@ stdenv.mkDerivation rec { substituteAllInPlace src/grand-search-daemon/data/com.deepin.dde.daemon.GrandSearch.service ''; - cmakeFlags = [ - "-DVERSION=${version}" - "-DNIX_DEEPIN_VERSION=23" - ]; + cmakeFlags = [ "-DVERSION=${version}" ]; meta = { description = "System-wide desktop search for DDE"; diff --git a/pkgs/desktops/deepin/core/dde-grand-search/patch-check-v23-interface.diff b/pkgs/desktops/deepin/core/dde-grand-search/patch-check-v23-interface.diff deleted file mode 100644 index bcb9f2b6c0c2..000000000000 --- a/pkgs/desktops/deepin/core/dde-grand-search/patch-check-v23-interface.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 76dac13..f43600e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -24,7 +24,7 @@ endif() - - #Indentify the version - find_package(DtkCMake REQUIRED) --if (${DEEPIN_OS_VERSION} MATCHES "23") -+if (${NIX_DEEPIN_VERSION} MATCHES "23") - add_definitions(-DCOMPILE_ON_V23) - set(COMPLIE_ON_V23 TRUE) - message("COMPILE ON v23") From a8cdaebca48d7550f470b32957d2829cd1dd8ec1 Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 28 Aug 2024 11:33:02 +0800 Subject: [PATCH 064/298] deepin.dde-network-core: 2.0.31 -> 2.0.32 --- pkgs/desktops/deepin/core/dde-network-core/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/deepin/core/dde-network-core/default.nix b/pkgs/desktops/deepin/core/dde-network-core/default.nix index 518fd99548f0..422b239edf18 100644 --- a/pkgs/desktops/deepin/core/dde-network-core/default.nix +++ b/pkgs/desktops/deepin/core/dde-network-core/default.nix @@ -9,7 +9,6 @@ qtbase, qtsvg, dtkwidget, - dde-dock, dde-control-center, dde-session-shell, networkmanager-qt, @@ -19,13 +18,13 @@ stdenv.mkDerivation rec { pname = "dde-network-core"; - version = "2.0.31"; + version = "2.0.32"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-vTcADZElqNZMzWKDCEFtH3oXNyW8i4wxAwnaBnyz6X8="; + hash = "sha256-dXLvBCNitlV07dH/rPatsbP6DFf8SZQ7hcDUYtqt2FA="; }; nativeBuildInputs = [ @@ -39,7 +38,6 @@ stdenv.mkDerivation rec { qtbase qtsvg dtkwidget - dde-dock dde-control-center dde-session-shell networkmanager-qt From 5be8f260c3914980393396a61fc9511883f4c116 Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 28 Aug 2024 13:19:05 +0800 Subject: [PATCH 065/298] deepin.deepin-system-monitor: 6.0.23 -> 6.5.0 --- .../deepin/apps/deepin-system-monitor/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix b/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix index f37fb2dc6c25..a0af0f680634 100644 --- a/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix @@ -14,7 +14,7 @@ qtsvg, qtx11extras, dde-qt-dbus-factory, - dde-dock, + dde-tray-loader, gsettings-qt, polkit-qt, procps, @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "deepin-system-monitor"; - version = "6.0.23"; + version = "6.5.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-LcXc8yI81YslVjof74TvOm6eWiN4UaHgUFU+HSCNZxQ="; + hash = "sha256-UOF0/RBceuRX6AtI1p5qqHhbRDAhA7i0+seOrkAFFgI="; }; postPatch = '' @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { qtsvg qtx11extras dde-qt-dbus-factory - dde-dock + dde-tray-loader gsettings-qt polkit-qt procps From 68ba4960d32c5222d19cd50df2bb3b2c186aaa42 Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 28 Aug 2024 13:19:49 +0800 Subject: [PATCH 066/298] deepin.util-dfm: 1.2.24 -> 1.3.2 --- pkgs/desktops/deepin/library/util-dfm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/deepin/library/util-dfm/default.nix b/pkgs/desktops/deepin/library/util-dfm/default.nix index 140b28fc7327..b7c2071a3868 100644 --- a/pkgs/desktops/deepin/library/util-dfm/default.nix +++ b/pkgs/desktops/deepin/library/util-dfm/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "util-dfm"; - version = "1.2.24"; + version = "1.3.2"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-7MuQVkb+xRMtcbB5PQBv6Au/i3ONA0c1whnZ9bMrA/8="; + hash = "sha256-ngDjjdwuYqvyhaUcMNV5PRmGKC3lmY/nJQGOQgRMIQE="; }; nativeBuildInputs = [ From 144afbcf44b33744af58fe5954e8e958ae9eec69 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Sep 2024 13:08:35 +0000 Subject: [PATCH 067/298] jay: 1.4.0 -> 1.5.0 --- pkgs/applications/window-managers/jay/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/jay/default.nix b/pkgs/applications/window-managers/jay/default.nix index 88ea73105a56..9eff972a0c60 100644 --- a/pkgs/applications/window-managers/jay/default.nix +++ b/pkgs/applications/window-managers/jay/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "jay"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "mahkoh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iZTdhWHlorTAJTd3p2ZJbD5LRYkUmDAFjSEIR5E0JDI="; + sha256 = "sha256-cuXFkG2YwS0w4xzr7jpjr0QmVA5UJfk5SpjIQKxN/LY="; }; - cargoHash = "sha256-SEL7hpHcW+p49vFRedC1hDRZ/Vq9zMzMAACyyBXHwZM="; + cargoHash = "sha256-w3ARwQlehJq9uNSQmbUjiWik4a2W3Ax/6/BIsdDUfKM="; SHADERC_LIB_DIR = "${lib.getLib shaderc}/lib"; From 275871df0ecb11bfc422ce8da2601b51e508b146 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Sep 2024 13:20:00 +0000 Subject: [PATCH 068/298] kuttl: 0.18.0 -> 0.19.0 --- pkgs/applications/networking/cluster/kuttl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kuttl/default.nix b/pkgs/applications/networking/cluster/kuttl/default.nix index c6402dbb103b..88b8cfc73a33 100644 --- a/pkgs/applications/networking/cluster/kuttl/default.nix +++ b/pkgs/applications/networking/cluster/kuttl/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "kuttl"; - version = "0.18.0"; + version = "0.19.0"; cli = "kubectl-kuttl"; src = fetchFromGitHub { owner = "kudobuilder"; repo = "kuttl"; rev = "v${version}"; - sha256 = "sha256-wTnBMNgwHqK8PdpEa3RAsVJemnGw/ymn6GJciPFsYrU="; + sha256 = "sha256-7fcVmLvRbKYuWuqwqZWlQf08YEyowcTxrp5RteV8qyU="; }; - vendorHash = "sha256-RKQM1JxyZA1HwqRjCULY4X3jZK9SgclW55/qXp395cQ="; + vendorHash = "sha256-E6gzr9gCLbRaoJU/pYA2cAy0rv5SUVmwf0m34lchF+M="; subPackages = [ "cmd/kubectl-kuttl" ]; From f5dc7311a4ee94a40d6ae71e195f0bfe46efc261 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Mon, 2 Sep 2024 16:01:44 +0200 Subject: [PATCH 069/298] liblas: add geospatial team as maintainer --- pkgs/development/libraries/libLAS/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix index 4b00de811573..b92d9161c1a3 100644 --- a/pkgs/development/libraries/libLAS/default.nix +++ b/pkgs/development/libraries/libLAS/default.nix @@ -49,11 +49,11 @@ stdenv.mkDerivation rec { install_name_tool -change "@rpath/liblas.3.dylib" "$out/lib/liblas.3.dylib" $out/lib/liblas_c.dylib ''; - meta = { + meta = with lib; { description = "LAS 1.0/1.1/1.2 ASPRS LiDAR data translation toolset"; homepage = "https://liblas.org"; - license = lib.licenses.bsd3; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.michelk ]; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; teams.geospatial.members ++ [ lib.maintainers.michelk ]; }; } From f029c456d5cbe8791ccdd70488b7e34d64b620f2 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Mon, 2 Sep 2024 16:06:42 +0200 Subject: [PATCH 070/298] lastools: add geospatial team as maintainer --- pkgs/development/libraries/LAStools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/LAStools/default.nix b/pkgs/development/libraries/LAStools/default.nix index 5dfd6570c080..8a34168484eb 100644 --- a/pkgs/development/libraries/LAStools/default.nix +++ b/pkgs/development/libraries/LAStools/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "Software for rapid LiDAR processing"; homepage = "http://lastools.org/"; license = licenses.unfree; - maintainers = with maintainers; [ stephenwithph ]; + maintainers = with maintainers; teams.geospatial.members ++ [ stephenwithph ]; platforms = platforms.unix; }; } From 935d38c894c59433910c148a7470d142a36a0607 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 2 Sep 2024 12:47:55 -0700 Subject: [PATCH 071/298] deltatouch: 1.5.1 -> 1.6.0 Diff: https://codeberg.org/lk108/deltatouch.git/compare/v1.5.1...1.6.0 Changelog: https://codeberg.org/lk108/deltatouch/src/tag/v1.6.0/CHANGELOG --- pkgs/by-name/de/deltatouch/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/de/deltatouch/package.nix b/pkgs/by-name/de/deltatouch/package.nix index 3b65c23a9a0a..3c78eeb75b31 100644 --- a/pkgs/by-name/de/deltatouch/package.nix +++ b/pkgs/by-name/de/deltatouch/package.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "deltatouch"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "lk108"; repo = "deltatouch"; rev = "v${finalAttrs.version}"; - hash = "sha256-OQrTxxmiBiAc9il1O5aEl9iN3fCfoxSAwJDfrASCPxs="; + hash = "sha256-mOs5WlWOkH9A+BZK6hvKq/JKS4k8tzvvov4CYFHyMfA="; fetchSubmodules = true; }; @@ -48,12 +48,13 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail 'assets/logo.svg DESTINATION assets' 'assets/logo.svg DESTINATION ''${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps RENAME deltatouch.svg' \ --replace-fail "\''${DESKTOP_FILE_NAME} DESTINATION \''${DATA_DIR}" "\''${DESKTOP_FILE_NAME} DESTINATION \''${CMAKE_INSTALL_DATAROOTDIR}/applications" - substituteInPlace plugins/DeltaHandler/CMakeLists.txt plugins/DTWebEngineProfile/CMakeLists.txt \ + substituteInPlace plugins/{DeltaHandler,HtmlMsgEngineProfile,WebxdcEngineProfile}/CMakeLists.txt \ --replace-fail 'set(QT_IMPORTS_DIR "/lib/''${ARCH_TRIPLET}")' 'set(QT_IMPORTS_DIR "${placeholder "out"}/${qt5.qtbase.qtQmlPrefix}")' # Fix import of library dependencies + substituteInPlace plugins/{DeltaHandler,WebxdcEngineProfile}/CMakeLists.txt \ + --replace-fail 'IMPORTED_LOCATION "''${CMAKE_CURRENT_BINARY_DIR}/libdeltachat.so"' 'IMPORTED_LOCATION "${lib.getLib libdeltachat}/lib/libdeltachat.so"' substituteInPlace plugins/DeltaHandler/CMakeLists.txt \ - --replace-fail 'IMPORTED_LOCATION "''${CMAKE_CURRENT_BINARY_DIR}/libdeltachat.so"' 'IMPORTED_LOCATION "${lib.getLib libdeltachat}/lib/libdeltachat.so"' \ --replace-fail 'IMPORTED_LOCATION "''${CMAKE_CURRENT_BINARY_DIR}/libquirc.so.1.2"' 'IMPORTED_LOCATION "${lib.getLib quirc}/lib/libquirc.so"' # Fix icon reference in desktop file From 83c48b4d47f5d3486370bf6e5d6fe52f23146fed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 2 Sep 2024 13:03:54 -0700 Subject: [PATCH 072/298] python311Packages.spacy: unpin thinc --- pkgs/development/python-modules/spacy/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 9842e22c92d9..5467d1da05b1 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -50,6 +50,13 @@ buildPythonPackage rec { hash = "sha256-pkjGy/Ksx6Vaae6ef6TyK99pqoKKWHobxc//CM88LdM="; }; + postPatch = '' + # thinc version 8.3.0 had no functional changes + # also see https://github.com/explosion/spaCy/issues/13607 + substituteInPlace pyproject.toml setup.cfg \ + --replace-fail "thinc>=8.2.2,<8.3.0" "thinc>=8.2.2,<8.4.0" + ''; + pythonRelaxDeps = [ "smart-open" "typer" From d3f0837c958c414a08f4198dd8ecd5a9677d905e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 2 Sep 2024 12:17:28 -0700 Subject: [PATCH 073/298] python311Packages.spacy: 3.7.5 -> 3.7.6 Changelog: https://github.com/explosion/spaCy/releases/tag/release-v3.7.6 --- .../python-modules/spacy/default.nix | 29 +++++++------------ 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 5467d1da05b1..51d20b3f2498 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -10,13 +10,11 @@ fetchPypi, hypothesis, jinja2, - jsonschema, langcodes, mock, murmurhash, numpy, packaging, - pathy, preshed, pydantic, pytestCheckHook, @@ -29,7 +27,6 @@ thinc, tqdm, typer, - typing-extensions, wasabi, weasel, writeScript, @@ -40,14 +37,14 @@ buildPythonPackage rec { pname = "spacy"; - version = "3.7.5"; + version = "3.7.6"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-pkjGy/Ksx6Vaae6ef6TyK99pqoKKWHobxc//CM88LdM="; + hash = "sha256-9AZcCqxcSLv7L/4ZHVXMszv7AFN2r71MzW1ek0FRTjQ="; }; postPatch = '' @@ -57,26 +54,22 @@ buildPythonPackage rec { --replace-fail "thinc>=8.2.2,<8.3.0" "thinc>=8.2.2,<8.4.0" ''; - pythonRelaxDeps = [ - "smart-open" - "typer" - ]; - - nativeBuildInputs = [ + build-system = [ + cymem cython_0 + murmurhash + numpy + thinc ]; - propagatedBuildInputs = [ - blis + dependencies = [ catalogue cymem jinja2 - jsonschema langcodes murmurhash numpy packaging - pathy preshed pydantic requests @@ -89,7 +82,7 @@ buildPythonPackage rec { typer wasabi weasel - ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + ]; nativeCheckInputs = [ pytestCheckHook @@ -97,8 +90,6 @@ buildPythonPackage rec { mock ]; - doCheck = true; - # Fixes ModuleNotFoundError when running tests on Cythonized code. See #255262 preCheck = '' cd $out @@ -139,7 +130,7 @@ buildPythonPackage rec { description = "Industrial-strength Natural Language Processing (NLP)"; mainProgram = "spacy"; homepage = "https://github.com/explosion/spaCy"; - changelog = "https://github.com/explosion/spaCy/releases/tag/v${version}"; + changelog = "https://github.com/explosion/spaCy/releases/tag/release-v${version}"; license = licenses.mit; maintainers = [ ]; }; From 31c38324dd4f3d330700054dfd759907637ac23f Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Fri, 30 Aug 2024 00:47:07 +0200 Subject: [PATCH 074/298] nixos/services.ceph: remove `with lib;` --- .../services/network-filesystems/ceph.nix | 187 +++++++++--------- 1 file changed, 92 insertions(+), 95 deletions(-) diff --git a/nixos/modules/services/network-filesystems/ceph.nix b/nixos/modules/services/network-filesystems/ceph.nix index d375434a1bd4..5961731dbf44 100644 --- a/nixos/modules/services/network-filesystems/ceph.nix +++ b/nixos/modules/services/network-filesystems/ceph.nix @@ -1,16 +1,13 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.ceph; # function that translates "camelCaseOptions" to "camel case options", credits to tilpner in #nixos@freenode - expandCamelCase = replaceStrings upperChars (map (s: " ${s}") lowerChars); - expandCamelCaseAttrs = mapAttrs' (name: value: nameValuePair (expandCamelCase name) value); + expandCamelCase = lib.replaceStrings lib.upperChars (map (s: " ${s}") lib.lowerChars); + expandCamelCaseAttrs = lib.mapAttrs' (name: value: lib.nameValuePair (expandCamelCase name) value); makeServices = daemonType: daemonIds: - mkMerge (map (daemonId: + lib.mkMerge (map (daemonId: { "ceph-${daemonType}-${daemonId}" = makeService daemonType daemonId cfg.global.clusterName cfg.${daemonType}.package; }) daemonIds); @@ -18,8 +15,8 @@ let let stateDirectory = "ceph/${if daemonType == "rgw" then "radosgw" else daemonType}/${clusterName}-${daemonId}"; in { enable = true; - description = "Ceph ${builtins.replaceStrings lowerChars upperChars daemonType} daemon ${daemonId}"; - after = [ "network-online.target" "time-sync.target" ] ++ optional (daemonType == "osd") "ceph-mon.target"; + description = "Ceph ${builtins.replaceStrings lib.lowerChars lib.upperChars daemonType} daemon ${daemonId}"; + after = [ "network-online.target" "time-sync.target" ] ++ lib.optional (daemonType == "osd") "ceph-mon.target"; wants = [ "network-online.target" "time-sync.target" ]; partOf = [ "ceph-${daemonType}.target" ]; wantedBy = [ "ceph-${daemonType}.target" ]; @@ -47,11 +44,11 @@ let Group = if daemonType == "osd" then "disk" else "ceph"; ExecStart = ''${ceph.out}/bin/${if daemonType == "rgw" then "radosgw" else "ceph-${daemonType}"} \ -f --cluster ${clusterName} --id ${daemonId}''; - } // optionalAttrs (daemonType == "osd") { + } // lib.optionalAttrs (daemonType == "osd") { ExecStartPre = "${ceph.lib}/libexec/ceph/ceph-osd-prestart.sh --id ${daemonId} --cluster ${clusterName}"; RestartSec = "20s"; PrivateDevices = "no"; # osd needs disk access - } // optionalAttrs ( daemonType == "mon") { + } // lib.optionalAttrs ( daemonType == "mon") { RestartSec = "10"; }; }; @@ -71,11 +68,11 @@ in options.services.ceph = { # Ceph has a monolithic configuration file but different sections for # each daemon, a separate client section and a global section - enable = mkEnableOption "Ceph global configuration"; + enable = lib.mkEnableOption "Ceph global configuration"; global = { - fsid = mkOption { - type = types.str; + fsid = lib.mkOption { + type = lib.types.str; example = '' 433a2193-4f8a-47a0-95d2-209d7ca2cca5 ''; @@ -85,25 +82,25 @@ in ''; }; - clusterName = mkOption { - type = types.str; + clusterName = lib.mkOption { + type = lib.types.str; default = "ceph"; description = '' Name of cluster ''; }; - mgrModulePath = mkOption { - type = types.path; + mgrModulePath = lib.mkOption { + type = lib.types.path; default = "${pkgs.ceph.lib}/lib/ceph/mgr"; - defaultText = literalExpression ''"''${pkgs.ceph.lib}/lib/ceph/mgr"''; + defaultText = lib.literalExpression ''"''${pkgs.ceph.lib}/lib/ceph/mgr"''; description = '' Path at which to find ceph-mgr modules. ''; }; - monInitialMembers = mkOption { - type = with types; nullOr commas; + monInitialMembers = lib.mkOption { + type = with lib.types; nullOr commas; default = null; example = '' node0, node1, node2 @@ -113,8 +110,8 @@ in ''; }; - monHost = mkOption { - type = with types; nullOr commas; + monHost = lib.mkOption { + type = with lib.types; nullOr commas; default = null; example = '' 10.10.0.1, 10.10.0.2, 10.10.0.3 @@ -124,40 +121,40 @@ in ''; }; - maxOpenFiles = mkOption { - type = types.int; + maxOpenFiles = lib.mkOption { + type = lib.types.int; default = 131072; description = '' Max open files for each OSD daemon. ''; }; - authClusterRequired = mkOption { - type = types.enum [ "cephx" "none" ]; + authClusterRequired = lib.mkOption { + type = lib.types.enum [ "cephx" "none" ]; default = "cephx"; description = '' Enables requiring daemons to authenticate with eachother in the cluster. ''; }; - authServiceRequired = mkOption { - type = types.enum [ "cephx" "none" ]; + authServiceRequired = lib.mkOption { + type = lib.types.enum [ "cephx" "none" ]; default = "cephx"; description = '' Enables requiring clients to authenticate with the cluster to access services in the cluster (e.g. radosgw, mds or osd). ''; }; - authClientRequired = mkOption { - type = types.enum [ "cephx" "none" ]; + authClientRequired = lib.mkOption { + type = lib.types.enum [ "cephx" "none" ]; default = "cephx"; description = '' Enables requiring the cluster to authenticate itself to the client. ''; }; - publicNetwork = mkOption { - type = with types; nullOr commas; + publicNetwork = lib.mkOption { + type = with lib.types; nullOr commas; default = null; example = '' 10.20.0.0/24, 192.168.1.0/24 @@ -167,8 +164,8 @@ in ''; }; - clusterNetwork = mkOption { - type = with types; nullOr commas; + clusterNetwork = lib.mkOption { + type = with lib.types; nullOr commas; default = null; example = '' 10.10.0.0/24, 192.168.0.0/24 @@ -178,18 +175,18 @@ in ''; }; - rgwMimeTypesFile = mkOption { - type = with types; nullOr path; + rgwMimeTypesFile = lib.mkOption { + type = with lib.types; nullOr path; default = "${pkgs.mailcap}/etc/mime.types"; - defaultText = literalExpression ''"''${pkgs.mailcap}/etc/mime.types"''; + defaultText = lib.literalExpression ''"''${pkgs.mailcap}/etc/mime.types"''; description = '' Path to mime types used by radosgw. ''; }; }; - extraConfig = mkOption { - type = with types; attrsOf str; + extraConfig = lib.mkOption { + type = with lib.types; attrsOf str; default = {}; example = { "ms bind ipv6" = "true"; @@ -200,9 +197,9 @@ in }; mgr = { - enable = mkEnableOption "Ceph MGR daemon"; - daemons = mkOption { - type = with types; listOf str; + enable = lib.mkEnableOption "Ceph MGR daemon"; + daemons = lib.mkOption { + type = with lib.types; listOf str; default = []; example = [ "name1" "name2" ]; description = '' @@ -210,9 +207,9 @@ in to the id part in ceph i.e. [ "name1" ] would result in mgr.name1 ''; }; - package = mkPackageOption pkgs "ceph" { }; - extraConfig = mkOption { - type = with types; attrsOf str; + package = lib.mkPackageOption pkgs "ceph" { }; + extraConfig = lib.mkOption { + type = with lib.types; attrsOf str; default = {}; description = '' Extra configuration to add to the global section for manager daemons. @@ -221,9 +218,9 @@ in }; mon = { - enable = mkEnableOption "Ceph MON daemon"; - daemons = mkOption { - type = with types; listOf str; + enable = lib.mkEnableOption "Ceph MON daemon"; + daemons = lib.mkOption { + type = with lib.types; listOf str; default = []; example = [ "name1" "name2" ]; description = '' @@ -231,9 +228,9 @@ in to the id part in ceph i.e. [ "name1" ] would result in mon.name1 ''; }; - package = mkPackageOption pkgs "ceph" { }; - extraConfig = mkOption { - type = with types; attrsOf str; + package = lib.mkPackageOption pkgs "ceph" { }; + extraConfig = lib.mkOption { + type = with lib.types; attrsOf str; default = {}; description = '' Extra configuration to add to the monitor section. @@ -242,9 +239,9 @@ in }; osd = { - enable = mkEnableOption "Ceph OSD daemon"; - daemons = mkOption { - type = with types; listOf str; + enable = lib.mkEnableOption "Ceph OSD daemon"; + daemons = lib.mkOption { + type = with lib.types; listOf str; default = []; example = [ "name1" "name2" ]; description = '' @@ -252,9 +249,9 @@ in to the id part in ceph i.e. [ "name1" ] would result in osd.name1 ''; }; - package = mkPackageOption pkgs "ceph" { }; - extraConfig = mkOption { - type = with types; attrsOf str; + package = lib.mkPackageOption pkgs "ceph" { }; + extraConfig = lib.mkOption { + type = with lib.types; attrsOf str; default = { "osd journal size" = "10000"; "osd pool default size" = "3"; @@ -270,9 +267,9 @@ in }; mds = { - enable = mkEnableOption "Ceph MDS daemon"; - daemons = mkOption { - type = with types; listOf str; + enable = lib.mkEnableOption "Ceph MDS daemon"; + daemons = lib.mkOption { + type = with lib.types; listOf str; default = []; example = [ "name1" "name2" ]; description = '' @@ -280,9 +277,9 @@ in to the id part in ceph i.e. [ "name1" ] would result in mds.name1 ''; }; - package = mkPackageOption pkgs "ceph" { }; - extraConfig = mkOption { - type = with types; attrsOf str; + package = lib.mkPackageOption pkgs "ceph" { }; + extraConfig = lib.mkOption { + type = with lib.types; attrsOf str; default = {}; description = '' Extra configuration to add to the MDS section. @@ -291,10 +288,10 @@ in }; rgw = { - enable = mkEnableOption "Ceph RadosGW daemon"; - package = mkPackageOption pkgs "ceph" { }; - daemons = mkOption { - type = with types; listOf str; + enable = lib.mkEnableOption "Ceph RadosGW daemon"; + package = lib.mkPackageOption pkgs "ceph" { }; + daemons = lib.mkOption { + type = with lib.types; listOf str; default = []; example = [ "name1" "name2" ]; description = '' @@ -307,11 +304,11 @@ in }; client = { - enable = mkEnableOption "Ceph client configuration"; - extraConfig = mkOption { - type = with types; attrsOf (attrsOf str); + enable = lib.mkEnableOption "Ceph client configuration"; + extraConfig = lib.mkOption { + type = with lib.types; attrsOf (attrsOf str); default = {}; - example = literalExpression '' + example = lib.literalExpression '' { # This would create a section for a radosgw daemon named node0 and related # configuration for it @@ -326,7 +323,7 @@ in }; }; - config = mkIf config.services.ceph.enable { + config = lib.mkIf config.services.ceph.enable { assertions = [ { assertion = cfg.global.fsid != ""; message = "fsid has to be set to a valid uuid for the cluster to function"; @@ -345,22 +342,22 @@ in } ]; - warnings = optional (cfg.global.monInitialMembers == null) + warnings = lib.optional (cfg.global.monInitialMembers == null) "Not setting up a list of members in monInitialMembers requires that you set the host variable for each mon daemon or else the cluster won't function"; environment.etc."ceph/ceph.conf".text = let # Merge the extraConfig set for mgr daemons, as mgr don't have their own section - globalSection = expandCamelCaseAttrs (cfg.global // cfg.extraConfig // optionalAttrs cfg.mgr.enable cfg.mgr.extraConfig); + globalSection = expandCamelCaseAttrs (cfg.global // cfg.extraConfig // lib.optionalAttrs cfg.mgr.enable cfg.mgr.extraConfig); # Remove all name-value pairs with null values from the attribute set to avoid making empty sections in the ceph.conf - globalSection' = filterAttrs (name: value: value != null) globalSection; + globalSection' = lib.filterAttrs (name: value: value != null) globalSection; totalConfig = { global = globalSection'; - } // optionalAttrs (cfg.mon.enable && cfg.mon.extraConfig != {}) { mon = cfg.mon.extraConfig; } - // optionalAttrs (cfg.mds.enable && cfg.mds.extraConfig != {}) { mds = cfg.mds.extraConfig; } - // optionalAttrs (cfg.osd.enable && cfg.osd.extraConfig != {}) { osd = cfg.osd.extraConfig; } - // optionalAttrs (cfg.client.enable && cfg.client.extraConfig != {}) cfg.client.extraConfig; + } // lib.optionalAttrs (cfg.mon.enable && cfg.mon.extraConfig != {}) { mon = cfg.mon.extraConfig; } + // lib.optionalAttrs (cfg.mds.enable && cfg.mds.extraConfig != {}) { mds = cfg.mds.extraConfig; } + // lib.optionalAttrs (cfg.osd.enable && cfg.osd.extraConfig != {}) { osd = cfg.osd.extraConfig; } + // lib.optionalAttrs (cfg.client.enable && cfg.client.extraConfig != {}) cfg.client.extraConfig; in - generators.toINI {} totalConfig; + lib.generators.toINI {} totalConfig; users.users.ceph = { uid = config.ids.uids.ceph; @@ -375,13 +372,13 @@ in systemd.services = let services = [] - ++ optional cfg.mon.enable (makeServices "mon" cfg.mon.daemons) - ++ optional cfg.mds.enable (makeServices "mds" cfg.mds.daemons) - ++ optional cfg.osd.enable (makeServices "osd" cfg.osd.daemons) - ++ optional cfg.rgw.enable (makeServices "rgw" cfg.rgw.daemons) - ++ optional cfg.mgr.enable (makeServices "mgr" cfg.mgr.daemons); + ++ lib.optional cfg.mon.enable (makeServices "mon" cfg.mon.daemons) + ++ lib.optional cfg.mds.enable (makeServices "mds" cfg.mds.daemons) + ++ lib.optional cfg.osd.enable (makeServices "osd" cfg.osd.daemons) + ++ lib.optional cfg.rgw.enable (makeServices "rgw" cfg.rgw.daemons) + ++ lib.optional cfg.mgr.enable (makeServices "mgr" cfg.mgr.daemons); in - mkMerge services; + lib.mkMerge services; systemd.targets = let targets = [ @@ -390,13 +387,13 @@ in wantedBy = [ "multi-user.target" ]; unitConfig.StopWhenUnneeded = true; }; } ] - ++ optional cfg.mon.enable (makeTarget "mon") - ++ optional cfg.mds.enable (makeTarget "mds") - ++ optional cfg.osd.enable (makeTarget "osd") - ++ optional cfg.rgw.enable (makeTarget "rgw") - ++ optional cfg.mgr.enable (makeTarget "mgr"); + ++ lib.optional cfg.mon.enable (makeTarget "mon") + ++ lib.optional cfg.mds.enable (makeTarget "mds") + ++ lib.optional cfg.osd.enable (makeTarget "osd") + ++ lib.optional cfg.rgw.enable (makeTarget "rgw") + ++ lib.optional cfg.mgr.enable (makeTarget "mgr"); in - mkMerge targets; + lib.mkMerge targets; systemd.tmpfiles.settings."10-ceph" = let defaultConfig = { @@ -407,9 +404,9 @@ in "/etc/ceph".d = defaultConfig; "/run/ceph".d = defaultConfig // { mode = "0770"; }; "/var/lib/ceph".d = defaultConfig; - "/var/lib/ceph/mgr".d = mkIf (cfg.mgr.enable) defaultConfig; - "/var/lib/ceph/mon".d = mkIf (cfg.mon.enable) defaultConfig; - "/var/lib/ceph/osd".d = mkIf (cfg.osd.enable) defaultConfig; + "/var/lib/ceph/mgr".d = lib.mkIf (cfg.mgr.enable) defaultConfig; + "/var/lib/ceph/mon".d = lib.mkIf (cfg.mon.enable) defaultConfig; + "/var/lib/ceph/osd".d = lib.mkIf (cfg.osd.enable) defaultConfig; }; }; } From 113a9e9f21b981a769cc89ff58d85254c00fddf7 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 1 Jul 2024 14:18:45 +0200 Subject: [PATCH 075/298] mistral-rs: 0.1.18 -> 0.3.0 Diff: https://github.com/EricLBuehler/mistral.rs/compare/refs/tags/v0.1.18...v0.3.0 Changelog: https://github.com/EricLBuehler/mistral.rs/releases/tag/v0.3.0 --- pkgs/by-name/mi/mistral-rs/Cargo.lock | 1579 +++++++++++------------- pkgs/by-name/mi/mistral-rs/package.nix | 42 +- 2 files changed, 733 insertions(+), 888 deletions(-) diff --git a/pkgs/by-name/mi/mistral-rs/Cargo.lock b/pkgs/by-name/mi/mistral-rs/Cargo.lock index edc87e02386e..4f74c843815b 100644 --- a/pkgs/by-name/mi/mistral-rs/Cargo.lock +++ b/pkgs/by-name/mi/mistral-rs/Cargo.lock @@ -33,6 +33,12 @@ 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 = "ahash" version = "0.8.11" @@ -60,12 +66,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1763692fc1416554cf051efc56a3de5595eca47299d731cc5c2b583adf8b4d2f" -[[package]] -name = "aligned-vec" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1" - [[package]] name = "allocator-api2" version = "0.2.18" @@ -89,9 +89,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.14" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", @@ -104,33 +104,33 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -154,32 +154,21 @@ dependencies = [ "derive_arbitrary", ] -[[package]] -name = "arg_enum_proc_macro" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.76", ] [[package]] @@ -194,29 +183,6 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" -[[package]] -name = "av1-grain" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6678909d8c5d46a42abcf571271e15fdbc0a225e3646cf23762cd415046c78bf" -dependencies = [ - "anyhow", - "arrayvec", - "log", - "nom", - "num-rational", - "v_frame", -] - -[[package]] -name = "avif-serialize" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876c75a42f6364451a033496a14c44bffe41f5f4a8236f697391f11024e596d2" -dependencies = [ - "arrayvec", -] - [[package]] name = "axum" version = "0.7.5" @@ -282,7 +248,7 @@ dependencies = [ "cc", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.7.4", "object", "rustc-demangle", ] @@ -316,6 +282,16 @@ dependencies = [ "rayon", ] +[[package]] +name = "bindgen_cuda" +version = "0.1.6" +source = "git+https://github.com/guoqingbao/bindgen_cuda.git#fb7ed75f3901b146aa1ba460baaeed5b494f2e0d" +dependencies = [ + "glob", + "num_cpus", + "rayon", +] + [[package]] name = "bit_field" version = "0.10.2" @@ -330,15 +306,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" - -[[package]] -name = "bitstream-io" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c12d1856e42f0d817a835fe55853957c85c8c8a470114029143d3f12671446e" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "block" @@ -365,17 +335,11 @@ dependencies = [ "proc-macro2", "quote", "str_inflector", - "syn 2.0.66", + "syn 2.0.76", "thiserror", "try_match", ] -[[package]] -name = "built" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6a6c0b39c38fd754ac338b00a88066436389c0f029da5d37d1e01091d9b7c17" - [[package]] name = "bumpalo" version = "3.16.0" @@ -384,22 +348,22 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.16.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" +checksum = "773d90827bc3feecfb67fab12e24de0749aad83c74b9504ecde46237b5cd24e2" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" +checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.76", ] [[package]] @@ -416,14 +380,14 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" [[package]] name = "bytes" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] name = "candle-core" version = "0.6.0" -source = "git+https://github.com/EricLBuehler/candle.git?rev=f52e2347b6237d19ffd7af26315f543c22f9f286#f52e2347b6237d19ffd7af26315f543c22f9f286" +source = "git+https://github.com/EricLBuehler/candle.git?rev=3c8e120#3c8e120e8a6ae88b41ee251ec6255035864858d6" dependencies = [ "accelerate-src", "byteorder", @@ -450,10 +414,10 @@ dependencies = [ [[package]] name = "candle-flash-attn" version = "0.6.0" -source = "git+https://github.com/EricLBuehler/candle.git?rev=f52e2347b6237d19ffd7af26315f543c22f9f286#f52e2347b6237d19ffd7af26315f543c22f9f286" +source = "git+https://github.com/EricLBuehler/candle.git?rev=3c8e120#3c8e120e8a6ae88b41ee251ec6255035864858d6" dependencies = [ "anyhow", - "bindgen_cuda", + "bindgen_cuda 0.1.5", "candle-core", "half", ] @@ -461,15 +425,15 @@ dependencies = [ [[package]] name = "candle-kernels" version = "0.6.0" -source = "git+https://github.com/EricLBuehler/candle.git?rev=f52e2347b6237d19ffd7af26315f543c22f9f286#f52e2347b6237d19ffd7af26315f543c22f9f286" +source = "git+https://github.com/EricLBuehler/candle.git?rev=3c8e120#3c8e120e8a6ae88b41ee251ec6255035864858d6" dependencies = [ - "bindgen_cuda", + "bindgen_cuda 0.1.5", ] [[package]] name = "candle-metal-kernels" version = "0.6.0" -source = "git+https://github.com/EricLBuehler/candle.git?rev=f52e2347b6237d19ffd7af26315f543c22f9f286#f52e2347b6237d19ffd7af26315f543c22f9f286" +source = "git+https://github.com/EricLBuehler/candle.git?rev=3c8e120#3c8e120e8a6ae88b41ee251ec6255035864858d6" dependencies = [ "metal", "once_cell", @@ -480,7 +444,7 @@ dependencies = [ [[package]] name = "candle-nn" version = "0.6.0" -source = "git+https://github.com/EricLBuehler/candle.git?rev=f52e2347b6237d19ffd7af26315f543c22f9f286#f52e2347b6237d19ffd7af26315f543c22f9f286" +source = "git+https://github.com/EricLBuehler/candle.git?rev=3c8e120#3c8e120e8a6ae88b41ee251ec6255035864858d6" dependencies = [ "accelerate-src", "candle-core", @@ -497,23 +461,11 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.99" +version = "1.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" +checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" dependencies = [ - "jobserver", - "libc", - "once_cell", -] - -[[package]] -name = "cfg-expr" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" -dependencies = [ - "smallvec", - "target-lexicon", + "shlex", ] [[package]] @@ -524,15 +476,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cfg_aliases" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "cfgrammar" -version = "0.13.6" +version = "0.13.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec07af28018dd8b4b52e49eb6e57268b19dda0996d4824889eb07ee0ef67378c" +checksum = "6026d8cd82ada8bbcfe337805dd1eb6afdc9e80fa4d57e977b3a36315e0c5525" dependencies = [ "indexmap", "lazy_static", @@ -553,14 +505,14 @@ dependencies = [ "js-sys", "num-traits", "wasm-bindgen", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] name = "chrono-tz" -version = "0.8.6" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59ae0466b83e838b81a54256c39d5d7c20b9d7daa10510a242d9b75abd5936e" +checksum = "93698b29de5e97ad0ae26447b344c482a7284c737d9ddc5f9e52b74a336671bb" dependencies = [ "chrono", "chrono-tz-build", @@ -569,9 +521,9 @@ dependencies = [ [[package]] name = "chrono-tz-build" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433e39f13c9a060046954e0592a8d0a4bcb1040125cbf91cb8ee58964cfb350f" +checksum = "0c088aee841df9c3041febbb73934cfc39708749bf96dc827e3359cd39ef11b1" dependencies = [ "parse-zoneinfo", "phf", @@ -580,9 +532,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.7" +version = "4.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f" +checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" dependencies = [ "clap_builder", "clap_derive", @@ -590,9 +542,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.7" +version = "4.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f" +checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" dependencies = [ "anstream", "anstyle", @@ -602,27 +554,27 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.5" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.76", ] [[package]] name = "clap_lex" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "cli-table" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adfbb116d9e2c4be7011360d0c0bee565712c11e969c9609b25b619366dc379d" +checksum = "b53f9241f288a7b12c56565f04aaeaeeab6b8923d42d99255d4ca428b4d97f89" dependencies = [ "cli-table-derive", "csv", @@ -632,9 +584,9 @@ dependencies = [ [[package]] name = "cli-table-derive" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2af3bfb9da627b0a6c467624fb7963921433774ed435493b5c08a3053e829ad4" +checksum = "3e83a93253aaae7c74eb7428ce4faa6e219ba94886908048888701819f82fb94" dependencies = [ "proc-macro2", "quote", @@ -649,9 +601,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "colorchoice" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "console" @@ -678,9 +630,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "core-graphics-types" @@ -695,9 +647,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" dependencies = [ "libc", ] @@ -745,7 +697,7 @@ dependencies = [ "bitflags 1.3.2", "crossterm_winapi", "libc", - "mio", + "mio 0.8.11", "parking_lot", "signal-hook", "signal-hook-mio", @@ -800,12 +752,12 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.4.4" +version = "3.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345" +checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3" dependencies = [ "nix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -830,12 +782,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ - "darling_core 0.20.9", - "darling_macro 0.20.9", + "darling_core 0.20.10", + "darling_macro 0.20.10", ] [[package]] @@ -854,16 +806,16 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.66", + "syn 2.0.76", ] [[package]] @@ -879,15 +831,21 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ - "darling_core 0.20.9", + "darling_core 0.20.10", "quote", - "syn 2.0.66", + "syn 2.0.76", ] +[[package]] +name = "data-url" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" + [[package]] name = "defmac" version = "0.1.3" @@ -902,7 +860,7 @@ checksum = "d150dea618e920167e5973d70ae6ece4385b7164e0d799fe7c122dd0a5d912ad" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.76", ] [[package]] @@ -913,7 +871,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.76", ] [[package]] @@ -931,10 +889,10 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" dependencies = [ - "darling 0.20.9", + "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.76", ] [[package]] @@ -944,18 +902,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" dependencies = [ "derive_builder_core", - "syn 2.0.66", + "syn 2.0.76", ] [[package]] name = "derive_more" -version = "0.99.17" +version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.76", ] [[package]] @@ -1000,15 +958,21 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.76", ] +[[package]] +name = "dyn-clone" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" + [[package]] name = "dyn-stack" version = "0.10.0" @@ -1021,9 +985,9 @@ dependencies = [ [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" dependencies = [ "serde", ] @@ -1058,7 +1022,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.76", ] [[package]] @@ -1096,7 +1060,7 @@ dependencies = [ "flume", "half", "lebe", - "miniz_oxide", + "miniz_oxide 0.7.4", "rayon-core", "smallvec", "zune-inflate", @@ -1114,9 +1078,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fdeflate" @@ -1129,24 +1093,24 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", + "libredox", + "windows-sys 0.59.0", ] [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -1191,7 +1155,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.76", ] [[package]] @@ -1271,7 +1235,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.76", ] [[package]] @@ -1489,9 +1453,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "h2" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" dependencies = [ "atomic-waker", "bytes", @@ -1578,9 +1542,9 @@ dependencies = [ [[package]] name = "http-body" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", "http", @@ -1601,9 +1565,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.9.3" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0e7a4dd27b9476dc40cb050d3632d3bba3a70ddbff012285f7f8559a1e7e545" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -1613,9 +1577,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "1.3.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ "bytes", "futures-channel", @@ -1634,9 +1598,9 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.26.0" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" dependencies = [ "futures-util", "http", @@ -1647,6 +1611,7 @@ dependencies = [ "tokio", "tokio-rustls", "tower-service", + "webpki-roots", ] [[package]] @@ -1667,9 +1632,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.5" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" dependencies = [ "bytes", "futures-channel", @@ -1708,124 +1673,6 @@ dependencies = [ "cc", ] -[[package]] -name = "icu_collections" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" -dependencies = [ - "displaydoc", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_locid" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" -dependencies = [ - "displaydoc", - "litemap", - "tinystr", - "writeable", - "zerovec", -] - -[[package]] -name = "icu_locid_transform" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_locid_transform_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_locid_transform_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" - -[[package]] -name = "icu_normalizer" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" -dependencies = [ - "displaydoc", - "icu_collections", - "icu_normalizer_data", - "icu_properties", - "icu_provider", - "smallvec", - "utf16_iter", - "utf8_iter", - "write16", - "zerovec", -] - -[[package]] -name = "icu_normalizer_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" - -[[package]] -name = "icu_properties" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f8ac670d7422d7f76b32e17a5db556510825b29ec9154f235977c9caba61036" -dependencies = [ - "displaydoc", - "icu_collections", - "icu_locid_transform", - "icu_properties_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_properties_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" - -[[package]] -name = "icu_provider" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_provider_macros", - "stable_deref_trait", - "tinystr", - "writeable", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_provider_macros" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "ident_case" version = "1.0.1" @@ -1834,24 +1681,22 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "1.0.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4716a3a0933a1d01c2f72450e89596eb51dd34ef3c211ccd875acdf1f8fe47ed" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ - "icu_normalizer", - "icu_properties", - "smallvec", - "utf8_iter", + "unicode-bidi", + "unicode-normalization", ] [[package]] name = "image" -version = "0.25.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" +checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" dependencies = [ "bytemuck", - "byteorder", + "byteorder-lite", "color_quant", "exr", "gif", @@ -1859,9 +1704,6 @@ dependencies = [ "num-traits", "png", "qoi", - "ravif", - "rayon", - "rgb", "tiff", "zune-core", "zune-jpeg", @@ -1869,20 +1711,14 @@ dependencies = [ [[package]] name = "image-webp" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d730b085583c4d789dfd07fdcf185be59501666a90c97c40162b37e4fdad272d" +checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904" dependencies = [ "byteorder-lite", - "thiserror", + "quick-error", ] -[[package]] -name = "imgref" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" - [[package]] name = "indenter" version = "0.3.3" @@ -1891,9 +1727,9 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" [[package]] name = "indexmap" -version = "2.2.6" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" dependencies = [ "equivalent", "hashbrown", @@ -1951,17 +1787,6 @@ dependencies = [ "walkdir", ] -[[package]] -name = "interpolate_name" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "ipnet" version = "2.9.0" @@ -1970,9 +1795,9 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is_terminal_polyfill" -version = "1.70.0" +version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itertools" @@ -2007,15 +1832,6 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" -[[package]] -name = "jobserver" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" -dependencies = [ - "libc", -] - [[package]] name = "jpeg-decoder" version = "0.3.1" @@ -2024,18 +1840,18 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lebe" @@ -2045,29 +1861,18 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.155" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" - -[[package]] -name = "libfuzzer-sys" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7" -dependencies = [ - "arbitrary", - "cc", - "once_cell", -] +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libloading" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -2082,8 +1887,9 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", + "redox_syscall", ] [[package]] @@ -2092,12 +1898,6 @@ version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" -[[package]] -name = "litemap" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" - [[package]] name = "lock_api" version = "0.4.12" @@ -2110,24 +1910,15 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" - -[[package]] -name = "loop9" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062" -dependencies = [ - "imgref", -] +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lrtable" -version = "0.13.6" +version = "0.13.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fcefc5628209d1b1f4b2cd0bcefd0e50be80bdf178e886cb07317f5ce4f2856" +checksum = "d42d2752cb50a171efadda0cb6fa97432e8bf05accfff3eed320b87e80a2f69e" dependencies = [ "cfgrammar", "fnv", @@ -2176,16 +1967,6 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" -[[package]] -name = "maybe-rayon" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" -dependencies = [ - "cfg-if", - "rayon", -] - [[package]] name = "memchr" version = "2.7.4" @@ -2217,7 +1998,7 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block", "core-graphics-types", "foreign-types 0.5.0", @@ -2234,9 +2015,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" dependencies = [ "mime", "unicase", @@ -2244,18 +2025,19 @@ dependencies = [ [[package]] name = "minijinja" -version = "2.0.2" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e136ef580d7955019ab0a407b68d77c292a9976907e217900f3f76bc8f6dc1a4" +checksum = "6d7d3e3a3eece1fa4618237ad41e1de855ced47eab705cec1c9a920e1d1c5aad" dependencies = [ "serde", + "serde_json", ] [[package]] name = "minijinja-contrib" -version = "2.0.2" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15ee37078c98d31e510d6a7af488031a2c3ccacdb76c5c4fc98ddfe6d0e9da07" +checksum = "744a2b84dbd22398e347594ed2aef9d3f1b948934e3e6e94ef69ecd39d597f4b" dependencies = [ "minijinja", "serde", @@ -2269,14 +2051,23 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", "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" @@ -2289,29 +2080,44 @@ 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", + "libc", + "wasi", + "windows-sys 0.52.0", +] + [[package]] name = "mistralrs" -version = "0.1.18" +version = "0.3.0" dependencies = [ "anyhow", "candle-core", "either", + "futures", "image", "indexmap", "mistralrs-core", + "rand", + "reqwest", + "serde", "serde_json", "tokio", ] [[package]] name = "mistralrs-bench" -version = "0.1.18" +version = "0.3.0" dependencies = [ "anyhow", "candle-core", "clap", "cli-table", - "either", "mistralrs-core", "serde", "serde_json", @@ -2321,21 +2127,24 @@ dependencies = [ [[package]] name = "mistralrs-core" -version = "0.1.18" +version = "0.3.0" dependencies = [ "accelerate-src", "akin", "anyhow", "async-trait", - "bindgen_cuda", + "base64 0.22.1", + "bindgen_cuda 0.1.5", "buildstructor", "bytemuck", + "bytemuck_derive", "candle-core", "candle-flash-attn", "candle-nn", "cfgrammar", "chrono", "clap", + "csv", "derive-new", "derive_more", "dirs", @@ -2352,19 +2161,25 @@ dependencies = [ "lrtable", "minijinja", "minijinja-contrib", + "mistralrs-paged-attn", + "mistralrs-quant", "mistralrs-vision", "once_cell", "pyo3", "radix_trie", "rand", "rand_isaac", - "range-checked", "rayon", + "regex", "regex-automata 0.4.7", + "reqwest", "rustc-hash", + "schemars", "serde", "serde_json", + "serde_yaml", "strum", + "sysinfo", "thiserror", "tokenizers", "tokio", @@ -2373,17 +2188,30 @@ dependencies = [ "tqdm", "tracing", "tracing-subscriber", + "uuid 1.10.0", "variantly", "vob", ] +[[package]] +name = "mistralrs-paged-attn" +version = "0.3.0" +dependencies = [ + "anyhow", + "bindgen_cuda 0.1.6", + "candle-core", + "half", +] + [[package]] name = "mistralrs-pyo3" -version = "0.1.18" +version = "0.3.0" dependencies = [ "accelerate-src", + "anyhow", "base64 0.22.1", "candle-core", + "data-url", "either", "futures", "image", @@ -2396,19 +2224,35 @@ dependencies = [ "serde", "serde_json", "tokio", + "url", +] + +[[package]] +name = "mistralrs-quant" +version = "0.3.0" +dependencies = [ + "bindgen_cuda 0.1.5", + "candle-core", + "candle-nn", + "half", + "lazy_static", + "paste", + "rayon", + "serde", + "tracing", ] [[package]] name = "mistralrs-server" -version = "0.1.18" +version = "0.3.0" dependencies = [ "accelerate-src", "anyhow", "axum", - "base64 0.22.1", "candle-core", "clap", "ctrlc", + "data-url", "either", "futures", "image", @@ -2422,13 +2266,14 @@ dependencies = [ "tokio", "tower-http", "tracing", + "url", "utoipa", "utoipa-swagger-ui", ] [[package]] name = "mistralrs-vision" -version = "0.1.18" +version = "0.3.0" dependencies = [ "candle-core", "image", @@ -2452,7 +2297,7 @@ checksum = "a7ce64b975ed4f123575d11afd9491f2e37bbd5813fbfbc0f09ae1fbddea74e0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.76", ] [[package]] @@ -2472,12 +2317,6 @@ dependencies = [ "tempfile", ] -[[package]] -name = "new_debug_unreachable" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" - [[package]] name = "nibble_vec" version = "0.1.0" @@ -2489,11 +2328,11 @@ dependencies = [ [[package]] name = "nix" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "cfg_aliases", "libc", @@ -2510,10 +2349,13 @@ dependencies = [ ] [[package]] -name = "noop_proc_macro" -version = "0.3.0" +name = "ntapi" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" +dependencies = [ + "winapi", +] [[package]] name = "nu-ansi-term" @@ -2527,9 +2369,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits", @@ -2545,17 +2387,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-derive" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "num-integer" version = "0.1.46" @@ -2598,23 +2429,23 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.76", ] [[package]] @@ -2644,23 +2475,27 @@ dependencies = [ [[package]] name = "object" -version = "0.36.0" +version = "0.36.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" +checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" dependencies = [ "memchr", ] [[package]] name = "oci-spec" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e423c4f827362c0d8d8da4b1f571270f389ebde73bcd3240a3d23c6d6f61d0f0" +checksum = "3f5a3fe998d50101ae009351fec56d88a69f4ed182e11000e711068c2f5abf72" dependencies = [ "derive_builder", "getset", + "once_cell", + "regex", "serde", "serde_json", + "strum", + "strum_macros", "thiserror", ] @@ -2687,7 +2522,7 @@ dependencies = [ "toml", "ureq", "url", - "uuid 1.8.0", + "uuid 1.10.0", "walkdir", ] @@ -2721,11 +2556,11 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.64" +version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "foreign-types 0.3.2", "libc", @@ -2742,7 +2577,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.76", ] [[package]] @@ -2753,9 +2588,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.102" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", @@ -2803,9 +2638,9 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.1", + "redox_syscall", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -2884,7 +2719,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.76", ] [[package]] @@ -2915,28 +2750,31 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide", + "miniz_oxide 0.7.4", ] [[package]] name = "portable-atomic" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.21.1", + "toml_edit", ] [[package]] @@ -2965,37 +2803,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] -[[package]] -name = "profiling" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" -dependencies = [ - "profiling-procmacros", -] - -[[package]] -name = "profiling-procmacros" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" -dependencies = [ - "quote", - "syn 2.0.66", -] - [[package]] name = "pulp" -version = "0.18.21" +version = "0.18.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ec8d02258294f59e4e223b41ad7e81c874aa6b15bc4ced9ba3965826da0eed5" +checksum = "a0a01a0dc67cf4558d279f0c25b0962bd08fc6dec0137699eae304103e882fe6" dependencies = [ "bytemuck", "libm", @@ -3005,9 +2824,9 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.21.2" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e00b96a521718e08e03b1a622f01c8a8deb50719335de3f60b3b3950f069d8" +checksum = "831e8e819a138c36e212f3af3fd9eeffed6bf1510a805af35b0edee5ffa59433" dependencies = [ "anyhow", "cfg-if", @@ -3022,7 +2841,8 @@ dependencies = [ "memoffset", "num-bigint", "num-complex", - "parking_lot", + "num-rational", + "once_cell", "portable-atomic", "pyo3-build-config", "pyo3-ffi", @@ -3035,9 +2855,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.21.2" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7883df5835fafdad87c0d888b266c8ec0f4c9ca48a5bed6bbb592e8dedee1b50" +checksum = "1e8730e591b14492a8945cdff32f089250b05f5accecf74aeddf9e8272ce1fa8" dependencies = [ "once_cell", "target-lexicon", @@ -3045,9 +2865,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.21.2" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01be5843dc60b916ab4dad1dca6d20b9b4e6ddc8e15f50c47fe6d85f1fb97403" +checksum = "5e97e919d2df92eb88ca80a037969f44e5e70356559654962cbb3316d00300c6" dependencies = [ "libc", "pyo3-build-config", @@ -3055,27 +2875,27 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.21.2" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77b34069fc0682e11b31dbd10321cbf94808394c56fd996796ce45217dfac53c" +checksum = "eb57983022ad41f9e683a599f2fd13c3664d7063a3ac5714cae4b7bee7d3f206" dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.66", + "syn 2.0.76", ] [[package]] name = "pyo3-macros-backend" -version = "0.21.2" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08260721f32db5e1a5beae69a55553f56b99bd0e1c3e6e0a5e8851a9d0f5a85c" +checksum = "ec480c0c51ddec81019531705acac51bcdbeae563557c982aa8263bb96880372" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "pyo3-build-config", "quote", - "syn 2.0.66", + "syn 2.0.76", ] [[package]] @@ -3094,10 +2914,58 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] -name = "quote" -version = "1.0.36" +name = "quinn" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash", + "rustls", + "socket2", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.11.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd" +dependencies = [ + "bytes", + "rand", + "ring", + "rustc-hash", + "rustls", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] +name = "quinn-udp" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285" +dependencies = [ + "libc", + "once_cell", + "socket2", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -3161,61 +3029,6 @@ dependencies = [ "rand_core", ] -[[package]] -name = "range-checked" -version = "0.1.0" -source = "git+https://github.com/EricLBuehler/range-checked.git#655349cc093fcd4965f35b25de394a24ff4b0c7b" - -[[package]] -name = "rav1e" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd87ce80a7665b1cce111f8a16c1f3929f6547ce91ade6addf4ec86a8dda5ce9" -dependencies = [ - "arbitrary", - "arg_enum_proc_macro", - "arrayvec", - "av1-grain", - "bitstream-io", - "built", - "cfg-if", - "interpolate_name", - "itertools 0.12.1", - "libc", - "libfuzzer-sys", - "log", - "maybe-rayon", - "new_debug_unreachable", - "noop_proc_macro", - "num-derive", - "num-traits", - "once_cell", - "paste", - "profiling", - "rand", - "rand_chacha", - "simd_helpers", - "system-deps", - "thiserror", - "v_frame", - "wasm-bindgen", -] - -[[package]] -name = "ravif" -version = "0.11.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc13288f5ab39e6d7c9d501759712e6969fcc9734220846fc9ed26cae2cc4234" -dependencies = [ - "avif-serialize", - "imgref", - "loop9", - "quick-error", - "rav1e", - "rayon", - "rgb", -] - [[package]] name = "raw-cpuid" version = "10.7.0" @@ -3264,27 +3077,18 @@ checksum = "03251193000f4bd3b042892be858ee50e8b3719f2b08e5833ac4353724632430" [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" -dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] name = "redox_users" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", @@ -3293,9 +3097,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.5" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -3337,9 +3141,9 @@ checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "reqwest" -version = "0.12.4" +version = "0.12.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" dependencies = [ "base64 0.22.1", "bytes", @@ -3363,13 +3167,14 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", + "quinn", "rustls", "rustls-pemfile", "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 0.1.2", + "sync_wrapper 1.0.1", "system-configuration", "tokio", "tokio-native-tls", @@ -3380,16 +3185,7 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "webpki-roots", - "winreg", -] - -[[package]] -name = "rgb" -version = "0.8.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" -dependencies = [ - "bytemuck", + "windows-registry", ] [[package]] @@ -3409,9 +3205,9 @@ dependencies = [ [[package]] name = "rust-embed" -version = "8.4.0" +version = "8.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19549741604902eb99a7ed0ee177a0663ee1eda51a29f71401f166e47e77806a" +checksum = "fa66af4a4fdd5e7ebc276f115e895611a34739a9c1c01028383d612d550953c0" dependencies = [ "rust-embed-impl", "rust-embed-utils", @@ -3420,22 +3216,22 @@ dependencies = [ [[package]] name = "rust-embed-impl" -version = "8.4.0" +version = "8.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb9f96e283ec64401f30d3df8ee2aaeb2561f34c824381efa24a35f79bf40ee4" +checksum = "6125dbc8867951125eec87294137f4e9c2c96566e61bf72c45095a7c77761478" dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.66", + "syn 2.0.76", "walkdir", ] [[package]] name = "rust-embed-utils" -version = "8.4.0" +version = "8.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38c74a686185620830701348de757fd36bef4aa9680fd23c49fc539ddcc1af32" +checksum = "2e5347777e9aacb56039b0e1f28785929a8a3b709e87482e7442c72e7c12529d" dependencies = [ "sha2", "walkdir", @@ -3443,9 +3239,9 @@ dependencies = [ [[package]] name = "rust_decimal" -version = "1.35.0" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" +checksum = "b082d80e3e3cc52b2ed634388d436fe1f4de6af5786cc2de9ba9737527bdf555" dependencies = [ "arrayvec", "num-traits", @@ -3459,9 +3255,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" -version = "1.1.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" [[package]] name = "rustc_version" @@ -3474,11 +3270,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -3487,11 +3283,12 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.4" +version = "0.23.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" dependencies = [ "log", + "once_cell", "ring", "rustls-pki-types", "rustls-webpki", @@ -3501,9 +3298,9 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" dependencies = [ "base64 0.22.1", "rustls-pki-types", @@ -3511,15 +3308,15 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" [[package]] name = "rustls-webpki" -version = "0.102.4" +version = "0.102.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" +checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56" dependencies = [ "ring", "rustls-pki-types", @@ -3540,9 +3337,9 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "safetensors" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ced76b22c7fba1162f11a5a75d9d8405264b467a07ae0c9c29be119b9297db9" +checksum = "7725d4d98fa515472f43a6e2bbf956c48e06b89bb50593a040e5945160214450" dependencies = [ "serde", "serde_json", @@ -3566,6 +3363,30 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "schemars" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" +dependencies = [ + "dyn-clone", + "schemars_derive", + "serde", + "serde_json", +] + +[[package]] +name = "schemars_derive" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", + "syn 2.0.76", +] + [[package]] name = "scopeguard" version = "1.2.0" @@ -3574,11 +3395,11 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "security-framework" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -3587,9 +3408,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -3609,31 +3430,43 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.76", +] + +[[package]] +name = "serde_derive_internals" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -3650,9 +3483,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -3669,6 +3502,19 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_yaml" +version = "0.9.34+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" +dependencies = [ + "indexmap", + "itoa", + "ryu", + "serde", + "unsafe-libyaml", +] + [[package]] name = "sha2" version = "0.10.8" @@ -3689,6 +3535,12 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "signal-hook" version = "0.3.17" @@ -3701,12 +3553,12 @@ dependencies = [ [[package]] name = "signal-hook-mio" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" +checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" dependencies = [ "libc", - "mio", + "mio 0.8.11", "signal-hook", ] @@ -3725,15 +3577,6 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" -[[package]] -name = "simd_helpers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6" -dependencies = [ - "quote", -] - [[package]] name = "siphasher" version = "0.3.11" @@ -3828,9 +3671,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" -version = "0.26.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ "strum_macros", ] @@ -3845,14 +3688,14 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.66", + "syn 2.0.76", ] [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" @@ -3867,9 +3710,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.66" +version = "2.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525" dependencies = [ "proc-macro2", "quote", @@ -3887,6 +3730,9 @@ name = "sync_wrapper" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] [[package]] name = "synstructure" @@ -3896,7 +3742,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.76", ] [[package]] @@ -3905,7 +3751,7 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec7dddc5f0fee506baf8b9fdb989e242f17e4b11c61dfbb0635b705217199eea" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "byteorder", "enum-as-inner", "libc", @@ -3914,39 +3760,41 @@ dependencies = [ ] [[package]] -name = "system-configuration" -version = "0.5.1" +name = "sysinfo" +version = "0.30.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3" dependencies = [ - "bitflags 1.3.2", + "cfg-if", + "core-foundation-sys", + "libc", + "ntapi", + "once_cell", + "rayon", + "windows", +] + +[[package]] +name = "system-configuration" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" +dependencies = [ + "bitflags 2.6.0", "core-foundation", "system-configuration-sys", ] [[package]] name = "system-configuration-sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" 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", - "heck 0.5.0", - "pkg-config", - "toml", - "version-compare", -] - [[package]] name = "tar" version = "0.4.41" @@ -3960,20 +3808,21 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.14" +version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", "fastrand", + "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3987,22 +3836,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.76", ] [[package]] @@ -4027,15 +3876,20 @@ dependencies = [ ] [[package]] -name = "tinystr" -version = "0.7.6" +name = "tinyvec" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ - "displaydoc", - "zerovec", + "tinyvec_macros", ] +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + [[package]] name = "tokenizers" version = "0.19.1" @@ -4070,32 +3924,31 @@ dependencies = [ [[package]] name = "tokio" -version = "1.38.0" +version = "1.39.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" +checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" dependencies = [ "backtrace", "bytes", "libc", - "mio", - "num_cpus", + "mio 1.0.2", "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.76", ] [[package]] @@ -4120,9 +3973,9 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ "rustls", "rustls-pki-types", @@ -4144,47 +3997,36 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.14" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.14", + "toml_edit", ] [[package]] name = "toml_datetime" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.21.1" +version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.13", + "winnow", ] [[package]] @@ -4209,7 +4051,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "bytes", "http", "http-body", @@ -4221,15 +4063,15 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tqdm" @@ -4262,7 +4104,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.76", ] [[package]] @@ -4312,22 +4154,22 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "try_match" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61ae3c1941e8859e30d28e572683fbfa89ae5330748b45139aedf488389e2be4" +checksum = "b065c869a3f832418e279aa4c1d7088f9d5d323bde15a60a08e20c2cd4549082" dependencies = [ "try_match_inner", ] [[package]] name = "try_match_inner" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0a91713132798caecb23c977488945566875e7b61b902fb111979871cbff34e" +checksum = "b9c81686f7ab4065ccac3df7a910c4249f8c0f3fb70421d6ddec19b9311f63f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.76", ] [[package]] @@ -4351,12 +4193,27 @@ 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 = "unicode-normalization-alignments" version = "0.1.12" @@ -4390,6 +4247,12 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" +[[package]] +name = "unsafe-libyaml" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" + [[package]] name = "untrusted" version = "0.9.0" @@ -4398,9 +4261,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.9.7" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd" +checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a" dependencies = [ "base64 0.22.1", "flate2", @@ -4409,7 +4272,6 @@ dependencies = [ "once_cell", "rustls", "rustls-pki-types", - "rustls-webpki", "serde", "serde_json", "url", @@ -4418,27 +4280,15 @@ dependencies = [ [[package]] name = "url" -version = "2.5.1" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c25da092f0a868cdf09e8674cd3b7ef3a7d92a24253e663a2fb85e2496de56" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", "percent-encoding", ] -[[package]] -name = "utf16_iter" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" - -[[package]] -name = "utf8_iter" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" - [[package]] name = "utf8parse" version = "0.2.2" @@ -4467,7 +4317,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.66", + "syn 2.0.76", ] [[package]] @@ -4499,24 +4349,13 @@ dependencies = [ [[package]] name = "uuid" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "getrandom", ] -[[package]] -name = "v_frame" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6f32aaa24bacd11e488aa9ba66369c7cd514885742c9fe08cfe85884db3e92b" -dependencies = [ - "aligned-vec", - "num-traits", - "wasm-bindgen", -] - [[package]] name = "valuable" version = "0.1.0" @@ -4543,17 +4382,11 @@ 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.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "vob" @@ -4593,34 +4426,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.76", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ "cfg-if", "js-sys", @@ -4630,9 +4464,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4640,28 +4474,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.76", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", @@ -4669,9 +4503,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c452ad30530b54a4d8e71952716a212b08efd0f3562baa66c29a618b07da7c3" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" dependencies = [ "rustls-pki-types", ] @@ -4700,11 +4534,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4713,13 +4547,53 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core", + "windows-targets 0.52.6", +] + [[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.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", ] [[package]] @@ -4737,7 +4611,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "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]] @@ -4757,18 +4640,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "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.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "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]] @@ -4779,9 +4662,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -4791,9 +4674,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -4803,15 +4686,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -4821,9 +4704,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -4833,9 +4716,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -4845,9 +4728,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -4857,50 +4740,19 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.5.40" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] -[[package]] -name = "winnow" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "write16" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" - -[[package]] -name = "writeable" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" - [[package]] name = "xattr" version = "1.3.1" @@ -4932,28 +4784,29 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.76", "synstructure", ] [[package]] name = "zerocopy" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ + "byteorder", "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.76", ] [[package]] @@ -4973,7 +4826,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.76", "synstructure", ] @@ -4983,28 +4836,6 @@ version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" -[[package]] -name = "zerovec" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2cc8827d6c0994478a15c53f374f46fbd41bea663d809b14744bc42e6b109c" -dependencies = [ - "yoke", - "zerofrom", - "zerovec-derive", -] - -[[package]] -name = "zerovec-derive" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97cf56601ee5052b4417d90c8755c6683473c926039908196cf35d99f893ebe7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "zip" version = "1.1.4" @@ -5038,9 +4869,9 @@ dependencies = [ [[package]] name = "zune-jpeg" -version = "0.4.11" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448" +checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768" dependencies = [ "zune-core", ] diff --git a/pkgs/by-name/mi/mistral-rs/package.nix b/pkgs/by-name/mi/mistral-rs/package.nix index 4c5324e8d856..9f4bf825664f 100644 --- a/pkgs/by-name/mi/mistral-rs/package.nix +++ b/pkgs/by-name/mi/mistral-rs/package.nix @@ -19,6 +19,7 @@ testers, mistral-rs, + nix-update-script, cudaPackages, cudaCapability ? null, @@ -56,7 +57,6 @@ let cudaCapability; cudaCapability' = lib.toInt (cudaPackages.cudaFlags.dropDot cudaCapabilityString); - # TODO Should we assert mklAccel -> stdenv.isLinux && stdenv.isx86_64 ? mklSupport = assert accelIsValid; (acceleration == "mkl"); @@ -80,27 +80,23 @@ in rustPlatform.buildRustPackage rec { pname = "mistral-rs"; - version = "0.1.18"; + version = "0.3.0"; src = fetchFromGitHub { owner = "EricLBuehler"; repo = "mistral.rs"; rev = "refs/tags/v${version}"; - hash = "sha256-lMDFWNv9b0UfckqLmyWRVwnqmGe6nxYsUHzoi2+oG84="; + hash = "sha256-3o7Esn+hEXKOoHX6JeXu/sgkWeL6tLCoH+Ep81/LoeU="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "candle-core-0.6.0" = "sha256-DxGBWf2H7MamrbboTJ4zHy1HeE8ZVT7QvE3sTYrRxBc="; - "range-checked-0.1.0" = "sha256-S+zcF13TjwQPFWZLIbUDkvEeaYdaxCOtDLtI+JRvum8="; + "bindgen_cuda-0.1.6" = "sha256-OWGcQxT+x5HyIFskNVWpPr6Qfkh6Mv/g4PVSm5oA27g="; + "candle-core-0.6.0" = "sha256-8UBDQfbVR4gsZRRCy899DA27saiC85+FRm6L4YBX2oA="; }; }; - postPatch = '' - ln -s ${./Cargo.lock} Cargo.lock - ''; - nativeBuildInputs = [ pkg-config python3 @@ -112,6 +108,7 @@ rustPlatform.buildRustPackage rec { openssl ] ++ lib.optionals cudaSupport [ + cudaPackages.cuda_cudart cudaPackages.cuda_nvrtc cudaPackages.libcublas cudaPackages.libcurand @@ -120,7 +117,13 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenv.isDarwin darwinBuildInputs; cargoBuildFlags = - lib.optionals cudaSupport [ "--features=cuda" ] + [ + # This disables the plotly crate which fails to build because of the kaleido feature requiring + # network access at build-time. + # See https://github.com/NixOS/nixpkgs/pull/323788#issuecomment-2206085825 + "--no-default-features" + ] + ++ lib.optionals cudaSupport [ "--features=cuda" ] ++ lib.optionals mklSupport [ "--features=mkl" ] ++ lib.optionals (stdenv.isDarwin && metalSupport) [ "--features=metal" ]; @@ -129,7 +132,7 @@ rustPlatform.buildRustPackage rec { SWAGGER_UI_DOWNLOAD_URL = let # When updating: - # - Look for the version of `utopia-swagger-ui` at: + # - Look for the version of `utoipa-swagger-ui` at: # https://github.com/EricLBuehler/mistral.rs/blob/v/mistralrs-server/Cargo.toml # - Look at the corresponding version of `swagger-ui` at: # https://github.com/juhaku/utoipa/blob/utoipa-swagger-ui-/utoipa-swagger-ui/build.rs#L21-L22 @@ -166,20 +169,29 @@ rustPlatform.buildRustPackage rec { checkFlags = [ "--skip=gguf::gguf_tokenizer::tests::test_decode_gpt2" "--skip=gguf::gguf_tokenizer::tests::test_decode_llama" + "--skip=gguf::gguf_tokenizer::tests::test_encode_decode_gpt2" + "--skip=gguf::gguf_tokenizer::tests::test_encode_decode_llama" "--skip=gguf::gguf_tokenizer::tests::test_encode_gpt2" "--skip=gguf::gguf_tokenizer::tests::test_encode_llama" "--skip=sampler::tests::test_argmax" "--skip=sampler::tests::test_gumbel_speculative" + "--skip=util::tests::test_parse_image_url" ]; passthru = { tests = { version = testers.testVersion { package = mistral-rs; }; - withMkl = mistral-rs.override { acceleration = "mkl"; }; - withCuda = mistral-rs.override { acceleration = "cuda"; }; - withMetal = mistral-rs.override { acceleration = "metal"; }; + # TODO: uncomment when mkl support will be fixed + withMkl = lib.optionalAttrs (stdenv.hostPlatform == "x86_64-linux") ( + mistral-rs.override { acceleration = "mkl"; } + ); + withCuda = lib.optionalAttrs stdenv.isLinux (mistral-rs.override { acceleration = "cuda"; }); + withMetal = lib.optionalAttrs (stdenv.hostPlatform == "aarch64-darwin") ( + mistral-rs.override { acceleration = "metal"; } + ); }; + updateScript = nix-update-script { }; }; meta = { @@ -194,6 +206,8 @@ rustPlatform.buildRustPackage rec { lib.platforms.linux else if metalSupport then [ "aarch64-darwin" ] + else if mklSupport then + [ "x86_64-linux" ] else lib.platforms.unix; broken = mklSupport; From 3cd81e56dfa55c94fe21c4f458867ffe6d44a749 Mon Sep 17 00:00:00 2001 From: Vedant <83997633+vedantmgoyal9@users.noreply.github.com> Date: Tue, 3 Sep 2024 03:16:26 +0530 Subject: [PATCH 076/298] maintainers: add vedantmgoyal9 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 94afcc5b3e76..bc4fdf3d1afe 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -21765,6 +21765,12 @@ github = "vector1dev"; githubId = 127302590; }; + vedantmgoyal9 = { + name = "Vedant Mohan Goyal"; + matrix = "@vedantmgoyal:beeper.com"; + github = "vedantmgoyal9"; + githubId = 83997633; + }; veehaitch = { name = "Vincent Haupert"; email = "mail@vincent-haupert.de"; From 3187df8bac83508df1acf944b74ac895b8b70999 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Sep 2024 01:07:32 +0000 Subject: [PATCH 077/298] fast-float: 6.1.4 -> 6.1.5 --- pkgs/by-name/fa/fast-float/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/fast-float/package.nix b/pkgs/by-name/fa/fast-float/package.nix index b6270a6eaa73..6b24b668013f 100644 --- a/pkgs/by-name/fa/fast-float/package.nix +++ b/pkgs/by-name/fa/fast-float/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fast-float"; - version = "6.1.4"; + version = "6.1.5"; src = fetchFromGitHub { owner = "fastfloat"; repo = "fast_float"; rev = "v${finalAttrs.version}"; - hash = "sha256-0eVovauN7SnO3nSIWBRWAJ4dR7q5beZrIGUZ18M2pao="; + hash = "sha256-tFHrvwZKZkNkJM5VEpWRPD+yDMH1seuNDR/Rd9pCqBg="; }; nativeBuildInputs = [ cmake ]; From a513b7c8088f8b645e599908f296d4dea600dac1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Sep 2024 05:07:05 +0000 Subject: [PATCH 078/298] xpipe: 11.0 -> 11.1 --- pkgs/applications/networking/xpipe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/xpipe/default.nix b/pkgs/applications/networking/xpipe/default.nix index ab7fe6bdb2cf..652c0c4f6d66 100644 --- a/pkgs/applications/networking/xpipe/default.nix +++ b/pkgs/applications/networking/xpipe/default.nix @@ -33,14 +33,14 @@ let }.${system} or throwSystem; hash = { - x86_64-linux = "sha256-l67oq9Jj2mmxcLsEMI4t+85cKD65xxMNkTNJrrRrwJQ="; + x86_64-linux = "sha256-DoN6I1lk4WpOZ+jC+od7jum3lxBHFppea5QFTuqY5nk="; }.${system} or throwSystem; displayname = "XPipe"; in stdenvNoCC.mkDerivation rec { pname = "xpipe"; - version = "11.0"; + version = "11.1"; src = fetchzip { url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz"; From 2379f18590b3e26b6d6bb6d34fea72b10b4c42e5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Sep 2024 07:10:46 +0000 Subject: [PATCH 079/298] clang-tidy-sarif: 0.6.5 -> 0.6.6 --- pkgs/by-name/cl/clang-tidy-sarif/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cl/clang-tidy-sarif/package.nix b/pkgs/by-name/cl/clang-tidy-sarif/package.nix index 4dce159eedd5..01a2c1bcfd5e 100644 --- a/pkgs/by-name/cl/clang-tidy-sarif/package.nix +++ b/pkgs/by-name/cl/clang-tidy-sarif/package.nix @@ -7,14 +7,14 @@ }: rustPlatform.buildRustPackage rec { pname = "clang-tidy-sarif"; - version = "0.6.5"; + version = "0.6.6"; src = fetchCrate { inherit pname version; - hash = "sha256-pQbhLbDRcZJhXXY6bWGO/8mmQRwgM3tDEWKoqmsNr68="; + hash = "sha256-rZnGueaqK7h8tWwwWacvFBvJwE1li2wN9iB4DJRHJ8U="; }; - cargoHash = "sha256-K+Cle2eCH4jCLbYfOrlEXeBvFUr7dGmpKFQM1IJi7p4="; + cargoHash = "sha256-mELx6UGHV+qtL1G3+xvYUaUzZbfMy0dKgai6IqdbT+A="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; From 8f0fcdef8dec2c4c6cb9efce768cf2f9a5101382 Mon Sep 17 00:00:00 2001 From: Juergen Fitschen Date: Tue, 3 Sep 2024 11:14:16 +0200 Subject: [PATCH 080/298] horizon-eda: 2.5.0 -> 2.6.0 --- .../science/electronics/horizon-eda/base.nix | 10 ++++++++-- .../development/python-modules/horizon-eda/default.nix | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/electronics/horizon-eda/base.nix b/pkgs/applications/science/electronics/horizon-eda/base.nix index 0292ee493a82..d39fc83823a2 100644 --- a/pkgs/applications/science/electronics/horizon-eda/base.nix +++ b/pkgs/applications/science/electronics/horizon-eda/base.nix @@ -1,4 +1,5 @@ { lib +, cmake , cppzmq , curl , fetchFromGitHub @@ -9,6 +10,8 @@ , libgit2 , librsvg , libuuid +, meson +, ninja , opencascade-occt_7_6 , pkg-config , podofo @@ -20,16 +23,19 @@ in # This base is used in horizon-eda and python3Packages.horizon-eda rec { pname = "horizon-eda"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "horizon-eda"; repo = "horizon"; rev = "v${version}"; - hash = "sha256-UcjbDJR6shyETpanNkRoH8LF8r6gFjsyNHVSCMHKqS8="; + hash = "sha256-0ikCR10r/WPb+H+Ut2GO6y4A/9bctJLanL/RR4r9GWs="; }; nativeBuildInputs = [ + meson + ninja + cmake pkg-config ]; diff --git a/pkgs/development/python-modules/horizon-eda/default.nix b/pkgs/development/python-modules/horizon-eda/default.nix index 2741dbc3675a..f1b64a71ae32 100644 --- a/pkgs/development/python-modules/horizon-eda/default.nix +++ b/pkgs/development/python-modules/horizon-eda/default.nix @@ -33,13 +33,13 @@ buildPythonPackage { nativeBuildInputs = base.nativeBuildInputs; - buildFlags = [ "pymodule" ]; + ninjaFlags = [ "horizon.so" ]; installPhase = '' runHook preInstall mkdir -p $out/${python.sitePackages} - cp build/horizon.so $out/${python.sitePackages} + cp horizon.so $out/${python.sitePackages} runHook postInstall ''; From 674ec3e45e5beb746ff9e0c0426285e86d91281c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 3 Sep 2024 12:42:13 +0200 Subject: [PATCH 081/298] grafana-image-renderer: 3.11.3 -> 3.11.4 ChangeLog: https://github.com/grafana/grafana-image-renderer/releases/tag/v3.11.4 --- .../monitoring/grafana-image-renderer/default.nix | 6 +++--- .../monitoring/grafana-image-renderer/package.json | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/monitoring/grafana-image-renderer/default.nix b/pkgs/servers/monitoring/grafana-image-renderer/default.nix index 9015c2a7ca59..a714031e43b1 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/default.nix +++ b/pkgs/servers/monitoring/grafana-image-renderer/default.nix @@ -7,18 +7,18 @@ mkYarnPackage rec { pname = "grafana-image-renderer"; - version = "3.11.3"; + version = "3.11.4"; src = fetchFromGitHub { owner = "grafana"; repo = "grafana-image-renderer"; rev = "v${version}"; - hash = "sha256-a++aQt2y7+Nrvjka9XV7j8YwmppWFnUffFO4XEiZVvo="; + hash = "sha256-ob+YSHuu8vnj3TeAeXa9vTaRJouWpgsdq0gvdKV3BnA="; }; offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-rW9mxrM4aHKGojyRbsxQe3ZZJQ8I42PJ0MplkVu3qyA="; + hash = "sha256-ZrP3cLGyA8I1EhYrQPkqUwUk52FvVxR8Wg4OGllNRmg="; }; packageJSON = ./package.json; diff --git a/pkgs/servers/monitoring/grafana-image-renderer/package.json b/pkgs/servers/monitoring/grafana-image-renderer/package.json index adc7428a89fd..686783d1820c 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/package.json +++ b/pkgs/servers/monitoring/grafana-image-renderer/package.json @@ -28,7 +28,7 @@ "@grpc/grpc-js": "^1.8.22", "@grpc/proto-loader": "^0.7.2", "@hapi/boom": "^10.0.0", - "@puppeteer/browsers": "^1.6.0", + "@puppeteer/browsers": "^2.3.1", "chokidar": "^3.5.2", "dompurify": "^2.4.0", "express": "^4.19.2", @@ -40,10 +40,10 @@ "morgan": "^1.9.0", "multer": "^1.4.5-lts.1", "on-finished": "^2.3.0", - "poolpeteer": "^0.23.0", + "poolpeteer": "^0.24.0", "prom-client": "^14.1.0", - "puppeteer": "^21.0.3", - "puppeteer-cluster": "^0.23.0", + "puppeteer": "^22.8.2", + "puppeteer-cluster": "^0.24.0", "unique-filename": "^2.0.1", "winston": "^3.8.2" }, @@ -59,7 +59,7 @@ "@types/supertest": "^2.0.15", "@typescript-eslint/eslint-plugin": "5.37.0", "@typescript-eslint/parser": "5.37.0", - "axios": "1.6.7", + "axios": "1.7.4", "cross-env": "7.0.3", "eslint": "8.23.1", "fast-png": "^6.2.0", From c8daa4dc81bbffa31eb07a1f9a259cc2fa9351fe Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 29 Aug 2024 14:28:57 +0200 Subject: [PATCH 082/298] python312Packages.minari: 0.4.3 -> 0.5.0 Diff: https://github.com/Farama-Foundation/Minari/compare/refs/tags/v0.4.3...v0.5.0 Changelog: https://github.com/Farama-Foundation/Minari/releases/tag/v0.5.0 --- .../python-modules/minari/default.nix | 68 ++++++++++++------- 1 file changed, 43 insertions(+), 25 deletions(-) diff --git a/pkgs/development/python-modules/minari/default.nix b/pkgs/development/python-modules/minari/default.nix index fdf38918ff33..dd6373a58c56 100644 --- a/pkgs/development/python-modules/minari/default.nix +++ b/pkgs/development/python-modules/minari/default.nix @@ -3,28 +3,34 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + + # build-system setuptools, - wheel, - google-cloud-storage, + + # dependencies gymnasium, - h5py, numpy, packaging, - portion, - rich, - tqdm, typer, typing-extensions, - imageio, - nbmake, + + # optional-dependencies + pyarrow, + jax, + google-cloud-storage, + tqdm, + h5py, + mktestdocs, pytest, - pytest-markdown-docs, + + # tests + jaxlib, pytestCheckHook, }: buildPythonPackage rec { pname = "minari"; - version = "0.4.3"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,40 +39,52 @@ buildPythonPackage rec { owner = "Farama-Foundation"; repo = "Minari"; rev = "refs/tags/v${version}"; - hash = "sha256-DwuANo0PCb2pPTVST8EwuJHe5HKRV8JIpFBpSqoJNh8="; + hash = "sha256-SVt93d0GbCxeZXhh5vMPvnsBAeJAfGWNceFi0W9RgeM="; }; build-system = [ setuptools - wheel ]; dependencies = [ - google-cloud-storage gymnasium - h5py numpy packaging - portion - rich - tqdm typer typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { + arrow = [ pyarrow ]; + create = [ jax ]; + gcs = [ + google-cloud-storage + tqdm + ]; + hdf5 = [ h5py ]; testing = [ # gymnasium-robotics - imageio - nbmake + mktestdocs pytest - pytest-markdown-docs ]; }; pythonImportsCheck = [ "minari" ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + jaxlib + pytestCheckHook + ] ++ lib.flatten (lib.attrValues optional-dependencies); + + disabledTests = [ + # Require internet access + "test_download_namespace_dataset" + "test_download_namespace_metadata" + "test_markdown" + + # Attempts at installing minari using pip (impossible in the sandbox) + "test_readme" + ]; disabledTestPaths = [ # Require internet access @@ -74,15 +92,15 @@ buildPythonPackage rec { "tests/test_cli.py" ]; - meta = with lib; { + meta = { description = "Standard format for offline reinforcement learning datasets, with popular reference datasets and related utilities"; homepage = "https://github.com/Farama-Foundation/Minari"; changelog = "https://github.com/Farama-Foundation/Minari/releases/tag/v${version}"; - license = with licenses; [ + license = with lib.licenses; [ asl20 mit ]; - maintainers = with maintainers; [ GaetanLepage ]; + maintainers = with lib.maintainers; [ GaetanLepage ]; mainProgram = "minari"; }; } From 941e3ccbc418133f031a157e4a28c1870a685173 Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Tue, 3 Sep 2024 15:14:35 +0200 Subject: [PATCH 083/298] k3s_1_28: 1.28.12+k3s1 -> 1.28.13+k3s1 https://github.com/k3s-io/k3s/releases/tag/v1.28.13%2Bk3s1 --- .../cluster/k3s/1_28/images-versions.json | 16 ++++++++-------- .../networking/cluster/k3s/1_28/versions.nix | 12 ++++++------ pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/1_28/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_28/images-versions.json index f5e27995f056..04c0f6616107 100644 --- a/pkgs/applications/networking/cluster/k3s/1_28/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_28/images-versions.json @@ -1,18 +1,18 @@ { "airgap-images-amd64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.12%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "0dhzkn5y3ng7blyxj4bwrhbq5qvl3hq1hzg0h9633h8swv0xbsss" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.13%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "1v3vyrb86xijyvljs0s0skhxpjbarjqg2sx9m40332dfq9din7xq" }, "airgap-images-arm": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.12%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "1225nqsfg7p6iq7a7qibzf3d0r7iwn53hnd9w6l189dxqna97015" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.13%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "0yifpx6vix5bjzkz81i5rsn89hkpp0rhk77ndl1lgy66pq4csbmm" }, "airgap-images-arm64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.12%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "1lic564naj9323dkkq0z0y10n3j3yfmhixargqqs60syanfvj2p7" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.13%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "1p8zf47pghhjqhrcvmzdbcfxxy78pjpqwvmhm3wdidsa8xyy375a" }, "images-list": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.12%2Bk3s1/k3s-images.txt", - "sha256": "1my3lfs5rfazcnnpsc9dj84dfnxx88xydrl86z6yw5n5p84x4nif" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.13%2Bk3s1/k3s-images.txt", + "sha256": "1f1d33jn4g5b6zmzdzzm4ffwfrmjwh60v9gnph0ysxjwsq1k0pxp" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_28/versions.nix b/pkgs/applications/networking/cluster/k3s/1_28/versions.nix index a6149c0d6e51..9128fbda8dfb 100644 --- a/pkgs/applications/networking/cluster/k3s/1_28/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_28/versions.nix @@ -1,15 +1,15 @@ { - k3sVersion = "1.28.12+k3s1"; - k3sCommit = "4717e2a58e04f0ba3d9f43d574a7eff01dea9146"; - k3sRepoSha256 = "02wywlqqna0dj9cam6q3ykb3p5mi96f6lclrg5yhjky7jdvkffds"; - k3sVendorHash = "sha256-RyUlaGQnfrCm4cB5FRs9IAeF+zn4LzAXmIViU3o30Z4="; + k3sVersion = "1.28.13+k3s1"; + k3sCommit = "47737e1c4c941325574e8aa14e4a3af2e596f696"; + k3sRepoSha256 = "1x66n36lxcvi5d9bdz0f1w2p24493rh3vbk1pskqd1f3v3fbv7kn"; + k3sVendorHash = "sha256-/knBr0l7dZ6lX9QpohyPNrFEi4WQpNM01zOE5bCIB2E="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); k3sRootVersion = "0.14.0"; k3sRootSha256 = "15cs9faw3jishsb5nhgmb5ldjc47hkwf7hz2126fp8ahf80m0fcl"; k3sCNIVersion = "1.4.0-k3s2"; k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa"; - containerdVersion = "1.7.17-k3s1.28"; - containerdSha256 = "0nhhx932j551ran3kkvyp4nmsg5c71mq0g6jrcbs2j4nn7yqdkhm"; + containerdVersion = "1.7.20-k3s2.28"; + containerdSha256 = "0jqqa9202d94qd7g8d5zy161snlsc42cdjpmp50w4j3pnp2i1cki"; criCtlVersion = "1.26.0-rc.0-k3s1"; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5886f745ff6d..4610c81d0744 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31091,8 +31091,8 @@ with pkgs; inherit (callPackage ../applications/networking/cluster/k3s { buildGoModule = buildGo121Module; go = go_1_21; - }) k3s_1_28 k3s_1_29; - inherit (callPackage ../applications/networking/cluster/k3s { }) k3s_1_30; + }) k3s_1_29; + inherit (callPackage ../applications/networking/cluster/k3s { }) k3s_1_28 k3s_1_30; k3s = k3s_1_30; k3sup = callPackage ../applications/networking/cluster/k3sup { }; From 864f4c22766313c860b3d3f2cf2c1762d1459793 Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Tue, 3 Sep 2024 15:31:25 +0200 Subject: [PATCH 084/298] k3s_1_29: 1.29.7+k3s2 -> 1.29.8+k3s1 https://github.com/k3s-io/k3s/releases/tag/v1.29.8%2Bk3s1 --- .../cluster/k3s/1_29/images-versions.json | 16 ++++++++-------- .../networking/cluster/k3s/1_29/versions.nix | 12 ++++++------ pkgs/top-level/all-packages.nix | 6 +----- 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/1_29/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_29/images-versions.json index 39b6faf17a46..ac4b6556128d 100644 --- a/pkgs/applications/networking/cluster/k3s/1_29/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_29/images-versions.json @@ -1,18 +1,18 @@ { "airgap-images-amd64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.7%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "1dyh107ygnlv9gyq2f9jdgrwjiyg25a61id69z48vc60gq480888" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.8%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "1v3vyrb86xijyvljs0s0skhxpjbarjqg2sx9m40332dfq9din7xq" }, "airgap-images-arm": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.7%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "16l6d1ix3ri1l2wr2k5brg11a1snbkqhqasrk69wrix6diddklrn" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.8%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "0yifpx6vix5bjzkz81i5rsn89hkpp0rhk77ndl1lgy66pq4csbmm" }, "airgap-images-arm64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.7%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "0pg4nzh1rf28003yxhl3jklxs41vjjgldviybvnqqp146ib6hy0r" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.8%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "1p8zf47pghhjqhrcvmzdbcfxxy78pjpqwvmhm3wdidsa8xyy375a" }, "images-list": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.7%2Bk3s1/k3s-images.txt", - "sha256": "1my3lfs5rfazcnnpsc9dj84dfnxx88xydrl86z6yw5n5p84x4nif" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.8%2Bk3s1/k3s-images.txt", + "sha256": "1f1d33jn4g5b6zmzdzzm4ffwfrmjwh60v9gnph0ysxjwsq1k0pxp" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_29/versions.nix b/pkgs/applications/networking/cluster/k3s/1_29/versions.nix index f27ea9030173..fd5654980afd 100644 --- a/pkgs/applications/networking/cluster/k3s/1_29/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_29/versions.nix @@ -1,15 +1,15 @@ { - k3sVersion = "1.29.7+k3s1"; - k3sCommit = "f246bbc390a05f45431e49617b58013fe06a460d"; - k3sRepoSha256 = "0fv628rxxavqmb2gv0ncsx4m8ghn3v6ddn2n06x8q4ar27d9gijg"; - k3sVendorHash = "sha256-pAOyGgEaO6ewNv+6yhDt83NZl95rmLseFUs4vlXNH6Q="; + k3sVersion = "1.29.8+k3s1"; + k3sCommit = "33fdc35dd67cf6c07989327e992fd26ed89b2449"; + k3sRepoSha256 = "0ky5f039nkhdj6y5v9yr6lk875l29c67j6kqc2dzdb3iqbwskcbr"; + k3sVendorHash = "sha256-VxVGBvpeKf/nuw09Llf85d4P8oCD2GvD1f0Mxt6fMj8="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); k3sRootVersion = "0.14.0"; k3sRootSha256 = "15cs9faw3jishsb5nhgmb5ldjc47hkwf7hz2126fp8ahf80m0fcl"; k3sCNIVersion = "1.4.0-k3s2"; k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa"; - containerdVersion = "1.7.17-k3s1"; - containerdSha256 = "1j61mbgx346ydvnjd8b07wf7nmvvplx28wi5jjdzi1k688r2hxpf"; + containerdVersion = "1.7.20-k3s1"; + containerdSha256 = "12ihr3z8vcglv5b0v9ris29zkkkdvjbcp3bf7ym71a0xdbg83s8i"; criCtlVersion = "1.29.0-k3s1"; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4610c81d0744..4431be64a3f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31088,11 +31088,7 @@ with pkgs; jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { }; - inherit (callPackage ../applications/networking/cluster/k3s { - buildGoModule = buildGo121Module; - go = go_1_21; - }) k3s_1_29; - inherit (callPackage ../applications/networking/cluster/k3s { }) k3s_1_28 k3s_1_30; + inherit (callPackage ../applications/networking/cluster/k3s { }) k3s_1_28 k3s_1_29 k3s_1_30; k3s = k3s_1_30; k3sup = callPackage ../applications/networking/cluster/k3sup { }; From de4b0a02bcfabc596c60c63e50f52e6940ac2b5d Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Tue, 3 Sep 2024 15:41:49 +0200 Subject: [PATCH 085/298] k3s_1_30: 1.30.3+k3s1 -> 1.30.4+k3s1 https://github.com/k3s-io/k3s/releases/tag/v1.30.4%2Bk3s1 --- .../cluster/k3s/1_30/images-versions.json | 16 ++++++++-------- .../networking/cluster/k3s/1_30/versions.nix | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json index e65329390325..cc2e2498d644 100644 --- a/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json @@ -1,18 +1,18 @@ { "airgap-images-amd64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.3%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "1ym7cdm3a2f05wgh4vba2g7q1zihrfvvm2zngcs0gm8djj7hy4d9" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.4%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "145sj4gpwdjvfv3bphpdg6db1d83bbwl0shbnsqpjizsm3ifvmm9" }, "airgap-images-arm": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.3%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "15mj949msrd30xhqryhpsvx1bi3pywm1z5bmi0h40qyzc1mcfvjk" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.4%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "0sdkfsjxxi5sq0nxjw7g7r1p7711l74r39y5ss12q85q4sla0m7l" }, "airgap-images-arm64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.3%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "1k2q6rzczajnrkj57p97fdr7lgmrfv7x54by2syngfwb5in8fhd5" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.4%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "1kw85g79rywk6n3wda7ffvjhf030wwj8g3x8n73rgiprvksw4p7j" }, "images-list": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.3%2Bk3s1/k3s-images.txt", - "sha256": "1my3lfs5rfazcnnpsc9dj84dfnxx88xydrl86z6yw5n5p84x4nif" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.4%2Bk3s1/k3s-images.txt", + "sha256": "1f1d33jn4g5b6zmzdzzm4ffwfrmjwh60v9gnph0ysxjwsq1k0pxp" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_30/versions.nix b/pkgs/applications/networking/cluster/k3s/1_30/versions.nix index 31b14892bab6..40e7386b38b2 100644 --- a/pkgs/applications/networking/cluster/k3s/1_30/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_30/versions.nix @@ -1,15 +1,15 @@ { - k3sVersion = "1.30.3+k3s1"; - k3sCommit = "f646604010affc6a1d3233a8a0870bca46bf80cf"; - k3sRepoSha256 = "1sqa4cx5rihrqcnriq7if7sm4hx73ma975yyr5k9nvhg71dvlig3"; - k3sVendorHash = "sha256-HMlYdWDUoELpwsfCtyCxVIcFULdvu5gna83lc79AUWc="; + k3sVersion = "1.30.4+k3s1"; + k3sCommit = "98262b5dee29fe5ac849a0cef90b5d50292b020b"; + k3sRepoSha256 = "1iwg7j0divbh41dx40kz69qkvscvppqb37dqvxayw3ha1yja4sq6"; + k3sVendorHash = "sha256-EovTZ3DvDqWFR9vxhtjgcZcPXVk1C0PYNCxEV5XA6wg="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); k3sRootVersion = "0.14.0"; k3sRootSha256 = "15cs9faw3jishsb5nhgmb5ldjc47hkwf7hz2126fp8ahf80m0fcl"; k3sCNIVersion = "1.4.0-k3s2"; k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa"; - containerdVersion = "1.7.17-k3s1"; - containerdSha256 = "1j61mbgx346ydvnjd8b07wf7nmvvplx28wi5jjdzi1k688r2hxpf"; + containerdVersion = "1.7.20-k3s1"; + containerdSha256 = "12ihr3z8vcglv5b0v9ris29zkkkdvjbcp3bf7ym71a0xdbg83s8i"; criCtlVersion = "1.29.0-k3s1"; } From 5c69e529d7f50fde8b09b78efb4a0687890ad0cc Mon Sep 17 00:00:00 2001 From: yasunori0418 Date: Tue, 3 Sep 2024 11:10:40 +0900 Subject: [PATCH 086/298] sheldon: enable on unix platforms Delete unnecessary platforms specification because installation is not possible in mac environment --- pkgs/tools/misc/sheldon/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/sheldon/default.nix b/pkgs/tools/misc/sheldon/default.nix index a11692f5d935..cf48868097b5 100644 --- a/pkgs/tools/misc/sheldon/default.nix +++ b/pkgs/tools/misc/sheldon/default.nix @@ -61,7 +61,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/rossmacarthur/sheldon"; license = with licenses; [ mit ]; maintainers = with maintainers; [ seqizz ]; - platforms = platforms.linux; + platforms = platforms.unix; mainProgram = "sheldon"; }; } From 0545e8e1bfacf31a79abcc153877c321fd519ceb Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 3 Sep 2024 17:08:14 +0200 Subject: [PATCH 087/298] cargo-llvm-cov: 0.6.11 -> 0.6.12 Signed-off-by: Matthias Beyer --- pkgs/development/tools/rust/cargo-llvm-cov/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix index 93994a7bc75b..387460a0dd16 100644 --- a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix @@ -26,7 +26,7 @@ let pname = "cargo-llvm-cov"; - version = "0.6.11"; + version = "0.6.12"; owner = "taiki-e"; homepage = "https://github.com/${owner}/${pname}"; @@ -37,7 +37,7 @@ let cargoLock = fetchurl { name = "Cargo.lock"; url = "https://crates.io/api/v1/crates/${pname}/${version}/download"; - sha256 = "sha256-/PwzG+Erz1aMDg50glZBP7mNHzuvvn2Dn+dicMG2ouo="; + sha256 = "sha256-QMO5J5c8MQr84w6X74oQrHV99cjSUVfpC8Ub1csQ0gI="; downloadToTemp = true; postFetch = '' tar xzf $downloadedFile ${pname}-${version}/Cargo.lock @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage { inherit owner; repo = pname; rev = "v${version}"; - sha256 = "sha256-1HZNYC7bMG7olnZH4oOC/fXOAF9qt7MYhlQbaOKDmvg="; + sha256 = "sha256-BlXgbCWjGya/I94nqfjBqQPSWnVhyhNn0oSRL9xiS6k="; }; # Upstream doesn't include the lockfile so we need to add it back @@ -63,7 +63,7 @@ rustPlatform.buildRustPackage { cp ${cargoLock} source/Cargo.lock ''; - cargoHash = "sha256-sN3vNZgi45pcDXI8kQ0L/r6HCDGs8l2VMwI+LHjwZ6Q="; + cargoHash = "sha256-nabO19JePQRuhxsbm5wVIU4+5si6p0VgqR2QLmLeivU="; # `cargo-llvm-cov` reads these environment variables to find these binaries, # which are needed to run the tests From 389bca777e371b17d631c4836c3262aa31fc1776 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 3 Sep 2024 10:18:31 -0700 Subject: [PATCH 088/298] fittrackee: rename from fit-trackee The former aligns with what the package is called on PyPI. --- .../default.nix => by-name/fi/fittrackee/package.nix} | 2 +- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) rename pkgs/{servers/geospatial/fit-trackee/default.nix => by-name/fi/fittrackee/package.nix} (98%) diff --git a/pkgs/servers/geospatial/fit-trackee/default.nix b/pkgs/by-name/fi/fittrackee/package.nix similarity index 98% rename from pkgs/servers/geospatial/fit-trackee/default.nix rename to pkgs/by-name/fi/fittrackee/package.nix index 72ddd146a88c..c066ffd5e63e 100644 --- a/pkgs/servers/geospatial/fit-trackee/default.nix +++ b/pkgs/by-name/fi/fittrackee/package.nix @@ -25,7 +25,7 @@ let in python.pkgs.buildPythonApplication rec { - pname = "fit-trackee"; + pname = "fittrackee"; version = "0.8.6"; pyproject = true; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d89be65d4e3c..3f3b4ca2f0f7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -464,6 +464,7 @@ mapAliases ({ firmwareLinuxNonfree = linux-firmware; # Added 2022-01-09 fishfight = jumpy; # Added 2022-08-03 fitnesstrax = throw "fitnesstrax was removed from nixpkgs because it disappeared upstream and no longer compiles"; # added 2023-07-04 + fit-trackee = fittrackee; # added 2024-09-03 flashrom-stable = flashprog; # Added 2024-03-01 flatbuffers_2_0 = flatbuffers; # Added 2022-05-12 flintqs = throw "FlintQS has been removed due to lack of maintenance and security issues; use SageMath or FLINT instead"; # Added 2024-03-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c734ccfa5358..e15d23e64c26 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25955,8 +25955,6 @@ with pkgs; ### SERVERS / GEOSPATIAL - fit-trackee = callPackage ../servers/geospatial/fit-trackee { }; - martin = callPackage ../servers/geospatial/martin { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; From a402cd72f93e00c475d2e0f85f0f925898286149 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 3 Sep 2024 10:20:26 -0700 Subject: [PATCH 089/298] fittrackee: format with nixfmt-rfc-style --- pkgs/by-name/fi/fittrackee/package.nix | 62 ++++++++++++++------------ 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/pkgs/by-name/fi/fittrackee/package.nix b/pkgs/by-name/fi/fittrackee/package.nix index c066ffd5e63e..23a2268c78d6 100644 --- a/pkgs/by-name/fi/fittrackee/package.nix +++ b/pkgs/by-name/fi/fittrackee/package.nix @@ -1,9 +1,10 @@ -{ lib -, python3 -, fetchFromGitHub -, fetchPypi -, postgresql -, postgresqlTestHook +{ + fetchFromGitHub, + fetchPypi, + lib, + postgresql, + postgresqlTestHook, + python3, }: let python = python3.override { @@ -53,29 +54,32 @@ python.pkgs.buildPythonApplication rec { "pyopenssl" ]; - dependencies = with python.pkgs; [ - authlib - babel - click - dramatiq - flask - flask-bcrypt - flask-dramatiq - flask-limiter - flask-migrate - flask-sqlalchemy - gpxpy - gunicorn - humanize - psycopg2 - pyjwt - pyopenssl - pytz - shortuuid - sqlalchemy - staticmap - ua-parser - ] ++ dramatiq.optional-dependencies.redis + dependencies = + with python.pkgs; + [ + authlib + babel + click + dramatiq + flask + flask-bcrypt + flask-dramatiq + flask-limiter + flask-migrate + flask-sqlalchemy + gpxpy + gunicorn + humanize + psycopg2 + pyjwt + pyopenssl + pytz + shortuuid + sqlalchemy + staticmap + ua-parser + ] + ++ dramatiq.optional-dependencies.redis ++ flask-limiter.optional-dependencies.redis; pythonImportsCheck = [ "fittrackee" ]; From d22c1f8639db18bd99214e822f50e706dd493793 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 3 Sep 2024 10:21:02 -0700 Subject: [PATCH 090/298] fittrackee: use psycopg2-binary --- pkgs/by-name/fi/fittrackee/package.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/by-name/fi/fittrackee/package.nix b/pkgs/by-name/fi/fittrackee/package.nix index 23a2268c78d6..f21da61f969f 100644 --- a/pkgs/by-name/fi/fittrackee/package.nix +++ b/pkgs/by-name/fi/fittrackee/package.nix @@ -37,11 +37,6 @@ python.pkgs.buildPythonApplication rec { hash = "sha256-lTDS+HfYG6ayXDotu7M2LUrw+1ZhQ0ftw0rTn4Mr3rQ="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail psycopg2-binary psycopg2 - ''; - build-system = [ python.pkgs.poetry-core ]; @@ -70,7 +65,7 @@ python.pkgs.buildPythonApplication rec { gpxpy gunicorn humanize - psycopg2 + psycopg2-binary pyjwt pyopenssl pytz From 6367bd6796e839a117ace66ce1e3cd03491dbfd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 3 Sep 2024 10:22:15 -0700 Subject: [PATCH 091/298] fittrackee: 0.8.6 -> 0.8.8 Diff: https://github.com/SamR1/FitTrackee/compare/refs/tags/v0.8.6...v0.8.8 Changelog: https://github.com/SamR1/FitTrackee/blob/refs/tags/v0.8.8/CHANGELOG.md --- pkgs/by-name/fi/fittrackee/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fi/fittrackee/package.nix b/pkgs/by-name/fi/fittrackee/package.nix index f21da61f969f..b69d3b428ade 100644 --- a/pkgs/by-name/fi/fittrackee/package.nix +++ b/pkgs/by-name/fi/fittrackee/package.nix @@ -27,14 +27,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "fittrackee"; - version = "0.8.6"; + version = "0.8.8"; pyproject = true; src = fetchFromGitHub { owner = "SamR1"; repo = "FitTrackee"; rev = "refs/tags/v${version}"; - hash = "sha256-lTDS+HfYG6ayXDotu7M2LUrw+1ZhQ0ftw0rTn4Mr3rQ="; + hash = "sha256-IO6M+HXAR3Gn0/71KwkaQr6sB0eCQzmnqHYgO+mzIZM="; }; build-system = [ From 8c507882d3c99855e042c7b2c1e66a57d578beec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93lafur=20Bjarki=20Bogason?= Date: Tue, 3 Sep 2024 18:28:11 +0100 Subject: [PATCH 092/298] make age-plugin-fido2-hmac work on darwin --- .../ag/age-plugin-fido2-hmac/package.nix | 36 +++++++++++++------ 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix b/pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix index 209bc1a24728..eec840ef2197 100644 --- a/pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix +++ b/pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix @@ -1,10 +1,27 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, libfido2 -, stdenv +{ + lib, + buildGoModule, + fetchFromGitHub, + stdenv, + libfido2, + openssl, + libcbor }: +let + darwin_arch = if stdenv.hostPlatform.system == "aarch64-darwin" then "arm64" else "amd64"; + darwin_configure = '' + chmod -R +w vendor/github.com/keys-pub/go-libfido2 + cat << EOF > vendor/github.com/keys-pub/go-libfido2/fido2_static_${darwin_arch}.go + package libfido2 + /* + #cgo darwin LDFLAGS: -framework CoreFoundation -framework IOKit -L${lib.getLib openssl}/lib -L${lib.getLib libcbor}/lib -lfido2 + #cgo darwin CFLAGS: -I${libfido2.dev}/include -I${openssl.dev}/include + */ + import "C" + EOF + ''; +in buildGoModule rec { pname = "age-plugin-fido2-hmac"; version = "0.2.3"; @@ -18,11 +35,11 @@ buildGoModule rec { vendorHash = "sha256-h4/tyq9oZt41IfRJmmsLHUpJiPJ7YuFu59ccM7jHsFo="; - ldflags = [ "-s" "-w" ]; + ldflags = [ "-s" "-w" "-X main.version=v${version}" ]; - buildInputs = [ - libfido2 - ]; + buildInputs = [ libfido2 ]; + + postConfigure = lib.optional stdenv.isDarwin darwin_configure; meta = with lib; { description = "Age plugin to encrypt files with fido2 tokens using the hmac-secret extension and non-discoverable credentials"; @@ -30,6 +47,5 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ matthewcroughan ]; mainProgram = "age-plugin-fido2-hmac"; - broken = stdenv.isDarwin; }; } From d3da7528fa20430bde26c09e040ce825b301d2b0 Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Tue, 3 Sep 2024 16:28:13 +0200 Subject: [PATCH 093/298] k3s_1_31: init 1.31.0+k3s1 Release: https://github.com/k3s-io/k3s/releases/tag/v1.31.0%2Bk3s1 --- .../cluster/k3s/1_31/chart-versions.nix | 10 ++++++++++ .../cluster/k3s/1_31/images-versions.json | 18 ++++++++++++++++++ .../networking/cluster/k3s/1_31/versions.nix | 15 +++++++++++++++ .../networking/cluster/k3s/builder.nix | 2 +- .../networking/cluster/k3s/default.nix | 10 ++++++++++ .../networking/cluster/k3s/update-script.sh | 8 +++++++- pkgs/top-level/all-packages.nix | 9 +++++++-- 7 files changed, 68 insertions(+), 4 deletions(-) create mode 100644 pkgs/applications/networking/cluster/k3s/1_31/chart-versions.nix create mode 100644 pkgs/applications/networking/cluster/k3s/1_31/images-versions.json create mode 100644 pkgs/applications/networking/cluster/k3s/1_31/versions.nix diff --git a/pkgs/applications/networking/cluster/k3s/1_31/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_31/chart-versions.nix new file mode 100644 index 000000000000..aaaa3d4c2970 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_31/chart-versions.nix @@ -0,0 +1,10 @@ +{ + traefik-crd = { + url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-25.0.3+up25.0.0.tgz"; + sha256 = "1z693i4kd3jyf26ccnb0sxjyxadipl6k13n7jyg5v4y93fv1rpdw"; + }; + traefik = { + url = "https://k3s.io/k3s-charts/assets/traefik/traefik-25.0.3+up25.0.0.tgz"; + sha256 = "1a24qlp7c6iri72ka1i37l1lzn13xibrd26dy295z2wzr55gg7if"; + }; +} diff --git a/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json new file mode 100644 index 000000000000..099ff7e3609b --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json @@ -0,0 +1,18 @@ +{ + "airgap-images-amd64": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.0%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "13pakr8nxlbqhqcz40gyjncw4bghk7x7ryb2ynmr5airspqcdrl6" + }, + "airgap-images-arm": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.0%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "0vc2v89qy9gbzfbmfrdb0l5yzyprk7yma5ps0yfj60jd9av07qvh" + }, + "airgap-images-arm64": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.0%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "10ffa45pm1scavcd5cimdaw29rlc55c9i40qzh3n3451g1yqlmmk" + }, + "images-list": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.0%2Bk3s1/k3s-images.txt", + "sha256": "0y4x02fj1iysghq6s88wsiqfpsajrrwrg89m59qk431cii23nrza" + } +} diff --git a/pkgs/applications/networking/cluster/k3s/1_31/versions.nix b/pkgs/applications/networking/cluster/k3s/1_31/versions.nix new file mode 100644 index 000000000000..74f2f1de0569 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_31/versions.nix @@ -0,0 +1,15 @@ +{ + k3sVersion = "1.31.0+k3s1"; + k3sCommit = "34be6d96d17d8d65fda86272b62b752cb0e9c45e"; + k3sRepoSha256 = "16yzsx56jmca07jdnzjvy4pcfrvvibv987l1mzdaws1vkm3xqfnw"; + k3sVendorHash = "sha256-1uYlvGkW6n4aiUVX/2OjppczdobY/fk1ZaK6j3AEwvM="; + chartVersions = import ./chart-versions.nix; + imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); + k3sRootVersion = "0.14.0"; + k3sRootSha256 = "15cs9faw3jishsb5nhgmb5ldjc47hkwf7hz2126fp8ahf80m0fcl"; + k3sCNIVersion = "1.4.0-k3s2"; + k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa"; + containerdVersion = "1.7.20-k3s1"; + containerdSha256 = "12ihr3z8vcglv5b0v9ris29zkkkdvjbcp3bf7ym71a0xdbg83s8i"; + criCtlVersion = "1.31.0-k3s2"; +} diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix index e0288c21fc99..1fb10c82dcc1 100644 --- a/pkgs/applications/networking/cluster/k3s/builder.nix +++ b/pkgs/applications/networking/cluster/k3s/builder.nix @@ -211,7 +211,7 @@ let sed --quiet '/# --- run the install process --/q;p' ${k3sRepo}/install.sh > install.sh # Let killall expect "containerd-shim" in the Nix store - to_replace="k3s/data/\[\^/\]\*/bin/containerd-shim" + to_replace="/data/\[\^/\]\*/bin/containerd-shim" replacement="/nix/store/.*k3s-containerd.*/bin/containerd-shim" changes=$(sed -i "s|$to_replace|$replacement| w /dev/stdout" install.sh) if [ -z "$changes" ]; then diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index c8e3fbc92696..59fd6b1be344 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -43,4 +43,14 @@ in ]; } ) extraArgs; + + k3s_1_31 = common ( + (import ./1_31/versions.nix) + // { + updateScript = [ + ./update-script.sh + "31" + ]; + } + ) extraArgs; } diff --git a/pkgs/applications/networking/cluster/k3s/update-script.sh b/pkgs/applications/networking/cluster/k3s/update-script.sh index 9eab8ce08f81..ac451806ff66 100755 --- a/pkgs/applications/networking/cluster/k3s/update-script.sh +++ b/pkgs/applications/networking/cluster/k3s/update-script.sh @@ -107,7 +107,13 @@ CONTAINERD_VERSION=$(grep github.com/containerd/containerd ${FILE_GO_MOD} \ CONTAINERD_SHA256=$(nix-prefetch-url --quiet --unpack \ "https://github.com/k3s-io/containerd/archive/refs/tags/v${CONTAINERD_VERSION}.tar.gz") -CRI_CTL_VERSION=$(grep github.com/kubernetes-sigs/cri-tools ${FILE_GO_MOD} \ +# The repository of "cri-tools" changes for 1.31.x, this can likely be removed in future releases +if [ "$MINOR_VERSION" -gt 30 ]; then + CRI_CTL_REPO=sigs.k8s.io +else + CRI_CTL_REPO=github.com/kubernetes-sigs +fi +CRI_CTL_VERSION=$(grep "$CRI_CTL_REPO/cri-tools" ${FILE_GO_MOD} \ | head -n1 | awk '{print $4}' | sed -e 's/"//g' -e 's/^v//') setKV () { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4431be64a3f4..3472fac9adfd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31088,8 +31088,13 @@ with pkgs; jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { }; - inherit (callPackage ../applications/networking/cluster/k3s { }) k3s_1_28 k3s_1_29 k3s_1_30; - k3s = k3s_1_30; + inherit (callPackage ../applications/networking/cluster/k3s { }) + k3s_1_28 + k3s_1_29 + k3s_1_30 + k3s_1_31 + ; + k3s = k3s_1_31; k3sup = callPackage ../applications/networking/cluster/k3sup { }; From ea8a9b515bd3577ab28528b3725fde979214f61b Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Tue, 3 Sep 2024 20:08:05 +0000 Subject: [PATCH 094/298] qgis: wrap all binaries This is necessary to make GRASS and Python plugins usable with qgis_process. --- pkgs/applications/gis/qgis/default.nix | 10 +++++----- pkgs/applications/gis/qgis/unwrapped.nix | 8 +++++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index e5e744b37467..5e22cc9aa016 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -24,13 +24,13 @@ in symlinkJoin rec { pythonInputs = qgis-unwrapped.pythonBuildInputs ++ (extraPythonPackages qgis-unwrapped.py.pkgs); postBuild = '' - # unpackPhase - buildPythonPath "$pythonInputs" - wrapProgram $out/bin/qgis \ - --prefix PATH : $program_PATH \ - --set PYTHONPATH $program_PYTHONPATH + for program in $out/bin/*; do + wrapProgram $program \ + --prefix PATH : $program_PATH \ + --set PYTHONPATH $program_PYTHONPATH + done ''; passthru = { diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index d7c743e36a53..5f61e0339446 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -175,9 +175,11 @@ in mkDerivation rec { # the path at build time using GRASS_PREFIX. # Using wrapGAppsHook also prevents file dialogs from crashing the program # on non-NixOS. - wrapProgram $out/bin/qgis \ - "''${gappsWrapperArgs[@]}" \ - --prefix PATH : ${lib.makeBinPath [ grass ]} + for program in $out/bin/*; do + wrapProgram $program \ + "''${gappsWrapperArgs[@]}" \ + --prefix PATH : ${lib.makeBinPath [ grass ]} + done ''; meta = with lib; { From 4982873579d4fbc3f7c9369d8118ddc8dece9361 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Sun, 25 Aug 2024 22:35:19 -0400 Subject: [PATCH 095/298] zathuraPkgs: modernize --- pkgs/applications/misc/zathura/cb/default.nix | 17 +++++++++-------- pkgs/applications/misc/zathura/core/default.nix | 8 ++++---- pkgs/applications/misc/zathura/djvu/default.nix | 15 ++++++++------- .../misc/zathura/pdf-mupdf/default.nix | 14 +++++++------- .../misc/zathura/pdf-poppler/default.nix | 15 ++++++++------- pkgs/applications/misc/zathura/ps/default.nix | 15 ++++++++------- 6 files changed, 44 insertions(+), 40 deletions(-) diff --git a/pkgs/applications/misc/zathura/cb/default.nix b/pkgs/applications/misc/zathura/cb/default.nix index 2c4dc76abb47..c3478627b38b 100644 --- a/pkgs/applications/misc/zathura/cb/default.nix +++ b/pkgs/applications/misc/zathura/cb/default.nix @@ -11,12 +11,12 @@ libarchive, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zathura-cb"; version = "0.1.10"; src = fetchurl { - url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; + url = "https://pwmt.org/projects/zathura-cb/download/zathura-cb-${finalAttrs.version}.tar.xz"; hash = "sha256-ibDKF6gMuh6p/Rs7cvOnFz8KrToGqMNk2GXEmZwYu8g="; }; @@ -26,22 +26,23 @@ stdenv.mkDerivation rec { pkg-config gettext ]; + buildInputs = [ libarchive zathura_core girara ]; - PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; + env.PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; - meta = with lib; { + meta = { homepage = "https://pwmt.org/projects/zathura-cb/"; description = "Zathura CB plugin"; longDescription = '' The zathura-cb plugin adds comic book support to zathura. ''; - license = licenses.zlib; - platforms = platforms.unix; - maintainers = with maintainers; [ jlesquembre ]; + license = lib.licenses.zlib; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ jlesquembre ]; }; -} +}) diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index b7b7a517310b..756bfbdbc600 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -85,11 +85,11 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = gitUpdater { }; - meta = with lib; { + meta = { homepage = "https://pwmt.org/projects/zathura"; description = "Core component for zathura PDF viewer"; - license = licenses.zlib; - platforms = platforms.unix; - maintainers = with maintainers; [ globin ]; + license = lib.licenses.zlib; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ globin ]; }; }) diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix index 00d3563d5b76..c38c3827c183 100644 --- a/pkgs/applications/misc/zathura/djvu/default.nix +++ b/pkgs/applications/misc/zathura/djvu/default.nix @@ -12,12 +12,12 @@ gettext, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zathura-djvu"; version = "0.2.9"; src = fetchurl { - url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; + url = "https://pwmt.org/projects/zathura-djvu/download/zathura-djvu-${finalAttrs.version}.tar.xz"; hash = "sha256-lub4pu5TIxBzsvcAMmSHL4RQHmPD2nvwWY0EYoawwgA="; }; @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { ninja pkg-config ]; + buildInputs = [ djvulibre gettext @@ -34,17 +35,17 @@ stdenv.mkDerivation rec { girara ]; - PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; + env.PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; - meta = with lib; { + meta = { homepage = "https://pwmt.org/projects/zathura-djvu/"; description = "Zathura DJVU plugin"; longDescription = '' The zathura-djvu plugin adds DjVu support to zathura by using the djvulibre library. ''; - license = licenses.zlib; - platforms = platforms.unix; + license = lib.licenses.zlib; + platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index b3b5d514a84c..54c7a3b549fa 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -20,12 +20,12 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.4.2"; pname = "zathura-pdf-mupdf"; src = fetchurl { - url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; + url = "https://pwmt.org/projects/zathura-pdf-mupdf/download/zathura-pdf-mupdf-${finalAttrs.version}.tar.xz"; hash = "sha256-fFC+z9mJX9ccExsV336Ut+zJJa8UdfUz/qVp9YgcnhM="; }; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { mujs ] ++ lib.optional stdenv.isDarwin gtk-mac-integration; - PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; + env.PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; postPatch = '' sed -i -e '/^mupdfthird =/d' -e 's/, mupdfthird//g' meson.build @@ -57,15 +57,15 @@ stdenv.mkDerivation rec { passthru.updateScript = gitUpdater { url = "https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"; }; - meta = with lib; { + meta = { homepage = "https://pwmt.org/projects/zathura-pdf-mupdf/"; description = "Zathura PDF plugin (mupdf)"; longDescription = '' The zathura-pdf-mupdf plugin adds PDF support to zathura by using the mupdf rendering library. ''; - license = licenses.zlib; - platforms = platforms.unix; + license = lib.licenses.zlib; + platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix index 7119acd03746..9395ab23cc0f 100644 --- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -10,12 +10,12 @@ poppler, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zathura-pdf-poppler"; version = "0.3.2"; src = fetchurl { - url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; + url = "https://pwmt.org/projects/zathura-pdf-poppler/download/zathura-pdf-poppler-${finalAttrs.version}.tar.xz"; hash = "sha256-cavu1RzR0YjO89vUwWR1jjw3FgR1aWeyOtF2rlNFMBE="; }; @@ -25,22 +25,23 @@ stdenv.mkDerivation rec { pkg-config zathura_core ]; + buildInputs = [ poppler girara ]; - PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; + env.PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; - meta = with lib; { + meta = { homepage = "https://pwmt.org/projects/zathura-pdf-poppler/"; description = "Zathura PDF plugin (poppler)"; longDescription = '' The zathura-pdf-poppler plugin adds PDF support to zathura by using the poppler rendering library. ''; - license = licenses.zlib; - platforms = platforms.unix; + license = lib.licenses.zlib; + platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix index 54202f919669..026e59c5a1eb 100644 --- a/pkgs/applications/misc/zathura/ps/default.nix +++ b/pkgs/applications/misc/zathura/ps/default.nix @@ -11,12 +11,12 @@ gettext, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zathura-ps"; version = "0.2.7"; src = fetchurl { - url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; + url = "https://pwmt.org/projects/zathura-ps/download/zathura-ps-${finalAttrs.version}.tar.xz"; hash = "sha256-WJf5IEz1+Xi5QTvnzn/r3oQxV69I41GTjt8H2/kwjkY="; }; @@ -26,23 +26,24 @@ stdenv.mkDerivation rec { pkg-config gettext ]; + buildInputs = [ libspectre zathura_core girara ]; - PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; + env.PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; - meta = with lib; { + meta = { homepage = "https://pwmt.org/projects/zathura-ps/"; description = "Zathura PS plugin"; longDescription = '' The zathura-ps plugin adds PS support to zathura by using the libspectre library. ''; - license = licenses.zlib; - platforms = platforms.unix; + license = lib.licenses.zlib; + platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) From b5fae886435c29ccb9370a8fb8a3a875ce980dbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Sun, 25 Aug 2024 22:36:24 -0400 Subject: [PATCH 096/298] zathura: 0.5.6 -> 0.5.8 Plugins are also updated to latest version. --- pkgs/applications/misc/zathura/cb/default.nix | 8 ++++++-- pkgs/applications/misc/zathura/core/default.nix | 15 +++++++++++++-- pkgs/applications/misc/zathura/djvu/default.nix | 8 ++++++-- .../misc/zathura/pdf-mupdf/default.nix | 8 ++++++-- .../misc/zathura/pdf-poppler/default.nix | 8 ++++++-- pkgs/applications/misc/zathura/ps/default.nix | 8 ++++++-- 6 files changed, 43 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/zathura/cb/default.nix b/pkgs/applications/misc/zathura/cb/default.nix index c3478627b38b..8da351b48069 100644 --- a/pkgs/applications/misc/zathura/cb/default.nix +++ b/pkgs/applications/misc/zathura/cb/default.nix @@ -9,15 +9,17 @@ girara, gettext, libarchive, + desktop-file-utils, + appstream-glib, }: stdenv.mkDerivation (finalAttrs: { pname = "zathura-cb"; - version = "0.1.10"; + version = "0.1.11"; src = fetchurl { url = "https://pwmt.org/projects/zathura-cb/download/zathura-cb-${finalAttrs.version}.tar.xz"; - hash = "sha256-ibDKF6gMuh6p/Rs7cvOnFz8KrToGqMNk2GXEmZwYu8g="; + hash = "sha256-TiAepUzcIKkyWMQ1VvY4lEGvmXQN59ymyh/1JBcvvUc="; }; nativeBuildInputs = [ @@ -25,6 +27,8 @@ stdenv.mkDerivation (finalAttrs: { ninja pkg-config gettext + desktop-file-utils + appstream-glib ]; buildInputs = [ diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 756bfbdbc600..c2a4abacb50e 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, meson, ninja, wrapGAppsHook3, @@ -28,15 +29,24 @@ stdenv.mkDerivation (finalAttrs: { pname = "zathura"; - version = "0.5.6"; + version = "0.5.8"; src = fetchFromGitHub { owner = "pwmt"; repo = "zathura"; rev = finalAttrs.version; - hash = "sha256-lTEBIZ3lkzjJ+L1qecrcL8iseo8AvSIo3Wh65/ikwac="; + hash = "sha256-k6DEJpUA3s0mGxE38aYnX7uea98LrzevJhWW1abHo/c="; }; + patches = [ + # https://github.com/pwmt/zathura/issues/664 + (fetchpatch { + name = "fix-build-on-macos.patch"; + url = "https://github.com/pwmt/zathura/commit/53f151f775091abec55ccc4b63893a8f9a668588.patch"; + hash = "sha256-d8lRdlBN1Kfw/aTjz8x0gvTKy+SqSYWHLQCjV7hF5MI="; + }) + ]; + outputs = [ "bin" "man" @@ -54,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: { # Make sure tests are enabled for doCheck # (lib.mesonEnable "tests" finalAttrs.finalPackage.doCheck) (lib.mesonEnable "seccomp" stdenv.hostPlatform.isLinux) + (lib.mesonEnable "landlock" stdenv.hostPlatform.isLinux) ]; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix index c38c3827c183..87ac40d1b204 100644 --- a/pkgs/applications/misc/zathura/djvu/default.nix +++ b/pkgs/applications/misc/zathura/djvu/default.nix @@ -10,21 +10,25 @@ girara, djvulibre, gettext, + desktop-file-utils, + appstream-glib, }: stdenv.mkDerivation (finalAttrs: { pname = "zathura-djvu"; - version = "0.2.9"; + version = "0.2.10"; src = fetchurl { url = "https://pwmt.org/projects/zathura-djvu/download/zathura-djvu-${finalAttrs.version}.tar.xz"; - hash = "sha256-lub4pu5TIxBzsvcAMmSHL4RQHmPD2nvwWY0EYoawwgA="; + hash = "sha256-MunYmSmnbNfT/Lr3n0QYaL2r7fFzF9HRhD+qHxkzjZU="; }; nativeBuildInputs = [ meson ninja pkg-config + desktop-file-utils + appstream-glib ]; buildInputs = [ diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index 54c7a3b549fa..b49371b24dea 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -17,22 +17,26 @@ tesseract, leptonica, mujs, + desktop-file-utils, + appstream-glib, gitUpdater, }: stdenv.mkDerivation (finalAttrs: { - version = "0.4.2"; + version = "0.4.4"; pname = "zathura-pdf-mupdf"; src = fetchurl { url = "https://pwmt.org/projects/zathura-pdf-mupdf/download/zathura-pdf-mupdf-${finalAttrs.version}.tar.xz"; - hash = "sha256-fFC+z9mJX9ccExsV336Ut+zJJa8UdfUz/qVp9YgcnhM="; + hash = "sha256-ASViSQHKvjov5jMVpG59lmoyPAKP9TiQ3694Vq2x9Pw="; }; nativeBuildInputs = [ meson ninja pkg-config + desktop-file-utils + appstream-glib ]; buildInputs = [ diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix index 9395ab23cc0f..37941f268983 100644 --- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -8,21 +8,25 @@ zathura_core, girara, poppler, + desktop-file-utils, + appstream-glib, }: stdenv.mkDerivation (finalAttrs: { pname = "zathura-pdf-poppler"; - version = "0.3.2"; + version = "0.3.3"; src = fetchurl { url = "https://pwmt.org/projects/zathura-pdf-poppler/download/zathura-pdf-poppler-${finalAttrs.version}.tar.xz"; - hash = "sha256-cavu1RzR0YjO89vUwWR1jjw3FgR1aWeyOtF2rlNFMBE="; + hash = "sha256-yBLy9ERv1d4Wc04TwC6pqiW6Tjup9ytzLA/5D5ujSTU="; }; nativeBuildInputs = [ meson ninja pkg-config + desktop-file-utils + appstream-glib zathura_core ]; diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix index 026e59c5a1eb..3978668991c3 100644 --- a/pkgs/applications/misc/zathura/ps/default.nix +++ b/pkgs/applications/misc/zathura/ps/default.nix @@ -9,15 +9,17 @@ girara, libspectre, gettext, + desktop-file-utils, + appstream-glib, }: stdenv.mkDerivation (finalAttrs: { pname = "zathura-ps"; - version = "0.2.7"; + version = "0.2.8"; src = fetchurl { url = "https://pwmt.org/projects/zathura-ps/download/zathura-ps-${finalAttrs.version}.tar.xz"; - hash = "sha256-WJf5IEz1+Xi5QTvnzn/r3oQxV69I41GTjt8H2/kwjkY="; + hash = "sha256-B8pZT3J3+YdtADgEhBg0PqKWQCjpPJD5Vp7/NqiTLko="; }; nativeBuildInputs = [ @@ -25,6 +27,8 @@ stdenv.mkDerivation (finalAttrs: { ninja pkg-config gettext + desktop-file-utils + appstream-glib ]; buildInputs = [ From bc448e7f96374252869d3578520f701134925f11 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Tue, 3 Sep 2024 21:05:50 -0300 Subject: [PATCH 097/298] micro: tidy up the package Basically, removing all references to clipboard things. The idea is to wrap them later in another derivation. --- pkgs/by-name/mi/micro/package.nix | 47 +++++++++---------------------- 1 file changed, 14 insertions(+), 33 deletions(-) diff --git a/pkgs/by-name/mi/micro/package.nix b/pkgs/by-name/mi/micro/package.nix index e7c25d77bc40..2e678546b456 100644 --- a/pkgs/by-name/mi/micro/package.nix +++ b/pkgs/by-name/mi/micro/package.nix @@ -1,26 +1,14 @@ { lib, - stdenv, buildGoModule, + callPackage, fetchFromGitHub, installShellFiles, - callPackage, - wl-clipboard, - xclip, - makeWrapper, - # Boolean flags - withXclip ? stdenv.isLinux, - withWlClipboard ? - if withWlclip != null then - lib.warn '' - withWlclip is deprecated and will be removed; - use withWlClipboard instead. - '' withWlclip - else - stdenv.isLinux, + stdenv, # Deprecated options - # Remove them before or right after next version update from Nixpkgs or this - # package itself + # Remove them as soon as possible + withXclip ? null, + withWlClipboard ? null, withWlclip ? null, }: @@ -38,10 +26,7 @@ let vendorHash = "sha256-ePhObvm3m/nT+7IyT0W6K+y+9UNkfd2kYjle2ffAd9Y="; - nativeBuildInputs = [ - installShellFiles - makeWrapper - ]; + nativeBuildInputs = [ installShellFiles ]; outputs = [ "out" @@ -73,17 +58,6 @@ let install -Dm644 assets/micro-logo-mark.svg $out/share/icons/hicolor/scalable/apps/micro.svg ''; - postFixup = - let - clipboardPackages = - lib.optionals withXclip [ xclip ] - ++ lib.optionals withWlClipboard [ wl-clipboard ]; - in - lib.optionalString (withXclip || withWlClipboard) '' - wrapProgram "$out/bin/micro" \ - --prefix PATH : "${lib.makeBinPath clipboardPackages}" - ''; - passthru = { tests = lib.packagesFromDirectoryRecursive { inherit callPackage; @@ -114,4 +88,11 @@ let }; }; in -self +lib.warnIf (withXclip != null || withWlClipboard != null || withWlclip != null) '' + The options `withXclip`, `withWlClipboard`, `withWlclip` were removed. If + you are seeking for clipboard support, please consider the following + packages: + - `micro-with-wl-clipboard` + - `micro-with-xclip` + - `micro-full` +'' self From c16c239724e9de50787ba6b793f603049dfe4e22 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Tue, 3 Sep 2024 21:06:41 -0300 Subject: [PATCH 098/298] micro.wrapper: init --- pkgs/by-name/mi/micro/package.nix | 1 + pkgs/by-name/mi/micro/wrapper.nix | 33 +++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/by-name/mi/micro/wrapper.nix diff --git a/pkgs/by-name/mi/micro/package.nix b/pkgs/by-name/mi/micro/package.nix index 2e678546b456..8f2bb8488db3 100644 --- a/pkgs/by-name/mi/micro/package.nix +++ b/pkgs/by-name/mi/micro/package.nix @@ -63,6 +63,7 @@ let inherit callPackage; directory = ./tests; }; + wrapper = callPackage ./wrapper.nix { micro = self; }; }; meta = { diff --git a/pkgs/by-name/mi/micro/wrapper.nix b/pkgs/by-name/mi/micro/wrapper.nix new file mode 100644 index 000000000000..1455fb44c447 --- /dev/null +++ b/pkgs/by-name/mi/micro/wrapper.nix @@ -0,0 +1,33 @@ +{ + lib, + micro, + makeWrapper, + symlinkJoin, + # configurable options + extraPackages ? [ ], +}: + +symlinkJoin { + name = "micro-wrapped-${micro.version}"; + inherit (micro) pname version outputs; + + nativeBuildInputs = [ makeWrapper ]; + + paths = [ micro ]; + + postBuild = '' + ${lib.concatMapStringsSep "\n" ( + output: "ln --verbose --symbolic --no-target-directory ${micro.${output}} \$${output}" + ) (lib.remove "out" micro.outputs)} + + pushd $out/bin + for f in *; do + rm $f + makeWrapper ${micro}/bin/$f $f \ + --prefix PATH ":" "${lib.makeBinPath extraPackages}" + done + popd + ''; + + meta = micro.meta; +} From 7ab079fe17bf64f2aa3bf112ca2b10b1c79c4d1b Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Tue, 3 Sep 2024 21:06:59 -0300 Subject: [PATCH 099/298] {micro-full,micro-with-wl-clipboard,micro-with-xclip}: "init" --- pkgs/top-level/all-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa1a6a2616e8..3e066ff09648 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25113,6 +25113,25 @@ with pkgs; meteor = callPackage ../servers/meteor { }; + micro-full = micro.wrapper.override { + extraPackages = [ + wl-clipboard + xclip + ]; + }; + + micro-with-wl-clipboard = micro.wrapper.override { + extraPackages = [ + wl-clipboard + ]; + }; + + micro-with-xclip = micro.wrapper.override { + extraPackages = [ + xclip + ]; + }; + micronaut = callPackage ../development/tools/micronaut { }; minio = callPackage ../servers/minio { }; From 686a0ee0ca1f82a3a6d3006d37b51143d61e9cb5 Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 28 Aug 2024 13:20:52 +0800 Subject: [PATCH 100/298] deepin.dde-file-manager: 6.0.51 -> 6.0.57 --- .../deepin/core/dde-file-manager/default.nix | 28 +++++++++++++++---- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/deepin/core/dde-file-manager/default.nix b/pkgs/desktops/deepin/core/dde-file-manager/default.nix index 7e77c7f083ff..5e4c8c4f7823 100644 --- a/pkgs/desktops/deepin/core/dde-file-manager/default.nix +++ b/pkgs/desktops/deepin/core/dde-file-manager/default.nix @@ -2,13 +2,14 @@ stdenv, lib, fetchFromGitHub, + fetchpatch, runtimeShell, dtkwidget, qt5integration, qt5platform-plugins, dde-qt-dbus-factory, docparser, - dde-dock, + dde-tray-loader, cmake, qttools, qtx11extras, @@ -44,13 +45,13 @@ stdenv.mkDerivation rec { pname = "dde-file-manager"; - version = "6.0.51"; + version = "6.0.57"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-MvrOhdejQPK693wFlqkERuwYM88ALtFNnbyu7H3TI4Q="; + hash = "sha256-laM6PgNdUNbsqbzKFGWk7DPuAWR+XHo0eXKG0CDuc9c="; }; nativeBuildInputs = [ @@ -62,10 +63,25 @@ stdenv.mkDerivation rec { ]; dontWrapGApps = true; - patches = [ ./patch_check_v23_interface.diff ]; + patches = [ + ./patch_check_v23_interface.diff + (fetchpatch { + name = "fix-permission-to-execute-dde-file-manager.patch"; + url = "https://github.com/linuxdeepin/dde-file-manager/commit/b78cc4bd08dd487f67c5a332a2a2f4d20b3798c7.patch"; + hash = "sha256-Tw3iu6sU0rrsM78WGMBpBgvA9YdRTM1ObjCxyM928F4="; + }) + ]; postPatch = '' - patchShebangs . + patchShebangs tests/*.sh \ + assets/scripts \ + src/*.sh \ + src/plugins/daemon/daemonplugin-accesscontrol/help.sh \ + src/apps/dde-file-manager/dde-property-dialog \ + src/apps/dde-desktop/data/applications/dfm-open.sh + + substituteInPlace assets/scripts/file-manager.sh \ + --replace-fail "/usr/libexec/dde-file-manager" "$out/libexec/dde-file-manager" substituteInPlace src/plugins/filemanager/dfmplugin-vault/utils/vaultdefine.h \ --replace-fail "/usr/bin/deepin-compressor" "deepin-compressor" @@ -99,7 +115,7 @@ stdenv.mkDerivation rec { dde-qt-dbus-factory glibmm docparser - dde-dock + dde-tray-loader qtx11extras qtmultimedia kcodecs From b24f36864244145b65dd8e7d7643e0a5ce82e181 Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 28 Aug 2024 13:23:54 +0800 Subject: [PATCH 101/298] deepin.dde-tray-loader: 0.0.5 -> 0.0.11 --- .../deepin/core/dde-tray-loader/default.nix | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/deepin/core/dde-tray-loader/default.nix b/pkgs/desktops/deepin/core/dde-tray-loader/default.nix index d5e7c1779ce6..c1e2fde90e85 100644 --- a/pkgs/desktops/deepin/core/dde-tray-loader/default.nix +++ b/pkgs/desktops/deepin/core/dde-tray-loader/default.nix @@ -2,11 +2,14 @@ stdenv, lib, fetchFromGitHub, + fetchpatch, cmake, extra-cmake-modules, pkg-config, dtkwidget, dde-qt-dbus-factory, + qt5integration, + qt5platform-plugins, wayland, wayland-scanner, xorg, @@ -15,19 +18,22 @@ stdenv.mkDerivation (finalAttrs: { pname = "dde-tray-loader"; - version = "0.0.5"; + version = "0.0.11"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dde-tray-loader"; - rev = "${finalAttrs.version}"; - hash = "sha256-ssgDLBzDFDs8FgtMHwa2k+3E3wOc8i0sVvYiYkb7lyE="; + rev = finalAttrs.version; + hash = "sha256-kz8+essf6O3ckeY5/5a/Z6539qNcfOnGbGTqSo5swhc="; }; - postPatch = '' - substituteInPlace plugins/dde-dock/CMakeLists.txt \ - --replace 'add_subdirectory("eye-comfort-mode")' " " - ''; + patches = [ + (fetchpatch { + name = "set-version-for-dde-dock_pc.patch"; + url = "https://github.com/linuxdeepin/dde-tray-loader/commit/0f9b90a9aa8096a92c21c8f01d29b4785aaf04e5.patch"; + hash = "sha256-A6k8XjyIDbA+XuUxYWd5yxFJ8yOWMOtUH5Vg10o//YM="; + }) + ]; nativeBuildInputs = [ cmake @@ -41,7 +47,10 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ dtkwidget dde-qt-dbus-factory + qt5integration + qt5platform-plugins libsForQt5.qtbase + libsForQt5.qtsvg libsForQt5.qtwayland libsForQt5.networkmanager-qt libsForQt5.libdbusmenu From 60348797ee3931aab1afbc2e165d8a6ca80374a7 Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 28 Aug 2024 13:28:44 +0800 Subject: [PATCH 102/298] deepin.dde-dock: remove --- .../services/x11/desktop-managers/deepin.nix | 2 - .../desktops/deepin/core/dde-dock/default.nix | 91 ------------------- .../deepin/core/dde-grand-search/default.nix | 4 +- .../core/dde-gsettings-schemas/default.nix | 2 + .../deepin/core/dde-session-ui/default.nix | 4 +- pkgs/desktops/deepin/default.nix | 2 +- 6 files changed, 7 insertions(+), 98 deletions(-) delete mode 100644 pkgs/desktops/deepin/core/dde-dock/default.nix diff --git a/nixos/modules/services/x11/desktop-managers/deepin.nix b/nixos/modules/services/x11/desktop-managers/deepin.nix index 1151178a8824..748b5bd16c0b 100644 --- a/nixos/modules/services/x11/desktop-managers/deepin.nix +++ b/nixos/modules/services/x11/desktop-managers/deepin.nix @@ -156,8 +156,6 @@ in deepin-desktop-base startdde - # TODO: should remove dde-dock, but dde-shell still need it's dconfig - dde-dock dde-shell dde-launchpad dde-session-ui diff --git a/pkgs/desktops/deepin/core/dde-dock/default.nix b/pkgs/desktops/deepin/core/dde-dock/default.nix deleted file mode 100644 index db3a4a052334..000000000000 --- a/pkgs/desktops/deepin/core/dde-dock/default.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - extra-cmake-modules, - qttools, - pkg-config, - wrapQtAppsHook, - wrapGAppsHook3, - qtbase, - dtkwidget, - qt5integration, - qt5platform-plugins, - dwayland, - qtx11extras, - gsettings-qt, - libdbusmenu, - xorg, -}: - -stdenv.mkDerivation rec { - pname = "dde-dock"; - version = "6.0.37"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-5VowwQ0NoV6jV6DwnoxPKnRi6n28Teh/UQZwRc3URWY="; - }; - - postPatch = '' - substituteInPlace plugins/pluginmanager/pluginmanager.cpp frame/controller/quicksettingcontroller.cpp \ - --replace "/usr/lib/dde-dock" "/run/current-system/sw/lib/dde-dock" - - substituteInPlace configs/com.deepin.dde.dock.json frame/util/common.h \ - --replace "/usr" "/run/current-system/sw" - - for file in $(grep -rl "/usr/lib/deepin-daemon"); do - substituteInPlace $file --replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon" - done - ''; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - qttools - pkg-config - wrapQtAppsHook - wrapGAppsHook3 - ]; - dontWrapGApps = true; - - buildInputs = [ - qtbase - dtkwidget - qt5platform-plugins - dwayland - qtx11extras - gsettings-qt - libdbusmenu - xorg.libXcursor - xorg.libXtst - xorg.libXdmcp - xorg.libXres - ]; - - outputs = [ - "out" - "dev" - ]; - - cmakeFlags = [ "-DVERSION=${version}" ]; - - # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH - qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" ]; - - preFixup = '' - qtWrapperArgs+=("''${gappsWrapperArgs[@]}") - ''; - - meta = with lib; { - description = "Deepin desktop-environment - dock module"; - mainProgram = "dde-dock"; - homepage = "https://github.com/linuxdeepin/dde-dock"; - platforms = platforms.linux; - license = licenses.lgpl3Plus; - maintainers = teams.deepin.members; - }; -} diff --git a/pkgs/desktops/deepin/core/dde-grand-search/default.nix b/pkgs/desktops/deepin/core/dde-grand-search/default.nix index ab5cd2f03039..11f2d4d403f4 100644 --- a/pkgs/desktops/deepin/core/dde-grand-search/default.nix +++ b/pkgs/desktops/deepin/core/dde-grand-search/default.nix @@ -8,7 +8,7 @@ wrapQtAppsHook, dtkwidget, dde-qt-dbus-factory, - dde-dock, + dde-tray-loader, deepin-pdfium, qt5integration, qt5platform-plugins, @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { buildInputs = [ dtkwidget - dde-dock + dde-tray-loader dde-qt-dbus-factory deepin-pdfium qt5integration diff --git a/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix b/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix index bdbd5e1b136b..0581339c254f 100644 --- a/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix +++ b/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix @@ -7,6 +7,7 @@ startdde, dde-session-shell, dde-file-manager, + dde-tray-loader, deepin-desktop-schemas, deepin-movie-reborn, deepin-system-monitor, @@ -21,6 +22,7 @@ let startdde dde-session-shell dde-file-manager + dde-tray-loader deepin-desktop-schemas deepin-movie-reborn deepin-system-monitor diff --git a/pkgs/desktops/deepin/core/dde-session-ui/default.nix b/pkgs/desktops/deepin/core/dde-session-ui/default.nix index a2ce7f009021..4a7e5cf9b016 100644 --- a/pkgs/desktops/deepin/core/dde-session-ui/default.nix +++ b/pkgs/desktops/deepin/core/dde-session-ui/default.nix @@ -10,7 +10,7 @@ dtkwidget, qt5integration, qt5platform-plugins, - dde-dock, + dde-tray-loader, gsettings-qt, qtx11extras, gtest, @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { qtbase dtkwidget qt5platform-plugins - dde-dock + dde-tray-loader gsettings-qt qtx11extras gtest diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 52f917a9c996..4d3ca683845a 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -48,7 +48,6 @@ let dde-control-center = callPackage ./core/dde-control-center { }; dde-calendar = callPackage ./core/dde-calendar { }; dde-clipboard = callPackage ./core/dde-clipboard { }; - dde-dock = callPackage ./core/dde-dock { }; dde-file-manager = callPackage ./core/dde-file-manager { }; dde-launchpad = callPackage ./core/dde-launchpad { }; dde-network-core = callPackage ./core/dde-network-core { }; @@ -110,6 +109,7 @@ let // lib.optionalAttrs config.allowAliases { dde-kwin = throw "The 'deepin.dde-kwin' package was removed as it is outdated and no longer relevant."; # added 2023-09-27 dde-launcher = throw "The 'deepin.dde-launcher' is no longer maintained. Please use 'deepin.dde-launchpad' instead."; # added 2023-11-23 + dde-dock = throw "The 'deepin.dde-dock' is no longer maintained. Please use 'deepin.dde-tray-loader' instead."; # added 2024-08-28 deepin-clone = throw "The 'deepin.deepin-clone' package was removed as it is broken and unmaintained."; # added 2024-08-23 go-lib = throw "Then 'deepin.go-lib' package was removed, use 'go mod' to manage it"; # added 2024-05-31 go-gir-generator = throw "Then 'deepin.go-gir-generator' package was removed, use 'go mod' to manage it"; # added 2024-05-31 From 76c5a31efefa16825c26da6811597ba2edb06257 Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 28 Aug 2024 13:51:41 +0800 Subject: [PATCH 103/298] deepin.dde-api-proxy: init at 1.0.16 --- .../deepin/core/dde-api-proxy/default.nix | 50 +++++++++++++++++++ pkgs/desktops/deepin/default.nix | 1 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/desktops/deepin/core/dde-api-proxy/default.nix diff --git a/pkgs/desktops/deepin/core/dde-api-proxy/default.nix b/pkgs/desktops/deepin/core/dde-api-proxy/default.nix new file mode 100644 index 000000000000..a46ead0f6e7c --- /dev/null +++ b/pkgs/desktops/deepin/core/dde-api-proxy/default.nix @@ -0,0 +1,50 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + libsForQt5, + dtkcore, + coreutils, +}: + +stdenv.mkDerivation rec { + pname = "dde-api-proxy"; + version = "1.0.16"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = "dde-api-proxy"; + rev = version; + hash = "sha256-kWodNftOPLIiQNPHAIC9p3VHFAis8FAI7vLJTqahAtU="; + }; + + postPatch = '' + for file in $(grep -rl "/usr/bin/false"); do + substituteInPlace $file --replace-fail "/usr/bin/false" "${coreutils}/bin/false" + done + for file in $(grep -rl "/usr/lib/dde-api-proxy"); do + substituteInPlace $file --replace-fail "/usr/lib/dde-api-proxy" "$out/lib/dde-api-proxy" + done + ''; + + nativeBuildInputs = [ + cmake + pkg-config + libsForQt5.wrapQtAppsHook + ]; + + buildInputs = [ + dtkcore + libsForQt5.qtbase + ]; + + meta = { + description = "Proxy service for dde"; + homepage = "https://github.com/linuxdeepin/dde-api-proxy"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 4d3ca683845a..d65299696e04 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -62,6 +62,7 @@ let dde-shell = callPackage ./core/dde-shell { }; dde-grand-search = callPackage ./core/dde-grand-search { }; dde-tray-loader = callPackage ./core/dde-tray-loader { }; + dde-api-proxy = callPackage ./core/dde-api-proxy { }; #### Dtk Application deepin-album = callPackage ./apps/deepin-album { }; From 2d0cdadc74ad69ca33d2ddd99a6ee72d2b397bf4 Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 28 Aug 2024 13:52:53 +0800 Subject: [PATCH 104/298] deepin.dde-launchpad: 0.7.0 -> 0.8.4 --- pkgs/desktops/deepin/core/dde-launchpad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/deepin/core/dde-launchpad/default.nix b/pkgs/desktops/deepin/core/dde-launchpad/default.nix index d1474b5bea97..44d46a0c9fae 100644 --- a/pkgs/desktops/deepin/core/dde-launchpad/default.nix +++ b/pkgs/desktops/deepin/core/dde-launchpad/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "dde-launchpad"; - version = "0.7.0"; + version = "0.8.4"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-nT89cUx7Bxf+d+fgqvXZ9U0i/qf1oP2alUB90UXpNcM="; + hash = "sha256-MPOzKAgwhJa7pMO6EZ6vYyYgZSD/SbU/L0L1dkN9/po="; }; nativeBuildInputs = [ From 8166a4e0caf43ea1c3bdfc16b4ac0f03525f939b Mon Sep 17 00:00:00 2001 From: rewine Date: Fri, 30 Aug 2024 21:06:47 +0800 Subject: [PATCH 105/298] deepin.dtkgui: fix svg renderer --- pkgs/desktops/deepin/library/dtkgui/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/desktops/deepin/library/dtkgui/default.nix b/pkgs/desktops/deepin/library/dtkgui/default.nix index 1b8c91265366..449a9d4156a1 100644 --- a/pkgs/desktops/deepin/library/dtkgui/default.nix +++ b/pkgs/desktops/deepin/library/dtkgui/default.nix @@ -27,6 +27,11 @@ stdenv.mkDerivation rec { ./fix-pri-path.patch ]; + postPatch = '' + substituteInPlace src/util/dsvgrenderer.cpp \ + --replace-fail 'QLibrary("rsvg-2", "2")' 'QLibrary("${lib.getLib librsvg}/lib/librsvg-2.so")' + ''; + nativeBuildInputs = [ cmake doxygen From 93f598448472dec37ccdc9b406e336fdefb5576f Mon Sep 17 00:00:00 2001 From: rewine Date: Fri, 30 Aug 2024 21:07:39 +0800 Subject: [PATCH 106/298] deepin.dtk6gui: fix svg renderer --- pkgs/desktops/deepin/library/dtk6gui/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/desktops/deepin/library/dtk6gui/default.nix b/pkgs/desktops/deepin/library/dtk6gui/default.nix index 53ca9621bb26..524a4bbb1c28 100644 --- a/pkgs/desktops/deepin/library/dtk6gui/default.nix +++ b/pkgs/desktops/deepin/library/dtk6gui/default.nix @@ -26,6 +26,11 @@ stdenv.mkDerivation (finalAttrs: { ./fix-pri-path.patch ]; + postPatch = '' + substituteInPlace src/util/dsvgrenderer.cpp \ + --replace-fail 'QLibrary("rsvg-2", "2")' 'QLibrary("${lib.getLib librsvg}/lib/librsvg-2.so")' + ''; + nativeBuildInputs = [ cmake pkg-config From a26df53f83daecfd018e44779c16f2b66777029a Mon Sep 17 00:00:00 2001 From: rewine Date: Fri, 30 Aug 2024 22:04:33 +0800 Subject: [PATCH 107/298] deepin.deepin-desktop-base: 2024.01.03 -> 2024.07.24 --- pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix index 7f4c433914c2..197928a86407 100644 --- a/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix +++ b/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation rec { pname = "deepin-desktop-base"; - version = "2024.01.03"; + version = "2024.07.24"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-45qR1LCnA8ZSrWykqNvvm7Dxbi5pQnAuFy6nZJrzyi0="; + hash = "sha256-JOC8nQ/YgUpY93FcniO2uypAfsL/SNU+KfTrthoZfQo="; }; makeFlags = [ "DESTDIR=${placeholder "out"}" ]; From f6bd986ea3903518969899c66771d93a84ebd537 Mon Sep 17 00:00:00 2001 From: rewine Date: Fri, 30 Aug 2024 22:17:47 +0800 Subject: [PATCH 108/298] deepin.docparser: 1.0.3 -> 1.0.11 --- .../deepin/library/docparser/default.nix | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/deepin/library/docparser/default.nix b/pkgs/desktops/deepin/library/docparser/default.nix index a283ac1098a9..e909169a0854 100644 --- a/pkgs/desktops/deepin/library/docparser/default.nix +++ b/pkgs/desktops/deepin/library/docparser/default.nix @@ -7,17 +7,21 @@ qttools, wrapQtAppsHook, poppler, + pugixml, + libzip, + libuuid, + tinyxml-2, }: stdenv.mkDerivation rec { pname = "docparser"; - version = "1.0.3"; + version = "1.0.11"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-iWRWSu8fALTTLLWdQGbpunN/1tpvKxuN/ZWJg34x0mU="; + hash = "sha256-shZXhs9ncgm6rECvCWrLi26RO1WAc1gRowoYmeKesfk="; }; nativeBuildInputs = [ @@ -27,15 +31,21 @@ stdenv.mkDerivation rec { wrapQtAppsHook ]; - buildInputs = [ poppler ]; + buildInputs = [ + poppler + pugixml + libzip + libuuid + tinyxml-2 + ]; qmakeFlags = [ "VERSION=${version}" ]; - meta = with lib; { + meta = { description = "Document parser library ported from document2html"; homepage = "https://github.com/linuxdeepin/docparser"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.deepin.members; }; } From 2ca2be2d8d5b8e7f3061ace874c5ccab42a7425d Mon Sep 17 00:00:00 2001 From: rewine Date: Fri, 30 Aug 2024 22:18:53 +0800 Subject: [PATCH 109/298] deepin.dde-calendar: 5.14.1 -> 5.14.4 --- pkgs/desktops/deepin/core/dde-calendar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/deepin/core/dde-calendar/default.nix b/pkgs/desktops/deepin/core/dde-calendar/default.nix index 6eecb85c1b60..71069e96ea96 100644 --- a/pkgs/desktops/deepin/core/dde-calendar/default.nix +++ b/pkgs/desktops/deepin/core/dde-calendar/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "dde-calendar"; - version = "5.14.1"; + version = "5.14.4"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-08xkdiP0/haHY3jdHSoA1zXRxMi2t+qxLxbcRc7EO6Q="; + hash = "sha256-bZxNOBtLjop0eYxpMeoomaWYvPcMyDfQfgGPK9m+ARo="; }; patches = [ ./fix-wrapped-name-not-in-whitelist.diff ]; From 8c77436ead0a01eb870d121504d1dc2c7ad3cdf1 Mon Sep 17 00:00:00 2001 From: rewine Date: Fri, 30 Aug 2024 22:21:32 +0800 Subject: [PATCH 110/298] deepin.deepin-icon-theme: 2024.07.19 -> 2024.07.31 --- pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix index 2ff8cb984351..2f15e0f1f195 100644 --- a/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix +++ b/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "deepin-icon-theme"; - version = "2024.07.19"; + version = "2024.07.31"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-eUL0V9pGYzvAdVZpnrWXDO/YeCBETCOGvcMqDTwTgoU="; + hash = "sha256-Vt2rYZthGelXVUp8/L57ZlDsVEjjZhCv+kSGeU6nC2s="; }; makeFlags = [ "PREFIX=${placeholder "out"}" ]; From e4a4c17bc9d362313060b317945a6ba68c30113e Mon Sep 17 00:00:00 2001 From: rewine Date: Fri, 30 Aug 2024 22:27:06 +0800 Subject: [PATCH 111/298] deepin.deepin-editor: 6.0.16 -> 6.5.0 --- .../deepin/apps/deepin-editor/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/deepin/apps/deepin-editor/default.nix b/pkgs/desktops/deepin/apps/deepin-editor/default.nix index a3b1a15b6697..9af8a60088d6 100644 --- a/pkgs/desktops/deepin/apps/deepin-editor/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-editor/default.nix @@ -17,18 +17,17 @@ libchardet, libuchardet, libiconv, - gitUpdater, }: stdenv.mkDerivation rec { pname = "deepin-editor"; - version = "6.0.16"; + version = "6.5.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-55hRXHP02MJWt+JUDCDKv4Boq0IwNW1itGw9rtCZrao="; + hash = "sha256-f6CJlSgsKU311ziXmm7Ado8tH+3dNRpWB1e4TewVf/8="; }; nativeBuildInputs = [ @@ -56,13 +55,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DVERSION=${version}" ]; - passthru.updateScript = gitUpdater { }; - - meta = with lib; { + meta = { description = "Desktop text editor that supports common text editing features"; homepage = "https://github.com/linuxdeepin/deepin-editor"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.deepin.members; }; } From 29d62536b95d1e94531cf8a2fbc4121000355cd7 Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 28 Aug 2024 18:00:17 +0800 Subject: [PATCH 112/298] deepin.nix: install dde-api-proxy --- nixos/modules/services/x11/desktop-managers/deepin.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/services/x11/desktop-managers/deepin.nix b/nixos/modules/services/x11/desktop-managers/deepin.nix index 748b5bd16c0b..9ec1591b6916 100644 --- a/nixos/modules/services/x11/desktop-managers/deepin.nix +++ b/nixos/modules/services/x11/desktop-managers/deepin.nix @@ -176,6 +176,8 @@ in dde-application-manager deepin-service-manager dde-grand-search + dde-api-proxy + dde-tray-loader ]; optionalPackages = [ onboard # dde-dock plugin @@ -215,6 +217,7 @@ in dde-application-manager deepin-service-manager dde-grand-search + dde-api-proxy ]; systemd.packages = with pkgs.deepin; [ @@ -229,6 +232,7 @@ in dde-session dde-application-manager deepin-service-manager + dde-api-proxy ]; }; } From 48f6d61156be2dc27bcc60dd397252cffbd85476 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Sep 2024 09:19:54 +0200 Subject: [PATCH 113/298] python312Packages.lxml-html-clean: 0.2.0 -> 0.2.2 Diff: https://github.com/fedora-python/lxml_html_clean/compare/refs/tags/0.2.0...0.2.2 Changelog: https://github.com/fedora-python/lxml_html_clean/blob/0.2.2/CHANGES.rst --- pkgs/development/python-modules/lxml-html-clean/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lxml-html-clean/default.nix b/pkgs/development/python-modules/lxml-html-clean/default.nix index 0215f85215dc..3b0308fe24c7 100644 --- a/pkgs/development/python-modules/lxml-html-clean/default.nix +++ b/pkgs/development/python-modules/lxml-html-clean/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "lxml-html-clean"; - version = "0.2.0"; + version = "0.2.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fedora-python"; repo = "lxml_html_clean"; rev = "refs/tags/${version}"; - hash = "sha256-3ifuEgjCLDj0dBh9AbjAT/hNFGfINbvyjgRuxIRuarw="; + hash = "sha256-DiHbO2m/JckdXFMU7/LAW2hkyskqWtrQ93sgsVcdDSo="; }; build-system = [ setuptools ]; From db3f2172c40c4005ee0a06511001decf953e4feb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Sep 2024 09:51:48 +0200 Subject: [PATCH 114/298] python312Packages.asyncssh: 2.15.0 -> 2.17.0 Changelog: https://github.com/ronf/asyncssh/blob/v2.17.0/docs/changes.rst --- pkgs/development/python-modules/asyncssh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index 427178dfa037..bcbb85e7dca9 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "2.15.0"; + version = "2.17.0"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-ChOkOBb0bPCEZX+wVZaCO5PVtI5173djyKdW7BIXg3o="; + hash = "sha256-OxWcEFqjiMHiJFxPr0g/VArajK2ZQCKBEZEAFm5e2zw="; }; build-system = [ setuptools ]; From 0cb37347c6d7328bdec1c34a6c3a0e553812ccf7 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Wed, 4 Sep 2024 09:59:10 +0200 Subject: [PATCH 115/298] auditd: format with nixfmt --- nixos/modules/security/auditd.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/nixos/modules/security/auditd.nix b/nixos/modules/security/auditd.nix index cd377c66f86d..9ac7a53e9deb 100644 --- a/nixos/modules/security/auditd.nix +++ b/nixos/modules/security/auditd.nix @@ -1,6 +1,10 @@ -{ config, lib, pkgs, ... }: - with lib; +{ + config, + lib, + pkgs, + ... +}: { options.security.auditd.enable = mkEnableOption "the Linux Audit daemon"; From 544c97226d70c9aadf1dfa4c0b259ffa158b14e4 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Wed, 4 Sep 2024 09:59:45 +0200 Subject: [PATCH 116/298] auditd: remove `with lib` --- nixos/modules/security/auditd.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/modules/security/auditd.nix b/nixos/modules/security/auditd.nix index 9ac7a53e9deb..30f0a049d8fd 100644 --- a/nixos/modules/security/auditd.nix +++ b/nixos/modules/security/auditd.nix @@ -1,4 +1,3 @@ -with lib; { config, lib, @@ -7,9 +6,9 @@ with lib; }: { - options.security.auditd.enable = mkEnableOption "the Linux Audit daemon"; + options.security.auditd.enable = lib.mkEnableOption "the Linux Audit daemon"; - config = mkIf config.security.auditd.enable { + config = lib.mkIf config.security.auditd.enable { boot.kernelParams = [ "audit=1" ]; environment.systemPackages = [ pkgs.audit ]; From a5e11d787b907dd16114f293b75d1d4af73794c4 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Wed, 4 Sep 2024 09:21:15 +0000 Subject: [PATCH 117/298] qgis-ltr: wrap all binaries This is necessary to make GRASS and Python plugins usable with qgis_process. --- pkgs/applications/gis/qgis/ltr.nix | 10 +++++----- pkgs/applications/gis/qgis/unwrapped-ltr.nix | 8 +++++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/gis/qgis/ltr.nix b/pkgs/applications/gis/qgis/ltr.nix index bcf99a5f4e4f..53e6069e8707 100644 --- a/pkgs/applications/gis/qgis/ltr.nix +++ b/pkgs/applications/gis/qgis/ltr.nix @@ -24,13 +24,13 @@ in symlinkJoin rec { pythonInputs = qgis-ltr-unwrapped.pythonBuildInputs ++ (extraPythonPackages qgis-ltr-unwrapped.py.pkgs); postBuild = '' - # unpackPhase - buildPythonPath "$pythonInputs" - wrapProgram $out/bin/qgis \ - --prefix PATH : $program_PATH \ - --set PYTHONPATH $program_PYTHONPATH + for program in $out/bin/*; do + wrapProgram $program \ + --prefix PATH : $program_PATH \ + --set PYTHONPATH $program_PYTHONPATH + done ''; passthru = { diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index 8b47329cd4a2..446a02e584ea 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -173,9 +173,11 @@ in mkDerivation rec { # the path at build time using GRASS_PREFIX. # Using wrapGAppsHook also prevents file dialogs from crashing the program # on non-NixOS. - wrapProgram $out/bin/qgis \ - "''${gappsWrapperArgs[@]}" \ - --prefix PATH : ${lib.makeBinPath [ grass ]} + for program in $out/bin/*; do + wrapProgram $program \ + "''${gappsWrapperArgs[@]}" \ + --prefix PATH : ${lib.makeBinPath [ grass ]} + done ''; meta = with lib; { From b181c313bcee62669f8b3afb4f45339cdcbc58e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Sep 2024 09:34:48 +0000 Subject: [PATCH 118/298] filesender: 2.48 -> 2.49 --- pkgs/by-name/fi/filesender/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fi/filesender/package.nix b/pkgs/by-name/fi/filesender/package.nix index 6cf4f36fd870..27a6cf73e76b 100644 --- a/pkgs/by-name/fi/filesender/package.nix +++ b/pkgs/by-name/fi/filesender/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "filesender"; - version = "2.48"; + version = "2.49"; src = fetchFromGitHub { owner = "filesender"; repo = "filesender"; rev = "filesender-${finalAttrs.version}"; - hash = "sha256-lXA9XZ5gbfut2EQ5bF2w8rhAEM++8rQseWviKwfRWGk="; + hash = "sha256-GNhborbwV9G2x7pLDyxGVCtTf4AIaMYQGAKNJPzedzo="; }; patches = [ From 4dd8774555f2e1e756f6e88d4958b98c3d0fbc1c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Sep 2024 11:22:56 +0000 Subject: [PATCH 119/298] spicedb-zed: 0.21.0 -> 0.21.1 --- pkgs/servers/spicedb/zed.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/spicedb/zed.nix b/pkgs/servers/spicedb/zed.nix index 1046c94c115f..dc82ca52fd7f 100644 --- a/pkgs/servers/spicedb/zed.nix +++ b/pkgs/servers/spicedb/zed.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "zed"; - version = "0.21.0"; + version = "0.21.1"; src = fetchFromGitHub { owner = "authzed"; repo = "zed"; rev = "v${version}"; - hash = "sha256-jHKugGQ3tta9vGjMtVEyTrLrmivLc41VFYVqAjH/IGQ="; + hash = "sha256-X8kZjPjFGMUfSQLdS6/XA1eNRQH6n/FffgbC19r1WRU="; }; - vendorHash = "sha256-nYf/ruU1IPDOcumhQz6LGEpKLyAxgASgxjPT7qz0N8c="; + vendorHash = "sha256-Q8OW9aBs1fcUdKin6uX1s6oD289eCUffmAK5nr3xn0s="; ldflags = [ "-X 'github.com/jzelinskie/cobrautil/v2.Version=${src.rev}'" From d558554243bc22db645792ab6f597d92a700334b Mon Sep 17 00:00:00 2001 From: r-vdp Date: Wed, 4 Sep 2024 11:35:44 +0200 Subject: [PATCH 120/298] initrd: use the new tmpfiles options to create tmpfiles config Otherwise we get a clash when generating the initrd since the initrd tmpfiles options create a symlink at /etc/tmpfiles.d/ and any subsequent writes inside this directory because of initrd.systemd.contents will cause a permission denied error. --- nixos/modules/system/boot/resolved.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix index b658a7a2dc05..65c00b694e0f 100644 --- a/nixos/modules/system/boot/resolved.nix +++ b/nixos/modules/system/boot/resolved.nix @@ -205,11 +205,12 @@ in boot.initrd.systemd = { contents = { - "/etc/tmpfiles.d/resolv.conf".text = - "L /etc/resolv.conf - - - - /run/systemd/resolve/stub-resolv.conf"; "/etc/systemd/resolved.conf".text = resolvedConf; }; + tmpfiles.settings.systemd-resolved-stub."/etc/resolv.conf".L.argument = + "/run/systemd/resolve/stub-resolv.conf"; + additionalUpstreamUnits = ["systemd-resolved.service"]; users.systemd-resolve = {}; groups.systemd-resolve = {}; From 81accfc667820dafa8654d76123c630bca486264 Mon Sep 17 00:00:00 2001 From: Enric Morales Date: Wed, 4 Sep 2024 15:26:02 +0200 Subject: [PATCH 121/298] basedpyright: 1.17.1 -> 1.17.2 --- pkgs/by-name/ba/basedpyright/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix index 5933a1921b28..197b546e9c71 100644 --- a/pkgs/by-name/ba/basedpyright/package.nix +++ b/pkgs/by-name/ba/basedpyright/package.nix @@ -11,13 +11,13 @@ }: let - version = "1.17.1"; + version = "1.17.2"; src = fetchFromGitHub { owner = "detachhead"; repo = "basedpyright"; rev = "refs/tags/v${version}"; - hash = "sha256-mFY0GvVGiozxd04ktSoqcezBwXkOAeIWTgNnv1zB74A="; + hash = "sha256-6pksb2drjiZo1Hp6P/G06LAj3nW5WXJbVNGt5897jAA="; }; patchedPackageJSON = runCommand "package.json" { } '' @@ -47,7 +47,7 @@ let pname = "pyright-internal"; inherit version src; sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-IJMK/YhTldOr3Gh4ewlVLUSt3PlhIjilxB7QBJpdu80="; + npmDepsHash = "sha256-w6SurZ4EG2QW7paZsWxu0gNXMXxnzQygClOUdLeBKdw="; dontNpmBuild = true; # Uncomment this flag when using unreleased peer dependencies # npmFlags = [ "--legacy-peer-deps" ]; @@ -94,7 +94,7 @@ buildNpmPackage rec { inherit version src; sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-TmJrh/Pya7jXhMQyCz6wwCCP0gzTTKFNUKF+vBq22U0="; + npmDepsHash = "sha256-y7arZsXjJ0LdWpXdSZjc7EBJPN/oWAje4uQDEhkRbDM="; postPatch = '' chmod +w ../../ From 85bbba4a182609170fe7f97ba7aa84cad3592616 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Sep 2024 14:49:06 +0200 Subject: [PATCH 122/298] python312Packages.ctypesgen: init at 1.1.1 Pure-python wrapper generator for ctypes https://github.com/ctypesgen/ctypesgen --- .../python-modules/ctypesgen/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/ctypesgen/default.nix diff --git a/pkgs/development/python-modules/ctypesgen/default.nix b/pkgs/development/python-modules/ctypesgen/default.nix new file mode 100644 index 000000000000..7eea6b726717 --- /dev/null +++ b/pkgs/development/python-modules/ctypesgen/default.nix @@ -0,0 +1,46 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + unittestCheckHook, + pythonOlder, + setuptools-scm, + setuptools, + toml, + wheel, +}: + +buildPythonPackage rec { + pname = "ctypesgen"; + version = "1.1.1"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "ctypesgen"; + repo = "ctypesgen"; + rev = "refs/tags/${version}"; + hash = "sha256-TwIWPellmjMpTGQ+adJBLNMdAqB0kLOMl4YAubvXKqo="; + }; + + build-system = [ + setuptools + setuptools-scm + toml + wheel + ]; + + # Various compiler errors + doCheck = false; + + pythonImportsCheck = [ "ctypesgen" ]; + + meta = with lib; { + description = "Pure-python wrapper generator for ctypes"; + homepage = "https://github.com/ctypesgen/ctypesgen"; + changelog = "https://github.com/ctypesgen/ctypesgen/blob/${src.rev}/CHANGELOG.md"; + license = licenses.bsd2; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 53d67680d8da..c0c58de9c748 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2700,6 +2700,8 @@ self: super: with self; { ctranslate2-cpp = pkgs.ctranslate2; }; + ctypesgen = callPackage ../development/python-modules/ctypesgen { }; + cu2qu = callPackage ../development/python-modules/cu2qu { }; customtkinter = callPackage ../development/python-modules/customtkinter { }; From b10dfee516d7a5a72292a412f10aaecb5448599b Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Tue, 3 Sep 2024 14:11:53 -0300 Subject: [PATCH 123/298] SDL_compat: copy setup-hook.sh from SDL_classic --- .../development/libraries/SDL_compat/default.nix | 2 +- .../libraries/SDL_compat/setup-hook.sh | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/SDL_compat/setup-hook.sh diff --git a/pkgs/development/libraries/SDL_compat/default.nix b/pkgs/development/libraries/SDL_compat/default.nix index 4a5d54df0e3d..dbe720837afa 100644 --- a/pkgs/development/libraries/SDL_compat/default.nix +++ b/pkgs/development/libraries/SDL_compat/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - setupHook = ../SDL/setup-hook.sh; + setupHook = ./setup-hook.sh; postFixup = '' for lib in $out/lib/*${stdenv.hostPlatform.extensions.sharedLibrary}* ; do diff --git a/pkgs/development/libraries/SDL_compat/setup-hook.sh b/pkgs/development/libraries/SDL_compat/setup-hook.sh new file mode 100644 index 000000000000..54a9b3e8bfab --- /dev/null +++ b/pkgs/development/libraries/SDL_compat/setup-hook.sh @@ -0,0 +1,16 @@ +addSDLPath () { + if [ -e "$1/include/SDL" ]; then + export SDL_PATH="${SDL_PATH-}${SDL_PATH:+ }$1/include/SDL" + # NB this doesn’t work with split dev packages because different packages + # will contain "include/SDL/" and "lib/" directories. + # + # However the SDL_LIB_PATH is consumed by SDL itself and serves to locate + # libraries like SDL_mixer, SDL_image, etc which are not split-package + # so the check above will only trigger on them. + if [ -e "$1/lib" ]; then + export SDL_LIB_PATH="${SDL_LIB_PATH-}${SDL_LIB_PATH:+ }-L$1/lib" + fi + fi +} + +addEnvHooks "$hostOffset" addSDLPath From 1918269b08b5605ec23577a662bbb3ad3f4a30db Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Tue, 3 Sep 2024 14:22:16 -0300 Subject: [PATCH 124/298] SDL_compat: hide parameters under package expression --- pkgs/development/libraries/SDL_compat/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/SDL_compat/default.nix b/pkgs/development/libraries/SDL_compat/default.nix index dbe720837afa..a5f3d6360f89 100644 --- a/pkgs/development/libraries/SDL_compat/default.nix +++ b/pkgs/development/libraries/SDL_compat/default.nix @@ -5,17 +5,17 @@ , pkg-config , SDL2 , libiconv -, Cocoa -, autoSignDarwinBinariesHook , mesa , libGLSupported ? lib.elem stdenv.hostPlatform.system mesa.meta.platforms , openglSupport ? libGLSupported , libGLU +, darwin }: let inherit (lib) optionals makeLibraryPath; - + inherit (darwin.apple_sdk.frameworks) Cocoa; + inherit (darwin) autoSignDarwinBinariesHook; in stdenv.mkDerivation rec { pname = "SDL_compat"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b5ebfb6ac4cb..d0cbfba5ab7a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23454,10 +23454,7 @@ with pkgs; libGLU = null; }); - SDL_compat = callPackage ../development/libraries/SDL_compat { - inherit (darwin.apple_sdk.frameworks) Cocoa; - inherit (darwin) autoSignDarwinBinariesHook; - }; + SDL_compat = callPackage ../development/libraries/SDL_compat { }; SDL = SDL_classic; From 77b1cefe321e18a15032ff4597b474282894ae21 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 4 Sep 2024 12:20:35 -0300 Subject: [PATCH 125/298] SDL_compat: migrate to by-name --- .../default.nix => by-name/sd/SDL_compat/package.nix} | 0 .../libraries => by-name/sd}/SDL_compat/setup-hook.sh | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{development/libraries/SDL_compat/default.nix => by-name/sd/SDL_compat/package.nix} (100%) rename pkgs/{development/libraries => by-name/sd}/SDL_compat/setup-hook.sh (100%) diff --git a/pkgs/development/libraries/SDL_compat/default.nix b/pkgs/by-name/sd/SDL_compat/package.nix similarity index 100% rename from pkgs/development/libraries/SDL_compat/default.nix rename to pkgs/by-name/sd/SDL_compat/package.nix diff --git a/pkgs/development/libraries/SDL_compat/setup-hook.sh b/pkgs/by-name/sd/SDL_compat/setup-hook.sh similarity index 100% rename from pkgs/development/libraries/SDL_compat/setup-hook.sh rename to pkgs/by-name/sd/SDL_compat/setup-hook.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d0cbfba5ab7a..6cba631e167d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23454,8 +23454,6 @@ with pkgs; libGLU = null; }); - SDL_compat = callPackage ../development/libraries/SDL_compat { }; - SDL = SDL_classic; SDL2 = callPackage ../development/libraries/SDL2 { From ad2899f18282c4585bb4f7ceb924ea04f8c59e68 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 4 Sep 2024 12:23:01 -0300 Subject: [PATCH 126/298] SDL_compat: rewrite - finalAttrs design pattern - get rid of nested with in meta --- pkgs/by-name/sd/SDL_compat/package.nix | 42 +++++++++++++------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/sd/SDL_compat/package.nix b/pkgs/by-name/sd/SDL_compat/package.nix index a5f3d6360f89..a2ac5f6d2887 100644 --- a/pkgs/by-name/sd/SDL_compat/package.nix +++ b/pkgs/by-name/sd/SDL_compat/package.nix @@ -1,39 +1,39 @@ { lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config , SDL2 +, cmake +, darwin +, fetchFromGitHub +, libGLU , libiconv , mesa +, pkg-config +, stdenv +# Boolean flags , libGLSupported ? lib.elem stdenv.hostPlatform.system mesa.meta.platforms , openglSupport ? libGLSupported -, libGLU -, darwin }: let - inherit (lib) optionals makeLibraryPath; inherit (darwin.apple_sdk.frameworks) Cocoa; inherit (darwin) autoSignDarwinBinariesHook; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "SDL_compat"; version = "1.2.68"; src = fetchFromGitHub { owner = "libsdl-org"; repo = "sdl12-compat"; - rev = "release-" + version; + rev = "release-" + finalAttrs.version; hash = "sha256-f2dl3L7/qoYNl4sjik1npcW/W09zsEumiV9jHuKnUmM="; }; nativeBuildInputs = [ cmake pkg-config ] - ++ optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ]; + ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ]; propagatedBuildInputs = [ SDL2 ] - ++ optionals stdenv.hostPlatform.isDarwin [ libiconv Cocoa ] - ++ optionals openglSupport [ libGLU ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Cocoa ] + ++ lib.optionals openglSupport [ libGLU ]; enableParallelBuilding = true; @@ -43,20 +43,20 @@ stdenv.mkDerivation rec { for lib in $out/lib/*${stdenv.hostPlatform.extensions.sharedLibrary}* ; do if [[ -L "$lib" ]]; then ${if stdenv.hostPlatform.isDarwin then '' - install_name_tool ${lib.strings.concatMapStrings (x: " -add_rpath ${makeLibraryPath [x]} ") propagatedBuildInputs} "$lib" + install_name_tool ${lib.strings.concatMapStrings (x: " -add_rpath ${lib.makeLibraryPath [x]} ") finalAttrs.propagatedBuildInputs} "$lib" '' else '' - patchelf --set-rpath "$(patchelf --print-rpath $lib):${makeLibraryPath propagatedBuildInputs}" "$lib" + patchelf --set-rpath "$(patchelf --print-rpath $lib):${lib.makeLibraryPath finalAttrs.propagatedBuildInputs}" "$lib" ''} fi done ''; - meta = with lib; { - description = "Cross-platform multimedia library - build SDL 1.2 applications against 2.0"; - mainProgram = "sdl-config"; + meta = { homepage = "https://www.libsdl.org/"; - license = licenses.zlib; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.all; + description = "Cross-platform multimedia library - build SDL 1.2 applications against 2.0"; + license = lib.licenses.zlib; + mainProgram = "sdl-config"; + maintainers = lib.teams.sdl.members ++ (with lib.maintainers; [ peterhoeg ]); + platforms = lib.platforms.all; }; -} +}) From 245276a92526f1f1eb4cfa58836a70b5165653dc Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Tue, 3 Sep 2024 14:07:21 -0300 Subject: [PATCH 127/298] SDL_classic: hide parameters under package expression --- pkgs/development/libraries/SDL/default.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 7 +------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 8038407090b4..90d164523a79 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -5,16 +5,19 @@ , x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid , libXext, libICE, libXrandr , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux && !stdenv.hostPlatform.isAndroid && lib.meta.availableOn stdenv.hostPlatform libpulseaudio, libpulseaudio -, OpenGL, GLUT, CoreAudio, CoreServices, AudioUnit, Kernel, Cocoa +, darwin }: # NOTE: When editing this expression see if the same change applies to # SDL2 expression too let + inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa GLUT; extraPropagatedBuildInputs = [ ] ++ lib.optionals x11Support [ libXext libICE libXrandr ] - ++ lib.optionals (openglSupport && stdenv.isLinux) [ libGL libGLU ] + ++ lib.optionals (openglSupport && stdenv.isLinux) [ libGL ] + # libGLU doesn’t work with Android's SDL + ++ lib.optionals (openglSupport && stdenv.isLinux && (!stdenv.hostPlatform.isAndroid)) [ libGLU ] ++ lib.optionals (openglSupport && stdenv.isDarwin) [ OpenGL GLUT ] ++ lib.optional alsaSupport alsa-lib ++ lib.optional pulseaudioSupport libpulseaudio diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6cba631e167d..2b24f02e0d46 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23447,12 +23447,7 @@ with pkgs; scope-lite = callPackage ../development/libraries/scope-lite { }; - SDL_classic = callPackage ../development/libraries/SDL ({ - inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa GLUT; - } // lib.optionalAttrs stdenv.hostPlatform.isAndroid { - # libGLU doesn’t work with Android’s SDL - libGLU = null; - }); + SDL_classic = callPackage ../development/libraries/SDL { }; SDL = SDL_classic; From 7159facf92be49324a6e5b544dc7952e25ed8c66 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Tue, 3 Sep 2024 15:04:51 -0300 Subject: [PATCH 128/298] SDL1: migrate to by-name And green-alias both SDL1 and SDL_classic to it. --- .../libraries/SDL => by-name/sd/SDL1}/find-headers.patch | 0 .../libraries/SDL/default.nix => by-name/sd/SDL1/package.nix} | 0 .../libraries/SDL => by-name/sd/SDL1}/setup-hook.sh | 0 pkgs/top-level/all-packages.nix | 4 ++-- 4 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/{development/libraries/SDL => by-name/sd/SDL1}/find-headers.patch (100%) rename pkgs/{development/libraries/SDL/default.nix => by-name/sd/SDL1/package.nix} (100%) rename pkgs/{development/libraries/SDL => by-name/sd/SDL1}/setup-hook.sh (100%) diff --git a/pkgs/development/libraries/SDL/find-headers.patch b/pkgs/by-name/sd/SDL1/find-headers.patch similarity index 100% rename from pkgs/development/libraries/SDL/find-headers.patch rename to pkgs/by-name/sd/SDL1/find-headers.patch diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/by-name/sd/SDL1/package.nix similarity index 100% rename from pkgs/development/libraries/SDL/default.nix rename to pkgs/by-name/sd/SDL1/package.nix diff --git a/pkgs/development/libraries/SDL/setup-hook.sh b/pkgs/by-name/sd/SDL1/setup-hook.sh similarity index 100% rename from pkgs/development/libraries/SDL/setup-hook.sh rename to pkgs/by-name/sd/SDL1/setup-hook.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b24f02e0d46..1167731903c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23447,9 +23447,9 @@ with pkgs; scope-lite = callPackage ../development/libraries/scope-lite { }; - SDL_classic = callPackage ../development/libraries/SDL { }; + SDL = SDL1; - SDL = SDL_classic; + SDL_classic = SDL1; SDL2 = callPackage ../development/libraries/SDL2 { inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL; From 31e68de81db7731d210022daa5be07afe5fd410d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Sep 2024 15:55:16 +0000 Subject: [PATCH 129/298] oidc-agent: 5.2.0 -> 5.2.1 --- pkgs/by-name/oi/oidc-agent/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/oi/oidc-agent/package.nix b/pkgs/by-name/oi/oidc-agent/package.nix index b84b9184262d..2be9a24f7db6 100644 --- a/pkgs/by-name/oi/oidc-agent/package.nix +++ b/pkgs/by-name/oi/oidc-agent/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "oidc-agent"; - version = "5.2.0"; + version = "5.2.1"; src = fetchFromGitHub { owner = "indigo-dc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Nwna8VbhhXtmEbAxgo/E9QgfuglGuyFK2DwHOZL4WXQ="; + sha256 = "sha256-SjpCD/x93kYB5759e/D0btLO48d6g4SkEUAX7PYfm2w="; }; nativeBuildInputs = [ From ad67b0f76ad86baf2d3e28e8a0942ffdd03f00fd Mon Sep 17 00:00:00 2001 From: PerchunPak Date: Wed, 4 Sep 2024 19:03:23 +0200 Subject: [PATCH 130/298] vimPlugins.nvim-treesitter: workaround for duplicate grammars See https://github.com/NixOS/nixpkgs/pull/339076#issuecomment-2329585080 --- .../editors/vim/plugins/nvim-treesitter/overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix index 710528c3561c..c7cd3266d9c7 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix @@ -42,7 +42,7 @@ let (f (tree-sitter.builtGrammars // builtGrammars)); copyGrammar = grammar: let name = lib.last (lib.splitString "-" grammar.name); in - "ln -s ${grammar}/parser/${name}.so $out/parser/${name}.so"; + "ln -sf ${grammar}/parser/${name}.so $out/parser/${name}.so"; in [ (runCommand "vimplugin-treesitter-grammars" From 8716383e945ae88fa9eb8ba47fa5f21e11b50d41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Wed, 4 Sep 2024 19:11:30 +0200 Subject: [PATCH 131/298] tor-browser: 13.5.2 -> 13.5.3 https://blog.torproject.org/new-release-tor-browser-1353/ --- pkgs/by-name/to/tor-browser/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix index 85e068db0842..5283e04db85f 100644 --- a/pkgs/by-name/to/tor-browser/package.nix +++ b/pkgs/by-name/to/tor-browser/package.nix @@ -101,7 +101,7 @@ lib.warnIf (useHardenedMalloc != null) ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "13.5.2"; + version = "13.5.3"; sources = { x86_64-linux = fetchurl { @@ -111,7 +111,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-f6bKRWirHuOe2BnCYegZi1j58Ou3p6Syw++NVLGUGdU="; + hash = "sha256-g4wSjFS3VFZcflN2lexAoSledOBCK9taixGEUbM3X1E="; }; i686-linux = fetchurl { @@ -121,7 +121,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" ]; - hash = "sha256-ye+l3aq3nV97SUyARZMcPhdtGLoAWoscbr81F5LdbS4="; + hash = "sha256-sw8PFbCTUvmD1+fE3VXX/3A07CnzXjBydQ+b4rshpak="; }; }; From 83fd501d7bad57b8235f294c9fb2ff07d7f7317b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Wed, 4 Sep 2024 19:13:36 +0200 Subject: [PATCH 132/298] mullvad-browser: 13.5.2 -> 13.5.3 https://github.com/mullvad/mullvad-browser/releases/tag/13.5.3 --- pkgs/by-name/mu/mullvad-browser/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mu/mullvad-browser/package.nix b/pkgs/by-name/mu/mullvad-browser/package.nix index 876cf96d5077..42cb084e0588 100644 --- a/pkgs/by-name/mu/mullvad-browser/package.nix +++ b/pkgs/by-name/mu/mullvad-browser/package.nix @@ -90,7 +90,7 @@ let ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "13.5.2"; + version = "13.5.3"; sources = { x86_64-linux = fetchurl { @@ -102,7 +102,7 @@ let "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-CXcaJLgG448tjTlOcxGwT/w1qWaokpVXbBZ6cLxWcNc="; + hash = "sha256-rJKOkVfWs5q3eF+ffeBLIQaAMtoR7KzoNQlv64iNWJ8="; }; }; From e80cd707c4b26ef11e5877bee5f5bac87c7babdd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Sep 2024 19:37:34 +0200 Subject: [PATCH 133/298] matrix-appservice-irc: 2.0.1 -> 3.0.0 https://github.com/matrix-org/matrix-appservice-irc/releases/tag/3.0.0 --- .../matrix-synapse/matrix-appservice-irc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix index 993fa909b1a8..86be2ddb41f8 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix @@ -13,19 +13,19 @@ let pname = "matrix-appservice-irc"; - version = "2.0.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "matrix-org"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ue3fOkrEBRI/NRE+uKFR+NaqP8QvzVVeX3LUh4aZYJA="; + hash = "sha256-ZT8ugev+Tgu47KLuVVo5sFfiGtWLDc6JW5NZvsQ1mA8="; }; yarnOfflineCache = fetchYarnDeps { name = "${pname}-${version}-offline-cache"; yarnLock = "${src}/yarn.lock"; - hash = "sha256-hapEbdjvvzeZHfrpYRW9W3vXkQVNyGZ0qydO34+mQqQ="; + hash = "sha256-13OUcxZOlW1pp4uB1aRmqlzKf6rTgyP/nMnLmksXV3w="; }; in From 2b8abed1f3c5f5f184c30fa0a2e9cff3519d833c Mon Sep 17 00:00:00 2001 From: Gavin John <> Date: Fri, 12 Jul 2024 14:28:31 -0400 Subject: [PATCH 134/298] paup: init at 4.0a169 --- pkgs/by-name/pa/paup/package.nix | 52 ++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 pkgs/by-name/pa/paup/package.nix diff --git a/pkgs/by-name/pa/paup/package.nix b/pkgs/by-name/pa/paup/package.nix new file mode 100644 index 000000000000..62bb5206587a --- /dev/null +++ b/pkgs/by-name/pa/paup/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenvNoCC, + fetchurl, + autoPatchelfHook, + curl, + gfortran, + zlib, +}: + +stdenvNoCC.mkDerivation { + pname = "paup"; + version = "4.0a168"; + + src = fetchurl { + url = "http://phylosolutions.com/paup-test/paup4a168_centos64.gz"; + hash = "sha256-41dZswlrIQ05f1zJzId78DKmPf0QH1SfrexzvCAUxq8="; + }; + + unpackPhase = '' + runHook preUnpack + + gunzip -c $src > paup + + runHook postUnpack + ''; + + nativeBuildInputs = [ autoPatchelfHook ]; + buildInputs = [ + curl + gfortran + zlib + ]; + + installPhase = '' + runHook preInstall + + install -Dm755 paup -t $out/bin + + runHook postInstall + ''; + + meta = { + description = "A software package for inferring evolutionary trees"; + homepage = "http://phylosolutions.com/paup-test/"; + license = lib.licenses.unfree; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + maintainers = with lib.maintainers; [ pandapip1 ]; + mainProgram = "paup"; + platforms = [ "x86_64-linux" ]; + }; +} From 0c288176f8494d7c37279cecdbf3c544236dde97 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Wed, 10 Jul 2024 17:52:02 -0400 Subject: [PATCH 135/298] python3Packages.dendropy: 4.5.1 -> 5.0.2 --- .../python-modules/dendropy/default.nix | 53 +++++++++++-------- 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/pkgs/development/python-modules/dendropy/default.nix b/pkgs/development/python-modules/dendropy/default.nix index f17acbdc4b95..8cc15b7210c7 100644 --- a/pkgs/development/python-modules/dendropy/default.nix +++ b/pkgs/development/python-modules/dendropy/default.nix @@ -1,45 +1,54 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, pytestCheckHook, pythonOlder, + nix-update-script, + setuptools, + paup, + paupIntegration ? false, }: +let + paupPath = if paupIntegration then lib.getExe paup else "NONE"; +in buildPythonPackage rec { pname = "dendropy"; - version = "4.5.1"; - format = "setuptools"; + version = "5.0.2"; - disabled = pythonOlder "3.7"; + pyproject = true; + build-system = [ setuptools ]; src = fetchFromGitHub { owner = "jeetsukumaran"; - repo = pname; - rev = "v${version}"; - hash = "sha256-FP0+fJkkFtSysPxoHXjyMgF8pPin7aRyzmHe9bH8LlM="; + repo = "dendropy"; + rev = "refs/tags/v${version}"; + hash = "sha256-OiFei/6226FDtL4w1XrXL2OVn3/hfQwnIhTzM4OneKc="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace '["pytest-runner"],' '[],' + + substituteInPlace src/dendropy/interop/paup.py \ + --replace 'PAUP_PATH = os.environ.get(metavar.DENDROPY_PAUP_PATH_ENVAR, "paup")' 'PAUP_PATH = os.environ.get(metavar.DENDROPY_PAUP_PATH_ENVAR, "${paupPath}")' + ''; + nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = [ - # FileNotFoundError: [Errno 2] No such file or directory: 'paup' - "test_basic_split_count_with_incorrect_rootings_raises_error" - "test_basic_split_count_with_incorrect_weight_treatment_raises_error" - "test_basic_split_counting_under_different_rootings" - "test_group1" - # AssertionError: 6 != 5 - "test_by_num_lineages" - # AttributeError: module 'collections' has no attribute 'Iterable' - "test_findall_multiple" - ]; - pythonImportsCheck = [ "dendropy" ]; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Python library for phylogenetic computing"; - homepage = "https://dendropy.org/"; - license = licenses.bsd3; - maintainers = with maintainers; [ unode ]; + homepage = "https://jeetsukumaran.github.io/DendroPy/"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ + unode + pandapip1 + ]; }; } From a4e033f90ce58031f324432b8bf0ca3b4bcf155c Mon Sep 17 00:00:00 2001 From: DarkOnion0 Date: Tue, 3 Sep 2024 10:56:17 +0200 Subject: [PATCH 136/298] appflowy: 0.6.7.2 -> 0.6.8 https://github.com/AppFlowy-IO/AppFlowy/releases/tag/0.6.8 --- pkgs/applications/office/appflowy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index 132c894507cb..a7a979ed82d3 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -17,11 +17,11 @@ let rec { x86_64-linux = { urlSuffix = "linux-x86_64.tar.gz"; - hash = "sha256-2hrrK3ACYPzkSDxhjOevO8yykwWjS9gARz3A0er7SO4="; + hash = "sha256-sQ3dxwPWHLUoWgnR9+oHaFoDzXxtwKRiBvz2wkFB01g="; }; x86_64-darwin = { urlSuffix = "macos-universal.zip"; - hash = "sha256-07u1KUfbYTBDFbmZK9ZHgutnhLMlcqQCg5l+z3ChTn0="; + hash = "sha256-4bU/qecZBrTr34SZAjDDgwpXAAHDITz6lV6mJGjElko="; }; aarch64-darwin = x86_64-darwin; } @@ -29,7 +29,7 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "appflowy"; - version = "0.6.7.2"; + version = "0.6.8"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${finalAttrs.version}/AppFlowy-${finalAttrs.version}-${dist.urlSuffix}"; From 8bc8bbd1c9da9e56a6c20ddcae7b9eb7b33a683d Mon Sep 17 00:00:00 2001 From: seth Date: Wed, 4 Sep 2024 14:43:23 -0400 Subject: [PATCH 137/298] doc/stdenv: fix typo in sourceRoot section --- doc/stdenv/stdenv.chapter.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 35330305f189..f776ca8d8dab 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -580,7 +580,7 @@ After unpacking all of `src` and `srcs`, if neither of `sourceRoot` and `setSour If `unpackPhase` produces multiple source directories, you should set `sourceRoot` to the name of the intended directory. You can also set `sourceRoot = ".";` if you want to control it yourself in a later phase. -For example, if your want your build to start in a sub-directory inside your sources, and you are using `fetchzip`-derived `src` (like `fetchFromGitHub` or similar), you need to set `sourceRoot = "${src.name}/my-sub-directory"`. +For example, if you want your build to start in a sub-directory inside your sources, and you are using `fetchzip`-derived `src` (like `fetchFromGitHub` or similar), you need to set `sourceRoot = "${src.name}/my-sub-directory"`. ##### `setSourceRoot` {#var-stdenv-setSourceRoot} From d1a0bf8bfc3fa43ac87eab51c9306d94b3217cfb Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 27 Aug 2024 19:13:31 +0300 Subject: [PATCH 138/298] musescore: 4.3.2 -> 4.4.0 Diff: https://github.com/musescore/MuseScore/compare/v4.3.2...v4.4.0 --- pkgs/applications/audio/musescore/default.nix | 54 ++++++++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 35 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 479e8850872c..b90cb2da303e 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , cmake , wrapQtAppsHook , pkg-config @@ -18,18 +19,16 @@ , portmidi , qtbase , qtdeclarative -, qtgraphicaleffects , flac , libopusenc , libopus , tinyxml-2 -, qtquickcontrols -, qtquickcontrols2 -, qtscript +, qt5compat +, qtwayland , qtsvg -, qtxmlpatterns +, qtscxml , qtnetworkauth -, qtx11extras +, qttools , nixosTests , darwin }: @@ -50,31 +49,48 @@ let } else portaudio; in stdenv'.mkDerivation (finalAttrs: { pname = "musescore"; - version = "4.3.2"; + version = "4.4.0"; src = fetchFromGitHub { owner = "musescore"; repo = "MuseScore"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-QjvY8R2nq/DeFDikHn9qr4aCEwzAcogQXM5vdZqhoMM="; + sha256 = "sha256-oDbOaLFmSpZ7D8E7LBxUwFwiaPcucIUj3eEp6sXR5o8="; }; + patches = [ + # https://github.com/musescore/MuseScore/pull/24247 + (fetchpatch { + name = "skip-downloading-harfbuzz.patch"; + url = "https://github.com/musescore/MuseScore/commit/686ea243d58b43eb3dff7ebdabb2e09de4d212e4.patch"; + hash = "sha256-fsb1hKFKXwBdMPh+Ek0UT3XtI8qg3ieWUQW1/XDvhmg="; + }) + # https://github.com/musescore/MuseScore/pull/24261 + (fetchpatch { + name = "allow-using-system-harfbuzz.patch"; + url = "https://github.com/musescore/MuseScore/commit/696279e362afe72db5e92f8a47aa64b3a0e86a86.patch"; + hash = "sha256-z1W2SmzUUlVL7mRR2frzUZjMEnwqkVfRVz4TufR1tDU="; + }) + # https://github.com/musescore/MuseScore/pull/24326 + (fetchpatch { + name = "fix-menubar-with-qt6.5+.patch"; + url = "https://github.com/musescore/MuseScore/pull/24326/commits/b274f13311ad0b2bce339634a006ba22fbd3379e.patch"; + hash = "sha256-ZGmjRa01CBEIxJdJYQMhdg4A9yjWdlgn0pCPmENBTq0="; + }) + ]; cmakeFlags = [ - "-DMUSESCORE_BUILD_MODE=release" + "-DMUSE_APP_BUILD_MODE=release" # Disable the build and usage of the `/bin/crashpad_handler` utility - it's # not useful on NixOS, see: # https://github.com/musescore/MuseScore/issues/15571 - "-DMUE_BUILD_CRASHPAD_CLIENT=OFF" + "-DMUSE_MODULE_DIAGNOSTICS_CRASHPAD_CLIENT=OFF" # Use our versions of system libraries "-DMUE_COMPILE_USE_SYSTEM_FREETYPE=ON" + "-DMUE_COMPILE_USE_SYSTEM_HARFBUZZ=ON" "-DMUE_COMPILE_USE_SYSTEM_TINYXML=ON" # Implies also -DMUE_COMPILE_USE_SYSTEM_OPUS=ON "-DMUE_COMPILE_USE_SYSTEM_OPUSENC=ON" "-DMUE_COMPILE_USE_SYSTEM_FLAC=ON" - # From some reason, in $src/build/cmake/SetupBuildEnvironment.cmake, - # upstream defaults to compiling to x86_64 only, unless this cmake flag is - # set - "-DMUE_COMPILE_BUILD_MACOS_APPLE_SILICON=ON" # Don't bundle qt qml files, relevant really only for darwin, but we set # this for all platforms anyway. "-DMUE_COMPILE_INSTALL_QTQML_FILES=OFF" @@ -94,6 +110,7 @@ in stdenv'.mkDerivation (finalAttrs: { nativeBuildInputs = [ wrapQtAppsHook cmake + qttools pkg-config ninja ]; @@ -114,14 +131,11 @@ in stdenv'.mkDerivation (finalAttrs: { tinyxml-2 qtbase qtdeclarative - qtgraphicaleffects - qtquickcontrols - qtquickcontrols2 - qtscript + qt5compat + qtwayland qtsvg - qtxmlpatterns + qtscxml qtnetworkauth - qtx11extras ] ++ lib.optionals stdenv.isLinux [ alsa-lib ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30550514880d..2b2d76828461 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32071,7 +32071,7 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - musescore = libsForQt5.callPackage ../applications/audio/musescore { }; + musescore = qt6.callPackage ../applications/audio/musescore { }; music-player = callPackage ../applications/audio/music-player { }; From d3df4119133bb6a79d80077213b9a61d42b40bcc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Sep 2024 20:35:02 +0200 Subject: [PATCH 139/298] nixos/matrix-appservice-irc: media proxying support Adds required options for serving authenticated media and the key generation logic. --- .../services/matrix/appservice-irc.nix | 35 +++++++++++++++++++ nixos/tests/matrix/appservice-irc.nix | 17 +++++---- 2 files changed, 46 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/matrix/appservice-irc.nix b/nixos/modules/services/matrix/appservice-irc.nix index 55a04059abe4..df12998ab156 100644 --- a/nixos/modules/services/matrix/appservice-irc.nix +++ b/nixos/modules/services/matrix/appservice-irc.nix @@ -137,6 +137,37 @@ in { type = submodule { freeformType = jsonType; }; description = "IRC servers to connect to"; }; + + mediaProxy = { + signingKeyPath = lib.mkOption { + type = path; + default = "/var/lib/matrix-appservice-irc/media-signingkey.jwk"; + description = '' + Path to the signing key file for authenticated media. + ''; + }; + ttlSeconds = lib.mkOption { + type = ints.positive; + default = 3600; + description = '' + Lifetime in seconds, that generated URLs stay valid. + ''; + }; + bindPort = lib.mkOption { + type = port; + default = 11111; + description = '' + Port that the media proxy binds to. + ''; + }; + publicUrl = lib.mkOption { + type = str; + example = "https://matrix.example.com/media"; + description = '' + URL under which the media proxy is publicly acccessible. + ''; + }; + }; }; }; }; @@ -144,6 +175,7 @@ in { }; }; }; + config = lib.mkIf cfg.enable { systemd.services.matrix-appservice-irc = { description = "Matrix-IRC bridge"; @@ -181,6 +213,9 @@ in { sed -i "s/^hs_token:.*$/$hs_token/g" ${registrationFile} sed -i "s/^as_token:.*$/$as_token/g" ${registrationFile} fi + if ! [ -f "${cfg.settings.ircService.mediaProxy.signingKeyPath}"]; then + ${lib.getExe pkgs.nodejs} ${pkg}/lib/generate-signing-key.js > "${cfg.settings.ircService.mediaProxy.signingKeyPath}" + fi # Allow synapse access to the registration if ${pkgs.getent}/bin/getent group matrix-synapse > /dev/null; then chgrp matrix-synapse ${registrationFile} diff --git a/nixos/tests/matrix/appservice-irc.nix b/nixos/tests/matrix/appservice-irc.nix index 78c53024ca6c..23e0a00436d3 100644 --- a/nixos/tests/matrix/appservice-irc.nix +++ b/nixos/tests/matrix/appservice-irc.nix @@ -75,13 +75,16 @@ import ../make-test-python.nix ({ pkgs, ... }: homeserver.url = homeserverUrl; homeserver.domain = "homeserver"; - ircService.servers."ircd" = { - name = "IRCd"; - port = 6667; - dynamicChannels = { - enabled = true; - aliasTemplate = "#irc_$CHANNEL"; + ircService = { + servers."ircd" = { + name = "IRCd"; + port = 6667; + dynamicChannels = { + enabled = true; + aliasTemplate = "#irc_$CHANNEL"; + }; }; + mediaProxy.publicUrl = "http://localhost:11111/media"; }; }; }; @@ -203,6 +206,8 @@ import ../make-test-python.nix ({ pkgs, ... }: with subtest("start the appservice"): appservice.wait_for_unit("matrix-appservice-irc.service") appservice.wait_for_open_port(8009) + appservice.wait_for_file("/var/lib/matrix-appservice-irc/media-signingkey.jwk") + appservice.wait_for_open_port(11111) with subtest("copy the registration file"): appservice.copy_from_vm("/var/lib/matrix-appservice-irc/registration.yml") From de396087e9e7e0aff63229788ea00a2f7a96c20c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Sep 2024 20:35:52 +0200 Subject: [PATCH 140/298] nixos/tests/matrix-appservice-irc: modernize --- nixos/tests/all-tests.nix | 2 +- nixos/tests/matrix/appservice-irc.nix | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 76c70e2c3fc8..f8e0eb190bf5 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -570,7 +570,7 @@ in { mate-wayland = handleTest ./mate-wayland.nix {}; matter-server = handleTest ./matter-server.nix {}; matomo = handleTest ./matomo.nix {}; - matrix-appservice-irc = handleTest ./matrix/appservice-irc.nix {}; + matrix-appservice-irc = runTest ./matrix/appservice-irc.nix; matrix-conduit = handleTest ./matrix/conduit.nix {}; matrix-synapse = handleTest ./matrix/synapse.nix {}; matrix-synapse-workers = handleTest ./matrix/synapse-workers.nix {}; diff --git a/nixos/tests/matrix/appservice-irc.nix b/nixos/tests/matrix/appservice-irc.nix index 23e0a00436d3..2c556ec37fc5 100644 --- a/nixos/tests/matrix/appservice-irc.nix +++ b/nixos/tests/matrix/appservice-irc.nix @@ -1,4 +1,4 @@ -import ../make-test-python.nix ({ pkgs, ... }: +{ pkgs, ... }: let homeserverUrl = "http://homeserver:8008"; in @@ -9,7 +9,7 @@ import ../make-test-python.nix ({ pkgs, ... }: }; nodes = { - homeserver = { pkgs, ... }: { + homeserver = { # We'll switch to this once the config is copied into place specialisation.running.configuration = { services.matrix-synapse = { @@ -46,7 +46,7 @@ import ../make-test-python.nix ({ pkgs, ... }: }; }; - ircd = { pkgs, ... }: { + ircd = { services.ngircd = { enable = true; config = '' @@ -227,4 +227,4 @@ import ../make-test-python.nix ({ pkgs, ... }: with subtest("ensure messages can be exchanged"): client.succeed("do_test ${homeserverUrl} >&2") ''; - }) + } From 5e05977655dc6cfeb99d8b8719176e3b67ceae71 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Thu, 5 Sep 2024 00:50:06 +0530 Subject: [PATCH 141/298] maintainers-list: remove loveisgrief Now a ghost user. Cleanup of https://github.com/NixOS/nixpkgs/pull/339372 Requested in https://github.com/NixOS/nixpkgs/issues/339089 --- maintainers/maintainer-list.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bfe5e59b86dd..82aaf98a705e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12015,13 +12015,6 @@ githubId = 4969294; name = "Louis Tim Larsen"; }; - loveisgrief = { - name = "LoveIsGrief"; - email = "loveisgrief@tuta.io"; - github = "LoveIsGrief"; - githubId = 2829538; - keys = [ { fingerprint = "9847 4F48 18C6 4E0A F0C5 3529 E96D 1EDF A053 45EB"; } ]; - }; lovek323 = { email = "jason@oconal.id.au"; github = "lovek323"; From 908013a89b096d7ed858fea4b127dbfe35555f74 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 Aug 2024 05:58:54 +0000 Subject: [PATCH 142/298] python312Packages.lsp-tree-sitter: 0.0.15 -> 0.0.16 --- pkgs/development/python-modules/lsp-tree-sitter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/lsp-tree-sitter/default.nix b/pkgs/development/python-modules/lsp-tree-sitter/default.nix index a0530544a938..b4bba5724077 100644 --- a/pkgs/development/python-modules/lsp-tree-sitter/default.nix +++ b/pkgs/development/python-modules/lsp-tree-sitter/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "lsp-tree-sitter"; - version = "0.0.15"; + version = "0.0.16"; pyproject = true; src = fetchFromGitHub { owner = "neomutt"; repo = "lsp-tree-sitter"; - rev = version; - hash = "sha256-yzScgix3BtSCBzlDoE1kMYGtVzkup/+ZK9L1C7VA3do="; + rev = "refs/tags/${version}"; + hash = "sha256-nRzyVZFgb08M0I+xmhuX1LDwPsghlBLdZ2Ou8stKzk0="; }; build-system = [ From 39f28adb191672439189d8dbed3c990de5580ae9 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 10 Aug 2024 20:35:59 +0300 Subject: [PATCH 143/298] autotools-language-server: fix build with old tree-sitter 0.21 --- pkgs/by-name/au/autotools-language-server/package.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/au/autotools-language-server/package.nix b/pkgs/by-name/au/autotools-language-server/package.nix index 9cd9c57ba463..68439d57dcf0 100644 --- a/pkgs/by-name/au/autotools-language-server/package.nix +++ b/pkgs/by-name/au/autotools-language-server/package.nix @@ -7,7 +7,12 @@ let python3 = python311.override { self = python3; - packageOverrides = _: super: { tree-sitter = super.tree-sitter_0_21; }; + packageOverrides = _: super: { + tree-sitter = super.tree-sitter_0_21; + lsp-tree-sitter = super.lsp-tree-sitter.overridePythonAttrs(__: { + pythonRelaxDeps = [ "tree-sitter" ]; + }); + }; }; in python3.pkgs.buildPythonApplication rec { From 3108fc275f0c16658bd92ec7a987d6b61a697578 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 4 Sep 2024 14:03:03 -0300 Subject: [PATCH 144/298] SDL1: rework input set --- pkgs/by-name/sd/SDL1/package.nix | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/sd/SDL1/package.nix b/pkgs/by-name/sd/SDL1/package.nix index 90d164523a79..c6bd9c690710 100644 --- a/pkgs/by-name/sd/SDL1/package.nix +++ b/pkgs/by-name/sd/SDL1/package.nix @@ -1,11 +1,26 @@ -{ lib, stdenv, config, fetchurl, fetchpatch, pkg-config, audiofile, libcap, libiconv -, libGLSupported ? lib.meta.availableOn stdenv.hostPlatform libGL -, openglSupport ? libGLSupported, libGL, libGLU -, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsa-lib -, x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid -, libXext, libICE, libXrandr -, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux && !stdenv.hostPlatform.isAndroid && lib.meta.availableOn stdenv.hostPlatform libpulseaudio, libpulseaudio +{ lib +, alsa-lib +, audiofile +, config , darwin +, fetchpatch +, fetchurl +, libGL +, libGLU +, libICE +, libXext +, libXrandr +, libcap +, libiconv +, libpulseaudio +, pkg-config +, stdenv +# Boolean flags +, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid +, libGLSupported ? lib.meta.availableOn stdenv.hostPlatform libGL +, openglSupport ? libGLSupported +, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux && !stdenv.hostPlatform.isAndroid && lib.meta.availableOn stdenv.hostPlatform libpulseaudio +, x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid }: # NOTE: When editing this expression see if the same change applies to From 2de9476bf87c495c21e573eb2c6b5211589447e4 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 4 Sep 2024 14:04:03 -0300 Subject: [PATCH 145/298] SDL1: move rpath next to its usage --- pkgs/by-name/sd/SDL1/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sd/SDL1/package.nix b/pkgs/by-name/sd/SDL1/package.nix index c6bd9c690710..8783b42ffec3 100644 --- a/pkgs/by-name/sd/SDL1/package.nix +++ b/pkgs/by-name/sd/SDL1/package.nix @@ -37,7 +37,6 @@ let ++ lib.optional alsaSupport alsa-lib ++ lib.optional pulseaudioSupport libpulseaudio ++ lib.optional stdenv.isDarwin Cocoa; - rpath = lib.makeLibraryPath extraPropagatedBuildInputs; in stdenv.mkDerivation rec { @@ -129,7 +128,9 @@ stdenv.mkDerivation rec { ''; # See the same place in the expression for SDL2 - postFixup = '' + postFixup = let + rpath = lib.makeLibraryPath extraPropagatedBuildInputs; + in '' for lib in $out/lib/*.so* ; do if [[ -L "$lib" ]]; then patchelf --set-rpath "$(patchelf --print-rpath $lib):${rpath}" "$lib" From 4ca394d2564cdd14a688b7ce16d3f97e3feb8342 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 4 Sep 2024 14:07:22 -0300 Subject: [PATCH 146/298] SDL1: finalAttrs design pattern --- pkgs/by-name/sd/SDL1/package.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/sd/SDL1/package.nix b/pkgs/by-name/sd/SDL1/package.nix index 8783b42ffec3..8a437092a521 100644 --- a/pkgs/by-name/sd/SDL1/package.nix +++ b/pkgs/by-name/sd/SDL1/package.nix @@ -38,14 +38,13 @@ let ++ lib.optional pulseaudioSupport libpulseaudio ++ lib.optional stdenv.isDarwin Cocoa; in - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "SDL"; version = "1.2.15"; src = fetchurl { - url = "https://www.libsdl.org/release/${pname}-${version}.tar.gz"; - sha256 = "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn"; + url = "https://www.libsdl.org/release/SDL-${finalAttrs.version}.tar.gz"; + hash = "sha256-1tMWp5Pl40gVXw3ZO5eXmJM/uYqh7evMEIgp1kdKrQA="; }; outputs = [ "out" "dev" ]; @@ -152,4 +151,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; license = licenses.lgpl21; }; -} +}) From 0af8b6e06bb1bebe783bf6c66b17ff335433414d Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 4 Sep 2024 14:08:37 -0300 Subject: [PATCH 147/298] SDL1: get rid of nested with in meta --- pkgs/by-name/sd/SDL1/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/sd/SDL1/package.nix b/pkgs/by-name/sd/SDL1/package.nix index 8a437092a521..449ee6db0afd 100644 --- a/pkgs/by-name/sd/SDL1/package.nix +++ b/pkgs/by-name/sd/SDL1/package.nix @@ -143,12 +143,12 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - meta = with lib; { + meta = { + homepage = "http://www.libsdl.org/"; description = "Cross-platform multimedia library"; + license = lib.licenses.lgpl21; mainProgram = "sdl-config"; - homepage = "http://www.libsdl.org/"; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; - license = licenses.lgpl21; + maintainers = lib.teams.sdl.members ++ (with lib.maintainers; [ lovek323 ]); + platforms = lib.platforms.unix; }; }) From 83c5ee361cafe48101bd9b2f650805947f9503c9 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 4 Sep 2024 14:09:25 -0300 Subject: [PATCH 148/298] SDL1: hammering --- pkgs/by-name/sd/SDL1/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sd/SDL1/package.nix b/pkgs/by-name/sd/SDL1/package.nix index 449ee6db0afd..705d7fe9b3a1 100644 --- a/pkgs/by-name/sd/SDL1/package.nix +++ b/pkgs/by-name/sd/SDL1/package.nix @@ -122,6 +122,8 @@ stdenv.mkDerivation (finalAttrs: { }) ]; + enableParallelBuilding = true; + postInstall = '' moveToOutput share/aclocal "$dev" ''; @@ -141,8 +143,6 @@ stdenv.mkDerivation (finalAttrs: { passthru = { inherit openglSupport; }; - enableParallelBuilding = true; - meta = { homepage = "http://www.libsdl.org/"; description = "Cross-platform multimedia library"; From 198dd168d59c692809339f32309ca1be5029c858 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 4 Sep 2024 14:13:30 -0300 Subject: [PATCH 149/298] SDL1: lib.optionals instead of lib.optional --- pkgs/by-name/sd/SDL1/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sd/SDL1/package.nix b/pkgs/by-name/sd/SDL1/package.nix index 705d7fe9b3a1..94b7e03f6e24 100644 --- a/pkgs/by-name/sd/SDL1/package.nix +++ b/pkgs/by-name/sd/SDL1/package.nix @@ -55,8 +55,9 @@ stdenv.mkDerivation (finalAttrs: { propagatedBuildInputs = [ libiconv ] ++ extraPropagatedBuildInputs; - buildInputs = [ ] - ++ lib.optional (!stdenv.hostPlatform.isMinGW && alsaSupport) audiofile + buildInputs = + [ ] + ++ lib.optionals (!stdenv.hostPlatform.isMinGW && alsaSupport) [ audiofile ] ++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ]; configureFlags = [ From 27e300bca20e24dd7731b565293d9cefde92c595 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Tue, 3 Sep 2024 19:28:13 -0300 Subject: [PATCH 150/298] SDL_classic: red-alias it to SDL1 --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index dd4bc389b81e..ab9843ac0e3d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1371,6 +1371,7 @@ mapAliases ({ ### S ### + SDL_classic = SDL1; # Added 2024-09-03 s2n = s2n-tls; # Added 2021-03-03 sandboxfs = throw "'sandboxfs' has been removed due to being unmaintained, consider using linux namespaces for sandboxing instead"; # Added 2024-06-06 sane-backends-git = sane-backends; # Added 2021-02-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1167731903c5..e8d5c39f9287 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23449,8 +23449,6 @@ with pkgs; SDL = SDL1; - SDL_classic = SDL1; - SDL2 = callPackage ../development/libraries/SDL2 { inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL; }; From 36d40dfc48572c967117a38914e394e92869af94 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Tue, 3 Sep 2024 15:14:14 -0300 Subject: [PATCH 151/298] rott: update commentary citing SDL_classic --- pkgs/games/rott/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/rott/default.nix b/pkgs/games/rott/default.nix index 534f14bcb289..e678994e47f0 100644 --- a/pkgs/games/rott/default.nix +++ b/pkgs/games/rott/default.nix @@ -40,8 +40,8 @@ stdenv.mkDerivation rec { "SHAREWARE=${if buildShareware then "1" else "0"}" ]; - # when using SDL_compat instead of SDL_classic, SDL_mixer isn't correctly - # detected, but there is no harm just specifying it + # when using SDL_compat instead of SDL1, SDL_mixer isn't correctly detected, + # but there is no harm just specifying it env.NIX_CFLAGS_COMPILE = toString [ "-I${lib.getDev SDL_mixer}/include/SDL" ]; From fc34fc1c85a3807d384f0b7814637f65b7b2ffcb Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Wed, 4 Sep 2024 22:09:16 +0200 Subject: [PATCH 152/298] python311Packages.python-magnumclient: init at 4.7.0 Add Magnum Client package, a client for the OpenStack Magnum container orchestration engine service. --- .../python-magnumclient/default.nix | 97 +++++++++++++++++++ .../python-openstackclient/default.nix | 2 + pkgs/top-level/all-packages.nix | 1 + pkgs/top-level/python-packages.nix | 2 + 4 files changed, 102 insertions(+) create mode 100644 pkgs/development/python-modules/python-magnumclient/default.nix diff --git a/pkgs/development/python-modules/python-magnumclient/default.nix b/pkgs/development/python-modules/python-magnumclient/default.nix new file mode 100644 index 000000000000..06866a59ce84 --- /dev/null +++ b/pkgs/development/python-modules/python-magnumclient/default.nix @@ -0,0 +1,97 @@ +{ + lib, + buildPythonPackage, + cryptography, + decorator, + fetchFromGitHub, + fixtures, + keystoneauth1, + openstackdocstheme, + os-client-config, + osc-lib, + oslo-i18n, + oslo-log, + oslo-serialization, + oslo-utils, + oslotest, + osprofiler, + pbr, + prettytable, + python-openstackclient, + pythonOlder, + requests-mock, + requests, + setuptools, + sphinxHook, + stestr, + testtools, +}: + +buildPythonPackage rec { + pname = "python-magnumclient"; + version = "4.7.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "openstack"; + repo = "python-magnumclient"; + rev = "refs/tags/${version}"; + hash = "sha256-2JHI3CB/DSZZ4LXzL3PCUSmubTciUXtZkc5jpeEc4kk="; + }; + + env.PBR_VERSION = version; + + nativeBuildInputs = [ + openstackdocstheme + sphinxHook + ]; + + sphinxBuilders = [ "man" ]; + + build-system = [ + pbr + setuptools + ]; + + dependencies = [ + cryptography + decorator + keystoneauth1 + os-client-config + osc-lib + oslo-i18n + oslo-log + oslo-serialization + oslo-utils + prettytable + requests + ]; + + nativeCheckInputs = [ + fixtures + python-openstackclient + osprofiler + oslotest + requests-mock + stestr + testtools + ]; + + checkPhase = '' + runHook preCheck + stestr run + runHook postCheck + ''; + + pythonImportsCheck = [ "magnumclient" ]; + + meta = { + homepage = "https://github.com/openstack/python-magnumclient"; + description = "Client library for OpenStack Magnum API"; + license = lib.licenses.asl20; + mainProgram = "magnum"; + maintainers = lib.teams.openstack.members; + }; +} diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index 3f3989283f74..dcc7464297e8 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -12,6 +12,7 @@ python-heatclient, python-ironicclient, python-keystoneclient, + python-magnumclient, python-manilaclient, python-mistralclient, python-neutronclient, @@ -74,6 +75,7 @@ buildPythonPackage rec { python-designateclient python-heatclient python-ironicclient + python-magnumclient python-manilaclient python-mistralclient python-neutronclient diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 804ab2b4ac35..9ffa0ae9dc1c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22944,6 +22944,7 @@ with pkgs; glanceclient = with python311Packages; toPythonApplication python-glanceclient; heatclient = with python311Packages; toPythonApplication python-heatclient; ironicclient = with python311Packages; toPythonApplication python-ironicclient; + magnumclient = with python311Packages; toPythonApplication python-magnumclient; manilaclient = with python311Packages; toPythonApplication python-manilaclient; mistralclient = with python311Packages; toPythonApplication python-mistralclient; swiftclient = with python311Packages; toPythonApplication python-swiftclient; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2dad059a3965..a15c969a0fa2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12641,6 +12641,8 @@ self: super: with self; { python-magic = callPackage ../development/python-modules/python-magic { }; + python-magnumclient = callPackage ../development/python-modules/python-magnumclient { }; + python-manilaclient = callPackage ../development/python-modules/python-manilaclient { }; python-mapnik = callPackage ../development/python-modules/python-mapnik rec { From cc4f98be0d44e6cf78ab74b5f5dcf4198decb4db Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 4 Sep 2024 21:21:33 +0100 Subject: [PATCH 153/298] cargo-nextest: 0.9.72 -> 0.9.77 --- .../tools/rust/cargo-nextest/default.nix | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/development/tools/rust/cargo-nextest/default.nix index 00515c2252af..00533106971f 100644 --- a/pkgs/development/tools/rust/cargo-nextest/default.nix +++ b/pkgs/development/tools/rust/cargo-nextest/default.nix @@ -1,31 +1,21 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; - version = "0.9.72"; + version = "0.9.77"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; rev = "cargo-nextest-${version}"; - hash = "sha256-FQM1SVzGgmu6HHijP9kKEJPhhzSLs/jo36b4qnx0lb4="; + hash = "sha256-4wqWCa3HHctKSaSYiiLBa9PM6cWyr0H7blI9BWGLTuI="; }; - cargoHash = "sha256-2ttG9lPIkLRzDPcDNZjROOIIDhcEHfBvs/DTniZtQUY="; - - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + cargoHash = "sha256-9XOkXK5sH+Qo8omS8V8FMgnh+oqLZL4paqoL9UOPevA="; cargoBuildFlags = [ "-p" "cargo-nextest" ]; cargoTestFlags = [ "-p" "cargo-nextest" ]; - # TODO: investigate some more why these tests fail in nix - checkFlags = [ - "--skip=tests_integration::test_list" - "--skip=tests_integration::test_relocated_run" - "--skip=tests_integration::test_run" - ]; meta = with lib; { description = "Next-generation test runner for Rust projects"; From c3304ee49dc1866d3f887e7df37aafcb4a3f6be0 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 4 Sep 2024 21:21:33 +0100 Subject: [PATCH 154/298] cargo-nextest: add update script --- pkgs/development/tools/rust/cargo-nextest/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/development/tools/rust/cargo-nextest/default.nix index 00533106971f..ef49f94e1066 100644 --- a/pkgs/development/tools/rust/cargo-nextest/default.nix +++ b/pkgs/development/tools/rust/cargo-nextest/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub, nix-update-script }: rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; @@ -16,6 +16,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "-p" "cargo-nextest" ]; cargoTestFlags = [ "-p" "cargo-nextest" ]; + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "Next-generation test runner for Rust projects"; From 25ad2d11ec45cbc6c908b78de63ad49aba401f9f Mon Sep 17 00:00:00 2001 From: Gavin John Date: Mon, 2 Sep 2024 17:54:44 -0700 Subject: [PATCH 155/298] python312Packages.kaleido: init at 0.2.1 --- .../python-modules/kaleido/default.nix | 113 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 115 insertions(+) create mode 100644 pkgs/development/python-modules/kaleido/default.nix diff --git a/pkgs/development/python-modules/kaleido/default.nix b/pkgs/development/python-modules/kaleido/default.nix new file mode 100644 index 000000000000..726ab291845c --- /dev/null +++ b/pkgs/development/python-modules/kaleido/default.nix @@ -0,0 +1,113 @@ +{ + lib, + stdenv, + python, + buildPythonPackage, + fetchurl, + autoPatchelfHook, + bash, + dejavu_fonts, + expat, + fontconfig, + lato, + libGL, + makeWrapper, + nspr, + nss, + sbclPackages, + sqlite, +}: + +buildPythonPackage rec { + pname = "kaleido"; + version = "0.2.1"; + format = "wheel"; + + src = + { + # This library is so cursed that I have to use fetchurl instead of fetchPypi. I am not happy. + x86_64-linux = fetchurl { + url = "https://files.pythonhosted.org/packages/py2.py3/k/kaleido/kaleido-${version}-py2.py3-none-manylinux1_x86_64.whl"; + hash = "sha256-qiHPG/HHj4+lCp99ReEAPDh709b+CnZ8+780S5W9w6g="; + }; + aarch64-linux = fetchurl { + url = "https://files.pythonhosted.org/packages/py2.py3/k/kaleido/kaleido-${version}-py2.py3-none-manylinux2014_aarch64.whl"; + hash = "sha256-hFgZhEyAgslGnZwX5CYh+/hcKyN++KhuyKhSf5i2USo="; + }; + x86_64-darwin = fetchurl { + url = "https://files.pythonhosted.org/packages/py2.py3/k/kaleido/kaleido-${version}-py2.py3-none-macosx_10_11_x86_64.whl"; + hash = "sha256-ym9z5/8AquvyhD9z8dO6zeGTDvUEEJP+drg6FXhQSac="; + }; + aarch64-darwin = fetchurl { + url = "https://files.pythonhosted.org/packages/py2.py3/k/kaleido/kaleido-${version}-py2.py3-none-macosx_11_0_arm64.whl"; + hash = "sha256-u5pdH3EDV9XUMu4kDvZlim0STD5hCTWBe0tC2px4fAU="; + }; + } + ."${stdenv.hostPlatform.system}" + or (throw "Unsupported system for ${pname}: ${stdenv.hostPlatform.system}"); + + nativeBuildInputs = (lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]) ++ [ + makeWrapper + ]; + buildInputs = [ + bash + dejavu_fonts + expat + fontconfig + lato + libGL + nspr + nss + sbclPackages.cl-dejavu + sqlite + ]; + + pythonImportsCheck = [ "kaleido" ]; + + postInstall = '' + # Expose kaleido binary + mkdir -p $out/bin + ln -s $out/${python.sitePackages}/kaleido/executable/bin/kaleido $out/bin/kaleido + + # Replace bundled swiftshader with libGL + rm -rf $out/${python.sitePackages}/kaleido/executable/bin/swiftshader + ln -s ${libGL}/lib $out/${python.sitePackages}/kaleido/executable/bin/swiftshader + + # Relace bundled libraries with nixpkgs-packaged libraries + rm -rf $out/${python.sitePackages}/kaleido/executable/lib + mkdir -p $out/${python.sitePackages}/kaleido/executable/lib + ln -s ${expat}/lib/* $out/${python.sitePackages}/kaleido/executable/lib/ + ln -s ${nspr}/lib/* $out/${python.sitePackages}/kaleido/executable/lib/ + ln -s ${nss}/lib/* $out/${python.sitePackages}/kaleido/executable/lib/ + ln -s ${sqlite}/lib/* $out/${python.sitePackages}/kaleido/executable/lib/ + + # Replace bundled font configuration with nixpkgs-packaged font configuration + rm -rf $out/${python.sitePackages}/kaleido/executable/etc/fonts + mkdir -p $out/${python.sitePackages}/kaleido/executable/etc/fonts/conf.d + ln -s ${fontconfig}/etc/fonts/fonts.conf $out/${python.sitePackages}/kaleido/executable/etc/fonts/ + ls -s ${fontconfig}/etc/fonts/conf.d/* $out/${python.sitePackages}/kaleido/executable/etc/fonts/conf.d/ + ln -s ${sbclPackages.cl-dejavu}/dejavu-fonts-ttf-2.37/fontconfig/* $out/${python.sitePackages}/kaleido/executable/etc/fonts/conf.d/ + + # Replace bundled fonts with nixpkgs-packaged fonts + # Currently this causes an issue where the fonts aren't found. I'm not sure why, so I'm leaving this commented out for now. + #rm -rf $out/${python.sitePackages}/kaleido/executable/xdg/fonts + #mkdir -p $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/dejavu $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/lato + #ln -s ${dejavu_fonts}/share/fonts/truetype/* $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/dejavu/ + #ln -s ${lato}/share/fonts/lato/* $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/lato/ + ''; + + meta = { + description = "Fast static image export for web-based visualization libraries with zero dependencies"; + homepage = "https://github.com/plotly/Kaleido"; + changelog = "https://github.com/plotly/Kaleido/releases"; + platforms = [ + "x86_64-linux" + "x86_64-darwin" + "aarch64-linux" + "aarch64-darwin" + ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; # Trust me, I'm not happy. But after literal hours of trying to reverse-engineer their build system and getting nowhere, I'll use the stupid binaries >:( + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pandapip1 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2dad059a3965..843f3973acd9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6612,6 +6612,8 @@ self: super: with self; { kaldi-active-grammar = callPackage ../development/python-modules/kaldi-active-grammar { }; + kaleido = callPackage ../development/python-modules/kaleido { }; + kanidm = callPackage ../development/python-modules/kanidm { }; kaptan = callPackage ../development/python-modules/kaptan { }; From 534c90d223c32bf88b7aba3399fa69936c25fbf6 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Mon, 2 Sep 2024 21:57:21 -0700 Subject: [PATCH 156/298] python312Packages.plotly: Add kaleido to dependencies --- pkgs/development/python-modules/plotly/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 6623b8ace1ee..8327af2ce6c2 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -5,6 +5,7 @@ setuptools, packaging, tenacity, + kaleido, }: buildPythonPackage rec { @@ -29,6 +30,7 @@ buildPythonPackage rec { dependencies = [ packaging tenacity + kaleido ]; pythonImportsCheck = [ "plotly" ]; From 4b29fd82fc757855333ef222742a48d7176eabb9 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Wed, 4 Sep 2024 16:27:22 +0200 Subject: [PATCH 157/298] openlens: remove package --- .../manual/release-notes/rl-2411.section.md | 2 + .../networking/cluster/openlens/default.nix | 39 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 3 insertions(+), 41 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/openlens/default.nix diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index fe86ca2c2f3a..76e84ff596e4 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -402,6 +402,8 @@ - The `services.syncplay` module now exposes all currently available command-line arguments for `syncplay-server` as options, as well as a `useACMEHost` option for easy TLS setup. The systemd service now uses `DynamicUser`/`StateDirectory` and the `user` and `group` options have been deprecated. +- The `openlens` package got removed, suggested replacment `lens-desktop` + ## Other Notable Changes {#sec-release-24.11-notable-changes} diff --git a/pkgs/applications/networking/cluster/openlens/default.nix b/pkgs/applications/networking/cluster/openlens/default.nix deleted file mode 100644 index 4581aef00e2d..000000000000 --- a/pkgs/applications/networking/cluster/openlens/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, fetchurl, appimageTools }: - -let - pname = "openlens"; - version = "6.5.2-366"; - - src = fetchurl { - url = "https://github.com/MuhammedKalkan/OpenLens/releases/download/v${version}/OpenLens-${version}.x86_64.AppImage"; - sha256 = "sha256-ZAltAS/U/xh4kCT7vQ+NHAzWV7z0uE5GMQICHKSdj8k="; - }; - - appimageContents = appimageTools.extractType2 { - inherit pname version src; - }; - -in -appimageTools.wrapType2 { - inherit pname version src; - unshareIpc = false; - - extraInstallCommands = '' - install -m 444 -D ${appimageContents}/open-lens.desktop $out/share/applications/${pname}.desktop - install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/open-lens.png \ - $out/share/icons/hicolor/512x512/apps/${pname}.png - - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Icon=open-lens' 'Icon=${pname}' \ - --replace 'Exec=AppRun' 'Exec=${pname}' - ''; - - meta = with lib; { - description = "Kubernetes IDE"; - homepage = "https://github.com/MuhammedKalkan/OpenLens"; - license = licenses.mit; - maintainers = with maintainers; [ benwbooth sebtm ]; - mainProgram = "openlens"; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index dd4bc389b81e..3a63adc7e093 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1132,6 +1132,7 @@ mapAliases ({ openjfx19 = throw "OpenJFX 19 was removed as it has reached its end of life"; # Added 2024-08-01 openjfx20 = throw "OpenJFX 20 was removed as it has reached its end of life"; # Added 2024-08-01 openjpeg_2 = openjpeg; # Added 2021-01-25 + openlens = throw "Lens Closed its source code, package obsolete/stale - consider lens as replacement"; # Added 2024-09-04 openlp = throw "openlp has been removed for now because the outdated version depended on insecure and removed packages and it needs help to upgrade and maintain it; see https://github.com/NixOS/nixpkgs/pull/314882"; # Added 2024-07-29 openmpt123 = libopenmpt; # Added 2021-09-05 openssl_3_0 = openssl_3; # Added 2022-06-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 804ab2b4ac35..3dcb198250a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31384,8 +31384,6 @@ with pkgs; lens = callPackage ../applications/networking/cluster/lens { }; - openlens = callPackage ../applications/networking/cluster/openlens { }; - leo-editor = libsForQt5.callPackage ../applications/editors/leo-editor { }; libkiwix = callPackage ../applications/misc/kiwix/lib.nix { }; From b3fa49d0ee1bf851e23f23ba3974a175e9ef8921 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 4 Sep 2024 23:32:54 +0200 Subject: [PATCH 158/298] scrutiny-collector: fix cross --- pkgs/by-name/sc/scrutiny-collector/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sc/scrutiny-collector/package.nix b/pkgs/by-name/sc/scrutiny-collector/package.nix index b0efd81f76fa..905ade381218 100644 --- a/pkgs/by-name/sc/scrutiny-collector/package.nix +++ b/pkgs/by-name/sc/scrutiny-collector/package.nix @@ -24,7 +24,7 @@ buildGoModule rec { vendorHash = "sha256-SiQw6pq0Fyy8Ia39S/Vgp9Mlfog2drtVn43g+GXiQuI="; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; CGO_ENABLED = 0; From 730527ca7a9f0ae586325663497b014f1dd21a33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Fri, 12 Jul 2024 13:35:16 -0400 Subject: [PATCH 159/298] treewide: remove use of python3(Packages) in python package set --- .../python-modules/ansible-builder/default.nix | 13 +++++++++---- pkgs/development/python-modules/bindep/default.nix | 13 +++++++++---- .../python-modules/chainstream/default.nix | 7 ++++--- pkgs/development/python-modules/cli-ui/default.nix | 4 ++-- .../development/python-modules/controku/default.nix | 4 ++-- .../development/python-modules/dbt-core/default.nix | 4 ++-- pkgs/development/python-modules/dnf4/wrapper.nix | 7 ++++--- pkgs/development/python-modules/exiv2/default.nix | 11 +++++++---- .../invisible-watermark/tests/cli.nix | 4 ++-- .../invisible-watermark/tests/python/default.nix | 12 +++++------- pkgs/development/python-modules/manuf/default.nix | 4 ++-- pkgs/development/python-modules/mlx/default.nix | 5 +++-- .../python-modules/onigurumacffi/default.nix | 8 +++++--- .../development/python-modules/orgparse/default.nix | 7 ++++--- 14 files changed, 60 insertions(+), 43 deletions(-) diff --git a/pkgs/development/python-modules/ansible-builder/default.nix b/pkgs/development/python-modules/ansible-builder/default.nix index f5a67d28eddb..064de3b127ad 100644 --- a/pkgs/development/python-modules/ansible-builder/default.nix +++ b/pkgs/development/python-modules/ansible-builder/default.nix @@ -1,11 +1,16 @@ { lib, - python3Packages, + setuptools, + setuptools-scm, + jsonschema, + requirements-parser, + pyyaml, podman, fetchPypi, bindep, + buildPythonPackage, }: -python3Packages.buildPythonPackage rec { +buildPythonPackage rec { pname = "ansible-builder"; version = "3.0.1"; format = "pyproject"; @@ -15,14 +20,14 @@ python3Packages.buildPythonPackage rec { hash = "sha256-rxyhgj9Cad751tPAptCTLCtXQLUXaRYv39bkoFzzjOk="; }; - nativeBuildInputs = with python3Packages; [ + nativeBuildInputs = [ setuptools setuptools-scm ]; buildInputs = [ bindep ]; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = [ podman jsonschema requirements-parser diff --git a/pkgs/development/python-modules/bindep/default.nix b/pkgs/development/python-modules/bindep/default.nix index 8acd7ecf7cf0..8153354843a4 100644 --- a/pkgs/development/python-modules/bindep/default.nix +++ b/pkgs/development/python-modules/bindep/default.nix @@ -1,9 +1,14 @@ { lib, - python3Packages, fetchPypi, + buildPythonPackage, + distro, + pbr, + setuptools, + packaging, + parsley, }: -python3Packages.buildPythonPackage rec { +buildPythonPackage rec { pname = "bindep"; version = "2.11.0"; format = "pyproject"; @@ -13,13 +18,13 @@ python3Packages.buildPythonPackage rec { hash = "sha256-rLLyWbzh/RUIhzR5YJu95bmq5Qg3hHamjWtqGQAufi8="; }; - buildInputs = with python3Packages; [ + buildInputs = [ distro pbr setuptools ]; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = [ parsley pbr packaging diff --git a/pkgs/development/python-modules/chainstream/default.nix b/pkgs/development/python-modules/chainstream/default.nix index d5ee7775ac82..8d247e234d2d 100644 --- a/pkgs/development/python-modules/chainstream/default.nix +++ b/pkgs/development/python-modules/chainstream/default.nix @@ -1,16 +1,17 @@ { lib, fetchPypi, - python3Packages, + buildPythonPackage, + setuptools, }: -python3Packages.buildPythonPackage rec { +buildPythonPackage rec { pname = "chainstream"; version = "1.0.1"; pyproject = true; - nativeBuildInputs = [ python3Packages.setuptools ]; + nativeBuildInputs = [ setuptools ]; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/cli-ui/default.nix b/pkgs/development/python-modules/cli-ui/default.nix index ecd30ce3fc07..3b93c3eb7be8 100644 --- a/pkgs/development/python-modules/cli-ui/default.nix +++ b/pkgs/development/python-modules/cli-ui/default.nix @@ -1,6 +1,5 @@ { lib, - python3Packages, fetchPypi, pytestCheckHook, pythonOlder, @@ -8,8 +7,9 @@ colorama, tabulate, unidecode, + buildPythonPackage, }: -python3Packages.buildPythonPackage rec { +buildPythonPackage rec { pname = "cli-ui"; version = "0.17.2"; pyproject = true; diff --git a/pkgs/development/python-modules/controku/default.nix b/pkgs/development/python-modules/controku/default.nix index e41e38b8ccd4..9aff50bfc087 100644 --- a/pkgs/development/python-modules/controku/default.nix +++ b/pkgs/development/python-modules/controku/default.nix @@ -1,6 +1,5 @@ { lib, - python3Packages, fetchFromGitHub, setuptools, requests, @@ -10,10 +9,11 @@ gobject-introspection, gtk3, wrapGAppsHook3, + buildPythonPackage, buildApplication ? false, }: -python3Packages.buildPythonPackage rec { +buildPythonPackage rec { pname = "controku"; version = "1.1.0"; format = "pyproject"; diff --git a/pkgs/development/python-modules/dbt-core/default.nix b/pkgs/development/python-modules/dbt-core/default.nix index 20d45f74723c..1f06cf0faf12 100644 --- a/pkgs/development/python-modules/dbt-core/default.nix +++ b/pkgs/development/python-modules/dbt-core/default.nix @@ -17,7 +17,7 @@ packaging, pathspec, protobuf, - python, + callPackage, pythonOlder, pytz, pyyaml, @@ -85,7 +85,7 @@ buildPythonPackage rec { doCheck = false; passthru = { - withAdapters = python.pkgs.callPackage ./with-adapters.nix { }; + withAdapters = callPackage ./with-adapters.nix { }; }; meta = with lib; { diff --git a/pkgs/development/python-modules/dnf4/wrapper.nix b/pkgs/development/python-modules/dnf4/wrapper.nix index b84584f52fad..c8cd1c1c261d 100644 --- a/pkgs/development/python-modules/dnf4/wrapper.nix +++ b/pkgs/development/python-modules/dnf4/wrapper.nix @@ -1,15 +1,16 @@ { lib, wrapPython, - python3, + python, stdenv, + dnf4, dnf-plugins-core, plugins ? [ dnf-plugins-core ], }: let - pluginPaths = map (p: "${p}/${python3.sitePackages}/dnf-plugins") plugins; + pluginPaths = map (p: "${p}/${python.sitePackages}/dnf-plugins") plugins; - dnf4-unwrapped = python3.pkgs.dnf4; + dnf4-unwrapped = dnf4; in stdenv.mkDerivation { diff --git a/pkgs/development/python-modules/exiv2/default.nix b/pkgs/development/python-modules/exiv2/default.nix index d533e4f58c6f..c1c9715f5a3f 100644 --- a/pkgs/development/python-modules/exiv2/default.nix +++ b/pkgs/development/python-modules/exiv2/default.nix @@ -3,11 +3,14 @@ pkg-config, exiv2, gettext, - python3Packages, fetchFromGitHub, gitUpdater, + buildPythonPackage, + setuptools, + toml, + unittestCheckHook, }: -python3Packages.buildPythonPackage rec { +buildPythonPackage rec { pname = "exiv2"; version = "0.17.0"; pyproject = true; @@ -30,7 +33,7 @@ python3Packages.buildPythonPackage rec { def test_localisation(self):" ''; - build-system = with python3Packages; [ + build-system = [ setuptools toml ]; @@ -42,7 +45,7 @@ python3Packages.buildPythonPackage rec { ]; pythonImportsCheck = [ "exiv2" ]; - nativeCheckInputs = with python3Packages; [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "-s" "tests" diff --git a/pkgs/development/python-modules/invisible-watermark/tests/cli.nix b/pkgs/development/python-modules/invisible-watermark/tests/cli.nix index 89de1174384a..a1563d67c716 100644 --- a/pkgs/development/python-modules/invisible-watermark/tests/cli.nix +++ b/pkgs/development/python-modules/invisible-watermark/tests/cli.nix @@ -1,7 +1,7 @@ { image, method, - python3Packages, + invisible-watermark, runCommand, testName, withOnnx, @@ -25,7 +25,7 @@ let else "fnörd1"; length = (builtins.stringLength message) * 8; - invisible-watermark' = python3Packages.invisible-watermark.override { inherit withOnnx; }; + invisible-watermark' = invisible-watermark.override { inherit withOnnx; }; expected-exit-code = if method == "rivaGan" && !withOnnx then "1" else "0"; in runCommand "invisible-watermark-test-${testName}" { nativeBuildInputs = [ invisible-watermark' ]; } diff --git a/pkgs/development/python-modules/invisible-watermark/tests/python/default.nix b/pkgs/development/python-modules/invisible-watermark/tests/python/default.nix index e713f9bfe20c..617dd0bb13cb 100644 --- a/pkgs/development/python-modules/invisible-watermark/tests/python/default.nix +++ b/pkgs/development/python-modules/invisible-watermark/tests/python/default.nix @@ -2,7 +2,7 @@ image, invisible-watermark, opencv4, - python3, + python, runCommand, stdenvNoCC, }: @@ -13,12 +13,10 @@ let message = "fnörd1"; method = "dwtDct"; - pythonWithPackages = python3.withPackages ( - pp: with pp; [ - invisible-watermark - opencv4 - ] - ); + pythonWithPackages = python.withPackages (_: [ + invisible-watermark + opencv4 + ]); pythonInterpreter = pythonWithPackages.interpreter; encode = stdenvNoCC.mkDerivation { diff --git a/pkgs/development/python-modules/manuf/default.nix b/pkgs/development/python-modules/manuf/default.nix index 20961a139682..2210f4a40fae 100644 --- a/pkgs/development/python-modules/manuf/default.nix +++ b/pkgs/development/python-modules/manuf/default.nix @@ -3,9 +3,9 @@ buildPythonPackage, fetchFromGitHub, runCommand, - python3, wireshark-cli, pytestCheckHook, + manuf, # remove when buildPythonPackage supports finalAttrs }: buildPythonPackage rec { @@ -42,7 +42,7 @@ buildPythonPackage rec { passthru.tests = { testMacAddress = runCommand "${pname}-test" { } '' - ${python3.pkgs.manuf}/bin/manuf BC:EE:7B:00:00:00 > $out + ${lib.getExe manuf} BC:EE:7B:00:00:00 > $out [ "$(cat $out | tr -d '\n')" = "Vendor(manuf='ASUSTekC', manuf_long='ASUSTek COMPUTER INC.', comment=None)" ] ''; }; diff --git a/pkgs/development/python-modules/mlx/default.nix b/pkgs/development/python-modules/mlx/default.nix index 2084b8c19f75..614aed274ba0 100644 --- a/pkgs/development/python-modules/mlx/default.nix +++ b/pkgs/development/python-modules/mlx/default.nix @@ -2,13 +2,13 @@ lib, fetchFromGitHub, buildPythonPackage, - python3Packages, pybind11, cmake, xcbuild, zsh, blas, lapack, + setuptools, }: let @@ -69,7 +69,8 @@ buildPythonPackage rec { zsh gguf-tools nlohmann_json - ] ++ (with python3Packages; [ setuptools ]); + setuptools + ]; buildInputs = [ blas diff --git a/pkgs/development/python-modules/onigurumacffi/default.nix b/pkgs/development/python-modules/onigurumacffi/default.nix index 09be23993652..2d2faef572fd 100644 --- a/pkgs/development/python-modules/onigurumacffi/default.nix +++ b/pkgs/development/python-modules/onigurumacffi/default.nix @@ -1,10 +1,12 @@ { lib, - python3Packages, + buildPythonPackage, fetchPypi, oniguruma, + setuptools, + cffi, }: -python3Packages.buildPythonPackage rec { +buildPythonPackage rec { pname = "onigurumacffi"; version = "1.3.0"; format = "pyproject"; @@ -14,7 +16,7 @@ python3Packages.buildPythonPackage rec { hash = "sha256-d0XNxWCWrOyIofOwhmCiKwnGWe040/WdtsHK12qXa+8="; }; - buildInputs = with python3Packages; [ + buildInputs = [ oniguruma setuptools cffi diff --git a/pkgs/development/python-modules/orgparse/default.nix b/pkgs/development/python-modules/orgparse/default.nix index 488a0e6e4d98..0ad3b30aaeba 100644 --- a/pkgs/development/python-modules/orgparse/default.nix +++ b/pkgs/development/python-modules/orgparse/default.nix @@ -1,10 +1,11 @@ { lib, - python3Packages, + setuptools-scm, fetchPypi, + buildPythonPackage, }: -python3Packages.buildPythonPackage rec { +buildPythonPackage rec { pname = "orgparse"; version = "0.4.20231004"; @@ -13,7 +14,7 @@ python3Packages.buildPythonPackage rec { hash = "sha256-pOOK6tq/mYiw9npmrNCCedGCILy8QioSkGDCiQu6kaA="; }; - nativeBuildInputs = [ python3Packages.setuptools-scm ]; + nativeBuildInputs = [ setuptools-scm ]; pyproject = true; From 3cee65f2f0fc792452cd54242607d9d9cf3c313c Mon Sep 17 00:00:00 2001 From: Edgar Vincent Date: Tue, 27 Aug 2024 10:52:08 +0200 Subject: [PATCH 160/298] melodeon: init at 0.4.1 --- pkgs/by-name/me/melodeon/package.nix | 42 ++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 pkgs/by-name/me/melodeon/package.nix diff --git a/pkgs/by-name/me/melodeon/package.nix b/pkgs/by-name/me/melodeon/package.nix new file mode 100644 index 000000000000..b7df31cebf79 --- /dev/null +++ b/pkgs/by-name/me/melodeon/package.nix @@ -0,0 +1,42 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + qt6, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "melodeon"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "CDrummond"; + repo = "melodeon"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-k74iJ3tmkMGUh4f538tjD7cv4ZXxm3x6M/d5HU25yPQ="; + fetchSubmodules = true; + }; + + buildInputs = [ + qt6.qtbase + qt6.qtwebengine + ]; + + nativeBuildInputs = [ + cmake + qt6.wrapQtAppsHook + ]; + + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; + + meta = { + description = "QWebEngine wrapper for MaterialSkin on Lyrion Music Server (formerly Logitech Media Server)"; + mainProgram = "melodeon"; + homepage = "https://github.com/CDrummond/melodeon"; + changelog = "https://github.com/CDrummond/melodeon/releases/tag/${finalAttrs.version}"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ edgar-vincent ]; + }; +}) From f450e5517f0c55ea620971689eca5d576138c894 Mon Sep 17 00:00:00 2001 From: Edgar Vincent Date: Tue, 27 Aug 2024 12:58:14 +0200 Subject: [PATCH 161/298] maintainers: add edgar-vincent --- maintainers/maintainer-list.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ed5817f57801..c4d8d7ec2cfc 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5767,6 +5767,14 @@ githubId = 119483; name = "Matthew Brown"; }; + edgar-vincent = { + name = "Edgar Vincent"; + email = "e-v@posteo.net"; + matrix = "@edgar.vincent:matrix.org"; + github = "edgar-vincent"; + githubId = 63352906; + keys = [ { fingerprint = "922F CA48 5FDB 20B1 ED1B A61F 284D 11D3 33C4 D21B"; } ]; + }; edlimerkaj = { name = "Edli Merkaj"; email = "edli.merkaj@identinet.io"; From 46c1ce890a749f6c17b07ce87237e7ebccf5af42 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Mon, 2 Sep 2024 22:06:59 -0700 Subject: [PATCH 162/298] python312Packages.kaleido: Add passthru.tests --- .../python-modules/kaleido/default.nix | 3 +++ pkgs/development/python-modules/kaleido/tests.nix | 15 +++++++++++++++ pkgs/development/python-modules/kaleido/tests.py | 11 +++++++++++ 3 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/kaleido/tests.nix create mode 100644 pkgs/development/python-modules/kaleido/tests.py diff --git a/pkgs/development/python-modules/kaleido/default.nix b/pkgs/development/python-modules/kaleido/default.nix index 726ab291845c..a0229b95be15 100644 --- a/pkgs/development/python-modules/kaleido/default.nix +++ b/pkgs/development/python-modules/kaleido/default.nix @@ -3,6 +3,7 @@ stdenv, python, buildPythonPackage, + callPackage, fetchurl, autoPatchelfHook, bash, @@ -96,6 +97,8 @@ buildPythonPackage rec { #ln -s ${lato}/share/fonts/lato/* $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/lato/ ''; + passthru.tests.kaleido = callPackage ./tests.nix { }; + meta = { description = "Fast static image export for web-based visualization libraries with zero dependencies"; homepage = "https://github.com/plotly/Kaleido"; diff --git a/pkgs/development/python-modules/kaleido/tests.nix b/pkgs/development/python-modules/kaleido/tests.nix new file mode 100644 index 000000000000..e09f4947a563 --- /dev/null +++ b/pkgs/development/python-modules/kaleido/tests.nix @@ -0,0 +1,15 @@ +{ + runCommand, + python, + plotly, + pandas, + kaleido, +}: + +runCommand "${kaleido.pname}-tests" { + nativeBuildInputs = [ + python + plotly + pandas + ]; +} "python3 ${./tests.py}" diff --git a/pkgs/development/python-modules/kaleido/tests.py b/pkgs/development/python-modules/kaleido/tests.py new file mode 100644 index 000000000000..0cbcaaae60be --- /dev/null +++ b/pkgs/development/python-modules/kaleido/tests.py @@ -0,0 +1,11 @@ +import plotly.express as px +import os +import os.path + +out = os.environ["out"] +if not os.path.exists(out): + os.makedirs(out) + +outfile = os.path.join(out, "figure.png") +fig = px.scatter(px.data.iris(), x="sepal_length", y="sepal_width", color="species") +fig.write_image(outfile, engine="kaleido") From 6c9867637668f00d0e7f8dac0f3312c525500c9d Mon Sep 17 00:00:00 2001 From: Gavin John Date: Tue, 3 Sep 2024 13:18:58 -0700 Subject: [PATCH 163/298] python312Packages.plotly: adopt --- pkgs/development/python-modules/plotly/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 8327af2ce6c2..38b4ed40dca2 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { downloadPage = "https://github.com/plotly/plotly.py"; homepage = "https://plot.ly/python/"; license = with licenses; [ mit ]; - maintainers = [ ]; + maintainers = with maintainers; [ pandapip1 ]; }; } From 912723b1b5868c2e140a506ef9586b2afca100d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Wed, 4 Sep 2024 18:17:17 -0400 Subject: [PATCH 164/298] nodePackages.eslint: fix alias --- .../node-packages/node-packages.nix | 112 ------------------ 1 file changed, 112 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 944babf1d284..6bb0ad7398db 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -67041,118 +67041,6 @@ in bypassCache = true; reconstructLock = true; }; - eslint = nodeEnv.buildNodePackage { - name = "eslint"; - packageName = "eslint"; - version = "9.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-9.7.0.tgz"; - sha512 = "FzJ9D/0nGiCGBf8UXO/IGLTgLVzIxze1zpfA8Ton2mjLovXdAPlYDv+MQDcqj3TmrhAGYfOpz9RfR+ent0AgAw=="; - }; - dependencies = [ - (sources."@eslint-community/eslint-utils-4.4.0" // { - dependencies = [ - sources."eslint-visitor-keys-3.4.3" - ]; - }) - sources."@eslint-community/regexpp-4.11.0" - sources."@eslint/config-array-0.17.1" - sources."@eslint/eslintrc-3.1.0" - sources."@eslint/js-9.7.0" - sources."@eslint/object-schema-2.1.4" - sources."@humanwhocodes/module-importer-1.0.1" - sources."@humanwhocodes/retry-0.3.0" - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."acorn-8.12.1" - sources."acorn-jsx-5.3.2" - sources."ajv-6.12.6" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."argparse-2.0.1" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."callsites-3.1.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."concat-map-0.0.1" - sources."cross-spawn-7.0.3" - sources."debug-4.3.5" - sources."deep-is-0.1.4" - sources."escape-string-regexp-4.0.0" - sources."eslint-9.7.0" - sources."eslint-scope-8.0.2" - sources."eslint-visitor-keys-4.0.0" - sources."espree-10.1.0" - sources."esquery-1.6.0" - sources."esrecurse-4.3.0" - sources."estraverse-5.3.0" - sources."esutils-2.0.3" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" - sources."fast-levenshtein-2.0.6" - sources."fastq-1.17.1" - sources."file-entry-cache-8.0.0" - sources."find-up-5.0.0" - sources."flat-cache-4.0.1" - sources."flatted-3.3.1" - sources."glob-parent-6.0.2" - sources."globals-14.0.0" - sources."has-flag-4.0.0" - sources."ignore-5.3.1" - sources."import-fresh-3.3.0" - sources."imurmurhash-0.1.4" - sources."is-extglob-2.1.1" - sources."is-glob-4.0.3" - sources."is-path-inside-3.0.3" - sources."isexe-2.0.0" - sources."js-yaml-4.1.0" - sources."json-buffer-3.0.1" - sources."json-schema-traverse-0.4.1" - sources."json-stable-stringify-without-jsonify-1.0.1" - sources."keyv-4.5.4" - sources."levn-0.4.1" - sources."locate-path-6.0.0" - sources."lodash.merge-4.6.2" - sources."minimatch-3.1.2" - sources."ms-2.1.2" - sources."natural-compare-1.4.0" - sources."optionator-0.9.4" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - sources."parent-module-1.0.1" - sources."path-exists-4.0.0" - sources."path-key-3.1.1" - sources."prelude-ls-1.2.1" - sources."punycode-2.3.1" - sources."queue-microtask-1.2.3" - sources."resolve-from-4.0.0" - sources."reusify-1.0.4" - sources."run-parallel-1.2.0" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."strip-ansi-6.0.1" - sources."strip-json-comments-3.1.1" - sources."supports-color-7.2.0" - sources."text-table-0.2.0" - sources."type-check-0.4.0" - sources."uri-js-4.4.1" - sources."which-2.0.2" - sources."word-wrap-1.2.5" - sources."yocto-queue-0.1.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "An AST-based pattern checker for JavaScript."; - homepage = "https://eslint.org"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; esy = nodeEnv.buildNodePackage { name = "esy"; packageName = "esy"; From 1ac50842b28e95e24b486cb082b8dc890ae9427e Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 4 Sep 2024 17:23:20 +0100 Subject: [PATCH 165/298] nixos/doc/rl-2411: improve wording of macOS version warning Fixes: f1c3597d95027fdd8f786716e02c0ed4167842d9 --- nixos/doc/manual/release-notes/rl-2411.section.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index a2fd124765cd..3ba7a90c3c7d 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -4,11 +4,10 @@ ## Highlights {#sec-release-24.11-highlights} -- **This will be the latest version of Nixpkgs to support macOS 10.12 (Sierra).** - Starting with release 25.05, the minimum supported version will be macOS 11 (Big Sur). - From that point on, packages may or may not work on older releases of macOS. - Users on old macOS versions should consider upgrading to a supported OS release (potentially using [OpenCore Legacy Patcher](https://dortania.github.io/OpenCore-Legacy-Patcher/) for old hardware) or installing NixOS. - If neither of those options are viable and you require new versions of software, [MacPorts](https://www.macports.org/) supports back to OS X 10.6 (Snow Leopard). +- **This will be the last release of Nixpkgs to support macOS Sierra 10.12 to macOS Catalina 10.15.** + Starting with release 25.05, the minimum supported version will be macOS Big Sur 11, and we cannot guarantee that packages will continue to work on older versions of macOS. + Users on old macOS versions should consider upgrading to a supported version (potentially using [OpenCore Legacy Patcher](https://dortania.github.io/OpenCore-Legacy-Patcher/) for old hardware) or installing NixOS. + If neither of those options are viable and you require new versions of software, [MacPorts](https://www.macports.org/) supports back to Mac OS X Snow Leopard 10.6. - Convenience options for `amdgpu`, open source driver for Radeon cards, is now available under `hardware.amdgpu`. From 03a0f9debeb081e8689b8330964db74af5494eae Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Fri, 30 Aug 2024 00:46:31 +0200 Subject: [PATCH 166/298] nixos/security.acme: remove `with lib;` --- nixos/modules/security/acme/default.nix | 275 ++++++++++++------------ 1 file changed, 137 insertions(+), 138 deletions(-) diff --git a/nixos/modules/security/acme/default.nix b/nixos/modules/security/acme/default.nix index 83581d02840e..21f1ea50d7f2 100644 --- a/nixos/modules/security/acme/default.nix +++ b/nixos/modules/security/acme/default.nix @@ -1,5 +1,4 @@ { config, lib, pkgs, options, ... }: -with lib; let @@ -8,11 +7,11 @@ let user = if cfg.useRoot then "root" else "acme"; # Used to calculate timer accuracy for coalescing - numCerts = length (builtins.attrNames cfg.certs); + numCerts = lib.length (builtins.attrNames cfg.certs); _24hSecs = 60 * 60 * 24; # Used to make unique paths for each cert/account config set - mkHash = with builtins; val: substring 0 20 (hashString "sha256" val); + mkHash = with builtins; val: lib.substring 0 20 (hashString "sha256" val); mkAccountHash = acmeServer: data: mkHash "${toString acmeServer} ${data.keyType} ${data.email}"; accountDirRoot = "/var/lib/acme/.lego/accounts/"; @@ -29,7 +28,7 @@ let else [{ fst = head workingBaseList; snd = head needAssignmentList;}] ++ _rrCycler origBaseList (if (tail workingBaseList == []) then origBaseList else tail workingBaseList) (tail needAssignmentList); - attrsToList = mapAttrsToList (attrname: attrval: {name = attrname; value = attrval;}); + attrsToList = lib.mapAttrsToList (attrname: attrval: {name = attrname; value = attrval;}); # for an AttrSet `funcsAttrs` having functions as values, apply single arguments from # `argsList` to them in a round-robin manner. # Returns an attribute set with the applied functions as values. @@ -57,7 +56,7 @@ let commonServiceConfig = { Type = "oneshot"; User = user; - Group = mkDefault "acme"; + Group = lib.mkDefault "acme"; UMask = "0022"; StateDirectoryMode = "750"; ProtectSystem = "strict"; @@ -136,8 +135,8 @@ let userMigrationService = let script = with builtins; '' chown -R ${user} .lego/accounts - '' + (concatStringsSep "\n" (mapAttrsToList (cert: data: '' - for fixpath in ${escapeShellArg cert} .lego/${escapeShellArg cert}; do + '' + (lib.concatStringsSep "\n" (lib.mapAttrsToList (cert: data: '' + for fixpath in ${lib.escapeShellArg cert} .lego/${lib.escapeShellArg cert}; do if [ -d "$fixpath" ]; then chmod -R u=rwX,g=rX,o= "$fixpath" chown -R ${user}:${data.group} "$fixpath" @@ -166,7 +165,7 @@ let # ensure all required lock files exist, but none more script = '' - GLOBIGNORE="${concatStringsSep ":" concurrencyLockfiles}" + GLOBIGNORE="${lib.concatStringsSep ":" concurrencyLockfiles}" rm -f * unset GLOBIGNORE @@ -186,7 +185,7 @@ let useDns = data.dnsProvider != null; useDnsOrS3 = useDns || data.s3Bucket != null; destPath = "/var/lib/acme/${cert}"; - selfsignedDeps = optionals (cfg.preliminarySelfsigned) [ "acme-selfsigned-${cert}.service" ]; + selfsignedDeps = lib.optionals (cfg.preliminarySelfsigned) [ "acme-selfsigned-${cert}.service" ]; # Minica and lego have a "feature" which replaces * with _. We need # to make this substitution to reference the output files from both programs. @@ -196,7 +195,7 @@ let # FIXME when mkChangedOptionModule supports submodules, change to that. # This is a workaround extraDomains = data.extraDomainNames ++ ( - optionals + lib.optionals (data.extraDomains != "_mkMergedOptionModule") (builtins.attrNames data.extraDomains) ); @@ -204,22 +203,22 @@ let # Create hashes for cert data directories based on configuration # Flags are separated to avoid collisions hashData = with builtins; '' - ${concatStringsSep " " data.extraLegoFlags} - - ${concatStringsSep " " data.extraLegoRunFlags} - - ${concatStringsSep " " data.extraLegoRenewFlags} - + ${lib.concatStringsSep " " data.extraLegoFlags} - + ${lib.concatStringsSep " " data.extraLegoRunFlags} - + ${lib.concatStringsSep " " data.extraLegoRenewFlags} - ${toString acmeServer} ${toString data.dnsProvider} ${toString data.ocspMustStaple} ${data.keyType} ''; certDir = mkHash hashData; # TODO remove domainHash usage entirely. Waiting on go-acme/lego#1532 - domainHash = mkHash "${concatStringsSep " " extraDomains} ${data.domain}"; + domainHash = mkHash "${lib.concatStringsSep " " extraDomains} ${data.domain}"; accountHash = (mkAccountHash acmeServer data); accountDir = accountDirRoot + accountHash; protocolOpts = if useDns then ( [ "--dns" data.dnsProvider ] - ++ optionals (!data.dnsPropagationCheck) [ "--dns.disable-cp" ] - ++ optionals (data.dnsResolver != null) [ "--dns.resolvers" data.dnsResolver ] + ++ lib.optionals (!data.dnsPropagationCheck) [ "--dns.disable-cp" ] + ++ lib.optionals (data.dnsResolver != null) [ "--dns.resolvers" data.dnsResolver ] ) else if data.s3Bucket != null then [ "--http" "--http.s3-bucket" data.s3Bucket ] else if data.listenHTTP != null then [ "--http" "--http.port" data.listenHTTP ] else [ "--http" "--http.webroot" data.webroot ]; @@ -231,22 +230,22 @@ let "--email" data.email "--key-type" data.keyType ] ++ protocolOpts - ++ optionals (acmeServer != null) [ "--server" acmeServer ] - ++ concatMap (name: [ "-d" name ]) extraDomains + ++ lib.optionals (acmeServer != null) [ "--server" acmeServer ] + ++ lib.concatMap (name: [ "-d" name ]) extraDomains ++ data.extraLegoFlags; # Although --must-staple is common to both modes, it is not declared as a # mode-agnostic argument in lego and thus must come after the mode. - runOpts = escapeShellArgs ( + runOpts = lib.escapeShellArgs ( commonOpts ++ [ "run" ] - ++ optionals data.ocspMustStaple [ "--must-staple" ] + ++ lib.optionals data.ocspMustStaple [ "--must-staple" ] ++ data.extraLegoRunFlags ); - renewOpts = escapeShellArgs ( + renewOpts = lib.escapeShellArgs ( commonOpts ++ [ "renew" "--no-random-sleep" ] - ++ optionals data.ocspMustStaple [ "--must-staple" ] + ++ lib.optionals data.ocspMustStaple [ "--must-staple" ] ++ data.extraLegoRenewFlags ); @@ -286,8 +285,8 @@ let selfsignService = lockfileName: { description = "Generate self-signed certificate for ${cert}"; - after = [ "acme-selfsigned-ca.service" "acme-fixperms.service" ] ++ optional (cfg.maxConcurrentRenewals > 0) "acme-lockfiles.service"; - requires = [ "acme-selfsigned-ca.service" "acme-fixperms.service" ] ++ optional (cfg.maxConcurrentRenewals > 0) "acme-lockfiles.service"; + after = [ "acme-selfsigned-ca.service" "acme-fixperms.service" ] ++ lib.optional (cfg.maxConcurrentRenewals > 0) "acme-lockfiles.service"; + requires = [ "acme-selfsigned-ca.service" "acme-fixperms.service" ] ++ lib.optional (cfg.maxConcurrentRenewals > 0) "acme-lockfiles.service"; path = with pkgs; [ minica ]; @@ -315,7 +314,7 @@ let minica \ --ca-key ca/key.pem \ --ca-cert ca/cert.pem \ - --domains ${escapeShellArg (builtins.concatStringsSep "," ([ data.domain ] ++ extraDomains))} + --domains ${lib.escapeShellArg (builtins.concatStringsSep "," ([ data.domain ] ++ extraDomains))} # Create files to match directory layout for real certificates cd '${keyName}' @@ -334,11 +333,11 @@ let renewService = lockfileName: { description = "Renew ACME certificate for ${cert}"; - after = [ "network.target" "network-online.target" "acme-fixperms.service" "nss-lookup.target" ] ++ selfsignedDeps ++ optional (cfg.maxConcurrentRenewals > 0) "acme-lockfiles.service"; - wants = [ "network-online.target" "acme-fixperms.service" ] ++ selfsignedDeps ++ optional (cfg.maxConcurrentRenewals > 0) "acme-lockfiles.service"; + after = [ "network.target" "network-online.target" "acme-fixperms.service" "nss-lookup.target" ] ++ selfsignedDeps ++ lib.optional (cfg.maxConcurrentRenewals > 0) "acme-lockfiles.service"; + wants = [ "network-online.target" "acme-fixperms.service" ] ++ selfsignedDeps ++ lib.optional (cfg.maxConcurrentRenewals > 0) "acme-lockfiles.service"; # https://github.com/NixOS/nixpkgs/pull/81371#issuecomment-605526099 - wantedBy = optionals (!config.boot.isContainer) [ "multi-user.target" ]; + wantedBy = lib.optionals (!config.boot.isContainer) [ "multi-user.target" ]; path = with pkgs; [ lego coreutils diffutils openssl ]; @@ -368,33 +367,33 @@ let "/var/lib/acme/.lego/${cert}/${certDir}:/tmp/certificates" ]; - EnvironmentFile = mkIf useDnsOrS3 data.environmentFile; + EnvironmentFile = lib.mkIf useDnsOrS3 data.environmentFile; - Environment = mkIf useDnsOrS3 - (mapAttrsToList (k: v: ''"${k}=%d/${k}"'') data.credentialFiles); + Environment = lib.mkIf useDnsOrS3 + (lib.mapAttrsToList (k: v: ''"${k}=%d/${k}"'') data.credentialFiles); - LoadCredential = mkIf useDnsOrS3 - (mapAttrsToList (k: v: "${k}:${v}") data.credentialFiles); + LoadCredential = lib.mkIf useDnsOrS3 + (lib.mapAttrsToList (k: v: "${k}:${v}") data.credentialFiles); # Run as root (Prefixed with +) ExecStartPost = "+" + (pkgs.writeShellScript "acme-postrun" '' - cd /var/lib/acme/${escapeShellArg cert} + cd /var/lib/acme/${lib.escapeShellArg cert} if [ -e renewed ]; then rm renewed ${data.postRun} - ${optionalString (data.reloadServices != []) - "systemctl --no-block try-reload-or-restart ${escapeShellArgs data.reloadServices}" + ${lib.optionalString (data.reloadServices != []) + "systemctl --no-block try-reload-or-restart ${lib.escapeShellArgs data.reloadServices}" } fi ''); - } // optionalAttrs (data.listenHTTP != null && toInt (last (splitString ":" data.listenHTTP)) < 1024) { + } // lib.optionalAttrs (data.listenHTTP != null && lib.toInt (lib.last (lib.splitString ":" data.listenHTTP)) < 1024) { CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; }; # Working directory will be /tmp script = (if (lockfileName == null) then lib.id else wrapInFlock "${lockdir}${lockfileName}") '' - ${optionalString data.enableDebugLogs "set -x"} + ${lib.optionalString data.enableDebugLogs "set -x"} set -euo pipefail # This reimplements the expiration date check, but without querying @@ -425,7 +424,7 @@ let [[ $expiration_days -gt ${toString data.validMinDays} ]] } - ${optionalString (data.webroot != null) '' + ${lib.optionalString (data.webroot != null) '' # Ensure the webroot exists. Fixing group is required in case configuration was changed between runs. # Lego will fail if the webroot does not exist at all. ( @@ -461,7 +460,7 @@ let # Produce a nice error for those doing their first nixos-rebuild with these certs echo Failed to fetch certificates. \ This may mean your DNS records are set up incorrectly. \ - ${optionalString (cfg.preliminarySelfsigned) "Selfsigned certs are in place and dependant services will still start."} + ${lib.optionalString (cfg.preliminarySelfsigned) "Selfsigned certs are in place and dependant services will still start."} # Exit 10 so that users can potentially amend SuccessExitStatus to ignore this error. # High number to avoid Systemd reserved codes. exit 10 @@ -490,7 +489,7 @@ let }; }; - certConfigs = mapAttrs certToConfig cfg.certs; + certConfigs = lib.mapAttrs certToConfig cfg.certs; # These options can be specified within # security.acme.defaults or security.acme.certs. @@ -504,22 +503,22 @@ let # stay constant. Though notably it wouldn't matter much, because to get # the option information, a submodule with name `` is evaluated # without any definitions. - defaultText = if isDefaults then default else literalExpression "config.security.acme.defaults.${name}"; + defaultText = if isDefaults then default else lib.literalExpression "config.security.acme.defaults.${name}"; }; in { imports = [ - (mkRenamedOptionModule [ "credentialsFile" ] [ "environmentFile" ]) + (lib.mkRenamedOptionModule [ "credentialsFile" ] [ "environmentFile" ]) ]; options = { - validMinDays = mkOption { - type = types.int; + validMinDays = lib.mkOption { + type = lib.types.int; inherit (defaultAndText "validMinDays" 30) default defaultText; description = "Minimum remaining validity before renewal in days."; }; - renewInterval = mkOption { - type = types.str; + renewInterval = lib.mkOption { + type = lib.types.str; inherit (defaultAndText "renewInterval" "daily") default defaultText; description = '' Systemd calendar expression when to check for renewal. See @@ -527,12 +526,12 @@ let ''; }; - enableDebugLogs = mkEnableOption "debug logging for this certificate" // { + enableDebugLogs = lib.mkEnableOption "debug logging for this certificate" // { inherit (defaultAndText "enableDebugLogs" true) default defaultText; }; - webroot = mkOption { - type = types.nullOr types.str; + webroot = lib.mkOption { + type = lib.types.nullOr lib.types.str; inherit (defaultAndText "webroot" null) default defaultText; example = "/var/lib/acme/acme-challenge"; description = '' @@ -544,8 +543,8 @@ let ''; }; - server = mkOption { - type = types.nullOr types.str; + server = lib.mkOption { + type = lib.types.nullOr lib.types.str; inherit (defaultAndText "server" "https://acme-v02.api.letsencrypt.org/directory") default defaultText; example = "https://acme-staging-v02.api.letsencrypt.org/directory"; description = '' @@ -556,8 +555,8 @@ let ''; }; - email = mkOption { - type = types.nullOr types.str; + email = lib.mkOption { + type = lib.types.nullOr lib.types.str; inherit (defaultAndText "email" null) default defaultText; description = '' Email address for account creation and correspondence from the CA. @@ -566,14 +565,14 @@ let ''; }; - group = mkOption { - type = types.str; + group = lib.mkOption { + type = lib.types.str; inherit (defaultAndText "group" "acme") default defaultText; description = "Group running the ACME client."; }; - reloadServices = mkOption { - type = types.listOf types.str; + reloadServices = lib.mkOption { + type = lib.types.listOf lib.types.str; inherit (defaultAndText "reloadServices" []) default defaultText; description = '' The list of systemd services to call `systemctl try-reload-or-restart` @@ -581,8 +580,8 @@ let ''; }; - postRun = mkOption { - type = types.lines; + postRun = lib.mkOption { + type = lib.types.lines; inherit (defaultAndText "postRun" "") default defaultText; example = "cp full.pem backup.pem"; description = '' @@ -593,8 +592,8 @@ let ''; }; - keyType = mkOption { - type = types.str; + keyType = lib.mkOption { + type = lib.types.str; inherit (defaultAndText "keyType" "ec256") default defaultText; description = '' Key type to use for private keys. @@ -603,8 +602,8 @@ let ''; }; - dnsProvider = mkOption { - type = types.nullOr types.str; + dnsProvider = lib.mkOption { + type = lib.types.nullOr lib.types.str; inherit (defaultAndText "dnsProvider" null) default defaultText; example = "route53"; description = '' @@ -613,8 +612,8 @@ let ''; }; - dnsResolver = mkOption { - type = types.nullOr types.str; + dnsResolver = lib.mkOption { + type = lib.types.nullOr lib.types.str; inherit (defaultAndText "dnsResolver" null) default defaultText; example = "1.1.1.1:53"; description = '' @@ -624,8 +623,8 @@ let ''; }; - environmentFile = mkOption { - type = types.nullOr types.path; + environmentFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; inherit (defaultAndText "environmentFile" null) default defaultText; description = '' Path to an EnvironmentFile for the cert's service containing any required and @@ -636,8 +635,8 @@ let example = "/var/src/secrets/example.org-route53-api-token"; }; - credentialFiles = mkOption { - type = types.attrsOf (types.path); + credentialFiles = lib.mkOption { + type = lib.types.attrsOf (lib.types.path); inherit (defaultAndText "credentialFiles" {}) default defaultText; description = '' Environment variables suffixed by "_FILE" to set for the cert's service @@ -647,15 +646,15 @@ let This allows to securely pass credential files to lego by leveraging systemd credentials. ''; - example = literalExpression '' + example = lib.literalExpression '' { "RFC2136_TSIG_SECRET_FILE" = "/run/secrets/tsig-secret-example.org"; } ''; }; - dnsPropagationCheck = mkOption { - type = types.bool; + dnsPropagationCheck = lib.mkOption { + type = lib.types.bool; inherit (defaultAndText "dnsPropagationCheck" true) default defaultText; description = '' Toggles lego DNS propagation check, which is used alongside DNS-01 @@ -663,8 +662,8 @@ let ''; }; - ocspMustStaple = mkOption { - type = types.bool; + ocspMustStaple = lib.mkOption { + type = lib.types.bool; inherit (defaultAndText "ocspMustStaple" false) default defaultText; description = '' Turns on the OCSP Must-Staple TLS extension. @@ -675,24 +674,24 @@ let ''; }; - extraLegoFlags = mkOption { - type = types.listOf types.str; + extraLegoFlags = lib.mkOption { + type = lib.types.listOf lib.types.str; inherit (defaultAndText "extraLegoFlags" []) default defaultText; description = '' Additional global flags to pass to all lego commands. ''; }; - extraLegoRenewFlags = mkOption { - type = types.listOf types.str; + extraLegoRenewFlags = lib.mkOption { + type = lib.types.listOf lib.types.str; inherit (defaultAndText "extraLegoRenewFlags" []) default defaultText; description = '' Additional flags to pass to lego renew. ''; }; - extraLegoRunFlags = mkOption { - type = types.listOf types.str; + extraLegoRunFlags = lib.mkOption { + type = lib.types.listOf lib.types.str; inherit (defaultAndText "extraLegoRunFlags" []) default defaultText; description = '' Additional flags to pass to lego run. @@ -704,40 +703,40 @@ let certOpts = { name, config, ... }: { options = { # user option has been removed - user = mkOption { + user = lib.mkOption { visible = false; default = "_mkRemovedOptionModule"; }; # allowKeysForGroup option has been removed - allowKeysForGroup = mkOption { + allowKeysForGroup = lib.mkOption { visible = false; default = "_mkRemovedOptionModule"; }; # extraDomains was replaced with extraDomainNames - extraDomains = mkOption { + extraDomains = lib.mkOption { visible = false; default = "_mkMergedOptionModule"; }; - directory = mkOption { - type = types.str; + directory = lib.mkOption { + type = lib.types.str; readOnly = true; default = "/var/lib/acme/${name}"; description = "Directory where certificate and other state is stored."; }; - domain = mkOption { - type = types.str; + domain = lib.mkOption { + type = lib.types.str; default = name; description = "Domain to fetch certificate for (defaults to the entry name)."; }; - extraDomainNames = mkOption { - type = types.listOf types.str; + extraDomainNames = lib.mkOption { + type = lib.types.listOf lib.types.str; default = []; - example = literalExpression '' + example = lib.literalExpression '' [ "example.org" "mydomain.org" @@ -751,8 +750,8 @@ let # This setting must be different for each configured certificate, otherwise # two or more renewals may fail to bind to the address. Hence, it is not in # the inheritableOpts. - listenHTTP = mkOption { - type = types.nullOr types.str; + listenHTTP = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; example = ":1360"; description = '' @@ -762,8 +761,8 @@ let ''; }; - s3Bucket = mkOption { - type = types.nullOr types.str; + s3Bucket = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; example = "acme"; description = '' @@ -771,7 +770,7 @@ let ''; }; - inheritDefaults = mkOption { + inheritDefaults = lib.mkOption { default = true; example = true; description = "Whether to inherit values set in `security.acme.defaults` or not."; @@ -784,8 +783,8 @@ in { options = { security.acme = { - preliminarySelfsigned = mkOption { - type = types.bool; + preliminarySelfsigned = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether a preliminary self-signed certificate should be generated before @@ -797,8 +796,8 @@ in { ''; }; - acceptTerms = mkOption { - type = types.bool; + acceptTerms = lib.mkOption { + type = lib.types.bool; default = false; description = '' Accept the CA's terms of service. The default provider is Let's Encrypt, @@ -806,8 +805,8 @@ in { ''; }; - useRoot = mkOption { - type = types.bool; + useRoot = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to use the root user when generating certs. This is not recommended @@ -818,8 +817,8 @@ in { ''; }; - defaults = mkOption { - type = types.submodule (inheritableModule true); + defaults = lib.mkOption { + type = lib.types.submodule (inheritableModule true); description = '' Default values inheritable by all configured certs. You can use this to define options shared by all your certs. These defaults @@ -828,9 +827,9 @@ in { ''; }; - certs = mkOption { + certs = lib.mkOption { default = { }; - type = with types; attrsOf (submodule [ (inheritableModule false) certOpts ]); + type = with lib.types; attrsOf (submodule [ (inheritableModule false) certOpts ]); description = '' Attribute set of certificates to get signed and renewed. Creates `acme-''${cert}.{service,timer}` systemd units for @@ -838,7 +837,7 @@ in { to those units if they rely on the certificates being present, or trigger restarts of the service if certificates get renewed. ''; - example = literalExpression '' + example = lib.literalExpression '' { "example.com" = { webroot = "/var/lib/acme/acme-challenge/"; @@ -852,9 +851,9 @@ in { } ''; }; - maxConcurrentRenewals = mkOption { + maxConcurrentRenewals = lib.mkOption { default = 5; - type = types.int; + type = lib.types.int; description = '' Maximum number of concurrent certificate generation or renewal jobs. All other jobs will queue and wait running jobs to finish. Reduces the system load of @@ -867,39 +866,39 @@ in { }; imports = [ - (mkRemovedOptionModule [ "security" "acme" "production" ] '' + (lib.mkRemovedOptionModule [ "security" "acme" "production" ] '' Use security.acme.server to define your staging ACME server URL instead. To use the let's encrypt staging server, use security.acme.server = "https://acme-staging-v02.api.letsencrypt.org/directory". '') - (mkRemovedOptionModule [ "security" "acme" "directory" ] "ACME Directory is now hardcoded to /var/lib/acme and its permissions are managed by systemd. See https://github.com/NixOS/nixpkgs/issues/53852 for more info.") - (mkRemovedOptionModule [ "security" "acme" "preDelay" ] "This option has been removed. If you want to make sure that something executes before certificates are provisioned, add a RequiredBy=acme-\${cert}.service to the service you want to execute before the cert renewal") - (mkRemovedOptionModule [ "security" "acme" "activationDelay" ] "This option has been removed. If you want to make sure that something executes before certificates are provisioned, add a RequiredBy=acme-\${cert}.service to the service you want to execute before the cert renewal") - (mkChangedOptionModule [ "security" "acme" "validMin" ] [ "security" "acme" "defaults" "validMinDays" ] (config: config.security.acme.validMin / (24 * 3600))) - (mkChangedOptionModule [ "security" "acme" "validMinDays" ] [ "security" "acme" "defaults" "validMinDays" ] (config: config.security.acme.validMinDays)) - (mkChangedOptionModule [ "security" "acme" "renewInterval" ] [ "security" "acme" "defaults" "renewInterval" ] (config: config.security.acme.renewInterval)) - (mkChangedOptionModule [ "security" "acme" "email" ] [ "security" "acme" "defaults" "email" ] (config: config.security.acme.email)) - (mkChangedOptionModule [ "security" "acme" "server" ] [ "security" "acme" "defaults" "server" ] (config: config.security.acme.server)) - (mkChangedOptionModule [ "security" "acme" "enableDebugLogs" ] [ "security" "acme" "defaults" "enableDebugLogs" ] (config: config.security.acme.enableDebugLogs)) + (lib.mkRemovedOptionModule [ "security" "acme" "directory" ] "ACME Directory is now hardcoded to /var/lib/acme and its permissions are managed by systemd. See https://github.com/NixOS/nixpkgs/issues/53852 for more info.") + (lib.mkRemovedOptionModule [ "security" "acme" "preDelay" ] "This option has been removed. If you want to make sure that something executes before certificates are provisioned, add a RequiredBy=acme-\${cert}.service to the service you want to execute before the cert renewal") + (lib.mkRemovedOptionModule [ "security" "acme" "activationDelay" ] "This option has been removed. If you want to make sure that something executes before certificates are provisioned, add a RequiredBy=acme-\${cert}.service to the service you want to execute before the cert renewal") + (lib.mkChangedOptionModule [ "security" "acme" "validMin" ] [ "security" "acme" "defaults" "validMinDays" ] (config: config.security.acme.validMin / (24 * 3600))) + (lib.mkChangedOptionModule [ "security" "acme" "validMinDays" ] [ "security" "acme" "defaults" "validMinDays" ] (config: config.security.acme.validMinDays)) + (lib.mkChangedOptionModule [ "security" "acme" "renewInterval" ] [ "security" "acme" "defaults" "renewInterval" ] (config: config.security.acme.renewInterval)) + (lib.mkChangedOptionModule [ "security" "acme" "email" ] [ "security" "acme" "defaults" "email" ] (config: config.security.acme.email)) + (lib.mkChangedOptionModule [ "security" "acme" "server" ] [ "security" "acme" "defaults" "server" ] (config: config.security.acme.server)) + (lib.mkChangedOptionModule [ "security" "acme" "enableDebugLogs" ] [ "security" "acme" "defaults" "enableDebugLogs" ] (config: config.security.acme.enableDebugLogs)) ]; - config = mkMerge [ - (mkIf (cfg.certs != { }) { + config = lib.mkMerge [ + (lib.mkIf (cfg.certs != { }) { # FIXME Most of these custom warnings and filters for security.acme.certs.* are required # because using mkRemovedOptionModule/mkChangedOptionModule with attrsets isn't possible. - warnings = filter (w: w != "") (mapAttrsToList (cert: data: optionalString (data.extraDomains != "_mkMergedOptionModule") '' + warnings = lib.filter (w: w != "") (lib.mapAttrsToList (cert: data: lib.optionalString (data.extraDomains != "_mkMergedOptionModule") '' The option definition `security.acme.certs.${cert}.extraDomains` has changed to `security.acme.certs.${cert}.extraDomainNames` and is now a list of strings. Setting a custom webroot for extra domains is not possible, instead use separate certs. '') cfg.certs); assertions = let - certs = attrValues cfg.certs; + certs = lib.attrValues cfg.certs; in [ { - assertion = cfg.defaults.email != null || all (certOpts: certOpts.email != null) certs; + assertion = cfg.defaults.email != null || lib.all (certOpts: certOpts.email != null) certs; message = '' You must define `security.acme.certs..email` or `security.acme.defaults.email` to register with the CA. Note that using @@ -914,7 +913,7 @@ in { to `true`. For Let's Encrypt's ToS see https://letsencrypt.org/repository/ ''; } - ] ++ (builtins.concatLists (mapAttrsToList (cert: data: [ + ] ++ (builtins.concatLists (lib.mapAttrsToList (cert: data: [ { assertion = data.user == "_mkRemovedOptionModule"; message = '' @@ -936,7 +935,7 @@ in { # referencing them as a user quite weird too. Best practice is to use # the domain option. { - assertion = ! hasInfix "*" cert; + assertion = ! lib.hasInfix "*" cert; message = '' The cert option path `security.acme.certs.${cert}.dnsProvider` cannot contain a * character. @@ -959,7 +958,7 @@ in { ''; }) { - assertion = all (hasSuffix "_FILE") (attrNames data.credentialFiles); + assertion = lib.all (lib.hasSuffix "_FILE") (lib.attrNames data.credentialFiles); message = '' Option `security.acme.certs.${cert}.credentialFiles` can only be used for variables suffixed by "_FILE". @@ -982,27 +981,27 @@ in { ]; systemd.services = let - renewServiceFunctions = mapAttrs' (cert: conf: nameValuePair "acme-${cert}" conf.renewService) certConfigs; + renewServiceFunctions = lib.mapAttrs' (cert: conf: lib.nameValuePair "acme-${cert}" conf.renewService) certConfigs; renewServices = if cfg.maxConcurrentRenewals > 0 then roundRobinApplyAttrs renewServiceFunctions concurrencyLockfiles - else mapAttrs (_: f: f null) renewServiceFunctions; - selfsignServiceFunctions = mapAttrs' (cert: conf: nameValuePair "acme-selfsigned-${cert}" conf.selfsignService) certConfigs; + else lib.mapAttrs (_: f: f null) renewServiceFunctions; + selfsignServiceFunctions = lib.mapAttrs' (cert: conf: lib.nameValuePair "acme-selfsigned-${cert}" conf.selfsignService) certConfigs; selfsignServices = if cfg.maxConcurrentRenewals > 0 then roundRobinApplyAttrs selfsignServiceFunctions concurrencyLockfiles - else mapAttrs (_: f: f null) selfsignServiceFunctions; + else lib.mapAttrs (_: f: f null) selfsignServiceFunctions; in { "acme-fixperms" = userMigrationService; } - // (optionalAttrs (cfg.maxConcurrentRenewals > 0) {"acme-lockfiles" = lockfilePrepareService; }) + // (lib.optionalAttrs (cfg.maxConcurrentRenewals > 0) {"acme-lockfiles" = lockfilePrepareService; }) // renewServices - // (optionalAttrs (cfg.preliminarySelfsigned) ({ + // (lib.optionalAttrs (cfg.preliminarySelfsigned) ({ "acme-selfsigned-ca" = selfsignCAService; } // selfsignServices)); - systemd.timers = mapAttrs' (cert: conf: nameValuePair "acme-${cert}" conf.renewTimer) certConfigs; + systemd.timers = lib.mapAttrs' (cert: conf: lib.nameValuePair "acme-${cert}" conf.renewTimer) certConfigs; systemd.targets = let # Create some targets which can be depended on to be "active" after cert renewals - finishedTargets = mapAttrs' (cert: conf: nameValuePair "acme-finished-${cert}" { + finishedTargets = lib.mapAttrs' (cert: conf: lib.nameValuePair "acme-finished-${cert}" { wantedBy = [ "default.target" ]; requires = [ "acme-${cert}.service" ]; after = [ "acme-${cert}.service" ]; @@ -1017,15 +1016,15 @@ in { # Using a target here is fine - account creation is a one time event. Even if # systemd clean --what=state is used to delete the account, so long as the user # then runs one of the cert services, there won't be any issues. - accountTargets = mapAttrs' (hash: confs: let + accountTargets = lib.mapAttrs' (hash: confs: let leader = "acme-${(builtins.head confs).cert}.service"; dependantServices = map (conf: "acme-${conf.cert}.service") (builtins.tail confs); - in nameValuePair "acme-account-${hash}" { + in lib.nameValuePair "acme-account-${hash}" { requiredBy = dependantServices; before = dependantServices; requires = [ leader ]; after = [ leader ]; - }) (groupBy (conf: conf.accountHash) (attrValues certConfigs)); + }) (lib.groupBy (conf: conf.accountHash) (lib.attrValues certConfigs)); in finishedTargets // accountTargets; }) ]; From 897d399d48d0c4a8019b2478ebbc212e54733b5c Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 4 Sep 2024 16:29:15 -0400 Subject: [PATCH 167/298] opentofu: 1.8.1 -> 1.8.2 Diff: https://github.com/opentofu/opentofu/compare/v1.8.1...v1.8.2 Changelog: https://github.com/opentofu/opentofu/blob/v1.8.2/CHANGELOG.md --- pkgs/applications/networking/cluster/opentofu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/opentofu/default.nix b/pkgs/applications/networking/cluster/opentofu/default.nix index 74d5fd9b30f2..d37167b37c60 100644 --- a/pkgs/applications/networking/cluster/opentofu/default.nix +++ b/pkgs/applications/networking/cluster/opentofu/default.nix @@ -14,13 +14,13 @@ let package = buildGoModule rec { pname = "opentofu"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "opentofu"; repo = "opentofu"; rev = "v${version}"; - hash = "sha256-mMp3X2jXBQi/lRbqdiBa1UMYPKXl4jEvTHXxbPji5D8="; + hash = "sha256-kBI3Jgi4fDOx5bknTMlcI2K3LxKj6Q4dunbG9N33Ps0="; }; vendorHash = "sha256-cM2DSP2ss3vleUhPBIdyxKeWJxtHpdjL5b5HVS/iC6o="; From 57dc7235c7bb6362364fc6b6acf6a9fd561612d9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 5 Sep 2024 00:41:01 +0200 Subject: [PATCH 168/298] home-assistant-custom-lovelace-modules.mushroom: 4.0.6 -> 4.0.7 https://github.com/piitaya/lovelace-mushroom/releases/tag/v4.0.7 --- .../custom-lovelace-modules/mushroom/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix index 6ca71440690b..9a03f71e8041 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "mushroom"; - version = "4.0.6"; + version = "4.0.7"; src = fetchFromGitHub { owner = "piitaya"; repo = "lovelace-mushroom"; rev = "v${version}"; - hash = "sha256-3zTavmuLrL/JPQE3axhGONxMhOMq0L0QvSj2pCKukmI="; + hash = "sha256-97FW4kNPaoP501xD0W/PjmykwhLbLz7yHVNZiwl/clE="; }; - npmDepsHash = "sha256-mzFgk5cGjFBnrVHbB6QQzf1QRAeLMl/6WS3I8jbheu8="; + npmDepsHash = "sha256-Gpt17teEbBMHU8teiH66fjZmgq+6v/XovTVxNfHFTg4="; installPhase = '' runHook preInstall From feb87d9700f72eef2499334dc540ee46ae9faf53 Mon Sep 17 00:00:00 2001 From: ozwaldorf Date: Wed, 4 Sep 2024 19:08:13 -0400 Subject: [PATCH 169/298] lutgen: add ozwaldorf as maintainer (package owner) --- pkgs/by-name/lu/lutgen/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/lu/lutgen/package.nix b/pkgs/by-name/lu/lutgen/package.nix index beac59da3af4..e415d0c8a14c 100644 --- a/pkgs/by-name/lu/lutgen/package.nix +++ b/pkgs/by-name/lu/lutgen/package.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Blazingly fast interpolated LUT generator and applicator for arbitrary and popular color palettes"; homepage = "https://github.com/ozwaldorf/lutgen-rs"; - maintainers = with maintainers; [ zzzsy donovanglover ]; + maintainers = with maintainers; [ ozwaldorf zzzsy donovanglover ]; mainProgram = "lutgen"; license = licenses.mit; }; From f548d04cca2fae1a523aef5f6b1f169e8e7a0fba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Sep 2024 23:14:56 +0000 Subject: [PATCH 170/298] vscode-extensions.mongodb.mongodb-vscode: 1.8.0 -> 1.8.1 --- .../vscode/extensions/mongodb.mongodb-vscode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix index 001e7e60f822..d9ab51bb6955 100644 --- a/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix @@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "mongodb-vscode"; publisher = "mongodb"; - version = "1.8.0"; - hash = "sha256-KtpXhDRf9vFS0iSQCJzywmIlRMhWLOlSuK7DPc0ddnw="; + version = "1.8.1"; + hash = "sha256-dHvYl3bg5OB/HYBoHQnUODhAob/ZylFNGLAuUQByvdM="; }; meta = { From 05d52e3b9e360dbca513a9283958fc834b4e8fba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Sep 2024 02:51:16 +0000 Subject: [PATCH 171/298] python312Packages.pylsp-mypy: 0.6.8 -> 0.6.9 --- pkgs/development/python-modules/pylsp-mypy/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pylsp-mypy/default.nix b/pkgs/development/python-modules/pylsp-mypy/default.nix index 17f9c244e702..42baae0b0659 100644 --- a/pkgs/development/python-modules/pylsp-mypy/default.nix +++ b/pkgs/development/python-modules/pylsp-mypy/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pylsp-mypy"; - version = "0.6.8"; + version = "0.6.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "python-lsp"; repo = "pylsp-mypy"; rev = "refs/tags/${version}"; - hash = "sha256-oEWUXkE8U7/ye6puJZRSkQFi10BPGuc8XZQbHwqOPEI="; + hash = "sha256-MP9a8dI5ggM+XEJYB6O4nYDYIXbtxi2TK5b+JQgViZQ="; }; build-system = [ setuptools ]; @@ -33,8 +33,7 @@ buildPythonPackage rec { dependencies = [ mypy python-lsp-server - tomli - ]; + ] ++ lib.optional (pythonOlder "3.11") tomli; nativeCheckInputs = [ pytestCheckHook ]; From 64eace5605875a1e8cec8ce3712df9f248cf7b40 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 5 Sep 2024 01:09:12 +0200 Subject: [PATCH 172/298] python312Packages.homeassistant-stubs: 2024.8.3 -> 2024.9.0 https://github.com/KapJI/homeassistant-stubs/releases/tag/2024.9.0 --- pkgs/servers/home-assistant/stubs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 5e7a0ab48200..fe0f8af3de2d 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2024.8.3"; + version = "2024.9.0"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-cpOxBdqrbN/YmtbxTLyarYdDhdlbnLoFfsBvnAdsWks="; + hash = "sha256-8t8r0CjiMvu73A+NtwF6/KMm+LkvMc/k4d1YPgWzWt8="; }; build-system = [ From 5f202323735b56354c2ee6109bcfd52d77f93164 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Sep 2024 23:31:59 +0000 Subject: [PATCH 173/298] miriway: 0-unstable-2024-08-14 -> 0-unstable-2024-08-31 --- pkgs/applications/window-managers/miriway/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/miriway/default.nix b/pkgs/applications/window-managers/miriway/default.nix index 97aa12e8ecd0..c23f1e799c35 100644 --- a/pkgs/applications/window-managers/miriway/default.nix +++ b/pkgs/applications/window-managers/miriway/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "miriway"; - version = "0-unstable-2024-08-14"; + version = "0-unstable-2024-08-31"; src = fetchFromGitHub { owner = "Miriway"; repo = "Miriway"; - rev = "2d00e8a61cb029cec96596897a1dada8033c601a"; - hash = "sha256-DB07IGFXLQj2LsU8iVZrSda0FS/efKUAolet8fK9Clo="; + rev = "2d754931f038865bd91938578b862262f0ce7c00"; + hash = "sha256-wmtAbajZ859tvLjKuwqFUq05VGLxHNJX1XyIXM6vvgU="; }; strictDeps = true; From 9b5041961804aef69cd7414c85697fe4b4dff33b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Ribeiro?= Date: Thu, 5 Sep 2024 00:35:30 +0100 Subject: [PATCH 174/298] feishin: 0.8.0 -> 0.8.1 Diff: https://github.com/jeffvli/feishin/compare/v0.8.0...v0.8.1 Changelog: - https://github.com/jeffvli/feishin/releases/tag/v0.8.1 --- pkgs/by-name/fe/feishin/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fe/feishin/package.nix b/pkgs/by-name/fe/feishin/package.nix index 068faa5d4918..c85e4aeecd04 100644 --- a/pkgs/by-name/fe/feishin/package.nix +++ b/pkgs/by-name/fe/feishin/package.nix @@ -11,13 +11,13 @@ }: let pname = "feishin"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "jeffvli"; repo = "feishin"; rev = "v${version}"; - hash = "sha256-KaZA7ZAeN6f1PWMeUl0Z4Xl/S/uD2vLPHM5uM+dIbko="; + hash = "sha256-9ExTxVptPEZ+E1Tr7vS3JCfH8RoRDfZ0daA1AHWuuas="; }; electron = electron_31; @@ -26,7 +26,7 @@ buildNpmPackage { inherit pname version; inherit src; - npmDepsHash = "sha256-1BG4U6x+e204KdrIh0S/rrdj/3wh2iuuWQgFXLjO3iw="; + npmDepsHash = "sha256-7CsbhwdNGkeNTNYrpMfOiQDU5lo23723F4zmM6QyFdA="; npmFlags = [ "--legacy-peer-deps" ]; makeCacheWritable = true; @@ -60,7 +60,7 @@ buildNpmPackage { inherit version; src = "${src}/release/app"; - npmDepsHash = "sha256-//K8jiO3nEHs08l9eMDW2HnZBeBgxBMai2omoCI7wQw="; + npmDepsHash = "sha256-2LsciXkFSCxFghiMRM7NoCv+7k9MC9W0xPtMsddZCZk="; npmFlags = [ "--ignore-scripts" ]; dontNpmBuild = true; From e2ae15171a0bff69c5d89bf9fec2db9d1b040b4a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 00:39:22 +0000 Subject: [PATCH 175/298] cargo-llvm-lines: 0.4.39 -> 0.4.40 --- pkgs/development/tools/rust/cargo-llvm-lines/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-llvm-lines/default.nix b/pkgs/development/tools/rust/cargo-llvm-lines/default.nix index 614630549b77..3e567af66173 100644 --- a/pkgs/development/tools/rust/cargo-llvm-lines/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-lines/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-llvm-lines"; - version = "0.4.39"; + version = "0.4.40"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - hash = "sha256-iy8bZvF3JYnlABzhmsrzo89pmKAWQYVNSZ9HoplpWiY="; + hash = "sha256-FyPq2+Smx4ZbJG13TKUHlyAANU4JbpAAUxisH9c4Aq8="; }; - cargoHash = "sha256-vFj7U+30dcLkFJ1eet6lykTcJHzKWOSzAqPqKJrp6Gg="; + cargoHash = "sha256-AH27+WrWguFpZFIq3N8Wb1Nlwbof6tgX0W4AtwMtoVw="; meta = with lib; { description = "Count the number of lines of LLVM IR across all instantiations of a generic function"; From 77afe924e59f18e4342cc02646acc4e56e548421 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 00:56:45 +0000 Subject: [PATCH 176/298] codux: 15.33.0 -> 15.34.0 --- pkgs/by-name/co/codux/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/codux/package.nix b/pkgs/by-name/co/codux/package.nix index fb56f3e86573..a73dad8a8984 100644 --- a/pkgs/by-name/co/codux/package.nix +++ b/pkgs/by-name/co/codux/package.nix @@ -5,11 +5,11 @@ let pname = "codux"; - version = "15.33.0"; + version = "15.34.0"; src = fetchurl { url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage"; - sha256 = "sha256-Fdy/Ovx8VCBe+pO/87VHVEnafJ9Ms8Pop0DOLYOHuQY="; + sha256 = "sha256-/e5tz3/XD/aaxLc/SUrTmWWfqI2Gw/xBTTTSmv5uZEQ="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; From ad601344e133ac92392b07f6631cc0b482f5ef7c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 5 Sep 2024 03:22:20 +0200 Subject: [PATCH 177/298] Revert "nixos/version: validate system.stateVersion" (#339671) This broke the eval of the ISOs on nixos/unstable-small and likely nixos/trunk-combined. See #339671 for details. --- .../manual/release-notes/rl-2411.section.md | 4 -- nixos/modules/misc/version.nix | 47 +------------------ 2 files changed, 2 insertions(+), 49 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 59e0a65152d5..0d6aa257b547 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -335,10 +335,6 @@ - `zx` was updated to v8, which introduces several breaking changes. See the [v8 changelog](https://github.com/google/zx/releases/tag/8.0.0) for more information. -- `system.stateVersion` is now validated. If you never changed this yourself, you don't need to do anything. If your `stateVersion` is not a valid NixOS release version (e.g. "24.11" is valid), - your system was already at risk of experiencing silent incompatible state updates. If your previous value is a well-formed version but not a valid release (e.g. "23.12"), - round down to the nearest actual release. If it wasn't a well-formed version (e.g. "nixos-unstable"), set it to the version of NixOS that you originally installed. - - The `portunus` package and service do not support weak password hashes anymore. If you installed Portunus on NixOS 23.11 or earlier, upgrade to NixOS 24.05 first to get support for strong password hashing. Then, follow the instructions on the [upstream release notes](https://github.com/majewsky/portunus/releases/tag/v2.0.0) to upgrade all existing user accounts to strong password hashes. diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index 169c58614a2e..db917f73a064 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -44,49 +44,6 @@ let }; initrdRelease = pkgs.writeText "initrd-release" (attrsToText initrdReleaseContents); - checkRelease = version: - let - parts = lib.versions.splitVersion version; - isVersion = lib.length parts == 2 && lib.all (p: lib.stringLength p == 2) parts; - majorVersion = lib.toIntBase10 (lib.elemAt parts 0); - minorVersion = lib.elemAt parts 1; - - versionPatterns = [ - # only 13.10 - { fromMajor = 13; minor = [ "10" ]; } - # 14.04 and 14.12 - { fromMajor = 14; minor = [ "04" "12" ]; } - # only 15.09 - { fromMajor = 15; minor = [ "09" ]; } - # 16.03 to 20.09 - { fromMajor = 16; minor = [ "03" "09" ]; } - # from 21.05 - { fromMajor = 21; minor = [ "05" "11" ]; } - ]; - - # find the versioning pattern that applies by looking for the first - # major version newer than `majorVersion`, and picking the previous pattern - patternIndex = lib.lists.findFirstIndex - ({ fromMajor, ... }: fromMajor > majorVersion) - (lib.length versionPatterns) - versionPatterns; - - validMinorVersions = - if patternIndex == 0 - then [] - else (lib.elemAt versionPatterns (patternIndex - 1)).minor; - - correctMinorVersion = lib.elem minorVersion validMinorVersions; - notNewerThanNixpkgs = lib.versionAtLeast trivial.release version; - in isVersion && correctMinorVersion && notNewerThanNixpkgs; - - releaseType = types.addCheck - (types.strMatching "[[:digit:]]{2}\\.[[:digit:]]{2}") - checkRelease // { - name = "nixosRelease"; - description = "NixOS release version, e.g. \"${trivial.release}\""; - descriptionClass = "nonRestrictiveClause"; - }; in { imports = [ @@ -113,7 +70,7 @@ in release = mkOption { readOnly = true; - type = releaseType; + type = types.str; default = trivial.release; description = "The NixOS release (e.g. `16.03`)."; }; @@ -194,7 +151,7 @@ in }; stateVersion = mkOption { - type = releaseType; + type = types.str; # TODO Remove this and drop the default of the option so people are forced to set it. # Doing this also means fixing the comment in nixos/modules/testing/test-instrumentation.nix apply = v: From f63edc3202ad695eddeedbf851882b04a2fd9805 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 01:25:54 +0000 Subject: [PATCH 178/298] netscanner: 0.5.2 -> 0.5.3 --- pkgs/by-name/ne/netscanner/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ne/netscanner/package.nix b/pkgs/by-name/ne/netscanner/package.nix index 516ca5aa11ec..8bca17373560 100644 --- a/pkgs/by-name/ne/netscanner/package.nix +++ b/pkgs/by-name/ne/netscanner/package.nix @@ -6,7 +6,7 @@ }: let pname = "netscanner"; - version = "0.5.2"; + version = "0.5.3"; in rustPlatform.buildRustPackage { inherit pname version; @@ -17,10 +17,10 @@ rustPlatform.buildRustPackage { owner = "Chleba"; repo = "netscanner"; rev = "refs/tags/v${version}"; - hash = "sha256-gVwI5dGQqSQf2wR7oKMTRIqseUbAEDTTuQ51S6dvEFw="; + hash = "sha256-rqUGi7UF9y3VZ0KoctCesQVgJbR1WfqhFA6aYFFimNk="; }; - cargoHash = "sha256-30VSeBbaVWVEO14eUx28HSymfkCxH0IZmEN4cnJ9wIk="; + cargoHash = "sha256-VP6L3lXDXadimSWC2L4yfzTRfTcUilJtZ7TeHARAKAY="; postFixup = '' wrapProgram $out/bin/netscanner \ From f330b5a43658c7e92826f9c9c46aa8dd93e7f89a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 01:28:24 +0000 Subject: [PATCH 179/298] nuclei: 3.3.1 -> 3.3.2 --- 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 d0bd1280349c..a0535d313259 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.1"; + version = "3.3.2"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei"; rev = "refs/tags/v${version}"; - hash = "sha256-pUctan5p3jxrj2/98nzibZQAL2EK8R5jnD/hjVgxSzQ="; + hash = "sha256-CBZeo2k9ZA41NotA6XIhkIQkEDvcbSIBCnPSOYXlLDQ="; }; - vendorHash = "sha256-sJkkgh7F5Hgj9K6m7OTQbamkcS3uS78jK9HdLYeypIU="; + vendorHash = "sha256-ewjJ89tCeedlTGngB7yU8JbfoTnPUw5Pg2iMwjg1SgU="; subPackages = [ "cmd/nuclei/" ]; From 80d8881fc7ff4840e86ab8f47ee1ec2503ab1518 Mon Sep 17 00:00:00 2001 From: Hentioe Date: Thu, 5 Sep 2024 09:41:27 +0800 Subject: [PATCH 180/298] mise: 2024.8.15 -> 2024.9.0 --- pkgs/tools/misc/mise/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/mise/default.nix b/pkgs/tools/misc/mise/default.nix index 42ebefe7e9de..473d7a308f23 100644 --- a/pkgs/tools/misc/mise/default.nix +++ b/pkgs/tools/misc/mise/default.nix @@ -17,13 +17,13 @@ rustPlatform.buildRustPackage rec { pname = "mise"; - version = "2024.8.15"; + version = "2024.9.0"; src = fetchFromGitHub { owner = "jdx"; repo = "mise"; rev = "v${version}"; - hash = "sha256-E4eS4wPExW4R7vb1lKBbxxwCzIcL3kut3U2c6n9cs3s="; + hash = "sha256-q515JEpws1UnZm1b8zgGxPvudH846XV+Ct4qKN2mNMQ="; # registry is not needed for compilation nor for tests. # contains files with the same name but different case, which cause problems with hash on darwin @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoHash = "sha256-oQbjR0nsyKQh232Ga5sPEfBd24ty0Om5vc742tVkCt4="; + cargoHash = "sha256-jGqaGbue+AEK0YjhHMlm84XBgA20p8Um03TjctjXVz0="; nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; From 617a699d598bfa904cba9384954eb2de8c90d110 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 02:10:21 +0000 Subject: [PATCH 181/298] python312Packages.catppuccin: 2.3.0 -> 2.3.1 --- pkgs/development/python-modules/catppuccin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/catppuccin/default.nix b/pkgs/development/python-modules/catppuccin/default.nix index 2726aa4f98de..a8007f932b16 100644 --- a/pkgs/development/python-modules/catppuccin/default.nix +++ b/pkgs/development/python-modules/catppuccin/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "catppuccin"; - version = "2.3.0"; + version = "2.3.1"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "catppuccin"; repo = "python"; rev = "refs/tags/v${version}"; - hash = "sha256-1CPNs+n9S7fV+EvhFWBwnv6/N3UWQ/jiyRcn4XKzmd8="; + hash = "sha256-MIxhl9D6nur26ZrbcXAwH8xO9YZlBvVKlB82qKX3Tx0="; }; build-system = [ From 9cf7b2a6db6d7d56ffab21da293e7660325e3aab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 02:12:25 +0000 Subject: [PATCH 182/298] python312Packages.adafruit-platformdetect: 3.73.0 -> 3.74.0 --- .../python-modules/adafruit-platformdetect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 2614a9925fd8..5f433ee5bfc3 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.73.0"; + version = "3.74.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "adafruit_platformdetect"; inherit version; - hash = "sha256-IwkJityP+Hs9mkpdOu6+P3t/VasOE9Get1/6hl82+rg="; + hash = "sha256-rVmtqpVjQgovAsVCu3+hgglga9LJPGT8zzlhySmpba8="; }; build-system = [ setuptools-scm ]; From 4ed8e990818e900c8b896881616ef97dedcd3667 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 4 Sep 2024 19:43:36 +0100 Subject: [PATCH 183/298] jujutsu: format with `nixfmt-rfc-style` --- .../version-management/jujutsu/default.nix | 71 +++++++++++-------- 1 file changed, 40 insertions(+), 31 deletions(-) diff --git a/pkgs/applications/version-management/jujutsu/default.nix b/pkgs/applications/version-management/jujutsu/default.nix index 1736287f2efd..7b6eaad444d5 100644 --- a/pkgs/applications/version-management/jujutsu/default.nix +++ b/pkgs/applications/version-management/jujutsu/default.nix @@ -1,21 +1,22 @@ -{ stdenv -, lib -, fetchFromGitHub -, fetchpatch2 -, rustPlatform -, Security -, SystemConfiguration -, pkg-config -, libiconv -, openssl -, gzip -, libssh2 -, libgit2 -, zstd -, installShellFiles -, nix-update-script -, testers -, jujutsu +{ + stdenv, + lib, + fetchFromGitHub, + fetchpatch2, + rustPlatform, + Security, + SystemConfiguration, + pkg-config, + libiconv, + openssl, + gzip, + libssh2, + libgit2, + zstd, + installShellFiles, + nix-update-script, + testers, + jujutsu, }: rustPlatform.buildRustPackage rec { @@ -31,9 +32,12 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-BOO1jP1Y5CNbE97zj+tpariiBdcuxKb1wyvI7i/VpYI="; - cargoBuildFlags = [ "--bin" "jj" ]; # don't install the fake editors + cargoBuildFlags = [ + "--bin" + "jj" + ]; # don't install the fake editors useNextest = false; # nextest is the upstream integration framework, but is problematic for test skipping - ZSTD_SYS_USE_PKG_CONFIG = "1"; # disable vendored zlib + ZSTD_SYS_USE_PKG_CONFIG = "1"; # disable vendored zlib LIBGIT2_NO_VENDOR = "1"; # disable vendored libgit2 LIBSSH2_SYS_USE_PKG_CONFIG = "1"; # disable vendored libssh2 @@ -43,16 +47,18 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = [ - openssl - zstd - libgit2 - libssh2 - ] ++ lib.optionals stdenv.isDarwin [ - Security - SystemConfiguration - libiconv - ]; + buildInputs = + [ + openssl + zstd + libgit2 + libssh2 + ] + ++ lib.optionals stdenv.isDarwin [ + Security + SystemConfiguration + libiconv + ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' $out/bin/jj util mangen > ./jj.1 @@ -84,7 +90,10 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/martinvonz/jj"; changelog = "https://github.com/martinvonz/jj/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ _0x4A6F thoughtpolice ]; + maintainers = with maintainers; [ + _0x4A6F + thoughtpolice + ]; mainProgram = "jj"; }; } From 64bbb1d94ce4c8fc538b50d9b1adbae66bc7a193 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 4 Sep 2024 19:44:31 +0100 Subject: [PATCH 184/298] jujutsu: move to `pkgs/by-name` --- .../jujutsu/default.nix => by-name/ju/jujutsu/package.nix} | 7 +++---- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 3 insertions(+), 8 deletions(-) rename pkgs/{applications/version-management/jujutsu/default.nix => by-name/ju/jujutsu/package.nix} (95%) diff --git a/pkgs/applications/version-management/jujutsu/default.nix b/pkgs/by-name/ju/jujutsu/package.nix similarity index 95% rename from pkgs/applications/version-management/jujutsu/default.nix rename to pkgs/by-name/ju/jujutsu/package.nix index 7b6eaad444d5..75563a83b5d3 100644 --- a/pkgs/applications/version-management/jujutsu/default.nix +++ b/pkgs/by-name/ju/jujutsu/package.nix @@ -4,8 +4,7 @@ fetchFromGitHub, fetchpatch2, rustPlatform, - Security, - SystemConfiguration, + darwin, pkg-config, libiconv, openssl, @@ -55,8 +54,8 @@ rustPlatform.buildRustPackage rec { libssh2 ] ++ lib.optionals stdenv.isDarwin [ - Security - SystemConfiguration + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration libiconv ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 804ab2b4ac35..11c8bbe008cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31876,10 +31876,6 @@ with pkgs; clerk = callPackage ../applications/audio/clerk { }; - jujutsu = callPackage ../applications/version-management/jujutsu { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - }; - nbstripout = callPackage ../applications/version-management/nbstripout { }; ncmpc = callPackage ../applications/audio/ncmpc { }; From d5b78d3cc11b4ed278dc9f8dd5b7fb7962bf804a Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 4 Sep 2024 20:01:59 +0100 Subject: [PATCH 185/298] jujutsu: remove `with lib` --- pkgs/by-name/ju/jujutsu/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix index 75563a83b5d3..c9a50783f751 100644 --- a/pkgs/by-name/ju/jujutsu/package.nix +++ b/pkgs/by-name/ju/jujutsu/package.nix @@ -84,12 +84,12 @@ rustPlatform.buildRustPackage rec { }; }; - meta = with lib; { + meta = { description = "Git-compatible DVCS that is both simple and powerful"; homepage = "https://github.com/martinvonz/jj"; changelog = "https://github.com/martinvonz/jj/blob/v${version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ _0x4A6F thoughtpolice ]; From 171489ac1a81f333241a2006421b18f3e759d7f8 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 4 Sep 2024 20:16:26 +0100 Subject: [PATCH 186/298] jujutsu: remove `rec` --- pkgs/by-name/ju/jujutsu/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix index c9a50783f751..ccc67897531d 100644 --- a/pkgs/by-name/ju/jujutsu/package.nix +++ b/pkgs/by-name/ju/jujutsu/package.nix @@ -18,9 +18,13 @@ jujutsu, }: -rustPlatform.buildRustPackage rec { - pname = "jujutsu"; +let version = "0.21.0"; +in + +rustPlatform.buildRustPackage { + pname = "jujutsu"; + inherit version; src = fetchFromGitHub { owner = "martinvonz"; From 7edc3b600d3e35e422bed873b9956797aeec801b Mon Sep 17 00:00:00 2001 From: Gavin John Date: Wed, 4 Sep 2024 19:17:15 -0700 Subject: [PATCH 187/298] python312Packages.kaleido: mark as broken on darwin --- pkgs/development/python-modules/kaleido/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/kaleido/default.nix b/pkgs/development/python-modules/kaleido/default.nix index a0229b95be15..0a8e3814fa00 100644 --- a/pkgs/development/python-modules/kaleido/default.nix +++ b/pkgs/development/python-modules/kaleido/default.nix @@ -112,5 +112,6 @@ buildPythonPackage rec { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; # Trust me, I'm not happy. But after literal hours of trying to reverse-engineer their build system and getting nowhere, I'll use the stupid binaries >:( license = lib.licenses.mit; maintainers = with lib.maintainers; [ pandapip1 ]; + broken = stdenv.isDarwin; # Tests fail on darwin for some reason }; } From 994d909ac9a9bea8021099914a508e64e899cd94 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 02:23:46 +0000 Subject: [PATCH 188/298] python312Packages.pykdtree: 1.3.12 -> 1.3.13 --- pkgs/development/python-modules/pykdtree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pykdtree/default.nix b/pkgs/development/python-modules/pykdtree/default.nix index 8e09b744ff8a..f169201b2cc5 100644 --- a/pkgs/development/python-modules/pykdtree/default.nix +++ b/pkgs/development/python-modules/pykdtree/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "pykdtree"; - version = "1.3.12"; + version = "1.3.13"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-zCCypnxkBWSFoxTSwrbbo1SvfuHI+42uG+byk2o3Q0E="; + hash = "sha256-Osz4UulGZT45nD1Nu+EZ28bT9yz9LVqVyr8L8Mf5JP4="; }; postPatch = '' From 636134b8ed2112412c1da441b4cc4d47a24e3bd3 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Wed, 4 Sep 2024 22:22:25 -0400 Subject: [PATCH 189/298] zfs_2_2: 2.2.5 -> 2.2.6 - This release brings official support for Kernel 6.10 - Also update zfs_unstable as it would otherwise lag behind - Upstream now links `zpool` completion, so only do so on older zfs (since we still need to support 2.1.x) Changelog: https://github.com/openzfs/zfs/releases/tag/zfs-2.2.6 --- pkgs/os-specific/linux/zfs/2_2.nix | 6 +++--- pkgs/os-specific/linux/zfs/generic.nix | 1 + pkgs/os-specific/linux/zfs/unstable.nix | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/2_2.nix b/pkgs/os-specific/linux/zfs/2_2.nix index 469b1cca0968..befb83b20569 100644 --- a/pkgs/os-specific/linux/zfs/2_2.nix +++ b/pkgs/os-specific/linux/zfs/2_2.nix @@ -14,10 +14,10 @@ callPackage ./generic.nix args { # this attribute is the correct one for this package. kernelModuleAttribute = "zfs_2_2"; # check the release notes for compatible kernels - kernelCompatible = kernel: kernel.kernelOlder "6.10"; + kernelCompatible = kernel: kernel.kernelOlder "6.11"; # this package should point to the latest release. - version = "2.2.5"; + version = "2.2.6"; tests = [ nixosTests.zfs.installer @@ -26,5 +26,5 @@ callPackage ./generic.nix args { maintainers = with lib.maintainers; [ adamcstephens amarshall ]; - hash = "sha256-BkwcNPk+jX8CXp5xEVrg4THof7o/5j8RY2SY6+IPNTg="; + hash = "sha256-wkgoYg6uQOHVq8a9sJXzO/QXJ6q28l7JXWkC+BFvOb0="; } diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix index b6e0a6d9882e..0fe8a1528737 100644 --- a/pkgs/os-specific/linux/zfs/generic.nix +++ b/pkgs/os-specific/linux/zfs/generic.nix @@ -184,6 +184,7 @@ let # Add Bash completions. install -v -m444 -D -t $out/share/bash-completion/completions contrib/bash_completion.d/zfs + '' + optionalString (lib.versionOlder version "2.2.6") '' (cd $out/share/bash-completion/completions; ln -s zfs zpool) ''; diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix index 8ca88c71303c..3fb46077d886 100644 --- a/pkgs/os-specific/linux/zfs/unstable.nix +++ b/pkgs/os-specific/linux/zfs/unstable.nix @@ -20,12 +20,12 @@ callPackage ./generic.nix args { # IMPORTANT: Always use a tagged release candidate or commits from the # zfs--staging branch, because this is tested by the OpenZFS # maintainers. - version = "2.2.5"; + version = "2.2.6"; # rev = ""; tests = [ nixosTests.zfs.unstable ]; - hash = "sha256-BkwcNPk+jX8CXp5xEVrg4THof7o/5j8RY2SY6+IPNTg="; + hash = "sha256-wkgoYg6uQOHVq8a9sJXzO/QXJ6q28l7JXWkC+BFvOb0="; } From fec826d5ad2b2de15fe0cdb3ba5f102eba7a3d34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Thu, 5 Sep 2024 04:34:29 +0200 Subject: [PATCH 190/298] eza: 0.19.1 -> 0.19.2 changelog: https://github.com/eza-community/eza/releases/tag/v0.19.2 --- pkgs/by-name/ez/eza/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index 7a784afcd26b..87b07a73cacf 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.19.1"; + version = "0.19.2"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-VV8tqVJq+bsgfdNSxSzo1vqYtYT37D2pBX4HydY6cKs="; + hash = "sha256-sTGU1Voa+mMBRIHVVUF79BwvxQfjA4XknhhhT5sk5xE="; }; - cargoHash = "sha256-SUvQxW3STsP1VrPJKK2NYbApuoGfbmfUiywZILvcvj4="; + cargoHash = "sha256-DSZ+1Svb22RlNzx74Kpj+oWrK60s4nGfpzzodDRL/Ko="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] From 9410d98452b1bf45b57fbd41a7906cef06a8f402 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 02:46:42 +0000 Subject: [PATCH 191/298] scaleway-cli: 2.32.1 -> 2.33.0 --- pkgs/tools/admin/scaleway-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/tools/admin/scaleway-cli/default.nix index 3b9ffe581afd..2693aa1f7d3a 100644 --- a/pkgs/tools/admin/scaleway-cli/default.nix +++ b/pkgs/tools/admin/scaleway-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "scaleway-cli"; - version = "2.32.1"; + version = "2.33.0"; src = fetchFromGitHub { owner = "scaleway"; repo = "scaleway-cli"; rev = "v${version}"; - sha256 = "sha256-+zSUgwh3CKyvBzRY4NevkoSINfvMNOfw8rvs48O0yJw="; + sha256 = "sha256-6mmjIrG81uaNfRAXW0YORZfviFwJd1QyORfvMucNWdI="; }; - vendorHash = "sha256-iEPBTM+hVAGs0TF30onHR0lWAALQbsA164OTkYuOdwc="; + vendorHash = "sha256-PWjcQD64DEJylRdSUA55iCcKHMdyMh5PrfWnhZz3LOg="; ldflags = [ "-w" From a4ef1d4a785b201468c54a066aa7a4019b5c9104 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 02:56:22 +0000 Subject: [PATCH 192/298] python312Packages.mizani: 0.12.1 -> 0.12.2 --- pkgs/development/python-modules/mizani/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mizani/default.nix b/pkgs/development/python-modules/mizani/default.nix index dd134c9d4c1d..92ced96774e0 100644 --- a/pkgs/development/python-modules/mizani/default.nix +++ b/pkgs/development/python-modules/mizani/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "mizani"; - version = "0.12.1"; + version = "0.12.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "has2k1"; repo = "mizani"; rev = "refs/tags/v${version}"; - hash = "sha256-a/+yZ7oUZG0fKgBUMwIf3XHUjac8Gsh3AosDVuUVoJU="; + hash = "sha256-aTc8LC/2zLrrTfOXABWs049m752PctpvlguA6qhyhp8="; }; build-system = [ setuptools-scm ]; From cc78da7bb3c1405e6581bdb67f4db7e156b4dea6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 02:57:02 +0000 Subject: [PATCH 193/298] terraform-ls: 0.34.2 -> 0.34.3 --- pkgs/development/tools/misc/terraform-ls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index 500c2ff7ba1a..f72e1e000ac4 100644 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.34.2"; + version = "0.34.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - hash = "sha256-4k9ro5XfcZs68p4QmvO+SBxfgBFf2Z8yrXiWmkbOj1c="; + hash = "sha256-fN/C7H0s7ZhXSg8pLn9iex6WglMKsx6hA8OK/HYqbRU="; }; - vendorHash = "sha256-znBfzX6oS19auL1ptcVXM0l2Thpnb7DrciYs5Z2XVJY="; + vendorHash = "sha256-NL5pqcQTjauxLschhj3kCiZLBLagABSCU/zHLcG2anM="; ldflags = [ "-s" "-w" ]; From acd8757d352af03a7b51ba28c480bbc27d2cb3d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 02:59:32 +0000 Subject: [PATCH 194/298] python312Packages.django-modeltranslation: 0.19.7 -> 0.19.8 --- .../python-modules/django-modeltranslation/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-modeltranslation/default.nix b/pkgs/development/python-modules/django-modeltranslation/default.nix index 35cd50fe4f53..1ede02a766a6 100644 --- a/pkgs/development/python-modules/django-modeltranslation/default.nix +++ b/pkgs/development/python-modules/django-modeltranslation/default.nix @@ -13,7 +13,7 @@ let # 0.18.12 was yanked from PyPI, it refers to this issue: # https://github.com/deschler/django-modeltranslation/issues/701 - version = "0.19.7"; + version = "0.19.8"; in buildPythonPackage { pname = "django-modeltranslation"; @@ -23,7 +23,7 @@ buildPythonPackage { owner = "deschler"; repo = "django-modeltranslation"; rev = "refs/tags/v${version}"; - hash = "sha256-jZm51HmK4pgEPeDirMkbLdLJQONspjuqSc2HgiSCtOY="; + hash = "sha256-23htGjPtupmg/oSO/5SuxOfbDmRQKrqx2/lvfqYp7dA="; }; disabled = pythonOlder "3.6"; From 50ebb3a99f3938e18cf7783a7defd31b45ae5464 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 4 Sep 2024 20:11:06 +0100 Subject: [PATCH 195/298] jujutsu: use `env` --- pkgs/by-name/ju/jujutsu/package.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix index ccc67897531d..5099d2cc463f 100644 --- a/pkgs/by-name/ju/jujutsu/package.nix +++ b/pkgs/by-name/ju/jujutsu/package.nix @@ -40,9 +40,6 @@ rustPlatform.buildRustPackage { "jj" ]; # don't install the fake editors useNextest = false; # nextest is the upstream integration framework, but is problematic for test skipping - ZSTD_SYS_USE_PKG_CONFIG = "1"; # disable vendored zlib - LIBGIT2_NO_VENDOR = "1"; # disable vendored libgit2 - LIBSSH2_SYS_USE_PKG_CONFIG = "1"; # disable vendored libssh2 nativeBuildInputs = [ gzip @@ -63,6 +60,13 @@ rustPlatform.buildRustPackage { libiconv ]; + env = { + # Disable vendored libraries. + ZSTD_SYS_USE_PKG_CONFIG = "1"; + LIBGIT2_NO_VENDOR = "1"; + LIBSSH2_SYS_USE_PKG_CONFIG = "1"; + }; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' $out/bin/jj util mangen > ./jj.1 installManPage ./jj.1 From 95b9708a696af57009fb1a7946ff3dad5e01f16e Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 4 Sep 2024 19:45:17 +0100 Subject: [PATCH 196/298] jujutsu: remove unused `fetchpatch2` argument --- pkgs/by-name/ju/jujutsu/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix index 5099d2cc463f..f6afd5ee9661 100644 --- a/pkgs/by-name/ju/jujutsu/package.nix +++ b/pkgs/by-name/ju/jujutsu/package.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitHub, - fetchpatch2, rustPlatform, darwin, pkg-config, From 099dad2daf9c3d834726a45742b858af2db18579 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 4 Sep 2024 20:00:37 +0100 Subject: [PATCH 197/298] jujutsu: remove `gzip` dependency This does not seem to be required any more. --- pkgs/by-name/ju/jujutsu/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix index f6afd5ee9661..f20ace1e7a7e 100644 --- a/pkgs/by-name/ju/jujutsu/package.nix +++ b/pkgs/by-name/ju/jujutsu/package.nix @@ -7,7 +7,6 @@ pkg-config, libiconv, openssl, - gzip, libssh2, libgit2, zstd, @@ -41,7 +40,6 @@ rustPlatform.buildRustPackage { useNextest = false; # nextest is the upstream integration framework, but is problematic for test skipping nativeBuildInputs = [ - gzip installShellFiles pkg-config ]; From 61d6f139bea4b1e10b112479f557fe726df47cd2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 03:21:45 +0000 Subject: [PATCH 198/298] python312Packages.appthreat-vulnerability-db: 6.0.8 -> 6.0.14 --- .../python-modules/appthreat-vulnerability-db/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index fc07530ed65f..ed93d5dc2792 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "6.0.8"; + version = "6.0.14"; pyproject = true; disabled = pythonOlder "3.10"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-lgt609UDuHTGQTTrpvxNvgUk6GU+TYqwc19dzatI4Io="; + hash = "sha256-Xm/2AHV4r6SmKK1wZS20xh9xRO3zhdEB/hpRT1o3z2Q="; }; pythonRelaxDeps = [ From b4fff4897c2144d48b3ac44e7a9be3cc614a3ac0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 05:11:58 +0000 Subject: [PATCH 199/298] qownnotes: 24.9.0 -> 24.9.1 --- pkgs/applications/office/qownnotes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index a08f9dd02ad0..f7fb254413d2 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -20,14 +20,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "24.9.0"; + version = "24.9.1"; in stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; - hash = "sha256-xlGBpRiak/th/z9zKbQXpuk3py/W1ns90NjKw4w3FtI="; + hash = "sha256-W9w7FJ0EfwPLC9R6OnDz+yny4VSaRGdrPXvaReV9hco="; }; nativeBuildInputs = [ From 15b474ae05881eff78f0cbd166ac5be8c43a27ce Mon Sep 17 00:00:00 2001 From: Vivek Revankar Date: Wed, 4 Sep 2024 22:28:40 -0700 Subject: [PATCH 200/298] nixos/endlessh-go: allow overriding package allow overriding the endlessh-go package used in the service --- nixos/modules/services/security/endlessh-go.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/security/endlessh-go.nix b/nixos/modules/services/security/endlessh-go.nix index 480bfc8cb9ef..1c5d2087f0b3 100644 --- a/nixos/modules/services/security/endlessh-go.nix +++ b/nixos/modules/services/security/endlessh-go.nix @@ -9,6 +9,8 @@ in options.services.endlessh-go = { enable = mkEnableOption "endlessh-go service"; + package = mkPackageOption pkgs "endlessh-go" { }; + listenAddress = mkOption { type = types.str; default = "0.0.0.0"; @@ -86,7 +88,7 @@ in { Restart = "always"; ExecStart = with cfg; concatStringsSep " " ([ - "${pkgs.endlessh-go}/bin/endlessh-go" + (lib.getExe cfg.package) "-logtostderr" "-host=${listenAddress}" "-port=${toString port}" From 1de02165a4e3eb352f65f404b2c0770389d7b460 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Sep 2024 21:48:43 +0200 Subject: [PATCH 201/298] python312Packages.awkward: disable failing tests --- pkgs/development/python-modules/awkward/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index 4bcfc343458d..5f9f5387cb4a 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -86,6 +86,12 @@ buildPythonPackage rec { # Disable tests dependending on jax on darwin ] ++ lib.optionals stdenv.isDarwin [ "tests/test_2603_custom_behaviors_with_jax.py" ]; + disabledTests = [ + # AssertionError: Regex pattern did not match. + "test_serialise_with_nonserialisable_attrs" + "test_serialise_with_nonserialisable_attrs" + ]; + meta = { description = "Manipulate JSON-like data with NumPy-like idioms"; homepage = "https://github.com/scikit-hep/awkward"; From fcdb874388b848d3e697b268aaee8fbaa633df9e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 06:42:01 +0000 Subject: [PATCH 202/298] rust-analyzer-unwrapped: 2024-08-27 -> 2024-09-02 --- pkgs/development/tools/rust/rust-analyzer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 122e5d747787..6326657372c4 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2024-08-27"; - cargoHash = "sha256-zYKBNByyHjLbShhmoVTvqWe30EKVf3XBKzktZzGjifo="; + version = "2024-09-02"; + cargoHash = "sha256-t45RzYkuywGByGWwUON3dW0aKjLYcFXB8uy4CybPuf4="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - hash = "sha256-tRaJTAfFpV2y+kqf8ZzX74waPpkZ0r2EB4WIKLQAsrw="; + hash = "sha256-YH0kH5CSOnAuPUB1BUzUqvnKiv5SgDhfMNjrkki9Ahk="; }; cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ]; From d0213a75e0ac65708469b5b33a509d2d902d7690 Mon Sep 17 00:00:00 2001 From: Moritz Sanft <58110325+msanft@users.noreply.github.com> Date: Sat, 24 Aug 2024 11:15:34 +0200 Subject: [PATCH 203/298] nixos: support dm-verity --- .../manual/release-notes/rl-2411.section.md | 3 + nixos/modules/module-list.nix | 1 + .../modules/system/boot/systemd/dm-verity.nix | 65 +++++ nixos/modules/system/boot/systemd/initrd.nix | 11 +- nixos/tests/all-tests.nix | 1 + nixos/tests/dm-verity.nix | 245 ++++++++++++++++++ 6 files changed, 322 insertions(+), 4 deletions(-) create mode 100644 nixos/modules/system/boot/systemd/dm-verity.nix create mode 100644 nixos/tests/dm-verity.nix diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 1761715c8e5b..0d668459f09b 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -35,6 +35,9 @@ Users that want to keep PulseAudio will want to set `services.pipewire.enable = false;` and `hardware.pulseaudio.enable = true;`. There is currently no plan to fully deprecate and remove PulseAudio, however, PipeWire should generally be preferred for new installs. +- Support for mounting filesystems from block devices protected with [dm-verity](https://docs.kernel.org/admin-guide/device-mapper/verity.html) + was added through the `boot.initrd.systemd.dmVerity` option. + ## New Modules {#sec-release-24.11-new-modules} - [TaskChampion Sync-Server](https://github.com/GothenburgBitFactory/taskchampion-sync-server), a [Taskwariror 3](https://taskwarrior.org/docs/upgrade-3/) sync server, replacing Taskwarrior 2's sync server named [`taskserver`](https://github.com/GothenburgBitFactory/taskserver). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 5e7d7b203e95..59ff758bde82 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1621,6 +1621,7 @@ ./system/boot/stage-2.nix ./system/boot/systemd.nix ./system/boot/systemd/coredump.nix + ./system/boot/systemd/dm-verity.nix ./system/boot/systemd/initrd-secrets.nix ./system/boot/systemd/initrd.nix ./system/boot/systemd/journald.nix diff --git a/nixos/modules/system/boot/systemd/dm-verity.nix b/nixos/modules/system/boot/systemd/dm-verity.nix new file mode 100644 index 000000000000..eea048126be0 --- /dev/null +++ b/nixos/modules/system/boot/systemd/dm-verity.nix @@ -0,0 +1,65 @@ +{ config, lib, ... }: + +let + cfg = config.boot.initrd.systemd.dmVerity; +in +{ + options = { + boot.initrd.systemd.dmVerity = { + enable = lib.mkEnableOption "dm-verity" // { + description = '' + Mount verity-protected block devices in the initrd. + + Enabling this option allows to use `systemd-veritysetup` and + `systemd-veritysetup-generator` in the initrd. + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = cfg.enable -> config.boot.initrd.systemd.enable; + message = '' + 'boot.initrd.systemd.dmVerity.enable' requires 'boot.initrd.systemd.enable' to be enabled. + ''; + } + ]; + + boot.initrd = { + availableKernelModules = [ + # For documentation, see https://docs.kernel.org/admin-guide/device-mapper/dm-init.html + "dm_mod" + # For documentation, see: + # - https://docs.kernel.org/admin-guide/device-mapper/verity.html + # - https://gitlab.com/cryptsetup/cryptsetup/-/wikis/DMVerity + "dm_verity" + ]; + + # dm-verity needs additional udev rules from LVM to work. + services.lvm.enable = true; + + # The additional targets and store paths allow users to integrate verity-protected devices + # through the systemd tooling. + systemd = { + additionalUpstreamUnits = [ + # https://github.com/systemd/systemd/blob/main/units/veritysetup-pre.target + "veritysetup-pre.target" + # https://github.com/systemd/systemd/blob/main/units/veritysetup.target + "veritysetup.target" + # https://github.com/systemd/systemd/blob/main/units/remote-veritysetup.target + "remote-veritysetup.target" + ]; + + storePaths = [ + # These are the two binaries mentioned in https://github.com/systemd/systemd/blob/main/src/veritysetup/meson.build; there are no others. + "${config.boot.initrd.systemd.package}/lib/systemd/systemd-veritysetup" + "${config.boot.initrd.systemd.package}/lib/systemd/system-generators/systemd-veritysetup-generator" + ]; + }; + }; + }; + + meta.maintainers = [ lib.maintainers.msanft ]; +} diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index 2ccc964820fe..2ad114d6a1d3 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -218,7 +218,7 @@ in { }; root = lib.mkOption { - type = lib.types.enum [ "fstab" "gpt-auto" ]; + type = lib.types.nullOr (lib.types.enum [ "fstab" "gpt-auto" ]); default = "fstab"; example = "gpt-auto"; description = '' @@ -227,6 +227,9 @@ in { allow specifying the root file system itself this way. Instead, the `fstab` value is used in order to interpret the root file system specified with the `fileSystems` option. + + If the root FS is mounted by other means, such as systemd generators other than + `fstab`, `gpt-auto` or a custom generator, set this to `null`. ''; }; @@ -398,9 +401,9 @@ in { ++ lib.optional (cfg.enableTpm2 && !(pkgs.stdenv.hostPlatform.isRiscV64 || pkgs.stdenv.hostPlatform.isArmv7)) "tpm-crb" ++ lib.optional cfg.package.withEfi "efivarfs"; - boot.kernelParams = [ - "root=${config.boot.initrd.systemd.root}" - ] ++ lib.optional (config.boot.resumeDevice != "") "resume=${config.boot.resumeDevice}" + boot.kernelParams = + lib.optional (config.boot.initrd.systemd.root != null) "root=${config.boot.initrd.systemd.root}" + ++ lib.optional (config.boot.resumeDevice != "") "resume=${config.boot.resumeDevice}" # `systemd` mounts root in initrd as read-only unless "rw" is on the kernel command line. # For NixOS activation to succeed, we need to have root writable in initrd. ++ lib.optional (config.boot.initrd.systemd.root == "gpt-auto") "rw"; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 76c70e2c3fc8..a00291309b84 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -259,6 +259,7 @@ in { dhparams = handleTest ./dhparams.nix {}; disable-installer-tools = handleTest ./disable-installer-tools.nix {}; discourse = handleTest ./discourse.nix {}; + dm-verity = runTest ./dm-verity.nix; dnscrypt-proxy2 = handleTestOn ["x86_64-linux"] ./dnscrypt-proxy2.nix {}; dnscrypt-wrapper = runTestOn ["x86_64-linux"] ./dnscrypt-wrapper; dnsdist = import ./dnsdist.nix { inherit pkgs runTest; }; diff --git a/nixos/tests/dm-verity.nix b/nixos/tests/dm-verity.nix new file mode 100644 index 000000000000..cf20dbe66f59 --- /dev/null +++ b/nixos/tests/dm-verity.nix @@ -0,0 +1,245 @@ +# Tests a NixOS system with a read-only root filesystem that's integrity-protected +# through DM-verity. The root filesystem is mounted read-only, and for NixOS activation +# to succeed, an overlay `tmpfs` is mounted on top of it. +# This test uses systemd-repart to create a bootable disk image, as it supplies handy +# utilities for creating verity partitions, but it can also be setup manually through +# `systemd-veritysetup`. + +{ lib, pkgs, ... }: + +let + imageId = "verity-root-image"; + imageVersion = "1-rc1"; + + # Use a random, but fixed root hash placeholder to allow us specifying the "real" root hash + # after the image is first built. + roothashPlaceholder = "61fe0f0c98eff2a595dd2f63a5e481a0a25387261fa9e34c37e3a4910edf32b8"; +in +{ + name = "verity-root"; + + meta.maintainers = with lib.maintainers; [ msanft ]; + + nodes.machine = + { + lib, + pkgs, + config, + modulesPath, + ... + }: + { + + imports = [ "${modulesPath}/image/repart.nix" ]; + + virtualisation.directBoot.enable = false; + virtualisation.mountHostNixStore = false; + virtualisation.useEFIBoot = true; + + # Disable boot loaders, as a UKI is used, which contains systemd-stub. + # TODO(raitobezarius): revisit this when #244907 lands + boot.loader.grub.enable = false; + + system.image.id = imageId; + system.image.version = imageVersion; + + # systemd-veritysetup-generator takes care of setting up the root filesystem. + fileSystems = lib.mkForce { }; + virtualisation.fileSystems = lib.mkForce { }; + + # Provides 'veritysetup' to check if the verity-protected device + # has been mapped correctly. + environment.systemPackages = with pkgs; [ cryptsetup ]; + + boot.initrd = { + kernelModules = [ "overlay" ]; + supportedFilesystems = [ "erofs" ]; + + systemd = { + enable = true; + dmVerity.enable = true; + root = null; # systemd-veritysetup-generator takes care of mounting / + + tmpfiles.settings = { + "10-mountpoints" = + let + conf = { + mode = "0755"; + user = "root"; + group = "root"; + }; + in + { + "/run/etc/upper".d = conf; + "/run/etc/work".d = conf; + "/run/var/upper".d = conf; + "/run/var/work".d = conf; + "/run/tmp/upper".d = conf; + "/run/tmp/work".d = conf; + }; + }; + + # We directly define the mount units here, as we need to specify dependencies very + # granularly, and systemd-fstab-generator doesn't give us that flexibility. + mounts = [ + { + where = "/sysroot/etc"; + what = "overlay"; + type = "overlay"; + options = "lowerdir=/sysroot${config.system.build.etc}/etc,upperdir=/run/etc/upper,workdir=/run/etc/work"; + wantedBy = [ + "initrd-fs.target" + "initrd-switch-root.target" + "default.target" + ]; + before = [ "initrd-fs.target" ]; + after = [ "systemd-tmpfiles-setup.service" ]; + unitConfig.RequiresMountsFor = "/sysroot/nix/store"; + unitConfig.DefaultDependencies = false; + } + { + where = "/sysroot/var"; + what = "overlay"; + type = "overlay"; + options = "lowerdir=/sysroot/var,upperdir=/run/var/upper,workdir=/run/var/work"; + wantedBy = [ + "initrd-fs.target" + "initrd-switch-root.target" + "default.target" + ]; + before = [ "initrd-fs.target" ]; + after = [ "systemd-tmpfiles-setup.service" ]; + unitConfig.RequiresMountsFor = "/sysroot/nix/store"; + unitConfig.DefaultDependencies = false; + } + { + where = "/sysroot/tmp"; + what = "overlay"; + type = "overlay"; + options = "lowerdir=/sysroot/tmp,upperdir=/run/tmp/upper,workdir=/run/tmp/work"; + wantedBy = [ + "initrd-fs.target" + "initrd-switch-root.target" + "default.target" + ]; + before = [ "initrd-fs.target" ]; + after = [ "systemd-tmpfiles-setup.service" ]; + unitConfig.RequiresMountsFor = "/sysroot/nix/store"; + unitConfig.DefaultDependencies = false; + } + ]; + }; + }; + + boot.kernelParams = [ + "systemd.verity=yes" + "roothash=${roothashPlaceholder}" + ]; + + image.repart = { + name = imageId; + # OVMF does not work with the default repart sector size of 4096 + sectorSize = 512; + partitions = { + # ESP + "00-esp" = { + contents = + let + efiArch = config.nixpkgs.hostPlatform.efiArch; + in + { + "/EFI/BOOT/BOOT${lib.toUpper efiArch}.EFI".source = "${pkgs.systemd}/lib/systemd/boot/efi/systemd-boot${efiArch}.efi"; + + "/EFI/Linux/${config.system.boot.loader.ukiFile}".source = "${config.system.build.uki}/${config.system.boot.loader.ukiFile}"; + }; + repartConfig = { + Type = "esp"; + Format = "vfat"; + # Minimize = "guess" seems to not work very well for vfat + # partitions. It's better to set a sensible default instead. The + # aarch64 kernel seems to generally be a little bigger than the + # x86_64 kernel. To stay on the safe side, leave some more slack + # for every platform other than x86_64. + SizeMinBytes = if config.nixpkgs.hostPlatform.isx86_64 then "64M" else "96M"; + }; + }; + + # Root Partition + "10-root" = { + storePaths = [ config.system.build.toplevel ]; + repartConfig = { + Type = "root"; + Format = "erofs"; + Label = "root"; + Verity = "data"; + VerityMatchKey = "root"; + Minimize = "best"; + # We need to ensure that mountpoints are available. + MakeDirectories = "/bin /boot /dev /etc /home /lib /lib64 /mnt /nix /opt /proc /root /run /srv /sys /tmp /usr /var"; + }; + }; + + # Verity hashtree for the root partition + "20-root-verity" = { + repartConfig = { + Type = "root-verity"; + Label = "root-verity"; + Verity = "hash"; + VerityMatchKey = "root"; + Minimize = "best"; + }; + }; + }; + }; + }; + + testScript = + let + # We override the build of the image by extending it with code to replace the placeholder with the real root hash. + # This way, we can build the image first and then set the root hash afterwards in a single derivation. + buildOverride = oldAttrs: { + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ pkgs.jq ]; + postInstall = '' + # Replace the placeholder with the real root hash. + realRoothash=$(${pkgs.jq}/bin/jq -r "[.[] | select(.roothash != null)] | .[0].roothash" $out/repart-output.json) + sed -i "0,/${roothashPlaceholder}/ s/${roothashPlaceholder}/$realRoothash/" $out/${oldAttrs.pname}_${oldAttrs.version}.raw + ''; + }; + in + { nodes, ... }: + '' + import os, subprocess, tempfile + + tmp_disk_image = tempfile.NamedTemporaryFile() + + subprocess.run([ + "${nodes.machine.virtualisation.qemu.package}/bin/qemu-img", + "create", + "-f", + "qcow2", + "-b", + "${nodes.machine.system.build.image.overrideAttrs buildOverride}/${nodes.machine.image.repart.imageFile}", + "-F", + "raw", + tmp_disk_image.name, + ]) + + # Set NIX_DISK_IMAGE so that the qemu script finds the right disk image. + os.environ['NIX_DISK_IMAGE'] = tmp_disk_image.name + + os_release = machine.succeed("cat /etc/os-release") + assert 'IMAGE_ID="${imageId}"' in os_release + assert 'IMAGE_VERSION="${imageVersion}"' in os_release + + bootctl_status = machine.succeed("bootctl status") + assert "Boot Loader Specification Type #2 (.efi)" in bootctl_status + + verity_status = machine.succeed("veritysetup status root") + assert "type: VERITY" in verity_status + assert "status: verified" in verity_status + + commandline = machine.succeed("cat /proc/cmdline") + roothash = commandline.split("roothash=")[1].split(" ")[0] + assert roothash in verity_status + ''; +} From b221192809ec9e70d3eea3ec1604a8849874e097 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 4 Sep 2024 20:09:17 +0100 Subject: [PATCH 204/298] =?UTF-8?q?jujutsu:=20don=E2=80=99t=20depend=20on?= =?UTF-8?q?=20OpenSSL=20on=20macOS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/ju/jujutsu/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix index f20ace1e7a7e..bf1c103c7e1c 100644 --- a/pkgs/by-name/ju/jujutsu/package.nix +++ b/pkgs/by-name/ju/jujutsu/package.nix @@ -46,12 +46,12 @@ rustPlatform.buildRustPackage { buildInputs = [ - openssl zstd libgit2 libssh2 ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration libiconv From 279e27754f473b8d724b505ddf9ffa954b6c366f Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 4 Sep 2024 20:03:21 +0100 Subject: [PATCH 205/298] jujutsu: reorder arguments --- pkgs/by-name/ju/jujutsu/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix index bf1c103c7e1c..6cb23e14f13a 100644 --- a/pkgs/by-name/ju/jujutsu/package.nix +++ b/pkgs/by-name/ju/jujutsu/package.nix @@ -1,16 +1,16 @@ { - stdenv, lib, - fetchFromGitHub, + stdenv, rustPlatform, - darwin, - pkg-config, - libiconv, - openssl, - libssh2, - libgit2, - zstd, + fetchFromGitHub, installShellFiles, + pkg-config, + zstd, + libgit2, + libssh2, + openssl, + darwin, + libiconv, nix-update-script, testers, jujutsu, From ede2bd2a5a8632c80c902e22313775ac479cb007 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 4 Sep 2024 20:14:04 +0100 Subject: [PATCH 206/298] jujutsu: weaken `canExecute` to `emulatorAvailable` --- pkgs/by-name/ju/jujutsu/package.nix | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix index 6cb23e14f13a..c649d17c77e1 100644 --- a/pkgs/by-name/ju/jujutsu/package.nix +++ b/pkgs/by-name/ju/jujutsu/package.nix @@ -11,6 +11,7 @@ openssl, darwin, libiconv, + buildPackages, nix-update-script, testers, jujutsu, @@ -64,15 +65,19 @@ rustPlatform.buildRustPackage { LIBSSH2_SYS_USE_PKG_CONFIG = "1"; }; - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - $out/bin/jj util mangen > ./jj.1 - installManPage ./jj.1 + postInstall = + let + jj = "${stdenv.hostPlatform.emulator buildPackages} $out/bin/jj"; + in + lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) '' + ${jj} util mangen > ./jj.1 + installManPage ./jj.1 - installShellCompletion --cmd jj \ - --bash <($out/bin/jj util completion bash) \ - --fish <($out/bin/jj util completion fish) \ - --zsh <($out/bin/jj util completion zsh) - ''; + installShellCompletion --cmd jj \ + --bash <(${jj} util completion bash) \ + --fish <(${jj} util completion fish) \ + --zsh <(${jj} util completion zsh) + ''; checkFlags = [ # signing tests spin up an ssh-agent and do git checkouts From c38eb8dbaf8a5dc7e69bcdc3f39cb84bbc8c707a Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 4 Sep 2024 20:51:44 +0100 Subject: [PATCH 207/298] jujutsu: run all tests --- pkgs/by-name/ju/jujutsu/package.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix index c649d17c77e1..9ac2cc158b96 100644 --- a/pkgs/by-name/ju/jujutsu/package.nix +++ b/pkgs/by-name/ju/jujutsu/package.nix @@ -11,6 +11,9 @@ openssl, darwin, libiconv, + git, + gnupg, + openssh, buildPackages, nix-update-script, testers, @@ -38,7 +41,6 @@ rustPlatform.buildRustPackage { "--bin" "jj" ]; # don't install the fake editors - useNextest = false; # nextest is the upstream integration framework, but is problematic for test skipping nativeBuildInputs = [ installShellFiles @@ -58,6 +60,12 @@ rustPlatform.buildRustPackage { libiconv ]; + nativeCheckInputs = [ + git + gnupg + openssh + ]; + env = { # Disable vendored libraries. ZSTD_SYS_USE_PKG_CONFIG = "1"; @@ -79,11 +87,6 @@ rustPlatform.buildRustPackage { --zsh <(${jj} util completion zsh) ''; - checkFlags = [ - # signing tests spin up an ssh-agent and do git checkouts - "--skip=test_ssh_signing" - ]; - passthru = { updateScript = nix-update-script { }; tests = { From b91e47c585aeee001fa41ea8b7582c6347bb8ba1 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 4 Sep 2024 20:51:44 +0100 Subject: [PATCH 208/298] jujutsu: use cargo-nextest --- pkgs/by-name/ju/jujutsu/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix index 9ac2cc158b96..d4a65adaf21f 100644 --- a/pkgs/by-name/ju/jujutsu/package.nix +++ b/pkgs/by-name/ju/jujutsu/package.nix @@ -66,6 +66,8 @@ rustPlatform.buildRustPackage { openssh ]; + useNextest = true; + env = { # Disable vendored libraries. ZSTD_SYS_USE_PKG_CONFIG = "1"; From f3c19826060547ae54f16c0dd1883079a6390325 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 4 Sep 2024 20:51:44 +0100 Subject: [PATCH 209/298] =?UTF-8?q?jujutsu:=20don=E2=80=99t=20build=20crat?= =?UTF-8?q?es=20without=20tests=20in=20`checkPhase`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/ju/jujutsu/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix index d4a65adaf21f..210c3a1d5476 100644 --- a/pkgs/by-name/ju/jujutsu/package.nix +++ b/pkgs/by-name/ju/jujutsu/package.nix @@ -68,6 +68,14 @@ rustPlatform.buildRustPackage { useNextest = true; + cargoTestFlags = [ + # Don’t build the `gen-protos` build tool when running tests. + "-p" + "jj-lib" + "-p" + "jj-cli" + ]; + env = { # Disable vendored libraries. ZSTD_SYS_USE_PKG_CONFIG = "1"; From 92d1f27b5328c2b518562e0e5579147cd2507edc Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 4 Sep 2024 20:39:55 +0100 Subject: [PATCH 210/298] jujutsu: update `cargoBuildFlags` comment The test executables are no longer installed by default, but this still picks up one of the build tools. Additionally, move the derivation attribute according to convention. --- pkgs/by-name/ju/jujutsu/package.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix index 210c3a1d5476..5069165eddfa 100644 --- a/pkgs/by-name/ju/jujutsu/package.nix +++ b/pkgs/by-name/ju/jujutsu/package.nix @@ -37,11 +37,6 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-BOO1jP1Y5CNbE97zj+tpariiBdcuxKb1wyvI7i/VpYI="; - cargoBuildFlags = [ - "--bin" - "jj" - ]; # don't install the fake editors - nativeBuildInputs = [ installShellFiles pkg-config @@ -66,6 +61,12 @@ rustPlatform.buildRustPackage { openssh ]; + cargoBuildFlags = [ + # Don’t install the `gen-protos` build tool. + "--bin" + "jj" + ]; + useNextest = true; cargoTestFlags = [ From ddae04e97ac3a1700eab9c2bae010b2e50730110 Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 5 Sep 2024 03:13:04 +0100 Subject: [PATCH 211/298] jujutsu: add emily to maintainers --- pkgs/by-name/ju/jujutsu/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix index 5069165eddfa..200f47fc18b2 100644 --- a/pkgs/by-name/ju/jujutsu/package.nix +++ b/pkgs/by-name/ju/jujutsu/package.nix @@ -116,6 +116,7 @@ rustPlatform.buildRustPackage { maintainers = with lib.maintainers; [ _0x4A6F thoughtpolice + emily ]; mainProgram = "jj"; }; From e2cf429ed63c6a105c5a40224a2fcb6f50ae6199 Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 5 Sep 2024 04:54:18 +0100 Subject: [PATCH 212/298] jujutsu: add bbigras to maintainers --- pkgs/by-name/ju/jujutsu/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix index 200f47fc18b2..dc21d2fabc88 100644 --- a/pkgs/by-name/ju/jujutsu/package.nix +++ b/pkgs/by-name/ju/jujutsu/package.nix @@ -117,6 +117,7 @@ rustPlatform.buildRustPackage { _0x4A6F thoughtpolice emily + bbigras ]; mainProgram = "jj"; }; From 659533b08fed098974cadc3e9ea1a641bb6e1f9e Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 5 Sep 2024 09:15:33 +0200 Subject: [PATCH 213/298] gcc-arm-embedded: 13.2.rel1 -> 13.3.rel1 --- .../compilers/gcc-arm-embedded/13/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/gcc-arm-embedded/13/default.nix b/pkgs/development/compilers/gcc-arm-embedded/13/default.nix index a16348dad02c..f3870205a66f 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/13/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/13/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "gcc-arm-embedded"; - version = "13.2.rel1"; + version = "13.3.rel1"; platform = { aarch64-darwin = "darwin-arm64"; @@ -20,11 +20,12 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://developer.arm.com/-/media/Files/downloads/gnu/${version}/binrel/arm-gnu-toolchain-${version}-${platform}-arm-none-eabi.tar.xz"; + # hashes obtained from location ${url}.sha256asc sha256 = { - aarch64-darwin = "39c44f8af42695b7b871df42e346c09fee670ea8dfc11f17083e296ea2b0d279"; - aarch64-linux = "8fd8b4a0a8d44ab2e195ccfbeef42223dfb3ede29d80f14dcf2183c34b8d199a"; - x86_64-darwin = "075faa4f3e8eb45e59144858202351a28706f54a6ec17eedd88c9fb9412372cc"; - x86_64-linux = "6cd1bbc1d9ae57312bcd169ae283153a9572bd6a8e4eeae2fedfbc33b115fdbb"; + aarch64-darwin = "fb6921db95d345dc7e5e487dd43b745e3a5b4d5c0c7ca4f707347148760317b4"; + aarch64-linux = "c8824bffd057afce2259f7618254e840715f33523a3d4e4294f471208f976764"; + x86_64-darwin = "1ab00742d1ed0926e6f227df39d767f8efab46f5250505c29cb81f548222d794"; + x86_64-linux = "95c011cee430e64dd6087c75c800f04b9c49832cc1000127a92a97f9c8d83af4"; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; From d6bc1b4f34fd8760016ccc259ddcbfddb123003e Mon Sep 17 00:00:00 2001 From: jokatzke Date: Thu, 5 Sep 2024 09:25:27 +0200 Subject: [PATCH 214/298] python312Packages.fastapi-cli: fix name clash with fastapi --- pkgs/development/python-modules/fastapi-cli/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/fastapi-cli/default.nix b/pkgs/development/python-modules/fastapi-cli/default.nix index b802b058df49..bfbfa0509a21 100644 --- a/pkgs/development/python-modules/fastapi-cli/default.nix +++ b/pkgs/development/python-modules/fastapi-cli/default.nix @@ -55,6 +55,10 @@ let self = buildPythonPackage rec { mainProgram = "fastapi"; license = licenses.mit; maintainers = [ ]; + # This package provides a `fastapi`-executable that is in conflict with the one from + # python3Packages.fastapi. Because this package is primarily used for the purpose of + # implementing the CLI for python3Packages.fastapi, we reduce the executable's priority + priority = 10; }; }; in self From c9fcbdf69b395de1b1bd08147ce9ead05d61fc80 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Sep 2024 09:29:05 +0200 Subject: [PATCH 215/298] python312Packages.pynslookup: init at 1.8.1 Module to do DNS lookups https://github.com/wesinator/pynslookup --- .../python-modules/pynslookup/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/pynslookup/default.nix diff --git a/pkgs/development/python-modules/pynslookup/default.nix b/pkgs/development/python-modules/pynslookup/default.nix new file mode 100644 index 000000000000..42591c750ca7 --- /dev/null +++ b/pkgs/development/python-modules/pynslookup/default.nix @@ -0,0 +1,39 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + dnspython, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "pynslookup"; + version = "1.8.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "wesinator"; + repo = "pynslookup"; + rev = "refs/tags/v${version}"; + hash = "sha256-cb8oyI8D8SzBP+tm1jGPPshJYhPegYOH0RwIH03/K/A="; + }; + + build-system = [ setuptools ]; + + dependencies = [ dnspython ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "nslookup" ]; + + meta = with lib; { + description = "Module to do DNS lookups"; + homepage = "https://github.com/wesinator/pynslookup"; + license = licenses.mpl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 53d67680d8da..dbf0006fa02d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10097,6 +10097,8 @@ self: super: with self; { pynotifier = callPackage ../development/python-modules/pynotifier { }; + pynslookup = callPackage ../development/python-modules/pynslookup { }; + pynuki = callPackage ../development/python-modules/pynuki { }; pynut2 = callPackage ../development/python-modules/pynut2 { }; From d8abce2039ba3c8a274d17b19e5722287d3b42db Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 07:46:29 +0000 Subject: [PATCH 216/298] audiobookshelf: 2.13.2 -> 2.13.3 --- pkgs/by-name/au/audiobookshelf/source.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/au/audiobookshelf/source.json b/pkgs/by-name/au/audiobookshelf/source.json index 6c761aac6a5a..7e19554b72a8 100644 --- a/pkgs/by-name/au/audiobookshelf/source.json +++ b/pkgs/by-name/au/audiobookshelf/source.json @@ -1,9 +1,9 @@ { "owner": "advplyr", "repo": "audiobookshelf", - "rev": "48f232790a5026ac886564ef57660a338a168187", - "hash": "sha256-2/lUByeWMZlxk7i+mvzBuxlxD97C+JEtmf/ajht5AOs=", - "version": "2.13.2", - "depsHash": "sha256-kU5Nrhy6AePwD2/kmvTXvrvGUH8uz3qm3ZvD3kC9EmE=", - "clientDepsHash": "sha256-1haujBoC9KyusE52HeepOcvmb6v7EG5XWD4dq1wPfe4=" + "rev": "24923c0009446e2db26ec366b25dd38deb2e2573", + "hash": "sha256-afNz4dTEr/6STn6cqSHxugn5ofa0jY4HvUnckJabxdo=", + "version": "2.13.3", + "depsHash": "sha256-fRz4qUxd8lZODQikP011FtvyFCz4fehESUfBmSBLwtA=", + "clientDepsHash": "sha256-VGbwiCuDjA1rtUpLw7gO+Xb5/D09evf/Jrb93H0QCH8=" } From 296c98a6dccc40a70a15f6dd71b717082c9a36f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 07:54:33 +0000 Subject: [PATCH 217/298] plasmusic-toolbar: 1.5.0 -> 1.6.0 --- pkgs/by-name/pl/plasmusic-toolbar/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pl/plasmusic-toolbar/package.nix b/pkgs/by-name/pl/plasmusic-toolbar/package.nix index 73afe152d627..28c991a76376 100644 --- a/pkgs/by-name/pl/plasmusic-toolbar/package.nix +++ b/pkgs/by-name/pl/plasmusic-toolbar/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "plasmusic-toolbar"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "ccatterina"; repo = "plasmusic-toolbar"; rev = "v${finalAttrs.version}"; - hash = "sha256-22eSrvigJHmwVB396APkDtiJjavpijUMuZ4mqQGVwf4="; + hash = "sha256-tZ2xcoGZp2GWoKd4XjO2K4he3tKBHgxi0PdqY+5ULn0="; }; installPhase = '' From 6ccc6bf4d2a6fac38236f7453149e402e443721e Mon Sep 17 00:00:00 2001 From: r-vdp Date: Wed, 4 Sep 2024 12:17:39 +0200 Subject: [PATCH 218/298] initrd: emit a warning when tmpfiles config is created manually --- nixos/modules/system/boot/systemd/tmpfiles.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/nixos/modules/system/boot/systemd/tmpfiles.nix b/nixos/modules/system/boot/systemd/tmpfiles.nix index f609da314c86..44c72f2768cc 100644 --- a/nixos/modules/system/boot/systemd/tmpfiles.nix +++ b/nixos/modules/system/boot/systemd/tmpfiles.nix @@ -163,6 +163,20 @@ in }; config = { + warnings = + let + paths = lib.filter (path: + path != null && lib.hasPrefix "/etc/tmpfiles.d/" path + ) (map (path: path.target) config.boot.initrd.systemd.storePaths); + in + lib.optional (lib.length paths > 0) (lib.concatStringsSep " " [ + "Files inside /etc/tmpfiles.d in the initrd need to be created with" + "boot.initrd.systemd.tmpfiles.settings." + "Creating them by hand using boot.initrd.systemd.contents or" + "boot.initrd.systemd.storePaths will lead to errors in the future." + "Found these problematic files: ${lib.concatStringsSep ", " paths}" + ]); + systemd.additionalUpstreamSystemUnits = [ "systemd-tmpfiles-clean.service" "systemd-tmpfiles-clean.timer" From 64da401049acb33e3d2001ac968a7c335c080a3c Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 2 Sep 2024 21:13:49 +0300 Subject: [PATCH 219/298] nixos/orca: init very simple module --- nixos/modules/module-list.nix | 1 + nixos/modules/services/accessibility/orca.nix | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 nixos/modules/services/accessibility/orca.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 59ff758bde82..f94b1368ac69 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -363,6 +363,7 @@ ./security/systemd-confinement.nix ./security/tpm2.nix ./security/wrappers/default.nix + ./services/accessibility/orca.nix ./services/accessibility/speechd.nix ./services/admin/docuum.nix ./services/admin/meshcentral.nix diff --git a/nixos/modules/services/accessibility/orca.nix b/nixos/modules/services/accessibility/orca.nix new file mode 100644 index 000000000000..4487afba103c --- /dev/null +++ b/nixos/modules/services/accessibility/orca.nix @@ -0,0 +1,25 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.services.orca; + inherit (lib) + mkEnableOption + mkIf + mkPackageOption + ; +in +{ + options.services.orca = { + enable = mkEnableOption "Orca screen reader"; + package = mkPackageOption pkgs "orca" { }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + services.speechd.enable = true; + }; +} From 0f03350dc943ff678662064292418c8deebd4e6c Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 2 Sep 2024 21:14:19 +0300 Subject: [PATCH 220/298] nixos/plasma6: enable Orca by default --- nixos/modules/services/desktop-managers/plasma6.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix index 3b36d3a905d0..c165c0b47eed 100644 --- a/nixos/modules/services/desktop-managers/plasma6.nix +++ b/nixos/modules/services/desktop-managers/plasma6.nix @@ -245,6 +245,9 @@ in { xdg.portal.configPackages = mkDefault [kdePackages.xdg-desktop-portal-kde]; services.pipewire.enable = mkDefault true; + # Enable screen reader by default + services.orca.enable = mkDefault true; + services.displayManager = { sessionPackages = [kdePackages.plasma-workspace]; defaultSession = mkDefault "plasma"; From cda3c82d92197513fcdb61a8ba725cf595703c46 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 2 Sep 2024 21:14:26 +0300 Subject: [PATCH 221/298] nixos/plasma5: enable Orca by default --- nixos/modules/services/x11/desktop-managers/plasma5.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 1893eb5d7f9a..90a1596d57e6 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -357,6 +357,9 @@ in pkgs.media-player-info ]; + # Enable screen reader by default + services.orca.enable = mkDefault true; + services.displayManager.sddm = { theme = mkDefault "breeze"; }; From 14efd10316e1c15a1139f8d22f898b7a0f797930 Mon Sep 17 00:00:00 2001 From: codgician <15964984+codgician@users.noreply.github.com> Date: Thu, 5 Sep 2024 16:00:56 +0800 Subject: [PATCH 222/298] prl-tools: init Rosetta support (#334661) prl-tools: install prlbinfmtconfig --- pkgs/os-specific/linux/prl-tools/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index 664e499cd1d4..9b2d6778f925 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -142,6 +142,7 @@ stdenv.mkDerivation (finalAttrs: { done install -Dm755 ../../tools/prlfsmountd.sh $out/sbin/prlfsmountd + install -Dm755 ../../tools/prlbinfmtconfig.sh $out/sbin/prlbinfmtconfig for f in $out/bin/* $out/sbin/*; do wrapProgram $f \ --prefix LD_LIBRARY_PATH ':' "${libPath}" \ From 38d73e0c07d3460ea324b01610c4a350129fb56d Mon Sep 17 00:00:00 2001 From: r-vdp Date: Wed, 4 Sep 2024 09:57:27 +0200 Subject: [PATCH 223/298] auditd: add a dependency on systemd-tmpfiles-setup This is needed so that: - users have been created (when using systemd-sysusers or userborn) - /run and /var/run exist --- nixos/modules/security/auditd.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/nixos/modules/security/auditd.nix b/nixos/modules/security/auditd.nix index 30f0a049d8fd..e9ffecdfbea5 100644 --- a/nixos/modules/security/auditd.nix +++ b/nixos/modules/security/auditd.nix @@ -15,8 +15,15 @@ systemd.services.auditd = { description = "Linux Audit daemon"; - wantedBy = [ "basic.target" ]; - before = [ "shutdown.target" ]; + wantedBy = [ "sysinit.target" ]; + after = [ + "local-fs.target" + "systemd-tmpfiles-setup.service" + ]; + before = [ + "sysinit.target" + "shutdown.target" + ]; conflicts = [ "shutdown.target" ]; unitConfig = { From 455eeff913ec02b4111762580093a195befdf670 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 08:08:24 +0000 Subject: [PATCH 224/298] anytype: 0.42.5 -> 0.42.6 --- pkgs/by-name/an/anytype/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix index 619ca4adefd5..65b9fd1e1f00 100644 --- a/pkgs/by-name/an/anytype/package.nix +++ b/pkgs/by-name/an/anytype/package.nix @@ -2,11 +2,11 @@ let pname = "anytype"; - version = "0.42.5"; + version = "0.42.6"; name = "Anytype-${version}"; src = fetchurl { url = "https://github.com/anyproto/anytype-ts/releases/download/v${version}/${name}.AppImage"; - hash = "sha256-43g/CdmmQTSxk7OTZMPIiWIYJjCG2zJNM9kaAq1jOqE="; + hash = "sha256-ubYk3CsdaUW4AtMYskmFunznUAVcBdbJh4dyGgSs1Io="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in appimageTools.wrapType2 { From f6081f46dbf7f878f0258e67ad2e79c7b2d5fb82 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 4 Sep 2024 23:42:03 +0200 Subject: [PATCH 225/298] sink-rotate: fix cross --- pkgs/by-name/si/sink-rotate/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/si/sink-rotate/package.nix b/pkgs/by-name/si/sink-rotate/package.nix index 44fd2a7dc12d..9e61d1ca19b3 100644 --- a/pkgs/by-name/si/sink-rotate/package.nix +++ b/pkgs/by-name/si/sink-rotate/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-MPeyPTkxpi6iw/BT5m4S7jVBD0c2zG2rsv+UZWQxpUU="; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postFixup = '' wrapProgram $out/bin/sink-rotate \ From 827cc913f1d883d8dbc0f98827cb2d5192de3bfd Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 5 Sep 2024 09:11:42 +0100 Subject: [PATCH 226/298] google-chrome: fix makeWrapper invocation --- pkgs/by-name/go/google-chrome/package.nix | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index 98692e0868d3..aa4546eafa07 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -236,6 +236,7 @@ let mv "$icon_file" "$logo_output_path/google-$appname.png" done + # "--simulate-outdated-no-au" disables auto updates and browser outdated popup makeWrapper "$out/share/google/$appname/google-$appname" "$exe" \ --prefix LD_LIBRARY_PATH : "$rpath" \ --prefix PATH : "$binpath" \ @@ -243,13 +244,8 @@ let --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addDriverRunpath.driverLink}/share" \ --set CHROME_WRAPPER "google-chrome-$dist" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ - --add-flags ${ - lib.concatStringsSep " " [ - (lib.escapeShellArg commandLineArgs) - # Disables auto updates and browser outdated popup - "--simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT'" - ] - } + --add-flags "--simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT'" \ + --add-flags ${lib.escapeShellArg commandLineArgs} for elf in $out/share/google/$appname/{chrome,chrome-sandbox,chrome_crashpad_handler}; do patchelf --set-rpath $rpath $elf @@ -288,15 +284,11 @@ let cp -r *.app $out/Applications mkdir -p $out/bin - makeWrapper $out/Applications/Google\ Chrome.app/Contents/MacOS/Google\ Chrome $out/bin/google-chrome-stable \ - --add-flags ${ - lib.concatStringsSep " " [ - (lib.escapeShellArg commandLineArgs) - # Disables auto updates and browser outdated popup - "--simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT'" - ] - } + # "--simulate-outdated-no-au" disables auto updates and browser outdated popup + makeWrapper $out/Applications/Google\ Chrome.app/Contents/MacOS/Google\ Chrome $out/bin/google-chrome-stable \ + --add-flags "--simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT'" \ + --add-flags ${lib.escapeShellArg commandLineArgs} runHook postInstall ''; }); From f8525d8a8e3e63fc98f7fa9532de713a488f1c14 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Thu, 5 Sep 2024 10:13:11 +0200 Subject: [PATCH 227/298] tmpi: fix cross eval --- pkgs/by-name/tm/tmpi/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/tm/tmpi/package.nix b/pkgs/by-name/tm/tmpi/package.nix index f61af72dc0f2..3282d9114de2 100644 --- a/pkgs/by-name/tm/tmpi/package.nix +++ b/pkgs/by-name/tm/tmpi/package.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ mpi mpich reptyr tmux ]; - buildInputs = [ autoconf makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ autoconf ]; installPhase = '' runHook preInstall From 2852a1839931e32378183070953942c87d19f45e Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Thu, 5 Sep 2024 10:13:35 +0200 Subject: [PATCH 228/298] tmpi: remove redundant input --- pkgs/by-name/tm/tmpi/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/tm/tmpi/package.nix b/pkgs/by-name/tm/tmpi/package.nix index 3282d9114de2..f745ce52e748 100644 --- a/pkgs/by-name/tm/tmpi/package.nix +++ b/pkgs/by-name/tm/tmpi/package.nix @@ -5,7 +5,6 @@ , mpich , tmux , reptyr -, autoconf , makeWrapper }: @@ -23,7 +22,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ mpi mpich reptyr tmux ]; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ autoconf ]; installPhase = '' runHook preInstall From 2495ff4bfa35bd99a3096f766d06cfc9f591708b Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Mon, 13 May 2024 10:27:07 +0200 Subject: [PATCH 229/298] clementine: unstable-2022-04-11 -> 1.4.rc2-unstable-2024-05-12 --- pkgs/applications/audio/clementine/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 75394a4afcfd..c0f7c3cbc82a 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -47,15 +47,16 @@ let withMTP = config.clementine.mtp or true; withCD = config.clementine.cd or true; withCloud = config.clementine.cloud or true; -in mkDerivation { +in +mkDerivation { pname = "clementine"; - version = "unstable-2022-04-11"; + version = "1.4.rc2-unstable-2024-05-12"; src = fetchFromGitHub { owner = "clementine-player"; repo = "Clementine"; - rev = "250024e117fbe5fae7c62b9c8e655d66412a6ed7"; - sha256 = "06fcbs3wig3mh711iypyj49qm5246f7qhvgvv8brqfrd8cqyh6qf"; + rev = "7607ddcb96e79d373c4b60d9de21f3315719c7d8"; + sha256 = "sha256-yOG/Je6N8YEsu5AOtxOFgDl3iqb97assYMZYMSwQqqk="; }; nativeBuildInputs = [ @@ -117,6 +118,7 @@ in mkDerivation { ''; cmakeFlags = [ + "-DFORCE_GIT_REVISION=1.3.1" "-DUSE_SYSTEM_PROJECTM=ON" "-DSPOTIFY_BLOB=OFF" ]; From 737d1ffb22157cb29ca62ab92c72380adf8b6502 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Thu, 22 Aug 2024 00:34:48 +0200 Subject: [PATCH 230/298] netdata: 1.46.1 -> 1.47.0 --- nixos/modules/services/monitoring/netdata.nix | 8 --- pkgs/tools/system/netdata/default.nix | 53 +++++++++---------- .../system/netdata/ndsudo-fix-path.patch | 7 +-- 3 files changed, 30 insertions(+), 38 deletions(-) diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix index c47da2cc075d..0929b0ab5171 100644 --- a/nixos/modules/services/monitoring/netdata.nix +++ b/nixos/modules/services/monitoring/netdata.nix @@ -374,14 +374,6 @@ in { permissions = "u+rx,g+x,o-rwx"; }; - "logs-management.plugin" = { - source = "${cfg.package}/libexec/netdata/plugins.d/logs-management.plugin.org"; - capabilities = "cap_dac_read_search,cap_syslog+ep"; - owner = cfg.user; - group = cfg.group; - permissions = "u+rx,g+x,o-rwx"; - }; - "slabinfo.plugin" = { source = "${cfg.package}/libexec/netdata/plugins.d/slabinfo.plugin.org"; capabilities = "cap_dac_override+ep"; diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 214fed86329f..84050ab400dc 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -20,7 +20,7 @@ }: stdenv.mkDerivation rec { - version = "1.46.1"; + version = "1.47.0"; pname = "netdata"; src = fetchFromGitHub { @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { repo = "netdata"; rev = "v${version}"; hash = if withCloudUi - then "sha256-tFjczhJ7bIEUDZx3MxYBu4tGkJhoQn5V79D4sLV2o8U=" + then "sha256-eMapy4HQaEblDfZt2uVSfBWRlkstX7TxZDBgSv5bW/I=" # we delete the v2 GUI after fetching - else "sha256-uW3jRiJjFIFSfmmavM3KVF985F8nMKa+lQAgNBZvKyE="; + else "sha256-Gx7u3Owh/fVAnSw91xfdcmyx4m+bvQAvDaUxzXQ36/0="; fetchSubmodules = true; # Remove v2 dashboard distributed under NCUL1. Make sure an empty @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config makeWrapper go ninja ] ++ lib.optionals withCups [ cups.dev ]; # bash is only used to rewrite shebangs - buildInputs = [ bash curl jemalloc json_c libuv zlib libyaml ] + buildInputs = [ bash curl jemalloc json_c libuv zlib libyaml lm_sensors ] ++ lib.optionals stdenv.isDarwin [ CoreFoundation IOKit libossp_uuid ] ++ lib.optionals (!stdenv.isDarwin) [ libcap libuuid ] ++ lib.optionals withCups [ cups ] @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { ./dashboard-v2-removal.patch ]; - # Guard against unused buld-time development inputs in closure. Without + # Guard against unused build-time development inputs in closure. Without # the ./skip-CONFIGURE_COMMAND.patch patch the closure retains inputs up # to bootstrap tools: # https://github.com/NixOS/nixpkgs/pull/175719 @@ -94,8 +94,6 @@ stdenv.mkDerivation rec { $out/libexec/netdata/plugins.d/slabinfo.plugin.org mv $out/libexec/netdata/plugins.d/debugfs.plugin \ $out/libexec/netdata/plugins.d/debugfs.plugin.org - mv $out/libexec/netdata/plugins.d/logs-management.plugin \ - $out/libexec/netdata/plugins.d/logs-management.plugin.org ${lib.optionalString withSystemdJournal '' mv $out/libexec/netdata/plugins.d/systemd-journal.plugin \ $out/libexec/netdata/plugins.d/systemd-journal.plugin.org @@ -115,30 +113,31 @@ stdenv.mkDerivation rec { ''; preConfigure = lib.optionalString (!stdenv.isDarwin) '' - substituteInPlace src/collectors/python.d.plugin/python_modules/third_party/lm_sensors.py \ - --replace-fail 'ctypes.util.find_library("sensors")' '"${lm_sensors.out}/lib/libsensors${stdenv.hostPlatform.extensions.sharedLibrary}"' - '' + '' export GOCACHE=$TMPDIR/go-cache export GOPATH=$TMPDIR/go - export GOPROXY=file://${passthru.netdata-go-modules} export GOSUMDB=off + substituteInPlace packaging/cmake/Modules/NetdataGoTools.cmake \ + --replace-fail \ + 'GOPROXY=https://proxy.golang.org' \ + 'GOPROXY=file://${passthru.netdata-go-modules}' + # Prevent the path to be caught into the Nix store path. substituteInPlace CMakeLists.txt \ - --replace-fail 'set(CACHE_DIR "''${CMAKE_INSTALL_PREFIX}/var/cache/netdata")' 'set(CACHE_DIR "/var/cache/netdata")' \ - --replace-fail 'set(CONFIG_DIR "''${CMAKE_INSTALL_PREFIX}/etc/netdata")' 'set(CONFIG_DIR "/etc/netdata")' \ - --replace-fail 'set(LIBCONFIG_DIR "''${CMAKE_INSTALL_PREFIX}/usr/lib/netdata/conf.d")' 'set(LIBCONFIG_DIR "${placeholder "out"}/share/netdata/conf.d")' \ - --replace-fail 'set(LOG_DIR "''${CMAKE_INSTALL_PREFIX}/var/log/netdata")' 'set(LOG_DIR "/var/log/netdata")' \ - --replace-fail 'set(PLUGINS_DIR "''${CMAKE_INSTALL_PREFIX}/usr/libexec/netdata/plugins.d")' 'set(PLUGINS_DIR "${placeholder "out"}/libexec/netdata/plugins.d")' \ - --replace-fail 'set(VARLIB_DIR "''${CMAKE_INSTALL_PREFIX}/var/lib/netdata")' 'set(VARLIB_DIR "/var/lib/netdata")' \ - --replace-fail 'set(pkglibexecdir_POST "''${CMAKE_INSTALL_PREFIX}/usr/libexec/netdata")' 'set(pkglibexecdir_POST "${placeholder "out"}/libexec/netdata")' \ - --replace-fail 'set(localstatedir_POST "''${CMAKE_INSTALL_PREFIX}/var")' 'set(localstatedir_POST "/var")' \ - --replace-fail 'set(sbindir_POST "''${CMAKE_INSTALL_PREFIX}/usr/sbin")' 'set(sbindir_POST "${placeholder "out"}/bin")' \ - --replace-fail 'set(configdir_POST "''${CMAKE_INSTALL_PREFIX}/etc/netdata")' 'set(configdir_POST "/etc/netdata")' \ - --replace-fail 'set(libconfigdir_POST "''${CMAKE_INSTALL_PREFIX}/usr/lib/netdata/conf.d")' 'set(libconfigdir_POST "${placeholder "out"}/share/netdata/conf.d")' \ - --replace-fail 'set(cachedir_POST "''${CMAKE_INSTALL_PREFIX}/var/cache/netdata")' 'set(libconfigdir_POST "/var/cache/netdata")' \ - --replace-fail 'set(registrydir_POST "''${CMAKE_INSTALL_PREFIX}/var/lib/netdata/registry")' 'set(registrydir_POST "/var/lib/netdata/registry")' \ - --replace-fail 'set(varlibdir_POST "''${CMAKE_INSTALL_PREFIX}/var/lib/netdata")' 'set(varlibdir_POST "/var/lib/netdata")' + --replace-fail 'set(CACHE_DIR "''${NETDATA_RUNTIME_PREFIX}/var/cache/netdata")' 'set(CACHE_DIR "/var/cache/netdata")' \ + --replace-fail 'set(CONFIG_DIR "''${NETDATA_RUNTIME_PREFIX}/etc/netdata")' 'set(CONFIG_DIR "/etc/netdata")' \ + --replace-fail 'set(LIBCONFIG_DIR "''${NETDATA_RUNTIME_PREFIX}/usr/lib/netdata/conf.d")' 'set(LIBCONFIG_DIR "${placeholder "out"}/share/netdata/conf.d")' \ + --replace-fail 'set(LOG_DIR "''${NETDATA_RUNTIME_PREFIX}/var/log/netdata")' 'set(LOG_DIR "/var/log/netdata")' \ + --replace-fail 'set(PLUGINS_DIR "''${NETDATA_RUNTIME_PREFIX}/usr/libexec/netdata/plugins.d")' 'set(PLUGINS_DIR "${placeholder "out"}/libexec/netdata/plugins.d")' \ + --replace-fail 'set(VARLIB_DIR "''${NETDATA_RUNTIME_PREFIX}/var/lib/netdata")' 'set(VARLIB_DIR "/var/lib/netdata")' \ + --replace-fail 'set(pkglibexecdir_POST "''${NETDATA_RUNTIME_PREFIX}/usr/libexec/netdata")' 'set(pkglibexecdir_POST "${placeholder "out"}/libexec/netdata")' \ + --replace-fail 'set(localstatedir_POST "''${NETDATA_RUNTIME_PREFIX}/var")' 'set(localstatedir_POST "/var")' \ + --replace-fail 'set(sbindir_POST "''${NETDATA_RUNTIME_PREFIX}/''${BINDIR}")' 'set(sbindir_POST "${placeholder "out"}/bin")' \ + --replace-fail 'set(configdir_POST "''${NETDATA_RUNTIME_PREFIX}/etc/netdata")' 'set(configdir_POST "/etc/netdata")' \ + --replace-fail 'set(libconfigdir_POST "''${NETDATA_RUNTIME_PREFIX}/usr/lib/netdata/conf.d")' 'set(libconfigdir_POST "${placeholder "out"}/share/netdata/conf.d")' \ + --replace-fail 'set(cachedir_POST "''${NETDATA_RUNTIME_PREFIX}/var/cache/netdata")' 'set(libconfigdir_POST "/var/cache/netdata")' \ + --replace-fail 'set(registrydir_POST "''${NETDATA_RUNTIME_PREFIX}/var/lib/netdata/registry")' 'set(registrydir_POST "/var/lib/netdata/registry")' \ + --replace-fail 'set(varlibdir_POST "''${NETDATA_RUNTIME_PREFIX}/var/lib/netdata")' 'set(varlibdir_POST "/var/lib/netdata")' ''; cmakeFlags = [ @@ -179,9 +178,9 @@ stdenv.mkDerivation rec { pname = "netdata-go-plugins"; inherit version src; - sourceRoot = "${src.name}/src/go/collectors/go.d.plugin"; + sourceRoot = "${src.name}/src/go/plugin/go.d"; - vendorHash = "sha256-fK6pboXgJom77iakb+CJvNuweQjLIrpS7suWRNY/KM4="; + vendorHash = "sha256-NZ1tg+lvXNgypqmjjb5f7dHH6DIA9VOa4PMM4eq11n0="; doCheck = false; proxyVendor = true; diff --git a/pkgs/tools/system/netdata/ndsudo-fix-path.patch b/pkgs/tools/system/netdata/ndsudo-fix-path.patch index 04087e54a00a..0ec9a63231f0 100644 --- a/pkgs/tools/system/netdata/ndsudo-fix-path.patch +++ b/pkgs/tools/system/netdata/ndsudo-fix-path.patch @@ -2,7 +2,7 @@ # https://github.com/netdata/netdata/security/advisories/GHSA-pmhq-4cxq-wj93 diff --git a/src/collectors/plugins.d/ndsudo.c b/src/collectors/plugins.d/ndsudo.c -index 8b4d76f46..68fa52d38 100644 +index d53ca9f28..b42a121bf 100644 --- a/src/collectors/plugins.d/ndsudo.c +++ b/src/collectors/plugins.d/ndsudo.c @@ -357,9 +357,6 @@ int main(int argc, char *argv[]) { @@ -12,5 +12,6 @@ index 8b4d76f46..68fa52d38 100644 - char new_path[] = "PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"; - putenv(new_path); - - bool found = false; - char filename[FILENAME_MAX]; \ No newline at end of file + setuid(0); + setgid(0); + setegid(0); From 674712809c01ad17421f6446433b4ed4cd6f3989 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 4 Sep 2024 23:51:37 +0300 Subject: [PATCH 231/298] python312Packages.numpy_2: add doronbehar to maintainers --- pkgs/development/python-modules/numpy/2.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/numpy/2.nix b/pkgs/development/python-modules/numpy/2.nix index 4164b7c80a93..9029111f9e51 100644 --- a/pkgs/development/python-modules/numpy/2.nix +++ b/pkgs/development/python-modules/numpy/2.nix @@ -176,5 +176,6 @@ buildPythonPackage rec { description = "Scientific tools for Python"; homepage = "https://numpy.org/"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ doronbehar ]; }; } From bd46e7f067253f2d272aea49eec71dd27905095f Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 4 Sep 2024 23:55:14 +0300 Subject: [PATCH 232/298] python312Packages.numpy_2: 2.1.0 -> 2.1.1 Changelog: https://github.com/numpy/numpy/releases/tag/v2.1.1 --- pkgs/development/python-modules/numpy/2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numpy/2.nix b/pkgs/development/python-modules/numpy/2.nix index 9029111f9e51..af9549ee0874 100644 --- a/pkgs/development/python-modules/numpy/2.nix +++ b/pkgs/development/python-modules/numpy/2.nix @@ -58,7 +58,7 @@ let in buildPythonPackage rec { pname = "numpy"; - version = "2.1.0"; + version = "2.1.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -66,7 +66,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-fckNoAgffh2knsTjmO3mqOnMT16+X54GtEPtiJ7pqqI="; + hash = "sha256-0M99VbEFE4eAdAWziY76+oYpl7TLqKpdvmV755Sv6v0="; }; patches = lib.optionals python.hasDistutilsCxxPatch [ From 27e688054ebb810679309eb82f0b9f7198d81607 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Fri, 30 Aug 2024 09:49:36 +0200 Subject: [PATCH 233/298] runiq: 2.0.0 -> 2.0.0-unstable-2024-08-19 Build from git to allow compiling with rust 1.80, until there is an upstream release containing a642926f6ec09d4faeebebb563d4aed89e0d36fb. --- pkgs/tools/text/runiq/Cargo.lock | 1685 +++++++++++++++++++++++++++++ pkgs/tools/text/runiq/default.nix | 18 +- 2 files changed, 1697 insertions(+), 6 deletions(-) create mode 100644 pkgs/tools/text/runiq/Cargo.lock diff --git a/pkgs/tools/text/runiq/Cargo.lock b/pkgs/tools/text/runiq/Cargo.lock new file mode 100644 index 000000000000..5a406d80ed55 --- /dev/null +++ b/pkgs/tools/text/runiq/Cargo.lock @@ -0,0 +1,1685 @@ +# 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", + "getrandom", + "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 = "autocfg" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" +dependencies = [ + "autocfg 1.3.0", +] + +[[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 = "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 = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bson" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8a88e82b9106923b5c4d6edfca9e7db958d4e98a478ec115022e81b9b38e2c8" +dependencies = [ + "ahash", + "base64", + "bitvec", + "hex", + "indexmap", + "js-sys", + "once_cell", + "rand 0.8.5", + "serde", + "serde_bytes", + "serde_json", + "time", + "uuid", +] + +[[package]] +name = "bstr" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "bytelines" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1297656b3c221f5251560da47ce530d981345d3dabe822067c18ecb36e67aacb" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytesize" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" + +[[package]] +name = "cc" +version = "1.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48" +dependencies = [ + "shlex", +] + +[[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", + "num-traits", + "windows-targets", +] + +[[package]] +name = "chrono-tz" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93698b29de5e97ad0ae26447b344c482a7284c737d9ddc5f9e52b74a336671bb" +dependencies = [ + "chrono", + "chrono-tz-build", + "phf", +] + +[[package]] +name = "chrono-tz-build" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c088aee841df9c3041febbb73934cfc39708749bf96dc827e3359cd39ef11b1" +dependencies = [ + "parse-zoneinfo", + "phf", + "phf_codegen", +] + +[[package]] +name = "clap" +version = "4.5.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.75", +] + +[[package]] +name = "clap_lex" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" + +[[package]] +name = "cli-table" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b53f9241f288a7b12c56565f04aaeaeeab6b8923d42d99255d4ca428b4d97f89" +dependencies = [ + "cli-table-derive", + "csv", + "termcolor", + "unicode-width", +] + +[[package]] +name = "cli-table-derive" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e83a93253aaae7c74eb7428ce4faa6e219ba94886908048888701819f82fb94" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "cloudabi" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "colorchoice" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "cpufeatures" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" +dependencies = [ + "libc", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[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 = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "deunicode" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "339544cc9e2c4dc3fc7149fd630c5f22263a4fdf18a98afd0075784968b5cf00" + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "failure" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" +dependencies = [ + "backtrace", + "failure_derive", +] + +[[package]] +name = "failure_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "synstructure", +] + +[[package]] +name = "fake" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7e5932b40ab216d69bca7d228fa0bf754c44b70ed97fcc70fdc1b66d6214f51" +dependencies = [ + "rand 0.6.5", +] + +[[package]] +name = "format_num" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14ac05eb8d2eb4ed1eeff847911deae077b0b53332465de9d6a26b0ea9961bc8" +dependencies = [ + "regex", +] + +[[package]] +name = "fuchsia-cprng" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" + +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[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 = "gimli" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" + +[[package]] +name = "globset" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +dependencies = [ + "aho-corasick", + "bstr", + "log", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "globwalk" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757" +dependencies = [ + "bitflags 2.6.0", + "ignore", + "walkdir", +] + +[[package]] +name = "growable-bloom-filter" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c669fa03050eb3445343f215d62fc1ab831e8098bc9a55f26e9724faff11075c" +dependencies = [ + "serde", + "serde_bytes", + "serde_derive", + "xxhash-rust", +] + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "humansize" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6cb51c9a029ddc91b07a787f1d86b53ccfa49b0e86688c946ebe8d3555685dd7" +dependencies = [ + "libm", +] + +[[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 = "identity-hash" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfdd7caa900436d8f13b2346fe10257e0c05c1f1f9e351f4f5d57c03bd5f45da" + +[[package]] +name = "ignore" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" +dependencies = [ + "crossbeam-deque", + "globset", + "log", + "memchr", + "regex-automata", + "same-file", + "walkdir", + "winapi-util", +] + +[[package]] +name = "indexmap" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jen" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6dbf07da3aeb1810d042d6b06d3fa1f940d9c540e50eaf50266d3e57c8f4049" +dependencies = [ + "bson", + "clap", + "failure", + "fake", + "nanoid", + "rand 0.8.5", + "serde", + "serde_json", + "tera", + "uuid", +] + +[[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 = "libc" +version = "0.2.158" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "miniz_oxide" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +dependencies = [ + "adler", +] + +[[package]] +name = "nanoid" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ffa00dec017b5b1a8b7cf5e2c008bfda1aa7e0697ac1508b491fdf2622fb4d8" +dependencies = [ + "rand 0.8.5", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg 1.3.0", +] + +[[package]] +name = "object" +version = "0.36.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "parse-zoneinfo" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f2a05b18d44e2957b88f96ba460715e295bc1d7510468a2f3d3b44535d26c24" +dependencies = [ + "regex", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pest" +version = "2.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" +dependencies = [ + "memchr", + "thiserror", + "ucd-trie", +] + +[[package]] +name = "pest_derive" +version = "2.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a" +dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn 2.0.75", +] + +[[package]] +name = "pest_meta" +version = "2.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f" +dependencies = [ + "once_cell", + "pest", + "sha2", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_shared", +] + +[[package]] +name = "phf_codegen" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" +dependencies = [ + "phf_generator", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand 0.8.5", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] + +[[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.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + +[[package]] +name = "rand" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" +dependencies = [ + "autocfg 0.1.8", + "libc", + "rand_chacha 0.1.1", + "rand_core 0.4.2", + "rand_hc", + "rand_isaac", + "rand_jitter", + "rand_os", + "rand_pcg", + "rand_xorshift", + "winapi", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" +dependencies = [ + "autocfg 0.1.8", + "rand_core 0.3.1", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_core" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" +dependencies = [ + "rand_core 0.4.2", +] + +[[package]] +name = "rand_core" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rand_hc" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "rand_isaac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "rand_jitter" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" +dependencies = [ + "libc", + "rand_core 0.4.2", + "winapi", +] + +[[package]] +name = "rand_os" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" +dependencies = [ + "cloudabi", + "fuchsia-cprng", + "libc", + "rand_core 0.4.2", + "rdrand", + "winapi", +] + +[[package]] +name = "rand_pcg" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" +dependencies = [ + "autocfg 0.1.8", + "rand_core 0.4.2", +] + +[[package]] +name = "rand_xorshift" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "rdrand" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" +dependencies = [ + "rand_core 0.3.1", +] + +[[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 = "runiq" +version = "2.0.0" +dependencies = [ + "bytelines", + "bytesize", + "clap", + "cli-table", + "format_num", + "growable-bloom-filter", + "identity-hash", + "jen", + "strum", + "strum_macros", + "xxhash-rust", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustversion" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "serde" +version = "1.0.208" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_bytes" +version = "0.11.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_derive" +version = "1.0.208" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.75", +] + +[[package]] +name = "serde_json" +version = "1.0.125" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" +dependencies = [ + "indexmap", + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "slug" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "882a80f72ee45de3cc9a5afeb2da0331d58df69e4e7d8eeb5d3c7784ae67e724" +dependencies = [ + "deunicode", + "wasm-bindgen", +] + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "strum" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" + +[[package]] +name = "strum_macros" +version = "0.25.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.75", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "synstructure" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "unicode-xid", +] + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "tera" +version = "1.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab9d851b45e865f178319da0abdbfe6acbc4328759ff18dafc3a41c16b4cd2ee" +dependencies = [ + "chrono", + "chrono-tz", + "globwalk", + "humansize", + "lazy_static", + "percent-encoding", + "pest", + "pest_derive", + "rand 0.8.5", + "regex", + "serde", + "serde_json", + "slug", + "unic-segment", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[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 2.0.75", +] + +[[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 = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "ucd-trie" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" + +[[package]] +name = "unic-char-property" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" +dependencies = [ + "unic-char-range", +] + +[[package]] +name = "unic-char-range" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" + +[[package]] +name = "unic-common" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" + +[[package]] +name = "unic-segment" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4ed5d26be57f84f176157270c112ef57b86debac9cd21daaabbe56db0f88f23" +dependencies = [ + "unic-ucd-segment", +] + +[[package]] +name = "unic-ucd-segment" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2079c122a62205b421f499da10f3ee0f7697f012f55b675e002483c73ea34700" +dependencies = [ + "unic-char-property", + "unic-char-range", + "unic-ucd-version", +] + +[[package]] +name = "unic-ucd-version" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" +dependencies = [ + "unic-common", +] + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-width" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[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 = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[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 2.0.75", + "wasm-bindgen-shared", +] + +[[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 2.0.75", + "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 = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys 0.59.0", +] + +[[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", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[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.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[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.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[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.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + +[[package]] +name = "xxhash-rust" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984" + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "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 2.0.75", +] diff --git a/pkgs/tools/text/runiq/default.nix b/pkgs/tools/text/runiq/default.nix index 022667798109..439dcb0715d6 100644 --- a/pkgs/tools/text/runiq/default.nix +++ b/pkgs/tools/text/runiq/default.nix @@ -1,15 +1,21 @@ -{ lib, rustPlatform, fetchCrate, stdenv, darwin }: +{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin }: rustPlatform.buildRustPackage rec { pname = "runiq"; - version = "2.0.0"; + version = "2.0.0-unstable-2024-08-19"; - src = fetchCrate { - inherit pname version; - hash = "sha256-qcgPuJOpK2fCsHAgzoIKF7upb9B3ySIZkpu9xf4JnCc="; + src = fetchFromGitHub { + owner = "whitfin"; + repo = "runiq"; + rev = "a642926f6ec09d4faeebebb563d4aed89e0d36fb"; + hash = "sha256-DWP0kbTjXlyUI/+bHgom9/XJ2XW/BJEU4xvIisPVug0="; }; - cargoHash = "sha256-WSMV0GNKNckN9uSPN647iDloGkNtaKcrZbeyglUappc="; + cargoLock.lockFile = ./Cargo.lock; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security From 029879164de6cf6e6517a5fbb9ed6f16df1c9cfe Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 4 Sep 2024 13:36:30 +0300 Subject: [PATCH 234/298] nixos/cinnamon: switch to Orca module --- nixos/modules/services/x11/desktop-managers/cinnamon.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index 33373c18a4e9..cd5c9e1c948f 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -172,7 +172,6 @@ in ] ++ utils.removePackagesByName [ # accessibility onboard - orca # theme sound-theme-freedesktop @@ -199,6 +198,8 @@ in }) ]; + services.orca.enable = mkDefault (notExcluded pkgs.orca); + xdg.portal.configPackages = mkDefault [ pkgs.cinnamon-common ]; # Override GSettings schemas From 69d2dc4d43a65d8f97368c6b0df4611a7f518360 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 4 Sep 2024 13:36:38 +0300 Subject: [PATCH 235/298] nixos/gnome: switch to Orca module --- nixos/modules/services/x11/desktop-managers/gnome.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index bbd47a382e18..bb2ce03e73a3 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -357,6 +357,8 @@ in isSystem = true; }; + services.orca.enable = notExcluded pkgs.orca; + fonts.packages = with pkgs; [ cantarell-fonts dejavu_fonts @@ -380,7 +382,6 @@ in pkgs.gnome-shell-extensions pkgs.gnome-tour # GNOME Shell detects the .desktop file on first log-in. pkgs.gnome-user-docs - pkgs.orca pkgs.glib # for gsettings program pkgs.gnome-menus pkgs.gtk3.out # for gtk-launch program From 5a4ee0a587d577a595902e5ece0462c0f0b7287b Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 4 Sep 2024 13:36:45 +0300 Subject: [PATCH 236/298] nixos/pantheon: switch to Orca module --- nixos/modules/services/x11/desktop-managers/pantheon.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index fc5fb4d0b53d..1ab898d35bc2 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -175,6 +175,7 @@ in # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1443 pkgs.pantheon.mutter ]; + services.orca.enable = mkDefault (notExcluded pkgs.orca); systemd.packages = with pkgs; [ gnome-session pantheon.gala @@ -211,7 +212,6 @@ in adwaita-icon-theme gtk3.out # for gtk-launch program onboard - orca # elementary/greeter#668 sound-theme-freedesktop xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ ]) ++ (with pkgs.pantheon; [ From f38abcc7a40f8c7628386807c53d58478fa28877 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 5 Sep 2024 11:59:42 +0300 Subject: [PATCH 237/298] home-assistant-custom-lovelace-modules.universal-remote-card: 3.9.4 -> 4.0.0, rename --- .../custom-lovelace-modules/default.nix | 14 +++++++++++--- .../default.nix | 14 +++++++------- .../dont-call-git.patch | 0 3 files changed, 18 insertions(+), 10 deletions(-) rename pkgs/servers/home-assistant/custom-lovelace-modules/{android-tv-card => universal-remote-card}/default.nix (54%) rename pkgs/servers/home-assistant/custom-lovelace-modules/{android-tv-card => universal-remote-card}/dont-call-git.patch (100%) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix index f716973d14b9..6271c3681bb1 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix @@ -1,9 +1,10 @@ -{ callPackage +{ + lib, + pkgs, + callPackage, }: { - android-tv-card = callPackage ./android-tv-card { }; - apexcharts-card = callPackage ./apexcharts-card { }; atomic-calendar-revive = callPackage ./atomic-calendar-revive { }; @@ -32,7 +33,14 @@ template-entity-row = callPackage ./template-entity-row { }; + universal-remote-card = callPackage ./universal-remote-card { }; + valetudo-map-card = callPackage ./valetudo-map-card { }; zigbee2mqtt-networkmap = callPackage ./zigbee2mqtt-networkmap { }; } +// lib.optionalAttrs pkgs.config.allowAliases { + android-tv-card = + lib.warn "`home-assistant-custom-lovelace-modules.android-tv-card` has been renamed to `universal-remote-card`" + pkgs.home-assistant-custom-lovelace-modules.universal-remote-card; +} diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix similarity index 54% rename from pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/default.nix rename to pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix index 270f979bae86..97ef82f9cf9a 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix @@ -4,33 +4,33 @@ }: buildNpmPackage rec { - pname = "android-tv-card"; - version = "3.9.4"; + pname = "universal-remote-card"; + version = "4.0.0"; src = fetchFromGitHub { owner = "Nerwyn"; repo = "android-tv-card"; rev = version; - hash = "sha256-I50WNH/OL7O6YrZ0yf+uPJc05STJrjP8DS/wfaSBTHU="; + hash = "sha256-vQfXsEMYPga816X8eGYdjgpou38KfMtLcKjIGkT25xU="; }; patches = [ ./dont-call-git.patch ]; - npmDepsHash = "sha256-cuc7+QziclvJWp7MncLjkzfub5UbWYPVoUC/DZfs38g="; + npmDepsHash = "sha256-lFpgO/5JEmnl1wXLuy/OqncxPSx96BTydbprGEN+feM="; installPhase = '' runHook preInstall mkdir $out - cp dist/android-tv-card.min.js $out + cp dist/universal-remote-card.min.js $out runHook postInstall ''; - passthru.entrypoint = "android-tv-card.min.js"; + passthru.entrypoint = "universal-remote-card.min.js"; meta = with lib; { - description = "Universal Customizable TV Remote Card, with HA actions, super configurable touchpad, slider, haptics, and keyboard"; + description = "Completely customizable universal remote card for Home Assistant. Supports multiple platforms out of the box"; homepage = "https://github.com/Nerwyn/android-tv-card"; license = licenses.asl20; maintainers = with maintainers; [ k900 ]; diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/dont-call-git.patch b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/dont-call-git.patch similarity index 100% rename from pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/dont-call-git.patch rename to pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/dont-call-git.patch From bbbc220850926b74f40980a262a471f508ba1571 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 09:15:52 +0000 Subject: [PATCH 238/298] hcledit: 0.2.14 -> 0.2.15 --- pkgs/tools/text/hcledit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/hcledit/default.nix b/pkgs/tools/text/hcledit/default.nix index 882561b98387..2328840648c1 100644 --- a/pkgs/tools/text/hcledit/default.nix +++ b/pkgs/tools/text/hcledit/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "hcledit"; - version = "0.2.14"; + version = "0.2.15"; src = fetchFromGitHub { owner = "minamijoyo"; repo = pname; rev = "v${version}"; - hash = "sha256-7Yay4a55AIzhJHkUh3lCNjklPOZm9VwrmAAyLIW6XJ0="; + hash = "sha256-EJSV7CsxnRCsVcqsJcImqeELdeg6Mnf7N6S9TlMbTaE="; }; vendorHash = "sha256-G6jmdosQHBA+n7MgVAlzdSTqPYb5d+k4b4EzAI384FQ="; From cb71d6df93e57f3f6f99fd3acc91509ed041a188 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 09:22:54 +0000 Subject: [PATCH 239/298] lazysql: 0.2.5 -> 0.2.9 --- pkgs/by-name/la/lazysql/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/la/lazysql/package.nix b/pkgs/by-name/la/lazysql/package.nix index dd9199847248..9957de463d87 100644 --- a/pkgs/by-name/la/lazysql/package.nix +++ b/pkgs/by-name/la/lazysql/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "lazysql"; - version = "0.2.5"; + version = "0.2.9"; src = fetchFromGitHub { owner = "jorgerojas26"; repo = "lazysql"; rev = "v${version}"; - hash = "sha256-QzvaQMSr0PjeAGJr5ThAQ/U0dRMa17E5hiPnc2ViUNo="; + hash = "sha256-6aJrLkmebOhLrnVhl9cnbW1ZBt0vq8lR7Lhz9nPFr8Q="; }; vendorHash = "sha256-celee8uyoirX+vtAww2iQJtRwJEHyfHL2mZA2muSRiQ="; From 60d2865bfabd2f95b91f75f519698d366fd4f0b9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Sep 2024 11:23:58 +0200 Subject: [PATCH 240/298] checkov: 3.2.243 -> 3.2.246 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.2.243...3.2.246 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.246 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index ef91d7ca652e..77057f2f1983 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.243"; + version = "3.2.246"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-cOBbfBCpF+//f+lB65XjQqUarZDepkuvh6OvJz7xSdA="; + hash = "sha256-oEAu/GDW7u/jPCGLkvazmFJ5c73gAMDWwRu/AkVLDpk="; }; patches = [ ./flake8-compat-5.x.patch ]; From 3673c28b29b24afc2fd7355f9ab660641a4648ee Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Sep 2024 11:25:14 +0200 Subject: [PATCH 241/298] python312Packages.tencentcloud-sdk-python: 3.0.1224 -> 3.0.1225 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1224...3.0.1225 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1225/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 d53b5a3b78f2..a05a4eb06ab4 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.1224"; + version = "3.0.1225"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-HO4W3EevyPC1nmPsTOVAFyc18CTKAE3cKYnQ7onlLPg="; + hash = "sha256-Fckkv5Oq8JqTqAqw4aOYqxELfk3+TMVOF5eTsGIRjLY="; }; build-system = [ setuptools ]; From db5b9e241661d0dcc2ba1e1fbbd3b28fc53dafd3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 09:28:56 +0000 Subject: [PATCH 242/298] python312Packages.nomadnet: 0.4.9 -> 0.5.0 --- pkgs/development/python-modules/nomadnet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix index 6ffc0da4c30f..9848ee69457e 100644 --- a/pkgs/development/python-modules/nomadnet/default.nix +++ b/pkgs/development/python-modules/nomadnet/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "nomadnet"; - version = "0.4.9"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "NomadNet"; rev = "refs/tags/${version}"; - hash = "sha256-Ut/YifODoiHCo3bhN8nV5ZPNIr70FM6MjlZCrUuNaFc="; + hash = "sha256-pYlEstApB0SYnkEfQ0kZl53xtbvTkRV+930TrCMqhbA="; }; build-system = [ setuptools ]; From 31b8e334cc3b21344a93f56c342894a6388749cc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Sep 2024 11:33:33 +0200 Subject: [PATCH 243/298] circup: 1.4.0 -> 2.0.4 Diff: https://github.com/adafruit/circup/compare/refs/tags/1.4.0...2.0.4 Changelog: https://github.com/adafruit/circup/releases/tag/2.0.4 --- pkgs/development/tools/circup/default.nix | 39 +++++++++++------------ 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/pkgs/development/tools/circup/default.nix b/pkgs/development/tools/circup/default.nix index 29b6cb3d8a38..cbb952c1035b 100644 --- a/pkgs/development/tools/circup/default.nix +++ b/pkgs/development/tools/circup/default.nix @@ -1,56 +1,55 @@ -{ lib -, fetchFromGitHub -, python3 +{ + lib, + fetchFromGitHub, + python3, }: python3.pkgs.buildPythonApplication rec { pname = "circup"; - version = "1.4.0"; - format = "setuptools"; + version = "2.0.4"; + pyproject = true; src = fetchFromGitHub { owner = "adafruit"; - repo = pname; + repo = "circup"; rev = "refs/tags/${version}"; - hash = "sha256-kax4gnvRkHSqj0Y6Rk8eyPpT7Wia2QngCQtxpqWSl9s="; + hash = "sha256-Iid6IwPoj7F9X6Yb0ESsuvD9/tZdRQyCceGOVt2R1qw="; }; - pythonRelaxDeps = [ - "semver" - ]; + pythonRelaxDeps = [ "semver" ]; - nativeBuildInputs = with python3.pkgs; [ - setuptools-scm - ]; + build-system = with python3.pkgs; [ setuptools-scm ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ appdirs click findimports requests semver setuptools + toml update-checker ]; - nativeCheckInputs = with python3.pkgs; [ - pytestCheckHook - ]; + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; postBuild = '' export HOME=$(mktemp -d); ''; - pythonImportsCheck = [ - "circup" + pythonImportsCheck = [ "circup" ]; + + disabledTests = [ + # Test requires network access + "test_libraries_from_imports_bad" ]; meta = with lib; { description = "CircuitPython library updater"; - mainProgram = "circup"; homepage = "https://github.com/adafruit/circup"; changelog = "https://github.com/adafruit/circup/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; + mainProgram = "circup"; }; } From 2930ea88d02f1a55302daf781ab5624b90495f43 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Sep 2024 11:55:27 +0200 Subject: [PATCH 244/298] python312Packages.fastcore: 1.7.2 -> 1.7.4 Diff: https://github.com/fastai/fastcore/compare/refs/tags/1.7.2...1.7.4 Changelog: https://github.com/fastai/fastcore/blob/1.7.4/CHANGELOG.md --- pkgs/development/python-modules/fastcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index 95b8e17b8859..36fd0e8a01ad 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.7.2"; + version = "1.7.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fastai"; repo = "fastcore"; rev = "refs/tags/${version}"; - hash = "sha256-3BOsOd3g+SepFUH2czywyaBnA88qLVyu/8eyHGkuEPY="; + hash = "sha256-pm/8YRefobh7urVWiAlb05COQbaBrXB70buDmuKY/qc="; }; build-system = [ setuptools ]; From ddbdfe29bcfe5ed4dcea5934fb4289623cd50da5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Sep 2024 11:56:04 +0200 Subject: [PATCH 245/298] python312Packages.flipr-api: 1.6.0 -> 1.6.1 Diff: https://github.com/cnico/flipr-api/compare/refs/tags/1.6.0...1.6.1 Changelog: https://github.com/cnico/flipr-api/releases/tag/1.6.1 --- pkgs/development/python-modules/flipr-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flipr-api/default.nix b/pkgs/development/python-modules/flipr-api/default.nix index e8cd063468e8..8b725ccc2050 100644 --- a/pkgs/development/python-modules/flipr-api/default.nix +++ b/pkgs/development/python-modules/flipr-api/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "flipr-api"; - version = "1.6.0"; + version = "1.6.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "cnico"; repo = "flipr-api"; rev = "refs/tags/${version}"; - hash = "sha256-sFCeWfu5rwImIizzik9RzfCWaEHiqhsQrapfuCXHr+4="; + hash = "sha256-/px8NuBwukAPMxdXvHdyfO/j/a9UatKbdrjDNuT0f4k="; }; build-system = [ poetry-core ]; From 0545bbb4cd21afe1d1fd00bf9397d415463a762e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 10 Aug 2024 09:24:18 +0200 Subject: [PATCH 246/298] python312Packages.msoffcrypto-tool: 5.4.1 -> 5.4.2 Diff: https://github.com/nolze/msoffcrypto-tool/compare/refs/tags/v5.4.1...v5.4.2 Changelog: https://github.com/nolze/msoffcrypto-tool/blob/v5.4.2/CHANGELOG.md --- pkgs/development/python-modules/msoffcrypto-tool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msoffcrypto-tool/default.nix b/pkgs/development/python-modules/msoffcrypto-tool/default.nix index 1c709d57884d..fe5d79ece2d3 100644 --- a/pkgs/development/python-modules/msoffcrypto-tool/default.nix +++ b/pkgs/development/python-modules/msoffcrypto-tool/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "msoffcrypto-tool"; - version = "5.4.1"; + version = "5.4.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "nolze"; repo = "msoffcrypto-tool"; rev = "refs/tags/v${version}"; - hash = "sha256-BVm4hMKvvNI3bJ82t4NIRcx8o8mgQgoulIerDwoVIT0="; + hash = "sha256-nwCjgcZqD0hptHC0WqIodHC5m/JHYyUdfEngIoXzNqA="; }; build-system = [ poetry-core ]; From b82be0d48c4713801a42ec6b68fa1a00c131d5a5 Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Thu, 5 Sep 2024 12:20:43 +0200 Subject: [PATCH 247/298] zed-editor: fix license menu Without the generated licenses file, Zed crashes when triggering the "View Dependency licenses" menu button. --- .../ze/zed-editor/0001-generate-licenses.patch | 17 +++++++++++++++++ pkgs/by-name/ze/zed-editor/package.nix | 12 ++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/by-name/ze/zed-editor/0001-generate-licenses.patch diff --git a/pkgs/by-name/ze/zed-editor/0001-generate-licenses.patch b/pkgs/by-name/ze/zed-editor/0001-generate-licenses.patch new file mode 100644 index 000000000000..4d02d0931d40 --- /dev/null +++ b/pkgs/by-name/ze/zed-editor/0001-generate-licenses.patch @@ -0,0 +1,17 @@ +diff --git a/script/generate-licenses b/script/generate-licenses +index 43b2f5c458..c740a3afa2 100755 +--- a/script/generate-licenses ++++ b/script/generate-licenses +@@ -15,12 +15,6 @@ cat assets/icons/LICENSES >> $OUTPUT_FILE + + echo -e "# ###### CODE LICENSES ######\n" >> $OUTPUT_FILE + +-if ! cargo install --list | grep "cargo-about v$CARGO_ABOUT_VERSION" > /dev/null; then +- echo "Installing cargo-about@$CARGO_ABOUT_VERSION..." +- cargo install "cargo-about@$CARGO_ABOUT_VERSION" +-else +- echo "cargo-about@$CARGO_ABOUT_VERSION is already installed." +-fi + + echo "Generating cargo licenses" + cargo about generate --fail -c script/licenses/zed-licenses.toml script/licenses/template.hbs.md >> $OUTPUT_FILE diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 4b61a77d22a7..a33567fa5b76 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -27,6 +27,7 @@ vulkan-loader, envsubst, nix-update-script, + cargo-about, withGLES ? false, }: @@ -45,6 +46,12 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; + patches = [ + # Zed uses cargo-install to install cargo-about during the script execution. + # We provide cargo-about ourselves and can skip this step. + ./0001-generate-licenses.patch + ]; + cargoLock = { lockFile = ./Cargo.lock; outputHashes = { @@ -73,6 +80,7 @@ rustPlatform.buildRustPackage rec { pkg-config protobuf rustPlatform.bindgenHook + cargo-about ] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun ]; buildInputs = @@ -133,6 +141,10 @@ rustPlatform.buildRustPackage rec { RUSTFLAGS = if withGLES then "--cfg gles" else ""; gpu-lib = if withGLES then libglvnd else vulkan-loader; + preBuild = '' + bash script/generate-licenses + ''; + postFixup = lib.optionalString stdenv.isLinux '' patchelf --add-rpath ${gpu-lib}/lib $out/libexec/* patchelf --add-rpath ${wayland}/lib $out/libexec/* From afce61251d28899e33ffaabdabedbbd5bd3b9bcd Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Thu, 5 Sep 2024 12:20:33 +0200 Subject: [PATCH 248/298] zed-editor: fix `--version` --- pkgs/by-name/ze/zed-editor/package.nix | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index a33567fa5b76..f999227661c8 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -28,6 +28,8 @@ envsubst, nix-update-script, cargo-about, + testers, + zed-editor, withGLES ? false, }: @@ -136,6 +138,8 @@ rustPlatform.buildRustPackage rec { # Setting this environment variable allows to disable auto-updates # https://zed.dev/docs/development/linux#notes-for-packaging-zed ZED_UPDATE_EXPLANATION = "zed has been installed using nix. Auto-updates have thus been disabled."; + # Used by `zed --version` + RELEASE_VERSION = version; }; RUSTFLAGS = if withGLES then "--cfg gles" else ""; @@ -187,11 +191,17 @@ rustPlatform.buildRustPackage rec { runHook postInstall ''; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version-regex" - "v(.*)" - ]; + passthru = { + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "v(.*)" + ]; + }; + tests.version = testers.testVersion { + inherit version; + package = zed-editor; + }; }; meta = { From bb4226cdd5c23de178c52c32e0a726664797f833 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 10:52:17 +0000 Subject: [PATCH 249/298] rtorrent: 0.9.8-unstable-2024-08-20 -> 0.9.8-unstable-2024-08-31 --- pkgs/by-name/rt/rtorrent/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/rt/rtorrent/package.nix b/pkgs/by-name/rt/rtorrent/package.nix index 59b346116147..281904eaeeac 100644 --- a/pkgs/by-name/rt/rtorrent/package.nix +++ b/pkgs/by-name/rt/rtorrent/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation { pname = "rakshasa-rtorrent"; - version = "0.9.8-unstable-2024-08-20"; + version = "0.9.8-unstable-2024-08-31"; src = fetchFromGitHub { owner = "rakshasa"; repo = "rtorrent"; - rev = "eacf9798e2787df7dd4d5c800a46bac7931ac41c"; - hash = "sha256-VJ2QJfBRUgk0KcCZTHtlyBIMVhs0UfYWAPlTeA98VZU="; + rev = "4e246a401f2572d6c8a3295cbe0335baa316cd24"; + hash = "sha256-tq/0Vq+rIyCn1UQlyo7lcTSVf6WW1I8MTfxiAwQYD/o="; }; outputs = [ "out" "man" ]; From 4c4d3971b8501b86f5eabcb6e76215a39114176a Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sat, 31 Aug 2024 09:54:55 +0200 Subject: [PATCH 250/298] home-assistant-custom-components.garmin_connect: init at unstable-2024-08-31 This packages the garmin_connect component from cyberjunky. I decided to not package the latest release, but the master branch, because the latest release hard depends on a specific version of python3Packages.garminconnect. The master branch does not. Signed-off-by: Matthias Beyer --- .../custom-components/default.nix | 2 ++ .../garmin_connect/default.nix | 32 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/servers/home-assistant/custom-components/garmin_connect/default.nix diff --git a/pkgs/servers/home-assistant/custom-components/default.nix b/pkgs/servers/home-assistant/custom-components/default.nix index 409c39f5154b..bd819ad0c36b 100644 --- a/pkgs/servers/home-assistant/custom-components/default.nix +++ b/pkgs/servers/home-assistant/custom-components/default.nix @@ -22,6 +22,8 @@ frigate = callPackage ./frigate {}; + garmin_connect = callPackage ./garmin_connect {}; + govee-lan = callPackage ./govee-lan {}; gpio = callPackage ./gpio {}; diff --git a/pkgs/servers/home-assistant/custom-components/garmin_connect/default.nix b/pkgs/servers/home-assistant/custom-components/garmin_connect/default.nix new file mode 100644 index 000000000000..0c288decc012 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/garmin_connect/default.nix @@ -0,0 +1,32 @@ +{ + lib, + buildHomeAssistantComponent, + fetchFromGitHub, + garminconnect, + tzlocal, +}: + +buildHomeAssistantComponent { + owner = "cyberjunky"; + domain = "garmin_connect"; + version = "unstable-2024-08-31"; + + src = fetchFromGitHub { + owner = "cyberjunky"; + repo = "home-assistant-garmin_connect"; + rev = "d42edcabc67ba6a7f960e849c8aaec1aabef87c0"; + hash = "sha256-KqbP6TpH9B0/AjtsW5TcWSNgUhND+w8rO6X8fHqtsDI="; + }; + + propagatedBuildInputs = [ + garminconnect + tzlocal + ]; + + meta = with lib; { + description = "The Garmin Connect integration allows you to expose data from Garmin Connect to Home Assistant"; + homepage = "https://github.com/cyberjunky/home-assistant-garmin_connect"; + maintainers = with maintainers; [ matthiasbeyer ]; + license = licenses.mit; + }; +} From c2408d4c827636f5b92b357b8522998e1b40db17 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 5 Sep 2024 08:06:38 +0200 Subject: [PATCH 251/298] home-assistant-custom-components.garmin_connect: Add dmadisetti as maintainer Signed-off-by: Matthias Beyer --- .../custom-components/garmin_connect/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/custom-components/garmin_connect/default.nix b/pkgs/servers/home-assistant/custom-components/garmin_connect/default.nix index 0c288decc012..1ad5adfbd3bc 100644 --- a/pkgs/servers/home-assistant/custom-components/garmin_connect/default.nix +++ b/pkgs/servers/home-assistant/custom-components/garmin_connect/default.nix @@ -26,7 +26,10 @@ buildHomeAssistantComponent { meta = with lib; { description = "The Garmin Connect integration allows you to expose data from Garmin Connect to Home Assistant"; homepage = "https://github.com/cyberjunky/home-assistant-garmin_connect"; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ + matthiasbeyer + dmadisetti + ]; license = licenses.mit; }; } From df6dfa1379fe0d7a2d3bd6587c94e99ab513128e Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Thu, 5 Sep 2024 13:18:14 +0200 Subject: [PATCH 252/298] weblate: 5.7.1 -> 5.7.2 Changelog: https://github.com/WeblateOrg/weblate/releases/tag/weblate-5.7.2 --- pkgs/by-name/we/weblate/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix index 93b73293955a..0993515eb1ae 100644 --- a/pkgs/by-name/we/weblate/package.nix +++ b/pkgs/by-name/we/weblate/package.nix @@ -28,7 +28,7 @@ let in python.pkgs.buildPythonApplication rec { pname = "weblate"; - version = "5.7.1"; + version = "5.7.2"; pyproject = true; @@ -41,7 +41,7 @@ python.pkgs.buildPythonApplication rec { owner = "WeblateOrg"; repo = "weblate"; rev = "refs/tags/weblate-${version}"; - hash = "sha256-h5+0lOMD+H0ehtZ0bngA9bI5va1I5KjZH9boaEtXJPo="; + hash = "sha256-cIwCNYXbg7l6z9OAkMAGJ783QI/nCOyrhLPURDcDv+Y="; }; patches = [ From ead836a24e05dcc3b24e7d19202d6b8b96cef46e Mon Sep 17 00:00:00 2001 From: GetPsyched Date: Thu, 5 Sep 2024 17:12:21 +0530 Subject: [PATCH 253/298] atlauncher: 3.4.36.10 -> 3.4.37.2 Changelog: https://github.com/ATLauncher/ATLauncher/compare/v3.4.36.10...v3.4.37.2 --- pkgs/by-name/at/atlauncher/deps.json | 733 +++++++++++++------------ pkgs/by-name/at/atlauncher/package.nix | 4 +- 2 files changed, 372 insertions(+), 365 deletions(-) diff --git a/pkgs/by-name/at/atlauncher/deps.json b/pkgs/by-name/at/atlauncher/deps.json index 5ebd36a13cc5..bd7ab048a99b 100644 --- a/pkgs/by-name/at/atlauncher/deps.json +++ b/pkgs/by-name/at/atlauncher/deps.json @@ -1,1276 +1,1283 @@ { "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", "!version": 1, - "https:/": { - "jitpack.io/com/github/ATLauncher/gradle-macappbundle#build/d22f8cdb94": { + "https://jitpack.io/com": { + "github/ATLauncher/gradle-macappbundle#build/d22f8cdb94": { "jar": "sha256-rBqYi12MUWdwuNbFSlYO0tREzcDpfXI3VRPVV/DRZ+c=", "module": "sha256-JlSHpEtQuOO3/qIdidXBZ21IjieA7PE2b0ui7aimdxc=", "pom": "sha256-ySbX7ZLlXt7l+JcGEqV/peu6T+h7oJp6s/d95XQdIVo=" }, - "jitpack.io/com/github/ATLauncher/gradle-macappbundle#edu.sc.seis.macAppBundle.gradle.plugin/d22f8cdb94": { + "github/ATLauncher/gradle-macappbundle#edu.sc.seis.macAppBundle.gradle.plugin/d22f8cdb94": { "pom": "sha256-9LZJTFfyVUyMXTgn2ifGyXEPLfPJ6tmlY8qSWEO0YmU=" }, - "jitpack.io/com/github/MCRcortex#nekodetector/Version-1.1-pre": { + "github/MCRcortex#nekodetector/Version-1.1-pre": { "jar": "sha256-5K2d2tmaNRavJFLe9oIv1RxNUoSUsWbZla7B0Z+4f9U=", "module": "sha256-NCI+ztVps3ogtEyQTwowxHLTZCzaGuKHF4xQItu/Ejg=", "pom": "sha256-pdiFUkilkUhJCwxup4WHMPCu9aPmzg0LmuVZ18Z5ODo=" }, - "jitpack.io/com/github/RyanTheAllmighty/gettext#gettext-gradle-plugin/aab5c30bf8": { + "github/RyanTheAllmighty/gettext#gettext-gradle-plugin/aab5c30bf8": { "jar": "sha256-S6XyAGm5/VXtmttMQBoNSkZ1cKNw0WKPVnLl0GxyTjw=", "pom": "sha256-ozcVak/AVSDRcUwozKhEC5crmdQwI1NUJso7nGu5qOg=" }, - "jitpack.io/com/github/RyanTheAllmighty/gettext#gettext-lib/88ae68d897": { + "github/RyanTheAllmighty/gettext#gettext-lib/88ae68d897": { "jar": "sha256-W/Er53HJryRvdlo/Vh4XQFu6TSD5OTwTxSYt7Sv9QMs=", "pom": "sha256-nbYGMqdReKL4Po10G3MWrloZWQLK8zUd3YqLKs/8TZI=" }, - "jitpack.io/com/github/RyanTheAllmighty/gettext#gettext-lib/aab5c30bf8": { + "github/RyanTheAllmighty/gettext#gettext-lib/aab5c30bf8": { "jar": "sha256-5ZE5ZDU4P3vhzmlAOVxAZynMBrkJfxPsTKVH+b/MxRE=", "pom": "sha256-AdGzI8W4ciDR49kasH/2Bh0XVpY8Ve/MFj+LI3pJHR4=" }, - "jitpack.io/com/github/Vatuu#discord-rpc/1.6.2": { + "github/Vatuu#discord-rpc/1.6.2": { "jar": "sha256-nTR5RBRKtdd34W1ui+EI3gxb9fbIz08uBOXS3Wn7tU4=", "pom": "sha256-TWqqjVQWL2EeeD9I7+HngsFOv5WuZifEfKc9s1PVVdo=" }, - "jitpack.io/com/gitlab/doomsdayrs#rxswing/a5749ad421": { + "gitlab/doomsdayrs#rxswing/a5749ad421": { "jar": "sha256-XZIGfC5TCNjiXwHdEdpxBSGWJu8aHt5RLkHYJey0nbc=", "module": "sha256-TAPDjgy5Byv7Vh43y9xE1VmAcq62/FGCh6NX+8Ir7lk=", "pom": "sha256-7Grt6dk72Csvb8zMKtflZte6wdf4SjDUynirA/OF1fM=" - }, - "libraries.minecraft.net/com/mojang#authlib/1.5.21": { + } + }, + "https://libraries.minecraft.net": { + "com/mojang#authlib/1.5.21": { "jar": "sha256-znqchuvr8wuJkpAm9KCjxYzg9NR5N9bcCGrk/Qx3VEo=", "pom": "sha256-1ZKDxzA7QuQWUY2PXCZYlSlcEWkP2NNgefGgTGpWsXw=" - }, - "plugins.gradle.org/m2/com/adarshr#gradle-test-logger-plugin/3.2.0": { + } + }, + "https://plugins.gradle.org/m2": { + "com/adarshr#gradle-test-logger-plugin/3.2.0": { "jar": "sha256-LW0Bksjs90nVxLHkUz/P2WXrsuteW9G+6qpLEJYdldg=", "pom": "sha256-bQ61NlUv5CUhW5L7YX/UP3RSCt05QDQUE3oVEkBPEFA=" }, - "plugins.gradle.org/m2/com/adarshr/test-logger#com.adarshr.test-logger.gradle.plugin/3.2.0": { + "com/adarshr/test-logger#com.adarshr.test-logger.gradle.plugin/3.2.0": { "pom": "sha256-ql6amsMp1l5VI+RgyVfUmalqo/FUJzQoxENCxB57BBk=" }, - "plugins.gradle.org/m2/com/apollographql/apollo#com.apollographql.apollo.gradle.plugin/2.5.14": { + "com/apollographql/apollo#com.apollographql.apollo.gradle.plugin/2.5.14": { "pom": "sha256-+Ww0HGI0gfly9FQurzIE3rd3NerlFYjOQrY0LUzfmcE=" }, - "plugins.gradle.org/m2/com/github/ben-manes#gradle-versions-plugin/0.47.0": { + "com/github/ben-manes#gradle-versions-plugin/0.47.0": { "jar": "sha256-H3CAteTQM5/dUJhSa+YDtPCVFaR/EirBUVCZzRWNg88=", "module": "sha256-VYVMhFmwZESD+Gh53gvsIcwx9GsgfNizpF5TdKxngl4=", "pom": "sha256-lO3mIRlM2G49tapNmGwedJroqjkSrN9xP5pTyKh9E5Q=" }, - "plugins.gradle.org/m2/com/github/ben-manes/versions#com.github.ben-manes.versions.gradle.plugin/0.47.0": { + "com/github/ben-manes/versions#com.github.ben-manes.versions.gradle.plugin/0.47.0": { "pom": "sha256-+Mn7dWyfcAjGRFsFTbe7g9aJAp09tHjdYZqa7cwnCgw=" }, - "plugins.gradle.org/m2/com/github/johnrengelman#shadow/8.1.1": { + "com/github/johnrengelman#shadow/8.1.1": { "jar": "sha256-CEGXVVWQpTuyG1lQijMwVZ9TbdtEjq/R7GdfVGIDb88=", "module": "sha256-nQ87SqpniYcj6vbF6c0nOHj5V03azWSqNwJDYgzgLko=", "pom": "sha256-Mu55f8hDI3xM5cSeX0FSxYoIlK/OCg6SY25qLU/JjDU=" }, - "plugins.gradle.org/m2/com/github/johnrengelman/shadow#com.github.johnrengelman.shadow.gradle.plugin/8.1.1": { + "com/github/johnrengelman/shadow#com.github.johnrengelman.shadow.gradle.plugin/8.1.1": { "pom": "sha256-PLOIa5ffbgZvEIwxayGfJiyXw8st9tp4kn5kXetkPLA=" }, - "plugins.gradle.org/m2/de/undercouch/download#de.undercouch.download.gradle.plugin/5.4.0": { + "de/undercouch/download#de.undercouch.download.gradle.plugin/5.4.0": { "pom": "sha256-6wbtSRqHmov6z2CGiCpS/hh9J17a+DUN0eoMmMQS6Jw=" }, - "plugins.gradle.org/m2/edu/sc/seis#macAppBundle/2.3.0": { + "edu/sc/seis#macAppBundle/2.3.0": { "jar": "sha256-RaQcBHwRecgPk0+WBIlWK8yD9CjWMcLUC2qzf93XlEQ=", "pom": "sha256-Bz+N8ig5R6YJRDDWt0iJ8xSjOW+6zOTAfqlTI+uecbY=" }, - "plugins.gradle.org/m2/edu/sc/seis/launch4j#edu.sc.seis.launch4j.gradle.plugin/3.0.3": { + "edu/sc/seis/launch4j#edu.sc.seis.launch4j.gradle.plugin/3.0.3": { "pom": "sha256-Os140q2vOhpbu95A1j3H9vFCTge+OmzytMhvP5E2RKU=" }, - "plugins.gradle.org/m2/edu/sc/seis/launch4j#launch4j/3.0.3": { + "edu/sc/seis/launch4j#launch4j/3.0.3": { "jar": "sha256-nKdCRA20uwEgYWQXxHE500jaDntn3KVB+wKfR3Yjdjo=", "module": "sha256-Cjj1r5mHEEhY1lPn0qwfv7kdHDfqDqU7qTf3lC1E4vs=", "pom": "sha256-hXI2OQ+LV4qlENBxsf2+k8/UKKcbyie2JDliKah7PGQ=" }, - "plugins.gradle.org/m2/edu/sc/seis/macAppBundle#edu.sc.seis.macAppBundle.gradle.plugin/2.3.0": { + "edu/sc/seis/macAppBundle#edu.sc.seis.macAppBundle.gradle.plugin/2.3.0": { "pom": "sha256-aIm5UVUoqdAZ6vQ1FQTUkj0fIZz34HuRZKnYERmdBsw=" }, - "plugins.gradle.org/m2/gradle/plugin/org/cadixdev/gradle#licenser/0.6.1": { + "gradle/plugin/org/cadixdev/gradle#licenser/0.6.1": { "jar": "sha256-w2sPCJOeiD8o0b9WgNvxxNYCSiIuN5dXiaJTcC05JmI=", "pom": "sha256-BPOApmghda+dW1ux+P7ULbtdoscHNpd0D/RfJn5MDtw=" }, - "plugins.gradle.org/m2/org/cadixdev/licenser#org.cadixdev.licenser.gradle.plugin/0.6.1": { + "org/cadixdev/licenser#org.cadixdev.licenser.gradle.plugin/0.6.1": { "pom": "sha256-R5s2fGaOTTg5LrH+WVD4tOq6CFe0hym9oxIiIhX74MM=" - }, - "raw.githubusercontent": { - "com/tofi86/universalJavaApplicationStub/404f5c1b008d6296065de7a93406b387c9f3dce1/src/universalJavaApplicationStub": "sha256-Sb0xuQ1Bsa/S0OR2Nv6iRh9dFsKlXgFH/YLXcwVRQVE=" - }, - "repo.maven.apache.org/maven2/com/apollographql/apollo#apollo-api-jvm/2.5.14": { + } + }, + "https://repo.maven.apache.org/maven2": { + "com/apollographql/apollo#apollo-api-jvm/2.5.14": { "jar": "sha256-ik9oiadu00lo72+aZMPpSyarUmFJR65dQjexoMFj2kY=", "module": "sha256-UjgMwRILvKZlPCrJHqBq6+z8S8JsqPUV/GH174tgX0E=", "pom": "sha256-B1cZPGRU3KS8qiGATDsYfLF6ZhxFy20HRbv3J8tFkkA=" }, - "repo.maven.apache.org/maven2/com/apollographql/apollo#apollo-api/2.5.14": { + "com/apollographql/apollo#apollo-api/2.5.14": { "module": "sha256-aCVcba2dnxtyH11LvYGOogtdkEMpTU76vW+ZkdI/3IE=", "pom": "sha256-ua2D9n7+u+1w/Xo4Q6xu40aXPMJyIdqG4i/JwcjcD1w=" }, - "repo.maven.apache.org/maven2/com/apollographql/apollo#apollo-gradle-plugin/2.5.14": { + "com/apollographql/apollo#apollo-gradle-plugin/2.5.14": { "jar": "sha256-xolghlRAe5uPk217j8CgLcTvhqEubaVgAkQTbJ+vq0M=", "module": "sha256-UCBR7CzahYmZRozuBYi1AJZDkCAjp4a/MBERzEENVGA=", "pom": "sha256-BADiKaboAKDcR+Smb0HtYvPR91qAz8kCcXhR0+VqR6o=" }, - "repo.maven.apache.org/maven2/com/apollographql/apollo#apollo-http-cache-api/2.5.14": { + "com/apollographql/apollo#apollo-http-cache-api/2.5.14": { "jar": "sha256-Qca5bmMQxRJ9LmG3cP84u/3I0Yz95G/F640Z/QZpRlw=", "module": "sha256-9DW1mK+1e/Zj59xx6DXNPFSWtx4IaqpE/jEItadtmto=", "pom": "sha256-6l/favLiCLRel35kgoX421G/wuITRwWyPYpjYoi6tvA=" }, - "repo.maven.apache.org/maven2/com/apollographql/apollo#apollo-http-cache/2.5.14": { + "com/apollographql/apollo#apollo-http-cache/2.5.14": { "jar": "sha256-PEbhbdRZfbTLqShL0jEBFEs3P7izUEY9JW8OykPkjg8=", "module": "sha256-HGZ+KrdHJCg6Yuf5ILvuQoEgPT27l/wOp4Lmnb7vA90=", "pom": "sha256-pUq2o/vxpNP4IcrW5dEwUg9/ggOEuFYf3M6f4UHf0nA=" }, - "repo.maven.apache.org/maven2/com/apollographql/apollo#apollo-normalized-cache-api-jvm/2.5.14": { + "com/apollographql/apollo#apollo-normalized-cache-api-jvm/2.5.14": { "jar": "sha256-vO01dy6yqLrzGYufZJ7ENTawccRxfoKAj2BOsf0PDPg=", "module": "sha256-QVaMITERZQZZu+VphkN8S8P8mY5IZ3rMGkAuuDOO0BU=", "pom": "sha256-MBBuZ/Ul07Qp2+Xho9c68Xvc25czmfiwWud4nQ89TM8=" }, - "repo.maven.apache.org/maven2/com/apollographql/apollo#apollo-normalized-cache-api/2.5.14": { + "com/apollographql/apollo#apollo-normalized-cache-api/2.5.14": { "module": "sha256-gTBeMIcINbqp4CpF/E5TO8Mg9jSnKs49bC7KtTRMBjU=", "pom": "sha256-HIccETIq3dAHgDUoTti34Yxa5jjdXD4wiYt5PkCqleo=" }, - "repo.maven.apache.org/maven2/com/apollographql/apollo#apollo-normalized-cache-jvm/2.5.14": { + "com/apollographql/apollo#apollo-normalized-cache-jvm/2.5.14": { "jar": "sha256-6kNfiztqub0KZUzBG7di5sTandhb0O3+i+o2ELzOWaI=", "module": "sha256-HJW8E/g0ptk3Xq8smD1S0ent1GeJNkd0i94gGV5mO+M=", "pom": "sha256-TTOHbwMJCYQXF7edrXrtS5MU9KWvqKL1GtBnmg/fZic=" }, - "repo.maven.apache.org/maven2/com/apollographql/apollo#apollo-normalized-cache/2.5.14": { + "com/apollographql/apollo#apollo-normalized-cache/2.5.14": { "module": "sha256-Fpsg4WzmNwCZDGnlmlx0DFx8+8z7lv60Lkx7thQ410I=", "pom": "sha256-ao3ZFBX1vESFDzaky32DEcTmJNEdVbQp7ROa+4yCit0=" }, - "repo.maven.apache.org/maven2/com/apollographql/apollo#apollo-runtime/2.5.14": { + "com/apollographql/apollo#apollo-runtime/2.5.14": { "jar": "sha256-svVruDVJmTutF/nujXrosNin7NGCo/BO0wwyHqW0vHQ=", "module": "sha256-pOMsFT5jX7lgFaBK2JbAqzMkyxjv9CFicPmW07FjwLI=", "pom": "sha256-k/cVpVv+AiUlqEnAhbuvvX8S04By7fYLh+Lhn7+TbT8=" }, - "repo.maven.apache.org/maven2/com/apollographql/apollo#apollo-rx3-support/2.5.14": { + "com/apollographql/apollo#apollo-rx3-support/2.5.14": { "jar": "sha256-sHZg8rYqymFjBiL90cy73W1zCcGpjhdBEi5DxvCRV9s=", "module": "sha256-VnUaIcuCllQzInsCKAEzUSqiKplxEuIyWdkASuK5OZ0=", "pom": "sha256-Ww5yoXMIwc+dld6zMz5VBi+/5razxalgmH2hfhzrAFA=" }, - "repo.maven.apache.org/maven2/com/apollographql/apollo#com.apollographql.apollo.gradle.plugin/2.5.14": { + "com/apollographql/apollo#com.apollographql.apollo.gradle.plugin/2.5.14": { "pom": "sha256-jrv1c+8UAZu4n9/HQnfCBRHVyeEHR10dP8X/O4LVKuY=" }, - "repo.maven.apache.org/maven2/com/benasher44#uuid-jvm/0.2.0": { + "com/benasher44#uuid-jvm/0.2.0": { "jar": "sha256-/YBhY1na/dyoW/WGkelJgQ6UGJ2bs8EZ0AL4XGzVk4Q=", "module": "sha256-UoG7jLvCZCKgfEBeSP1JULZU2Qwe08bNWbFrU+fJ4Hs=", "pom": "sha256-9ujJ/xbl9o7PsOke2r7s/9lEYh5ZGKlsbAczGmiyg9A=" }, - "repo.maven.apache.org/maven2/com/benasher44#uuid/0.2.0": { + "com/benasher44#uuid/0.2.0": { "module": "sha256-QNZuutBWPPBK7ScOhmAjCHLER8wMoJ5D4ZpOfOIUw1A=", "pom": "sha256-jrkHIhN74rupW7ioLd0Q6Nxp9ENCuK5tUYBHc4F6M/U=" }, - "repo.maven.apache.org/maven2/com/ethlo/time#itu/1.7.0": { + "com/ethlo/time#itu/1.7.0": { "jar": "sha256-Vc60GMnoE4xPz2LiE8TIFNieioTIJ9OVQHy+y6XXkec=", "pom": "sha256-gIZwS+Wqp8UulyZmz0nHr+6bOZu6O6nNJraAXE/N6Bg=" }, - "repo.maven.apache.org/maven2/com/fasterxml#oss-parent/48": { + "com/fasterxml#oss-parent/48": { "pom": "sha256-EbuiLYYxgW4JtiOiAHR0U9ZJGmbqyPXAicc9ordJAU8=" }, - "repo.maven.apache.org/maven2/com/fasterxml#oss-parent/49": { + "com/fasterxml#oss-parent/49": { "pom": "sha256-bfHMCoZSQhAIiUNBLJcbQqumidGwaNuf05Htmhk4cjU=" }, - "repo.maven.apache.org/maven2/com/fasterxml/jackson#jackson-base/2.14.1": { + "com/fasterxml/jackson#jackson-base/2.14.1": { "pom": "sha256-GAFdG6y6mhRiWovxlBH1v62C0AYN83snvQLngTLEZ24=" }, - "repo.maven.apache.org/maven2/com/fasterxml/jackson#jackson-bom/2.14.1": { + "com/fasterxml/jackson#jackson-bom/2.14.1": { "pom": "sha256-eP35nlBQ/EhfQRfauMzL+2+mxoOF6184oJtlU3HUpsw=" }, - "repo.maven.apache.org/maven2/com/fasterxml/jackson#jackson-parent/2.14": { + "com/fasterxml/jackson#jackson-parent/2.14": { "pom": "sha256-CQat2FWuOfkjV9Y/SFiJsI/KTEOl/kM1ItdTROB1exk=" }, - "repo.maven.apache.org/maven2/com/fasterxml/jackson/core#jackson-annotations/2.14.1": { + "com/fasterxml/jackson/core#jackson-annotations/2.14.1": { "jar": "sha256-0lW0uGP/jscUqPlvpVw0Yh1D27grgtP1dHZJakwJ4ec=", "module": "sha256-JnpoC7csvXUsdreeuQiuDAq+sRT8scIKlnjwN4iYues=", "pom": "sha256-id8WI4ax7eg6iATpCDlw0aYr310caenpkUdhtGf4CIM=" }, - "repo.maven.apache.org/maven2/com/fasterxml/jackson/core#jackson-core/2.14.1": { + "com/fasterxml/jackson/core#jackson-core/2.14.1": { "jar": "sha256-ARQYfilrNMkxwb+eWoQVK2K/q30YL1Yj85gtwto15SY=", "module": "sha256-fIuANfkA8/HL2wa4x53CsYsR9q+hOwt0cZzuNJ/0wyk=", "pom": "sha256-dHse68uLbe8o+u7cCSN0jxwVP8aksNjjsLyo3l/aY38=" }, - "repo.maven.apache.org/maven2/com/fasterxml/jackson/core#jackson-databind/2.14.1": { + "com/fasterxml/jackson/core#jackson-databind/2.14.1": { "jar": "sha256-QjoMgG3ks/petKKGmDBeOjd3xzHhvPobLzo3YMe253M=", "module": "sha256-2BeXfIprCq7aUZ+yp7jcugKzjDwnICT62jLFzOfj08s=", "pom": "sha256-etsj1tdG7c+UbRwGKxmP+aAmwOIrMHuNXXnB4IU4xjU=" }, - "repo.maven.apache.org/maven2/com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.14.1": { + "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.14.1": { "jar": "sha256-nhV+JiXthVq3OveRXiVvaCOZOjCYL0kjycqCu3UqAwM=", "module": "sha256-VanyBdnMgeilSjgYNbspbniFWR0Dx0BGd6EuEvJJeoo=", "pom": "sha256-MLlX5y4J2kuXIn4AFluOTmupgXTK3JcJHDRlLihi4cI=" }, - "repo.maven.apache.org/maven2/com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.14.1": { + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.14.1": { "pom": "sha256-+jI/nD8sJtfMzU4hNgkQRRVNRdwcFmHU+HakcfVix1k=" }, - "repo.maven.apache.org/maven2/com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.14.1": { + "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.14.1": { "jar": "sha256-C2U2E/UdbhU5bStlzP7JU5sqtHHFhC9bEaxId8vVH3I=", "module": "sha256-/Tb5c/sUISE7KMjOFXtoj0oKO+9gll/wzohQDtbJIh4=", "pom": "sha256-yRM4B2Gdzeb1Jc1UNJZSk/0BcUccj4R+D6GVu6GttNc=" }, - "repo.maven.apache.org/maven2/com/fasterxml/jackson/module#jackson-modules-java8/2.14.1": { + "com/fasterxml/jackson/module#jackson-modules-java8/2.14.1": { "pom": "sha256-CyfB7lgSDFHyo4cXwseUr/qa91wSNNcpe5zkLof8Il4=" }, - "repo.maven.apache.org/maven2/com/fasterxml/uuid#java-uuid-generator/4.1.0": { + "com/fasterxml/uuid#java-uuid-generator/4.1.0": { "jar": "sha256-u0s3BtLxXF5eYCPu0lG87hOPoVK+NUdJ9W/sAccmhnk=", "pom": "sha256-5TZK+P0X73rgJVElx+Qy1w0YW/Uy6cLzOSWZSeendSQ=" }, - "repo.maven.apache.org/maven2/com/formdev#flatlaf-extras/3.1.1": { + "com/formdev#flatlaf-extras/3.1.1": { "jar": "sha256-3l09TZ+oX+pOPEOv1+iCfr5cAF8+H/rVTT4/QJofZtM=", "module": "sha256-5N/Q1zK+EUS7BJWdNkSwvvzvLAa6MNQj5Cp34hcLmMQ=", "pom": "sha256-jFE9cIGiz2SOOUG/LTDo/NJ4y7I3FZqbWn2fCNaeXBo=" }, - "repo.maven.apache.org/maven2/com/formdev#flatlaf/3.1.1": { + "com/formdev#flatlaf/3.1.1": { "jar": "sha256-Jk75UoYnUQyiDzxoDE46wBKbysI1uNTZ8BQmHzzW1W8=", "module": "sha256-pyoFwWAhh9DRfKh+1W9IjgzCtVpPiK0LAfgejZlnX4I=", "pom": "sha256-X6tw379yYFHCJtgn2zQfND00aPKlm3Qw1hQKSJMsi+8=" }, - "repo.maven.apache.org/maven2/com/formdev#svgSalamander/1.1.3": { + "com/formdev#svgSalamander/1.1.3": { "jar": "sha256-y7Z73jhascHpgy9UkSmCxp/GDIHCRINdB/Q8pORhDrA=", "pom": "sha256-Cz+GlIGr8x9f9fQ4apYLTeYY4AQgLPHXsowlRf9Qoy8=" }, - "repo.maven.apache.org/maven2/com/github/cliftonlabs#json-simple/3.0.2": { + "com/github/cliftonlabs#json-simple/3.0.2": { "jar": "sha256-/aZamtDhrAyImHEG6Jqk2LKiSV5+BCNx76g4E/ZbcpU=", "pom": "sha256-sNrLFHnNTb4IENGqM1vw+5vDxP9VNpyHWXumj1h5/k8=" }, - "repo.maven.apache.org/maven2/com/github/hypfvieh#dbus-java-parent/3.3.2": { + "com/github/hypfvieh#dbus-java-parent/3.3.2": { "pom": "sha256-f3IGVDpJy9AvxUbGukYJGeQFwDxaRyNCvF0WQs7WGOI=" }, - "repo.maven.apache.org/maven2/com/github/hypfvieh#dbus-java/3.3.2": { + "com/github/hypfvieh#dbus-java/3.3.2": { "jar": "sha256-avCJp4anMpzhH1cjO0EwLa9+DcQGiffy4LCfpr7gCEU=", "pom": "sha256-BWRd/O/aPsk7ZdigneVvQfT33DjnqG7nqL5MDZOXhT8=" }, - "repo.maven.apache.org/maven2/com/github/java-json-tools#btf/1.3": { + "com/github/java-json-tools#btf/1.3": { "jar": "sha256-Z8PkYutQgH9OCl9N7jBLvxfNmGpC7l6wsvTJv2TRMNk=", "pom": "sha256-qb8bOVbm1Gy99zeRKOsXMs3hrGVAl5RNxlobbcQlcPA=" }, - "repo.maven.apache.org/maven2/com/github/java-json-tools#jackson-coreutils-equivalence/1.0": { + "com/github/java-json-tools#jackson-coreutils-equivalence/1.0": { "jar": "sha256-60qa19gD+whL/895PIqB9R10W21DjChHDvnVql+4oYI=", "pom": "sha256-0Vd8uaSY6Et0+ADXdRiQb/ErXT4vKJ2SqTauCU6sxeE=" }, - "repo.maven.apache.org/maven2/com/github/java-json-tools#jackson-coreutils/2.0": { + "com/github/java-json-tools#jackson-coreutils/2.0": { "jar": "sha256-FrOqvTqeslZV3aQz41+b2cfBqnmRQncC9fEfAAgT27A=", "pom": "sha256-jZ7pOk/dXSvYDrqUonoTDWBo8/heSI61vxSUOHEc6eo=" }, - "repo.maven.apache.org/maven2/com/github/java-json-tools#json-patch/1.13": { + "com/github/java-json-tools#json-patch/1.13": { "jar": "sha256-H3lNJWlltT7zfnC1VQXi7QDdwBhNROLo4f3OWjysx94=", "pom": "sha256-59lec35Uwo1EuFv2Qw8VNvZEZU1pQr2ogzM4r5aWSw8=" }, - "repo.maven.apache.org/maven2/com/github/java-json-tools#json-schema-core/1.2.14": { + "com/github/java-json-tools#json-schema-core/1.2.14": { "jar": "sha256-yFmUL92inCbMsr6DqEU6Ew3jX95viK4Yl4VRa10U+Bw=", "pom": "sha256-pR/BAI6VN7vFJbpywl4Lz4LzXxscwwfC53jS7fO9V18=" }, - "repo.maven.apache.org/maven2/com/github/java-json-tools#json-schema-validator/2.2.14": { + "com/github/java-json-tools#json-schema-validator/2.2.14": { "jar": "sha256-zZ48WZuzIpZRf9OsOL7qxwnwpquBstQolJXQNhulmJk=", "pom": "sha256-W8HTDGddkv+DV3ldOvN172JqvffrMjS2TahmKqEeqZs=" }, - "repo.maven.apache.org/maven2/com/github/java-json-tools#msg-simple/1.2": { + "com/github/java-json-tools#msg-simple/1.2": { "jar": "sha256-vvQRG5k6Wz5hSNj1hWIczqwqGInNvDREixFjLg2Kmo8=", "pom": "sha256-bvPzUgcukUz6FzkzRoXyotAAJRL8Ul+kEtSQ1FCUMKM=" }, - "repo.maven.apache.org/maven2/com/github/java-json-tools#uri-template/0.10": { + "com/github/java-json-tools#uri-template/0.10": { "jar": "sha256-OTb2fY59+j7t7+RQ/1iHF0kwiYLGuLcGU1qIQ5HfT7A=", "pom": "sha256-MXithX0gGmwpZy4rFGrAuj7MUlNquZaUpGuxJfoBxrk=" }, - "repo.maven.apache.org/maven2/com/github/jnr#jffi/1.3.9": { + "com/github/jnr#jffi/1.3.9": { "jar": "sha256-1zwPAKXOnb88teW7JpGjJso4giBeyaBs65AGU3En5mE=", "pom": "sha256-zEqmwymkRXqBhdvE2iH17AYuIiWux5wgCDsg11ESehw=" }, - "repo.maven.apache.org/maven2/com/github/jnr#jffi/1.3.9/native": { + "com/github/jnr#jffi/1.3.9/native": { "jar": "sha256-vd/kYNUoxopx0NTJ0wEi8o9vGC+eu0vo9l5wkMTKiBw=" }, - "repo.maven.apache.org/maven2/com/github/jnr#jnr-a64asm/1.0.0": { + "com/github/jnr#jnr-a64asm/1.0.0": { "jar": "sha256-U65ep/pcKE6Ceao0jnud5FSLDK4Qv9BY+iF8eRh15M8=", "pom": "sha256-ndnCmco+ySh9suwmVxpcxhHcIaGk9dLvElWpJPrOR6g=" }, - "repo.maven.apache.org/maven2/com/github/jnr#jnr-constants/0.10.3": { + "com/github/jnr#jnr-constants/0.10.3": { "jar": "sha256-phew2EY9PqNkNb0WERE97bN0kVev0iaZCKswbJkq7+0=", "pom": "sha256-5s/r5K5E3pah7I7j/z6xE07Uk7ChWymoZj45tv2rp6I=" }, - "repo.maven.apache.org/maven2/com/github/jnr#jnr-enxio/0.32.13": { + "com/github/jnr#jnr-enxio/0.32.13": { "jar": "sha256-08ATbrAXYJIhDVyHDb4w8dkrQ9c+6bHkqGHijGRgUnw=", "pom": "sha256-pcrvbflKJYBULdQsZzN004RQ2W+82Od8mOaoX4ln/Tk=" }, - "repo.maven.apache.org/maven2/com/github/jnr#jnr-ffi/2.2.11": { + "com/github/jnr#jnr-ffi/2.2.11": { "jar": "sha256-qcC955JRTZLonxneBBLF4m7nLbWYkUAkKykCpDt6x/U=", "pom": "sha256-i+JCWRyszLbK6dpwD0Nz3a0Adg6NpnlpepgSi7QqX3s=" }, - "repo.maven.apache.org/maven2/com/github/jnr#jnr-posix/3.1.15": { + "com/github/jnr#jnr-posix/3.1.15": { "jar": "sha256-w47PzNJOXyHxemLkXVvUVIQsXbF+1CsBuGj5IG0Omec=", "pom": "sha256-qjwjbl+8bsNl5MgR7OpNvKdZGFHOx8eh32syTE6wgqM=" }, - "repo.maven.apache.org/maven2/com/github/jnr#jnr-unixsocket/0.38.17": { + "com/github/jnr#jnr-unixsocket/0.38.17": { "jar": "sha256-mPYscZs0gUV/Jf0l4lAqznqQ1F91olVOvPy2vgsWGhc=", "pom": "sha256-3oSBWeFSRkTp8cV0r39Gt1Hm5TDzWifutMhT6R6hwuE=" }, - "repo.maven.apache.org/maven2/com/github/jnr#jnr-x86asm/1.0.2": { + "com/github/jnr#jnr-x86asm/1.0.2": { "jar": "sha256-OfNnW5EObpuTgl+ChL7J9K0wRM0gpvfI/54vhpXr8h4=", "pom": "sha256-6oYs472WzLjKNrjp57rvLaP7v73CVrrqqMioc5EQdOc=" }, - "repo.maven.apache.org/maven2/com/github/oshi#oshi-core/6.4.4": { + "com/github/oshi#oshi-core/6.4.4": { "jar": "sha256-Qj70zXIge3OpGXvVw1FMOzNqcG5E8t+9Hp2hT3UTXc4=", "pom": "sha256-LQP0hyNVDZCjSpqrK8EAY2jRaaxvpQnLAbHbKbueOFo=" }, - "repo.maven.apache.org/maven2/com/github/oshi#oshi-parent/6.4.4": { + "com/github/oshi#oshi-parent/6.4.4": { "pom": "sha256-jNu7z13zPmIDXCUQWKKb7LK6e9R+LjqsDtyKrvfl+dA=" }, - "repo.maven.apache.org/maven2/com/github/stephenc/jcip#jcip-annotations/1.0-1": { + "com/github/stephenc/jcip#jcip-annotations/1.0-1": { "jar": "sha256-T8z/g4Kq/FiZYsTtsmL2qlleNPHhHmEFfRxqluj8cyM=", "pom": "sha256-aMKlqm6PNFdDCT5StbngGQuk1aUhXApZtNfTNkcgjLs=" }, - "repo.maven.apache.org/maven2/com/google/code/findbugs#jsr305/2.0.1": { + "com/google/code/findbugs#jsr305/2.0.1": { "pom": "sha256-AsEsPCrhLdR1IZ/2kcgqTZ6iH0S8WUoYEpW/bUPc+7A=" }, - "repo.maven.apache.org/maven2/com/google/code/findbugs#jsr305/3.0.2": { + "com/google/code/findbugs#jsr305/3.0.2": { "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" }, - "repo.maven.apache.org/maven2/com/google/code/gson#gson-parent/2.10.1": { + "com/google/code/gson#gson-parent/2.10.1": { "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM=" }, - "repo.maven.apache.org/maven2/com/google/code/gson#gson/2.10.1": { + "com/google/code/gson#gson/2.10.1": { "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=", "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc=" }, - "repo.maven.apache.org/maven2/com/google/errorprone#error_prone_annotations/2.18.0": { + "com/google/errorprone#error_prone_annotations/2.18.0": { "jar": "sha256-nmgUy3GBaYik/RsHqZOo8hu3BY1SLBYrHehJ4ZvqVK4=", "pom": "sha256-kgE1eX3MpZF7WlwBdkKljTQKTNG80S9W+JKlZjvXvdw=" }, - "repo.maven.apache.org/maven2/com/google/errorprone#error_prone_parent/2.18.0": { + "com/google/errorprone#error_prone_parent/2.18.0": { "pom": "sha256-R/Iumce/RmOR3vFvg3eYXl07pvW7z2WFNkSAVRPhX60=" }, - "repo.maven.apache.org/maven2/com/google/guava#failureaccess/1.0.1": { + "com/google/guava#failureaccess/1.0.1": { "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=", "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk=" }, - "repo.maven.apache.org/maven2/com/google/guava#guava-parent/26.0-android": { + "com/google/guava#guava-parent/26.0-android": { "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" }, - "repo.maven.apache.org/maven2/com/google/guava#guava-parent/32.1.1-jre": { + "com/google/guava#guava-parent/32.1.1-jre": { "pom": "sha256-BqpdGsBo8vgJUw8/9T+1yMlAFSolNiPQtTxPU/WhOj0=" }, - "repo.maven.apache.org/maven2/com/google/guava#guava/32.1.1-jre": { + "com/google/guava#guava/32.1.1-jre": { "jar": "sha256-kfu6N/HIslHPnqnn06Np63nrHmpd8dS79IPdA4B0AoE=", "module": "sha256-pY+TjSOeaYtZs8OcrVgO/Ro/1MoTq5KzBCbUJFLE7z4=", "pom": "sha256-LJBx19FSKwx2IFfDToub+uOZJ6DrdVw2qnZRlyGHDXs=" }, - "repo.maven.apache.org/maven2/com/google/j2objc#j2objc-annotations/2.8": { + "com/google/j2objc#j2objc-annotations/2.8": { "jar": "sha256-8CqV+hpele2z7YWf0Pt99wnRIaNSkO/4t03OKrf01u0=", "pom": "sha256-N/h3mLGDhRE8kYv6nhJ2/lBzXvj6hJtYAMUZ1U2/Efg=" }, - "repo.maven.apache.org/maven2/com/googlecode/libphonenumber#libphonenumber-parent/8.11.1": { + "com/googlecode/libphonenumber#libphonenumber-parent/8.11.1": { "pom": "sha256-X12sUXT4TGCi6Z56g8eCb3NJgfvCDqHUN/em/Piq2hY=" }, - "repo.maven.apache.org/maven2/com/googlecode/libphonenumber#libphonenumber/8.11.1": { + "com/googlecode/libphonenumber#libphonenumber/8.11.1": { "jar": "sha256-9DDJI5TCBT8WhxWFPaltmZlulONOWikbl8XIalrWKpg=", "pom": "sha256-irUVuq10qC2rsC6+nm8XLUj0r+0KyAxn7aKIRqbN7dA=" }, - "repo.maven.apache.org/maven2/com/jayway/jsonpath#json-path/2.7.0": { + "com/jayway/jsonpath#json-path/2.7.0": { "jar": "sha256-3oLw5GAu6gGH3zZ3mujPwWU7bZIBJWdK9NNl0LyllQg=", "pom": "sha256-F5akBRkEB7LqzgQlhmlKmy/w2XuCAJ016VyeIVDN0Mc=" }, - "repo.maven.apache.org/maven2/com/jcraft#jzlib/1.1.3": { + "com/jcraft#jzlib/1.1.3": { "jar": "sha256-ibE2D0Bzgb9h/eQRAZ2MvQCeuxDP9xXzZpAXoDECdWA=", "pom": "sha256-7bZyUWCFVq2VhNAORrXvOOzxJG1XHA+A8k9QsoWp9oI=" }, - "repo.maven.apache.org/maven2/com/lmax#disruptor/3.4.4": { + "com/lmax#disruptor/3.4.4": { "jar": "sha256-FSTtMfE7yr7hthRuZ74wxjF8uU/NDHwvfHofPoIIfFE=", "pom": "sha256-34QNrLNYveyOnBZAlyHksOsFJGF9QkJt9yg3b8WHQi8=" }, - "repo.maven.apache.org/maven2/com/networknt#json-schema-validator/1.0.76": { + "com/networknt#json-schema-validator/1.0.76": { "jar": "sha256-CbdNrjzp+L4eeUm979MWQt3aWD4us1ZDnSn5QRMB6uA=", "pom": "sha256-+gTgetjg62RK7LCU6USfD7GSxne3ywqurvL1ndq6UHc=" }, - "repo.maven.apache.org/maven2/com/nimbusds#nimbus-jose-jwt/9.28": { + "com/nimbusds#nimbus-jose-jwt/9.28": { "jar": "sha256-7bukLZl+N6zws2zk1anErIjv2ILOVwfzXnUZaul2LkU=", "pom": "sha256-5rSewLgGmFClCxkWO1b8eoiyU6D2R7Su5uH7mAGnsnU=" }, - "repo.maven.apache.org/maven2/com/nytimes/android#cache/2.0.2": { + "com/nytimes/android#cache/2.0.2": { "jar": "sha256-AyLQrW+wm6xEH8wBJyuVbUvrUbHkLdaPm4prCoH1uLU=", "pom": "sha256-+YA4MgoWLGV7SllvKp9pmkHY2Wg/F/6XQgMdoNT3rjM=" }, - "repo.maven.apache.org/maven2/com/samskivert#jmustache/1.15": { + "com/samskivert#jmustache/1.15": { "jar": "sha256-GuuWudwXvClUC4wzQujpHul01cYEFl7NRp3XawQcJQw=", "pom": "sha256-Z77EYiZJjJBFuqct8cnH9mG4XOObYni2TWign0Xry1k=" }, - "repo.maven.apache.org/maven2/com/sangupta#murmur/1.0.0": { + "com/sangupta#murmur/1.0.0": { "jar": "sha256-Mmj1Ag+5oi0slAwazBDllj2IxFLbMdn0YQo0LOftGio=", "pom": "sha256-iR3ql2IvUijfrV1DCHUq9kJ9GgbfxrRIwuC2vrNwO1Q=" }, - "repo.maven.apache.org/maven2/com/squareup/moshi#moshi-kotlin/1.12.0": { + "com/squareup/moshi#moshi-kotlin/1.12.0": { "jar": "sha256-HENsB8FZzRrwMrt5NRpIqY5/eBrIB8/4tXEamZtWZt8=", "module": "sha256-KnvKZtbM8WhVy1oKp8lRWPaIklomPv5MIEsjclSGH6E=", "pom": "sha256-gwdSmAK8nLCHd24CabvdaSBG+kpz8ZDVgUpaj5JmJ24=" }, - "repo.maven.apache.org/maven2/com/squareup/moshi#moshi/1.12.0": { + "com/squareup/moshi#moshi/1.12.0": { "jar": "sha256-7pCR4dGlkm+ptN8mQsH7e7lq7Ahjm2IZwZ4LhyTUJHU=", "module": "sha256-uGqTFURxITGVpEL4XKBG55oAHG1EbEHU0WiTbahW6+I=", "pom": "sha256-YbyUJDqTc9mUini25xAAl161EPtvf0aoHq/N3TgeR3k=" }, - "repo.maven.apache.org/maven2/com/squareup/okhttp3#okhttp-tls/4.11.0": { + "com/squareup/okhttp3#okhttp-tls/4.11.0": { "jar": "sha256-SuTHCSwBeBhSRQabkSdGX9V8dkSF81ev7USlxIoFNf0=", "module": "sha256-2m5O5qfdybnUZusr5ScBAmsXms2wClyso08uXTdeSMI=", "pom": "sha256-0SYiMcXxtb/bVe/7+SXas1/dWlNFEvhsSd3HIGY/IEg=" }, - "repo.maven.apache.org/maven2/com/squareup/okhttp3#okhttp/4.11.0": { + "com/squareup/okhttp3#okhttp/4.11.0": { "jar": "sha256-7o9r1s0SVwE9dIMw9MoUdjip+8tS+ziNWsk89TQIdF0=", "module": "sha256-VnwltR13eWF0Q5GE11JBK6l+2f22X8cYQNvFVjvrj6g=", "pom": "sha256-ei1Cezixfgdtpk7o0hAuZIiNyyOK7l4tukp3UslKP94=" }, - "repo.maven.apache.org/maven2/com/squareup/okio#okio-jvm/3.2.0": { + "com/squareup/okio#okio-jvm/3.2.0": { "jar": "sha256-tkK670xXAFXeTLPRZnsrFtztkB/4BmNFoGNpGqBgJaQ=", "module": "sha256-p3jzkIXtar/NaHESmGxjhapXrC2IQLIdlGs8IJXzDqQ=", "pom": "sha256-XEUflKdr6oYbbvK/hOj1cgBUWWjIZVWr3+0Tx8otSJ0=" }, - "repo.maven.apache.org/maven2/com/squareup/okio#okio-multiplatform/2.9.0": { + "com/squareup/okio#okio-multiplatform/2.9.0": { "module": "sha256-JA9DK32vz1cfuOx8s48eiQiPFsjN92gq9Wt3I5FKw2A=", "pom": "sha256-NywwDgfKvA3u89B/QoPQfESwoS89XoV9WYT5UYCPdsY=" }, - "repo.maven.apache.org/maven2/com/squareup/okio#okio/3.2.0": { + "com/squareup/okio#okio/3.2.0": { "module": "sha256-aB9c7BcN5FuVST6e5wWGjrNa34mO4G+W4i0ZclDBsQQ=", "pom": "sha256-i0b1jZua6xF4Nh1YpoZfTa1mWTDF/3tV4LqmHvOpcqE=" }, - "repo.maven.apache.org/maven2/com/sun/activation#all/2.0.1": { + "com/sun/activation#all/2.0.1": { "pom": "sha256-ZI1dYrYVP0LxkM7S1ucMHmRCVQyc/rZvvuCWHGYWssw=" }, - "repo.maven.apache.org/maven2/com/sun/activation#jakarta.activation/2.0.1": { + "com/sun/activation#jakarta.activation/2.0.1": { "jar": "sha256-ueJLfdbgdJVWLqllMb4xMMltuk144d/Yitu96/QzKHE=", "pom": "sha256-igaFktsI5oUyBP8LYlowFDjjw26l8a5lur/tIIUCeBo=" }, - "repo.maven.apache.org/maven2/com/sun/mail#all/1.6.2": { + "com/sun/mail#all/1.6.2": { "pom": "sha256-S36Dqpt31l4AfpfLUPm4nNt1T6rxZBHl/ZTR49q3brM=" }, - "repo.maven.apache.org/maven2/com/sun/mail#mailapi/1.6.2": { + "com/sun/mail#mailapi/1.6.2": { "jar": "sha256-03wPiO+llzzLQQD0zEmu41EM0BqyUBLR8IWxt5iuLrs=", "pom": "sha256-PPiVwnXN1NlmmFtwGYwVAaTl/UqfbYGDiGJKm24oCMA=" }, - "repo.maven.apache.org/maven2/com/sun/xml/bind#jaxb-bom-ext/4.0.1": { + "com/sun/xml/bind#jaxb-bom-ext/4.0.1": { "pom": "sha256-q7S3Gd3TFWhM1/W/iebXU2XC4I8wCVmsbF9SyjioLxk=" }, - "repo.maven.apache.org/maven2/com/sun/xml/bind#jaxb-core/4.0.1": { + "com/sun/xml/bind#jaxb-core/4.0.1": { "jar": "sha256-EIaQnLEwQzA52OKGW/Mxr2KNmSvO8QqV9y3BIasCB3U=", "pom": "sha256-GmaseJTWVDkAz/EMuxD0hZ68DoQHbYPpP1ybc8wx3lY=" }, - "repo.maven.apache.org/maven2/com/sun/xml/bind#jaxb-impl/4.0.1": { + "com/sun/xml/bind#jaxb-impl/4.0.1": { "jar": "sha256-2XplOnj4z5pt6azznU7ZHaOQe/7XSOhzCmLDD58+ycE=", "pom": "sha256-rywz0zS9LjOZLR+fQqSItix5SdweJqpEJ5kMUn4vbZ0=" }, - "repo.maven.apache.org/maven2/com/sun/xml/bind/mvn#jaxb-bundles/4.0.1": { + "com/sun/xml/bind/mvn#jaxb-bundles/4.0.1": { "pom": "sha256-sBFLQhIwN6zURDEpu2pdhvCVtdzSLt7wGrGpNvxRcIk=" }, - "repo.maven.apache.org/maven2/com/sun/xml/bind/mvn#jaxb-parent/4.0.1": { + "com/sun/xml/bind/mvn#jaxb-parent/4.0.1": { "pom": "sha256-URxR71bIkbZ15LYenyNqUDCVLBBy/5RgQBgXoQRT+K4=" }, - "repo.maven.apache.org/maven2/com/thoughtworks/xstream#xstream-parent/1.4.20": { + "com/thoughtworks/xstream#xstream-parent/1.4.20": { "pom": "sha256-ERiJ4wIWWg9EpU3k23BSUNHeDckbp4oZih0ieDRL7uc=" }, - "repo.maven.apache.org/maven2/com/thoughtworks/xstream#xstream/1.4.20": { + "com/thoughtworks/xstream#xstream/1.4.20": { "jar": "sha256-h98PC+V8kgN9ARD7siWjC2UXAtwnVlPSha/P7zG8LoE=", "pom": "sha256-c9gezjnpSh0tf80BhGYqo9QQa/6XCbeTlkiS4+f0/cQ=" }, - "repo.maven.apache.org/maven2/com/tunnelvisionlabs#antlr4-master/4.7.3": { + "com/tunnelvisionlabs#antlr4-master/4.7.3": { "pom": "sha256-5KRpWtziLRuHurCavYZ3vnAzbd+63YbTnIAsAMRctro=" }, - "repo.maven.apache.org/maven2/com/tunnelvisionlabs#antlr4-runtime/4.7.3": { + "com/tunnelvisionlabs#antlr4-runtime/4.7.3": { "jar": "sha256-X08MQDHkuDyzae8A9JCc229isR49JT+DphhNgMXrMVc=", "pom": "sha256-jcFqM2Rg2Fc4wPw+JKyUwGNwmwHZFYOOBV/PaAFgXV0=" }, - "repo.maven.apache.org/maven2/commons-beanutils#commons-beanutils/1.9.4": { + "commons-beanutils#commons-beanutils/1.9.4": { "jar": "sha256-fZOMgXiQKARcCMBl6UvnX8KAUnYg1b1itRnVg4UyNoo=", "pom": "sha256-w1zKe2HUZ42VeMvAuQG4cXtTmr+SVEQdp4uP5g3gZNA=" }, - "repo.maven.apache.org/maven2/commons-codec#commons-codec/1.15": { + "commons-codec#commons-codec/1.15": { "jar": "sha256-s+n21jp5AQm/DQVmEfvtHPaQVYJt7+uYlKcTadJG7WM=", "pom": "sha256-yG7hmKNaNxVIeGD0Gcv2Qufk2ehxR3eUfb5qTjogq1g=" }, - "repo.maven.apache.org/maven2/commons-codec#commons-codec/1.9": { + "commons-codec#commons-codec/1.9": { "jar": "sha256-rRnSYBw6vwuUa1w6QRPiJqjB4zBeOVuQATt43ZSnI84=", "pom": "sha256-5e/PA5zZCWiMIB3FR5sUT9bwHw5AJSt/xefS4bXAeZA=" }, - "repo.maven.apache.org/maven2/commons-collections#commons-collections/3.2.2": { + "commons-collections#commons-collections/3.2.2": { "jar": "sha256-7urpF5FxRKaKdB1MDf9mqlxcX9hVk/8he87T/Iyng7g=", "pom": "sha256-1dgfzCiMDYxxHDAgB8raSqmiJu0aES1LqmTLHWMiFws=" }, - "repo.maven.apache.org/maven2/commons-io#commons-io/2.11.0": { + "commons-io#commons-io/2.11.0": { "jar": "sha256-lhsvbYfbrMXVSr9Fq3puJJX4m3VZiWLYxyPOqbwhCQg=", "pom": "sha256-LgFv1+MkS18sIKytg02TqkeQSG7h5FZGQTYaPoMe71k=" }, - "repo.maven.apache.org/maven2/commons-io#commons-io/2.4": { + "commons-io#commons-io/2.4": { "jar": "sha256-zGpB3D6qzJ5ECmvQ0okLINNrTuQI/i1nEi8yi7bgFYE=", "pom": "sha256-srXdRs+Zj6Ym62+KHBFPYWfI05JpQWTmJTPliY6bMfI=" }, - "repo.maven.apache.org/maven2/commons-logging#commons-logging/1.2": { + "commons-logging#commons-logging/1.2": { "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" }, - "repo.maven.apache.org/maven2/de/undercouch#gradle-download-task/5.4.0": { + "de/undercouch#gradle-download-task/5.4.0": { "jar": "sha256-JsVNuzwLnvITSpqanOcC6qyjbsFUnB3NJVv5SiRqjlQ=", "module": "sha256-ttq8wyBMhKj4+Eh00qFkQ6thI2PP5SfBAngVuxJ7+sE=", "pom": "sha256-jlGpL1k66bZZxEYWIcTymIP4l+EC1SIWZFmBsbQJiYU=" }, - "repo.maven.apache.org/maven2/de/undercouch/download#de.undercouch.download.gradle.plugin/5.4.0": { + "de/undercouch/download#de.undercouch.download.gradle.plugin/5.4.0": { "pom": "sha256-4NrTSpBgtpqatLk0VkOHq5IW2hwphf4BVrQNgfTYMAE=" }, - "repo.maven.apache.org/maven2/io/fabric8#kubernetes-client-bom/5.12.2": { + "io/fabric8#kubernetes-client-bom/5.12.2": { "pom": "sha256-6qA8FpVlaNVKa6Q31J1Ay/DdjpOXf5hDGCQldrZQvDs=" }, - "repo.maven.apache.org/maven2/io/github/classgraph#classgraph/4.8.154": { + "io/github/classgraph#classgraph/4.8.154": { "jar": "sha256-8LBLXXexjtow8h+NHDXNbiuMsv8PmsRuc71yekdW39E=", "pom": "sha256-Irh7X4jt0O1kE2d4w9XluyqenqONrkg8+pOoAn3Qgd0=" }, - "repo.maven.apache.org/maven2/io/github/x-stream#mxparser/1.2.2": { + "io/github/x-stream#mxparser/1.2.2": { "jar": "sha256-ru7iOjMD2BG8qHkOp/JbU0MUhhwDz/Ntr9zCGAlp65c=", "pom": "sha256-I1AiQk4S8zGB9iraGcxEKAGbaXZXw8OSzjVxYKQi+qg=" }, - "repo.maven.apache.org/maven2/io/netty#netty-bom/4.1.86.Final": { + "io/netty#netty-bom/4.1.86.Final": { "pom": "sha256-EnFsH+ZM9b2qcETTfROq46iIIbkdR5hCDEanR2kXiv0=" }, - "repo.maven.apache.org/maven2/io/netty#netty-buffer/4.1.86.Final": { + "io/netty#netty-buffer/4.1.86.Final": { "jar": "sha256-5C4V9HyGUmax+qbgOOv9fdrc+fSunmYX7dSIHb1Kvog=", "pom": "sha256-AuVYTl+waYU7QYqRQ15Xdxp2efcf8Ex6K+UXzdOGZF0=" }, - "repo.maven.apache.org/maven2/io/netty#netty-codec-http/4.1.86.Final": { + "io/netty#netty-codec-http/4.1.86.Final": { "jar": "sha256-P2zrMRLPz3twVF61ERIgzlfbVNWT8j9kw4MzuyLEC4Q=", "pom": "sha256-Gk2fY66Da5YHWhrQ/QBLUOAerjgqx6BnqPGhtnn/v14=" }, - "repo.maven.apache.org/maven2/io/netty#netty-codec-http2/4.1.86.Final": { + "io/netty#netty-codec-http2/4.1.86.Final": { "jar": "sha256-6Ojijmq2u5ia7ZBHeJIgRfOIz7QgvB6zer9N+IAdsWc=", "pom": "sha256-E79xRBBCtPvWvrk+VMLnVy11UUJy6JCerJxYxFM4RNE=" }, - "repo.maven.apache.org/maven2/io/netty#netty-codec-socks/4.1.86.Final": { + "io/netty#netty-codec-socks/4.1.86.Final": { "jar": "sha256-g4ovRmeOhKu37XZiR9A4y4Xfr8SA/4wsXkLZHZnF/00=", "pom": "sha256-qmEWU5aTLf+2bzyVEX8jx+jGUjx9G6uBH9k0SVhJij8=" }, - "repo.maven.apache.org/maven2/io/netty#netty-codec/4.1.86.Final": { + "io/netty#netty-codec/4.1.86.Final": { "jar": "sha256-BFaEC1yFHa1sq4gc0amtXZFttl2BBIFF3x2abQMyW+o=", "pom": "sha256-6PLkDv2+igJXYhulUNlS53RK1wlXf+ITQXsvya8zJUI=" }, - "repo.maven.apache.org/maven2/io/netty#netty-common/4.1.86.Final": { + "io/netty#netty-common/4.1.86.Final": { "jar": "sha256-o1o/FufNRcXYUpqj53AtTvOzYhPqMy21l0TqNI/Crpk=", "pom": "sha256-PhYyrWMX3D24rTt3V9I/l3lXHXKNvGrUAyoZqItQ64k=" }, - "repo.maven.apache.org/maven2/io/netty#netty-handler-proxy/4.1.86.Final": { + "io/netty#netty-handler-proxy/4.1.86.Final": { "jar": "sha256-uBL+fXLIT7yE5TtPJnZNgvdrBqZfMx8PvZVDqnPhj5E=", "pom": "sha256-6KOsTrx3EaCm5UZS2DK1uUiCdlFtPpGyaGKGxxEwafc=" }, - "repo.maven.apache.org/maven2/io/netty#netty-handler/4.1.86.Final": { + "io/netty#netty-handler/4.1.86.Final": { "jar": "sha256-5ptCKSkpsnjcUi4lF33ffFQCVIS1WHn4InNJrfvhwE0=", "pom": "sha256-MtNruk2l9kv9vau0PHGVXnzQ6dZ5BTHU0/6XiCp+YKs=" }, - "repo.maven.apache.org/maven2/io/netty#netty-parent/4.1.86.Final": { + "io/netty#netty-parent/4.1.86.Final": { "pom": "sha256-HZIrfai+sQMcrCpfr89xnOZyyyy2nuzJw4PzCswWUBM=" }, - "repo.maven.apache.org/maven2/io/netty#netty-resolver/4.1.86.Final": { + "io/netty#netty-resolver/4.1.86.Final": { "jar": "sha256-diihMJ1/JEPcQdiSOn8mnimBuWFvgKmZ63JkrmvL/bo=", "pom": "sha256-q/IkL64IwCALGC91P6pvP0g+wdpt2waO5xfwTOBCB/k=" }, - "repo.maven.apache.org/maven2/io/netty#netty-tcnative-boringssl-static/2.0.56.Final": { + "io/netty#netty-tcnative-boringssl-static/2.0.56.Final": { "jar": "sha256-eS2vMLQmGm6uvmUsFxqq4Qr/GBoomT7GWUJtiefzafg=", "pom": "sha256-jiXf4zBSV9HHQ1tgk6oqvu8yXN3rAjgxYaRqHF+QcOc=" }, - "repo.maven.apache.org/maven2/io/netty#netty-tcnative-classes/2.0.56.Final": { + "io/netty#netty-tcnative-classes/2.0.56.Final": { "jar": "sha256-7t6Afw3V6xrXTqGuEJRDBjHaY/zeANTcIOsM0Ei7CsM=", "pom": "sha256-XvARmSCV3II/sBw7MUKMSmypKnvem7jyetY4DqolYjY=" }, - "repo.maven.apache.org/maven2/io/netty#netty-tcnative-parent/2.0.56.Final": { + "io/netty#netty-tcnative-parent/2.0.56.Final": { "pom": "sha256-PuDTYrA0q7bTmnEE8G7g0fruIz9MrTVQwwuFKFeaPWE=" }, - "repo.maven.apache.org/maven2/io/netty#netty-transport-native-unix-common/4.1.86.Final": { + "io/netty#netty-transport-native-unix-common/4.1.86.Final": { "jar": "sha256-7CbQOgZWV5HVfpl/eTZ37k0/xHspC3lRiYwuzQIy8RU=", "pom": "sha256-HLTiJ560F+3OKE9xvflhQYMmTyLwUNxTcm9W3w9SC5U=" }, - "repo.maven.apache.org/maven2/io/netty#netty-transport/4.1.86.Final": { + "io/netty#netty-transport/4.1.86.Final": { "jar": "sha256-9nJtzVTkkitGs7T0RntEOnCjDrCKYmIMj+UC2MuALJ8=", "pom": "sha256-hc9ax3wb90xRqFFVexdXE560zS0KW2HK4oSfRvy1ldo=" }, - "repo.maven.apache.org/maven2/io/prometheus#parent/0.16.0": { + "io/prometheus#parent/0.16.0": { "pom": "sha256-citVEZCXsE1xFHnftg3VSye1kgoa63cCAnxEohX/xZY=" }, - "repo.maven.apache.org/maven2/io/prometheus#simpleclient/0.16.0": { + "io/prometheus#simpleclient/0.16.0": { "jar": "sha256-IsN08jf3vE/bHw7C2jecC6AOaa0v/otq3lQ9cwYtN38=", "pom": "sha256-/sCA0HqxWHXZccSugflR2mG1z/mZHPUOUwuo/KR3CXM=" }, - "repo.maven.apache.org/maven2/io/prometheus#simpleclient_common/0.16.0": { + "io/prometheus#simpleclient_common/0.16.0": { "jar": "sha256-66bsJs5+QMu4cl4F+4Mkep9PRJRbnnUi4zdd3me58Fk=", "pom": "sha256-d/ARCc4VB710Q+InJzdnSydST6rLDcuW47jt4LarnrY=" }, - "repo.maven.apache.org/maven2/io/prometheus#simpleclient_httpserver/0.16.0": { + "io/prometheus#simpleclient_httpserver/0.16.0": { "jar": "sha256-yrh94QtqR0FRzO68O2NDKalz/7YCzm7+8sD9l6kDZcg=", "pom": "sha256-PGR/1vVhohsZ7ZcdBBn9Ri2fg/k0e8ChBaHCie6qqsQ=" }, - "repo.maven.apache.org/maven2/io/prometheus#simpleclient_tracer/0.16.0": { + "io/prometheus#simpleclient_tracer/0.16.0": { "pom": "sha256-OBK7IrlfgbTDRg6eTnXDunL6ReRDqfzlMghCqr0OmcI=" }, - "repo.maven.apache.org/maven2/io/prometheus#simpleclient_tracer_common/0.16.0": { + "io/prometheus#simpleclient_tracer_common/0.16.0": { "jar": "sha256-6Ep4SsjiTxgu5i2oC2tcgUB3S3W/pL+cw9O4OQ22JfY=", "pom": "sha256-X5AHXOz80RKB3pzLSJaNEhKyRnDWhP/IQEQaUq6HXv8=" }, - "repo.maven.apache.org/maven2/io/prometheus#simpleclient_tracer_otel/0.16.0": { + "io/prometheus#simpleclient_tracer_otel/0.16.0": { "jar": "sha256-oqhMWb7zeWu3+cbyrot96LkFMT7ygYCsPef/Yd1o3z8=", "pom": "sha256-frl58dwz6L5OWtFDDlQJcYpBeDwmd5qzEFJg9rQ20EY=" }, - "repo.maven.apache.org/maven2/io/prometheus#simpleclient_tracer_otel_agent/0.16.0": { + "io/prometheus#simpleclient_tracer_otel_agent/0.16.0": { "jar": "sha256-etK7QN90p3LZ9URaPQNXm0nWs3pH1ekPbPP1ns9BrQY=", "pom": "sha256-VSj4WIQ1SulNm8BnR+f1iS0JLAtVBVrnBWZo6gyhznw=" }, - "repo.maven.apache.org/maven2/io/reactivex/rxjava3#rxjava/3.1.6": { + "io/reactivex/rxjava3#rxjava/3.1.6": { "jar": "sha256-NGgr0+xvBDxd77WJotGBE7o+LSNy3UAXRPjkgVwdtjg=", "module": "sha256-xLSmhqW/xXqx3ud42SR1l8LtzDU3d2nbtMWuPQV000Q=", "pom": "sha256-sfaISn2fJzghY7nkaKlfKNtls7j2tIhVieZ6C7zjw1E=" }, - "repo.maven.apache.org/maven2/io/sentry#sentry/6.25.0": { + "io/sentry#sentry/6.25.0": { "jar": "sha256-QkQ2zF0SuRoCxvrazTDaf74NPcfoprvSygQEWMLw68w=", "pom": "sha256-xMKzUiPvr/ZFvCRUcAqtmn+WcZjYDr3hLzDsbB0uq60=" }, - "repo.maven.apache.org/maven2/io/swagger#swagger-annotations/1.6.9": { + "io/swagger#swagger-annotations/1.6.9": { "jar": "sha256-fvhZdOXYL8q9DavSxFXNgDeLNtd03gF86shCo6T6ZPg=", "pom": "sha256-6BtJB3W1C6snD7sLb7wKoda0wHS6GFuwUrjsMTFIPmk=" }, - "repo.maven.apache.org/maven2/io/swagger#swagger-compat-spec-parser/1.0.64": { + "io/swagger#swagger-compat-spec-parser/1.0.64": { "jar": "sha256-zkFPC8rqxSFq7q/Wivre+J/TPc4m+Zba3uDGO5UWPAM=", "pom": "sha256-DK2rKrdbuIf3HmIl5RiL9KxTiWKHQ+JQrCsUwwOaCfo=" }, - "repo.maven.apache.org/maven2/io/swagger#swagger-core/1.6.9": { + "io/swagger#swagger-core/1.6.9": { "jar": "sha256-QPtMcZBJR65H+f/P6+3v3mMNiUfhwbtmdDu8QPB7ngE=", "pom": "sha256-3y2nBUrbCjZR1NQ87aKblNXd0Fhz0tgU1OSXe6cPSek=" }, - "repo.maven.apache.org/maven2/io/swagger#swagger-models/1.6.9": { + "io/swagger#swagger-models/1.6.9": { "jar": "sha256-zwtTERHMwCqAE3nXQ8jjPwL7x5BpiqIOYsYvR22oyVo=", "pom": "sha256-YNg3lgDJP0qyFYkWJ6cednc+KiSitd1n/DkkWSjxv2s=" }, - "repo.maven.apache.org/maven2/io/swagger#swagger-parser-project/1.0.64": { + "io/swagger#swagger-parser-project/1.0.64": { "pom": "sha256-tMVYXqpLuz2i3XNVaP4YdG+8DwhTzXRjF9tQoRRN6eQ=" }, - "repo.maven.apache.org/maven2/io/swagger#swagger-parser/1.0.64": { + "io/swagger#swagger-parser/1.0.64": { "jar": "sha256-IgYs5/fEO7UodTpc8I/3tZ6A0e4hHxP92+rn3aaQsyg=", "pom": "sha256-Y7RH9HoMcUh8xP5tcIuXilfa32WaxvjnwjUPbmD5ryM=" }, - "repo.maven.apache.org/maven2/io/swagger#swagger-project/1.6.9": { + "io/swagger#swagger-project/1.6.9": { "pom": "sha256-bSqxGVAq0G+Apf8NdBzwshPFYXC1F2H8WRGuzY9RJEE=" }, - "repo.maven.apache.org/maven2/io/swagger/core/v3#swagger-annotations/2.2.8": { + "io/swagger/core/v3#swagger-annotations/2.2.8": { "jar": "sha256-Cvzf5Kd3X8zlHRBbj3yMpRRnbBa+pXFCNQPYOHd/Ed0=", "pom": "sha256-VhgFAUOpHf/pVfAn7PDg75Z310EbGyXBRsoZUXgQ2Zo=" }, - "repo.maven.apache.org/maven2/io/swagger/core/v3#swagger-core/2.2.8": { + "io/swagger/core/v3#swagger-core/2.2.8": { "jar": "sha256-c4Japfb0d8Y340xwIQspV7jpBL8PXA0yuqoqN9LDOiM=", "pom": "sha256-cwB0DaF4EVy0TpD+lk91x5UNgEm0n7br4tsXxwFDzE0=" }, - "repo.maven.apache.org/maven2/io/swagger/core/v3#swagger-models/2.2.8": { + "io/swagger/core/v3#swagger-models/2.2.8": { "jar": "sha256-s3I3ROAu1TADsWLViUqeF8QQxTOrKmlwtDCSHln032Y=", "pom": "sha256-p20h2UwizuLWBXr7py8sdDxwA7x1e3IXhY+E84CTXdE=" }, - "repo.maven.apache.org/maven2/io/swagger/core/v3#swagger-project/2.2.8": { + "io/swagger/core/v3#swagger-project/2.2.8": { "pom": "sha256-a17siOJKC8vQFj9ZEErvDwBtJ+S7CGG9ypgCW2f9lFc=" }, - "repo.maven.apache.org/maven2/io/swagger/parser/v3#swagger-parser-core/2.1.10": { + "io/swagger/parser/v3#swagger-parser-core/2.1.10": { "jar": "sha256-dWGrUJ6XLPu1LNmROSwuOQvBPQ/1+/ykJWDTBaG2UJM=", "pom": "sha256-lZbs9gLG/YGLNEOz68v0pN4cijVATcgL73aWsog0CW8=" }, - "repo.maven.apache.org/maven2/io/swagger/parser/v3#swagger-parser-project/2.1.10": { + "io/swagger/parser/v3#swagger-parser-project/2.1.10": { "pom": "sha256-R8bWO70ZDgOdpigmdcSWWTfnr7Tg8EHU9gPS0PIH5hM=" }, - "repo.maven.apache.org/maven2/io/swagger/parser/v3#swagger-parser-v2-converter/2.1.10": { + "io/swagger/parser/v3#swagger-parser-v2-converter/2.1.10": { "jar": "sha256-mAr5/FK/ftv8QMlUZViP3Nz1Bt2nqQYn/qnhBvBcI+s=", "pom": "sha256-9Oqs2CxPfKPy3+D+CT6EQs4vsC3TRSKIW2wr40KFm4o=" }, - "repo.maven.apache.org/maven2/io/swagger/parser/v3#swagger-parser-v3/2.1.10": { + "io/swagger/parser/v3#swagger-parser-v3/2.1.10": { "jar": "sha256-sa24NH67Y8+SsHt5v8sHWAzsCDQID13MNTz+8UHFr/c=", "pom": "sha256-ultheoFp1/obMPnRwt3q3Cd25b9vSp3Ycshwj9n67rk=" }, - "repo.maven.apache.org/maven2/io/swagger/parser/v3#swagger-parser/2.1.10": { + "io/swagger/parser/v3#swagger-parser/2.1.10": { "jar": "sha256-AyreTvUvSxReAlKLhog9Ftf6siz0iHkXKPxk0/mvxKM=", "pom": "sha256-4KEdmSQXRe3uUvmuOfVVLICg29b5+wah1q5nF+KDxyY=" }, - "repo.maven.apache.org/maven2/jakarta/activation#jakarta.activation-api/2.1.0": { + "jakarta/activation#jakarta.activation-api/2.1.0": { "jar": "sha256-VujZlAlf5JwoE4xgKRSC9m8Y0SrCtyDpOGl9zmoxNcc=", "pom": "sha256-hw0qdcyS4K7Dfo0WNxBVLTVDGJ6B6cqQCaMl33YMKwY=" }, - "repo.maven.apache.org/maven2/jakarta/platform#jakarta.jakartaee-bom/9.0.0": { + "jakarta/platform#jakarta.jakartaee-bom/9.0.0": { "pom": "sha256-kZA9Ddh23sZ/i5I/EzK6cr8pWwa9OX0Y868ZMHzhos4=" }, - "repo.maven.apache.org/maven2/jakarta/platform#jakartaee-api-parent/9.0.0": { + "jakarta/platform#jakartaee-api-parent/9.0.0": { "pom": "sha256-9l3PFLbh2RSOGYo5D6/hVfrKCTJT3ekAMH8+DqgsrTs=" }, - "repo.maven.apache.org/maven2/jakarta/validation#jakarta.validation-api/2.0.2": { + "jakarta/validation#jakarta.validation-api/2.0.2": { "jar": "sha256-tC1CQo89kiyJKpCfoEMofVd8DFsWWtm31WjOv4f8nqQ=", "pom": "sha256-Oy5Oh3+3C6+h2tdcDemZxFYTEoLUcbpR3z25bDt02pI=" }, - "repo.maven.apache.org/maven2/jakarta/xml/bind#jakarta.xml.bind-api-parent/3.0.1": { + "jakarta/xml/bind#jakarta.xml.bind-api-parent/3.0.1": { "pom": "sha256-nx+11KAun4/dYu876rlLj+p7gWQ3SMhvaKMfQPd0rVY=" }, - "repo.maven.apache.org/maven2/jakarta/xml/bind#jakarta.xml.bind-api-parent/4.0.0": { + "jakarta/xml/bind#jakarta.xml.bind-api-parent/4.0.0": { "pom": "sha256-4lW43VYeity88NHHus2uynK5Cr9BPy5//TSBd4rhCZA=" }, - "repo.maven.apache.org/maven2/jakarta/xml/bind#jakarta.xml.bind-api/3.0.1": { + "jakarta/xml/bind#jakarta.xml.bind-api/3.0.1": { "jar": "sha256-uPtL7j/1tcHvdxRNhBExYBjXu9Qfzx7eBkb3l4VGuGc=", "pom": "sha256-onPayXQUEv2dzM6ZESmHBteJ5YLcs1GXB19v0qWw6+o=" }, - "repo.maven.apache.org/maven2/jakarta/xml/bind#jakarta.xml.bind-api/4.0.0": { + "jakarta/xml/bind#jakarta.xml.bind-api/4.0.0": { "jar": "sha256-V+N5atV1NkAIj1+dPFPBg/LCULfa2QUp6j4ZpVFaoSI=", "pom": "sha256-a9atlG7ZyKRKJrYKX8zM/M9fyMy/v/SQS1kXs8aUACs=" }, - "repo.maven.apache.org/maven2/javax/servlet#javax.servlet-api/4.0.1": { + "javax/servlet#javax.servlet-api/4.0.1": { "jar": "sha256-g6A92HfTZ0V28Np7kHVchSSvCZzPBgf8YaqXFTWtfGA=", "pom": "sha256-FAVeYVW4oqYype7GoeW+DAoLo4D36T+ctMuPfk+Vm/E=" }, - "repo.maven.apache.org/maven2/joda-time#joda-time/2.12.5": { + "joda-time#joda-time/2.12.5": { "jar": "sha256-EGKEEey0DEY0GWxUTzRoGr3u+CbzdwljV0M9H5oTW8Y=", "pom": "sha256-QHV6ykQ5qWmPR1jyBsPFNxO1nNxVAd6W0WGKhPb/bH4=" }, - "repo.maven.apache.org/maven2/junit#junit/4.13.2": { + "junit#junit/4.12": { + "pom": "sha256-kPFj944/+28cetl96efrpO6iWAcUG4XW0SvmfKJUScQ=" + }, + "junit#junit/4.13.2": { "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" }, - "repo.maven.apache.org/maven2/net/bytebuddy#byte-buddy-agent/1.12.19": { + "net/bytebuddy#byte-buddy-agent/1.12.19": { "jar": "sha256-OnAkDefNzeBOfFBMIyfXA1ucJa4CBogeO/TmeYonPtg=", "pom": "sha256-taLP9kNoHeFof8QKzSUf7v38oj5nPgSfs8NpK1NSbUs=" }, - "repo.maven.apache.org/maven2/net/bytebuddy#byte-buddy-parent/1.12.19": { + "net/bytebuddy#byte-buddy-parent/1.12.19": { "pom": "sha256-cqtv70CegSkh9HKLPEtu9PpTvCX6uwSI/CyuNnNotU0=" }, - "repo.maven.apache.org/maven2/net/bytebuddy#byte-buddy/1.12.19": { + "net/bytebuddy#byte-buddy/1.12.19": { "jar": "sha256-AwcEE55G8yw40nBg7e6eBnawoP/4qL5TRhUVFUuop74=", "pom": "sha256-Q1+4Zkqpt+EgyN1scH1Or6ZC+iYt/21eP3HcJcaeies=" }, - "repo.maven.apache.org/maven2/net/freeutils#jlhttp/2.6": { + "net/freeutils#jlhttp/2.6": { "jar": "sha256-HMFbUBezgFWM4q0uCvwrqW3iYXK6rXjCpwulXFRoV4A=", "pom": "sha256-BaYFDFndeVRC+3zdZFjXUrJg6FOWbYovsNXiCXEo6Ug=" }, - "repo.maven.apache.org/maven2/net/freeutils#parent/1.3": { + "net/freeutils#parent/1.3": { "pom": "sha256-xouwWtmH1kcR6aU+/0ODO87EiMepPuRyfTOJEpsBc2Q=" }, - "repo.maven.apache.org/maven2/net/iharder#base64/2.3.9": { + "net/iharder#base64/2.3.9": { "jar": "sha256-8aDjWe7imlk5w15f3txXTdfoygZbBW/BSysp4+081U0=", "pom": "sha256-3CpFvNCQU+bgD4tgOpFwz/20GMBV3TWrbrsJ1WgtYns=" }, - "repo.maven.apache.org/maven2/net/java#jvnet-parent/1": { + "net/java#jvnet-parent/1": { "pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78=" }, - "repo.maven.apache.org/maven2/net/java#jvnet-parent/3": { + "net/java#jvnet-parent/3": { "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" }, - "repo.maven.apache.org/maven2/net/java/dev/jna#jna-platform/5.13.0": { + "net/java/dev/jna#jna-platform/5.13.0": { "jar": "sha256-R017iPbpcAm27B2YwwJN2VwjGHxl2r+8NTMbysPRc90=", "pom": "sha256-Y7IMivBXyYGW+HieGiGm3d8Cqo84XmsEtLT58N8lcGY=" }, - "repo.maven.apache.org/maven2/net/java/dev/jna#jna/5.13.0": { + "net/java/dev/jna#jna/5.13.0": { "jar": "sha256-ZtT4GaBipRodVie//CP6xV0Wd/Dgof66FEqr3WcKZLs=", "pom": "sha256-9RXCV4F49FJH7Mp6nh2xCVMbHELyQk4lPO6w9rjUI3Q=" }, - "repo.maven.apache.org/maven2/net/javacrumbs/json-unit#json-unit-core/2.36.0": { + "net/javacrumbs/json-unit#json-unit-core/2.36.0": { "jar": "sha256-a1j8/G2tlI6YMwzlmDUrOjnEndyPbZ9aCYPpL8h1hwU=", "pom": "sha256-k2b/YXpssLQW3sOJQ13+q5AIsgj2lIvSVj8uAgQ5dTM=" }, - "repo.maven.apache.org/maven2/net/javacrumbs/json-unit#json-unit-parent/2.36.0": { + "net/javacrumbs/json-unit#json-unit-parent/2.36.0": { "pom": "sha256-xZA74bIcEdkTIEXwxbQKQqEdX0iub0+ORtLExeVscnw=" }, - "repo.maven.apache.org/maven2/net/minidev#accessors-smart/2.4.7": { + "net/minidev#accessors-smart/2.4.7": { "jar": "sha256-71EDQp8QH34/9i86GCNCcgQ56upD0u7TEZu6dwuyAqk=", "pom": "sha256-WNvy07GUT0rbSSvQXSWM0OVW6r/5oU3qnUEBo04FguA=" }, - "repo.maven.apache.org/maven2/net/minidev#json-smart/2.4.7": { + "net/minidev#json-smart/2.4.7": { "jar": "sha256-KMF+0WrCLmhFdD/R6EMh7fXXc1/CFuRO4mnRBr89gUY=", "pom": "sha256-6QFccydoKXJRxB74wMnD1HGslQl2iAmKlUx18eIwPrI=" }, - "repo.maven.apache.org/maven2/net/sf/jopt-simple#jopt-simple/5.0.4": { + "net/sf/jopt-simple#jopt-simple/5.0.4": { "jar": "sha256-3ybMWPI19HfbB/dTulo6skPr5Xidn4ns9o3WLqmmbCg=", "pom": "sha256-amd2O3avzZyAuV5cXiR4LRjMGw49m0VK0/h1THa3aBU=" }, - "repo.maven.apache.org/maven2/net/sf/launch4j#launch4j/3.50": { + "net/sf/launch4j#launch4j/3.50": { "pom": "sha256-1716EuPm1bR/Ou0p/4g89cTKnie3GWkQZnkzH6N+xy0=" }, - "repo.maven.apache.org/maven2/net/sf/launch4j#launch4j/3.50/core": { + "net/sf/launch4j#launch4j/3.50/core": { "jar": "sha256-2U8eT20fHhl9Es7vpwot75OMzxbig+mjx0Cmb/WGvW8=" }, - "repo.maven.apache.org/maven2/net/sf/launch4j#launch4j/3.50/workdir-linux64": { + "net/sf/launch4j#launch4j/3.50/workdir-linux64": { "jar": "sha256-/uvoOrT+Q5F+qn3/Jy3uDvP6hUvWgzRDRDDgjjoS8zA=" }, - "repo.maven.apache.org/maven2/org/apache#apache/13": { + "org/apache#apache/13": { "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" }, - "repo.maven.apache.org/maven2/org/apache#apache/16": { + "org/apache#apache/16": { "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4=" }, - "repo.maven.apache.org/maven2/org/apache#apache/19": { + "org/apache#apache/19": { "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8=" }, - "repo.maven.apache.org/maven2/org/apache#apache/21": { + "org/apache#apache/21": { "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" }, - "repo.maven.apache.org/maven2/org/apache#apache/23": { + "org/apache#apache/23": { "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" }, - "repo.maven.apache.org/maven2/org/apache#apache/27": { + "org/apache#apache/27": { "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk=" }, - "repo.maven.apache.org/maven2/org/apache#apache/29": { + "org/apache#apache/29": { "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c=" }, - "repo.maven.apache.org/maven2/org/apache#apache/9": { + "org/apache#apache/9": { "pom": "sha256-SUbmClR8jtpp87wjxbbw2tz4Rp6kmx0dp940rs/PGN0=" }, - "repo.maven.apache.org/maven2/org/apache/ant#ant-launcher/1.10.13": { + "org/apache/ant#ant-launcher/1.10.13": { "jar": "sha256-zXaVs7+2lkq3G2oLMdrWAAWud/5QITI2Rnmqzwj3eXA=", "pom": "sha256-ApkvvDgFU1bzyU0B6qJJmcsCoJuqnB/fXqx2t8MVY8o=" }, - "repo.maven.apache.org/maven2/org/apache/ant#ant-parent/1.10.13": { + "org/apache/ant#ant-parent/1.10.13": { "pom": "sha256-blv8hwgiFD8f+7LG8I7EiHctsxSlKDMC9IFLEms0aTk=" }, - "repo.maven.apache.org/maven2/org/apache/ant#ant/1.10.13": { + "org/apache/ant#ant/1.10.13": { "jar": "sha256-vvv8eedE6Yks+n25bfO26C3BfSVxr0KqQnl2/CIpmDg=", "pom": "sha256-J5NR7tkLj3QbtIyVvmHD7CRU48ipr7Q7zB0LrB3aE3o=" }, - "repo.maven.apache.org/maven2/org/apache/commons#commons-compress/1.23.0": { + "org/apache/commons#commons-compress/1.23.0": { "jar": "sha256-wmfxcWDp72YrTXi38p3KfIKxXFz/LLaphl70qz3Vt4c=", "pom": "sha256-WdwSFAa6notbUSvO9FcTUf7R+QK5Oc9SfYk7f3KUVMk=" }, - "repo.maven.apache.org/maven2/org/apache/commons#commons-digester3/3.2": { + "org/apache/commons#commons-digester3/3.2": { "jar": "sha256-HBUOPS30tCN7R+KP6iB5+w2jJFeNXMpqX+0uN6Ygguw=", "pom": "sha256-W7ihmK21l8MCBLTxwzb9s9KBZTZAPprTNJqyAAMuVEU=" }, - "repo.maven.apache.org/maven2/org/apache/commons#commons-lang3/3.12.0": { + "org/apache/commons#commons-lang3/3.12.0": { "jar": "sha256-2RnZBEhsA3+NGTQS2gyS4iqfokIwudZ6V4VcXDHH6U4=", "pom": "sha256-gtMfHcxFg+/9dE6XkWWxbaZL+GvKYj/F0bA+2U9FyFo=" }, - "repo.maven.apache.org/maven2/org/apache/commons#commons-parent/22": { + "org/apache/commons#commons-parent/22": { "pom": "sha256-+4xeVeMKet20/yEIWKDo0klO1nV7vhkBLamdUVhsPLs=" }, - "repo.maven.apache.org/maven2/org/apache/commons#commons-parent/25": { + "org/apache/commons#commons-parent/25": { "pom": "sha256-RnrmUEQuh2hnN5CU51GN/dZ9IsU1Lr05gIyEJZ6XkLo=" }, - "repo.maven.apache.org/maven2/org/apache/commons#commons-parent/32": { + "org/apache/commons#commons-parent/32": { "pom": "sha256-5NJYr4sv9AMhSNQVN53veHB4mmAD6AV28VBLEPJrS+g=" }, - "repo.maven.apache.org/maven2/org/apache/commons#commons-parent/34": { + "org/apache/commons#commons-parent/34": { "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w=" }, - "repo.maven.apache.org/maven2/org/apache/commons#commons-parent/39": { + "org/apache/commons#commons-parent/39": { "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac=" }, - "repo.maven.apache.org/maven2/org/apache/commons#commons-parent/47": { + "org/apache/commons#commons-parent/47": { "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc=" }, - "repo.maven.apache.org/maven2/org/apache/commons#commons-parent/52": { + "org/apache/commons#commons-parent/52": { "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" }, - "repo.maven.apache.org/maven2/org/apache/commons#commons-parent/54": { + "org/apache/commons#commons-parent/54": { "pom": "sha256-AA2Bh5UrIjcC/eKW33mVY/Nd6CznKttOe/FXNCN4++M=" }, - "repo.maven.apache.org/maven2/org/apache/commons#commons-parent/56": { + "org/apache/commons#commons-parent/56": { "pom": "sha256-VgxwUd3HaOE3LkCHlwdk5MATkDxdxutSwph3Nw2uJpQ=" }, - "repo.maven.apache.org/maven2/org/apache/commons#commons-text/1.10.0": { + "org/apache/commons#commons-text/1.10.0": { "jar": "sha256-dwzZA/p7YE0ffve6F/hBCGZylLK0eL6O0a87/7SuABg=", "pom": "sha256-OI3VI0i6GEKqOK64l8kdJwsUZh64daIP2YAxU1qydWc=" }, - "repo.maven.apache.org/maven2/org/apache/httpcomponents#httpclient/4.5.13": { + "org/apache/httpcomponents#httpclient/4.5.13": { "jar": "sha256-b+kCalZsalABYIzz/DIZZkH2weXhmG0QN8zb1fMe90M=", "pom": "sha256-eOua2nSSn81j0HrcT0kjaEGkXMKdX4F79FgB9RP9fmw=" }, - "repo.maven.apache.org/maven2/org/apache/httpcomponents#httpcomponents-client/4.5.13": { + "org/apache/httpcomponents#httpcomponents-client/4.5.13": { "pom": "sha256-nLpZTAjbcnHQwg6YRdYiuznmlYORC0Xn1d+C9gWNTdk=" }, - "repo.maven.apache.org/maven2/org/apache/httpcomponents#httpcomponents-core/4.4.13": { + "org/apache/httpcomponents#httpcomponents-core/4.4.13": { "pom": "sha256-xVTnAI5FF8fvVOAFzIt09Mh6VKDqLG9Xvl0Fad9Rk2s=" }, - "repo.maven.apache.org/maven2/org/apache/httpcomponents#httpcomponents-parent/11": { + "org/apache/httpcomponents#httpcomponents-parent/11": { "pom": "sha256-qQH4exFcVQcMfuQ+//Y+IOewLTCvJEOuKSvx9OUy06o=" }, - "repo.maven.apache.org/maven2/org/apache/httpcomponents#httpcore/4.4.13": { + "org/apache/httpcomponents#httpcore/4.4.13": { "jar": "sha256-4G6J1AlDJF/Po57FN82/zjdirs3o+cWXeA0rAMK0NCQ=", "pom": "sha256-j4Etn6e3Kj1Kp/glJ4kypd80S0Km2DmJBYeUMaG/mpc=" }, - "repo.maven.apache.org/maven2/org/apache/logging#logging-parent/7": { + "org/apache/logging#logging-parent/7": { "pom": "sha256-5YkR3J/GsXOhDlqp7bk8eZStBmAnBd0Gftz8bh6eFys=" }, - "repo.maven.apache.org/maven2/org/apache/logging/log4j#log4j-api/2.20.0": { + "org/apache/logging/log4j#log4j-api/2.20.0": { "jar": "sha256-L0PupnnqZvFMoPE/7CqGAKwST1pSMdy034OT7dy5dVA=", "pom": "sha256-zUWDKj1s0hlENcDWPKAV8ZSWjy++pPKRVTv3r7hOFjc=" }, - "repo.maven.apache.org/maven2/org/apache/logging/log4j#log4j-bom/2.20.0": { + "org/apache/logging/log4j#log4j-bom/2.20.0": { "pom": "sha256-+LtpLpWmt72mAehxAJWOg9AGG38SMlC2gSiUOhlenaE=" }, - "repo.maven.apache.org/maven2/org/apache/logging/log4j#log4j-core/2.20.0": { + "org/apache/logging/log4j#log4j-core/2.20.0": { "jar": "sha256-YTffhIza7Z9NUHb3VRPGyF2oC5U/TnrMo4CYt3B2P1U=", "pom": "sha256-3nGsEAVR9KB3rsrQd70VPnHfeqacMELXZRbMXM4Ice4=" }, - "repo.maven.apache.org/maven2/org/apache/logging/log4j#log4j/2.20.0": { + "org/apache/logging/log4j#log4j/2.20.0": { "pom": "sha256-mje0qPZ+jUG8JHNxejAhYz1qPD8xBXnbmtC+PyRlnGk=" }, - "repo.maven.apache.org/maven2/org/apache/velocity#velocity-engine-core/2.3": { + "org/apache/velocity#velocity-engine-core/2.3": { "jar": "sha256-sIbO6P2Bg+JAtK/PVP447DPdjrDaQUY25b96pNmFZik=", "pom": "sha256-1CQqYXQkPx5oBDRXG6TmoduuGZwLw1Cph9X7nDzh4NM=" }, - "repo.maven.apache.org/maven2/org/apache/velocity#velocity-engine-parent/2.3": { + "org/apache/velocity#velocity-engine-parent/2.3": { "pom": "sha256-TA5KkvaHDzmblG1bt4nRd+SkeUEUfD/dwubwY+nLlts=" }, - "repo.maven.apache.org/maven2/org/apache/velocity#velocity-engine-scripting/2.3": { + "org/apache/velocity#velocity-engine-scripting/2.3": { "jar": "sha256-PspyQVbBrSBlVfBSx4POm2Cc567wLYW5AvdHxcdNUKU=", "pom": "sha256-pURg2E/7W60V6jOgR47ZzOWGvxqpN0P3YHM96MBkaTE=" }, - "repo.maven.apache.org/maven2/org/apache/velocity#velocity-master/4": { + "org/apache/velocity#velocity-master/4": { "pom": "sha256-eirHPJDdEEtaB+bizQPpXsKNKfO4ME891//87LBJcS4=" }, - "repo.maven.apache.org/maven2/org/apache/velocity/tools#velocity-tools-generic/3.1": { + "org/apache/velocity/tools#velocity-tools-generic/3.1": { "jar": "sha256-gljP3KoWEn81/+YQo/pPdrfr5RuIkixzxO45zo83jOU=", "pom": "sha256-pvUMs/QTh1wDllImnSqJ+IeNDZ/IzGYvwTWRyiDYR1g=" }, - "repo.maven.apache.org/maven2/org/apache/velocity/tools#velocity-tools-parent/3.1": { + "org/apache/velocity/tools#velocity-tools-parent/3.1": { "pom": "sha256-Wll7iNunlQkOdwFbzfU0YbQdRdotfRdk5Ozoswoib80=" }, - "repo.maven.apache.org/maven2/org/apiguardian#apiguardian-api/1.1.2": { + "org/apiguardian#apiguardian-api/1.1.2": { "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" }, - "repo.maven.apache.org/maven2/org/assertj#assertj-core/3.17.2": { + "org/assertj#assertj-core/3.17.2": { "jar": "sha256-2al41VnQtSqH9Bmz2PW7E3uXxmH3viE04EmLRU5LmA4=", "pom": "sha256-n3yDy/nAPZNYQT7rNDExhDZ6/o5dKRX1X5Eb49vhRgY=" }, - "repo.maven.apache.org/maven2/org/assertj#assertj-parent-pom/2.2.1": { + "org/assertj#assertj-parent-pom/2.2.1": { "pom": "sha256-DtCwM3FLoeYkfT4T7/8FILdvi1TTM+jNsO5fNscphWA=" }, - "repo.maven.apache.org/maven2/org/assertj#assertj-parent-pom/2.2.7": { + "org/assertj#assertj-parent-pom/2.2.7": { "pom": "sha256-DpRvSGuXLAgPwin2U3PRUQSvZnTGMP2fElxP1yEgdzs=" }, - "repo.maven.apache.org/maven2/org/assertj#assertj-swing-junit/3.17.1": { + "org/assertj#assertj-swing-junit/3.17.1": { "jar": "sha256-5W/qUbeWkkBGDQJ6F/HHBLQ+TuykmoxXIG1XPaPjCHE=", "pom": "sha256-v1t2qFRwpj6fuShvtCC80iSXySGVM6vou3D5sCoeLpY=" }, - "repo.maven.apache.org/maven2/org/assertj#assertj-swing-parent-pom/3.17.1": { + "org/assertj#assertj-swing-parent-pom/3.17.1": { "pom": "sha256-r1N8kNjGDMiis2NTz/777Dgk/9LsmVvCsqqIxOZ3J8s=" }, - "repo.maven.apache.org/maven2/org/assertj#assertj-swing/3.17.1": { + "org/assertj#assertj-swing/3.17.1": { "jar": "sha256-42RFQ41y2DzEgBXcs/FNmpfqpCxGY6mCbbK7UOTHcTs=", "pom": "sha256-rkNavHruVk/+pSh32IPKViRLFBGtcYQqEPcbvv9+1es=" }, - "repo.maven.apache.org/maven2/org/bouncycastle#bcpkix-jdk18on/1.72": { + "org/bouncycastle#bcpkix-jdk18on/1.72": { "jar": "sha256-VqBUyxcNQfsfi6CylWiAYli3/+/cXpi3fvltR0Dz1rw=", "pom": "sha256-KFuL5ZWHD2HXXniBsPtO3C0ao30KecT8j/Lczx2caf0=" }, - "repo.maven.apache.org/maven2/org/bouncycastle#bcprov-jdk18on/1.72": { + "org/bouncycastle#bcprov-jdk18on/1.72": { "jar": "sha256-OSh/IginU9tBn1ylKdbIDwlGFKp015AzESazyca4X9o=", "pom": "sha256-47ttnhNGz8Iw4JAPF35goSttviEqkuHNLPseSNTASDk=" }, - "repo.maven.apache.org/maven2/org/bouncycastle#bcutil-jdk18on/1.72": { + "org/bouncycastle#bcutil-jdk18on/1.72": { "jar": "sha256-RTd/22VgqXHupyX1B9kf1rj70Hl9Yb/Ibyy2U8WBhqQ=", "pom": "sha256-VwEEzKwN+inkb7ZAL35qchcCwlXe9DvjAcassYwl520=" }, - "repo.maven.apache.org/maven2/org/checkerframework#checker-qual/3.33.0": { + "org/checkerframework#checker-qual/3.33.0": { "jar": "sha256-4xYlW7/Nn+UNFlMUuFq7KzPLKmapPEkdtkjkmKgsLeE=", "module": "sha256-6FIddWJdQScsdn0mKhU6wWPMUFtmZEou9wX6iUn/tOU=", "pom": "sha256-9VqSICenj92LPqFaDYv+P+xqXOrDDIaqivpKW5sN9gM=" }, - "repo.maven.apache.org/maven2/org/codehaus/groovy#groovy-bom/3.0.14": { + "org/codehaus/groovy#groovy-bom/3.0.14": { "pom": "sha256-JODptzjecRjennNWD/0GA0u1zwfKE6fgNFnoi6nRric=" }, - "repo.maven.apache.org/maven2/org/codehaus/plexus#plexus-utils/3.5.1": { + "org/codehaus/plexus#plexus-utils/3.5.1": { "jar": "sha256-huAlXUyHnGG0gz7X8TEk6LtnnfR967EnMm59t91JoHs=", "pom": "sha256-lP9o7etIIE0SyZGJx2cWTTqfd4oTctHc4RpBRi5iNvI=" }, - "repo.maven.apache.org/maven2/org/codehaus/plexus#plexus/10": { + "org/codehaus/plexus#plexus/10": { "pom": "sha256-u6nFIQZLnKEyzpfMHMfrSvwtvjK8iMuHLIjpn2FiMB8=" }, - "repo.maven.apache.org/maven2/org/commonmark#commonmark-parent/0.21.0": { + "org/commonmark#commonmark-parent/0.21.0": { "pom": "sha256-qeGddPQOEj3jbHAaUlIg2r5eMjVDZUfbek/TwJi31Qs=" }, - "repo.maven.apache.org/maven2/org/commonmark#commonmark/0.21.0": { + "org/commonmark#commonmark/0.21.0": { "jar": "sha256-gQhKcDUEb+MG8NvxbvV6aNCO5clwBOqGfmK120bpivs=", "pom": "sha256-RhGg7TfAGTzGANRRrUxFfT0NVBxaxlbI2ANL0s0NB1g=" }, - "repo.maven.apache.org/maven2/org/easytesting#fest-reflect/1.4.1": { + "org/easytesting#fest-reflect/1.4.1": { "jar": "sha256-wcoZ/PDNNVW698KvFHwErSK0OTq3Xl2wKE5RcPtVTBY=", "pom": "sha256-HGUmEF/LVuFjU1Hi0DuO8coI4qOSrj+NRUK1L9DTpYM=" }, - "repo.maven.apache.org/maven2/org/easytesting#fest-util/1.2.5": { + "org/easytesting#fest-util/1.2.5": { "jar": "sha256-e1L0061Bt+1x9baxGDMRO34IMmyO9w0t7fC0MMe6U0E=", "pom": "sha256-odiCzcAADcrcZQzw8DXh6edCW/ipx57f1h0lzn8ODHo=" }, - "repo.maven.apache.org/maven2/org/easytesting#fest/1.0.15": { + "org/easytesting#fest/1.0.15": { "pom": "sha256-EBz6z6cEL1sWQWoG7EIZjLeUIqv40R1I/xIXfznbIxc=" }, - "repo.maven.apache.org/maven2/org/eclipse/angus#angus-activation-project/1.0.0": { + "org/eclipse/angus#angus-activation-project/1.0.0": { "pom": "sha256-xbpJl8zRYQNHMGsM23caRKv9qhhzIkogdZVQ4Q8inNU=" }, - "repo.maven.apache.org/maven2/org/eclipse/angus#angus-activation/1.0.0": { + "org/eclipse/angus#angus-activation/1.0.0": { "jar": "sha256-43r/FH4Y7UjFCqn7eMyF50eMv9ASV7AtU9OhhtGDIkU=", "pom": "sha256-L8eRQlvvS53yjp80ZAXMCeDqN369YQJjiNqEDGGhsPw=" }, - "repo.maven.apache.org/maven2/org/eclipse/ee4j#project/1.0.5": { + "org/eclipse/ee4j#project/1.0.5": { "pom": "sha256-kWtHlNjYIgpZo/32pk2+eUrrIzleiIuBrjaptaLFkaY=" }, - "repo.maven.apache.org/maven2/org/eclipse/ee4j#project/1.0.6": { + "org/eclipse/ee4j#project/1.0.6": { "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0=" }, - "repo.maven.apache.org/maven2/org/eclipse/ee4j#project/1.0.7": { + "org/eclipse/ee4j#project/1.0.7": { "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" }, - "repo.maven.apache.org/maven2/org/eclipse/jetty#jetty-bom/9.4.50.v20221201": { + "org/eclipse/jetty#jetty-bom/9.4.50.v20221201": { "pom": "sha256-TN5uUz1gHq+LZazulWt3BsGBkvJ1XQI9fo0Zu31bOUM=" }, - "repo.maven.apache.org/maven2/org/fusesource#fusesource-pom/1.12": { + "org/fusesource#fusesource-pom/1.12": { "pom": "sha256-xA2WDarc73sBwbHGZXr7rE//teUxaPj8sLKLhOb9zKE=" }, - "repo.maven.apache.org/maven2/org/fusesource/jansi#jansi/2.4.0": { + "org/fusesource/jansi#jansi/2.4.0": { "jar": "sha256-bNkZkTI917L7KMqT16wSr1qGovUyeeKzWCezAxP9C58=", "pom": "sha256-rECp8tDB7mMfw7CO+OLwvRS6IgEcp2/xvPZftWnq3zU=" }, - "repo.maven.apache.org/maven2/org/glassfish/jaxb#jaxb-bom/4.0.1": { + "org/glassfish/jaxb#jaxb-bom/4.0.1": { "pom": "sha256-lSK+rNDHwC3Mi7VDMA6Eolu8wPfREPEwr3Z9yX1eP5Q=" }, - "repo.maven.apache.org/maven2/org/hamcrest#hamcrest-core/1.3": { + "org/hamcrest#hamcrest-core/1.3": { "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" }, - "repo.maven.apache.org/maven2/org/hamcrest#hamcrest-core/2.2": { + "org/hamcrest#hamcrest-core/2.2": { "jar": "sha256-CU9dkrS32ciiv1PMadNWJDronDSZRXvLS5L37Tv5WHk=", "pom": "sha256-9/3i//UQGl/Do54ogQuRHC2iAt3CvVB2X4nnxv+M590=" }, - "repo.maven.apache.org/maven2/org/hamcrest#hamcrest-parent/1.3": { + "org/hamcrest#hamcrest-parent/1.3": { "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" }, - "repo.maven.apache.org/maven2/org/hamcrest#hamcrest/2.2": { + "org/hamcrest#hamcrest/2.2": { "jar": "sha256-XmKEaonwXNeM2cGlU/NA0AJFg4DDIEVd0fj8VJeoocE=", "pom": "sha256-s2E3N2xLP8923DN+KhvFtpGirBqpZqtdJiCak4EvpX0=" }, - "repo.maven.apache.org/maven2/org/jdom#jdom2/2.0.6.1": { + "org/jdom#jdom2/2.0.6.1": { "jar": "sha256-CyD0XjoP2PDRLNxTFrBndukCsTZdsAEYh2+RdcYPMCw=", "pom": "sha256-VXleEBi4rmR7k3lnz4EKmbCFgsI3TnhzwShzTIyRS/M=" }, - "repo.maven.apache.org/maven2/org/jetbrains#annotations/13.0": { + "org/jetbrains#annotations/13.0": { "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" }, - "repo.maven.apache.org/maven2/org/jetbrains/kotlin#kotlin-reflect/1.8.20": { + "org/jetbrains/kotlin#kotlin-reflect/1.8.20": { "jar": "sha256-Ux48P5sMRfmiHxZCF0RTBmoQZr7AGQJUpjMbMxgUq4s=", "pom": "sha256-5D19CbkCpeM8I0r1O3YYTUkz9gkI0A4QSy7EA+4tQDU=" }, - "repo.maven.apache.org/maven2/org/jetbrains/kotlin#kotlin-stdlib-common/1.6.20": { + "org/jetbrains/kotlin#kotlin-stdlib-common/1.6.20": { "jar": "sha256-jaQKJSDTDcsQEhdv6T0k6C0Io+NGw34DQ7D7b2T2vgE=", "pom": "sha256-PgTMk1HVzsQqRcBg+HM/bpTrx+NZExClGOBuiFB4mcg=" }, - "repo.maven.apache.org/maven2/org/jetbrains/kotlin#kotlin-stdlib-common/1.8.21": { + "org/jetbrains/kotlin#kotlin-stdlib-common/1.8.21": { "jar": "sha256-akTJ7MnXdU2elD+x41iMdNSj8Xhb5RB09J1sVyNoKnM=", "pom": "sha256-4ZpVd8vOqJcolw21MzyCZMjGmuci7recv0HV8LDJrmU=" }, - "repo.maven.apache.org/maven2/org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.6.20": { + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.6.20": { "jar": "sha256-qi+i6BNVxNmN2X2iFpv0AfhCJhN49bHL6hqhGFXWdiA=", "pom": "sha256-iBveiiNwhuKOA0KLTvMmj0SspfoajHb4lUdIRVyuvSE=" }, - "repo.maven.apache.org/maven2/org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.21": { + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.21": { "jar": "sha256-M9FI2w4R3r0NkGd9KCQrztkH+cd3MAAP1ZeGcIkDnYY=", "pom": "sha256-m7EH1dXjkwvFl38AekPNILfSTZGxweUo6m7g8kjxTTY=" }, - "repo.maven.apache.org/maven2/org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.6.20": { + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.6.20": { "jar": "sha256-/asb8SDiteerbXiI6evAJOxrjKcpNhKWOV2rY0shNpU=", "pom": "sha256-GEap+GBLC+HHGiEovb2diQJyAnlCf2ItK5pECsmjwwk=" }, - "repo.maven.apache.org/maven2/org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.21": { + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.21": { "jar": "sha256-PbdSowB08G7mxXmEqm8n2kT00rvH9UQmUfaYjxyyt9c=", "pom": "sha256-ODnXKNfDCaXDaLAnC0S08ceHj/XKXTKpogT6o0kUWdg=" }, - "repo.maven.apache.org/maven2/org/jetbrains/kotlin#kotlin-stdlib/1.6.20": { + "org/jetbrains/kotlin#kotlin-stdlib/1.6.20": { "jar": "sha256-7rUcK2eyYjP9gdC8T4BE7ISXGIkJBXY87/2Eox4st5k=", "pom": "sha256-oI6D3LDymFCYd94i1SZEZHbdsx6hx3Uw8sgfJNsWb5k=" }, - "repo.maven.apache.org/maven2/org/jetbrains/kotlin#kotlin-stdlib/1.8.21": { + "org/jetbrains/kotlin#kotlin-stdlib/1.8.21": { "jar": "sha256-BCoc0ayXbNz+XrY/HY4LC4kskkjhWmnIz7pJXVRupSo=", "pom": "sha256-/gzZ4yGT5FMzP9Kx9XfmYvtavGkHECu5Z4F7wTEoD9c=" }, - "repo.maven.apache.org/maven2/org/junit#junit-bom/5.5.2": { + "org/junit#junit-bom/5.10.2": { + "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", + "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" + }, + "org/junit#junit-bom/5.5.2": { "pom": "sha256-WklWKkcEVB5p1O4xbNfq9xHN23ytXQ+Ia/ih/pjWqcU=" }, - "repo.maven.apache.org/maven2/org/junit#junit-bom/5.6.2": { + "org/junit#junit-bom/5.6.2": { "module": "sha256-f0j4L1XvwfDMWVg8LUdKNBDiQXndLR0iFkUVzOM9dkM=", "pom": "sha256-6K1gGzGBsjeHoY5x0mrIaknFbcX4VgZ2S8PFG15F/hM=" }, - "repo.maven.apache.org/maven2/org/junit#junit-bom/5.7.1": { + "org/junit#junit-bom/5.7.1": { "module": "sha256-mFTjiU1kskhSB+AEa8oHs9QtFp54L0+oyc4imnj67gQ=", "pom": "sha256-C5sUo9YhBvr+jGinF7h7h60YaFiZRRt1PAT6QbaFd4Q=" }, - "repo.maven.apache.org/maven2/org/junit#junit-bom/5.7.2": { + "org/junit#junit-bom/5.7.2": { "module": "sha256-87zrHFndT2mT9DBN/6WAFyuN9lp2zTb6T9ksBXjSitg=", "pom": "sha256-zRSqqGmZH4ICHFhdVw0x/zQry6WLtEIztwGTdxuWSHs=" }, - "repo.maven.apache.org/maven2/org/junit#junit-bom/5.9.0": { + "org/junit#junit-bom/5.9.0": { "module": "sha256-oFTq9QFrWLvN6GZgREp8DdPiyvhNKhrV/Ey1JZecGbk=", "pom": "sha256-2D6H8Wds3kQZHuxc2mkEkjkvJpI7HkmBSMpznf7XUpU=" }, - "repo.maven.apache.org/maven2/org/junit#junit-bom/5.9.1": { + "org/junit#junit-bom/5.9.1": { "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=", "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw=" }, - "repo.maven.apache.org/maven2/org/junit#junit-bom/5.9.3": { - "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=", - "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc=" + "org/junit/jupiter#junit-jupiter-api/5.10.2": { + "jar": "sha256-r/93wYbNMXJ1gDhy+lEzqoAf1qxAvZHHimz4AJtLF8w=", + "module": "sha256-QRtKlsKm2wmY1uWOiZNn8NElQWPzBBydmOeu38o3RBk=", + "pom": "sha256-u12jBgImsbPOtUCEldxptZRlv1DX6+Y+75TyWQnPGQA=" }, - "repo.maven.apache.org/maven2/org/junit/jupiter#junit-jupiter-api/5.9.3": { - "jar": "sha256-2JXj7t9PobEN4xqRvlWjAbswe/GO8yWz+l2z+A7pLRw=", - "module": "sha256-ba7jABTiBFWh7MbW0LOsYERECtE+9CA5jikZCYDpuHo=", - "pom": "sha256-f3KVZWK+1JEdMhf5DeCw0kDdklb4V99aJLvrAVS0FBs=" + "org/junit/jupiter#junit-jupiter-engine/5.10.2": { + "jar": "sha256-tt812nUKVGrpMjdvEbPA34QfDJDHyylEzTmttDKIbks=", + "module": "sha256-FD7yda5mlRGdeCEqkyRazrv5I1tTdbn0wdSvcy87Uwo=", + "pom": "sha256-q+csj7+anI+e55usKbpkedMrDf+quICApQKRHSTTlGM=" }, - "repo.maven.apache.org/maven2/org/junit/jupiter#junit-jupiter-engine/5.9.3": { - "jar": "sha256-tV4wSxzS6PEWwat3pdw+yoxNm0amnghLY6ylHN61Xw8=", - "module": "sha256-lY9TIPRbNNCmZ24W/1ScsBDhQm3KUs/bEFh2vM9Pdog=", - "pom": "sha256-D1/XZ2n95tJHMI+Dbf8TTItS9lpC5UuNCtoEFvMKc3o=" + "org/junit/platform#junit-platform-commons/1.10.2": { + "jar": "sha256-tWpewACked9Jc7GLuiTJj+Dbj6oUyJB9PvRR2Mcf2K4=", + "module": "sha256-HoFCGmL4cryk0gIgs56hniexNfNre3gXBPkvrVQxlhg=", + "pom": "sha256-8/glx8o72JcU1IlEfHfHbifqOPAoX195ahAAoX/KS+c=" }, - "repo.maven.apache.org/maven2/org/junit/platform#junit-platform-commons/1.9.3": { - "jar": "sha256-hRkVffgTwhDoX8FBS3QQnj2F9D1wklY+1wTEPEjw1eY=", - "module": "sha256-eWpB8nJB+2dgjwGazPTBw2cVe3MjinavhvbeuuNZnrQ=", - "pom": "sha256-4Xof3keC8vwjtC3sp1wLBWbVwphQ0DBr5lxdpzuAIXg=" + "org/junit/platform#junit-platform-engine/1.10.2": { + "jar": "sha256-kFy6m0mYzMKdEjkIWn+x/g4oAk11JhUjVtgQ7ewKSaM=", + "module": "sha256-4dG63P7cJyRFQeC+XV6EtyoicNevYWhrJvEc/Edw2kI=", + "pom": "sha256-EqqGyhwNZIoiXU58aWBUwfx26IeCxcOft983muI7728=" }, - "repo.maven.apache.org/maven2/org/junit/platform#junit-platform-engine/1.9.3": { - "jar": "sha256-DDlVPZoDUQdXIn9aHGzGUwKHsaMh7WJYRQZkh0qioWo=", - "module": "sha256-nQVThnLcRrITlxJjbv3B8Xg9Q5qhwktp0Ckrgci36o8=", - "pom": "sha256-HFq3/OvjpgEYOXm6r78vQOVUOIKnyiPp+etxkZWnR9U=" + "org/junit/vintage#junit-vintage-engine/5.10.2": { + "jar": "sha256-8fjR0zVyx1DL6bxquBAZryjo3lVdWMQtHQtySLMxV2k=", + "module": "sha256-kMb9QnMc0QoP6c6qolXz/B9IPnFO6b2DtPk8lsgfWVY=", + "pom": "sha256-kw2chGQmBTZYP28ozjHkZL6JJIWu/tWnYIqzZqUYEK4=" }, - "repo.maven.apache.org/maven2/org/junit/vintage#junit-vintage-engine/5.9.3": { - "jar": "sha256-a8G0IoKu2LnszbQGMc9FABr4qzrZ0Nhc/4bEXoX8WdA=", - "module": "sha256-903In7pI9S/PzSKUFEQbDXn4Cz5tgTsAvIuXT1K0bZE=", - "pom": "sha256-FISWCrLBD3mXJlEWmJuzsY21XJKfrFn96nS4ssd5WkY=" - }, - "repo.maven.apache.org/maven2/org/mock-server#mockserver-client-java/5.15.0": { + "org/mock-server#mockserver-client-java/5.15.0": { "jar": "sha256-LMqrNKNYdlkALhh/PISJAtd8g55OrmxZRp4YUUnvGyY=", "pom": "sha256-nVRRAJ9Q2bMQCStLyAFPz3+di/HYUbOfOzNPm4rmkfQ=" }, - "repo.maven.apache.org/maven2/org/mock-server#mockserver-core/5.15.0": { + "org/mock-server#mockserver-core/5.15.0": { "jar": "sha256-dpZGoStLzGwK8eZiFsRYH4b5UkY4zvxn3vVJjNKeL7o=", "pom": "sha256-DSwI3ATUdSuev1sSROKtV6+kSBJ/YZnqeeUYRAbpUYM=" }, - "repo.maven.apache.org/maven2/org/mock-server#mockserver-netty/5.15.0": { + "org/mock-server#mockserver-netty/5.15.0": { "jar": "sha256-EKBXpHdbami8aXQtEgBmt/cBOH7X5l9RioGYTqRaw6s=", "pom": "sha256-1aN22L2gDxkgNt4fm6g89tTXvlFar4+GaN6u1pagCVU=" }, - "repo.maven.apache.org/maven2/org/mock-server#mockserver/5.15.0": { + "org/mock-server#mockserver/5.15.0": { "pom": "sha256-tlNuOpSx7xwjGfX1Zwc1JL1YtvIh4vK1rLh57Bu5DJA=" }, - "repo.maven.apache.org/maven2/org/mockito#mockito-core/4.11.0": { + "org/mockito#mockito-core/4.11.0": { "jar": "sha256-S5CWkMqyiMdh65TAvw6BRJbPOSHYr/rITNh3dFMDUeU=", "pom": "sha256-K8LjyMizE/2sIx8jgiIlsHgx3ImdBnBy9J1fiuN+c5o=" }, - "repo.maven.apache.org/maven2/org/mockito#mockito-inline/4.11.0": { + "org/mockito#mockito-inline/4.11.0": { "jar": "sha256-7lLhwpmmMhhPuidKk3CZPgkUBCn15RbmxVcP1ldLKX8=", "pom": "sha256-g+Y+nBxoitBSIUa0qneUjJlzrAGCnhAzZGI2lWGoA0Q=" }, - "repo.maven.apache.org/maven2/org/mozilla#rhino/1.7.7.2": { + "org/mozilla#rhino/1.7.7.2": { "jar": "sha256-XG2uBQzrcXdKX8gs5uPwOS2vD/qew1lvcNTQfuULiXA=", "pom": "sha256-B2kGiYfBiVPlHUGeBi9AlW8egvOioUD+qITXxeb6lH8=" }, - "repo.maven.apache.org/maven2/org/objenesis#objenesis-parent/3.3": { + "org/objenesis#objenesis-parent/3.3": { "pom": "sha256-MFw4SqLx4cf+U6ltpBw+w1JDuX1CjSSo93mBjMEL5P8=" }, - "repo.maven.apache.org/maven2/org/objenesis#objenesis/3.3": { + "org/objenesis#objenesis/3.3": { "jar": "sha256-At/QsEOaVZHjW3CO0vVHTrCUj1Or90Y36Vm45O9pv+s=", "pom": "sha256-ugxA2iZpoEi24k73BmpHHw+8v8xQnmo+hWyk3fphStM=" }, - "repo.maven.apache.org/maven2/org/opentest4j#opentest4j/1.2.0": { - "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", - "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" + "org/opentest4j#opentest4j/1.3.0": { + "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=", + "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=", + "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U=" }, - "repo.maven.apache.org/maven2/org/ow2#ow2/1.5": { + "org/ow2#ow2/1.5": { "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs=" }, - "repo.maven.apache.org/maven2/org/ow2#ow2/1.5.1": { + "org/ow2#ow2/1.5.1": { "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" }, - "repo.maven.apache.org/maven2/org/ow2/asm#asm-analysis/9.2": { + "org/ow2/asm#asm-analysis/9.2": { "jar": "sha256-h4++UhcxwHLRTS1luYOxvq5q0G/aAAe2qLroH3P0M8Q=", "pom": "sha256-dzzBor/BTGxKl5xRoHXAI0oL9pT8Or5PrPRU83oUXxs=" }, - "repo.maven.apache.org/maven2/org/ow2/asm#asm-commons/9.2": { + "org/ow2/asm#asm-commons/9.2": { "jar": "sha256-vkzlMTiiOLtSLNeBz5Hzulzi9sqT7GLUahYqEnIl4KY=", "pom": "sha256-AoJOg58qLw5ylZ/dMLSJckDwWvxD3kLXugsYQ3YBwHA=" }, - "repo.maven.apache.org/maven2/org/ow2/asm#asm-commons/9.4": { + "org/ow2/asm#asm-commons/9.4": { "jar": "sha256-DBKKnsPzPJiVknL20WzxQke1CPWJUVdLzb0rVtYyY2Q=", "pom": "sha256-tCyiq8+IEXdqXdwCkPIQbX8xP4LHiw3czVzOTGOjUXk=" }, - "repo.maven.apache.org/maven2/org/ow2/asm#asm-tree/9.2": { + "org/ow2/asm#asm-tree/9.2": { "jar": "sha256-qr+b0jCRpOv8EJwfPufPPkuJ9rotP1HFJD8Ws8/64BE=", "pom": "sha256-9h8+vqVSDd8Z9FKwPEJscjG92KgdesKHZctScSJaw3g=" }, - "repo.maven.apache.org/maven2/org/ow2/asm#asm-tree/9.4": { + "org/ow2/asm#asm-tree/9.4": { "jar": "sha256-xC1HnPJFZqIesgr37q7vToa9tKiGMGz3L0g7ZedbKs8=", "pom": "sha256-x+nvk73YqzYwMs5TgvzGTQAtbFicF1IzI2zSmOUaPBY=" }, - "repo.maven.apache.org/maven2/org/ow2/asm#asm-tree/9.5": { + "org/ow2/asm#asm-tree/9.5": { "jar": "sha256-PDOmSBkQea6urrfBmkmxU5UvnkD+hvusUgVVTd2azZQ=", "pom": "sha256-pyqq+N0FGJn6CJ54PsfUgnrE19GHYgHG3uy6qUoNyVY=" }, - "repo.maven.apache.org/maven2/org/ow2/asm#asm-util/9.2": { + "org/ow2/asm#asm-util/9.2": { "jar": "sha256-/1s80zGuipqAR2goDamPUPQk/vI908eIuzIOCMlO5Zg=", "pom": "sha256-3dBpE/FH1wrmjnpuQ1alWzPxTd5hYtv/K9DiiVgfGtI=" }, - "repo.maven.apache.org/maven2/org/ow2/asm#asm/9.2": { + "org/ow2/asm#asm/9.2": { "jar": "sha256-udT+TXGTjfOIOfDspCqqpkz4sxPWeNoDbwyzyhmbR/U=", "pom": "sha256-37EqGyJL8Bvh/WBAIEZviUJBvLZF3M45Xt2M1vilDfQ=" }, - "repo.maven.apache.org/maven2/org/ow2/asm#asm/9.4": { + "org/ow2/asm#asm/9.4": { "jar": "sha256-OdDis9xFr2Wgmwl5RXUKlKEm4FLhJPk0aEQ6HQ4V84E=", "pom": "sha256-SDdR5I+y0fQ8Ya06sA/6Rm7cAzPY/C/bWibpXTKYI5Q=" }, - "repo.maven.apache.org/maven2/org/ow2/asm#asm/9.5": { + "org/ow2/asm#asm/9.5": { "jar": "sha256-ti6EtZgHKXUbBFjFNM8TZvcnVCu40VhiEzVoKkYPA1M=", "pom": "sha256-LJzOuVHMZYbejZoWxnKtPkwwucMjAo16PDNmVg1WJ7E=" }, - "repo.maven.apache.org/maven2/org/reactivestreams#reactive-streams/1.0.4": { + "org/reactivestreams#reactive-streams/1.0.4": { "jar": "sha256-91yll3ibPaxY9hhXuawuEDSmj6Zy2zUFWo+0UJ4yXyg=", "pom": "sha256-VLoj2HotQ4VAyZ74eUoIVvxXOiVrSYZ4KDw8Z+8Yrag=" }, - "repo.maven.apache.org/maven2/org/slf4j#slf4j-api/1.6.6": { + "org/slf4j#slf4j-api/1.6.6": { "pom": "sha256-cxmZMiteIokinNntRiTJQexXG3xh0qJ9alB+9zuXyho=" }, - "repo.maven.apache.org/maven2/org/slf4j#slf4j-api/2.0.7": { + "org/slf4j#slf4j-api/2.0.7": { "jar": "sha256-XWKYuToZBcMs2mR4gIrBTC1KR+kVNeU8Qff+64XZRvQ=", "pom": "sha256-LUA8zw4KAtXBqGZ7DiozyN/GA4qyh7lnHdaBwgUmeYE=" }, - "repo.maven.apache.org/maven2/org/slf4j#slf4j-parent/1.6.6": { + "org/slf4j#slf4j-parent/1.6.6": { "pom": "sha256-QrjCR2CP2OENW2Zs98gKW1nSseEoRQ97bZ0sIM+2sxs=" }, - "repo.maven.apache.org/maven2/org/slf4j#slf4j-parent/2.0.7": { + "org/slf4j#slf4j-parent/2.0.7": { "pom": "sha256-wYK7Ns068ck8FgPN/v54iRV9swuotYT0pEU1/NIuRec=" }, - "repo.maven.apache.org/maven2/org/sonatype/oss#oss-parent/5": { + "org/sonatype/oss#oss-parent/5": { "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0=" }, - "repo.maven.apache.org/maven2/org/sonatype/oss#oss-parent/6": { + "org/sonatype/oss#oss-parent/6": { "pom": "sha256-tDBtE+j1OSRYobMIZvHP8WGz0uaZmojQWe6jkyyKhJk=" }, - "repo.maven.apache.org/maven2/org/sonatype/oss#oss-parent/7": { + "org/sonatype/oss#oss-parent/7": { "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" }, - "repo.maven.apache.org/maven2/org/sonatype/oss#oss-parent/9": { + "org/sonatype/oss#oss-parent/9": { "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" }, - "repo.maven.apache.org/maven2/org/springframework#spring-framework-bom/5.3.24": { + "org/springframework#spring-framework-bom/5.3.24": { "module": "sha256-GZbh9hfLA/p26hGFD+Kh4gsOMKEEa6bV2zvbv0QRP84=", "pom": "sha256-U1ITVmu77+Jjag1OjdGnOt5hLiQwyP/TENzCo7O5ukE=" }, - "repo.maven.apache.org/maven2/org/tukaani#xz/1.9": { + "org/tukaani#xz/1.9": { "jar": "sha256-IRswbPxE+Plt86Cj3a91uoxSie7XfWDXL4ibuFX1NeU=", "pom": "sha256-CTvhsDMxvOKTLWglw36YJy12Ieap6fuTKJoAJRi43Vo=" }, - "repo.maven.apache.org/maven2/org/vafer#jdependency/2.8.0": { + "org/vafer#jdependency/2.8.0": { "jar": "sha256-v9LMfhv8eKqDtEwKVL8s3jikOC7CRyivaD2Y3GvngZI=", "pom": "sha256-EBhn8/npJlei74mjELYE1D0JDJuQqj4LBS3NFqO78y0=" }, - "repo.maven.apache.org/maven2/org/xmlunit#xmlunit-core/2.9.1": { + "org/xmlunit#xmlunit-core/2.9.1": { "jar": "sha256-fnDyPU914F8O558Pa54Tts9R0082xfw6a4OUKd3h7+8=", "pom": "sha256-0n5OKjEqIVR+82BcgS5+YMiuyWTn+WDlDU3Dy2azkBI=" }, - "repo.maven.apache.org/maven2/org/xmlunit#xmlunit-parent/2.9.1": { + "org/xmlunit#xmlunit-parent/2.9.1": { "pom": "sha256-1+RY+9XGRFBIeOX7zglLHTB402mn/uF93ezj0Zn9qsA=" }, - "repo.maven.apache.org/maven2/org/xmlunit#xmlunit-placeholders/2.9.1": { + "org/xmlunit#xmlunit-placeholders/2.9.1": { "jar": "sha256-H+OrnCfYNVl+031hZ8m7zLksLT0Buhr+7Cqta0Ny0+g=", "pom": "sha256-8lixEzrsF0x2T84Rf12TjVBxfEFzVSIYKJUXmKF8qH8=" }, - "repo.maven.apache.org/maven2/org/yaml#snakeyaml/1.33": { + "org/yaml#snakeyaml/1.33": { "jar": "sha256-Ef9Fl4jwoteB9WpKhtfmkgLOus0Cc9UmnErp8C8/2PA=", "pom": "sha256-6n1I/UUyGmAz2XzSiBhtSOXpLMDHBm5ziNfEzrSvWVc=" }, - "repo.maven.apache.org/maven2/org/zeroturnaround#zt-zip/1.15": { + "org/zeroturnaround#zt-zip/1.15": { "jar": "sha256-egIaxh7b4ktfzIM5aWf3BxIE51cLktf0s/mH6Wylu5M=", "pom": "sha256-ll/F/uIc+Ys81paoijiZqsjRiBsZlfZp+Jmvdtu2C2E=" }, - "repo.maven.apache.org/maven2/xmlpull#xmlpull/1.1.3.1": { + "xmlpull#xmlpull/1.1.3.1": { "jar": "sha256-NOCO5iEWBxy7acDtcNFaelsgjWJ5jFnyEgu4kpMky2M=", "pom": "sha256-jxD/2N8NPpgZyMyEAnCcaySLxTqVTvbkVHDZrjpXNfs=" } diff --git a/pkgs/by-name/at/atlauncher/package.nix b/pkgs/by-name/at/atlauncher/package.nix index 3337821922f8..5d3fdfa12509 100644 --- a/pkgs/by-name/at/atlauncher/package.nix +++ b/pkgs/by-name/at/atlauncher/package.nix @@ -21,13 +21,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "atlauncher"; - version = "3.4.36.10"; + version = "3.4.37.2"; src = fetchFromGitHub { owner = "ATLauncher"; repo = "ATLauncher"; rev = "v${finalAttrs.version}"; - hash = "sha256-EMV/M5W/acJaQJsi4COoRQC2YVfuJG9HGcwvGfakoNo="; + hash = "sha256-1sIzQBJWbkGk8VrZdRi3eIHBAfiu90lodEZVouZNzVM="; }; postPatch = '' From 68d77b59d6ad30564f2d757d3b621c2ccf951ae1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 11:42:22 +0000 Subject: [PATCH 254/298] quark-engine: 24.8.1 -> 24.9.1 --- pkgs/tools/security/quark-engine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/quark-engine/default.nix b/pkgs/tools/security/quark-engine/default.nix index bd53ff018414..a42cca82b67c 100644 --- a/pkgs/tools/security/quark-engine/default.nix +++ b/pkgs/tools/security/quark-engine/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "quark-engine"; - version = "24.8.1"; + version = "24.9.1"; pyproject = true; src = fetchFromGitHub { owner = "quark-engine"; repo = "quark-engine"; rev = "refs/tags/v${version}"; - hash = "sha256-oeVjUbw6RKSZLFBuPy1goraiqtwjeuq1hy81ibpcuus="; + hash = "sha256-DmiqsYEdCh9hG5aa41UymW8IDkba4fuCrtM10A0X2Gg="; }; build-system = with python3.pkgs; [ setuptools ]; From 59c844b41771d32c0e341ccfc74c397f240d9329 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 11:44:20 +0000 Subject: [PATCH 255/298] patroni: 4.0.0 -> 4.0.1 --- pkgs/servers/sql/patroni/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/patroni/default.nix b/pkgs/servers/sql/patroni/default.nix index ad76b6b7e134..c286377e6234 100644 --- a/pkgs/servers/sql/patroni/default.nix +++ b/pkgs/servers/sql/patroni/default.nix @@ -6,13 +6,13 @@ pythonPackages.buildPythonApplication rec { pname = "patroni"; - version = "4.0.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "zalando"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-C0YjLak/m8ZMCzR5x22zjCATvzs72l56GRccN0Gur+4="; + sha256 = "sha256-0Eqk9X/qO9MkETaVIOCS6vyvywAK175/CDCNHH+YatQ="; }; propagatedBuildInputs = with pythonPackages; [ From f4ec76bd673f5658b1b136885051e9581e463216 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Sep 2024 14:26:48 +0200 Subject: [PATCH 256/298] python312Packages.fickling: init at 0.1.3 A Python pickling decompiler and static analyzer https://github.com/trailofbits/fickling --- .../python-modules/fickling/default.nix | 55 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/development/python-modules/fickling/default.nix diff --git a/pkgs/development/python-modules/fickling/default.nix b/pkgs/development/python-modules/fickling/default.nix new file mode 100644 index 000000000000..a5de0d913a2c --- /dev/null +++ b/pkgs/development/python-modules/fickling/default.nix @@ -0,0 +1,55 @@ +{ + lib, + astunparse, + buildPythonPackage, + distutils, + fetchFromGitHub, + fickling, + flit-core, + numpy, + pytestCheckHook, + pythonOlder, + torch, + torchvision, +}: + +buildPythonPackage rec { + pname = "fickling"; + version = "0.1.3"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "trailofbits"; + repo = "fickling"; + rev = "refs/tags/v${version}"; + hash = "sha256-/cV1XhJ8KMFby9nZ/qXEYxf+P6352Q2DZOLuvebyuHQ="; + }; + + build-system = [ + distutils + flit-core + ]; + + dependencies = [ astunparse ]; + + optional-dependencies = { + torch = [ + torch + torchvision + ]; + }; + + nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (builtins.attrValues optional-dependencies); + + pythonImportsCheck = [ "fickling" ]; + + meta = with lib; { + description = "A Python pickling decompiler and static analyzer"; + homepage = "https://github.com/trailofbits/fickling"; + changelog = "https://github.com/trailofbits/fickling/releases/tag/v${version}"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 88504c16e663..8c80523085a7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4356,6 +4356,8 @@ self: super: with self; { fiblary3-fork = callPackage ../development/python-modules/fiblary3-fork { }; + fickling = callPackage ../development/python-modules/fickling { }; + fido2 = callPackage ../development/python-modules/fido2 { }; fields = callPackage ../development/python-modules/fields { }; From 9f4a6a1e9e29069469820d6b43818177a64caeaa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 12:32:02 +0000 Subject: [PATCH 257/298] civo: 1.0.89 -> 1.0.90 --- pkgs/by-name/ci/civo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ci/civo/package.nix b/pkgs/by-name/ci/civo/package.nix index f96db4760b68..9830daa37615 100644 --- a/pkgs/by-name/ci/civo/package.nix +++ b/pkgs/by-name/ci/civo/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "civo"; - version = "1.0.89"; + version = "1.0.90"; src = fetchFromGitHub { owner = "civo"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-hX/tmeQYcTDs3JZSFhvzCrcbqvfa78MXtTo8VcuAqxY="; + sha256 = "sha256-2UWEQZRbtPArYK7Kr0eHtF8+XWXl06v86nAb8nka50g="; }; - vendorHash = "sha256-bwmJnKxdvVskrrTCa0cdpiYeFVZWTYyaFNEbeymT7P0="; + vendorHash = "sha256-ZnomzHbsNKWwAsRjOjESKSdR+KgSiMMlG0xq33qpzX0="; nativeBuildInputs = [ installShellFiles ]; From 93e069f9aaf55d56fa6c44edb021953c5e0c1c54 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Sep 2024 14:33:46 +0200 Subject: [PATCH 258/298] python312Packages.graphtage: refactor --- .../python-modules/graphtage/default.nix | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/graphtage/default.nix b/pkgs/development/python-modules/graphtage/default.nix index 7ecdeb1adf84..5b3f70dcc1f3 100644 --- a/pkgs/development/python-modules/graphtage/default.nix +++ b/pkgs/development/python-modules/graphtage/default.nix @@ -1,14 +1,17 @@ { lib, buildPythonPackage, - fetchFromGitHub, - pytestCheckHook, - pythonOlder, colorama, + distutils, + fetchFromGitHub, + fickling, intervaltree, json5, + pytestCheckHook, + pythonOlder, pyyaml, scipy, + setuptools, tqdm, typing-extensions, }: @@ -16,24 +19,27 @@ buildPythonPackage rec { pname = "graphtage"; version = "0.3.1"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "trailofbits"; - repo = pname; + repo = "graphtage"; rev = "refs/tags/v${version}"; hash = "sha256-Bz2T8tVdVOdXt23yPITkDNL46Y5LZPhY3SXZ5bF3CHw="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "json5==0.9.5" "json5>=0.9.5" - ''; + pythonRelaxDeps = [ "json5" ]; - propagatedBuildInputs = [ + build-system = [ + distutils + setuptools + ]; + + dependencies = [ colorama + fickling intervaltree json5 pyyaml @@ -48,10 +54,10 @@ buildPythonPackage rec { meta = with lib; { description = "Utility to diff tree-like files such as JSON and XML"; - mainProgram = "graphtage"; homepage = "https://github.com/trailofbits/graphtage"; changelog = "https://github.com/trailofbits/graphtage/releases/tag/v${version}"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ veehaitch ]; + mainProgram = "graphtage"; }; } From fd2982de56099d98a725b594603cb65c4a20073a Mon Sep 17 00:00:00 2001 From: Amir Yalon Date: Mon, 17 Jun 2024 11:38:12 +0300 Subject: [PATCH 259/298] Build sphinxsearch using the old c++98 standard Various warnings are emitted when building in Darwin environments, apparently due to the use of Clang as opposed to GCC. We could continue to add more `-Wno-xxx` flags as they arise, either with the existing `stdenv.isDarwin` condition or with the more correct `stdenv.cc.isClang`, but for an older codebase it seems more prodent to stick with the latest standard where it builds cleanly. The newer `-std=c++11` was also attempted, but it still failed to build. --- pkgs/servers/search/sphinxsearch/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/servers/search/sphinxsearch/default.nix index 0b34c1f44a8f..58887c5ef5e3 100644 --- a/pkgs/servers/search/sphinxsearch/default.nix +++ b/pkgs/servers/search/sphinxsearch/default.nix @@ -31,13 +31,7 @@ stdenv.mkDerivation rec { expat ]; - CXXFLAGS = lib.concatStringsSep " " (lib.optionals stdenv.isDarwin [ - # see upstream bug: http://sphinxsearch.com/bugs/view.php?id=2578 - # workaround for "error: invalid suffix on literal - "-Wno-reserved-user-defined-literal" - # workaround for "error: non-constant-expression cannot be narrowed from type 'long' to 'int'" - "-Wno-c++11-narrowing" - ]); + CXXFLAGS = "-std=c++98"; meta = { description = "Open source full text search server"; From 74180c61596033fbcc75bb0959c98ca33190f513 Mon Sep 17 00:00:00 2001 From: phaer Date: Thu, 5 Sep 2024 14:40:29 +0200 Subject: [PATCH 260/298] brightboxImage: remove, as it seems unmaintained ...and is broken/flaky on master, due to custom script with mknod usage. --- .../manual/release-notes/rl-2411.section.md | 2 + .../virtualisation/brightbox-config.nix | 5 - .../virtualisation/brightbox-image.nix | 166 ------------------ 3 files changed, 2 insertions(+), 171 deletions(-) delete mode 100644 nixos/modules/virtualisation/brightbox-config.nix delete mode 100644 nixos/modules/virtualisation/brightbox-image.nix diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 0d668459f09b..ef4dddf757b7 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -402,6 +402,8 @@ - The `antennas` package and the `services.antennas` module have been removed as they only work with `tvheadend` (see above). +- The `system.build.brightboxImage` image has been removed as It did not build anymore and has not seen any maintenance in over 7 years (excluding tree-wide changes). + - The `services.syncplay` module now exposes all currently available command-line arguments for `syncplay-server` as options, as well as a `useACMEHost` option for easy TLS setup. The systemd service now uses `DynamicUser`/`StateDirectory` and the `user` and `group` options have been deprecated. diff --git a/nixos/modules/virtualisation/brightbox-config.nix b/nixos/modules/virtualisation/brightbox-config.nix deleted file mode 100644 index 0a018e4cd695..000000000000 --- a/nixos/modules/virtualisation/brightbox-config.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ modulesPath, ... }: - -{ - imports = [ "${modulesPath}/virtualisation/brightbox-image.nix" ]; -} diff --git a/nixos/modules/virtualisation/brightbox-image.nix b/nixos/modules/virtualisation/brightbox-image.nix deleted file mode 100644 index 15f8fd6d8f7d..000000000000 --- a/nixos/modules/virtualisation/brightbox-image.nix +++ /dev/null @@ -1,166 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; -let - diskSize = "20G"; -in -{ - imports = [ ../profiles/headless.nix ../profiles/qemu-guest.nix ]; - - system.build.brightboxImage = - pkgs.vmTools.runInLinuxVM ( - pkgs.runCommand "brightbox-image" - { preVM = - '' - mkdir $out - diskImage=$out/$diskImageBase - truncate $diskImage --size ${diskSize} - mv closure xchg/ - ''; - - postVM = - '' - PATH=$PATH:${lib.makeBinPath [ pkgs.gnutar pkgs.gzip ]} - pushd $out - ${pkgs.qemu_kvm}/bin/qemu-img convert -c -O qcow2 $diskImageBase nixos.qcow2 - rm $diskImageBase - popd - ''; - diskImageBase = "nixos-image-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.raw"; - buildInputs = [ pkgs.util-linux pkgs.perl ]; - exportReferencesGraph = - [ "closure" config.system.build.toplevel ]; - } - '' - # Create partition table - ${pkgs.parted}/sbin/parted --script /dev/vda mklabel msdos - ${pkgs.parted}/sbin/parted --script /dev/vda mkpart primary ext4 1 ${diskSize} - ${pkgs.parted}/sbin/parted --script /dev/vda print - . /sys/class/block/vda1/uevent - mknod /dev/vda1 b $MAJOR $MINOR - - # Create an empty filesystem and mount it. - ${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L nixos /dev/vda1 - ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1 - - mkdir /mnt - mount /dev/vda1 /mnt - - # The initrd expects these directories to exist. - mkdir /mnt/dev /mnt/proc /mnt/sys - - mount --bind /proc /mnt/proc - mount --bind /dev /mnt/dev - mount --bind /sys /mnt/sys - - # Copy all paths in the closure to the filesystem. - storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure) - - mkdir -p /mnt/nix/store - echo "copying everything (will take a while)..." - cp -prd $storePaths /mnt/nix/store/ - - # Register the paths in the Nix database. - printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \ - chroot /mnt ${config.nix.package.out}/bin/nix-store --load-db --option build-users-group "" - - # Create the system profile to allow nixos-rebuild to work. - chroot /mnt ${config.nix.package.out}/bin/nix-env \ - -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} \ - --option build-users-group "" - - # `nixos-rebuild' requires an /etc/NIXOS. - mkdir -p /mnt/etc - touch /mnt/etc/NIXOS - - # `switch-to-configuration' requires a /bin/sh - mkdir -p /mnt/bin - ln -s ${config.system.build.binsh}/bin/sh /mnt/bin/sh - - # Install a configuration.nix. - mkdir -p /mnt/etc/nixos /mnt/boot/grub - cp ${./brightbox-config.nix} /mnt/etc/nixos/configuration.nix - - # Generate the GRUB menu. - ln -s vda /dev/sda - chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot - - umount /mnt/proc /mnt/dev /mnt/sys - umount /mnt - '' - ); - - fileSystems."/".label = "nixos"; - - # Generate a GRUB menu. Amazon's pv-grub uses this to boot our kernel/initrd. - boot.loader.grub.device = "/dev/vda"; - boot.loader.timeout = 0; - - # Don't put old configurations in the GRUB menu. The user has no - # way to select them anyway. - boot.loader.grub.configurationLimit = 0; - - # Allow root logins only using the SSH key that the user specified - # at instance creation time. - services.openssh.enable = true; - services.openssh.settings.PermitRootLogin = "prohibit-password"; - - # Force getting the hostname from Google Compute. - networking.hostName = mkDefault ""; - - # Always include cryptsetup so that NixOps can use it. - environment.systemPackages = [ pkgs.cryptsetup ]; - - systemd.services.fetch-ec2-data = - { description = "Fetch EC2 Data"; - - wantedBy = [ "multi-user.target" "sshd.service" ]; - before = [ "sshd.service" ]; - wants = [ "network-online.target" ]; - after = [ "network-online.target" ]; - - path = [ pkgs.wget pkgs.iproute2 ]; - - script = - '' - wget="wget -q --retry-connrefused -O -" - - ${optionalString (config.networking.hostName == "") '' - echo "setting host name..." - ${pkgs.nettools}/bin/hostname $($wget http://169.254.169.254/latest/meta-data/hostname) - ''} - - # Don't download the SSH key if it has already been injected - # into the image (a Nova feature). - if ! [ -e /root/.ssh/authorized_keys ]; then - echo "obtaining SSH key..." - mkdir -m 0700 -p /root/.ssh - $wget http://169.254.169.254/latest/meta-data/public-keys/0/openssh-key > /root/key.pub - if [ $? -eq 0 -a -e /root/key.pub ]; then - if ! grep -q -f /root/key.pub /root/.ssh/authorized_keys; then - cat /root/key.pub >> /root/.ssh/authorized_keys - echo "new key added to authorized_keys" - fi - chmod 600 /root/.ssh/authorized_keys - rm -f /root/key.pub - fi - fi - - # Extract the intended SSH host key for this machine from - # the supplied user data, if available. Otherwise sshd will - # generate one normally. - $wget http://169.254.169.254/2011-01-01/user-data > /root/user-data || true - key="$(sed 's/|/\n/g; s/SSH_HOST_DSA_KEY://; t; d' /root/user-data)" - key_pub="$(sed 's/SSH_HOST_DSA_KEY_PUB://; t; d' /root/user-data)" - if [ -n "$key" -a -n "$key_pub" -a ! -e /etc/ssh/ssh_host_dsa_key ]; then - mkdir -m 0755 -p /etc/ssh - (umask 077; echo "$key" > /etc/ssh/ssh_host_dsa_key) - echo "$key_pub" > /etc/ssh/ssh_host_dsa_key.pub - fi - ''; - - serviceConfig.Type = "oneshot"; - serviceConfig.RemainAfterExit = true; - }; - -} From 1afc4e9ab0e93240a6e1ff279760173d0037d6dd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Sep 2024 14:45:37 +0200 Subject: [PATCH 261/298] python312Packages.ansible-runner: refactor --- pkgs/development/python-modules/ansible-runner/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index 746877f57e2e..8d8e80877307 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace '"setuptools>=45, <=69.0.2", "setuptools-scm[toml]>=6.2, <=8.0.4"' '"setuptools", "setuptools-scm"' + --replace-fail '"setuptools>=45, <=69.0.2", "setuptools-scm[toml]>=6.2, <=8.0.4"' '"setuptools", "setuptools-scm"' ''; build-system = [ @@ -69,7 +69,7 @@ buildPythonPackage rec { ''; disabledTests = [ - # Requires network access + # Tests require network access "test_callback_plugin_task_args_leak" "test_env_accuracy" # Times out on slower hardware @@ -95,9 +95,10 @@ buildPythonPackage rec { meta = with lib; { description = "Helps when interfacing with Ansible"; - mainProgram = "ansible-runner"; homepage = "https://github.com/ansible/ansible-runner"; + changelog = "https://github.com/ansible/ansible-runner/releases/tag/${version}"; license = licenses.asl20; maintainers = [ ]; + mainProgram = "ansible-runner"; }; } From ad97610187e2d763bef2e2f804d674e00cc12605 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Sep 2024 14:48:14 +0200 Subject: [PATCH 262/298] python312Packages.ansible-runner: disable failing tests --- pkgs/development/python-modules/ansible-runner/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index 8d8e80877307..0e1a3b8ca7a2 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -76,6 +76,11 @@ buildPythonPackage rec { "test_large_stdout_blob" # Failed: DID NOT RAISE "test_validate_pattern" + # Assertion error + "test_get_role_list" + "test_include_role_from_collection_events" + "test_resolved_actions" + "test_callback_plugin_censoring_does_not_overwrite" ]; disabledTestPaths = From d7a5ae0a6aa6ada77f2ea47662ab3bc1a493af7f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Sep 2024 15:07:18 +0200 Subject: [PATCH 263/298] python312Packages.blocksat-cli: 2.4.6 -> 2.4.7 Diff: https://github.com/Blockstream/satellite/compare/refs/tags/v2.4.6...v2.4.7 Changelog: https://github.com/Blockstream/satellite/releases/tag/v2.4.7 --- .../python-modules/blocksat-cli/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/blocksat-cli/default.nix b/pkgs/development/python-modules/blocksat-cli/default.nix index 1351b26698b8..fb1856f7a245 100644 --- a/pkgs/development/python-modules/blocksat-cli/default.nix +++ b/pkgs/development/python-modules/blocksat-cli/default.nix @@ -5,6 +5,7 @@ fetchFromGitHub, pyasyncore, pysnmp, + pysnmplib, pytestCheckHook, python-gnupg, pythonAtLeast, @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "blocksat-cli"; - version = "2.4.6"; + version = "2.4.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,14 +26,17 @@ buildPythonPackage rec { owner = "Blockstream"; repo = "satellite"; rev = "refs/tags/v${version}"; - hash = "sha256-1gz2lAS/AHeY54AaVXGeofLC68KjAP7POsIaBL3v2EY="; + hash = "sha256-OmIQUrUH3kWgf+v+9Hl2OgDdGPwb3guNY0+H64CWkeg="; }; - nativeBuildInputs = [ setuptools ]; + pythonRelaxDeps = [ "pyasyncore" ]; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ distro pysnmp + pysnmplib python-gnupg qrcode requests @@ -50,10 +54,10 @@ buildPythonPackage rec { meta = with lib; { description = "Blockstream Satellite CLI"; - mainProgram = "blocksat-cli"; homepage = "https://github.com/Blockstream/satellite"; changelog = "https://github.com/Blockstream/satellite/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ prusnak ]; + mainProgram = "blocksat-cli"; }; } From b6b60e025ac58aca273dbfcf5f416ea3c652f4fe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Sep 2024 15:14:27 +0200 Subject: [PATCH 264/298] python312Packages.azure-mgmt-netapp: 13.1.0 -> 13.2.0 Changelog: https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-netapp_13.2.0/sdk/netapp/azure-mgmt-netapp/CHANGELOG.md --- pkgs/development/python-modules/azure-mgmt-netapp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix index 8d12b418a194..0a5ca8dcfefc 100644 --- a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "azure-mgmt-netapp"; - version = "13.1.0"; + version = "13.2.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-8JzJFZTplNGo74wBelP8Geo7+FQ7WYmAOAef4jv533M="; + hash = "sha256-31wzzDeQrs04AL8Qsz050RY/AllvXwy+8Ng+QbUihjo="; }; build-system = [ setuptools ]; From 696b2a92d03b9d0793e1f786252a655153708d91 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Sep 2024 15:15:42 +0200 Subject: [PATCH 265/298] python312Packages.azure-mgmt-web: 7.3.0 -> 7.3.1 Changelog: https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-web_7.3.1/sdk/appservice/azure-mgmt-web/CHANGELOG.md --- pkgs/development/python-modules/azure-mgmt-web/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-web/default.nix b/pkgs/development/python-modules/azure-mgmt-web/default.nix index adbae42173ca..aec11200508d 100644 --- a/pkgs/development/python-modules/azure-mgmt-web/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-web/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-mgmt-web"; - version = "7.3.0"; + version = "7.3.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-IDK/TVDfC7uCLqAMrDv74OZ0h9LJzBGCwIWPgxSc3qk="; + hash = "sha256-h7dxQ2vJmnqN9Z0K0YW5aHmgbc4UdkoGs/w9r6j8tWs="; }; propagatedBuildInputs = [ From b660e0dd5bc0317b0e64393ea53b0db950b09224 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Sep 2024 15:17:07 +0200 Subject: [PATCH 266/298] python312Packages.azure-appconfiguration: 1.6.0 -> 1.7.1 Changelog: https://github.com/Azure/azure-sdk-for-python/blob/azure-appconfiguration_1.7.1/sdk/appconfiguration/azure-appconfiguration/CHANGELOG.md --- .../python-modules/azure-appconfiguration/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-appconfiguration/default.nix b/pkgs/development/python-modules/azure-appconfiguration/default.nix index 33f24c827fdb..02d8447c12ad 100644 --- a/pkgs/development/python-modules/azure-appconfiguration/default.nix +++ b/pkgs/development/python-modules/azure-appconfiguration/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-appconfiguration"; - version = "1.6.0"; + version = "1.7.1"; pyporject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-z2KKPh6mZDR5ZDzSRt2kZO3Eq3hXQzOaao/oCbwTf+w="; + hash = "sha256-Pr5B6b4/SubKYeXbxCxLfMAHoBBUqFBlAaJt/Bmf0+w="; }; build-system = [ setuptools ]; From 36a28bc62e40e32de18abe96636f0eb9e2f03957 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Sep 2024 15:18:34 +0200 Subject: [PATCH 267/298] python312Packages.azure-mgmt-network: 25.4.0 -> 26.0.0 Changelog: https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-network_26.0.0/sdk/network/azure-mgmt-network/CHANGELOG.md --- .../development/python-modules/azure-mgmt-network/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index 8e0590238007..735184f21b1a 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "azure-mgmt-network"; - version = "25.4.0"; + version = "26.0.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-ozjmLYH9vwUPgCFDwoy5ZbB+3UOADvBQTN+muIVNdVQ="; + hash = "sha256-TeZ2GEGVBT/bEGpuoQQqiU5wxzGm08imM9UvUin07hs="; }; nativeBuildInputs = [ setuptools ]; From 1c86a6ff8f5505cb481ce2102305152b3267cd53 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Sep 2024 15:19:09 +0200 Subject: [PATCH 268/298] python312Packages.azure-mgmt-appcontainers: 3.0.0 -> 3.1.0 --- .../python-modules/azure-mgmt-appcontainers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix b/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix index 8d66700b5413..0be4aa8e3c01 100644 --- a/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "azure-mgmt-appcontainers"; - version = "3.0.0"; + version = "3.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-oqKPEOnZaIU7IMzDqT552IBJr9RtWt3vFO3SlG8igs0="; + hash = "sha256-PHlDnxK8788UCvjG572LUWJOlx/ZH1rOmKzAc8Lm+uw="; }; propagatedBuildInputs = [ From 31bd29314c8526288d019bfae1d0a0e32b06c530 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 27 Aug 2024 12:49:21 -0400 Subject: [PATCH 269/298] gpt4all: 2.8.0 -> 3.2.1 --- pkgs/by-name/gp/gpt4all/embedding-local.patch | 50 +++++++++++++++++++ pkgs/by-name/gp/gpt4all/package.nix | 18 +++++-- 2 files changed, 65 insertions(+), 3 deletions(-) create mode 100644 pkgs/by-name/gp/gpt4all/embedding-local.patch diff --git a/pkgs/by-name/gp/gpt4all/embedding-local.patch b/pkgs/by-name/gp/gpt4all/embedding-local.patch new file mode 100644 index 000000000000..fee7702102ac --- /dev/null +++ b/pkgs/by-name/gp/gpt4all/embedding-local.patch @@ -0,0 +1,50 @@ +commit 1e8fdf3f90fd142c5ddd63e44ca1e5c172dbfb7f +Author: Simon Gardling +Date: Tue Aug 27 12:45:14 2024 -0400 + + use locally downloaded embeddings + +index 27f3f5d9..9e25528a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -90,6 +90,7 @@ elseif (APPLE) + endif() + + # Embedding model ++#[[ + set(LOCAL_EMBEDDING_MODEL "nomic-embed-text-v1.5.f16.gguf") + set(LOCAL_EMBEDDING_MODEL_MD5 "a5401e7f7e46ed9fcaed5b60a281d547") + set(LOCAL_EMBEDDING_MODEL_PATH "${CMAKE_BINARY_DIR}/resources/${LOCAL_EMBEDDING_MODEL}") +@@ -104,6 +105,7 @@ + if (APPLE) + list(APPEND CHAT_EXE_RESOURCES "${LOCAL_EMBEDDING_MODEL_PATH}") + endif() ++]] + + qt_add_executable(chat + main.cpp +@@ -383,11 +385,13 @@ + endif() + endif() + ++#[[ + if (NOT APPLE) + install(FILES "${CMAKE_BINARY_DIR}/resources/${LOCAL_EMBEDDING_MODEL}" + DESTINATION resources + COMPONENT ${COMPONENT_NAME_MAIN}) + endif() ++]] + + set(CPACK_GENERATOR "IFW") + set(CPACK_VERBATIM_VARIABLES YES) +--- a/embllm.cpp ++++ b/embllm.cpp +@@ -84,7 +84,7 @@ bool EmbeddingLLMWorker::loadModel() + + QString filePath = embPathFmt.arg(QCoreApplication::applicationDirPath(), LOCAL_EMBEDDING_MODEL); + if (!QFileInfo::exists(filePath)) { +- qWarning() << "embllm WARNING: Local embedding model not found"; ++ qWarning() << "embllm WARNING: Local embedding model not found: " << filePath; + return false; + } + diff --git a/pkgs/by-name/gp/gpt4all/package.nix b/pkgs/by-name/gp/gpt4all/package.nix index 60a6e05de211..5f56d7fe34d2 100644 --- a/pkgs/by-name/gp/gpt4all/package.nix +++ b/pkgs/by-name/gp/gpt4all/package.nix @@ -2,6 +2,7 @@ , config , stdenv , fetchFromGitHub +, fetchurl , cmake , qt6 , fmt @@ -14,16 +15,25 @@ stdenv.mkDerivation (finalAttrs: { pname = "gpt4all"; - version = "2.8.0"; + version = "3.2.1"; src = fetchFromGitHub { fetchSubmodules = true; - hash = "sha256-aSz37+1K26Xizf4cpV45a2DnSsl959VQok/ppFRk/hs="; + hash = "sha256-h6hcqafTjQsqVlpnqVeohh38A67VSGrW3WrCErjaKIQ="; owner = "nomic-ai"; repo = "gpt4all"; rev = "v${finalAttrs.version}"; }; + embed_model = fetchurl { + url = "https://gpt4all.io/models/gguf/nomic-embed-text-v1.5.f16.gguf"; + sha256 = "f7af6f66802f4df86eda10fe9bbcfc75c39562bed48ef6ace719a251cf1c2fdb"; + }; + + patches = [ + ./embedding-local.patch + ]; + sourceRoot = "${finalAttrs.src.name}/gpt4all-chat"; nativeBuildInputs = [ @@ -41,6 +51,7 @@ stdenv.mkDerivation (finalAttrs: { qt6.qthttpserver qt6.qtwebengine qt6.qt5compat + qt6.qttools shaderc vulkan-headers wayland @@ -64,8 +75,9 @@ stdenv.mkDerivation (finalAttrs: { rm -rf $out/include rm -rf $out/lib/*.a mv $out/bin/chat $out/bin/${finalAttrs.meta.mainProgram} + install -D ${finalAttrs.embed_model} $out/resources/nomic-embed-text-v1.5.f16.gguf install -m 444 -D $src/gpt4all-chat/flatpak-manifest/io.gpt4all.gpt4all.desktop $out/share/applications/io.gpt4all.gpt4all.desktop - install -m 444 -D $src/gpt4all-chat/icons/logo.svg $out/share/icons/hicolor/scalable/apps/io.gpt4all.gpt4all.svg + install -m 444 -D $src/gpt4all-chat/icons/nomic_logo.svg $out/share/icons/hicolor/scalable/apps/io.gpt4all.gpt4all.svg substituteInPlace $out/share/applications/io.gpt4all.gpt4all.desktop \ --replace-fail 'Exec=chat' 'Exec=${finalAttrs.meta.mainProgram}' ''; From 9f64249ad1a304536e9ab0c21981557514ffd729 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 5 Sep 2024 09:53:34 -0400 Subject: [PATCH 270/298] maintainers: add titaniumtown --- maintainers/maintainer-list.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 54de059cf560..1143ce6436b8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -20990,6 +20990,14 @@ github = "tirimia"; githubId = 11174371; }; + titaniumtown = { + email = "titaniumtown@proton.me"; + name = "Simon Gardling"; + github = "titaniumtown"; + githubId = 11786225; + matrix = "@titaniumtown:envs.net"; + keys = [ { fingerprint = "D15E 4754 FE1A EDA1 5A6D 4702 9AB2 8AC1 0ECE 533D"; } ]; + }; tjni = { email = "43ngvg@masqt.com"; matrix = "@tni:matrix.org"; From abcf14644a7adcf069619aa7404fad05a33beb25 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 5 Sep 2024 09:54:49 -0400 Subject: [PATCH 271/298] gpt4all: add titaniumtown as maintainer --- pkgs/by-name/gp/gpt4all/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/gp/gpt4all/package.nix b/pkgs/by-name/gp/gpt4all/package.nix index 5f56d7fe34d2..893e3594bc50 100644 --- a/pkgs/by-name/gp/gpt4all/package.nix +++ b/pkgs/by-name/gp/gpt4all/package.nix @@ -88,6 +88,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/nomic-ai/gpt4all"; license = lib.licenses.mit; mainProgram = "gpt4all"; - maintainers = with lib.maintainers; [ polygon ]; + maintainers = with lib.maintainers; [ polygon titaniumtown ]; }; }) From ae48da36640772903475fb54e79c2111a5a75542 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Sep 2024 16:14:46 +0200 Subject: [PATCH 272/298] python312Packages.azure-mgmt-datafactory: 8.0.0 -> 9.0.0 Changelog: https://github.com/Azure/azure-sdk-for-python/tree/azure-mgmt-datafactory_9.0.0/sdk/datafactory/azure-mgmt-datafactory --- .../python-modules/azure-mgmt-datafactory/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index 3c511be3ca53..325db23d062f 100644 --- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "8.0.0"; + version = "9.0.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-CL1Z50yjbEkncmKT4FhJ7UaOiUtw1CD85TVEJ7KHjQ4="; + hash = "sha256-j1TMe2/jkSVa7p4Ar9HmZjh56GNqtkHP+QbSuyTDT04="; }; nativeBuildInputs = [ setuptools ]; From d96191de0b08e9704ce4d1a3d105e2d521b21eed Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 5 Sep 2024 16:23:21 +0200 Subject: [PATCH 273/298] kubectl-view-allocations: remove superfluous perl input MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This hasn't been necessary since kubectl-view-allocations commit 0a2e061 ("➖ switch from openssl to rustls (like kube-rs 0.86)"). --- .../networking/cluster/kubectl-view-allocations/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix b/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix index 4d67c3786bdd..25e11043252b 100644 --- a/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix @@ -2,7 +2,6 @@ , stdenv , rustPlatform , fetchFromGitHub -, perl , Security ? null }: @@ -25,7 +24,6 @@ rustPlatform.buildRustPackage rec { lockFile = ./Cargo.lock; }; - nativeBuildInputs = [ perl ]; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; meta = with lib; { From 5f454a7d94f4822cee0b2749444573107e8b5c86 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 14:24:36 +0000 Subject: [PATCH 274/298] json2hcl: 0.1.1 -> 0.2.0 --- pkgs/development/tools/json2hcl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/json2hcl/default.nix b/pkgs/development/tools/json2hcl/default.nix index 39fa629df62b..7255736cd500 100644 --- a/pkgs/development/tools/json2hcl/default.nix +++ b/pkgs/development/tools/json2hcl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "json2hcl"; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromGitHub { owner = "kvz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0ku8sON4fzWAirqY+dhYAks2LSyC7OH/LKI0kb+QhpM="; + sha256 = "sha256-h7DudYVWvDRCbjoIgOoCIudf7ZfUfWXp5OJ4ni0nm6c="; }; vendorHash = "sha256-GxYuFak+5CJyHgC1/RsS0ub84bgmgL+bI4YKFTb+vIY="; From 8ce7f9f78bdbe659a8d7c1fe376b89b3a43e4cdc Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 31 Aug 2024 12:08:55 +0200 Subject: [PATCH 275/298] qemu: 9.0.2 -> 9.1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The macOS deployment target has been set to 12.0, and the collection of patches and reverts to keep older macOS versions working has been dropped, as maintaining what is effectively a fork of QEMU solely for the sake of versions no longer supported by Apple has become untenable. It may or may not still work on older macOS versions, potentially with reduced functionality. Upstream only officially supports the latest two versions of macOS, so this is still extending support further back than QEMU will support. To continue supporting back to macOS 10.12, at least the following upstream commits would have to be reverted, and possibly more: * * * However, if you want to do that, you should be prepared to take up the burden of maintaining the monotonically‐increasing set of patches that will be required to keep this working in future. Fixes: CVE-2024-7409 Co-authored-by: Emily --- .../virtualization/qemu/default.nix | 37 ++-- .../virtualization/qemu/fix-qemu-ga.patch | 75 ++++--- .../qemu/provide-fallback-for-utimensat.patch | 189 ----------------- ...remove-ui-cocoa-use-safe-area-insets.patch | 14 -- ...evert-ui-cocoa-add-clipboard-support.patch | 200 ------------------ ...i-cocoa-use-the-standard-about-panel.patch | 145 ------------- pkgs/top-level/all-packages.nix | 10 +- 7 files changed, 68 insertions(+), 602 deletions(-) delete mode 100644 pkgs/applications/virtualization/qemu/provide-fallback-for-utimensat.patch delete mode 100644 pkgs/applications/virtualization/qemu/remove-ui-cocoa-use-safe-area-insets.patch delete mode 100644 pkgs/applications/virtualization/qemu/revert-ui-cocoa-add-clipboard-support.patch delete mode 100644 pkgs/applications/virtualization/qemu/revert-ui-cocoa-use-the-standard-about-panel.patch diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index acff3e0e2298..6be060d44891 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchurl, fetchpatch, python3Packages, zlib, pkg-config, glib, buildPackages +{ lib, stdenv, fetchurl, fetchpatch, python3Packages, zlib, pkg-config, glib, overrideSDK, buildPackages , pixman, vde2, alsa-lib, flex, pcre2 , bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, dtc, ninja, meson , sigtool , makeWrapper, removeReferencesTo , attr, libcap, libcap_ng, socat, libslirp -, CoreServices, Cocoa, Hypervisor, rez, setfile, vmnet +, CoreServices, Cocoa, Hypervisor, Kernel, rez, setfile, vmnet , guestAgentSupport ? (with stdenv.hostPlatform; isLinux || isNetBSD || isOpenBSD || isSunOS || isWindows) && !minimal , numaSupport ? stdenv.isLinux && !stdenv.isAarch32 && !minimal, numactl , seccompSupport ? stdenv.isLinux && !minimal, libseccomp @@ -52,6 +52,16 @@ let hexagonSupport = hostCpuTargets == null || lib.elem "hexagon" hostCpuTargets; + + buildPlatformStdenv = + if stdenv.buildPlatform.isDarwin then + overrideSDK buildPackages.stdenv { + # Keep these values in sync with `all-packages.nix`. + darwinSdkVersion = "12.3"; + darwinMinVersion = "12.0"; + } + else + buildPackages.stdenv; in stdenv.mkDerivation (finalAttrs: { @@ -61,14 +71,14 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString nixosTestRunner "-for-vm-tests" + lib.optionalString toolsOnly "-utils" + lib.optionalString userOnly "-user"; - version = "9.0.2"; + version = "9.1.0"; src = fetchurl { url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz"; - hash = "sha256-qMP1lq7Olto7AMr7dLqvoNFFFer7jtHuP39cLQ6/ArY="; + hash = "sha256-gWtwIqi6fCrDDi4M+XPoJva8yFBTOWAyEsXt6OlNeDQ="; }; - depsBuildBuild = [ buildPackages.stdenv.cc ] + depsBuildBuild = [ buildPlatformStdenv.cc ] ++ lib.optionals hexagonSupport [ pkg-config ]; nativeBuildInputs = [ @@ -82,16 +92,14 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals enableDocs [ python3Packages.sphinx python3Packages.sphinx-rtd-theme ] ++ lib.optionals hexagonSupport [ glib ] ++ lib.optionals stdenv.isDarwin [ sigtool ] - ++ lib.optionals (!userOnly) [ dtc ] - # workaround, remove once this patch lands: https://lore.kernel.org/qemu-devel/20240805104921.4035256-1-hi@alyssa.is/ - ++ lib.optionals (hexagonSupport && stdenv.hostPlatform.isStatic) [ pcre2 ]; + ++ lib.optionals (!userOnly) [ dtc ]; buildInputs = [ zlib glib pixman vde2 lzo snappy libtasn1 gnutls nettle curl libslirp ] ++ lib.optionals ncursesSupport [ ncurses ] - ++ lib.optionals stdenv.isDarwin [ CoreServices Cocoa Hypervisor rez setfile vmnet ] + ++ lib.optionals stdenv.isDarwin [ CoreServices Cocoa Hypervisor Kernel rez setfile vmnet ] ++ lib.optionals seccompSupport [ libseccomp ] ++ lib.optionals numaSupport [ numactl ] ++ lib.optionals alsaSupport [ alsa-lib ] @@ -129,17 +137,6 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./fix-qemu-ga.patch - # QEMU upstream does not demand compatibility to pre-10.13, so 9p-darwin - # support on nix requires utimensat fallback. The patch adding this fallback - # set was removed during the process of upstreaming this functionality, and - # will still be needed in nix until the macOS SDK reaches 10.13+. - ./provide-fallback-for-utimensat.patch - # Cocoa clipboard support only works on macOS 10.14+ - ./revert-ui-cocoa-add-clipboard-support.patch - # Standard about panel requires AppKit and macOS 10.13+ - ./revert-ui-cocoa-use-the-standard-about-panel.patch - # Safe area insets require macOS 11+ - ./remove-ui-cocoa-use-safe-area-insets.patch # Workaround for upstream issue with nested virtualisation: https://gitlab.com/qemu-project/qemu/-/issues/1008 (fetchpatch { url = "https://gitlab.com/qemu-project/qemu/-/commit/3e4546d5bd38a1e98d4bd2de48631abf0398a3a2.diff"; diff --git a/pkgs/applications/virtualization/qemu/fix-qemu-ga.patch b/pkgs/applications/virtualization/qemu/fix-qemu-ga.patch index 94dec6916800..9a4a7f0d432e 100644 --- a/pkgs/applications/virtualization/qemu/fix-qemu-ga.patch +++ b/pkgs/applications/virtualization/qemu/fix-qemu-ga.patch @@ -1,36 +1,45 @@ -diff --git i/qga/commands-posix.c w/qga/commands-posix.c -index 954efed01b..39c4b916ce 100644 ---- i/qga/commands-posix.c -+++ w/qga/commands-posix.c -@@ -123,6 +123,8 @@ void qmp_guest_shutdown(bool has_mode, const char *mode, Error **errp) - execl("/sbin/shutdown", "shutdown", shutdown_flag, "-g0", "-y", - "hypervisor initiated shutdown", (char *)NULL); - #else -+ execl("/run/current-system/sw/bin/shutdown", "shutdown", "-h", shutdown_flag, "+0", -+ "hypervisor initiated shutdown", (char *)NULL); - execl("/sbin/shutdown", "shutdown", "-h", shutdown_flag, "+0", - "hypervisor initiated shutdown", (char *)NULL); - #endif -@@ -158,11 +160,13 @@ void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp) - pid_t pid; - Error *local_err = NULL; - struct timeval tv; -+ static const char hwclock_path_nix[] = "/run/current-system/sw/bin/hwclock"; - static const char hwclock_path[] = "/sbin/hwclock"; - static int hwclock_available = -1; - - if (hwclock_available < 0) { -- hwclock_available = (access(hwclock_path, X_OK) == 0); -+ hwclock_available = (access(hwclock_path_nix, X_OK) == 0) || -+ (access(hwclock_path, X_OK) == 0); +diff --git a/qga/commands-posix.c b/qga/commands-posix.c +index c2bd0b4316..47cee1c351 100644 +--- a/qga/commands-posix.c ++++ b/qga/commands-posix.c +@@ -246,7 +246,7 @@ void qmp_guest_shutdown(const char *mode, Error **errp) + return; } - if (!hwclock_available) { -@@ -208,6 +212,7 @@ void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp) +- const char *argv[] = {"/sbin/shutdown", ++ const char *argv[] = {"/run/current-system/sw/bin/shutdown", + #ifdef CONFIG_SOLARIS + shutdown_flag, "-g0", "-y", + #elif defined(CONFIG_BSD) +@@ -257,6 +257,10 @@ void qmp_guest_shutdown(const char *mode, Error **errp) + "hypervisor initiated shutdown", (char *) NULL}; - /* Use '/sbin/hwclock -w' to set RTC from the system time, - * or '/sbin/hwclock -s' to set the system time from RTC. */ -+ execl(hwclock_path_nix, "hwclock", has_time ? "-w" : "-s", NULL); - execl(hwclock_path, "hwclock", has_time ? "-w" : "-s", NULL); - _exit(EXIT_FAILURE); - } else if (pid < 0) { + ga_run_command(argv, NULL, "shutdown", &local_err); ++ if (local_err) { ++ argv[0] = "/sbin/shutdown"; ++ ga_run_command(argv, NULL, "shutdown", &local_err); ++ } + if (local_err) { + error_propagate(errp, local_err); + return; +@@ -270,7 +274,7 @@ void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp) + int ret; + Error *local_err = NULL; + struct timeval tv; +- const char *argv[] = {"/sbin/hwclock", has_time ? "-w" : "-s", NULL}; ++ const char *argv[] = {"/run/current-system/sw/bin/hwclock", has_time ? "-w" : "-s", NULL}; + + /* If user has passed a time, validate and set it. */ + if (has_time) { +@@ -303,6 +307,11 @@ void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp) + * hardware clock (RTC). */ + ga_run_command(argv, NULL, "set hardware clock to system time", + &local_err); ++ if (local_err) { ++ argv[0] = "/sbin/hwclock"; ++ ga_run_command(argv, NULL, "set hardware clock to system time", ++ &local_err); ++ } + if (local_err) { + error_propagate(errp, local_err); + return; diff --git a/pkgs/applications/virtualization/qemu/provide-fallback-for-utimensat.patch b/pkgs/applications/virtualization/qemu/provide-fallback-for-utimensat.patch deleted file mode 100644 index dc4f4abb2738..000000000000 --- a/pkgs/applications/virtualization/qemu/provide-fallback-for-utimensat.patch +++ /dev/null @@ -1,189 +0,0 @@ -From 2ec149ea3f0046fa83e3be74aca192649a60be47 Mon Sep 17 00:00:00 2001 -From: Keno Fischer -Date: Sat, 16 Jun 2018 20:56:54 -0400 -Subject: [PATCH] 9p: darwin: Provide fallback impl for utimensat - -This function is new in Mac OS 10.13. Provide a fallback implementation -when building against older SDKs. The complication in the definition comes -having to separately handle the used SDK version and the target OS version. - -- If the SDK version is too low (__MAC_10_13 not defined), utimensat is not - defined in the header, so we must not try to use it (doing so would error). -- Otherwise, if the targetted OS version is at least 10.13, we know this - function is available, so we can unconditionally call it. -- Lastly, we check for the availability of the __builtin_available macro to - potentially insert a dynamic check for this OS version. However, __builtin_available - is only available with sufficiently recent versions of clang and while all - Apple clang versions that ship with Xcode versions that support the 10.13 - SDK support with builtin, we want to allow building with compilers other - than Apple clang that may not support this builtin. - -Signed-off-by: Keno Fischer -Signed-off-by: Michael Roitzsch -Signed-off-by: Will Cohen ---- - hw/9pfs/9p-local.c | 2 +- - hw/9pfs/9p-util-darwin.c | 96 ++++++++++++++++++++++++++++++++++++++++ - hw/9pfs/9p-util-linux.c | 6 +++ - hw/9pfs/9p-util.h | 8 ++++ - 4 files changed, 111 insertions(+), 1 deletion(-) - -diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c -index 9d07620235..9c77a431d5 100644 ---- a/hw/9pfs/9p-local.c -+++ b/hw/9pfs/9p-local.c -@@ -1081,7 +1081,7 @@ static int local_utimensat(FsContext *s, V9fsPath *fs_path, - goto out; - } - -- ret = qemu_utimensat(dirfd, name, buf, AT_SYMLINK_NOFOLLOW); -+ ret = utimensat_nofollow(dirfd, name, buf); - close_preserve_errno(dirfd); - out: - g_free(dirpath); -diff --git a/hw/9pfs/9p-util-darwin.c b/hw/9pfs/9p-util-darwin.c -index 95146e7354..74ab2a7f99 100644 ---- a/hw/9pfs/9p-util-darwin.c -+++ b/hw/9pfs/9p-util-darwin.c -@@ -145,3 +145,99 @@ int qemu_mknodat(int dirfd, const char *filename, mode_t mode, dev_t dev) - } - - #endif -+ -+#ifndef __has_builtin -+#define __has_builtin(x) 0 -+#endif -+ -+static int update_times_from_stat(int fd, struct timespec times[2], -+ int update0, int update1) -+{ -+ struct stat buf; -+ int ret = fstat(fd, &buf); -+ if (ret == -1) { -+ return ret; -+ } -+ if (update0) { -+ times[0] = buf.st_atimespec; -+ } -+ if (update1) { -+ times[1] = buf.st_mtimespec; -+ } -+ return 0; -+} -+ -+int utimensat_nofollow(int dirfd, const char *filename, -+ const struct timespec times_in[2]) -+{ -+ int ret, fd; -+ int special0, special1; -+ struct timeval futimes_buf[2]; -+ struct timespec times[2]; -+ memcpy(times, times_in, 2 * sizeof(struct timespec)); -+ -+/* Check whether we have an SDK version that defines utimensat */ -+#if defined(__MAC_10_13) -+# if __MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_10_13 -+# define UTIMENSAT_AVAILABLE 1 -+# elif __has_builtin(__builtin_available) -+# define UTIMENSAT_AVAILABLE __builtin_available(macos 10.13, *) -+# else -+# define UTIMENSAT_AVAILABLE 0 -+# endif -+ if (UTIMENSAT_AVAILABLE) { -+ return utimensat(dirfd, filename, times, AT_SYMLINK_NOFOLLOW); -+ } -+#endif -+ -+ /* utimensat not available. Use futimes. */ -+ fd = openat_file(dirfd, filename, O_PATH_9P_UTIL | O_NOFOLLOW, 0); -+ if (fd == -1) { -+ return -1; -+ } -+ -+ special0 = times[0].tv_nsec == UTIME_OMIT; -+ special1 = times[1].tv_nsec == UTIME_OMIT; -+ if (special0 || special1) { -+ /* If both are set, nothing to do */ -+ if (special0 && special1) { -+ ret = 0; -+ goto done; -+ } -+ -+ ret = update_times_from_stat(fd, times, special0, special1); -+ if (ret < 0) { -+ goto done; -+ } -+ } -+ -+ special0 = times[0].tv_nsec == UTIME_NOW; -+ special1 = times[1].tv_nsec == UTIME_NOW; -+ if (special0 || special1) { -+ ret = futimes(fd, NULL); -+ if (ret < 0) { -+ goto done; -+ } -+ -+ /* If both are set, we are done */ -+ if (special0 && special1) { -+ ret = 0; -+ goto done; -+ } -+ -+ ret = update_times_from_stat(fd, times, special0, special1); -+ if (ret < 0) { -+ goto done; -+ } -+ } -+ -+ futimes_buf[0].tv_sec = times[0].tv_sec; -+ futimes_buf[0].tv_usec = times[0].tv_nsec / 1000; -+ futimes_buf[1].tv_sec = times[1].tv_sec; -+ futimes_buf[1].tv_usec = times[1].tv_nsec / 1000; -+ ret = futimes(fd, futimes_buf); -+ -+done: -+ close_preserve_errno(fd); -+ return ret; -+} -diff --git a/hw/9pfs/9p-util-linux.c b/hw/9pfs/9p-util-linux.c -index db451b0784..320697f347 100644 ---- a/hw/9pfs/9p-util-linux.c -+++ b/hw/9pfs/9p-util-linux.c -@@ -68,3 +68,9 @@ int qemu_mknodat(int dirfd, const char *filename, mode_t mode, dev_t dev) - { - return mknodat(dirfd, filename, mode, dev); - } -+ -+int utimensat_nofollow(int dirfd, const char *filename, -+ const struct timespec times[2]) -+{ -+ return utimensat(dirfd, filename, times, AT_SYMLINK_NOFOLLOW); -+} -diff --git a/hw/9pfs/9p-util.h b/hw/9pfs/9p-util.h -index c314cf381d..12d57f3398 100644 ---- a/hw/9pfs/9p-util.h -+++ b/hw/9pfs/9p-util.h -@@ -101,6 +101,12 @@ static inline int errno_to_dotl(int err) { - #define qemu_utimensat utimensat - #define qemu_unlinkat unlinkat - -+/* Compatibility with old SDK Versions for Darwin */ -+#if defined(CONFIG_DARWIN) && !defined(UTIME_NOW) -+#define UTIME_NOW -1 -+#define UTIME_OMIT -2 -+#endif -+ - static inline void close_preserve_errno(int fd) - { - int serrno = errno; -@@ -163,6 +169,8 @@ ssize_t flistxattrat_nofollow(int dirfd, const char *filename, - char *list, size_t size); - ssize_t fremovexattrat_nofollow(int dirfd, const char *filename, - const char *name); -+int utimensat_nofollow(int dirfd, const char *filename, -+ const struct timespec times[2]); - - /* - * Darwin has d_seekoff, which appears to function similarly to d_off. --- -2.39.2 diff --git a/pkgs/applications/virtualization/qemu/remove-ui-cocoa-use-safe-area-insets.patch b/pkgs/applications/virtualization/qemu/remove-ui-cocoa-use-safe-area-insets.patch deleted file mode 100644 index 2a8430afaa70..000000000000 --- a/pkgs/applications/virtualization/qemu/remove-ui-cocoa-use-safe-area-insets.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/ui/cocoa.m b/ui/cocoa.m -index 25e0db9dd0..7ce889d798 100644 ---- a/ui/cocoa.m -+++ b/ui/cocoa.m -@@ -539,9 +539,6 @@ - (NSSize)fixAspectRatio:(NSSize)max - - (NSSize) screenSafeAreaSize - { - NSSize size = [[[self window] screen] frame].size; -- NSEdgeInsets insets = [[[self window] screen] safeAreaInsets]; -- size.width -= insets.left + insets.right; -- size.height -= insets.top + insets.bottom; - return size; - } - diff --git a/pkgs/applications/virtualization/qemu/revert-ui-cocoa-add-clipboard-support.patch b/pkgs/applications/virtualization/qemu/revert-ui-cocoa-add-clipboard-support.patch deleted file mode 100644 index c429bce03dcf..000000000000 --- a/pkgs/applications/virtualization/qemu/revert-ui-cocoa-add-clipboard-support.patch +++ /dev/null @@ -1,200 +0,0 @@ -Based on a reversion of upstream 7e3e20d89129614f4a7b2451fe321cc6ccca3b76, -adapted for 7.2.0 - -diff --git a/include/ui/clipboard.h b/include/ui/clipboard.h -index ce76aa451f..c4e1dc4ff4 100644 ---- a/include/ui/clipboard.h -+++ b/include/ui/clipboard.h -@@ -269,7 +269,7 @@ void qemu_clipboard_set_data(QemuClipboardPeer *peer, - QemuClipboardInfo *info, - QemuClipboardType type, - uint32_t size, -- const void *data, -+ void *data, - bool update); - - G_DEFINE_AUTOPTR_CLEANUP_FUNC(QemuClipboardInfo, qemu_clipboard_info_unref) -diff --git a/ui/clipboard.c b/ui/clipboard.c -index 3d14bffaf8..2c3f4c3ba0 100644 ---- a/ui/clipboard.c -+++ b/ui/clipboard.c -@@ -154,7 +154,7 @@ void qemu_clipboard_set_data(QemuClipboardPeer *peer, - QemuClipboardInfo *info, - QemuClipboardType type, - uint32_t size, -- const void *data, -+ void *data, - bool update) - { - if (!info || -diff --git a/ui/cocoa.m b/ui/cocoa.m -index 660d3e0935..0e6760c360 100644 ---- a/ui/cocoa.m -+++ b/ui/cocoa.m -@@ -29,7 +29,6 @@ - - #include "qemu/help-texts.h" - #include "qemu-main.h" --#include "ui/clipboard.h" - #include "ui/console.h" - #include "ui/input.h" - #include "ui/kbd-state.h" -@@ -105,10 +104,6 @@ static void cocoa_switch(DisplayChangeListener *dcl, - - static bool allow_events; - --static NSInteger cbchangecount = -1; --static QemuClipboardInfo *cbinfo; --static QemuEvent cbevent; -- - // Utility functions to run specified code block with the BQL held - typedef void (^CodeBlock)(void); - typedef bool (^BoolCodeBlock)(void); -@@ -1799,107 +1794,6 @@ static void addRemovableDevicesMenuItems(void) - qapi_free_BlockInfoList(pointerToFree); - } - --@interface QemuCocoaPasteboardTypeOwner : NSObject --@end -- --@implementation QemuCocoaPasteboardTypeOwner -- --- (void)pasteboard:(NSPasteboard *)sender provideDataForType:(NSPasteboardType)type --{ -- if (type != NSPasteboardTypeString) { -- return; -- } -- -- with_bql(^{ -- QemuClipboardInfo *info = qemu_clipboard_info_ref(cbinfo); -- qemu_event_reset(&cbevent); -- qemu_clipboard_request(info, QEMU_CLIPBOARD_TYPE_TEXT); -- -- while (info == cbinfo && -- info->types[QEMU_CLIPBOARD_TYPE_TEXT].available && -- info->types[QEMU_CLIPBOARD_TYPE_TEXT].data == NULL) { -- bql_unlock(); -- qemu_event_wait(&cbevent); -- bql_lock(); -- } -- -- if (info == cbinfo) { -- NSData *data = [[NSData alloc] initWithBytes:info->types[QEMU_CLIPBOARD_TYPE_TEXT].data -- length:info->types[QEMU_CLIPBOARD_TYPE_TEXT].size]; -- [sender setData:data forType:NSPasteboardTypeString]; -- [data release]; -- } -- -- qemu_clipboard_info_unref(info); -- }); --} -- --@end -- --static QemuCocoaPasteboardTypeOwner *cbowner; -- --static void cocoa_clipboard_notify(Notifier *notifier, void *data); --static void cocoa_clipboard_request(QemuClipboardInfo *info, -- QemuClipboardType type); -- --static QemuClipboardPeer cbpeer = { -- .name = "cocoa", -- .notifier = { .notify = cocoa_clipboard_notify }, -- .request = cocoa_clipboard_request --}; -- --static void cocoa_clipboard_update_info(QemuClipboardInfo *info) --{ -- if (info->owner == &cbpeer || info->selection != QEMU_CLIPBOARD_SELECTION_CLIPBOARD) { -- return; -- } -- -- if (info != cbinfo) { -- NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; -- qemu_clipboard_info_unref(cbinfo); -- cbinfo = qemu_clipboard_info_ref(info); -- cbchangecount = [[NSPasteboard generalPasteboard] declareTypes:@[NSPasteboardTypeString] owner:cbowner]; -- [pool release]; -- } -- -- qemu_event_set(&cbevent); --} -- --static void cocoa_clipboard_notify(Notifier *notifier, void *data) --{ -- QemuClipboardNotify *notify = data; -- -- switch (notify->type) { -- case QEMU_CLIPBOARD_UPDATE_INFO: -- cocoa_clipboard_update_info(notify->info); -- return; -- case QEMU_CLIPBOARD_RESET_SERIAL: -- /* ignore */ -- return; -- } --} -- --static void cocoa_clipboard_request(QemuClipboardInfo *info, -- QemuClipboardType type) --{ -- NSAutoreleasePool *pool; -- NSData *text; -- -- switch (type) { -- case QEMU_CLIPBOARD_TYPE_TEXT: -- pool = [[NSAutoreleasePool alloc] init]; -- text = [[NSPasteboard generalPasteboard] dataForType:NSPasteboardTypeString]; -- if (text) { -- qemu_clipboard_set_data(&cbpeer, info, type, -- [text length], [text bytes], true); -- } -- [pool release]; -- break; -- default: -- break; -- } --} -- - /* - * The startup process for the OSX/Cocoa UI is complicated, because - * OSX insists that the UI runs on the initial main thread, and so we -@@ -1922,7 +1816,6 @@ static void cocoa_clipboard_request(QemuClipboardInfo *info, - status = qemu_default_main(); - qemu_mutex_unlock_iothread(); - COCOA_DEBUG("Second thread: qemu_default_main() returned, exiting\n"); -- [cbowner release]; - exit(status); - } - -@@ -2003,18 +1896,6 @@ static void cocoa_refresh(DisplayChangeListener *dcl) - [cocoaView setAbsoluteEnabled:YES]; - }); - } -- -- if (cbchangecount != [[NSPasteboard generalPasteboard] changeCount]) { -- qemu_clipboard_info_unref(cbinfo); -- cbinfo = qemu_clipboard_info_new(&cbpeer, QEMU_CLIPBOARD_SELECTION_CLIPBOARD); -- if ([[NSPasteboard generalPasteboard] availableTypeFromArray:@[NSPasteboardTypeString]]) { -- cbinfo->types[QEMU_CLIPBOARD_TYPE_TEXT].available = true; -- } -- qemu_clipboard_update(cbinfo); -- cbchangecount = [[NSPasteboard generalPasteboard] changeCount]; -- qemu_event_set(&cbevent); -- } -- - [pool release]; - } - -@@ -2071,12 +1952,6 @@ static void cocoa_display_init(DisplayState *ds, DisplayOptions *opts) - // register vga output callbacks - register_displaychangelistener(&dcl); - [cocoaView updateUIInfo]; -- -- qemu_event_init(&cbevent, false); -- cbowner = [[QemuCocoaPasteboardTypeOwner alloc] init]; -- qemu_clipboard_peer_register(&cbpeer); -- -- [pool release]; - } - - static QemuDisplay qemu_display_cocoa = { diff --git a/pkgs/applications/virtualization/qemu/revert-ui-cocoa-use-the-standard-about-panel.patch b/pkgs/applications/virtualization/qemu/revert-ui-cocoa-use-the-standard-about-panel.patch deleted file mode 100644 index 08620da3b963..000000000000 --- a/pkgs/applications/virtualization/qemu/revert-ui-cocoa-use-the-standard-about-panel.patch +++ /dev/null @@ -1,145 +0,0 @@ -diff --git a/ui/cocoa.m b/ui/cocoa.m -index 25e0db9dd0..4af0712036 100644 ---- a/ui/cocoa.m -+++ b/ui/cocoa.m -@@ -93,6 +93,7 @@ static void cocoa_switch(DisplayChangeListener *dcl, - - static void cocoa_refresh(DisplayChangeListener *dcl); - -+static NSWindow *about_window; - static const DisplayChangeListenerOps dcl_ops = { - .dpy_name = "cocoa", - .dpy_gfx_update = cocoa_update, -@@ -1180,6 +1181,7 @@ - (void)changeDeviceMedia:(id)sender; - - (BOOL)verifyQuit; - - (void)openDocumentation:(NSString *)filename; - - (IBAction) do_about_menu_item: (id) sender; -+- (void)make_about_window; - - (void)adjustSpeed:(id)sender; - @end - -@@ -1227,6 +1229,8 @@ - (id) init - [pauseLabel setFont: [NSFont fontWithName: @"Helvetica" size: 90]]; - [pauseLabel setTextColor: [NSColor blackColor]]; - [pauseLabel sizeToFit]; -+ -+ [self make_about_window]; - } - return self; - } -@@ -1549,29 +1553,92 @@ - (BOOL)verifyQuit - /* The action method for the About menu item */ - - (IBAction) do_about_menu_item: (id) sender - { -- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; -- char *icon_path_c = get_relocated_path(CONFIG_QEMU_ICONDIR "/hicolor/512x512/apps/qemu.png"); -- NSString *icon_path = [NSString stringWithUTF8String:icon_path_c]; -- g_free(icon_path_c); -- NSImage *icon = [[NSImage alloc] initWithContentsOfFile:icon_path]; -- NSString *version = @"QEMU emulator version " QEMU_FULL_VERSION; -- NSString *copyright = @QEMU_COPYRIGHT; -- NSDictionary *options; -- if (icon) { -- options = @{ -- NSAboutPanelOptionApplicationIcon : icon, -- NSAboutPanelOptionApplicationVersion : version, -- @"Copyright" : copyright, -- }; -- [icon release]; -- } else { -- options = @{ -- NSAboutPanelOptionApplicationVersion : version, -- @"Copyright" : copyright, -- }; -- } -- [NSApp orderFrontStandardAboutPanelWithOptions:options]; -- [pool release]; -+ [about_window makeKeyAndOrderFront: nil]; -+} -+ -+/* Create and display the about dialog */ -+- (void)make_about_window -+{ -+ /* Make the window */ -+ int x = 0, y = 0, about_width = 400, about_height = 200; -+ NSRect window_rect = NSMakeRect(x, y, about_width, about_height); -+ about_window = [[NSWindow alloc] initWithContentRect:window_rect -+ styleMask:NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | -+ NSWindowStyleMaskMiniaturizable -+ backing:NSBackingStoreBuffered -+ defer:NO]; -+ [about_window setTitle: @"About"]; -+ [about_window setReleasedWhenClosed: NO]; -+ [about_window center]; -+ NSView *superView = [about_window contentView]; -+ -+ /* Create the dimensions of the picture */ -+ int picture_width = 80, picture_height = 80; -+ x = (about_width - picture_width)/2; -+ y = about_height - picture_height - 10; -+ NSRect picture_rect = NSMakeRect(x, y, picture_width, picture_height); -+ -+ /* Make the picture of QEMU */ -+ NSImageView *picture_view = [[NSImageView alloc] initWithFrame: -+ picture_rect]; -+ char *qemu_image_path_c = get_relocated_path(CONFIG_QEMU_ICONDIR "/hicolor/512x512/apps/qemu.png"); -+ NSString *qemu_image_path = [NSString stringWithUTF8String:qemu_image_path_c]; -+ g_free(qemu_image_path_c); -+ NSImage *qemu_image = [[NSImage alloc] initWithContentsOfFile:qemu_image_path]; -+ [picture_view setImage: qemu_image]; -+ [picture_view setImageScaling: NSImageScaleProportionallyUpOrDown]; -+ [superView addSubview: picture_view]; -+ -+ /* Make the name label */ -+ NSBundle *bundle = [NSBundle mainBundle]; -+ if (bundle) { -+ x = 0; -+ y = y - 25; -+ int name_width = about_width, name_height = 20; -+ NSRect name_rect = NSMakeRect(x, y, name_width, name_height); -+ NSTextField *name_label = [[NSTextField alloc] initWithFrame: name_rect]; -+ [name_label setEditable: NO]; -+ [name_label setBezeled: NO]; -+ [name_label setDrawsBackground: NO]; -+ [name_label setAlignment: NSTextAlignmentCenter]; -+ NSString *qemu_name = [[bundle executablePath] lastPathComponent]; -+ [name_label setStringValue: qemu_name]; -+ [superView addSubview: name_label]; -+ } -+ -+ /* Set the version label's attributes */ -+ x = 0; -+ y = 50; -+ int version_width = about_width, version_height = 20; -+ NSRect version_rect = NSMakeRect(x, y, version_width, version_height); -+ NSTextField *version_label = [[NSTextField alloc] initWithFrame: -+ version_rect]; -+ [version_label setEditable: NO]; -+ [version_label setBezeled: NO]; -+ [version_label setAlignment: NSTextAlignmentCenter]; -+ [version_label setDrawsBackground: NO]; -+ -+ /* Create the version string*/ -+ NSString *version_string; -+ version_string = [[NSString alloc] initWithFormat: -+ @"QEMU emulator version %s", QEMU_FULL_VERSION]; -+ [version_label setStringValue: version_string]; -+ [superView addSubview: version_label]; -+ -+ /* Make copyright label */ -+ x = 0; -+ y = 35; -+ int copyright_width = about_width, copyright_height = 20; -+ NSRect copyright_rect = NSMakeRect(x, y, copyright_width, copyright_height); -+ NSTextField *copyright_label = [[NSTextField alloc] initWithFrame: -+ copyright_rect]; -+ [copyright_label setEditable: NO]; -+ [copyright_label setBezeled: NO]; -+ [copyright_label setDrawsBackground: NO]; -+ [copyright_label setAlignment: NSTextAlignmentCenter]; -+ [copyright_label setStringValue: [NSString stringWithFormat: @"%s", -+ QEMU_COPYRIGHT]]; -+ [superView addSubview: copyright_label]; - } - - /* Used by the Speed menu items */ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51bbb49c4228..e79374a38a3f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32823,9 +32823,17 @@ with pkgs; eiskaltdcpp = libsForQt5.callPackage ../applications/networking/p2p/eiskaltdcpp { }; qemu = callPackage ../applications/virtualization/qemu { - inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Hypervisor vmnet; + inherit (darwin.apple_sdk_12_3.frameworks) CoreServices Cocoa Hypervisor Kernel vmnet; inherit (darwin.stubs) rez setfile; inherit (darwin) sigtool; + stdenv = + if stdenv.hostPlatform.isDarwin then + overrideSDK stdenv { + darwinSdkVersion = "12.3"; + darwinMinVersion = "12.0"; + } + else + stdenv; }; qemu-python-utils = python3Packages.toPythonApplication ( From 0088e7d130c1f895294795669e15668f983489af Mon Sep 17 00:00:00 2001 From: paumr Date: Thu, 5 Sep 2024 16:40:06 +0200 Subject: [PATCH 276/298] matrix: migrated links to new element-hq org The vector-im GitHub organisation has been renamed to element-hq: https://github.com/vector-im/.github/blob/1d586281f08885acaa0284598d3a5dfc32402767/profile/README.md --- nixos/modules/services/matrix/synapse.md | 4 ++-- .../instant-messengers/element/element-desktop.nix | 6 +++--- .../instant-messengers/element/element-web.nix | 6 +++--- .../networking/instant-messengers/element/update.sh | 10 +++++----- .../instant-messengers/hydrogen-web/unwrapped.nix | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/nixos/modules/services/matrix/synapse.md b/nixos/modules/services/matrix/synapse.md index 0ce13550d5b2..62967adddb4b 100644 --- a/nixos/modules/services/matrix/synapse.md +++ b/nixos/modules/services/matrix/synapse.md @@ -188,7 +188,7 @@ or [OpenID](https://element-hq.github.io/synapse/latest/openid.html). ## Element (formerly known as Riot) Web Client {#module-services-matrix-element-web} -[Element Web](https://github.com/vector-im/riot-web/) is +[Element Web](https://github.com/element-hq/element-web) is the reference web client for Matrix and developed by the core team at matrix.org. Element was formerly known as Riot.im, see the [Element introductory blog post](https://element.io/blog/welcome-to-element/) @@ -228,6 +228,6 @@ the example, this means that you should not reuse the `myhostname.example.org` virtualHost to also serve Element, but instead serve it on a different subdomain, like `element.example.org` in the example. See the -[Element Important Security Notes](https://github.com/vector-im/element-web/tree/v1.10.0#important-security-notes) +[Element Important Security Notes](https://github.com/element-hq/element-web/tree/v1.10.0#important-security-notes) for more information on this subject. ::: diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index db8a8be7a871..37393681224b 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { pname = "element-desktop"; name = "${finalAttrs.pname}-${finalAttrs.version}"; src = fetchFromGitHub { - owner = "vector-im"; + owner = "element-hq"; repo = "element-desktop"; rev = "v${finalAttrs.version}"; hash = desktopSrcHash; @@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { ''; # The desktop item properties should be kept in sync with data from upstream: - # https://github.com/vector-im/element-desktop/blob/develop/package.json + # https://github.com/element-hq/element-desktop/blob/develop/package.json desktopItem = makeDesktopItem { name = "element-desktop"; exec = "${executableName} %u"; @@ -147,7 +147,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { meta = with lib; { description = "A feature-rich client for Matrix.org"; homepage = "https://element.io/"; - changelog = "https://github.com/vector-im/element-desktop/blob/v${finalAttrs.version}/CHANGELOG.md"; + changelog = "https://github.com/element-hq/element-desktop/blob/v${finalAttrs.version}/CHANGELOG.md"; license = licenses.asl20; maintainers = teams.matrix.members; inherit (electron.meta) platforms; diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 83289e5a6f61..1bfea7162dde 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { pname = "element-web"; src = fetchFromGitHub { - owner = "vector-im"; + owner = "element-hq"; repo = "element-web"; rev = "v${finalAttrs.version}"; hash = webSrcHash; @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { # with the update of openssl3, some key ciphers are not supported anymore # this flag will allow those codecs again as a workaround # see https://medium.com/the-node-js-collection/node-js-17-is-here-8dba1e14e382#5f07 - # and https://github.com/vector-im/element-web/issues/21043 + # and https://github.com/element-hq/element-web/issues/21043 export NODE_OPTIONS=--openssl-legacy-provider mkdir -p $HOME @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { meta = { description = "Glossy Matrix collaboration client for the web"; homepage = "https://element.io/"; - changelog = "https://github.com/vector-im/element-web/blob/v${finalAttrs.version}/CHANGELOG.md"; + changelog = "https://github.com/element-hq/element-web/blob/v${finalAttrs.version}/CHANGELOG.md"; maintainers = lib.teams.matrix.members; license = lib.licenses.asl20; platforms = lib.platforms.all; diff --git a/pkgs/applications/networking/instant-messengers/element/update.sh b/pkgs/applications/networking/instant-messengers/element/update.sh index 0a1cc0595f87..2a4ec5fcdec2 100755 --- a/pkgs/applications/networking/instant-messengers/element/update.sh +++ b/pkgs/applications/networking/instant-messengers/element/update.sh @@ -12,15 +12,15 @@ version="$1" set -euo pipefail if [ -z "$version" ]; then - version="$(wget -q -O- "https://api.github.com/repos/vector-im/element-desktop/releases?per_page=1" | jq -r '.[0].tag_name')" + version="$(wget -q -O- "https://api.github.com/repos/element-hq/element-desktop/releases?per_page=1" | jq -r '.[0].tag_name')" fi # strip leading "v" version="${version#v}" # Element Web -web_src="https://raw.githubusercontent.com/vector-im/element-web/v$version" -web_src_hash=$(nix-prefetch-github vector-im element-web --rev v${version} | jq -r .hash) +web_src="https://raw.githubusercontent.com/element-hq/element-web/v$version" +web_src_hash=$(nix-prefetch-github element-hq element-web --rev v${version} | jq -r .hash) web_tmpdir=$(mktemp -d) trap 'rm -rf "$web_tmpdir"' EXIT @@ -31,8 +31,8 @@ web_yarn_hash=$(prefetch-yarn-deps yarn.lock) popd # Element Desktop -desktop_src="https://raw.githubusercontent.com/vector-im/element-desktop/v$version" -desktop_src_hash=$(nix-prefetch-github vector-im element-desktop --rev v${version} | jq -r .hash) +desktop_src="https://raw.githubusercontent.com/element-hq/element-desktop/v$version" +desktop_src_hash=$(nix-prefetch-github element-hq element-desktop --rev v${version} | jq -r .hash) desktop_tmpdir=$(mktemp -d) trap 'rm -rf "$desktop_tmpdir"' EXIT diff --git a/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix b/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix index 05841080b1dd..c2052473a483 100644 --- a/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix +++ b/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { version = "0.4.0"; src = fetchFromGitHub { - owner = "vector-im"; + owner = "element-hq"; repo = "hydrogen-web"; rev = "v${finalAttrs.version}"; hash = "sha256-u8Yex3r7EZH+JztQHJbfncYeyyl6hgb1ZNFIg//wcb0="; @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Lightweight matrix client with legacy and mobile browser support"; - homepage = "https://github.com/vector-im/hydrogen-web"; + homepage = "https://github.com/element-hq/hydrogen-web"; maintainers = lib.teams.matrix.members; license = lib.licenses.asl20; platforms = lib.platforms.all; From 7b9bb0a9a1e2a0c07640efc9575be3d404d24682 Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 5 Sep 2024 15:26:13 +0100 Subject: [PATCH 277/298] nixos/installer: drop support for ReiserFS and JFS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ReiserFS has not been actively maintained for many years. It has been marked as obsolete since Linux 6.6, and is scheduled for removal in 2025. A warning is logged informing users of this every time a ReiserFS file system is mounted. It suffers from unfixable issues like the year 2038 problem. JFS is a slightly more ambiguous case. It also has not been actively maintained for years; even in 2008 questions were being raised about its maintenance state and IBM’s commitment to it, and some enterprise distributions were opting not to ship support for it as a result. It will [indefinitely postpone journal writes], leading to data loss over potentially arbitrary amounts of time. Kernel developers [considered marking it as deprecated] last year, but no concrete decision was made. There have been [occasional fixes] to the code since then, but even the developer of much of those was not opposed to deprecating it. [considered marking it as deprecated]: https://lore.kernel.org/lkml/Y8DvK281ii6yPRcW@infradead.org/ [indefinitely postpone journal writes]: https://www.usenix.org/legacy/events/usenix05/tech/general/full_papers/prabhakaran/prabhakaran.pdf [occasional fixes]: https://www.phoronix.com/news/JFS-Linux-6.7-Improvements Regardless of whether JFS should be removed from the kernel, with all the implications for existing installations that entails, I think it’s safe to say that no new Linux installation should be using either of these file systems, and that it’s a waste of space and potential footgun to be shipping support for them on our standard installation media. We’re lagging behind other distributions on this decision; neither is supported by Fedora’s installation media. (It also just so happens that `jfsutils` is the one remaining package in the minimal installer ISO that has reproducibility issues, due to some cursed toolchain bug, but I’m not trying to Goodhart’s law this or anything. I just think we shouldn’t be shipping it anyway.) --- nixos/doc/manual/release-notes/rl-2411.section.md | 2 ++ nixos/modules/profiles/base.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 0d668459f09b..85dbfc68b712 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -407,6 +407,8 @@ - The `openlens` package got removed, suggested replacment `lens-desktop` +- The NixOS installation media no longer support the ReiserFS or JFS file systems by default. + ## Other Notable Changes {#sec-release-24.11-notable-changes} diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix index 9f32f85a61ec..be79bd205cb3 100644 --- a/nixos/modules/profiles/base.nix +++ b/nixos/modules/profiles/base.nix @@ -50,7 +50,7 @@ # Include support for various filesystems and tools to create / manipulate them. boot.supportedFilesystems = - [ "btrfs" "cifs" "f2fs" "jfs" "ntfs" "reiserfs" "vfat" "xfs" ] ++ + [ "btrfs" "cifs" "f2fs" "ntfs" "vfat" "xfs" ] ++ lib.optional (lib.meta.availableOn pkgs.stdenv.hostPlatform config.boot.zfs.package) "zfs"; # Configure host id for ZFS to work From 96cc7aa0ba980740e026cd6ebcb514a7c8cad3e0 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Thu, 5 Sep 2024 10:18:51 +0200 Subject: [PATCH 278/298] idris2Packages.idris2Lsp: fix cross eval --- pkgs/development/compilers/idris2/idris2-lsp.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/idris2/idris2-lsp.nix b/pkgs/development/compilers/idris2/idris2-lsp.nix index 59a718c045ce..a01cd1667938 100644 --- a/pkgs/development/compilers/idris2/idris2-lsp.nix +++ b/pkgs/development/compilers/idris2/idris2-lsp.nix @@ -35,7 +35,7 @@ let }; idrisLibraries = [idris2Api lspLib]; - buildInputs = [makeWrapper]; + nativeBuildInputs = [ makeWrapper ]; postInstall = '' wrapProgram $out/bin/idris2-lsp \ --suffix IDRIS2_PACKAGE_PATH ':' "${globalLibrariesPath}" From ed3f34ffddd6bf470edf0c5e12d1750856f7df0a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 15:23:43 +0000 Subject: [PATCH 279/298] kubergrunt: 0.15.0 -> 0.16.0 --- pkgs/applications/networking/cluster/kubergrunt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubergrunt/default.nix b/pkgs/applications/networking/cluster/kubergrunt/default.nix index 3c5cf3ee52d2..b6262cf85700 100644 --- a/pkgs/applications/networking/cluster/kubergrunt/default.nix +++ b/pkgs/applications/networking/cluster/kubergrunt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubergrunt"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = "kubergrunt"; rev = "v${version}"; - sha256 = "sha256-yN5tpe3ayQPhTlBvxlt7CD6mSURCB4lxGatEK9OThzs="; + sha256 = "sha256-FOXnerB6qmUUotWLlTTsR5x0+A0Q9D8PVDTMG8j8b9o="; }; - vendorHash = "sha256-VJkqg2cnpYHuEYOv5+spoyRWFAdFWE7YIVYaN9OmIZM="; + vendorHash = "sha256-rgU6Yv+gmKShWfpPaWtK2VIBPgFSsPVOnUzIp2+V7oI="; # Disable tests since it requires network access and relies on the # presence of certain AWS infrastructure From 3a264a6cddc420e0a0689c1568940599824aed18 Mon Sep 17 00:00:00 2001 From: eymeric Date: Sun, 25 Aug 2024 21:41:13 +0200 Subject: [PATCH 280/298] rustdesk: 1.2.3 -> 1.3.0 --- pkgs/by-name/ru/rustdesk/Cargo.lock | 4862 +++++++++++++++----------- pkgs/by-name/ru/rustdesk/package.nix | 50 +- 2 files changed, 2882 insertions(+), 2030 deletions(-) diff --git a/pkgs/by-name/ru/rustdesk/Cargo.lock b/pkgs/by-name/ru/rustdesk/Cargo.lock index 507a77665757..6ebeb4201503 100644 --- a/pkgs/by-name/ru/rustdesk/Cargo.lock +++ b/pkgs/by-name/ru/rustdesk/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -18,22 +18,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] -name = "aes" -version = "0.7.5" +name = "adler2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] +name = "aes" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if 1.0.0", "cipher", "cpufeatures", - "opaque-debug", ] [[package]] name = "ahash" -version = "0.7.6" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" dependencies = [ "getrandom", "once_cell", @@ -41,19 +46,31 @@ dependencies = [ ] [[package]] -name = "aho-corasick" -version = "1.0.1" +name = "ahash" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if 1.0.0", + "once_cell", + "version_check", + "zerocopy 0.7.35", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] name = "allo-isolate" -version = "0.1.14" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ed55848be9f41d44c79df6045b680a74a78bc579e0813f7f196cd7928e22fb1" +checksum = "97b6d794345b06592d0ebeed8e477e41b71e5a0a49df4fc0e4184d5938b99509" dependencies = [ "anyhow", "atomic", @@ -77,15 +94,21 @@ dependencies = [ ] [[package]] -name = "alsa" -version = "0.7.0" +name = "allocator-api2" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8512c9117059663fb5606788fbca3619e2a91dac0e3fe516242eab1fa6be5e44" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" + +[[package]] +name = "alsa" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed7572b7ba83a31e20d1b48970ee402d2e3e0537dcfe0a3ff4d6eb7508617d43" dependencies = [ "alsa-sys", - "bitflags", + "bitflags 2.6.0", + "cfg-if 1.0.0", "libc", - "nix 0.24.3", ] [[package]] @@ -99,19 +122,35 @@ dependencies = [ ] [[package]] -name = "android_log-sys" -version = "0.3.0" +name = "android-tzdata" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27f0fc03f560e1aebde41c2398b691cb98b5ea5996a6184a7a67bbbb77448969" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android-wakelock" +version = "0.1.0" +source = "git+https://github.com/rustdesk-org/android-wakelock#d0292e5a367e627c4fa6f1ca6bdfad005dca7d90" +dependencies = [ + "jni 0.21.1", + "log", + "ndk-context", +] + +[[package]] +name = "android_log-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ecc8056bf6ab9892dcd53216c83d1597487d7dacac16c8df6b877d127df9937" [[package]] name = "android_logger" -version = "0.13.1" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fa490e751f3878eb9accb9f18988eca52c2337ce000a8bf31ef50d4c723ca9e" +checksum = "c494134f746c14dc653a35a4ea5aca24ac368529da5370ecf41fe0341c35772f" dependencies = [ "android_log-sys", - "env_logger 0.10.0", + "env_logger 0.10.2", "log", "once_cell", ] @@ -136,114 +175,77 @@ dependencies = [ [[package]] name = "anstream" -version = "0.3.2" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.0" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" -version = "0.2.0" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "1.0.1" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" - -[[package]] -name = "apple-bindgen" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f109ee76f68b4767848cb5dc93bfcc7c425deca849c4c81fa11cdce525e3d2" -dependencies = [ - "apple-sdk", - "bindgen 0.63.0", - "derive_more", - "regex", - "serde 1.0.163", - "thiserror", - "toml 0.6.0", -] - -[[package]] -name = "apple-sdk" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a04f192a700686ee70008ff4e4eb76fe7d11814ab93b7ee9d48c36b9a9f0bd2a" -dependencies = [ - "plist", - "serde 1.0.163", - "serde_json 1.0.96", -] - -[[package]] -name = "apple-sys" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b3a1c3342678cd72676d0c1644fde496c1f65ea41f51465f54a89cad3bdf34" -dependencies = [ - "apple-bindgen", - "apple-sdk", - "objc", -] +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "arboard" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6041616acea41d67c4a984709ddab1587fd0b10efe5cc563fee954d2f011854" +version = "3.4.0" +source = "git+https://github.com/rustdesk-org/arboard#a04bdb1b368a99691822c33bf0f7ed497d6a7a35" dependencies = [ "clipboard-win", - "core-graphics", - "image", + "core-graphics 0.23.2", + "image 0.25.2", "log", - "objc", - "objc-foundation", - "objc_id", - "once_cell", + "objc2 0.5.2", + "objc2-app-kit", + "objc2-foundation", "parking_lot", - "thiserror", - "winapi 0.3.9", - "x11rb", + "serde 1.0.209", + "serde_derive", + "windows-sys 0.48.0", + "wl-clipboard-rs", + "x11rb 0.13.1", ] [[package]] @@ -252,32 +254,45 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" dependencies = [ - "event-listener", + "event-listener 2.5.3", "futures-core", ] [[package]] name = "async-channel" -version = "1.8.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener", + "event-listener-strategy", "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-compression" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" +dependencies = [ + "flate2", + "futures-core", + "memchr", + "pin-project-lite", + "tokio", ] [[package]] name = "async-executor" -version = "1.5.1" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" +checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" dependencies = [ - "async-lock", "async-task", "concurrent-queue", - "fastrand", - "futures-lite", + "fastrand 2.1.1", + "futures-lite 2.3.0", "slab", ] @@ -287,10 +302,10 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" dependencies = [ - "async-lock", - "autocfg 1.1.0", + "async-lock 2.8.0", + "autocfg 1.3.0", "blocking", - "futures-lite", + "futures-lite 1.13.0", ] [[package]] @@ -299,113 +314,156 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ - "async-lock", - "autocfg 1.1.0", + "async-lock 2.8.0", + "autocfg 1.3.0", "cfg-if 1.0.0", "concurrent-queue", - "futures-lite", + "futures-lite 1.13.0", "log", "parking", - "polling", - "rustix", + "polling 2.8.0", + "rustix 0.37.27", "slab", - "socket2 0.4.9", + "socket2 0.4.10", "waker-fn", ] [[package]] -name = "async-lock" -version = "2.7.0" +name = "async-io" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" dependencies = [ - "event-listener", + "async-lock 3.4.0", + "cfg-if 1.0.0", + "concurrent-queue", + "futures-io", + "futures-lite 2.3.0", + "parking", + "polling 3.7.3", + "rustix 0.38.34", + "slab", + "tracing", + "windows-sys 0.59.0", +] + +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" +dependencies = [ + "event-listener 5.3.1", + "event-listener-strategy", + "pin-project-lite", ] [[package]] name = "async-process" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" dependencies = [ - "async-io", - "async-lock", - "autocfg 1.1.0", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-signal", "blocking", "cfg-if 1.0.0", - "event-listener", - "futures-lite", - "rustix", - "signal-hook", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.34", "windows-sys 0.48.0", ] [[package]] name = "async-recursion" -version = "1.0.4" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", +] + +[[package]] +name = "async-signal" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" +dependencies = [ + "async-io 2.3.4", + "async-lock 3.4.0", + "atomic-waker", + "cfg-if 1.0.0", + "futures-core", + "futures-io", + "rustix 0.38.34", + "signal-hook-registry", + "slab", + "windows-sys 0.59.0", ] [[package]] name = "async-task" -version = "4.4.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.68" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", ] [[package]] name = "atk" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39991bc421ddf72f70159011b323ff49b0f783cc676a7287c59453da2e2531cf" +checksum = "b4af014b17dd80e8af9fa689b2d4a211ddba6eb583c1622f35d0cb543f6b17e4" dependencies = [ "atk-sys", - "bitflags", - "glib 0.16.7", + "glib 0.18.5", "libc", ] [[package]] name = "atk-sys" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11ad703eb64dc058024f0e57ccfa069e15a413b98dbd50a1a950e743b7f11148" +checksum = "251e0b7d90e33e0ba930891a505a9a35ece37b2dd37a14f3ffc306c13b980009" dependencies = [ - "glib-sys 0.16.3", - "gobject-sys 0.16.3", + "glib-sys 0.18.1", + "gobject-sys 0.18.0", "libc", - "system-deps 6.1.0", + "system-deps 6.2.2", ] [[package]] name = "atomic" -version = "0.5.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b88d82667eca772c4aa12f0f1348b3ae643424c8876448f3f7bd5787032e234c" -dependencies = [ - "autocfg 1.1.0", -] +checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" [[package]] name = "atomic-waker" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "atty" @@ -424,35 +482,47 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", ] [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.67" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", "cfg-if 1.0.0", "libc", - "miniz_oxide 0.6.2", + "miniz_oxide 0.7.4", "object", "rustc-demangle", ] [[package]] -name = "base64" -version = "0.21.0" +name = "base32" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa" + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64ct" @@ -466,7 +536,7 @@ version = "0.59.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cexpr", "clang-sys", "clap 2.34.0", @@ -475,63 +545,21 @@ dependencies = [ "lazycell", "log", "peeking_take_while", - "proc-macro2 1.0.63", - "quote 1.0.27", + "proc-macro2 1.0.86", + "quote 1.0.37", "regex", "rustc-hash", "shlex", "which", ] -[[package]] -name = "bindgen" -version = "0.63.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885" -dependencies = [ - "bitflags", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "log", - "peeking_take_while", - "proc-macro2 1.0.63", - "quote 1.0.27", - "regex", - "rustc-hash", - "shlex", - "syn 1.0.109", - "which", -] - -[[package]] -name = "bindgen" -version = "0.64.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" -dependencies = [ - "bitflags", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "peeking_take_while", - "proc-macro2 1.0.63", - "quote 1.0.27", - "regex", - "rustc-hash", - "shlex", - "syn 1.0.109", -] - [[package]] name = "bindgen" version = "0.65.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cexpr", "clang-sys", "lazy_static", @@ -539,15 +567,35 @@ dependencies = [ "log", "peeking_take_while", "prettyplease", - "proc-macro2 1.0.63", - "quote 1.0.27", + "proc-macro2 1.0.86", + "quote 1.0.37", "regex", "rustc-hash", "shlex", - "syn 2.0.15", + "syn 2.0.76", "which", ] +[[package]] +name = "bindgen" +version = "0.69.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +dependencies = [ + "bitflags 2.6.0", + "cexpr", + "clang-sys", + "itertools 0.12.1", + "lazy_static", + "lazycell", + "proc-macro2 1.0.86", + "quote 1.0.37", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.76", +] + [[package]] name = "bit_field" version = "0.10.2" @@ -560,6 +608,25 @@ 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" +dependencies = [ + "serde 1.0.209", +] + +[[package]] +name = "bitmask-enum" +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", +] + [[package]] name = "bitvec" version = "1.0.1" @@ -588,25 +655,51 @@ dependencies = [ ] [[package]] -name = "blocking" -version = "1.3.1" +name = "block-sys" +version = "0.1.0-beta.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" +checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146" +dependencies = [ + "objc-sys 0.2.0-beta.2", +] + +[[package]] +name = "block2" +version = "0.2.0-alpha.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42" +dependencies = [ + "block-sys", + "objc2-encode 2.0.0-pre.2", +] + +[[package]] +name = "block2" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" +dependencies = [ + "objc2 0.5.2", +] + +[[package]] +name = "blocking" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ "async-channel", - "async-lock", "async-task", - "atomic-waker", - "fastrand", - "futures-lite", - "log", + "futures-io", + "futures-lite 2.3.0", + "piper", ] [[package]] name = "brotli" -version = "3.3.4" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -615,9 +708,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.4" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" +checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -631,29 +724,35 @@ checksum = "832133bbabbbaa9fbdba793456a2827627a7d2b8fb96032fa1e7666d7895832b" [[package]] name = "bumpalo" -version = "3.12.2" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c6ed94e98ecff0c12dd1b04c15ec0d7d9458ca8fe806cea6f12954efe74c63b" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "6fd4c6dcc3b0aea2f5c0b4b82c2b15fe39ddbc76041a310848f4706edf76bb31" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +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.4.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" dependencies = [ - "serde 1.0.163", + "serde 1.0.209", ] [[package]] @@ -678,14 +777,32 @@ dependencies = [ ] [[package]] -name = "cairo-rs" -version = "0.16.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3125b15ec28b84c238f6f476c6034016a5f6cc0221cb514ca46c532139fc97d" +name = "cacao" +version = "0.4.0-beta2" +source = "git+https://github.com/clslaid/cacao?branch=feat/set-file-urls#05e1536b0b43aaae308ec72c0eed703e875b7b95" dependencies = [ - "bitflags", + "bitmask-enum", + "block2 0.2.0-alpha.6", + "core-foundation 0.9.3", + "core-graphics 0.23.1", + "dispatch", + "lazy_static", + "libc", + "objc2 0.3.0-beta.2", + "os_info", + "percent-encoding", + "url", +] + +[[package]] +name = "cairo-rs" +version = "0.18.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2" +dependencies = [ + "bitflags 2.6.0", "cairo-sys-rs", - "glib 0.16.7", + "glib 0.18.5", "libc", "once_cell", "thiserror", @@ -693,72 +810,24 @@ dependencies = [ [[package]] name = "cairo-sys-rs" -version = "0.16.3" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48f4af05fabdcfa9658178e1326efa061853f040ce7d72e33af6885196f421" +checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" dependencies = [ - "glib-sys 0.16.3", + "glib-sys 0.18.1", "libc", - "system-deps 6.1.0", -] - -[[package]] -name = "camino" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c530edf18f37068ac2d977409ed5cd50d53d73bc653c7647b48eb78976ac9ae2" -dependencies = [ - "serde 1.0.163", -] - -[[package]] -name = "cargo-platform" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" -dependencies = [ - "serde 1.0.163", -] - -[[package]] -name = "cargo_metadata" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" -dependencies = [ - "camino", - "cargo-platform", - "semver", - "serde 1.0.163", - "serde_json 1.0.96", -] - -[[package]] -name = "cbindgen" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6358dedf60f4d9b8db43ad187391afe959746101346fe51bb978126bec61dfb" -dependencies = [ - "clap 3.2.25", - "heck 0.4.1", - "indexmap", - "log", - "proc-macro2 1.0.63", - "quote 1.0.27", - "serde 1.0.163", - "serde_json 1.0.96", - "syn 1.0.109", - "tempfile", - "toml 0.5.11", + "system-deps 6.2.2", ] [[package]] name = "cc" -version = "1.0.79" +version = "1.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "50d2eb3cd3d1bf4529e31c215ee6f93ec5a3d536d9f578f93d9d33ee19562932" dependencies = [ "jobserver", + "libc", + "shlex", ] [[package]] @@ -778,9 +847,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.1" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8790cf1286da485c72cf5fc7aeba308438800036ec67d89425924c4807268c9" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" dependencies = [ "smallvec", "target-lexicon", @@ -799,51 +868,63 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "chrono" -version = "0.4.24" +name = "cfg_aliases" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + +[[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-integer", - "num-traits 0.2.15", - "time 0.1.45", + "num-traits 0.2.19", "wasm-bindgen", - "winapi 0.3.9", + "windows-targets 0.52.6", ] [[package]] name = "cidr-utils" -version = "0.5.10" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdfa36f04861d39453affe1cf084ce2d6554021a84eb6f31ebdeafb6fb92a01c" +checksum = "2315f7119b7146d6a883de6acd63ddf96071b5f79d9d98d2adaa84d749f6abf1" dependencies = [ "debug-helper", "num-bigint", - "num-traits 0.2.15", + "num-traits 0.2.19", "once_cell", "regex", ] [[package]] name = "cipher" -version = "0.3.0" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ - "generic-array", + "crypto-common", + "inout", ] [[package]] name = "clang-sys" -version = "1.6.1" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", - "libloading 0.7.4", + "libloading 0.8.5", ] [[package]] @@ -854,100 +935,87 @@ checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ "ansi_term", "atty", - "bitflags", + "bitflags 1.3.2", "strsim 0.8.0", - "textwrap 0.11.0", + "textwrap", "unicode-width", "vec_map", ] [[package]] name = "clap" -version = "3.2.25" +version = "4.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" -dependencies = [ - "atty", - "bitflags", - "clap_lex 0.2.4", - "indexmap", - "strsim 0.10.0", - "termcolor", - "textwrap 0.16.0", -] - -[[package]] -name = "clap" -version = "4.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34d21f9bf1b425d2968943631ec91202fe5e837264063503708b83013f8fc938" +checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" dependencies = [ "clap_builder", - "clap_derive", - "once_cell", ] [[package]] name = "clap_builder" -version = "4.2.7" +version = "4.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "914c8c79fb560f238ef6429439a30023c862f7a28e688c58f7203f12b29970bd" +checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" dependencies = [ "anstream", "anstyle", - "bitflags", - "clap_lex 0.4.1", - "strsim 0.10.0", -] - -[[package]] -name = "clap_derive" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" -dependencies = [ - "heck 0.4.1", - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", + "clap_lex", + "strsim 0.11.1", ] [[package]] name = "clap_lex" -version = "0.2.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "clap_lex" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "clipboard" version = "0.1.0" dependencies = [ + "cacao", "cc", + "dashmap", + "fuser", "hbb_common", "lazy_static", - "serde 1.0.163", + "libc", + "once_cell", + "parking_lot", + "percent-encoding", + "rand 0.8.5", + "serde 1.0.209", "serde_derive", "thiserror", + "utf16string", + "x11-clipboard 0.8.1", + "x11rb 0.12.0", +] + +[[package]] +name = "clipboard-master" +version = "4.0.0-beta.6" +source = "git+https://github.com/rustdesk-org/clipboard-master#4fb62e5b62fb6350d82b571ec7ba94b3cd466695" +dependencies = [ + "objc", + "objc-foundation", + "objc_id", + "wayland-client", + "wayland-protocols", + "wayland-protocols-wlr", + "windows-win", + "wl-clipboard-rs", + "x11-clipboard 0.9.2", + "x11rb 0.13.1", ] [[package]] name = "clipboard-win" -version = "4.5.0" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" +checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" dependencies = [ "error-code", - "str-buf", - "winapi 0.3.9", ] [[package]] @@ -956,14 +1024,14 @@ version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] name = "cmake" -version = "0.1.50" +version = "0.1.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" +checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" dependencies = [ "cc", ] @@ -974,39 +1042,74 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "block", - "cocoa-foundation", - "core-foundation", - "core-graphics", - "foreign-types", + "cocoa-foundation 0.1.2", + "core-foundation 0.9.4", + "core-graphics 0.22.3", + "foreign-types 0.3.2", + "libc", + "objc", +] + +[[package]] +name = "cocoa" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation 0.1.2", + "core-foundation 0.9.4", + "core-graphics 0.23.2", + "foreign-types 0.5.0", + "libc", + "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.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6" +checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" dependencies = [ - "bitflags", + "bitflags 1.3.2", "block", - "core-foundation", - "core-graphics-types", - "foreign-types", + "core-foundation 0.9.4", + "core-graphics-types 0.1.3", "libc", "objc", ] [[package]] -name = "codespan-reporting" -version = "0.11.1" +name = "cocoa-foundation" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +checksum = "e14045fb83be07b5acf1c0884b2180461635b433455fa35d1cd6f17f1450679d" dependencies = [ - "termcolor", - "unicode-width", + "bitflags 2.6.0", + "block", + "core-foundation 0.10.0", + "core-graphics-types 0.2.0", + "libc", + "objc", ] [[package]] @@ -1017,26 +1120,15 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "colored" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4ffc801dacf156c5854b9df4f425a626539c3a6ef7893cc0c5084a23f0b6c59" -dependencies = [ - "atty", - "lazy_static", - "winapi 0.3.9", -] +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "combine" -version = "4.6.6" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" dependencies = [ "bytes", "memchr", @@ -1044,9 +1136,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.2.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] @@ -1054,10 +1146,10 @@ dependencies = [ [[package]] name = "confy" version = "0.4.0-2" -source = "git+https://github.com/open-trade/confy#7855cd3c32b1a60b44e5076ee8f6b4131da10350" +source = "git+https://github.com/rustdesk-org/confy#83db9ec19a2f97e9718aef69e4fc5611bb382479" dependencies = [ "directories-next", - "serde 1.0.163", + "serde 1.0.209", "thiserror", "toml 0.5.11", ] @@ -1074,28 +1166,28 @@ dependencies = [ [[package]] name = "const_fn" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" +checksum = "373e9fafaa20882876db20562275ff58d50e0caa2590077fe7ce7bef90211d0d" [[package]] name = "const_format" -version = "0.2.31" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c990efc7a285731f9a4378d81aff2f0e85a2c8781a05ef0f8baa8dac54d0ff48" +checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673" dependencies = [ "const_format_proc_macros", ] [[package]] name = "const_format_proc_macros" -version = "0.2.31" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e026b6ce194a874cb9cf32cd5772d1ef9767cc8fcb5765948d74f37a9d8b2bf6" +checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "unicode-xid 0.2.4", + "proc-macro2 1.0.86", + "quote 1.0.37", + "unicode-xid 0.2.5", ] [[package]] @@ -1105,38 +1197,53 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] -name = "convert_case" -version = "0.4.0" +name = "constant_time_eq" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "convert_case" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4a24b1aaf0fd0ce8b45161144d6f42cd91677fd5940fd431183eb023b3a2b8" +checksum = "21a53c0a4d288377e7415b53dcfc3c04da5cdc2cc95c8d5ac178b58f0b861ad6" [[package]] name = "core-foundation" version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +source = "git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd#7d593d016175755e492a92ef89edca68ac3bd5cd" dependencies = [ - "core-foundation-sys 0.8.4", + "core-foundation-sys 0.8.6", + "libc", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys 0.8.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", "libc", ] [[package]] name = "core-foundation-sys" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" +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.4" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "core-graphics" @@ -1144,140 +1251,188 @@ version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" dependencies = [ - "bitflags", - "core-foundation", - "core-graphics-types", - "foreign-types", + "bitflags 1.3.2", + "core-foundation 0.9.4", + "core-graphics-types 0.1.3", + "foreign-types 0.3.2", + "libc", +] + +[[package]] +name = "core-graphics" +version = "0.23.1" +source = "git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd#7d593d016175755e492a92ef89edca68ac3bd5cd" +dependencies = [ + "bitflags 1.3.2", + "core-foundation 0.9.3", + "core-graphics-types 0.1.2", + "foreign-types 0.5.0", + "libc", + "objc2-encode 2.0.0-pre.2", +] + +[[package]] +name = "core-graphics" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" +dependencies = [ + "bitflags 1.3.2", + "core-foundation 0.9.4", + "core-graphics-types 0.1.3", + "foreign-types 0.5.0", + "libc", +] + +[[package]] +name = "core-graphics" +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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" +version = "0.1.2" +source = "git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd#7d593d016175755e492a92ef89edca68ac3bd5cd" dependencies = [ - "bitflags", - "core-foundation", - "foreign-types", + "bitflags 1.3.2", + "core-foundation 0.9.3", + "libc", + "objc2-encode 2.0.0-pre.2", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation 0.9.4", + "libc", +] + +[[package]] +name = "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.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb17e2d1795b1996419648915df94bc7103c28f7b48062d7acf4652fc371b2ff" +checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace" dependencies = [ - "bitflags", - "core-foundation-sys 0.6.2", + "bitflags 1.3.2", + "core-foundation-sys 0.8.7", "coreaudio-sys", ] [[package]] name = "coreaudio-sys" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f034b2258e6c4ade2f73bf87b21047567fb913ee9550837c2316d139b0262b24" +checksum = "7f01585027057ff5f0a5bf276174ae4c1594a2c5bde93d5f46a016d76270f5a9" dependencies = [ - "bindgen 0.64.0", + "bindgen 0.69.4", ] [[package]] name = "cpal" -version = "0.15.2" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d959d90e938c5493000514b446987c07aed46c668faaa7d34d6c7a67b1a578c" +checksum = "873dab07c8f743075e57f524c583985fbaf745602acbe916a01539364369a779" dependencies = [ "alsa", - "core-foundation-sys 0.8.4", + "core-foundation-sys 0.8.7", "coreaudio-rs", "dasp_sample", - "jni 0.19.0", + "jni 0.21.1", "js-sys", "libc", "mach2", - "ndk", + "ndk 0.8.0", "ndk-context", "oboe", - "once_cell", - "parking_lot", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "windows 0.46.0", + "windows 0.54.0", ] [[package]] name = "cpufeatures" -version = "0.2.7" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ - "cfg-if 1.0.0", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if 1.0.0", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.14" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg 1.1.0", - "cfg-if 1.0.0", "crossbeam-utils", - "memoffset 0.8.0", - "scopeguard", ] [[package]] name = "crossbeam-queue" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" dependencies = [ - "cfg-if 1.0.0", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.15" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" -dependencies = [ - "cfg-if 1.0.0", -] +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -1297,84 +1452,36 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.2.5" +version = "3.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbcf33c2a618cbe41ee43ae6e9f2e48368cd9f9db2896f10167d8d762679f639" +checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3" dependencies = [ - "nix 0.26.2", - "windows-sys 0.45.0", -] - -[[package]] -name = "cxx" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2 1.0.63", - "quote 1.0.27", - "scratch", - "syn 2.0.15", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" -dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", -] - -[[package]] -name = "dark-light" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62007a65515b3cd88c733dd3464431f05d2ad066999a824259d8edc3cf6f645" -dependencies = [ - "dconf_rs", - "detect-desktop-environment", - "dirs 4.0.0", - "objc", - "rust-ini", - "web-sys", - "winreg 0.10.1", - "zbus", - "zvariant", + "nix 0.29.0", + "windows-sys 0.59.0", ] [[package]] name = "dart-sys" -version = "4.0.2" +version = "4.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d8b5680b5c2cc52f50acb2457d9b3a3b58adcca785db13a0e3655626f601de6" +checksum = "57967e4b200d767d091b961d6ab42cc7d0cc14fe9e052e75d0d3cf9eb732d895" dependencies = [ "cc", ] +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if 1.0.0", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core", +] + [[package]] name = "dasp" version = "0.11.0" @@ -1514,12 +1621,6 @@ dependencies = [ "dbus", ] -[[package]] -name = "dconf_rs" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7046468a81e6a002061c01e6a7c83139daf91b11c30e66795b13217c2d885c8b" - [[package]] name = "debug-helper" version = "0.3.13" @@ -1544,14 +1645,12 @@ dependencies = [ ] [[package]] -name = "delegate" -version = "0.8.0" +name = "deranged" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "082a24a9967533dc5d743c602157637116fc1b52806d694a5a45e6f32567fcdd" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 1.0.109", + "powerfmt", ] [[package]] @@ -1560,35 +1659,16 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", + "proc-macro2 1.0.86", + "quote 1.0.37", "syn 1.0.109", ] -[[package]] -name = "derive_more" -version = "0.99.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -dependencies = [ - "convert_case 0.4.0", - "proc-macro2 1.0.63", - "quote 1.0.27", - "rustc_version", - "syn 1.0.109", -] - -[[package]] -name = "detect-desktop-environment" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21d8ad60dd5b13a4ee6bd8fa2d5d88965c597c67bce32b5fc49c94f55cb50810" - [[package]] name = "digest" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", "crypto-common", @@ -1615,15 +1695,6 @@ dependencies = [ "dirs-sys 0.3.7", ] -[[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys 0.3.7", -] - [[package]] name = "dirs" version = "5.0.1" @@ -1683,6 +1754,15 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading 0.8.5", +] + [[package]] name = "dlopen" version = "0.1.8" @@ -1713,8 +1793,8 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a09ac8bb8c16a282264c379dffba707b9c998afc7506009137f3c6136888078" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", + "proc-macro2 1.0.86", + "quote 1.0.37", "syn 1.0.109", ] @@ -1743,10 +1823,22 @@ checksum = "7f3f119846c823f9eafcf953a8f6ffb6ed69bf6240883261a7f13b634579a51f" dependencies = [ "lazy_static", "regex", - "serde 1.0.163", + "serde 1.0.209", "strsim 0.10.0", ] +[[package]] +name = "downcast-rs" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" + +[[package]] +name = "dpi" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53" + [[package]] name = "dtoa" version = "0.4.8" @@ -1760,7 +1852,7 @@ dependencies = [ "cc", "hbb_common", "lazy_static", - "serde 1.0.163", + "serde 1.0.209", "serde_derive", "thiserror", ] @@ -1776,28 +1868,15 @@ dependencies = [ [[package]] name = "either" -version = "1.8.1" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" - -[[package]] -name = "embed-resource" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80663502655af01a2902dff3f06869330782267924bf1788410b74edcd93770a" -dependencies = [ - "cc", - "rustc_version", - "toml 0.7.3", - "vswhom", - "winreg 0.11.0", -] +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if 1.0.0", ] @@ -1806,13 +1885,13 @@ dependencies = [ name = "enigo" version = "0.0.14" dependencies = [ - "core-graphics", + "core-graphics 0.22.3", "hbb_common", "log", "objc", "pkg-config", "rdev", - "serde 1.0.163", + "serde 1.0.209", "serde_derive", "tfc", "unicode-segmentation", @@ -1820,76 +1899,53 @@ dependencies = [ ] [[package]] -name = "enum-iterator" -version = "1.4.1" +name = "enquote" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7add3873b5dd076766ee79c8e406ad1a472c385476b9e38849f8eec24f1be689" +checksum = "06c36cb11dbde389f4096111698d8b567c0720e3452fd5ac3e6b4e47e1939932" dependencies = [ - "enum-iterator-derive", -] - -[[package]] -name = "enum-iterator-derive" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb" -dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", + "thiserror", ] [[package]] name = "enum-map" -version = "2.5.0" +version = "2.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "988f0d17a0fa38291e5f41f71ea8d46a5d5497b9054d5a759fae2cbb819f2356" +checksum = "6866f3bfdf8207509a033af1a75a7b08abda06bbaaeae6669323fd5a097df2e9" dependencies = [ "enum-map-derive", ] [[package]] name = "enum-map-derive" -version = "0.11.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a4da76b3b6116d758c7ba93f7ec6a35d2e2cf24feda76c6e38a375f4d5c59f2" +checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 1.0.109", -] - -[[package]] -name = "enum_dispatch" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11f36e95862220b211a6e2aa5eca09b4fa391b13cd52ceb8035a24bf65a79de2" -dependencies = [ - "once_cell", - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 1.0.109", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", ] [[package]] name = "enumflags2" -version = "0.7.7" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2" +checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" dependencies = [ "enumflags2_derive", - "serde 1.0.163", + "serde 1.0.209", ] [[package]] name = "enumflags2_derive" -version = "0.7.7" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" +checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", ] [[package]] @@ -1907,9 +1963,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.10.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" dependencies = [ "humantime", "is-terminal", @@ -1920,44 +1976,35 @@ dependencies = [ [[package]] name = "epoll" -version = "4.3.1" +version = "4.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20df693c700404f7e19d4d6fae6b15215d2913c27955d2b9d6f2c0f537511cd0" +checksum = "74351c3392ea1ff6cd2628e0042d268ac2371cb613252ff383b6dfa50d22fa79" dependencies = [ - "bitflags", + "bitflags 2.6.0", "libc", ] +[[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.1" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", "libc", + "windows-sys 0.52.0", ] [[package]] name = "error-code" -version = "2.3.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" -dependencies = [ - "libc", - "str-buf", -] +checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" [[package]] name = "evdev" @@ -1976,16 +2023,48 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] -name = "exr" -version = "1.6.3" +name = "event-listener" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdd2162b720141a91a054640662d3edce3d50a944a50ffca5313cd951abb35b4" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "5.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +dependencies = [ + "event-listener 5.3.1", + "pin-project-lite", +] + +[[package]] +name = "exr" +version = "1.72.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4" dependencies = [ "bit_field", "flume", "half", "lebe", - "miniz_oxide 0.6.2", + "miniz_oxide 0.7.4", "rayon-core", "smallvec", "zune-inflate", @@ -2001,62 +2080,63 @@ dependencies = [ ] [[package]] -name = "fdeflate" -version = "0.3.0" +name = "fastrand" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" + +[[package]] +name = "fdeflate" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" dependencies = [ "simd-adler32", ] -[[package]] -name = "fern" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee" -dependencies = [ - "chrono", - "colored", - "log", -] - [[package]] name = "field-offset" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3cf3a800ff6e860c863ca6d4b16fd999db8b752819c1606884047b73e468535" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ - "memoffset 0.8.0", + "memoffset 0.9.1", "rustc_version", ] [[package]] name = "filetime" -version = "0.2.21" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" +checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.2.16", - "windows-sys 0.48.0", + "libredox", + "windows-sys 0.59.0", ] [[package]] -name = "flate2" -version = "1.0.26" +name = "fixedbitset" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "flate2" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", - "miniz_oxide 0.7.1", + "miniz_oxide 0.8.0", ] [[package]] name = "flexi_logger" -version = "0.25.4" +version = "0.27.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611de758a8869ffffa7524aafdb48658c64dae95cdce49654d68a8442e500d89" +checksum = "469e584c031833564840fb0cdbce99bdfe946fd45480a188545e73a76f45461c" dependencies = [ "chrono", "crossbeam-channel", @@ -2072,22 +2152,18 @@ dependencies = [ [[package]] name = "flume" -version = "0.10.14" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ - "futures-core", - "futures-sink", - "nanorand", - "pin-project", - "spin 0.9.8", + "spin", ] [[package]] name = "flutter_rust_bridge" -version = "1.75.3" +version = "1.80.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "907f6624c3c6a5a1421b1c1eb9c2881104607730d5f67ce7ae50051efa7a2cf3" +checksum = "fd0305ebc9f097d9826530a55fc2acd63222e912c663f7adce3ab641ecc0f346" dependencies = [ "allo-isolate", "anyhow", @@ -2109,44 +2185,11 @@ dependencies = [ "web-sys", ] -[[package]] -name = "flutter_rust_bridge_codegen" -version = "1.75.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49fdb2728cabeb86d1271ed4398ee1518b4a3d9f659756cf5021e5c5a91e3f25" -dependencies = [ - "anyhow", - "atty", - "cargo_metadata", - "cbindgen", - "chrono", - "clap 4.2.7", - "convert_case 0.5.0", - "delegate", - "enum-iterator", - "enum_dispatch", - "fern", - "itertools 0.10.5", - "lazy_static", - "log", - "pathdiff", - "quote 1.0.27", - "regex", - "serde 1.0.163", - "serde_yaml", - "strum_macros 0.24.3", - "syn 1.0.109", - "tempfile", - "thiserror", - "toml 0.5.11", - "topological-sort", -] - [[package]] name = "flutter_rust_bridge_macros" -version = "1.75.3" +version = "1.82.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de66560e226cb4a5da7ab042a0872c0be4e165288f5bcde809a08f3f5ca22962" +checksum = "a7fe743d921bedf4578b9472346d03a9643a01cd565ca7df7961baebad534ba5" [[package]] name = "fnv" @@ -2169,7 +2212,28 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" dependencies = [ - "foreign-types-shared", + "foreign-types-shared 0.1.1", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared 0.3.1", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +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", ] [[package]] @@ -2179,10 +2243,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] -name = "form_urlencoded" -version = "1.1.0" +name = "foreign-types-shared" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -2213,10 +2283,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] -name = "futures" -version = "0.3.28" +name = "fuser" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "21370f84640642c8ea36dfb2a6bfc4c55941f476fcf431f6fef25a5ddcf0169b" +dependencies = [ + "libc", + "log", + "memchr", + "page_size", + "pkg-config", + "smallvec", + "zerocopy 0.6.6", +] + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -2229,9 +2314,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -2239,15 +2324,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -2256,9 +2341,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" @@ -2266,7 +2351,7 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand", + "fastrand 1.9.0", "futures-core", "futures-io", "memchr", @@ -2276,33 +2361,46 @@ dependencies = [ ] [[package]] -name = "futures-macro" -version = "0.3.28" +name = "futures-lite" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", + "fastrand 2.1.1", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] +name = "futures-macro" +version = "0.3.30" +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", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -2318,87 +2416,86 @@ dependencies = [ [[package]] name = "gdk" -version = "0.16.2" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa9cb33da481c6c040404a11f8212d193889e9b435db2c14fd86987f630d3ce1" +checksum = "f5ba081bdef3b75ebcdbfc953699ed2d7417d6bd853347a42a37d76406a33646" dependencies = [ - "bitflags", "cairo-rs", "gdk-pixbuf", "gdk-sys", "gio", - "glib 0.16.7", + "glib 0.18.5", "libc", "pango", ] [[package]] name = "gdk-pixbuf" -version = "0.16.7" +version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3578c60dee9d029ad86593ed88cb40f35c1b83360e12498d055022385dd9a05" +checksum = "50e1f5f1b0bfb830d6ccc8066d18db35c487b1b2b1e8589b5dfe9f07e8defaec" dependencies = [ - "bitflags", "gdk-pixbuf-sys", "gio", - "glib 0.16.7", + "glib 0.18.5", "libc", + "once_cell", ] [[package]] name = "gdk-pixbuf-sys" -version = "0.16.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3092cf797a5f1210479ea38070d9ae8a5b8e9f8f1be9f32f4643c529c7d70016" +checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" dependencies = [ "gio-sys", - "glib-sys 0.16.3", - "gobject-sys 0.16.3", + "glib-sys 0.18.1", + "gobject-sys 0.18.0", "libc", - "system-deps 6.1.0", + "system-deps 6.2.2", ] [[package]] name = "gdk-sys" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76354f97a913e55b984759a997b693aa7dc71068c9e98bcce51aa167a0a5c5a" +checksum = "31ff856cb3386dae1703a920f803abafcc580e9b5f711ca62ed1620c25b51ff2" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", "gio-sys", - "glib-sys 0.16.3", - "gobject-sys 0.16.3", + "glib-sys 0.18.1", + "gobject-sys 0.18.0", "libc", "pango-sys", "pkg-config", - "system-deps 6.1.0", + "system-deps 6.2.2", ] [[package]] name = "gdkwayland-sys" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4511710212ed3020b61a8622a37aa6f0dd2a84516575da92e9b96928dcbe83ba" +checksum = "a90fbf5c033c65d93792192a49a8efb5bb1e640c419682a58bb96f5ae77f3d4a" dependencies = [ "gdk-sys", - "glib-sys 0.16.3", - "gobject-sys 0.16.3", + "glib-sys 0.18.1", + "gobject-sys 0.18.0", "libc", "pkg-config", - "system-deps 6.1.0", + "system-deps 6.2.2", ] [[package]] name = "gdkx11-sys" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fa2bf8b5b8c414bc5d05e48b271896d0fd3ddb57464a3108438082da61de6af" +checksum = "fee8f00f4ee46cad2939b8990f5c70c94ff882c3028f3cc5abf950fa4ab53043" dependencies = [ "gdk-sys", - "glib-sys 0.16.3", + "glib-sys 0.18.1", "libc", - "system-deps 6.1.0", + "system-deps 6.2.2", "x11 2.21.0", ] @@ -2414,32 +2511,40 @@ dependencies = [ [[package]] name = "gethostname" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" +checksum = "bb65d4ba3173c56a500b555b532f72c42e8d1fe64962b518897f8959fae2c177" dependencies = [ "libc", "winapi 0.3.9", ] [[package]] -name = "getrandom" -version = "0.2.9" +name = "gethostname" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" +dependencies = [ + "libc", + "windows-targets 0.48.5", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if 1.0.0", - "js-sys", "libc", "wasi 0.11.0+wasi-snapshot-preview1", - "wasm-bindgen", ] [[package]] name = "gif" -version = "0.12.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" dependencies = [ "color_quant", "weezl", @@ -2447,23 +2552,22 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.2" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "gio" -version = "0.16.7" +version = "0.18.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a1c84b4534a290a29160ef5c6eff2a9c95833111472e824fc5cb78b513dd092" +checksum = "d4fc8f532f87b79cbc51a79748f16a6828fb784be93145a322fa14d06d354c73" dependencies = [ - "bitflags", "futures-channel", "futures-core", "futures-io", "futures-util", "gio-sys", - "glib 0.16.7", + "glib 0.18.5", "libc", "once_cell", "pin-project-lite", @@ -2473,14 +2577,14 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.16.3" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9b693b8e39d042a95547fc258a7b07349b1f0b48f4b2fa3108ba3c51c0b5229" +checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" dependencies = [ - "glib-sys 0.16.3", - "gobject-sys 0.16.3", + "glib-sys 0.18.1", + "gobject-sys 0.18.0", "libc", - "system-deps 6.1.0", + "system-deps 6.2.2", "winapi 0.3.9", ] @@ -2490,7 +2594,7 @@ version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccf7f68c2995f392c49fffb4f95ae2c873297830eb25c6bc4c114ce8f4562acc" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", "libgit2-sys", "log", @@ -2503,7 +2607,7 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c685013b7515e668f1b57a165b009d4d28cb139a8a989bbd699c10dad29d0c5" dependencies = [ - "bitflags", + "bitflags 1.3.2", "futures-channel", "futures-core", "futures-executor", @@ -2518,21 +2622,22 @@ dependencies = [ [[package]] name = "glib" -version = "0.16.7" +version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddd4df61a866ed7259d6189b8bcb1464989a77f1d85d25d002279bbe9dd38b2f" +checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5" dependencies = [ - "bitflags", + "bitflags 2.6.0", "futures-channel", "futures-core", "futures-executor", "futures-task", "futures-util", "gio-sys", - "glib-macros 0.16.8", - "glib-sys 0.16.3", - "gobject-sys 0.16.3", + "glib-macros 0.18.5", + "glib-sys 0.18.1", + "gobject-sys 0.18.0", "libc", + "memchr", "once_cell", "smallvec", "thiserror", @@ -2549,24 +2654,23 @@ dependencies = [ "itertools 0.9.0", "proc-macro-crate 0.1.5", "proc-macro-error", - "proc-macro2 1.0.63", - "quote 1.0.27", + "proc-macro2 1.0.86", + "quote 1.0.37", "syn 1.0.109", ] [[package]] name = "glib-macros" -version = "0.16.8" +version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb1a9325847aa46f1e96ffea37611b9d51fc4827e67f79e7de502a297560a67b" +checksum = "0bb0228f477c0900c880fd78c8759b95c7636dbd7842707f49e132378aa2acdc" dependencies = [ - "anyhow", "heck 0.4.1", - "proc-macro-crate 1.3.1", + "proc-macro-crate 2.0.2", "proc-macro-error", - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 1.0.109", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", ] [[package]] @@ -2581,12 +2685,12 @@ dependencies = [ [[package]] name = "glib-sys" -version = "0.16.3" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61a4f46316d06bfa33a7ac22df6f0524c8be58e3db2d9ca99ccb1f357b62a65" +checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" dependencies = [ "libc", - "system-deps 6.1.0", + "system-deps 6.2.2", ] [[package]] @@ -2608,13 +2712,13 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.16.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3520bb9c07ae2a12c7f2fbb24d4efc11231c8146a86956413fb1a79bb760a0f1" +checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" dependencies = [ - "glib-sys 0.16.3", + "glib-sys 0.18.1", "libc", - "system-deps 6.1.0", + "system-deps 6.2.2", ] [[package]] @@ -2623,7 +2727,7 @@ version = "0.16.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ff5d0f7ff308ae37e6eb47b6ded17785bdea06e438a708cd09e0288c1862f33" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "futures-channel", "futures-core", @@ -2634,7 +2738,7 @@ dependencies = [ "gstreamer-sys", "libc", "muldiv", - "num-rational 0.3.2", + "num-rational", "once_cell", "paste", "pretty-hex", @@ -2647,7 +2751,7 @@ version = "0.16.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc80888271338c3ede875d8cafc452eb207476ff5539dcbe0018a8f5b827af0e" dependencies = [ - "bitflags", + "bitflags 1.3.2", "futures-core", "futures-sink", "glib 0.10.3", @@ -2680,7 +2784,7 @@ version = "0.16.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bafd01c56f59cb10f4b5a10f97bb4bdf8c2b2784ae5b04da7e2d400cf6e6afcf" dependencies = [ - "bitflags", + "bitflags 1.3.2", "glib 0.10.3", "glib-sys 0.10.1", "gobject-sys 0.10.0", @@ -2721,7 +2825,7 @@ version = "0.16.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7bbb1485d87469849ec45c08e03c2f280d3ea20ff3c439d03185be54e3ce98e" dependencies = [ - "bitflags", + "bitflags 1.3.2", "futures-channel", "futures-util", "glib 0.10.3", @@ -2752,64 +2856,61 @@ dependencies = [ [[package]] name = "gtk" -version = "0.16.2" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4d3507d43908c866c805f74c9dd593c0ce7ba5c38e576e41846639cdcd4bee6" +checksum = "93c4f5e0e20b60e10631a5f06da7fe3dda744b05ad0ea71fee2f47adf865890c" dependencies = [ "atk", - "bitflags", "cairo-rs", "field-offset", "futures-channel", "gdk", "gdk-pixbuf", "gio", - "glib 0.16.7", + "glib 0.18.5", "gtk-sys", "gtk3-macros", "libc", - "once_cell", "pango", "pkg-config", ] [[package]] name = "gtk-sys" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b5f8946685d5fe44497007786600c2f368ff6b1e61a16251c89f72a97520a3" +checksum = "771437bf1de2c1c0b496c11505bdf748e26066bbe942dfc8f614c9460f6d7722" dependencies = [ "atk-sys", "cairo-sys-rs", "gdk-pixbuf-sys", "gdk-sys", "gio-sys", - "glib-sys 0.16.3", - "gobject-sys 0.16.3", + "glib-sys 0.18.1", + "gobject-sys 0.18.0", "libc", "pango-sys", - "system-deps 6.1.0", + "system-deps 6.2.2", ] [[package]] name = "gtk3-macros" -version = "0.16.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "096eb63c6fedf03bafe65e5924595785eaf1bcb7200dac0f2cbe9c9738f05ad8" +checksum = "c6063efb63db582968fb7df72e1ae68aa6360dcfb0a75143f34fc7d616bad75e" dependencies = [ - "anyhow", "proc-macro-crate 1.3.1", "proc-macro-error", - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 1.0.109", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", ] [[package]] name = "h2" -version = "0.3.18" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -2826,10 +2927,11 @@ dependencies = [ [[package]] name = "half" -version = "2.2.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ + "cfg-if 1.0.0", "crunchy", ] @@ -2839,7 +2941,17 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash", + "ahash 0.7.8", +] + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash 0.8.11", + "allocator-api2", ] [[package]] @@ -2848,17 +2960,19 @@ version = "0.1.0" dependencies = [ "anyhow", "backtrace", + "base64 0.22.1", "bytes", "chrono", "confy", "directories-next", "dirs-next", "dlopen", - "env_logger 0.10.0", + "env_logger 0.10.2", "filetime", "flexi_logger", "futures", "futures-util", + "httparse", "lazy_static", "libc", "log", @@ -2867,22 +2981,27 @@ dependencies = [ "osascript", "protobuf", "protobuf-codegen", - "quinn", "rand 0.8.5", "regex", - "serde 1.0.163", + "rustls-pki-types", + "rustls-platform-verifier", + "serde 1.0.209", "serde_derive", - "serde_json 1.0.96", + "serde_json 1.0.127", "socket2 0.3.19", "sodiumoxide", "sysinfo", + "thiserror", "tokio", - "tokio-socks", + "tokio-native-tls", + "tokio-rustls 0.26.0", + "tokio-socks 0.5.2-1", "tokio-util", - "toml 0.7.3", + "toml 0.7.8", + "url", "uuid", "winapi 0.3.9", - "zstd 0.12.3+zstd.1.5.2", + "zstd 0.13.2", ] [[package]] @@ -2900,6 +3019,12 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[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.1.19" @@ -2911,18 +3036,15 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.2.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hermit-abi" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" [[package]] name = "hex" @@ -2940,27 +3062,45 @@ dependencies = [ ] [[package]] -name = "hound" -version = "3.5.0" +name = "home" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d13cdbd5dbb29f9c88095bbdc2590c9cba0d0a1269b983fef6b2cdd7e9f4db1" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "hound" +version = "3.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62adaabb884c94955b19907d60019f4e145d091c75345379e70d1ee696f7854f" + +[[package]] +name = "html-escape" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476" +dependencies = [ + "utf8-width", +] [[package]] name = "http" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", - "itoa 1.0.6", + "itoa 1.0.11", ] [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", "http", @@ -2969,15 +3109,15 @@ dependencies = [ [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "humantime" @@ -2987,22 +3127,22 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hwcodec" -version = "0.1.1" -source = "git+https://github.com/21pages/hwcodec?branch=stable#82cdc15457e42feaf14e1b38622506b2d54baf76" +version = "0.7.0" +source = "git+https://github.com/rustdesk-org/hwcodec#6abd1898f3a03481ed0c038507b5218d6ea94267" dependencies = [ "bindgen 0.59.2", "cc", "log", - "serde 1.0.163", + "serde 1.0.209", "serde_derive", - "serde_json 1.0.96", + "serde_json 1.0.127", ] [[package]] name = "hyper" -version = "0.14.26" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ "bytes", "futures-channel", @@ -3013,9 +3153,9 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa 1.0.6", + "itoa 1.0.11", "pin-project-lite", - "socket2 0.4.9", + "socket2 0.5.7", "tokio", "tower-service", "tracing", @@ -3024,46 +3164,59 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.24.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ + "futures-util", "http", "hyper", - "rustls 0.21.2", + "rustls 0.21.12", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", +] + +[[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.56" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", - "core-foundation-sys 0.8.4", + "core-foundation-sys 0.8.7", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows 0.48.0", + "windows-core 0.52.0", ] [[package]] name = "iana-time-zone-haiku" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" dependencies = [ - "cxx", - "cxx-build", + "cc", ] [[package]] name = "idna" -version = "0.3.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -3071,9 +3224,9 @@ dependencies = [ [[package]] name = "image" -version = "0.24.6" +version = "0.24.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" dependencies = [ "bytemuck", "byteorder", @@ -3081,57 +3234,69 @@ dependencies = [ "exr", "gif", "jpeg-decoder", - "num-rational 0.4.1", - "num-traits 0.2.15", + "num-traits 0.2.19", "png", "qoi", "tiff", ] +[[package]] +name = "image" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" +dependencies = [ + "bytemuck", + "byteorder-lite", + "num-traits 0.2.19", + "png", + "tiff", +] + [[package]] name = "impersonate_system" version = "0.1.0" -source = "git+https://github.com/21pages/impersonate-system#84b401893d5b6628c8b33b295328d13fbbe2674b" +source = "git+https://github.com/rustdesk-org/impersonate-system#2f429010a5a10b1fe5eceb553c6672fd53d20167" dependencies = [ "cc", ] [[package]] name = "include_dir" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e" +checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd" dependencies = [ "include_dir_macros", ] [[package]] name = "include_dir_macros" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f" +checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", + "proc-macro2 1.0.86", + "quote 1.0.37", ] [[package]] name = "indexmap" -version = "1.9.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" dependencies = [ - "autocfg 1.1.0", - "hashbrown", + "equivalent", + "hashbrown 0.14.5", ] [[package]] name = "inotify" -version = "0.10.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abf888f9575c290197b2c948dc9e9ff10bd1a39ad1ea8585f734585fa6b9d3f9" +checksum = "fdd168d97690d0b8c412d6b6c10360277f4d7ee495c5d0d5d5fe0854923255cc" dependencies = [ - "bitflags", + "bitflags 1.3.2", "inotify-sys", "libc", ] @@ -3146,41 +3311,49 @@ dependencies = [ ] [[package]] -name = "instant" -version = "0.1.12" +name = "inout" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", +] + +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "io-lifetimes" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi 0.3.9", "libc", "windows-sys 0.48.0", ] [[package]] name = "ipnet" -version = "2.7.2" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" -version = "0.4.7" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix", - "windows-sys 0.48.0", + "hermit-abi 0.4.0", + "libc", + "windows-sys 0.52.0", ] [[package]] @@ -3189,6 +3362,12 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06d198e9919d9822d5f7083ba8530e04de87841eaf21ead9af8f2304efd57c89" +[[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.9.0" @@ -3200,9 +3379,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.10.5" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] @@ -3215,9 +3394,9 @@ checksum = "8324a32baf01e2ae060e9de58ed0bc2320c9a2833491ee36cd3b4c414de4db8c" [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jni" @@ -3233,20 +3412,6 @@ dependencies = [ "walkdir", ] -[[package]] -name = "jni" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" -dependencies = [ - "cesu8", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", -] - [[package]] name = "jni" version = "0.21.1" @@ -3271,27 +3436,27 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] [[package]] name = "jpeg-decoder" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" dependencies = [ "rayon", ] [[package]] name = "js-sys" -version = "0.3.62" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68c16e1bfd491478ab155fd8b4896b86f9ede344949b641e61501e07c2b8b4d5" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] @@ -3299,12 +3464,11 @@ dependencies = [ [[package]] name = "keepawake" version = "0.4.3" -source = "git+https://github.com/rustdesk-org/keepawake-rs#ac395ef826b32a077bc5d2fe108cf71fde8fe2e6" +source = "git+https://github.com/rustdesk-org/keepawake-rs#64d568586dd16551d02120e19668d2b0fec8e3c9" dependencies = [ "anyhow", - "apple-sys", "cfg-if 1.0.0", - "core-foundation", + "core-foundation 0.9.4", "shadow-rs", "windows 0.48.0", "winres", @@ -3323,20 +3487,20 @@ dependencies = [ [[package]] name = "keyboard-types" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7668b7cff6a51fe61cdde64cd27c8a220786f399501b57ebe36f7d8112fd68" +checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a" dependencies = [ - "bitflags", - "serde 1.0.163", + "bitflags 2.6.0", + "serde 1.0.209", "unicode-segmentation", ] [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lazycell" @@ -3352,11 +3516,11 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libappindicator" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89e1edfdc9b0853358306c6dfb4b77c79c779174256fe93d80c0b5ebca451a2f" +checksum = "03589b9607c868cc7ae54c0b2a22c8dc03dd41692d48f2d7df73615c6a95dc0a" dependencies = [ - "glib 0.16.7", + "glib 0.18.5", "gtk", "gtk-sys", "libappindicator-sys", @@ -3365,9 +3529,9 @@ dependencies = [ [[package]] name = "libappindicator-sys" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08fcb2bea89cee9613982501ec83eaa2d09256b24540ae463c52a28906163918" +checksum = "6e9ec52138abedcc58dc17a7c6c0c00a2bdb4f3427c7f63fa97fd0d859155caf" dependencies = [ "gtk-sys", "libloading 0.7.4", @@ -3376,9 +3540,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.144" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libdbus-sys" @@ -3413,39 +3577,39 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.0" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if 1.0.0", - "windows-sys 0.48.0", + "windows-targets 0.52.6", ] [[package]] name = "libm" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libpulse-binding" -version = "2.27.1" +version = "2.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1745b20bfc194ac12ef828f144f0ec2d4a7fe993281fa3567a0bd4969aee6890" +checksum = "ed3557a2dfc380c8f061189a01c6ae7348354e0c9886038dc6c171219c08eaff" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", "libpulse-sys", - "num-derive", - "num-traits 0.2.15", + "num-derive 0.3.3", + "num-traits 0.2.19", "winapi 0.3.9", ] [[package]] name = "libpulse-simple-binding" -version = "2.27.1" +version = "2.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ced94199e6e44133431374e4043f34e1f0697ebfb7b7d6c244a65bfaedf0e31" +checksum = "05fd6b68f33f6a251265e6ed1212dc3107caad7c5c6fdcd847b2e65ef58c308d" dependencies = [ "libpulse-binding", "libpulse-simple-sys", @@ -3454,9 +3618,9 @@ dependencies = [ [[package]] name = "libpulse-simple-sys" -version = "1.20.1" +version = "1.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84e423d9c619c908ce9b4916080e65ab586ca55b8c4939379f15e6e72fb43842" +checksum = "ea6613b4199d8b9f0edcfb623e020cb17bbd0bee8dd21f3c7cc938de561c4152" dependencies = [ "libpulse-sys", "pkg-config", @@ -3464,17 +3628,28 @@ dependencies = [ [[package]] name = "libpulse-sys" -version = "1.20.1" +version = "1.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2191e6880818d1df4cf72eac8e91dce7a5a52ba0da4b2a5cdafabc22b937eadb" +checksum = "bc19e110fbf42c17260d30f6d3dc545f58491c7830d38ecb9aaca96e26067a9b" dependencies = [ "libc", - "num-derive", - "num-traits 0.2.15", + "num-derive 0.3.3", + "num-traits 0.2.19", "pkg-config", "winapi 0.3.9", ] +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.6.0", + "libc", + "redox_syscall 0.5.3", +] + [[package]] name = "libsamplerate-sys" version = "0.1.12" @@ -3517,9 +3692,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.9" +version = "1.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" +checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" dependencies = [ "cc", "libc", @@ -3528,69 +3703,48 @@ dependencies = [ ] [[package]] -name = "line-wrap" -version = "0.1.1" +name = "linux-raw-sys" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" -dependencies = [ - "safemem", -] - -[[package]] -name = "link-cplusplus" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", -] - -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.3.7" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", "scopeguard", ] [[package]] name = "log" -version = "0.4.17" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if 1.0.0", -] +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "mac_address" -version = "1.1.4" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b238e3235c8382b7653c6408ed1b08dd379bdb9fdf990fb0bbae3db2cc0ae963" +checksum = "8836fae9d0d4be2c8b4efcdd79e828a2faa058a90d005abf42f91cac5493a08e" dependencies = [ - "nix 0.23.2", + "nix 0.28.0", "winapi 0.3.9", ] [[package]] name = "mach2" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" dependencies = [ "libc", ] @@ -3598,7 +3752,7 @@ dependencies = [ [[package]] name = "machine-uid" version = "0.3.0" -source = "git+https://github.com/21pages/machine-uid#381ff579c1dc3a6c54db9dfec47c44bcb0246542" +source = "git+https://github.com/rustdesk-org/machine-uid#381ff579c1dc3a6c54db9dfec47c44bcb0246542" dependencies = [ "bindgen 0.59.2", "cc", @@ -3608,7 +3762,7 @@ dependencies = [ [[package]] name = "magnum-opus" version = "0.4.0" -source = "git+https://github.com/rustdesk/magnum-opus#5cd2bf989c148662fa3a2d9d539a71d71fd1d256" +source = "git+https://github.com/rustdesk-org/magnum-opus#5cd2bf989c148662fa3a2d9d539a71d71fd1d256" dependencies = [ "bindgen 0.59.2", "pkg-config", @@ -3638,9 +3792,9 @@ checksum = "df39d232f5c40b0891c10216992c2f250c054105cb1e56f0fc9032db6203ecc1" [[package]] name = "memchr" -version = "2.5.0" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" @@ -3648,7 +3802,7 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", ] [[package]] @@ -3657,16 +3811,16 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", ] [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", ] [[package]] @@ -3683,62 +3837,56 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.6.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", "simd-adler32", ] [[package]] -name = "mio" -version = "0.8.6" +name = "miniz_oxide" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + +[[package]] +name = "mio" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] -name = "miow" -version = "0.5.0" +name = "mio" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ffbca2f655e33c08be35d87278e5b18b89550a37dbd598c20db92f6a471123" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ - "windows-sys 0.42.0", -] - -[[package]] -name = "mouce" -version = "0.2.1" -source = "git+https://github.com/rustdesk-org/mouce.git#ed83800d532b95d70e39915314f6052aa433e9b9" -dependencies = [ - "glob", + "hermit-abi 0.3.9", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.52.0", ] [[package]] name = "muda" -version = "0.5.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c820db003e601413e835a33b10cf51452b6415ef34ff1d862401826431c675" +checksum = "ba8ac4080fb1e097c2c22acae467e46e4da72d941f02e82b67a87a2a89fa38b1" dependencies = [ - "cocoa", + "cocoa 0.26.0", "crossbeam-channel", - "gdk", - "gdk-pixbuf", + "dpi", "gtk", "keyboard-types", "libxdo", @@ -3746,7 +3894,7 @@ dependencies = [ "once_cell", "png", "thiserror", - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -3756,12 +3904,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0419348c027fa7be448d2ae7ea0e4e04c2334c31dc4e74ab29f00a2a7ca69204" [[package]] -name = "nanorand" -version = "0.7.0" +name = "native-tls" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" dependencies = [ - "getrandom", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "native-windows-gui" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f7003a669f68deb6b7c57d74fff4f8e533c44a3f0b297492440ef4ff5a28454" +dependencies = [ + "bitflags 1.3.2", + "lazy_static", + "winapi 0.3.9", + "winapi-build", ] [[package]] @@ -3770,11 +3938,25 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" dependencies = [ - "bitflags", + "bitflags 1.3.2", "jni-sys", - "ndk-sys", - "num_enum", - "raw-window-handle", + "ndk-sys 0.4.1+23.1.7779620", + "num_enum 0.5.11", + "raw-window-handle 0.5.2", + "thiserror", +] + +[[package]] +name = "ndk" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +dependencies = [ + "bitflags 2.6.0", + "jni-sys", + "log", + "ndk-sys 0.5.0+25.2.9519653", + "num_enum 0.7.3", "thiserror", ] @@ -3793,6 +3975,15 @@ dependencies = [ "jni-sys", ] +[[package]] +name = "ndk-sys" +version = "0.5.0+25.2.9519653" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" +dependencies = [ + "jni-sys", +] + [[package]] name = "netlink-packet-core" version = "0.5.0" @@ -3812,7 +4003,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea993e32c77d87f01236c38f572ecb6c311d592e56a06262a007fd2a6e31253c" dependencies = [ "anyhow", - "bitflags", + "bitflags 1.3.2", "byteorder", "libc", "netlink-packet-core", @@ -3833,9 +4024,9 @@ dependencies = [ [[package]] name = "netlink-sys" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6471bf08e7ac0135876a9581bf3217ef0333c191c128d34878079f42ee150411" +checksum = "416060d346fbaf1f23f9512963e3e878f1a78e707cb699ba9215761754244307" dependencies = [ "bytes", "libc", @@ -3848,7 +4039,7 @@ version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cc", "cfg-if 1.0.0", "libc", @@ -3857,27 +4048,39 @@ dependencies = [ [[package]] name = "nix" -version = "0.24.3" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "libc", - "memoffset 0.6.5", + "memoffset 0.7.1", ] [[package]] name = "nix" -version = "0.26.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags", + "bitflags 2.6.0", "cfg-if 1.0.0", + "cfg_aliases 0.1.1", + "libc", + "memoffset 0.9.1", +] + +[[package]] +name = "nix" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +dependencies = [ + "bitflags 2.6.0", + "cfg-if 1.0.0", + "cfg_aliases 0.2.1", "libc", - "memoffset 0.7.1", - "static_assertions", ] [[package]] @@ -3890,15 +4093,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "nom8" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8" -dependencies = [ - "memchr", -] - [[package]] name = "ntapi" version = "0.4.1" @@ -3910,53 +4104,67 @@ dependencies = [ [[package]] name = "nu-ansi-term" -version = "0.46.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +checksum = "c073d3c1930d0751774acf49e66653acecb416c3a54c6ec095a9b11caddb5a68" dependencies = [ - "overload", - "winapi 0.3.9", + "windows-sys 0.48.0", ] [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "autocfg 1.1.0", "num-integer", - "num-traits 0.2.15", + "num-traits 0.2.19", ] [[package]] name = "num-complex" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ - "num-traits 0.2.15", + "num-traits 0.2.19", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-derive" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", + "proc-macro2 1.0.86", + "quote 1.0.37", "syn 1.0.109", ] [[package]] -name = "num-integer" -version = "0.1.45" +name = "num-derive" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ - "autocfg 1.1.0", - "num-traits 0.2.15", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", +] + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits 0.2.19", ] [[package]] @@ -3965,20 +4173,9 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", "num-integer", - "num-traits 0.2.15", -] - -[[package]] -name = "num-rational" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ - "autocfg 1.1.0", - "num-integer", - "num-traits 0.2.15", + "num-traits 0.2.19", ] [[package]] @@ -3987,25 +4184,25 @@ version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" dependencies = [ - "num-traits 0.2.15", + "num-traits 0.2.19", ] [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", ] [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi 0.3.9", "libc", ] @@ -4015,7 +4212,16 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" dependencies = [ - "num_enum_derive", + "num_enum_derive 0.5.11", +] + +[[package]] +name = "num_enum" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" +dependencies = [ + "num_enum_derive 0.7.3", ] [[package]] @@ -4025,16 +4231,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ "proc-macro-crate 1.3.1", - "proc-macro2 1.0.63", - "quote 1.0.27", + "proc-macro2 1.0.86", + "quote 1.0.37", "syn 1.0.109", ] [[package]] -name = "num_threads" -version = "0.1.6" +name = "num_enum_derive" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" +dependencies = [ + "proc-macro-crate 2.0.2", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", +] + +[[package]] +name = "num_threads" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" dependencies = [ "libc", ] @@ -4060,6 +4278,131 @@ dependencies = [ "objc_id", ] +[[package]] +name = "objc-sys" +version = "0.2.0-beta.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7" + +[[package]] +name = "objc-sys" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" + +[[package]] +name = "objc2" +version = "0.3.0-beta.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a49f420f16c8814efdcd6b4258664de9d9920cbc26b6f95d034a1ca9850ccc2c" +dependencies = [ + "block2 0.2.0-alpha.6", + "objc-sys 0.2.0-beta.2", + "objc2-encode 2.0.0-pre.2", +] + +[[package]] +name = "objc2" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" +dependencies = [ + "objc-sys 0.3.5", + "objc2-encode 4.0.3", +] + +[[package]] +name = "objc2-app-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" +dependencies = [ + "bitflags 2.6.0", + "block2 0.5.1", + "libc", + "objc2 0.5.2", + "objc2-core-data", + "objc2-core-image", + "objc2-foundation", + "objc2-quartz-core", +] + +[[package]] +name = "objc2-core-data" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" +dependencies = [ + "bitflags 2.6.0", + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-image" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" +dependencies = [ + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-encode" +version = "2.0.0-pre.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512" +dependencies = [ + "objc-sys 0.2.0-beta.2", +] + +[[package]] +name = "objc2-encode" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" + +[[package]] +name = "objc2-foundation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" +dependencies = [ + "bitflags 2.6.0", + "block2 0.5.1", + "libc", + "objc2 0.5.2", +] + +[[package]] +name = "objc2-metal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" +dependencies = [ + "bitflags 2.6.0", + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" +dependencies = [ + "bitflags 2.6.0", + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation", + "objc2-metal", +] + [[package]] name = "objc_exception" version = "0.1.2" @@ -4080,47 +4423,67 @@ dependencies = [ [[package]] name = "object" -version = "0.30.3" +version = "0.36.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" dependencies = [ "memchr", ] [[package]] name = "oboe" -version = "0.5.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8868cc237ee02e2d9618539a23a8d228b9bb3fc2e7a5b11eed3831de77c395d0" +checksum = "e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb" dependencies = [ - "jni 0.20.0", - "ndk", + "jni 0.21.1", + "ndk 0.8.0", "ndk-context", - "num-derive", - "num-traits 0.2.15", + "num-derive 0.4.2", + "num-traits 0.2.19", "oboe-sys", ] [[package]] name = "oboe-sys" -version = "0.5.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f44155e7fb718d3cfddcf70690b2b51ac4412f347cd9e4fbe511abe9cd7b5f2" +checksum = "6c8bb09a4a2b1d668170cfe0a7d5bc103f8999fb316c98099b6a9939c9f2e79d" dependencies = [ "cc", ] [[package]] name = "once_cell" -version = "1.17.1" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] -name = "opaque-debug" -version = "0.3.0" +name = "openssl" +version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +dependencies = [ + "bitflags 2.6.0", + "cfg-if 1.0.0", + "foreign-types 0.3.2", + "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 1.0.86", + "quote 1.0.37", + "syn 2.0.76", +] [[package]] name = "openssl-probe" @@ -4128,6 +4491,18 @@ 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-ext" version = "0.2.0" @@ -4141,7 +4516,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a" dependencies = [ "dlv-list", - "hashbrown", + "hashbrown 0.12.3", ] [[package]] @@ -4167,10 +4542,25 @@ dependencies = [ ] [[package]] -name = "os_str_bytes" -version = "6.5.0" +name = "os_info" +version = "3.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" +checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092" +dependencies = [ + "log", + "serde 1.0.209", + "windows-sys 0.52.0", +] + +[[package]] +name = "os_pipe" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ffd2b0a5634335b135d5728d84c5e0fd726954b87111f7506a61c502280d982" +dependencies = [ + "libc", + "windows-sys 0.59.0", +] [[package]] name = "osascript" @@ -4178,21 +4568,25 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38731fa859ef679f1aec66ca9562165926b442f298467f76f5990f431efe87dc" dependencies = [ - "serde 1.0.163", + "serde 1.0.209", "serde_derive", - "serde_json 1.0.96", + "serde_json 1.0.127", ] [[package]] -name = "overload" -version = "0.1.1" +name = "page_size" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" +checksum = "1b7663cbd190cfd818d08efa8497f6cd383076688c49a391ef7c0d03cd12b561" +dependencies = [ + "libc", + "winapi 0.3.9", +] [[package]] name = "pam" version = "0.7.0" -source = "git+https://github.com/rustdesk-org/pam#10da2cbbabe32cbc9de22a66abe44738e7ec0ea0" +source = "git+https://github.com/rustdesk-org/pam#7bfd25510202cd269292cbdd7c71f3977a6fd762" dependencies = [ "libc", "pam-macros", @@ -4206,16 +4600,15 @@ version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c94f3b9b97df3c6d4e51a14916639b24e02c7d15d1dba686ce9b1118277cb811" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", + "proc-macro2 1.0.86", + "quote 1.0.37", "syn 1.0.109", ] [[package]] name = "pam-sys" version = "1.0.0-alpha4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e9dfd42858f6a6bb1081079fd9dc259ca3e2aaece6cb689fd36b1058046c969" +source = "git+https://github.com/rustdesk-org/pam-sys?branch=fix/v1.0.0-alpha4_gnuc_va_list#3337c9bb9a9c68d7497ec8c93cad2368c26091b7" dependencies = [ "bindgen 0.59.2", "libc", @@ -4223,13 +4616,12 @@ dependencies = [ [[package]] name = "pango" -version = "0.16.5" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdff66b271861037b89d028656184059e03b0b6ccb36003820be19f7200b1e94" +checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4" dependencies = [ - "bitflags", "gio", - "glib 0.16.7", + "glib 0.18.5", "libc", "once_cell", "pango-sys", @@ -4237,25 +4629,24 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.16.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e134909a9a293e04d2cc31928aa95679c5e4df954d0b85483159bd20d8f047f" +checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" dependencies = [ - "glib-sys 0.16.3", - "gobject-sys 0.16.3", + "glib-sys 0.18.1", + "gobject-sys 0.18.0", "libc", - "system-deps 6.1.0", + "system-deps 6.2.2", ] [[package]] name = "parity-tokio-ipc" -version = "0.7.3-2" -source = "git+https://github.com/open-trade/parity-tokio-ipc#a5b7861249107cbacc856cd43507cb95f40aef6e" +version = "0.7.3-4" +source = "git+https://github.com/rustdesk-org/parity-tokio-ipc#3623ec9ebef50c9b118e03b03df831008a4d1441" dependencies = [ "futures", "libc", "log", - "miow", "rand 0.8.5", "tokio", "winapi 0.3.9", @@ -4263,15 +4654,15 @@ dependencies = [ [[package]] name = "parking" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -4279,15 +4670,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.7" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.5.3", "smallvec", - "windows-sys 0.45.0", + "windows-targets 0.52.6", ] [[package]] @@ -4303,15 +4694,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.12" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" - -[[package]] -name = "pathdiff" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pbkdf2" @@ -4333,9 +4718,19 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "petgraph" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" +dependencies = [ + "fixedbitset", + "indexmap", +] [[package]] name = "phf" @@ -4377,29 +4772,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.0.12" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.12" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 1.0.109", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", ] [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -4408,36 +4803,46 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] -name = "pkg-config" -version = "0.3.27" +name = "piper" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" +dependencies = [ + "atomic-waker", + "fastrand 2.1.1", + "futures-io", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "plist" -version = "1.4.3" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bd9647b268a3d3e14ff09c23201133a62589c658db02bb7388c7246aafe0590" +checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" dependencies = [ - "base64", + "base64 0.22.1", "indexmap", - "line-wrap", - "quick-xml 0.28.2", - "serde 1.0.163", - "time 0.3.21", + "quick-xml 0.32.0", + "serde 1.0.209", + "time 0.3.36", ] [[package]] name = "png" -version = "0.17.8" +version = "0.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.7.1", + "miniz_oxide 0.7.4", ] [[package]] @@ -4446,8 +4851,8 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ - "autocfg 1.1.0", - "bitflags", + "autocfg 1.3.0", + "bitflags 1.3.2", "cfg-if 1.0.0", "concurrent-queue", "libc", @@ -4457,10 +4862,34 @@ dependencies = [ ] [[package]] -name = "ppv-lite86" -version = "0.2.17" +name = "polling" +version = "3.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" +dependencies = [ + "cfg-if 1.0.0", + "concurrent-queue", + "hermit-abi 0.4.0", + "pin-project-lite", + "rustix 0.38.34", + "tracing", + "windows-sys 0.59.0", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy 0.7.35", +] [[package]] name = "pretty-hex" @@ -4470,19 +4899,19 @@ checksum = "bc5c99d529f0d30937f6f4b8a86d988047327bb88d04d2c4afc356de74722131" [[package]] name = "prettyplease" -version = "0.2.4" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ceca8aaf45b5c46ec7ed39fff75f57290368c1846d33d24a122ca81416ab058" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ - "proc-macro2 1.0.63", - "syn 2.0.15", + "proc-macro2 1.0.86", + "syn 2.0.76", ] [[package]] name = "primal-check" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9df7f93fd637f083201473dab4fee2db4c429d32e55e3299980ab3957ab916a0" +checksum = "dc0d895b311e3af9902528fbb8f928688abbd95872819320517cc24ca6b2bd08" dependencies = [ "num-integer", ] @@ -4503,7 +4932,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit 0.19.8", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b00f26d3400549137f92511a46ac1cd8ce37cb5598a96d382381458b992a5d24" +dependencies = [ + "toml_datetime", + "toml_edit 0.20.2", ] [[package]] @@ -4513,8 +4952,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.63", - "quote 1.0.27", + "proc-macro2 1.0.86", + "quote 1.0.37", "syn 1.0.109", "version_check", ] @@ -4525,8 +4964,8 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", + "proc-macro2 1.0.86", + "quote 1.0.37", "version_check", ] @@ -4541,18 +4980,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.63" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] [[package]] name = "protobuf" -version = "3.2.0" +version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b55bad9126f378a853655831eb7363b7b01b81d19f8cb1218861086ca4a1a61e" +checksum = "0bcc343da15609eaecd65f8aa76df8dc4209d325131d8219358c0aaaebab0bf6" dependencies = [ "bytes", "once_cell", @@ -4562,9 +5001,9 @@ dependencies = [ [[package]] name = "protobuf-codegen" -version = "3.2.0" +version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd418ac3c91caa4032d37cb80ff0d44e2ebe637b2fb243b6234bf89cdac4901" +checksum = "c4d0cde5642ea4df842b13eb9f59ea6fafa26dcb43e3e1ee49120e9757556189" dependencies = [ "anyhow", "once_cell", @@ -4577,9 +5016,9 @@ dependencies = [ [[package]] name = "protobuf-parse" -version = "3.2.0" +version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d39b14605eaa1f6a340aec7f320b34064feb26c93aec35d6a9a2272a8ddfa49" +checksum = "1b0e9b447d099ae2c4993c0cbb03c7a9d6c937b17f2d56cfc0b1550e6fcfdb76" dependencies = [ "anyhow", "indexmap", @@ -4593,9 +5032,9 @@ dependencies = [ [[package]] name = "protobuf-support" -version = "3.2.0" +version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5d4d7b8601c814cfb36bcebb79f0e61e45e1e93640cf778837833bbed05c372" +checksum = "f0766e3675a627c327e4b3964582594b0e8741305d628a98a5de75a1d15f99b9" dependencies = [ "thiserror", ] @@ -4609,6 +5048,23 @@ dependencies = [ "bytemuck", ] +[[package]] +name = "qrcode-generator" +version = "4.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d06cb9646c7a14096231a2474d7f21e5e8c13de090c68d13bde6157cfe7f159" +dependencies = [ + "html-escape", + "image 0.24.9", + "qrcodegen", +] + +[[package]] +name = "qrcodegen" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4339fc7a1021c9c1621d87f5e3505f2805c8c105420ba2f2a4df86814590c142" + [[package]] name = "quest" version = "0.3.0" @@ -4624,70 +5080,29 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.23.1" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11bafc859c6815fbaffbbbf4229ecb767ac913fecb27f9ad4343662e9ef099ea" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" dependencies = [ "memchr", ] [[package]] name = "quick-xml" -version = "0.28.2" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" +checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" dependencies = [ "memchr", ] [[package]] -name = "quinn" -version = "0.9.3" +name = "quick-xml" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445cbfe2382fa023c4f2f3c7e1c95c03dcc1df2bf23cebcb2b13e1402c4394d1" +checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4" dependencies = [ - "bytes", - "pin-project-lite", - "quinn-proto", - "quinn-udp", - "rustc-hash", - "rustls 0.20.8", - "thiserror", - "tokio", - "tracing", - "webpki", -] - -[[package]] -name = "quinn-proto" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c10f662eee9c94ddd7135043e544f3c82fa839a1e7b865911331961b53186c" -dependencies = [ - "bytes", - "rand 0.8.5", - "ring", - "rustc-hash", - "rustls 0.20.8", - "rustls-native-certs", - "slab", - "thiserror", - "tinyvec", - "tracing", - "webpki", -] - -[[package]] -name = "quinn-udp" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "641538578b21f5e5c8ea733b736895576d0fe329bb883b937db6f4d163dbaaf4" -dependencies = [ - "libc", - "quinn-proto", - "socket2 0.4.9", - "tracing", - "windows-sys 0.42.0", + "memchr", ] [[package]] @@ -4701,11 +5116,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.27" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ - "proc-macro2 1.0.63", + "proc-macro2 1.0.86", ] [[package]] @@ -4857,10 +5272,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" [[package]] -name = "rayon" -version = "1.7.0" +name = "raw-window-handle" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" + +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -4868,25 +5289,23 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] name = "rdev" version = "0.5.0-2" -source = "git+https://github.com/rustdesk-org/rdev#2e8221d653f4995c831ad52966e79a514516b1fa" +source = "git+https://github.com/rustdesk-org/rdev#b3434caee84c92412b45a2f655a15ac5dad33488" dependencies = [ - "cocoa", - "core-foundation", - "core-foundation-sys 0.8.4", - "core-graphics", + "cocoa 0.24.1", + "core-foundation 0.9.4", + "core-foundation-sys 0.8.7", + "core-graphics 0.22.3", "dispatch", "enum-map", "epoll", @@ -4894,7 +5313,7 @@ dependencies = [ "lazy_static", "libc", "log", - "mio", + "mio 0.8.11", "strum 0.24.1", "strum_macros 0.24.3", "widestring", @@ -4913,47 +5332,59 @@ dependencies = [ [[package]] name = "realfft" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93d6b8e8f0c6d2234aa58048d7290c60bf92cd36fd2888cd8331c66ad4f2e1d2" +checksum = "953d9f7e5cdd80963547b456251296efc2626ed4e3cbf36c869d9564e0220571" dependencies = [ "rustfft", ] [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "bitflags", + "bitflags 2.6.0", ] [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", - "redox_syscall 0.2.16", + "libredox", "thiserror", ] [[package]] name = "regex" -version = "1.8.1" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" +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", @@ -4962,9 +5393,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.1" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "repng" @@ -4978,10 +5409,11 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.18" -source = "git+https://github.com/rustdesk-org/reqwest#4cc834539d9c44f7b6bbc5d2f8805842dc5aa328" +version = "0.11.23" +source = "git+https://github.com/rustdesk-org/reqwest#9cb758c9fb2f4edc62eb790acfd45a6a3da21ed3" dependencies = [ - "base64", + "async-compression", + "base64 0.21.7", "bytes", "encoding_rs", "futures-core", @@ -4991,42 +5423,50 @@ dependencies = [ "http-body", "hyper", "hyper-rustls", + "hyper-tls", "ipnet", "js-sys", "log", "mime", + "native-tls", "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.2", - "rustls-pemfile", - "serde 1.0.163", - "serde_json 1.0.96", + "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_urlencoded", + "sync_wrapper", + "system-configuration", "tokio", - "tokio-rustls", + "tokio-native-tls", + "tokio-rustls 0.24.1", + "tokio-socks 0.5.2", + "tokio-util", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots", + "webpki-roots 0.25.4", "winreg 0.50.0", ] [[package]] name = "ring" -version = "0.16.20" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", + "cfg-if 1.0.0", + "getrandom", "libc", - "once_cell", - "spin 0.5.2", + "spin", "untrusted", - "web-sys", - "winapi 0.3.9", + "windows-sys 0.52.0", ] [[package]] @@ -5051,23 +5491,23 @@ dependencies = [ [[package]] name = "rpassword" -version = "7.2.0" +version = "7.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322" +checksum = "80472be3c897911d0137b2d2b9055faf6eeac5b14e324073d83bc17b191d7e3f" dependencies = [ "libc", "rtoolbox", - "winapi 0.3.9", + "windows-sys 0.48.0", ] [[package]] name = "rtoolbox" -version = "0.0.1" +version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a" +checksum = "c247d24e63230cdb56463ae328478bd5eac8b8faa8c69461a77e8e323afac90e" dependencies = [ "libc", - "winapi 0.3.9", + "windows-sys 0.48.0", ] [[package]] @@ -5078,18 +5518,20 @@ checksum = "cd70209c27d5b08f5528bdc779ea3ffb418954e28987f9f9775c6eac41003f9c" dependencies = [ "num-complex", "num-integer", - "num-traits 0.2.15", + "num-traits 0.2.19", "realfft", ] [[package]] name = "runas" -version = "1.0.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed87390fefd18965ff20baae5aeb9913bcf82d2b59dc04c0f6d8f17f7be56ff2" +checksum = "b96d6b6c505282b007a9b009f2aa38b2fd0359b81a0430ceacc60f69ade4c6a0" dependencies = [ - "cc", + "libc", + "security-framework-sys", "which", + "windows-sys 0.48.0", ] [[package]] @@ -5112,9 +5554,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -5133,27 +5575,27 @@ dependencies = [ [[package]] name = "rustdesk" -version = "1.2.3" +version = "1.3.0" dependencies = [ + "android-wakelock", "android_logger", "arboard", "async-process", "async-trait", - "base64", "bytes", "cc", "cfg-if 1.0.0", "chrono", "cidr-utils", - "clap 4.2.7", + "clap 4.5.16", "clipboard", - "cocoa", - "core-foundation", - "core-graphics", + "clipboard-master", + "cocoa 0.24.1", + "core-foundation 0.9.4", + "core-graphics 0.22.3", "cpal", "crossbeam-queue", "ctrlc", - "dark-light", "dasp", "dbus", "dbus-crossroads", @@ -5163,44 +5605,45 @@ dependencies = [ "errno", "evdev", "flutter_rust_bridge", - "flutter_rust_bridge_codegen", "fon", "fruitbasket", "hbb_common", "hex", "hound", - "image", + "image 0.24.9", "impersonate_system", "include_dir", "jni 0.21.1", "keepawake", "lazy_static", - "libloading 0.8.0", + "libloading 0.8.5", "libpulse-binding", "libpulse-simple-binding", "mac_address", "magnum-opus", - "mouce", "num_cpus", "objc", "objc_id", + "once_cell", "os-version", "pam", "parity-tokio-ipc", + "percent-encoding", + "qrcode-generator", "rdev", "repng", "reqwest", "ringbuf", - "rpassword 7.2.0", + "rpassword 7.3.1", "rubato", "runas", "rust-pulsectl", "samplerate", "sciter-rs", "scrap", - "serde 1.0.163", + "serde 1.0.209", "serde_derive", - "serde_json 1.0.96", + "serde_json 1.0.127", "serde_repr", "sha2", "shared_memory", @@ -5209,40 +5652,45 @@ dependencies = [ "system_shutdown", "tao", "tauri-winrt-notification", + "totp-rs", "tray-icon", "url", "users 0.11.0", "uuid", "virtual_display", + "wallpaper", "whoami", "winapi 0.3.9", "windows-service", "winreg 0.11.0", "winres", "wol-rs", + "x11-clipboard 0.8.1", + "x11rb 0.12.0", "zip", ] [[package]] name = "rustdesk-portable-packer" -version = "0.1.0" +version = "1.3.0" dependencies = [ "brotli", "dirs 5.0.1", - "embed-resource", "md5", + "native-windows-gui", "winapi 0.3.9", + "winres", ] [[package]] name = "rustfft" -version = "6.1.0" +version = "6.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17d4f6cbdb180c9f4b2a26bbf01c4e647f1e1dea22fe8eb9db54198b32f9434" +checksum = "43806561bc506d0c5d160643ad742e3161049ac01027b5e6d7524091fd401d86" dependencies = [ "num-complex", "num-integer", - "num-traits 0.2.15", + "num-traits 0.2.19", "primal-check", "strength_reduce", "transpose", @@ -5251,89 +5699,167 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.19" +version = "0.37.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", - "linux-raw-sys", + "linux-raw-sys 0.3.8", "windows-sys 0.48.0", ] [[package]] -name = "rustls" -version = "0.20.8" +name = "rustix" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "ring", - "sct", - "webpki", + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys 0.4.14", + "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.21.2" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e32ca28af694bc1bbf399c33a516dbdf1c90090b8ab23c2bc24f834aa2247f5f" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", "ring", - "rustls-webpki", + "rustls-webpki 0.101.7", "sct", ] +[[package]] +name = "rustls" +version = "0.23.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +dependencies = [ + "log", + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki 0.102.6", + "subtle", + "zeroize", +] + [[package]] name = "rustls-native-certs" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", - "rustls-pemfile", + "rustls-pemfile 1.0.4", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-native-certs" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04182dffc9091a404e0fc069ea5cd60e5b866c3adf881eff99a32d048242dffa" +dependencies = [ + "openssl-probe", + "rustls-pemfile 2.1.3", + "rustls-pki-types", "schannel", "security-framework", ] [[package]] name = "rustls-pemfile" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64", + "base64 0.21.7", ] [[package]] -name = "rustls-webpki" -version = "0.100.1" +name = "rustls-pemfile" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +dependencies = [ + "base64 0.22.1", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" + +[[package]] +name = "rustls-platform-verifier" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afbb878bdfdf63a336a5e63561b1835e7a8c91524f51621db870169eac84b490" +dependencies = [ + "core-foundation 0.9.4", + "core-foundation-sys 0.8.7", + "jni 0.19.0", + "log", + "once_cell", + "rustls 0.23.12", + "rustls-native-certs 0.7.2", + "rustls-platform-verifier-android", + "rustls-webpki 0.102.6", + "security-framework", + "security-framework-sys", + "webpki-roots 0.26.3", + "winapi 0.3.9", +] + +[[package]] +name = "rustls-platform-verifier-android" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ "ring", "untrusted", ] [[package]] -name = "rustversion" -version = "1.0.12" +name = "rustls-webpki" +version = "0.102.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" - -[[package]] -name = "safemem" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -5355,17 +5881,17 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys 0.42.0", + "windows-sys 0.52.0", ] [[package]] name = "sciter-rs" version = "0.5.57" -source = "git+https://github.com/open-trade/rust-sciter?branch=dyn#fab913b7c2e779b05c249b0c5de5a08759b2c15d" +source = "git+https://github.com/open-trade/rust-sciter?branch=dyn#5322f3a755a0e6bf999fbc60d1efc35246c0f821" dependencies = [ "lazy_static", "libc", @@ -5374,10 +5900,16 @@ dependencies = [ ] [[package]] -name = "scopeguard" -version = "1.1.0" +name = "scoped-tls" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scrap" @@ -5397,30 +5929,25 @@ dependencies = [ "jni 0.21.1", "lazy_static", "log", - "ndk", + "ndk 0.7.0", + "ndk-context", "num_cpus", "pkg-config", "quest", "repng", - "serde 1.0.163", - "serde_json 1.0.96", + "serde 1.0.209", + "serde_json 1.0.127", "target_build_utils", "tracing", "webm", "winapi 0.3.9", ] -[[package]] -name = "scratch" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" - [[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ "ring", "untrusted", @@ -5428,35 +5955,33 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.8.2" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys 0.8.4", + "bitflags 2.6.0", + "core-foundation 0.9.4", + "core-foundation-sys 0.8.7", "libc", + "num-bigint", "security-framework-sys", ] [[package]] name = "security-framework-sys" -version = "2.8.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ - "core-foundation-sys 0.8.4", + "core-foundation-sys 0.8.7", "libc", ] [[package]] name = "semver" -version = "1.0.17" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" -dependencies = [ - "serde 1.0.163", -] +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" @@ -5466,22 +5991,22 @@ checksum = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af" [[package]] name = "serde" -version = "1.0.163" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.163" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", ] [[package]] @@ -5498,33 +6023,34 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" dependencies = [ - "itoa 1.0.6", + "itoa 1.0.11", + "memchr", "ryu", - "serde 1.0.163", + "serde 1.0.209", ] [[package]] name = "serde_repr" -version = "0.1.12" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", ] [[package]] name = "serde_spanned" -version = "0.6.1" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ - "serde 1.0.163", + "serde 1.0.209", ] [[package]] @@ -5534,28 +6060,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.6", + "itoa 1.0.11", "ryu", - "serde 1.0.163", -] - -[[package]] -name = "serde_yaml" -version = "0.8.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" -dependencies = [ - "indexmap", - "ryu", - "serde 1.0.163", - "yaml-rust", + "serde 1.0.209", ] [[package]] name = "sha1" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if 1.0.0", "cpufeatures", @@ -5564,9 +6078,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if 1.0.0", "cpufeatures", @@ -5582,8 +6096,8 @@ dependencies = [ "const_format", "git2", "is_debug", - "time 0.3.21", - "tzdb", + "time 0.3.36", + "tzdb 0.5.10", ] [[package]] @@ -5601,9 +6115,9 @@ dependencies = [ [[package]] name = "shlex" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "shutdown_hooks" @@ -5611,21 +6125,11 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6057adedbec913419c92996f395ba69931acbd50b7d56955394cd3f7bedbfa45" -[[package]] -name = "signal-hook" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" -dependencies = [ - "libc", - "signal-hook-registry", -] - [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -5638,9 +6142,9 @@ checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" [[package]] name = "simd-adler32" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "siphasher" @@ -5650,18 +6154,18 @@ checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", ] [[package]] name = "smallvec" -version = "1.10.0" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" @@ -5676,14 +6180,24 @@ dependencies = [ [[package]] name = "socket2" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ "libc", "winapi 0.3.9", ] +[[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 = "sodiumoxide" version = "0.2.7" @@ -5693,15 +6207,9 @@ dependencies = [ "ed25519", "libc", "libsodium-sys", - "serde 1.0.163", + "serde 1.0.209", ] -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - [[package]] name = "spin" version = "0.9.8" @@ -5717,12 +6225,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "str-buf" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" - [[package]] name = "strength_reduce" version = "0.2.4" @@ -5741,6 +6243,12 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + [[package]] name = "strum" version = "0.18.0" @@ -5760,8 +6268,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c" dependencies = [ "heck 0.3.3", - "proc-macro2 1.0.63", - "quote 1.0.27", + "proc-macro2 1.0.86", + "quote 1.0.37", "syn 1.0.109", ] @@ -5772,17 +6280,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.63", - "quote 1.0.27", + "proc-macro2 1.0.86", + "quote 1.0.37", "rustversion", "syn 1.0.109", ] [[package]] name = "subtle" -version = "2.4.1" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" @@ -5801,55 +6309,59 @@ version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", + "proc-macro2 1.0.86", + "quote 1.0.37", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.15" +version = "2.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", + "proc-macro2 1.0.86", + "quote 1.0.37", "unicode-ident", ] [[package]] -name = "sys-locale" -version = "0.3.0" +name = "sync_wrapper" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0b9eefabb91675082b41eb94c3ecd91af7656caee3fb4961a07c0ec8c7ca6f" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "sys-locale" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0" dependencies = [ "libc", - "windows-sys 0.45.0", ] [[package]] name = "sysinfo" -version = "0.29.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7cb97a5a85a136d84e75d5c3cf89655090602efb1be0d8d5337b7e386af2908" +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.4", + "core-foundation-sys 0.8.7", "libc", "ntapi", "once_cell", "rayon", - "winapi 0.3.9", + "windows 0.51.1", ] [[package]] name = "system-configuration" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75182f12f490e953596550b65ee31bda7c8e043d9386174b353bda50838c3fd" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ - "bitflags", - "core-foundation", + "bitflags 1.3.2", + "core-foundation 0.9.4", "system-configuration-sys", ] @@ -5859,7 +6371,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" dependencies = [ - "core-foundation-sys 0.8.4", + "core-foundation-sys 0.8.7", "libc", ] @@ -5880,15 +6392,15 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.1.0" +version = "6.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5fa6fb9ee296c0dc2df41a656ca7948546d061958115ddb0bcaae43ad0d17d2" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" dependencies = [ "cfg-expr", - "heck 0.4.1", + "heck 0.5.0", "pkg-config", - "toml 0.7.3", - "version-compare 0.1.1", + "toml 0.8.2", + "version-compare 0.2.0", ] [[package]] @@ -5903,47 +6415,40 @@ dependencies = [ [[package]] name = "tao" -version = "0.22.2" -source = "git+https://github.com/rustdesk-org/tao?branch=dev#1e5b97258cf42a30f80f85a6aa0b1a4aece1977e" +version = "0.25.0" +source = "git+https://github.com/rustdesk-org/tao?branch=dev#288c219cb0527e509590c2b2d8e7072aa9feb2d3" dependencies = [ - "bitflags", - "cairo-rs", + "bitflags 1.3.2", "cc", - "cocoa", - "core-foundation", - "core-graphics", + "cocoa 0.25.0", + "core-foundation 0.9.4", + "core-graphics 0.23.2", "crossbeam-channel", "dispatch", - "gdk", - "gdk-pixbuf", - "gdk-sys", "gdkwayland-sys", "gdkx11-sys", - "gio", - "glib 0.16.7", - "glib-sys 0.16.3", "gtk", - "image", + "image 0.24.9", "instant", "jni 0.21.1", "lazy_static", "libc", "log", - "ndk", + "ndk 0.7.0", "ndk-context", - "ndk-sys", + "ndk-sys 0.4.1+23.1.7779620", "objc", "once_cell", "parking_lot", "png", - "raw-window-handle", + "raw-window-handle 0.6.2", "scopeguard", "tao-macros", "unicode-segmentation", "url", - "uuid", - "windows 0.48.0", + "windows 0.52.0", "windows-implement", + "windows-version", "x11-dl", "zbus", ] @@ -5951,10 +6456,10 @@ dependencies = [ [[package]] name = "tao-macros" version = "0.1.2" -source = "git+https://github.com/rustdesk-org/tao?branch=dev#1e5b97258cf42a30f80f85a6aa0b1a4aece1977e" +source = "git+https://github.com/rustdesk-org/tao?branch=dev#288c219cb0527e509590c2b2d8e7072aa9feb2d3" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", + "proc-macro2 1.0.86", + "quote 1.0.37", "syn 1.0.109", ] @@ -5966,9 +6471,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "target-lexicon" -version = "0.12.7" +version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "target_build_utils" @@ -5983,32 +6488,32 @@ dependencies = [ [[package]] name = "tauri-winrt-notification" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f5bff1d532fead7c43324a0fa33643b8621a47ce2944a633be4cb6c0240898f" +checksum = "006851c9ccefa3c38a7646b8cec804bb429def3da10497bfa977179869c3e8e2" dependencies = [ - "quick-xml 0.23.1", - "windows 0.39.0", + "quick-xml 0.30.0", + "windows 0.51.1", ] [[package]] name = "tempfile" -version = "3.5.0" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if 1.0.0", - "fastrand", - "redox_syscall 0.3.5", - "rustix", - "windows-sys 0.45.0", + "fastrand 2.1.1", + "once_cell", + "rustix 0.38.34", + "windows-sys 0.59.0", ] [[package]] name = "termcolor" -version = "1.2.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] @@ -6031,19 +6536,13 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - [[package]] name = "tfc" -version = "0.6.1" -source = "git+https://github.com/rustdesk-org/The-Fat-Controller#9dd86151525fd010dc93f6bc9b6aedd1a75cc342" +version = "0.7.0" +source = "git+https://github.com/rustdesk-org/The-Fat-Controller?branch=history/rebase_upstream_20240722#87a6450f17659edba0cad669d9b57e8775479917" dependencies = [ "anyhow", - "core-graphics", + "core-graphics 0.23.2", "unicode-segmentation", "winapi 0.3.9", "x11 2.19.0", @@ -6051,22 +6550,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", ] [[package]] @@ -6080,9 +6579,9 @@ dependencies = [ [[package]] name = "tiff" -version = "0.8.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7449334f9ff2baf290d55d73983a7d6fa15e01198faef72af07e2a8db851e471" +checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" dependencies = [ "flate2", "jpeg-decoder", @@ -6102,38 +6601,42 @@ dependencies = [ [[package]] name = "time" -version = "0.3.21" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ - "itoa 1.0.6", + "deranged", + "itoa 1.0.11", "libc", + "num-conv", "num_threads", - "serde 1.0.163", + "powerfmt", + "serde 1.0.209", "time-core", "time-macros", ] [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.9" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -6146,32 +6649,41 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.28.1" +version = "1.39.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" +checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" dependencies = [ - "autocfg 1.1.0", + "backtrace", "bytes", "libc", - "mio", - "num_cpus", + "mio 1.0.2", "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.4.9", + "socket2 0.5.7", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", +] + +[[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]] @@ -6180,14 +6692,25 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.2", + "rustls 0.21.12", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls 0.23.12", + "rustls-pki-types", "tokio", ] [[package]] name = "tokio-socks" -version = "0.5.1-2" -source = "git+https://github.com/open-trade/tokio-socks#14a5c2564fa20a2765ea53d03c573ee2b7e20421" +version = "0.5.2-1" +source = "git+https://github.com/rustdesk-org/tokio-socks#94e97c6d7c93b0bcbfa54f2dc397c1da0a6e43d3" dependencies = [ "bytes", "either", @@ -6201,21 +6724,32 @@ dependencies = [ ] [[package]] -name = "tokio-util" -version = "0.7.8" +name = "tokio-socks" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f" +dependencies = [ + "either", + "futures-util", + "thiserror", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-io", "futures-sink", "futures-util", - "hashbrown", + "hashbrown 0.14.5", "pin-project-lite", "slab", "tokio", - "tracing", ] [[package]] @@ -6224,96 +6758,96 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ - "serde 1.0.163", + "serde 1.0.209", ] [[package]] name = "toml" -version = "0.6.0" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb9d890e4dc9298b70f740f615f2e05b9db37dce531f6b24fb77ac993f9f217" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ - "serde 1.0.163", + "serde 1.0.209", "serde_spanned", - "toml_datetime 0.5.1", - "toml_edit 0.18.1", + "toml_datetime", + "toml_edit 0.19.15", ] [[package]] name = "toml" -version = "0.7.3" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" +checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" dependencies = [ - "serde 1.0.163", + "serde 1.0.209", "serde_spanned", - "toml_datetime 0.6.1", - "toml_edit 0.19.8", + "toml_datetime", + "toml_edit 0.20.2", ] [[package]] name = "toml_datetime" -version = "0.5.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" dependencies = [ - "serde 1.0.163", -] - -[[package]] -name = "toml_datetime" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" -dependencies = [ - "serde 1.0.163", + "serde 1.0.209", ] [[package]] name = "toml_edit" -version = "0.18.1" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c59d8dd7d0dcbc6428bf7aa2f0e823e26e43b3c9aca15bbc9475d23e5fa12b" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ "indexmap", - "nom8", - "serde 1.0.163", + "serde 1.0.209", "serde_spanned", - "toml_datetime 0.5.1", -] - -[[package]] -name = "toml_edit" -version = "0.19.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" -dependencies = [ - "indexmap", - "serde 1.0.163", - "serde_spanned", - "toml_datetime 0.6.1", + "toml_datetime", "winnow", ] [[package]] -name = "topological-sort" -version = "0.2.2" +name = "toml_edit" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea68304e134ecd095ac6c3574494fc62b909f416c4fca77e440530221e549d3d" +checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" +dependencies = [ + "indexmap", + "serde 1.0.209", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "totp-rs" +version = "5.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17b2f27dad992486c26b4e7455f38aa487e838d6d61b57e72906ee2b8c287a90" +dependencies = [ + "base32", + "constant_time_eq 0.2.6", + "hmac", + "rand 0.8.5", + "sha1", + "sha2", + "url", + "urlencoding", +] [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if 1.0.0", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -6321,29 +6855,29 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.24" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", ] [[package]] name = "tracing-core" -version = "0.1.30" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", ] [[package]] name = "transpose" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6522d49d03727ffb138ae4cbc1283d3774f0d10aa7f9bf52e6784c45daf9b23" +checksum = "1ad61aed86bc3faea4300c7aee358b4c6d0c8d6ccc36524c96e4c92ccf26e77e" dependencies = [ "num-integer", "strength_reduce", @@ -6351,33 +6885,48 @@ dependencies = [ [[package]] name = "tray-icon" -version = "0.5.1" -source = "git+https://github.com/rustdesk-org/tray-icon#ef98e7b98abed2e3da614277eced12a85bfb717c" +version = "0.15.1" +source = "git+https://github.com/tauri-apps/tray-icon#759f6a74fdcbcd979d3d39a2c9c2bc6a54e5e739" dependencies = [ - "cocoa", - "core-graphics", + "core-graphics 0.24.0", "crossbeam-channel", - "dirs-next", + "dirs 5.0.1", "libappindicator", "muda", - "objc", + "objc2 0.5.2", + "objc2-app-kit", + "objc2-foundation", "once_cell", "png", "thiserror", - "windows-sys 0.48.0", + "windows-sys 0.59.0", +] + +[[package]] +name = "tree_magic_mini" +version = "3.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469a727cac55b41448315cc10427c069c618ac59bb6a4480283fcd811749bdc2" +dependencies = [ + "fnv", + "home", + "memchr", + "nom", + "once_cell", + "petgraph", ] [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "tz-rs" @@ -6390,20 +6939,42 @@ dependencies = [ [[package]] name = "tzdb" -version = "0.5.7" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec758958f2fb5069cd7fae385be95cc8eceb8cdfd270c7d14de6034f0108d99e" +checksum = "6a18ee5bde3433d683d41859650804a5ad89cad17f153a53f1e6a96e0da2d969" dependencies = [ "iana-time-zone", "tz-rs", + "tzdb 0.6.1", +] + +[[package]] +name = "tzdb" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b580f6b365fa89f5767cdb619a55d534d04a4e14c2d7e5b9a31e94598687fb1" +dependencies = [ + "iana-time-zone", + "tz-rs", + "tzdb_data", +] + +[[package]] +name = "tzdb_data" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1889fdffac09d65c1d95c42d5202e9b21ad8c758f426e9fe09088817ea998d6" +dependencies = [ + "tz-rs", ] [[package]] name = "uds_windows" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ + "memoffset 0.9.1", "tempfile", "winapi 0.3.9", ] @@ -6419,36 +6990,36 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unicode-xid" @@ -6458,28 +7029,34 @@ checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" [[package]] name = "unicode-xid" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" [[package]] name = "untrusted" -version = "0.7.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.3.1" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", "percent-encoding", - "serde 1.0.163", + "serde 1.0.209", ] +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + [[package]] name = "users" version = "0.10.0" @@ -6501,16 +7078,31 @@ dependencies = [ ] [[package]] -name = "utf8parse" -version = "0.2.1" +name = "utf16string" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "0b62a1e85e12d5d712bf47a85f426b73d303e2d00a90de5f3004df3596e9d216" +dependencies = [ + "byteorder", +] + +[[package]] +name = "utf8-width" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.3.2" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dad5567ad0cf5b760e5665964bec1b47dfd077ba8a2544b513f3556d3d239a2" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "getrandom", ] @@ -6535,15 +7127,15 @@ checksum = "d63556a25bae6ea31b52e640d7c41d1ab27faba4ccb600013837a3d0b3994ca1" [[package]] name = "version-compare" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "virtual_display" @@ -6553,49 +7145,41 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "vswhom" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" -dependencies = [ - "libc", - "vswhom-sys", -] - -[[package]] -name = "vswhom-sys" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3b17ae1f6c8a2b28506cd96d412eebf83b4a0ff2cbefeeb952f2f9dfa44ba18" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "waker-fn" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", ] [[package]] +name = "wallpaper" +version = "3.2.0" +source = "git+https://github.com/rustdesk-org/wallpaper.rs#ce4a0cd3f58327c7cc44d15a63706fb0c022bacf" +dependencies = [ + "dirs 5.0.1", + "enquote", + "rust-ini", + "thiserror", + "winapi 0.3.9", + "winreg 0.11.0", +] + +[[package]] name = "want" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" dependencies = [ - "log", "try-lock", ] @@ -6612,35 +7196,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] -name = "wasm-bindgen" -version = "0.2.85" +name = "wasite" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b6cb788c4e39112fbe1822277ef6fb3c55cd86b95cb3d3c4c1c9597e4ac74b4" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + +[[package]] +name = "wasm-bindgen" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if 1.0.0", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.85" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e522ed4105a9d626d885b35d62501b30d9666283a5c8be12c14a8bdafe7822" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.35" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "083abe15c5d88556b77bdf7aef403625be9e327ad37c62c4e4129af740168163" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -6650,38 +7241,111 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.85" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "358a79a0cb89d21db8120cbfb91392335913e4890665b1a7981d9e956903b434" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ - "quote 1.0.27", + "quote 1.0.37", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.85" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4783ce29f09b9d93134d41297aded3a712b7b979e9c6f28c32cb88c973a94869" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.85" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a901d592cafaa4d711bc324edfaff879ac700b19c3dfd60058d2b445be2691eb" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" + +[[package]] +name = "wayland-backend" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f90e11ce2ca99c97b940ee83edbae9da2d56a08f9ea8158550fd77fa31722993" +dependencies = [ + "cc", + "downcast-rs", + "rustix 0.38.34", + "scoped-tls", + "smallvec", + "wayland-sys", +] + +[[package]] +name = "wayland-client" +version = "0.31.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e321577a0a165911bdcfb39cf029302479d7527b517ee58ab0f6ad09edf0943" +dependencies = [ + "bitflags 2.6.0", + "rustix 0.38.34", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols" +version = "0.32.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62989625a776e827cc0f15d41444a3cea5205b963c3a25be48ae1b52d6b4daaa" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd993de54a40a40fbe5601d9f1fbcaef0aebcc5fda447d7dc8f6dcbaae4f8953" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7b56f89937f1cf2ee1f1259cf2936a17a1f45d8f0aa1019fae6d470d304cfa6" +dependencies = [ + "proc-macro2 1.0.86", + "quick-xml 0.34.0", + "quote 1.0.37", +] + +[[package]] +name = "wayland-sys" +version = "0.31.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43676fe2daf68754ecf1d72026e4e6c15483198b5d24e888b74d3f22f887a148" +dependencies = [ + "dlib", + "log", + "pkg-config", +] [[package]] name = "web-sys" -version = "0.3.62" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b5f940c7edfdc6d12126d98c9ef4d1b3d470011c47c76a6581df47ad9ba721" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", @@ -6689,73 +7353,69 @@ dependencies = [ [[package]] name = "webm" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecb047148a12ef1fd8ab26302bca7e82036f005c3073b48e17cc1b44ec577136" +version = "1.1.0" +source = "git+https://github.com/rustdesk-org/rust-webm#d2c4d3ac133c7b0e4c0f656da710b48391981e64" dependencies = [ "webm-sys", ] [[package]] name = "webm-sys" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ded6ec82ccf51fe265b0b2b1579cac839574ed910c17baac58e807f8a9de7f3" +version = "1.0.4" +source = "git+https://github.com/rustdesk-org/rust-webm#d2c4d3ac133c7b0e4c0f656da710b48391981e64" dependencies = [ "cc", ] [[package]] -name = "webpki" -version = "0.22.0" +name = "webpki-roots" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "webpki-roots" -version = "0.23.1" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" dependencies = [ - "rustls-webpki", + "rustls-pki-types", ] [[package]] name = "weezl" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "which" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" dependencies = [ "either", - "libc", + "home", "once_cell", + "rustix 0.38.34", ] [[package]] name = "whoami" -version = "1.4.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c70234412ca409cc04e864e89523cb0fc37f5e1344ebed5a3ebf4192b6b9f68" +checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" dependencies = [ - "wasm-bindgen", + "redox_syscall 0.4.1", + "wasite", "web-sys", ] [[package]] name = "widestring" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" [[package]] name = "win-sys" @@ -6796,18 +7456,18 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "winapi 0.3.9", + "windows-sys 0.59.0", ] [[package]] name = "winapi-wsapoll" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" +checksum = "1eafc5f679c576995526e81635d0cf9695841736712b4e892f87abbe6fed3f28" dependencies = [ "winapi 0.3.9", ] @@ -6844,19 +7504,6 @@ dependencies = [ "windows_x86_64_msvc 0.34.0", ] -[[package]] -name = "windows" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a" -dependencies = [ - "windows_aarch64_msvc 0.39.0", - "windows_i686_gnu 0.39.0", - "windows_i686_msvc 0.39.0", - "windows_x86_64_gnu 0.39.0", - "windows_x86_64_msvc 0.39.0", -] - [[package]] name = "windows" version = "0.44.0" @@ -6866,46 +7513,104 @@ dependencies = [ "windows-targets 0.42.2", ] -[[package]] -name = "windows" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25" -dependencies = [ - "windows-targets 0.42.2", -] - [[package]] name = "windows" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +dependencies = [ + "windows-core 0.51.1", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core 0.52.0", "windows-implement", "windows-interface", - "windows-targets 0.48.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" +dependencies = [ + "windows-core 0.54.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +dependencies = [ + "windows-targets 0.48.5", +] + +[[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-core" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", ] [[package]] name = "windows-implement" -version = "0.48.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c" +checksum = "12168c33176773b86799be25e2a2ba07c7aab9968b37541f1094dbd7a60c8946" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 1.0.109", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", ] [[package]] name = "windows-interface" -version = "0.48.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7" +checksum = "9d8dc32e0095a7eeccebd0e3f09e9509365ecb3fc6ac4d6f5f14a3f6392942d1" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 1.0.109", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", +] + +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -6914,26 +7619,11 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd9db37ecb5b13762d95468a2fc6009d4b2c62801243223aabd44fca13ad13c8" dependencies = [ - "bitflags", + "bitflags 1.3.2", "widestring", "windows-sys 0.45.0", ] -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - [[package]] name = "windows-sys" version = "0.45.0" @@ -6949,7 +7639,25 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.0", + "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]] @@ -6969,17 +7677,51 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "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-version" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-win" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58e23e33622b3b52f948049acbec9bcc34bf6e26d74176b88941f213c75cf2dc" +dependencies = [ + "error-code", ] [[package]] @@ -6990,9 +7732,15 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +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" @@ -7006,12 +7754,6 @@ version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" -[[package]] -name = "windows_aarch64_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2" - [[package]] name = "windows_aarch64_msvc" version = "0.42.2" @@ -7020,9 +7762,15 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +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" @@ -7036,12 +7784,6 @@ version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" -[[package]] -name = "windows_i686_gnu" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b" - [[package]] name = "windows_i686_gnu" version = "0.42.2" @@ -7050,9 +7792,21 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +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" @@ -7066,12 +7820,6 @@ version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" -[[package]] -name = "windows_i686_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106" - [[package]] name = "windows_i686_msvc" version = "0.42.2" @@ -7080,9 +7828,15 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +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" @@ -7096,12 +7850,6 @@ version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" -[[package]] -name = "windows_x86_64_gnu" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65" - [[package]] name = "windows_x86_64_gnu" version = "0.42.2" @@ -7110,9 +7858,15 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +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" @@ -7122,9 +7876,15 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +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" @@ -7138,12 +7898,6 @@ version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" -[[package]] -name = "windows_x86_64_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809" - [[package]] name = "windows_x86_64_msvc" version = "0.42.2" @@ -7152,28 +7906,25 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +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.4.6" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" dependencies = [ "memchr", ] -[[package]] -name = "winreg" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ - "winapi 0.3.9", -] - [[package]] name = "winreg" version = "0.11.0" @@ -7204,10 +7955,29 @@ dependencies = [ ] [[package]] -name = "wol-rs" -version = "1.0.0" +name = "wl-clipboard-rs" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48dc5e486e34a31515518d370cdd8bf59ec696323fe8f92b858e43942e84a765" +checksum = "4de22eebb1d1e2bad2d970086e96da0e12cde0b411321e5b0f7b2a1f876aa26f" +dependencies = [ + "libc", + "log", + "os_pipe", + "rustix 0.38.34", + "tempfile", + "thiserror", + "tree_magic_mini", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-protocols-wlr", +] + +[[package]] +name = "wol-rs" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5a8a033ef9b208ec8b5946761958ed2b2693ac49b04f647fdc013000870b8f" [[package]] name = "wyz" @@ -7237,6 +8007,24 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "x11-clipboard" +version = "0.8.1" +source = "git+https://github.com/clslaid/x11-clipboard?branch=feat/store-batch#5fc2e73bc01ada3681159b34cf3ea8f0d14cd904" +dependencies = [ + "x11rb 0.12.0", +] + +[[package]] +name = "x11-clipboard" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98785a09322d7446e28a13203d2cae1059a0dd3dfb32cb06d0a225f023d8286" +dependencies = [ + "libc", + "x11rb 0.13.1", +] + [[package]] name = "x11-dl" version = "2.21.0" @@ -7250,72 +8038,82 @@ dependencies = [ [[package]] name = "x11rb" -version = "0.10.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "592b4883219f345e712b3209c62654ebda0bb50887f330cbd018d0f654bfd507" +checksum = "b1641b26d4dec61337c35a1b1aaf9e3cba8f46f0b43636c609ab0291a648040a" dependencies = [ - "gethostname", - "nix 0.24.3", + "gethostname 0.3.0", + "nix 0.26.4", "winapi 0.3.9", "winapi-wsapoll", - "x11rb-protocol", + "x11rb-protocol 0.12.0", +] + +[[package]] +name = "x11rb" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" +dependencies = [ + "gethostname 0.4.3", + "rustix 0.38.34", + "x11rb-protocol 0.13.1", ] [[package]] name = "x11rb-protocol" -version = "0.10.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56b245751c0ac9db0e006dc812031482784e434630205a93c73cfefcaabeac67" +checksum = "82d6c3f9a0fb6701fab8f6cea9b0c0bd5d6876f1f89f7fada07e558077c344bc" dependencies = [ - "nix 0.24.3", + "nix 0.26.4", ] +[[package]] +name = "x11rb-protocol" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" + [[package]] name = "xdg-home" -version = "1.0.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" dependencies = [ - "nix 0.26.2", - "winapi 0.3.9", -] - -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", + "libc", + "windows-sys 0.59.0", ] [[package]] name = "zbus" -version = "3.12.0" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29242fa5ec5693629ae74d6eb1f69622a9511f600986d6d9779bccf36ac316e3" +checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" dependencies = [ "async-broadcast", "async-executor", "async-fs", - "async-io", - "async-lock", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-process", "async-recursion", "async-task", "async-trait", + "blocking", "byteorder", "derivative", "enumflags2", - "event-listener", + "event-listener 2.5.3", "futures-core", "futures-sink", "futures-util", "hex", - "nix 0.26.2", + "nix 0.26.4", "once_cell", "ordered-stream", "rand 0.8.5", - "serde 1.0.163", + "serde 1.0.209", "serde_repr", "sha1", "static_assertions", @@ -7330,13 +8128,13 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "3.12.0" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "537793e26e9af85f774801dc52c6f6292352b2b517c5cf0449ffd3735732a53a" +checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" dependencies = [ "proc-macro-crate 1.3.1", - "proc-macro2 1.0.63", - "quote 1.0.27", + "proc-macro2 1.0.86", + "quote 1.0.37", "regex", "syn 1.0.109", "zvariant_utils", @@ -7344,32 +8142,80 @@ dependencies = [ [[package]] name = "zbus_names" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f34f314916bd89bdb9934154627fab152f4f28acdda03e7c4c68181b214fe7e3" +checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" dependencies = [ - "serde 1.0.163", + "serde 1.0.209", "static_assertions", "zvariant", ] [[package]] -name = "zip" -version = "0.6.5" +name = "zerocopy" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e92305c174683d78035cbf1b70e18db6329cc0f1b9cae0a52ca90bf5bfe7125" +checksum = "854e949ac82d619ee9a14c66a1b674ac730422372ccb759ce0c39cabcf2bf8e6" +dependencies = [ + "byteorder", + "zerocopy-derive 0.6.6", +] + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive 0.7.35", +] + +[[package]] +name = "zerocopy-derive" +version = "0.6.6" +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", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.76", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" + +[[package]] +name = "zip" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" dependencies = [ "aes", "byteorder", "bzip2", - "constant_time_eq", + "constant_time_eq 0.1.5", "crc32fast", "crossbeam-utils", "flate2", "hmac", "pbkdf2", "sha1", - "time 0.3.21", + "time 0.3.36", "zstd 0.11.2+zstd.1.5.2", ] @@ -7384,11 +8230,11 @@ dependencies = [ [[package]] name = "zstd" -version = "0.12.3+zstd.1.5.2" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" dependencies = [ - "zstd-safe 6.0.5+zstd.1.5.4", + "zstd-safe 7.2.1", ] [[package]] @@ -7403,22 +8249,20 @@ dependencies = [ [[package]] name = "zstd-safe" -version = "6.0.5+zstd.1.5.4" +version = "7.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56d9e60b4b1758206c238a10165fbcae3ca37b01744e394c463463f6529d23b" +checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" dependencies = [ - "libc", "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.8+zstd.1.5.5" +version = "2.0.13+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" +checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" dependencies = [ "cc", - "libc", "pkg-config", ] @@ -7433,38 +8277,38 @@ dependencies = [ [[package]] name = "zvariant" -version = "3.12.0" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fe4914a985446d6fd287019b5fceccce38303d71407d9e6e711d44954a05d8" +checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" dependencies = [ "byteorder", "enumflags2", "libc", - "serde 1.0.163", + "serde 1.0.209", "static_assertions", "zvariant_derive", ] [[package]] name = "zvariant_derive" -version = "3.12.0" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34c20260af4b28b3275d6676c7e2a6be0d4332e8e0aba4616d34007fd84e462a" +checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" dependencies = [ "proc-macro-crate 1.3.1", - "proc-macro2 1.0.63", - "quote 1.0.27", + "proc-macro2 1.0.86", + "quote 1.0.37", "syn 1.0.109", "zvariant_utils", ] [[package]] name = "zvariant_utils" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b22993dbc4d128a17a3b6c92f1c63872dd67198537ee728d8b5d7c40640a8b" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", + "proc-macro2 1.0.86", + "quote 1.0.37", "syn 1.0.109", ] diff --git a/pkgs/by-name/ru/rustdesk/package.nix b/pkgs/by-name/ru/rustdesk/package.nix index 39ba2dad76a8..5b838d39cff8 100644 --- a/pkgs/by-name/ru/rustdesk/package.nix +++ b/pkgs/by-name/ru/rustdesk/package.nix @@ -37,45 +37,53 @@ rustPlatform.buildRustPackage rec { pname = "rustdesk"; - version = "1.2.3"; + version = "1.3.0"; src = fetchFromGitHub { owner = "rustdesk"; repo = "rustdesk"; rev = version; - hash = "sha256-6TdirqEnWvuPgKOLzNIAm66EgKNdGVjD7vf2maqlxI8="; + hash = "sha256-pDGURsF0eft2BkuXOzaMtNCHp9VFgZZh4bbNRa5NDII="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "confy-0.4.0-2" = "sha256-r5VeggXrIq5Cwxc2WSrxQDI5Gvbw979qIUQfMKHgBUI="; + "android-wakelock-0.1.0" = "sha256-09EH/U1BBs3l4galQOrTKmPUYBgryUjfc/rqPZhdYc4="; + "arboard-3.4.0" = "sha256-lZIG5z115ExR6DcUut1rk9MrYFzSyCYH9kNGIikOPJM="; + "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.1.1" = "sha256-EQGJr5kH8O48y1oSrzFF3QGGpGFKP3v4gn2JquAkdlY="; - "impersonate_system-0.1.0" = "sha256-qbaTw9gxMKDjX5pKdUrKlmIxCxWwb99YuWPDvD2A3kY="; - "keepawake-0.4.3" = "sha256-sLQf9q88dB2bkTN01UlxRWSpoF1kFsqqpYC4Sw6cbEY="; + "hwcodec-0.7.0" = "sha256-pfzcaD7h/U5ou+P7qRLR56iXOkm043rF74y+Q0FsVLo="; + "impersonate_system-0.1.0" = "sha256-pIV7s2qGoCIUrhaRovBDCJaGQ/pMdJacDXJmeBpkcyI="; + "keepawake-0.4.3" = "sha256-cqSpkq/PCz+5+ZUyPy5hF6rP3fBzuZDywyxMUQ50Rk4="; "machine-uid-0.3.0" = "sha256-rEOyNThg6p5oqE9URnxSkPtzyW8D4zKzLi9pAnzTElE="; "magnum-opus-0.4.0" = "sha256-T4qaYOl8lCK1h9jWa9KqGvnVfDViT9Ob5R+YgnSw2tg="; - "mouce-0.2.1" = "sha256-3PtNEmVMXgqKV4r3KiKTkk4oyCt4BKynniJREE+RyFk="; - "pam-0.7.0" = "sha256-qe2GH6sfGEUnqLiQucYLB5rD/GyAaVtm9pAxWRb1H3Q="; - "parity-tokio-ipc-0.7.3-2" = "sha256-WXDKcDBaJuq4K9gjzOKMozePOFiVX0EqYAFamAz/Yvw="; - "rdev-0.5.0-2" = "sha256-MJ4Uqp0yz1CcFvoZYyUYwNojUcfW1AyVowKShihhhbY="; - "reqwest-0.11.18" = "sha256-3k2wcVD+DzJEdP/+8BqP9qz3tgEWcbWZj5/CjrZz5LY="; + "pam-0.7.0" = "sha256-o47tVoFlW9RiL7O8Lvuwz7rMYQHO+5TG27XxkAdHEOE="; + "pam-sys-1.0.0-alpha4" = "sha256-5HIErVWnanLo5054NgU+DEKC2wwyiJ8AHvbx0BGbyWo="; + "parity-tokio-ipc-0.7.3-4" = "sha256-PKw2Twd2ap+tRrQxqg8T1FvpoeKn0hvBqn1Z44F1LcY="; + "rdev-0.5.0-2" = "sha256-KrzNa4sKyuVw3EV/Ec9VBNRyJy7QFR2Gu4c2WkltwUw="; + "reqwest-0.11.23" = "sha256-kEUT+gs4ziknDiGdPMLnj5pmxC5SBpLopZ8jZ34GDWc="; "rust-pulsectl-0.2.12" = "sha256-8jXTspWvjONFcvw9/Z8C43g4BuGZ3rsG32tvLMQbtbM="; - "sciter-rs-0.5.57" = "sha256-NQPDlMQ0sGY8c9lBMlplT82sNjbgJy2m/+REnF3fz8M="; - "tao-0.22.2" = "sha256-vZx7WM6vK9UarbFQ/FMnTNEEDS+tglhWcPXt/h7YMFA="; - "tfc-0.6.1" = "sha256-ukxJl7Z+pUXCjvTsG5Q0RiXocPERWGsnAyh3SIWm0HU="; - "tokio-socks-0.5.1-2" = "sha256-x3aFJKo0XLaCGkZLtG9GYA+A/cGGedVZ8gOztWiYVUY="; - "tray-icon-0.5.1" = "sha256-1VyUg8V4omgdRIYyXhfn8kUvhV5ef6D2cr2Djz2uQyc="; + "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="; + "tokio-socks-0.5.2-1" = "sha256-i1dfNatqN4dinMcyAdLhj9hJWVsT10OWpCXsxl7pifI="; + "tray-icon-0.15.1" = "sha256-DvTVAsE3dB+o89SFk3RPRt5JzaWjPl4nlvC77zsVN/s="; + "wallpaper-3.2.0" = "sha256-p9NRmusdA0wvF6onp1UTL0/4t7XnEAc19sqyGDnfg/Q="; + "webm-1.1.0" = "sha256-p4BMej7yvb8c/dJynRWZmwo2hxAAY96Qx6Qx2DbT8hE="; "x11-2.19.0" = "sha256-GDCeKzUtvaLeBDmPQdyr499EjEfT6y4diBMzZVEptzc="; + "x11-clipboard-0.8.1" = "sha256-PtqmSD2MwkbLVWbfTSXZW3WEvEnUlo04qieUTjN2whE="; }; }; - prePatch = '' - # Patch 404 repos - substituteInPlace Cargo.lock --replace-fail "fufesou" "rustdesk-org"; - substituteInPlace Cargo.toml --replace-fail "fufesou" "rustdesk-org"; - substituteInPlace libs/enigo/Cargo.toml --replace-fail "fufesou" "rustdesk-org"; + 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 ''; desktopItems = [ From c48488b2e90d8e8161f52c3e4c9d1fd6e1bd4aed Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 4 Sep 2024 21:44:03 +0200 Subject: [PATCH 281/298] open-webui: 0.3.16 -> 0.3.18 diff: https://github.com/open-webui/open-webui/compare/v0.3.16..v0.3.18 changelog: https://github.com/open-webui/open-webui/releases/tag/v0.3.18 --- pkgs/by-name/op/open-webui/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index 7fc0530e6cf5..48a18549f393 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -7,19 +7,19 @@ }: let pname = "open-webui"; - version = "0.3.16"; + version = "0.3.18-unstable-2024-09-05"; src = fetchFromGitHub { owner = "open-webui"; repo = "open-webui"; - rev = "v${version}"; - hash = "sha256-AxD7WHL5fGM0CBKi7zc/gmoSJQBohDh0HgIDU1/BQ7w="; + rev = "c3271e84efc281dfed8c1e2d265cd24e1e5865e6"; + hash = "sha256-yOLxpRgwTVPlQASzFqul+ap/s7Wx3uxf4xr+Xb2Nb7A="; }; frontend = buildNpmPackage { inherit pname version src; - npmDepsHash = "sha256-Ik+wXymso3jdKXQgLydnhhWvpHl0d82pwYSmUR0yfPE="; + npmDepsHash = "sha256-BkjvMD1XxELzxiPZagYd0aEUsaAl338h5W9nvxxrJJg="; # Disabling `pyodide:fetch` as it downloads packages during `buildPhase` # Until this is solved, running python packages from the browser will not work. From 6bb48ed4eafb33c12792ce821b2ad79dc02858ee Mon Sep 17 00:00:00 2001 From: ghpzin Date: Thu, 5 Sep 2024 19:21:47 +0300 Subject: [PATCH 282/298] sbclPackages.cl-liballegro-nuklear: fix build - remove patch that no longer applies as upstream includes that change --- pkgs/development/lisp-modules/packages.nix | 1 - .../cl-liballegro-nuklear-missing-dll.patch | 17 ----------------- 2 files changed, 18 deletions(-) delete mode 100644 pkgs/development/lisp-modules/patches/cl-liballegro-nuklear-missing-dll.patch diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix index cf7eeb44ca3b..7bada7cbd653 100644 --- a/pkgs/development/lisp-modules/packages.nix +++ b/pkgs/development/lisp-modules/packages.nix @@ -104,7 +104,6 @@ let nativeBuildInputs = [ pkgs.allegro5 ]; nativeLibs = [ pkgs.allegro5 ]; lispLibs = super.cl-liballegro-nuklear.lispLibs ++ [ self.cl-liballegro ]; - patches = [ ./patches/cl-liballegro-nuklear-missing-dll.patch ]; }; lessp = build-asdf-system { diff --git a/pkgs/development/lisp-modules/patches/cl-liballegro-nuklear-missing-dll.patch b/pkgs/development/lisp-modules/patches/cl-liballegro-nuklear-missing-dll.patch deleted file mode 100644 index b5bde523eba9..000000000000 --- a/pkgs/development/lisp-modules/patches/cl-liballegro-nuklear-missing-dll.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix system not loading due to: - -Unhandled CFFI:LOAD-FOREIGN-LIBRARY-ERROR - Unable to load foreign library (LIBALLEGRO-NUKLEAR). - Error opening shared object "/build/source/src/liballegro_nuklear.so": - /build/source/src/liballegro_nuklear.so: undefined symbol: al_draw_ellipse. ---- a/cl-liballegro-nuklear.asd -+++ b/cl-liballegro-nuklear.asd -@@ -12,7 +12,7 @@ - :description "CFFI wrapper for the Nuklear IM GUI library with liballegro backend, to be used with cl-liballegro." - :author "Andrew Kravchuk " - :license "MIT" -- :depends-on (:cffi :cffi-libffi :trivial-features) -+ :depends-on (:cl-liballegro :cffi :cffi-libffi :trivial-features) - :pathname "src" - :serial t - :components ((:makefile "Makefile") From 926e474996ddcc8ae46dce66081bdd3ba8bf8da9 Mon Sep 17 00:00:00 2001 From: Adrian Pistol Date: Thu, 5 Sep 2024 18:43:48 +0200 Subject: [PATCH 283/298] haproxy: 3.0.3 -> 3.0.4 --- pkgs/tools/networking/haproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 6a01f2f8ba88..f2dc5dfd6e02 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -28,11 +28,11 @@ let sslPkg = sslPkgs.${sslLibrary}; in stdenv.mkDerivation (finalAttrs: { pname = "haproxy"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz"; - hash = "sha256-Oac8GHoLANJgLLP/ylLRtZ2Q8JAyc0/owD6y4pp9Gd8="; + hash = "sha256-qr/ZitpyG7+2j3gFWGztA3P7TI1z4Y+qlAVaFsIJaTY"; }; buildInputs = [ sslPkg zlib libxcrypt ] From 879e277f4d5c3284eebed1e3cf2de877a4f7019d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 17:27:12 +0000 Subject: [PATCH 284/298] python312Packages.exchangelib: 5.4.2 -> 5.4.3 --- pkgs/development/python-modules/exchangelib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix index 805c348756e1..5be910888a8e 100644 --- a/pkgs/development/python-modules/exchangelib/default.nix +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "exchangelib"; - version = "5.4.2"; + version = "5.4.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "ecederstrand"; repo = "exchangelib"; rev = "refs/tags/v${version}"; - hash = "sha256-UAc8Aju2+AM7m8XbWliVNzfWlL5fdPDa2q6Fsw04nHQ="; + hash = "sha256-SX5F0OXKdxA2HoDwvCe4M7RftdjUEdQuFbxRyuABC4E="; }; pythonRelaxDeps = [ "defusedxml" ]; From 9f5bf99b3be22c180a3da283d8a0eb5f2f55e877 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 17:49:33 +0000 Subject: [PATCH 285/298] qgroundcontrol: 4.4.1 -> 4.4.2 --- pkgs/applications/science/robotics/qgroundcontrol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index c2ee629d77ba..8caddf7dfcef 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "qgroundcontrol"; - version = "4.4.1"; + version = "4.4.2"; propagatedBuildInputs = [ qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2 @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { owner = "mavlink"; repo = pname; rev = "v${version}"; - hash = "sha256-FdF9QQYCF7HbmjvUQgV6HytJo2Aje2OEDPO2GSl1dqE="; + hash = "sha256-2Bc4uC/2e+PTsvFZ4RjnTzkOiBO9vsYHeLPkcwpDRrg="; fetchSubmodules = true; }; From 22beb958eff30548cfaa3240409f20b44871c720 Mon Sep 17 00:00:00 2001 From: uku Date: Fri, 24 May 2024 16:02:41 +0200 Subject: [PATCH 286/298] wine-discord-ipc-bridge: init at unstable-2023-08-09 --- .../wi/wine-discord-ipc-bridge/package.nix | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 pkgs/by-name/wi/wine-discord-ipc-bridge/package.nix diff --git a/pkgs/by-name/wi/wine-discord-ipc-bridge/package.nix b/pkgs/by-name/wi/wine-discord-ipc-bridge/package.nix new file mode 100644 index 000000000000..bd873bd7ba33 --- /dev/null +++ b/pkgs/by-name/wi/wine-discord-ipc-bridge/package.nix @@ -0,0 +1,38 @@ +{ + lib, + stdenv, + fetchFromGitHub, +}: + +stdenv.mkDerivation { + pname = "wine-discord-ipc-bridge"; + version = "unstable-2023-08-09"; + + src = fetchFromGitHub { + owner = "0e4ef622"; + repo = "wine-discord-ipc-bridge"; + rev = "f8198c9d52e708143301017a296f7557c4387127"; + hash = "sha256-tAknITFlG63+gI5cN9SfUIUZkbIq/MgOPoGIcvoNo4Q="; + }; + + postPatch = '' + patchShebangs winediscordipcbridge-steam.sh + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp winediscordipcbridge.exe $out/bin + cp winediscordipcbridge-steam.sh $out/bin + runHook postInstall + ''; + + meta = with lib; { + description = "Enable games running under wine to use Discord Rich Presence"; + homepage = "https://github.com/0e4ef622/wine-discord-ipc-bridge"; + license = licenses.mit; + maintainers = [ maintainers.uku3lig ]; + mainProgram = "winediscordipcbridge"; + platforms = [ "mingw32" ]; + }; +} From cb82c01eefccf8a6008b15c376413b9fa1e5eabb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 18:20:41 +0000 Subject: [PATCH 287/298] leetgo: 1.4.8 -> 1.4.9 --- pkgs/by-name/le/leetgo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/le/leetgo/package.nix b/pkgs/by-name/le/leetgo/package.nix index 0194260f5beb..b4fcfd9aad0a 100644 --- a/pkgs/by-name/le/leetgo/package.nix +++ b/pkgs/by-name/le/leetgo/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "leetgo"; - version = "1.4.8"; + version = "1.4.9"; src = fetchFromGitHub { owner = "j178"; repo = "leetgo"; rev = "v${version}"; - hash = "sha256-4Y/NwgLNBdd2uL7oiIdM1I08ZnLjreHf397s/vhS+Ac="; + hash = "sha256-FlQYTNz1Fh0igwnufjVXN4bsUYBB1kls19D+/v7Ztps="; }; - vendorHash = "sha256-zpS+6Z31m6g67we4JaQ0sPodqC315lgftqGzZkelDCU="; + vendorHash = "sha256-DdAe9yyusA6Ac8ioKqLiM5lcOt9Xy7F77gMG6yBTl7Q="; nativeBuildInputs = [ installShellFiles ]; From 4c64146e452b9beb6fda91b8124d076b4cd1c9eb Mon Sep 17 00:00:00 2001 From: Sandro Date: Thu, 5 Sep 2024 20:23:41 +0200 Subject: [PATCH 288/298] treewide: Retire `srgom` from meta.maintainers (#337930) The GitHub account has been inactive for 4+ years. This is sadly necessary due to the delays in reviews/merges when others are waiting for the requested maintainers to review the PR. Instructions for re-adding once you return https://github.com/NixOS/nixpkgs/tree/master/maintainers#how-to-become-a-maintainer We appreciate your past and future contributions. Co-authored-by: Anderson Torres --- pkgs/applications/system/qjournalctl/default.nix | 2 +- pkgs/tools/typesetting/tex/pplatex/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/system/qjournalctl/default.nix b/pkgs/applications/system/qjournalctl/default.nix index 5c8714677ad9..fc80c3f69df8 100644 --- a/pkgs/applications/system/qjournalctl/default.nix +++ b/pkgs/applications/system/qjournalctl/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/pentix/qjournalctl"; license = licenses.gpl3Only; platforms = platforms.all; - maintainers = with maintainers; [ srgom romildo ]; + maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/tools/typesetting/tex/pplatex/default.nix b/pkgs/tools/typesetting/tex/pplatex/default.nix index 367daa9450fc..7bd1e4d0eb1e 100644 --- a/pkgs/tools/typesetting/tex/pplatex/default.nix +++ b/pkgs/tools/typesetting/tex/pplatex/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "pplatex"; homepage = "https://github.com/stefanhepp/pplatex"; license = licenses.gpl3Plus; - maintainers = [ maintainers.srgom maintainers.doronbehar ]; + maintainers = [ maintainers.doronbehar ]; platforms = platforms.unix; }; }) From d598d4360d73c87e1b9d9bd42e978a62f4d9ba84 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 18:40:22 +0000 Subject: [PATCH 289/298] python312Packages.twilio: 9.2.4 -> 9.3.0 --- pkgs/development/python-modules/twilio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 7e14cc581a63..33680d968969 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "9.2.4"; + version = "9.3.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-5HHHSAvyUxR5myKucWpjkF7NQv/b1pViij606TZGzTY="; + hash = "sha256-v+Xq2t9eaKHLQFypNUTzLVBLo+3m0bKkjI09jwD3ieQ="; }; build-system = [ setuptools ]; From 5b09fecd006eff96b769560c3f821ae8bcb1a5db Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 18:40:32 +0000 Subject: [PATCH 290/298] vsce: 3.0.0 -> 3.1.0 --- pkgs/by-name/vs/vsce/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vs/vsce/package.nix b/pkgs/by-name/vs/vsce/package.nix index 8020835f0be6..873b4e2c1af3 100644 --- a/pkgs/by-name/vs/vsce/package.nix +++ b/pkgs/by-name/vs/vsce/package.nix @@ -12,16 +12,16 @@ buildNpmPackage rec { pname = "vsce"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "microsoft"; repo = "vscode-vsce"; rev = "v${version}"; - hash = "sha256-FoJfpzrbui+tKCEq15wGC0o44iLCBAuVYBISiy+zOmE="; + hash = "sha256-k2jeYeDLpSVw3puiOqlrtQ1a156OV1Er/TqdJuJ+578="; }; - npmDepsHash = "sha256-TTFolysg+La605EoS87gmhEjlzwNUVYmnXKr49De7fk="; + npmDepsHash = "sha256-k6LdGCpVoBNpHe4z7NrS0T/gcB1EQBvBxGAM3zo+AAo="; postPatch = '' substituteInPlace package.json --replace '"version": "0.0.0"' '"version": "${version}"' From 05193982cfadb19399acfb53d4865473f0d3b847 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 5 Sep 2024 22:25:09 +0300 Subject: [PATCH 291/298] python312.jaxlib-bin: throw on missing gpuSrc Better throw than to do an uncatchable missing attribute error https://www.github.com/NixOS/nixpkgs/pull/338199 --- pkgs/development/python-modules/jaxlib/bin.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix index 0932222e02b8..3104cee90e1c 100644 --- a/pkgs/development/python-modules/jaxlib/bin.nix +++ b/pkgs/development/python-modules/jaxlib/bin.nix @@ -181,7 +181,7 @@ buildPythonPackage { or (throw "jaxlib-bin is not supported on ${stdenv.hostPlatform.system}") ) else - gpuSrcs."${gpuSrcVersionString}"; + gpuSrcs."${gpuSrcVersionString}" or (throw "jaxlib-bin: No gpuSrc for ${gpuSrcVersionString}"); # Prebuilt wheels are dynamically linked against things that nix can't find. # Run `autoPatchelfHook` to automagically fix them. From 18d5bb71c700116bcce9ecf08c90d3ab48a053b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 5 Sep 2024 12:28:43 -0700 Subject: [PATCH 292/298] imagemagick: add willow to passthru.tests see https://github.com/wagtail/Willow/issues/150 --- pkgs/applications/graphics/ImageMagick/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index c278a476bae8..cd998be7019f 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -133,7 +133,7 @@ stdenv.mkDerivation (finalAttrs: { version = testers.testVersion { package = finalAttrs.finalPackage; }; inherit nixos-icons; inherit (perlPackages) ImageMagick; - inherit (python3.pkgs) img2pdf; + inherit (python3.pkgs) img2pdf willow; pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; version = lib.head (lib.splitString "-" finalAttrs.version); From 9a87b54f702eb8c4b170c1d59a25d13159170928 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Sep 2024 21:37:59 +0200 Subject: [PATCH 293/298] python312Packages.sshfs: disable test --- pkgs/development/python-modules/sshfs/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/sshfs/default.nix b/pkgs/development/python-modules/sshfs/default.nix index 5b101748cd4f..6eaae84d6f77 100644 --- a/pkgs/development/python-modules/sshfs/default.nix +++ b/pkgs/development/python-modules/sshfs/default.nix @@ -54,10 +54,15 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = lib.optionals stdenv.isDarwin [ - # test fails with sandbox enabled - "test_checksum" - ]; + disabledTests = + [ + # Test requires network access + "test_config_expansions" + ] + ++ lib.optionals stdenv.isDarwin [ + # Test fails with sandbox enabled + "test_checksum" + ]; pythonImportsCheck = [ "sshfs" ]; From a2282d35a722d1905b9f89d7c43dfe1cae09e6aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 19:54:04 +0000 Subject: [PATCH 294/298] picard: 2.12.2 -> 2.12.3 --- pkgs/applications/audio/picard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index a767658d8d24..e43e39e5a47d 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -21,14 +21,14 @@ in pythonPackages.buildPythonApplication rec { pname = "picard"; # nix-update --commit picard --version-regex 'release-(.*)' - version = "2.12.2"; + version = "2.12.3"; format = "setuptools"; src = fetchFromGitHub { owner = "metabrainz"; repo = "picard"; rev = "refs/tags/release-${version}"; - hash = "sha256-m0cFJKkYNH01YzcRrbKgkXpjlZ9ZEymwGDnOFQfZKv0="; + hash = "sha256-ysHOiX8b9tlUaQDGl4qHUVLrLUF9MUDc4+vOQB76cj4="; }; nativeBuildInputs = [ From 5a575e88b6b395bac6fca5858da08c54b6b74d66 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Thu, 5 Sep 2024 15:56:49 -0400 Subject: [PATCH 295/298] Revert "nixos: support dm-verity" --- .../manual/release-notes/rl-2411.section.md | 3 - nixos/modules/module-list.nix | 1 - .../modules/system/boot/systemd/dm-verity.nix | 65 ----- nixos/modules/system/boot/systemd/initrd.nix | 11 +- nixos/tests/all-tests.nix | 1 - nixos/tests/dm-verity.nix | 245 ------------------ 6 files changed, 4 insertions(+), 322 deletions(-) delete mode 100644 nixos/modules/system/boot/systemd/dm-verity.nix delete mode 100644 nixos/tests/dm-verity.nix diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index a352fae45ad0..1720dfea3525 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -34,9 +34,6 @@ Users that want to keep PulseAudio will want to set `services.pipewire.enable = false;` and `hardware.pulseaudio.enable = true;`. There is currently no plan to fully deprecate and remove PulseAudio, however, PipeWire should generally be preferred for new installs. -- Support for mounting filesystems from block devices protected with [dm-verity](https://docs.kernel.org/admin-guide/device-mapper/verity.html) - was added through the `boot.initrd.systemd.dmVerity` option. - ## New Modules {#sec-release-24.11-new-modules} - [TaskChampion Sync-Server](https://github.com/GothenburgBitFactory/taskchampion-sync-server), a [Taskwariror 3](https://taskwarrior.org/docs/upgrade-3/) sync server, replacing Taskwarrior 2's sync server named [`taskserver`](https://github.com/GothenburgBitFactory/taskserver). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index f94b1368ac69..dff961f3f55b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1622,7 +1622,6 @@ ./system/boot/stage-2.nix ./system/boot/systemd.nix ./system/boot/systemd/coredump.nix - ./system/boot/systemd/dm-verity.nix ./system/boot/systemd/initrd-secrets.nix ./system/boot/systemd/initrd.nix ./system/boot/systemd/journald.nix diff --git a/nixos/modules/system/boot/systemd/dm-verity.nix b/nixos/modules/system/boot/systemd/dm-verity.nix deleted file mode 100644 index eea048126be0..000000000000 --- a/nixos/modules/system/boot/systemd/dm-verity.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ config, lib, ... }: - -let - cfg = config.boot.initrd.systemd.dmVerity; -in -{ - options = { - boot.initrd.systemd.dmVerity = { - enable = lib.mkEnableOption "dm-verity" // { - description = '' - Mount verity-protected block devices in the initrd. - - Enabling this option allows to use `systemd-veritysetup` and - `systemd-veritysetup-generator` in the initrd. - ''; - }; - }; - }; - - config = lib.mkIf cfg.enable { - assertions = [ - { - assertion = cfg.enable -> config.boot.initrd.systemd.enable; - message = '' - 'boot.initrd.systemd.dmVerity.enable' requires 'boot.initrd.systemd.enable' to be enabled. - ''; - } - ]; - - boot.initrd = { - availableKernelModules = [ - # For documentation, see https://docs.kernel.org/admin-guide/device-mapper/dm-init.html - "dm_mod" - # For documentation, see: - # - https://docs.kernel.org/admin-guide/device-mapper/verity.html - # - https://gitlab.com/cryptsetup/cryptsetup/-/wikis/DMVerity - "dm_verity" - ]; - - # dm-verity needs additional udev rules from LVM to work. - services.lvm.enable = true; - - # The additional targets and store paths allow users to integrate verity-protected devices - # through the systemd tooling. - systemd = { - additionalUpstreamUnits = [ - # https://github.com/systemd/systemd/blob/main/units/veritysetup-pre.target - "veritysetup-pre.target" - # https://github.com/systemd/systemd/blob/main/units/veritysetup.target - "veritysetup.target" - # https://github.com/systemd/systemd/blob/main/units/remote-veritysetup.target - "remote-veritysetup.target" - ]; - - storePaths = [ - # These are the two binaries mentioned in https://github.com/systemd/systemd/blob/main/src/veritysetup/meson.build; there are no others. - "${config.boot.initrd.systemd.package}/lib/systemd/systemd-veritysetup" - "${config.boot.initrd.systemd.package}/lib/systemd/system-generators/systemd-veritysetup-generator" - ]; - }; - }; - }; - - meta.maintainers = [ lib.maintainers.msanft ]; -} diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index 2ad114d6a1d3..2ccc964820fe 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -218,7 +218,7 @@ in { }; root = lib.mkOption { - type = lib.types.nullOr (lib.types.enum [ "fstab" "gpt-auto" ]); + type = lib.types.enum [ "fstab" "gpt-auto" ]; default = "fstab"; example = "gpt-auto"; description = '' @@ -227,9 +227,6 @@ in { allow specifying the root file system itself this way. Instead, the `fstab` value is used in order to interpret the root file system specified with the `fileSystems` option. - - If the root FS is mounted by other means, such as systemd generators other than - `fstab`, `gpt-auto` or a custom generator, set this to `null`. ''; }; @@ -401,9 +398,9 @@ in { ++ lib.optional (cfg.enableTpm2 && !(pkgs.stdenv.hostPlatform.isRiscV64 || pkgs.stdenv.hostPlatform.isArmv7)) "tpm-crb" ++ lib.optional cfg.package.withEfi "efivarfs"; - boot.kernelParams = - lib.optional (config.boot.initrd.systemd.root != null) "root=${config.boot.initrd.systemd.root}" - ++ lib.optional (config.boot.resumeDevice != "") "resume=${config.boot.resumeDevice}" + boot.kernelParams = [ + "root=${config.boot.initrd.systemd.root}" + ] ++ lib.optional (config.boot.resumeDevice != "") "resume=${config.boot.resumeDevice}" # `systemd` mounts root in initrd as read-only unless "rw" is on the kernel command line. # For NixOS activation to succeed, we need to have root writable in initrd. ++ lib.optional (config.boot.initrd.systemd.root == "gpt-auto") "rw"; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 44ab2d445841..f8e0eb190bf5 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -259,7 +259,6 @@ in { dhparams = handleTest ./dhparams.nix {}; disable-installer-tools = handleTest ./disable-installer-tools.nix {}; discourse = handleTest ./discourse.nix {}; - dm-verity = runTest ./dm-verity.nix; dnscrypt-proxy2 = handleTestOn ["x86_64-linux"] ./dnscrypt-proxy2.nix {}; dnscrypt-wrapper = runTestOn ["x86_64-linux"] ./dnscrypt-wrapper; dnsdist = import ./dnsdist.nix { inherit pkgs runTest; }; diff --git a/nixos/tests/dm-verity.nix b/nixos/tests/dm-verity.nix deleted file mode 100644 index cf20dbe66f59..000000000000 --- a/nixos/tests/dm-verity.nix +++ /dev/null @@ -1,245 +0,0 @@ -# Tests a NixOS system with a read-only root filesystem that's integrity-protected -# through DM-verity. The root filesystem is mounted read-only, and for NixOS activation -# to succeed, an overlay `tmpfs` is mounted on top of it. -# This test uses systemd-repart to create a bootable disk image, as it supplies handy -# utilities for creating verity partitions, but it can also be setup manually through -# `systemd-veritysetup`. - -{ lib, pkgs, ... }: - -let - imageId = "verity-root-image"; - imageVersion = "1-rc1"; - - # Use a random, but fixed root hash placeholder to allow us specifying the "real" root hash - # after the image is first built. - roothashPlaceholder = "61fe0f0c98eff2a595dd2f63a5e481a0a25387261fa9e34c37e3a4910edf32b8"; -in -{ - name = "verity-root"; - - meta.maintainers = with lib.maintainers; [ msanft ]; - - nodes.machine = - { - lib, - pkgs, - config, - modulesPath, - ... - }: - { - - imports = [ "${modulesPath}/image/repart.nix" ]; - - virtualisation.directBoot.enable = false; - virtualisation.mountHostNixStore = false; - virtualisation.useEFIBoot = true; - - # Disable boot loaders, as a UKI is used, which contains systemd-stub. - # TODO(raitobezarius): revisit this when #244907 lands - boot.loader.grub.enable = false; - - system.image.id = imageId; - system.image.version = imageVersion; - - # systemd-veritysetup-generator takes care of setting up the root filesystem. - fileSystems = lib.mkForce { }; - virtualisation.fileSystems = lib.mkForce { }; - - # Provides 'veritysetup' to check if the verity-protected device - # has been mapped correctly. - environment.systemPackages = with pkgs; [ cryptsetup ]; - - boot.initrd = { - kernelModules = [ "overlay" ]; - supportedFilesystems = [ "erofs" ]; - - systemd = { - enable = true; - dmVerity.enable = true; - root = null; # systemd-veritysetup-generator takes care of mounting / - - tmpfiles.settings = { - "10-mountpoints" = - let - conf = { - mode = "0755"; - user = "root"; - group = "root"; - }; - in - { - "/run/etc/upper".d = conf; - "/run/etc/work".d = conf; - "/run/var/upper".d = conf; - "/run/var/work".d = conf; - "/run/tmp/upper".d = conf; - "/run/tmp/work".d = conf; - }; - }; - - # We directly define the mount units here, as we need to specify dependencies very - # granularly, and systemd-fstab-generator doesn't give us that flexibility. - mounts = [ - { - where = "/sysroot/etc"; - what = "overlay"; - type = "overlay"; - options = "lowerdir=/sysroot${config.system.build.etc}/etc,upperdir=/run/etc/upper,workdir=/run/etc/work"; - wantedBy = [ - "initrd-fs.target" - "initrd-switch-root.target" - "default.target" - ]; - before = [ "initrd-fs.target" ]; - after = [ "systemd-tmpfiles-setup.service" ]; - unitConfig.RequiresMountsFor = "/sysroot/nix/store"; - unitConfig.DefaultDependencies = false; - } - { - where = "/sysroot/var"; - what = "overlay"; - type = "overlay"; - options = "lowerdir=/sysroot/var,upperdir=/run/var/upper,workdir=/run/var/work"; - wantedBy = [ - "initrd-fs.target" - "initrd-switch-root.target" - "default.target" - ]; - before = [ "initrd-fs.target" ]; - after = [ "systemd-tmpfiles-setup.service" ]; - unitConfig.RequiresMountsFor = "/sysroot/nix/store"; - unitConfig.DefaultDependencies = false; - } - { - where = "/sysroot/tmp"; - what = "overlay"; - type = "overlay"; - options = "lowerdir=/sysroot/tmp,upperdir=/run/tmp/upper,workdir=/run/tmp/work"; - wantedBy = [ - "initrd-fs.target" - "initrd-switch-root.target" - "default.target" - ]; - before = [ "initrd-fs.target" ]; - after = [ "systemd-tmpfiles-setup.service" ]; - unitConfig.RequiresMountsFor = "/sysroot/nix/store"; - unitConfig.DefaultDependencies = false; - } - ]; - }; - }; - - boot.kernelParams = [ - "systemd.verity=yes" - "roothash=${roothashPlaceholder}" - ]; - - image.repart = { - name = imageId; - # OVMF does not work with the default repart sector size of 4096 - sectorSize = 512; - partitions = { - # ESP - "00-esp" = { - contents = - let - efiArch = config.nixpkgs.hostPlatform.efiArch; - in - { - "/EFI/BOOT/BOOT${lib.toUpper efiArch}.EFI".source = "${pkgs.systemd}/lib/systemd/boot/efi/systemd-boot${efiArch}.efi"; - - "/EFI/Linux/${config.system.boot.loader.ukiFile}".source = "${config.system.build.uki}/${config.system.boot.loader.ukiFile}"; - }; - repartConfig = { - Type = "esp"; - Format = "vfat"; - # Minimize = "guess" seems to not work very well for vfat - # partitions. It's better to set a sensible default instead. The - # aarch64 kernel seems to generally be a little bigger than the - # x86_64 kernel. To stay on the safe side, leave some more slack - # for every platform other than x86_64. - SizeMinBytes = if config.nixpkgs.hostPlatform.isx86_64 then "64M" else "96M"; - }; - }; - - # Root Partition - "10-root" = { - storePaths = [ config.system.build.toplevel ]; - repartConfig = { - Type = "root"; - Format = "erofs"; - Label = "root"; - Verity = "data"; - VerityMatchKey = "root"; - Minimize = "best"; - # We need to ensure that mountpoints are available. - MakeDirectories = "/bin /boot /dev /etc /home /lib /lib64 /mnt /nix /opt /proc /root /run /srv /sys /tmp /usr /var"; - }; - }; - - # Verity hashtree for the root partition - "20-root-verity" = { - repartConfig = { - Type = "root-verity"; - Label = "root-verity"; - Verity = "hash"; - VerityMatchKey = "root"; - Minimize = "best"; - }; - }; - }; - }; - }; - - testScript = - let - # We override the build of the image by extending it with code to replace the placeholder with the real root hash. - # This way, we can build the image first and then set the root hash afterwards in a single derivation. - buildOverride = oldAttrs: { - nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ pkgs.jq ]; - postInstall = '' - # Replace the placeholder with the real root hash. - realRoothash=$(${pkgs.jq}/bin/jq -r "[.[] | select(.roothash != null)] | .[0].roothash" $out/repart-output.json) - sed -i "0,/${roothashPlaceholder}/ s/${roothashPlaceholder}/$realRoothash/" $out/${oldAttrs.pname}_${oldAttrs.version}.raw - ''; - }; - in - { nodes, ... }: - '' - import os, subprocess, tempfile - - tmp_disk_image = tempfile.NamedTemporaryFile() - - subprocess.run([ - "${nodes.machine.virtualisation.qemu.package}/bin/qemu-img", - "create", - "-f", - "qcow2", - "-b", - "${nodes.machine.system.build.image.overrideAttrs buildOverride}/${nodes.machine.image.repart.imageFile}", - "-F", - "raw", - tmp_disk_image.name, - ]) - - # Set NIX_DISK_IMAGE so that the qemu script finds the right disk image. - os.environ['NIX_DISK_IMAGE'] = tmp_disk_image.name - - os_release = machine.succeed("cat /etc/os-release") - assert 'IMAGE_ID="${imageId}"' in os_release - assert 'IMAGE_VERSION="${imageVersion}"' in os_release - - bootctl_status = machine.succeed("bootctl status") - assert "Boot Loader Specification Type #2 (.efi)" in bootctl_status - - verity_status = machine.succeed("veritysetup status root") - assert "type: VERITY" in verity_status - assert "status: verified" in verity_status - - commandline = machine.succeed("cat /proc/cmdline") - roothash = commandline.split("roothash=")[1].split(" ")[0] - assert roothash in verity_status - ''; -} From d5c686a5bd342d98116cb2b85a33a77fb2c4af95 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Sep 2024 22:01:11 +0200 Subject: [PATCH 296/298] metasploit: 6.4.24 -> 6.4.25 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 6 +++--- pkgs/tools/security/metasploit/default.nix | 4 ++-- pkgs/tools/security/metasploit/gemset.nix | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 5cb6092615da..60c1bfad1134 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.24" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.25" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 6eddefe9becd..49c0b3dd6918 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 1d1fe1ccc7a339d4800cf20b8301d1ff1f56cd9b - ref: refs/tags/6.4.24 + revision: 8a95b2c37de1aea1c347324a1e8171d9189e149b + ref: refs/tags/6.4.25 specs: - metasploit-framework (6.4.24) + metasploit-framework (6.4.25) aarch64 abbrev actionpack (~> 7.0.0) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index a8a01e639cc1..d52a883e6520 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.4.24"; + version = "6.4.25"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = "refs/tags/${version}"; - hash = "sha256-320yeezX3GV8sNi84JbU8qeKcj+uuiaqXQkYYh1jmh0="; + hash = "sha256-JSRex8aNwINEErNi5UoW29YV0R6pSfkyYrULK9vLTAc="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 26b9050c60cb..b59162d271e0 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -724,12 +724,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "1d1fe1ccc7a339d4800cf20b8301d1ff1f56cd9b"; - sha256 = "07csccfn4609bnm2dfmf7xr8m9zjsjbf1g6qn1y6bp6pxiwk4vfz"; + rev = "8a95b2c37de1aea1c347324a1e8171d9189e149b"; + sha256 = "01scrgdjn2xmc8rgjjd93v8ibmnv2r5faqmk29287h4dqv3mw915"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.4.24"; + version = "6.4.25"; }; metasploit-model = { groups = ["default"]; From 24ef2a079dd6399e6683ba2990756d78ef9ed26d Mon Sep 17 00:00:00 2001 From: t4ccer Date: Thu, 5 Sep 2024 14:34:49 -0600 Subject: [PATCH 297/298] unrar-free: fix meta.mainProgram --- pkgs/by-name/un/unrar-free/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/un/unrar-free/package.nix b/pkgs/by-name/un/unrar-free/package.nix index ca6b7f7e526e..176a01a45640 100644 --- a/pkgs/by-name/un/unrar-free/package.nix +++ b/pkgs/by-name/un/unrar-free/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://gitlab.com/bgermann/unrar-free"; license = lib.licenses.gpl2Plus; - mainProgram = "unrar"; + mainProgram = "unrar-free"; maintainers = with lib.maintainers; [ thiagokokada ]; platforms = lib.platforms.unix; broken = stdenv.isDarwin; From c39e9041e8e371ee72a8e28217d7dd9072cd6ef6 Mon Sep 17 00:00:00 2001 From: Jakub Skokan Date: Thu, 5 Sep 2024 23:57:13 +0200 Subject: [PATCH 298/298] vpsfree-client: 0.18.0 -> 0.19.0 (#339850) --- pkgs/by-name/vp/vpsfree-client/Gemfile | 2 +- pkgs/by-name/vp/vpsfree-client/Gemfile.lock | 52 +++++----- pkgs/by-name/vp/vpsfree-client/gemset.nix | 104 ++++++++++++-------- 3 files changed, 92 insertions(+), 66 deletions(-) diff --git a/pkgs/by-name/vp/vpsfree-client/Gemfile b/pkgs/by-name/vp/vpsfree-client/Gemfile index 90fce7a5cbd5..87c9aeebb90c 100644 --- a/pkgs/by-name/vp/vpsfree-client/Gemfile +++ b/pkgs/by-name/vp/vpsfree-client/Gemfile @@ -2,4 +2,4 @@ source "https://rubygems.org" -gem "vpsfree-client", "0.18.0" +gem "vpsfree-client" diff --git a/pkgs/by-name/vp/vpsfree-client/Gemfile.lock b/pkgs/by-name/vp/vpsfree-client/Gemfile.lock index 7485c24ce168..761b8a6db21a 100644 --- a/pkgs/by-name/vp/vpsfree-client/Gemfile.lock +++ b/pkgs/by-name/vp/vpsfree-client/Gemfile.lock @@ -1,45 +1,48 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.1.3.2) + activesupport (7.2.1) base64 bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) base64 (0.2.0) - bigdecimal (3.1.6) - concurrent-ruby (1.2.3) + bigdecimal (3.1.8) + concurrent-ruby (1.3.4) connection_pool (2.4.1) - curses (1.4.4) + curses (1.4.6) domain_name (0.6.20240107) drb (2.2.1) - haveapi-client (0.19.3) + haveapi-client (0.23.7) activesupport (>= 7.0) - highline (~> 2.1.0) + highline (~> 3.1) json require_all (~> 2.0.0) rest-client (~> 2.1.0) ruby-progressbar (~> 1.13.0) - highline (2.1.0) + highline (3.1.1) + reline http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.7) domain_name (~> 0.5) - i18n (1.14.3) + i18n (1.14.5) concurrent-ruby (~> 1.0) - racc (~> 1.7) - json (2.7.1) + io-console (0.7.2) + json (2.7.2) + logger (1.6.1) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) - minitest (5.22.2) - mutex_m (0.2.0) + mime-types-data (3.2024.0903) + minitest (5.25.1) netrc (0.11.0) - racc (1.7.3) + reline (0.5.10) + io-console (~> 0.5) require_all (2.0.0) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) @@ -47,20 +50,21 @@ GEM mime-types (>= 1.16, < 4.0) netrc (~> 0.8) ruby-progressbar (1.13.0) + securerandom (0.3.1) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - vpsadmin-client (3.0.0.master.20231229.pre.0.51d41b07) + vpsadmin-client (4.0.0) curses - haveapi-client (~> 0.19.0) + haveapi-client (~> 0.23.6) json - vpsfree-client (0.18.0) - vpsadmin-client (= 3.0.0.master.20231229.pre.0.51d41b07) + vpsfree-client (0.19.0) + vpsadmin-client (~> 4.0) PLATFORMS ruby DEPENDENCIES - vpsfree-client (= 0.18.0) + vpsfree-client BUNDLED WITH - 2.4.22 + 2.5.9 diff --git a/pkgs/by-name/vp/vpsfree-client/gemset.nix b/pkgs/by-name/vp/vpsfree-client/gemset.nix index cdc9250b875e..e19de26f9228 100644 --- a/pkgs/by-name/vp/vpsfree-client/gemset.nix +++ b/pkgs/by-name/vp/vpsfree-client/gemset.nix @@ -1,14 +1,14 @@ { activesupport = { - dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"]; + dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "logger" "minitest" "securerandom" "tzinfo"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0blbbf2x7dn7ar4g9aij403582zb6zscbj48bz63lvaamsvlb15d"; + sha256 = "094cv9kxa8hwlsw3c0njkvvayd0wszcz9b6xywv4yajrg83zlmvm"; type = "gem"; }; - version = "7.1.3.2"; + version = "7.2.1"; }; base64 = { groups = ["default"]; @@ -25,20 +25,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00db5v09k1z3539g1zrk7vkjrln9967k08adh6qx33ng97a2gg5w"; + sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558"; type = "gem"; }; - version = "3.1.6"; + version = "3.1.8"; }; concurrent-ruby = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2"; + sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl"; type = "gem"; }; - version = "1.2.3"; + version = "1.3.4"; }; connection_pool = { groups = ["default"]; @@ -55,10 +55,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00y9g79lzfffxarj3rmhnkblsnyx7izx91mh8c1sdcs9y2pdfq53"; + sha256 = "15pj04v9m06lj7xcq5xjk6b0nqfpq3kiaisjmh2pysmi6nvsg9ly"; type = "gem"; }; - version = "1.4.4"; + version = "1.4.6"; }; domain_name = { groups = ["default"]; @@ -86,20 +86,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yjcf6yf90sqjsywlcxzfrfrl835ndw96x6bh4grvc75zbb5ijki"; + sha256 = "1a6k0milq4rfybf1pc8gzikpr18dmnzpz1wi2avzdkp0dpqkvaw3"; type = "gem"; }; - version = "0.19.3"; + version = "0.23.7"; }; highline = { + dependencies = ["reline"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f8cr014j7mdqpdb9q17fp5vb5b8n1pswqaif91s3ylg5x3pygfn"; + sha256 = "1q0f7izfi542sp93gl276spm0xyws1kpqxm0alrwwmz06mz4i0ks"; type = "gem"; }; - version = "2.1.0"; + version = "3.1.1"; }; http-accept = { groups = ["default"]; @@ -117,31 +118,51 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13rilvlv8kwbzqfb644qp6hrbsj82cbqmnzcvqip1p6vqx36sxbk"; + sha256 = "0lr2yk5g5vvf9nzlmkn3p7mhh9mn55gpdc7kl2w21xs46fgkjynb"; type = "gem"; }; - version = "1.0.5"; + version = "1.0.7"; }; i18n = { - dependencies = ["concurrent-ruby" "racc"]; + dependencies = ["concurrent-ruby"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j9zl6ssshkdjdn21lckdhsfkkw1n4wcynqp8n67afa5qps2gmds"; + sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16"; type = "gem"; }; - version = "1.14.3"; + version = "1.14.5"; + }; + io-console = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08d2lx42pa8jjav0lcjbzfzmw61b8imxr9041pva8xzqabrczp7h"; + type = "gem"; + }; + version = "0.7.2"; }; json = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r9jmjhg2ly3l736flk7r2al47b5c8cayh0gqkq0yhjqzc9a6zhq"; + sha256 = "0b4qsi8gay7ncmigr0pnbxyb17y3h8kavdyhsh7nrlqwr35vb60q"; type = "gem"; }; - version = "2.7.1"; + version = "2.7.2"; + }; + logger = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s"; + type = "gem"; + }; + version = "1.6.1"; }; mime-types = { dependencies = ["mime-types-data"]; @@ -159,30 +180,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00x7w5xqsj9m33v3vkmy23wipkkysafksib53ypzn27p5g81w455"; + sha256 = "0d5bmxcq87nj6h5rx6b1fkdzq8256yba97s2vlkszpwhc47m9rfs"; type = "gem"; }; - version = "3.2024.0305"; + version = "3.2024.0903"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0667vf0zglacry87nkcl3ns8421aydvz71vfa3g3yjhiq8zh19f5"; + sha256 = "1n1akmc6bibkbxkzm1p1wmfb4n9vv397knkgz0ffykb3h1d7kdix"; type = "gem"; }; - version = "5.22.2"; - }; - mutex_m = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn"; - type = "gem"; - }; - version = "0.2.0"; + version = "5.25.1"; }; netrc = { groups = ["default"]; @@ -194,15 +205,16 @@ }; version = "0.11.0"; }; - racc = { + reline = { + dependencies = ["io-console"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; + sha256 = "0rl1jmxs7pay58l7lkxkrn6nkdpk52k8rvnfwqsd1swjlxlwjq0n"; type = "gem"; }; - version = "1.7.3"; + version = "0.5.10"; }; require_all = { groups = ["default"]; @@ -235,6 +247,16 @@ }; version = "1.13.0"; }; + securerandom = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1phv6kh417vkanhssbjr960c0gfqvf8z7d3d9fd2yvd41q64bw4q"; + type = "gem"; + }; + version = "0.3.1"; + }; tzinfo = { dependencies = ["concurrent-ruby"]; groups = ["default"]; @@ -252,10 +274,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d1bdyda8l42x8csf4ri2cqcr3xf6pcnv7s1k859rb8ysj7y8aqx"; + sha256 = "1qy0l0gyhsyz9hdbqdb324l4zlgs78hml1cnp3gx1jl5ndj62znc"; type = "gem"; }; - version = "3.0.0.master.20231229.pre.0.51d41b07"; + version = "4.0.0"; }; vpsfree-client = { dependencies = ["vpsadmin-client"]; @@ -263,9 +285,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "038a57avnp4wmfqdya5a6r4a135nh6crzs6nf0khnhdhb9kkjfjg"; + sha256 = "0cl6r20r7hksd3g6sjqrgi9x21ykbvv170vszf2l06a8ifrrqlk7"; type = "gem"; }; - version = "0.18.0"; + version = "0.19.0"; }; }