diff --git a/pkgs/applications/misc/kchmviewer/default.nix b/pkgs/applications/misc/kchmviewer/default.nix deleted file mode 100644 index f3ecbdf87e37..000000000000 --- a/pkgs/applications/misc/kchmviewer/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchpatch, - qmake, - wrapQtAppsHook, - chmlib, - libzip, - qtwebengine, -}: - -stdenv.mkDerivation rec { - pname = "kchmviewer"; - version = "8.0"; - - src = fetchFromGitHub { - owner = "gyunaev"; - repo = pname; - rev = "RELEASE_${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "sha256-YNpiBf6AFBCRbAZRPODvqGbQQedJJJrZFQIQyzIeBlw="; - }; - - patches = [ - # remove unused webkit - (fetchpatch { - url = "https://github.com/gyunaev/kchmviewer/commit/a4a3984465cb635822953350c571950ae726b539.patch"; - sha256 = "sha256-nHW18a4SrTG4fETJmKS4ojHXwnX1d1uN1m4H0GIuI28="; - }) - # QtWebengine fixes - (fetchpatch { - url = "https://github.com/gyunaev/kchmviewer/commit/9ac73e7ad15de08aab6b1198115be2eb44da7afe.patch"; - sha256 = "sha256-qg2ytqA2On7jg19WZmHIOU7vLQI2hoyqItySLEA64SY="; - }) - (fetchpatch { - url = "https://github.com/gyunaev/kchmviewer/commit/99a6d94bdfce9c4578cce82707e71863a71d1453.patch"; - sha256 = "sha256-o8JkaMmcJObmMt+o/6ooCAPCi+yRAWDAgxV+tR5eHfY="; - }) - ]; - - buildInputs = [ - chmlib - libzip - qtwebengine - ]; - - nativeBuildInputs = [ - qmake - wrapQtAppsHook - ]; - - postInstall = '' - install -Dm755 bin/kchmviewer -t $out/bin - install -Dm644 packages/kchmviewer.png -t $out/share/pixmaps - install -Dm644 packages/kchmviewer.desktop -t $out/share/applications - ''; - - meta = with lib; { - description = "CHM (Winhelp) files viewer"; - mainProgram = "kchmviewer"; - homepage = "http://www.ulduzsoft.com/linux/kchmviewer/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ sikmir ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/misc/orpie/default.nix b/pkgs/applications/misc/orpie/default.nix index 0783d9cf16bf..8c99c0830ca0 100644 --- a/pkgs/applications/misc/orpie/default.nix +++ b/pkgs/applications/misc/orpie/default.nix @@ -10,9 +10,9 @@ ocamlPackages.buildDunePackage rec { src = fetchFromGitHub { owner = "pelzlpj"; - repo = pname; - rev = "release-${version}"; - sha256 = "1rx2nl6cdv609pfymnbq53pi3ql5fr4kda8x10ycd9xq2gc4f21g"; + repo = "orpie"; + tag = "release-${version}"; + sha256 = "sha256-LwhH2BO4p8Y8CB2pNkl2heIR7yh42erdTcDsxgy1ouc="; }; patches = [ ./prefix.patch ]; diff --git a/pkgs/by-name/ae/aerc/basename-temp-file-fixup.patch b/pkgs/by-name/ae/aerc/basename-temp-file-fixup.patch new file mode 100644 index 000000000000..07bec5bffbd8 --- /dev/null +++ b/pkgs/by-name/ae/aerc/basename-temp-file-fixup.patch @@ -0,0 +1,34 @@ +From 2bbe75fe0bc87ab4c1e16c5a18c6200224391629 Mon Sep 17 00:00:00 2001 +From: Nicole Patricia Mazzuca +Date: Fri, 9 May 2025 09:32:21 +0200 +Subject: [PATCH] open: fix opening text/html messages + +This fixes a bug introduced in 93bec0de8ed5ab3d6b1f01026fe2ef20fa154329: +aerc started using `path.Base()`, which returns `"."` on an empty +path, but still checked for `""` two lines later. + +On macOS, the result is that aerc attempts to open the directory: + +``` +open /var/folders/vn/hs0zvdsx3vq6svvry8s1bnym0000gn/T/aerc-4229266673: is a directory +``` + +Signed-off-by: Nicole Patricia Mazzuca +Acked-by: Robin Jarry +--- + commands/msgview/open.go | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/commands/msgview/open.go b/commands/msgview/open.go +index a6e43cb8da5fd49d2aa562d4c25ee2d597deefc3..7c770d4a90b771e3a18dfcb327f5e9306d5b5fa7 100644 +--- a/commands/msgview/open.go ++++ b/commands/msgview/open.go +@@ -59,7 +59,7 @@ func (o Open) Execute(args []string) error { + } + filename := path.Base(part.FileName()) + var tmpFile *os.File +- if filename == "" { ++ if filename == "." { + extension := "" + if exts, _ := mime.ExtensionsByType(mimeType); len(exts) > 0 { + extension = exts[0] diff --git a/pkgs/by-name/ae/aerc/basename-temp-file.patch b/pkgs/by-name/ae/aerc/basename-temp-file.patch new file mode 100644 index 000000000000..8ca81c21db95 --- /dev/null +++ b/pkgs/by-name/ae/aerc/basename-temp-file.patch @@ -0,0 +1,41 @@ +From 93bec0de8ed5ab3d6b1f01026fe2ef20fa154329 Mon Sep 17 00:00:00 2001 +From: Robin Jarry +Date: Wed, 9 Apr 2025 10:49:24 +0200 +Subject: [PATCH] open: only use part basename for temp file + +When an attachment part has a name such as "/tmp/55208186_AllDocs.pdf", +aerc creates a temp folder and tries to store the file by blindly +concatenating the path as follows: + + /tmp/aerc-3444057757/tmp/55208186_AllDocs.pdf + +And when writing to this path, it gets a "No such file or directory" +error because the intermediate "tmp" subfolder isn't created. + +Reported-by: Erik Colson +Signed-off-by: Robin Jarry +--- + commands/msgview/open.go | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/commands/msgview/open.go b/commands/msgview/open.go +index 4293b7e4892c137a7f3fbbe79245ffb6733b2671..a6e43cb8da5fd49d2aa562d4c25ee2d597deefc3 100644 +--- a/commands/msgview/open.go ++++ b/commands/msgview/open.go +@@ -5,6 +5,7 @@ import ( + "io" + "mime" + "os" ++ "path" + "path/filepath" + + "git.sr.ht/~rjarry/aerc/app" +@@ -56,7 +57,7 @@ func (o Open) Execute(args []string) error { + app.PushError(err.Error()) + return + } +- filename := part.FileName() ++ filename := path.Base(part.FileName()) + var tmpFile *os.File + if filename == "" { + extension := "" diff --git a/pkgs/by-name/ae/aerc/package.nix b/pkgs/by-name/ae/aerc/package.nix index b05f3b97c395..906c9a39f7f6 100644 --- a/pkgs/by-name/ae/aerc/package.nix +++ b/pkgs/by-name/ae/aerc/package.nix @@ -33,7 +33,14 @@ buildGoModule (finalAttrs: { python3Packages.wrapPython ]; - patches = [ ./runtime-libexec.patch ]; + patches = [ + ./runtime-libexec.patch + + # TODO remove these with the next release + # they resolve a path injection vulnerability when saving attachments (CVE-2025-49466) + ./basename-temp-file.patch + ./basename-temp-file-fixup.patch + ]; postPatch = '' substituteAllInPlace config/aerc.conf diff --git a/pkgs/by-name/bl/blackfire/php-probe.nix b/pkgs/by-name/bl/blackfire/php-probe.nix index aa133ac2653f..d319d6574404 100644 --- a/pkgs/by-name/bl/blackfire/php-probe.nix +++ b/pkgs/by-name/bl/blackfire/php-probe.nix @@ -16,50 +16,50 @@ let phpMajor = lib.versions.majorMinor php.version; inherit (stdenv.hostPlatform) system; - version = "1.92.36"; + version = "1.92.37"; hashes = { "x86_64-linux" = { system = "amd64"; hash = { - "8.1" = "sha256-Fn+6aZi8UuyF0f94t09SwhUwvHqjvN6m2HBq2mbr/CA="; - "8.2" = "sha256-b8YyT9P+KQonwHqXSn17EDRTdTw9CuvIX0PzjvGlmCo="; - "8.3" = "sha256-YLQi530JkoQfAx/ZBR9w2dthK6IsDSyqq3U+rGugUPw="; - "8.4" = "sha256-zpXYElris1fjMlwpTwuRDkCdO3MNHCLp3D24x5X/S88="; + "8.1" = "sha256-NuWxVeVueKz64jDIE1KPzLEco+MoUyuc/9/hsTaRrAI="; + "8.2" = "sha256-NJlrEwSY55INO7q5GAvPojnLdkAYJ4eCIjxFH55Pdmg="; + "8.3" = "sha256-KGpNPp2bOAmY/GUPnUxTJ4z6X8AdvZAG6YC3pLTjbGI="; + "8.4" = "sha256-3HrbezGcdVMtdPrfRpLEhY/1AXlGUIMraeie7LEmiC8="; }; }; "i686-linux" = { system = "i386"; hash = { - "8.1" = "sha256-3mNgyfrkgiZBkLE8ppans7R72lOeXFup2nwLoP6Gve0="; - "8.2" = "sha256-PT7virnfH8Ujkol/fK84TmVTc4jK4xGfaDL1kb9bj/4="; - "8.3" = "sha256-h4Gf4YR2I+R9dMDiFpAN1WB2o6BNP3C80fX7vKEN6Gs="; - "8.4" = "sha256-lRunm8coAkwiLvPELWquAsoNQEZv0LvL13Hdg+9dOfA="; + "8.1" = "sha256-Z9D6yoDSTdvzAQw+LhCk37J+LPMLEthUzbB1YQdr7AY="; + "8.2" = "sha256-ES2Y2RewFSP0R5wuYF2sm7NAVlCRvRPSpfPt7X2uYqs="; + "8.3" = "sha256-jqcS97JcHU/LzdU08MwNXDepH7OzIa4Fo7s3hg+x6hA="; + "8.4" = "sha256-xel7bbb4S16YddLuw0sDINbKQ0zoJeeRSI4g+tpqYz0="; }; }; "aarch64-linux" = { system = "arm64"; hash = { - "8.1" = "sha256-DDco6F8cD/D4J3KM1B111bjcJkRxd++CLR+x0azcR0g="; - "8.2" = "sha256-AQPQQM5Q5wlhvkXOnVNgPLcQpZ5xda/CYFqvm5J7e0c="; - "8.3" = "sha256-Yae7UVRrIdShIVZDSza9IrukYHgfX5CrVIpuH4rEAek="; - "8.4" = "sha256-l0+DN5zEqGJLg8Ig5U4PvZGms1O0eZ/PqjXgSw4bCA4="; + "8.1" = "sha256-l3mz8n1PjBUTcLN4Kyjg573Ip20dFV85yNT2krYq6Z0="; + "8.2" = "sha256-EyxrVMitvupQzAwhFDwMO56PUhyLb35aqWgJeH+211E="; + "8.3" = "sha256-T6UkTtQl1Ce95tA4/J9mSk/pBWAZJJz0pHb3xMIGYvc="; + "8.4" = "sha256-udvqUMbbVcFOocu1F0rSgi0+bg5VPq2Qw2LrRqNRQHw="; }; }; "aarch64-darwin" = { system = "arm64"; hash = { - "8.1" = "sha256-xb28nloEKKfJfddrDShBFuLHPOIyBo74erHWB9H5im4="; - "8.2" = "sha256-vmjjmGem7SdEkBWIjDfxgLQhmO9B/x1gIP5GSlAPPDs="; - "8.3" = "sha256-l6XrHQIigav6gMpgg7HEwm+2PeuU76AX3je8UVrcPEQ="; + "8.1" = "sha256-PoXihk7e+xT6fat48dnD/3lZqQKpgBHs4Eao08J4dMs="; + "8.2" = "sha256-lLham3VjXvszjOU8NvxZsjz5vfEK58QG1tE4X06luzQ="; + "8.3" = "sha256-rAsJ71P+yM939JqhhwDbxfL0EwB4q7SNqvSdN0n6ES0="; }; }; "x86_64-darwin" = { system = "amd64"; hash = { - "8.1" = "sha256-xY/5UQuLM/UrdDvA1WUF117m+Coj3ElEgV3cbelfKvM="; - "8.2" = "sha256-bGpijGg++VJNZFHN9K6Gx1R+jBn3o+Qeh/RpmPC8NPE="; - "8.3" = "sha256-3uiTuEmEsp3sKOOR0WxH72pVPCs5ogR1yi3VQ7+/fw8="; + "8.1" = "sha256-6RoANqMjuyaLcMzg5R0unhTwOSbsQhEXCkjQ2kjnnCg="; + "8.2" = "sha256-PjvLjRsnhHgXOEj7J7ekWM0fFuaOuiYJhXbINClaFtU="; + "8.3" = "sha256-NoY788iBgeVMrQp3tm6vbAnwBZB7yMjCVmH7jr32HWU="; }; }; }; diff --git a/pkgs/by-name/bu/buffer/package.nix b/pkgs/by-name/bu/buffer/package.nix index c3c04a12a985..6dd991fa261b 100644 --- a/pkgs/by-name/bu/buffer/package.nix +++ b/pkgs/by-name/bu/buffer/package.nix @@ -1,8 +1,8 @@ { lib, + cargo, desktop-file-utils, fetchFromGitLab, - gobject-introspection, gtk4, gtksourceview5, libadwaita, @@ -10,29 +10,37 @@ meson, ninja, pkg-config, - python3, + rustPlatform, + rustc, stdenv, wrapGAppsHook4, }: stdenv.mkDerivation (finalAttrs: { pname = "buffer"; - version = "0.9.10"; + version = "0.10.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "cheywood"; repo = "buffer"; tag = finalAttrs.version; - hash = "sha256-amWfrZX1b1OmLhL7w8j/+iEwYRnO1DVR580pLkjtS/g="; + hash = "sha256-81riamRKzV4wXVTXkp1ngO/5mG7leRJMw/r2DDHl8LU="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) src pname version; + hash = "sha256-fwXeXaoC/Uh9eMEkRjhpAouxOrlRWX2n2r4pgIe83S0="; }; nativeBuildInputs = [ + cargo desktop-file-utils - gobject-introspection meson ninja pkg-config + rustPlatform.cargoSetupHook + rustc wrapGAppsHook4 ]; @@ -41,19 +49,8 @@ stdenv.mkDerivation (finalAttrs: { gtksourceview5 libadwaita libspelling - (python3.withPackages ( - ps: with ps; [ - pygobject3 - ] - )) ]; - preFixup = '' - gappsWrapperArgs+=( - --prefix PYTHONPATH : "$out/${python3.sitePackages}" - ) - ''; - meta = { description = "Minimal editing space for all those things that don't need keeping"; homepage = "https://gitlab.gnome.org/cheywood/buffer"; diff --git a/pkgs/by-name/da/dart-sass/package.nix b/pkgs/by-name/da/dart-sass/package.nix index b8945655f42a..d8862fd64f5f 100644 --- a/pkgs/by-name/da/dart-sass/package.nix +++ b/pkgs/by-name/da/dart-sass/package.nix @@ -4,6 +4,7 @@ buildDartApplication, buf, protoc-gen-dart, + writableTmpDirAsHomeHook, testers, dart-sass, runCommand, @@ -16,19 +17,19 @@ let embedded-protocol = fetchFromGitHub { owner = "sass"; repo = "sass"; - rev = "refs/tags/embedded-protocol-${embedded-protocol-version}"; + tag = "embedded-protocol-${embedded-protocol-version}"; hash = "sha256-yX30i1gbVZalVhefj9c37mpFOIDaQlsLeAh7UnY56ro="; }; in buildDartApplication rec { pname = "dart-sass"; - version = "1.89.0"; + version = "1.89.1"; src = fetchFromGitHub { owner = "sass"; repo = "dart-sass"; - rev = version; - hash = "sha256-ydKkZlpjshIf8/Q1ufUFHWmJGonYPtzMiXn4VxDgHDo="; + tag = version; + hash = "sha256-G9uiG7fTDTx9wVH0bV7BeY2TpTEtTHDd0+z/+kLZiwU="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; @@ -36,12 +37,13 @@ buildDartApplication rec { nativeBuildInputs = [ buf protoc-gen-dart + writableTmpDirAsHomeHook ]; preConfigure = '' mkdir -p build ln -s ${embedded-protocol} build/language - HOME="$TMPDIR" buf generate + buf generate ''; dartCompileFlags = [ "--define=version=${version}" ]; diff --git a/pkgs/by-name/da/dart-sass/pubspec.lock.json b/pkgs/by-name/da/dart-sass/pubspec.lock.json index bbe061c58e4d..f2093583f6d9 100644 --- a/pkgs/by-name/da/dart-sass/pubspec.lock.json +++ b/pkgs/by-name/da/dart-sass/pubspec.lock.json @@ -144,11 +144,11 @@ "dependency": "transitive", "description": { "name": "coverage", - "sha256": "802bd084fb82e55df091ec8ad1553a7331b61c08251eef19a508b6f3f3a9858d", + "sha256": "4b8701e48a58f7712492c9b1f7ba0bb9d525644dd66d023b62e1fc8cdb560c8a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.13.1" + "version": "1.14.0" }, "crypto": { "dependency": "direct dev", @@ -184,11 +184,11 @@ "dependency": "direct dev", "description": { "name": "dartdoc", - "sha256": "eb152ab07c585adb11cc24b7b93280a02f6ac5ff724cca4e6cabb24e8be88c82", + "sha256": "f978526530e42dbb831295af743c057d94533e89c27ce1f4023b252f3d85b8be", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.3.3" + "version": "8.3.4" }, "ffi": { "dependency": "transitive", @@ -474,21 +474,21 @@ "dependency": "direct main", "description": { "name": "protobuf", - "sha256": "fbb0c37d435641d0b84813c1dad41e6fa61ddc880a320bce16b3063ecec35aa6", + "sha256": "579fe5557eae58e3adca2e999e38f02441d8aa908703854a9e0a0f47fa857731", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.0" + "version": "4.1.0" }, "protoc_plugin": { "dependency": "direct dev", "description": { "name": "protoc_plugin", - "sha256": "cb2c7ec4ca331a8b1b3042200d1fe329f989450c8d380b45565b21ae3f7f5ce9", + "sha256": "32fbf4ac1b1a7263440898c9011209c3a13c9063f326ef78da83734e6f992ff3", "url": "https://pub.dev" }, "source": "hosted", - "version": "22.1.0" + "version": "22.3.0" }, "pub_api_client": { "dependency": "direct dev", @@ -654,31 +654,31 @@ "dependency": "direct dev", "description": { "name": "test", - "sha256": "f1665eeffe3b6b193548b5f515e8d1b54ccd9a6e0e7721a417e134e7ed7f06a1", + "sha256": "65e29d831719be0591f7b3b1a32a3cda258ec98c58c7b25f7b84241bc31215bb", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.26.0" + "version": "1.26.2" }, "test_api": { "dependency": "transitive", "description": { "name": "test_api", - "sha256": "6c7653816b1c938e121b69ff63a33c9dc68102b65a5fb0a5c0f9786256ed33e6", + "sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.5" + "version": "0.7.6" }, "test_core": { "dependency": "transitive", "description": { "name": "test_core", - "sha256": "3caa7c3956b366643b2dedecff764cc32030317b2a15252aed845570df6bcc0f", + "sha256": "80bf5a02b60af04b09e14f6fe68b921aad119493e26e490deaca5993fef1b05a", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.9" + "version": "0.6.11" }, "test_descriptor": { "dependency": "direct dev", @@ -724,11 +724,11 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02", + "sha256": "6f82e9ee8e7339f5d8b699317f6f3afc17c80a68ebef1bc0d6f52a678c14b1e6", "url": "https://pub.dev" }, "source": "hosted", - "version": "15.0.0" + "version": "15.0.1" }, "watcher": { "dependency": "direct main", diff --git a/pkgs/by-name/ed/eduke32/package.nix b/pkgs/by-name/ed/eduke32/package.nix index bcafef63bade..3033001f6545 100644 --- a/pkgs/by-name/ed/eduke32/package.nix +++ b/pkgs/by-name/ed/eduke32/package.nix @@ -9,13 +9,14 @@ copyDesktopItems, alsa-lib, flac, - gtk2, libvorbis, libvpx, libGL, SDL2, SDL2_mixer, + xorg, graphicsmagick, + unstableGitUpdater, }: let @@ -33,7 +34,14 @@ stdenv.mkDerivation (finalAttrs: { owner = "terminx"; repo = "eduke32"; rev = "b8759847124c2c53a165a02efef4a0c778674baf"; - hash = "sha256-PudO6EKCh6UpoY6GT/J0hkVteKNIAO4Q454jIzaegMg="; + hash = "sha256-+XaIoCP6TA5QMzs/VxXIv1NP8X4i9rIm6iw+pFH8Q6Q="; + deepClone = true; + leaveDotGit = true; + postFetch = '' + cd $out + git rev-list --count HEAD > VC_REV + rm -rf .git + ''; }; patches = [ @@ -52,8 +60,8 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib - gtk2 libGL + xorg.libX11 ]; nativeBuildInputs = @@ -83,10 +91,9 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "SDLCONFIG=${SDL2}/bin/sdl2-config" - # git rev-list --count HEAD - "VC_REV=10619" "VC_HASH=${lib.substring 0 9 finalAttrs.src.rev}" "VC_BRANCH=master" + "HAVE_GTK2=0" ]; buildFlags = [ @@ -94,6 +101,10 @@ stdenv.mkDerivation (finalAttrs: { "sw" ]; + preConfigure = '' + appendToVar makeFlags "VC_REV=$(cat VC_REV)" + ''; + desktopItems = [ (makeDesktopItem { name = "eduke32"; @@ -169,6 +180,8 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; + meta = { description = "Enhanched port of Duke Nukem 3D for various platforms"; homepage = "http://eduke32.com"; diff --git a/pkgs/by-name/fl/flare/engine.nix b/pkgs/by-name/fl/flare/engine.nix index 41feaac20101..d466f032dd8c 100644 --- a/pkgs/by-name/fl/flare/engine.nix +++ b/pkgs/by-name/fl/flare/engine.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "flareteam"; - repo = pname; - rev = "v${version}"; + repo = "flare-engine"; + tag = "v${version}"; hash = "sha256-DIzfTqwZJ8NAPB/TWzvPjepHb7hIbIr+Kk+doXJmpLc="; }; @@ -30,14 +30,14 @@ stdenv.mkDerivation rec { SDL2_ttf ]; - meta = with lib; { + meta = { description = "Free/Libre Action Roleplaying Engine"; homepage = "https://github.com/flareteam/flare-engine"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ aanderse McSinyx ]; - license = [ licenses.gpl3 ]; - platforms = platforms.unix; + license = [ lib.licenses.gpl3Plus ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/fl/flare/game.nix b/pkgs/by-name/fl/flare/game.nix index 74dbcaaaae31..e726d3a290e0 100644 --- a/pkgs/by-name/fl/flare/game.nix +++ b/pkgs/by-name/fl/flare/game.nix @@ -11,21 +11,21 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "flareteam"; - repo = pname; - rev = "v${version}"; + repo = "flare-game"; + tag = "v${version}"; hash = "sha256-tINIwxyQn8eeJCHwRmAMo2TYRgrgJlGaUrnrgbmM3Jo="; }; nativeBuildInputs = [ cmake ]; - meta = with lib; { + meta = { description = "Fantasy action RPG using the FLARE engine"; homepage = "https://github.com/flareteam/flare-game"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ aanderse McSinyx ]; - license = [ licenses.cc-by-sa-30 ]; - platforms = platforms.unix; + license = [ lib.licenses.cc-by-sa-30 ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/gr/grayjay/deps.json b/pkgs/by-name/gr/grayjay/deps.json index d525290b1b91..37e2160290d4 100644 --- a/pkgs/by-name/gr/grayjay/deps.json +++ b/pkgs/by-name/gr/grayjay/deps.json @@ -34,15 +34,25 @@ "version": "1.11.58", "hash": "sha256-VCrBPH6Waw3LmZEKStBSd5uSH2vicndwYazYX6IdnYE=" }, + { + "pname": "HtmlAgilityPack", + "version": "1.5.1", + "hash": "sha256-Jr+DOYzDaJrGRYUZ13zrz/6I2cCh6B+0etWPvPYkJU8=" + }, { "pname": "libsodium", "version": "1.0.20", "hash": "sha256-BsitQQnUSm1YupzI5N/LFx0kPFdk1FP8VdM1S3uttvs=" }, { - "pname": "Microsoft.Bcl.AsyncInterfaces", - "version": "9.0.0", - "hash": "sha256-BsXNOWEgfFq3Yz7VTtK6m/ov4/erRqyBzieWSIpmc1U=" + "pname": "Microsoft.AspNetCore.App.Ref", + "version": "8.0.16", + "hash": "sha256-nV9G5UWIh4A/4vsgmARABY9lM2nzpWevsETKuHfhz9o=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", + "version": "8.0.16", + "hash": "sha256-QcnhPjQNVZGAyh5O74sV94u3DHCQDHjg5U2CXrTykw4=" }, { "pname": "Microsoft.ClearScript.Core", @@ -104,11 +114,6 @@ "version": "4.3.0", "hash": "sha256-a3dAiPaVuky0wpcHmpTVtAQJNGZ2v91/oArA+dpJgj8=" }, - { - "pname": "Microsoft.CSharp", - "version": "4.7.0", - "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0=" - }, { "pname": "Microsoft.Data.Sqlite", "version": "8.0.1", @@ -130,20 +135,25 @@ "hash": "sha256-pogseJyMGIikTZORsDXKwyAhRPTkxiOAAV+ceR6/3K4=" }, { - "pname": "Microsoft.NETCore.Platforms", - "version": "1.0.1", - "hash": "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU=" + "pname": "Microsoft.NETCore.App.Host.linux-x64", + "version": "8.0.16", + "hash": "sha256-j1xxV7RXTrmmqHEaEXtPAz2FQoQiK7RO7a7GRwKCW90=" + }, + { + "pname": "Microsoft.NETCore.App.Ref", + "version": "8.0.16", + "hash": "sha256-ARNf4NsLtYpChsiMv015znXluW7EDWnnw+32I1lu7zU=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.linux-x64", + "version": "8.0.16", + "hash": "sha256-rDkCCwXkHMDQAQj33BDPitTucHYPx3V85kE9L+CwSRA=" }, { "pname": "Microsoft.NETCore.Platforms", "version": "1.1.0", "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" }, - { - "pname": "Microsoft.NETCore.Targets", - "version": "1.0.1", - "hash": "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4=" - }, { "pname": "Microsoft.NETCore.Targets", "version": "1.1.0", @@ -174,11 +184,6 @@ "version": "4.3.0", "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg=" }, - { - "pname": "Microsoft.Win32.Registry", - "version": "5.0.0", - "hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA=" - }, { "pname": "MSTest.TestAdapter", "version": "2.2.10", @@ -229,26 +234,11 @@ "version": "4.3.0", "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8=" }, - { - "pname": "runtime.any.System.Diagnostics.Tools", - "version": "4.3.0", - "hash": "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I=" - }, - { - "pname": "runtime.any.System.Diagnostics.Tracing", - "version": "4.3.0", - "hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI=" - }, { "pname": "runtime.any.System.Globalization", "version": "4.3.0", "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU=" }, - { - "pname": "runtime.any.System.Globalization.Calendars", - "version": "4.3.0", - "hash": "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4=" - }, { "pname": "runtime.any.System.IO", "version": "4.3.0", @@ -259,11 +249,6 @@ "version": "4.3.0", "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=" }, - { - "pname": "runtime.any.System.Reflection.Extensions", - "version": "4.3.0", - "hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8=" - }, { "pname": "runtime.any.System.Reflection.Primitives", "version": "4.3.0", @@ -279,36 +264,16 @@ "version": "4.3.0", "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=" }, - { - "pname": "runtime.any.System.Runtime.Handles", - "version": "4.3.0", - "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4=" - }, - { - "pname": "runtime.any.System.Runtime.InteropServices", - "version": "4.3.0", - "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA=" - }, { "pname": "runtime.any.System.Text.Encoding", "version": "4.3.0", "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=" }, - { - "pname": "runtime.any.System.Text.Encoding.Extensions", - "version": "4.3.0", - "hash": "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM=" - }, { "pname": "runtime.any.System.Threading.Tasks", "version": "4.3.0", "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=" }, - { - "pname": "runtime.any.System.Threading.Timer", - "version": "4.3.0", - "hash": "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs=" - }, { "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", @@ -329,21 +294,6 @@ "version": "4.3.0", "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" }, - { - "pname": "runtime.native.System.IO.Compression", - "version": "4.3.0", - "hash": "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8=" - }, - { - "pname": "runtime.native.System.Net.Http", - "version": "4.3.0", - "hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg=" - }, - { - "pname": "runtime.native.System.Security.Cryptography.Apple", - "version": "4.3.0", - "hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw=" - }, { "pname": "runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", @@ -359,11 +309,6 @@ "version": "4.3.0", "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4=" }, - { - "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple", - "version": "4.3.0", - "hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM=" - }, { "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", @@ -389,36 +334,11 @@ "version": "4.3.0", "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw=" }, - { - "pname": "runtime.unix.Microsoft.Win32.Primitives", - "version": "4.3.0", - "hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg=" - }, - { - "pname": "runtime.unix.System.Console", - "version": "4.3.0", - "hash": "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190=" - }, { "pname": "runtime.unix.System.Diagnostics.Debug", "version": "4.3.0", "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI=" }, - { - "pname": "runtime.unix.System.IO.FileSystem", - "version": "4.3.0", - "hash": "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I=" - }, - { - "pname": "runtime.unix.System.Net.Primitives", - "version": "4.3.0", - "hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0=" - }, - { - "pname": "runtime.unix.System.Net.Sockets", - "version": "4.3.0", - "hash": "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4=" - }, { "pname": "runtime.unix.System.Private.Uri", "version": "4.3.0", @@ -454,16 +374,6 @@ "version": "4.3.0", "hash": "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg=" }, - { - "pname": "System.Buffers", - "version": "4.3.0", - "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk=" - }, - { - "pname": "System.Buffers", - "version": "4.5.1", - "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI=" - }, { "pname": "System.Collections", "version": "4.0.11", @@ -519,21 +429,11 @@ "version": "4.3.0", "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=" }, - { - "pname": "System.Diagnostics.DiagnosticSource", - "version": "4.3.0", - "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw=" - }, { "pname": "System.Diagnostics.TextWriterTraceListener", "version": "4.3.0", "hash": "sha256-gx3IHPvPNRmwpLwtswu12U/ow4f/7OPAeHxyMxw5qyU=" }, - { - "pname": "System.Diagnostics.Tools", - "version": "4.0.1", - "hash": "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U=" - }, { "pname": "System.Diagnostics.Tools", "version": "4.3.0", @@ -574,11 +474,6 @@ "version": "4.3.0", "hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc=" }, - { - "pname": "System.Globalization.Extensions", - "version": "4.3.0", - "hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk=" - }, { "pname": "System.IO", "version": "4.1.0", @@ -599,21 +494,11 @@ "version": "4.3.0", "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs=" }, - { - "pname": "System.IO.FileSystem", - "version": "4.0.1", - "hash": "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0=" - }, { "pname": "System.IO.FileSystem", "version": "4.3.0", "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw=" }, - { - "pname": "System.IO.FileSystem.Primitives", - "version": "4.0.1", - "hash": "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg=" - }, { "pname": "System.IO.FileSystem.Primitives", "version": "4.3.0", @@ -649,26 +534,11 @@ "version": "4.5.3", "hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk=" }, - { - "pname": "System.Memory", - "version": "4.5.4", - "hash": "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E=" - }, - { - "pname": "System.Memory", - "version": "4.5.5", - "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI=" - }, { "pname": "System.Net.Http", "version": "4.3.0", "hash": "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q=" }, - { - "pname": "System.Net.NameResolution", - "version": "4.3.0", - "hash": "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c=" - }, { "pname": "System.Net.Primitives", "version": "4.3.0", @@ -679,11 +549,6 @@ "version": "4.3.0", "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus=" }, - { - "pname": "System.Numerics.Vectors", - "version": "4.4.0", - "hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U=" - }, { "pname": "System.ObjectModel", "version": "4.0.12", @@ -709,36 +574,6 @@ "version": "4.3.0", "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" }, - { - "pname": "System.Reflection.Emit", - "version": "4.0.1", - "hash": "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk=" - }, - { - "pname": "System.Reflection.Emit", - "version": "4.3.0", - "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU=" - }, - { - "pname": "System.Reflection.Emit.ILGeneration", - "version": "4.0.1", - "hash": "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0=" - }, - { - "pname": "System.Reflection.Emit.ILGeneration", - "version": "4.3.0", - "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA=" - }, - { - "pname": "System.Reflection.Emit.Lightweight", - "version": "4.0.1", - "hash": "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g=" - }, - { - "pname": "System.Reflection.Emit.Lightweight", - "version": "4.3.0", - "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I=" - }, { "pname": "System.Reflection.Extensions", "version": "4.0.1", @@ -754,21 +589,11 @@ "version": "1.6.0", "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E=" }, - { - "pname": "System.Reflection.Primitives", - "version": "4.0.1", - "hash": "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0=" - }, { "pname": "System.Reflection.Primitives", "version": "4.3.0", "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" }, - { - "pname": "System.Reflection.TypeExtensions", - "version": "4.1.0", - "hash": "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4=" - }, { "pname": "System.Reflection.TypeExtensions", "version": "4.3.0", @@ -794,16 +619,6 @@ "version": "4.3.0", "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "4.5.3", - "hash": "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak=" - }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "6.0.0", - "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" - }, { "pname": "System.Runtime.Extensions", "version": "4.1.0", @@ -814,21 +629,11 @@ "version": "4.3.0", "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=" }, - { - "pname": "System.Runtime.Handles", - "version": "4.0.1", - "hash": "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w=" - }, { "pname": "System.Runtime.Handles", "version": "4.3.0", "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms=" }, - { - "pname": "System.Runtime.InteropServices", - "version": "4.1.0", - "hash": "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY=" - }, { "pname": "System.Runtime.InteropServices", "version": "4.3.0", @@ -859,41 +664,16 @@ "version": "4.3.0", "hash": "sha256-zu5m1M9usend+i9sbuD6Xbizdo8Z6N5PEF9DAtEVewc=" }, - { - "pname": "System.Security.AccessControl", - "version": "5.0.0", - "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54=" - }, - { - "pname": "System.Security.Claims", - "version": "4.3.0", - "hash": "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks=" - }, { "pname": "System.Security.Cryptography.Algorithms", "version": "4.3.0", "hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8=" }, - { - "pname": "System.Security.Cryptography.Cng", - "version": "4.3.0", - "hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw=" - }, - { - "pname": "System.Security.Cryptography.Csp", - "version": "4.3.0", - "hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ=" - }, { "pname": "System.Security.Cryptography.Encoding", "version": "4.3.0", "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss=" }, - { - "pname": "System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4=" - }, { "pname": "System.Security.Cryptography.Primitives", "version": "4.3.0", @@ -904,21 +684,6 @@ "version": "4.3.0", "hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0=" }, - { - "pname": "System.Security.Principal", - "version": "4.3.0", - "hash": "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk=" - }, - { - "pname": "System.Security.Principal.Windows", - "version": "4.3.0", - "hash": "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE=" - }, - { - "pname": "System.Security.Principal.Windows", - "version": "5.0.0", - "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y=" - }, { "pname": "System.Text.Encoding", "version": "4.0.11", @@ -979,26 +744,6 @@ "version": "4.3.0", "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.0.0", - "hash": "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE=" - }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.3.0", - "hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc=" - }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.5.4", - "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng=" - }, - { - "pname": "System.Threading.ThreadPool", - "version": "4.3.0", - "hash": "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg=" - }, { "pname": "System.Threading.Timer", "version": "4.3.0", diff --git a/pkgs/by-name/gr/grayjay/package.nix b/pkgs/by-name/gr/grayjay/package.nix index 52ee039d8c9a..c29973c50aa1 100644 --- a/pkgs/by-name/gr/grayjay/package.nix +++ b/pkgs/by-name/gr/grayjay/package.nix @@ -32,15 +32,16 @@ libgcc, krb5, wrapGAppsHook3, + _experimental-update-script-combinators, }: let - version = "5"; + version = "7"; src = fetchFromGitLab { domain = "gitlab.futo.org"; owner = "videostreaming"; repo = "Grayjay.Desktop"; tag = version; - hash = "sha256-xrbYghNymny6MQrvFn++GaI+kUoOphPQMWcqH47U1Yg="; + hash = "sha256-EaAMkYbQwj0IXDraRZHqvdK19SlyKtXfqkIOGzkiY7Q="; fetchSubmodules = true; fetchLFS = true; }; @@ -60,7 +61,7 @@ let ''; }; in -buildDotnetModule { +buildDotnetModule (finalAttrs: { pname = "grayjay"; inherit version src frontend; @@ -113,7 +114,8 @@ buildDotnetModule { nugetDeps = ./deps.json; - dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; + dotnet-sdk = dotnetCorePackages.sdk_9_0; + dotnet-runtime = dotnetCorePackages.aspnetcore_9_0; executables = [ "Grayjay" ]; @@ -164,14 +166,17 @@ buildDotnetModule { libsecret ]; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--subpackage" - "frontend" - "--url" - "https://github.com/futo-org/Grayjay.Desktop" - ]; - }; + passthru.updateScript = _experimental-update-script-combinators.sequence [ + (nix-update-script { + extraArgs = [ + "--subpackage" + "frontend" + "--url" + "https://github.com/futo-org/Grayjay.Desktop" + ]; + }) + (finalAttrs.passthru.fetch-deps) + ]; meta = { description = "Cross-platform application to stream and download content from various sources"; @@ -188,4 +193,4 @@ buildDotnetModule { platforms = [ "x86_64-linux" ]; mainProgram = "Grayjay"; }; -} +}) diff --git a/pkgs/by-name/ho/hoppscotch/package.nix b/pkgs/by-name/ho/hoppscotch/package.nix index 11fed297344e..1f6767fca16b 100644 --- a/pkgs/by-name/ho/hoppscotch/package.nix +++ b/pkgs/by-name/ho/hoppscotch/package.nix @@ -8,22 +8,22 @@ let pname = "hoppscotch"; - version = "25.4.2-0"; + version = "25.5.1-0"; src = fetchurl { aarch64-darwin = { url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_aarch64.dmg"; - hash = "sha256-f3Ar5QUm1MJ/kfLRsjxAU1mudpJhU63uxEdu17Y2rmo="; + hash = "sha256-03WSc4/udaShc9te7Xv09gCgMv9i2/WvK55mpj4AK5k="; }; x86_64-darwin = { url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_x64.dmg"; - hash = "sha256-Q21XD+LWx6b/2e4qUabDpjxaJ7h1yz2T4ZbyIDWAljE="; + hash = "sha256-1D/ZW+KxbmJtt62uQOdZZwiKk+6r1hhviwe7CZxaXns="; }; x86_64-linux = { url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_linux_x64.AppImage"; - hash = "sha256-Y+zvpTfsVwvM8clyTeE8bFCJfsOTJkkGOWzzVQtZrYI="; + hash = "sha256-REj9VtAggS6PcGSh3K+GByxhUk6elKoHsSck42U9IdA="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/by-name/im/imgbrd-grabber/fix-for-qt6.patch b/pkgs/by-name/im/imgbrd-grabber/fix-for-qt6.patch new file mode 100644 index 000000000000..b2a9e3542e4d --- /dev/null +++ b/pkgs/by-name/im/imgbrd-grabber/fix-for-qt6.patch @@ -0,0 +1,11 @@ +diffsrc/cli/vendor/qcommandlinecommandparser/qcommandlinecommandparser.cpp b/src/cli/vendor/qcommandlinecommandparser/qcommandlinecommandparser.cpp +index 0742cac1..da820e94 100644 +--- src/cli/vendor/qcommandlinecommandparser/qcommandlinecommandparser.cpp ++++ src/cli/vendor/qcommandlinecommandparser/qcommandlinecommandparser.cpp +@@ -1,5 +1,6 @@ + #include "qcommandlinecommandparser.h" + #include ++#include + #include "vendor.h" + + Q_CORE_EXPORT void qt_call_post_routines(); diff --git a/pkgs/by-name/im/imgbrd-grabber/package.nix b/pkgs/by-name/im/imgbrd-grabber/package.nix index 6e4646c1afc7..4848228f2c95 100644 --- a/pkgs/by-name/im/imgbrd-grabber/package.nix +++ b/pkgs/by-name/im/imgbrd-grabber/package.nix @@ -57,6 +57,10 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs ../scripts/package.sh ''; + patches = [ + ./fix-for-qt6.patch + ]; + postPatch = '' # ensure the script uses the rsync package from nixpkgs diff --git a/pkgs/by-name/im/immich-public-proxy/package.nix b/pkgs/by-name/im/immich-public-proxy/package.nix index 2d5bcf6217f3..11567f7450b9 100644 --- a/pkgs/by-name/im/immich-public-proxy/package.nix +++ b/pkgs/by-name/im/immich-public-proxy/package.nix @@ -8,17 +8,17 @@ }: buildNpmPackage rec { pname = "immich-public-proxy"; - version = "1.11.1"; + version = "1.11.2"; src = fetchFromGitHub { owner = "alangrainger"; repo = "immich-public-proxy"; tag = "v${version}"; - hash = "sha256-tuF2ienJPQgPSugJQMZsqgPEB+b/zW013Hx9OUTvV6E="; + hash = "sha256-4FZa2OZ0It2UF2VHpNFQvkNyuFkTBfjxxxMgKlEzo6I="; }; sourceRoot = "${src.name}/app"; - npmDepsHash = "sha256-fl2oboifADrWIOKfdKtckuG4jiOSGT8oMRRXeXpJ8E0="; + npmDepsHash = "sha256-3cL6bijTEg5m2KhHu6TcjaDF9BP+GYSn09pEtdr3oYI="; # patch in absolute nix store paths so the process doesn't need to cwd in $out postPatch = '' diff --git a/pkgs/by-name/ja/jazz2/package.nix b/pkgs/by-name/ja/jazz2/package.nix index a5e97f26f2d5..d7781911b0f5 100644 --- a/pkgs/by-name/ja/jazz2/package.nix +++ b/pkgs/by-name/ja/jazz2/package.nix @@ -1,34 +1,37 @@ { - lib, - stdenv, - fetchFromGitHub, cmake, + curl, + fetchFromGitHub, + gitUpdater, jazz2-content, + lib, + libGL, libopenmpt, libvorbis, openal, SDL2, - libGL, - zlib, + stdenv, versionCheckHook, - gitUpdater, + zlib, }: stdenv.mkDerivation (finalAttrs: { pname = "jazz2"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "deathkiller"; repo = "jazz2-native"; tag = finalAttrs.version; - hash = "sha256-9Fsm4hiNIEi5OVZLOLccSUkFmHnQ+ZUoBor+DZ9edVo="; + hash = "sha256-dj+BEAx626vSPy26+Ip3uaj3SBE1SWkfbh5P8U0iXsg="; }; patches = [ ./nocontent.patch ]; + strictDeps = true; nativeBuildInputs = [ cmake ]; buildInputs = [ + curl libGL libopenmpt libvorbis @@ -38,8 +41,8 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - (lib.cmakeFeature "LIBOPENMPT_INCLUDE_DIR" "${lib.getDev libopenmpt}/include/libopenmpt") (lib.cmakeBool "NCINE_DOWNLOAD_DEPENDENCIES" false) + (lib.cmakeFeature "LIBOPENMPT_INCLUDE_DIR" "${lib.getDev libopenmpt}/include/libopenmpt") (lib.cmakeFeature "NCINE_OVERRIDE_CONTENT_PATH" "${jazz2-content}") ]; diff --git a/pkgs/by-name/kc/kchmviewer/package.nix b/pkgs/by-name/kc/kchmviewer/package.nix new file mode 100644 index 000000000000..3e84705d0992 --- /dev/null +++ b/pkgs/by-name/kc/kchmviewer/package.nix @@ -0,0 +1,81 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + qt5, + chmlib, + libzip, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "kchmviewer"; + version = "8.0"; + + src = fetchFromGitHub { + owner = "gyunaev"; + repo = "kchmviewer"; + tag = "RELEASE_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; + hash = "sha256-YNpiBf6AFBCRbAZRPODvqGbQQedJJJrZFQIQyzIeBlw="; + }; + + patches = [ + # remove unused webkit + (fetchpatch { + url = "https://github.com/gyunaev/kchmviewer/commit/a4a3984465cb635822953350c571950ae726b539.patch"; + hash = "sha256-nHW18a4SrTG4fETJmKS4ojHXwnX1d1uN1m4H0GIuI28="; + }) + # QtWebengine fixes + (fetchpatch { + url = "https://github.com/gyunaev/kchmviewer/commit/9ac73e7ad15de08aab6b1198115be2eb44da7afe.patch"; + hash = "sha256-qg2ytqA2On7jg19WZmHIOU7vLQI2hoyqItySLEA64SY="; + }) + (fetchpatch { + url = "https://github.com/gyunaev/kchmviewer/commit/99a6d94bdfce9c4578cce82707e71863a71d1453.patch"; + hash = "sha256-o8JkaMmcJObmMt+o/6ooCAPCi+yRAWDAgxV+tR5eHfY="; + }) + # Fix build on macOS + (fetchpatch { + url = "https://github.com/gyunaev/kchmviewer/pull/35/commits/b68ed6fe72eaf9ee4e7e42925f5071fbd02dc6b3.patch"; + hash = "sha256-sJA0RE0Z83tYv0S42yQYWKKeLhW+YDsrxLkY5aMKKT4="; + }) + (fetchpatch { + url = "https://github.com/gyunaev/kchmviewer/pull/35/commits/d307e4e829c5a6f57ab0040f786c3da7fd2f0a99.patch"; + hash = "sha256-FWYfqG8heL6AnhevueCWHQc+c6Yj4+DuIdjIwXVZ+O4="; + }) + ]; + + buildInputs = [ + chmlib + libzip + qt5.qtwebengine + ]; + + nativeBuildInputs = [ + qt5.qmake + qt5.wrapQtAppsHook + ]; + + postInstall = + if stdenv.hostPlatform.isDarwin then + '' + mkdir -p $out/{Applications,bin} + mv bin/kchmviewer.app $out/Applications + ln -s $out/Applications/kchmviewer.app/Contents/MacOS/kchmviewer $out/bin/kchmviewer + '' + else + '' + install -Dm755 bin/kchmviewer -t $out/bin + install -Dm644 packages/kchmviewer.png -t $out/share/pixmaps + install -Dm644 packages/kchmviewer.desktop -t $out/share/applications + ''; + + meta = { + description = "CHM (Winhelp) files viewer"; + mainProgram = "kchmviewer"; + homepage = "http://www.ulduzsoft.com/linux/kchmviewer/"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ sikmir ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/me/memogram/package.nix b/pkgs/by-name/me/memogram/package.nix index 9205ea5d3f5b..ebe7c03b0196 100644 --- a/pkgs/by-name/me/memogram/package.nix +++ b/pkgs/by-name/me/memogram/package.nix @@ -4,18 +4,18 @@ fetchFromGitHub, nix-update-script, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "memogram"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "usememos"; repo = "telegram-integration"; - tag = "v${version}"; - hash = "sha256-nhNVo8Bp/g/IWyj548BQlyxPy1t3DDCyLmInDwQCH4c="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Q3C1Ehs2TMeKsnjcNiL4HK08sCeWXjqVHiE55iHs0g8="; }; - vendorHash = "sha256-g8mAG5l2juOVaem2xk+pPVzKYNJHbWbkS/D0LwF+XdM="; + vendorHash = "sha256-3NdWhckcXUEeKLz2G7xsHlbIBViyvFDCQzNVvaDi48U="; subPackages = [ "bin/memogram" ]; @@ -24,10 +24,10 @@ buildGoModule rec { meta = { description = "Easy to use integration service for syncing messages and images from a Telegram bot into your Memos"; homepage = "https://github.com/usememos/telegram-integration"; - changelog = "https://github.com/usememos/telegram-integration/releases/v${version}"; + changelog = "https://github.com/usememos/telegram-integration/releases/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ merrkry ]; mainProgram = "memogram"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/mu/multipass/pubspec.lock.json b/pkgs/by-name/mu/multipass/pubspec.lock.json index a6afc3de0299..a96a27a386ef 100644 --- a/pkgs/by-name/mu/multipass/pubspec.lock.json +++ b/pkgs/by-name/mu/multipass/pubspec.lock.json @@ -1 +1 @@ -{"packages":{"args":{"dependency":"transitive","description":{"name":"args","sha256":"7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a","url":"https://pub.dev"},"source":"hosted","version":"2.5.0"},"asn1lib":{"dependency":"transitive","description":{"name":"asn1lib","sha256":"6b151826fcc95ff246cd219a0bf4c753ea14f4081ad71c61939becf3aba27f70","url":"https://pub.dev"},"source":"hosted","version":"1.5.5"},"async":{"dependency":"direct main","description":{"name":"async","sha256":"947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c","url":"https://pub.dev"},"source":"hosted","version":"2.11.0"},"basics":{"dependency":"direct main","description":{"name":"basics","sha256":"41ff8aded84ae174d1df5cce0bcac3ab9070caac9f7da35fd2cc638dfee6163f","url":"https://pub.dev"},"source":"hosted","version":"0.10.0"},"boolean_selector":{"dependency":"transitive","description":{"name":"boolean_selector","sha256":"6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66","url":"https://pub.dev"},"source":"hosted","version":"2.1.1"},"built_collection":{"dependency":"direct main","description":{"name":"built_collection","sha256":"376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100","url":"https://pub.dev"},"source":"hosted","version":"5.1.1"},"characters":{"dependency":"transitive","description":{"name":"characters","sha256":"04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605","url":"https://pub.dev"},"source":"hosted","version":"1.3.0"},"clock":{"dependency":"transitive","description":{"name":"clock","sha256":"cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf","url":"https://pub.dev"},"source":"hosted","version":"1.1.1"},"collection":{"dependency":"direct main","description":{"name":"collection","sha256":"ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a","url":"https://pub.dev"},"source":"hosted","version":"1.18.0"},"convert":{"dependency":"transitive","description":{"name":"convert","sha256":"0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592","url":"https://pub.dev"},"source":"hosted","version":"3.1.1"},"cross_file":{"dependency":"transitive","description":{"name":"cross_file","sha256":"7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670","url":"https://pub.dev"},"source":"hosted","version":"0.3.4+2"},"crypto":{"dependency":"transitive","description":{"name":"crypto","sha256":"ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27","url":"https://pub.dev"},"source":"hosted","version":"3.0.5"},"dartssh2":{"dependency":"direct main","description":{"path":".","ref":"2.10.0+mp","resolved-ref":"e7c66932cf7ca8eba083268fa3230222c8cd0722","url":"https://github.com/andrei-toterman/dartssh2.git"},"source":"git","version":"2.10.0"},"equatable":{"dependency":"transitive","description":{"name":"equatable","sha256":"c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2","url":"https://pub.dev"},"source":"hosted","version":"2.0.5"},"extended_text":{"dependency":"direct main","description":{"name":"extended_text","sha256":"b0cdd240b4ddf61d18d7e33e7775195971f2d033bd69706fa897446dc96c3b81","url":"https://pub.dev"},"source":"hosted","version":"14.1.0"},"extended_text_library":{"dependency":"transitive","description":{"name":"extended_text_library","sha256":"55d09098ec56fab0d9a8a68950ca0bbf2efa1327937f7cec6af6dfa066234829","url":"https://pub.dev"},"source":"hosted","version":"12.0.0"},"ffi":{"dependency":"direct main","description":{"name":"ffi","sha256":"16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6","url":"https://pub.dev"},"source":"hosted","version":"2.1.3"},"file":{"dependency":"transitive","description":{"name":"file","sha256":"5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c","url":"https://pub.dev"},"source":"hosted","version":"7.0.0"},"file_selector":{"dependency":"direct main","description":{"name":"file_selector","sha256":"5019692b593455127794d5718304ff1ae15447dea286cdda9f0db2a796a1b828","url":"https://pub.dev"},"source":"hosted","version":"1.0.3"},"file_selector_android":{"dependency":"transitive","description":{"name":"file_selector_android","sha256":"8bcc3af859e9d47fab9c7dc315537406511a894ab578e198bd8f9ed745ea5a01","url":"https://pub.dev"},"source":"hosted","version":"0.5.1+2"},"file_selector_ios":{"dependency":"transitive","description":{"name":"file_selector_ios","sha256":"38ebf91ecbcfa89a9639a0854ccaed8ab370c75678938eebca7d34184296f0bb","url":"https://pub.dev"},"source":"hosted","version":"0.5.3"},"file_selector_linux":{"dependency":"transitive","description":{"name":"file_selector_linux","sha256":"045d372bf19b02aeb69cacf8b4009555fb5f6f0b7ad8016e5f46dd1387ddd492","url":"https://pub.dev"},"source":"hosted","version":"0.9.2+1"},"file_selector_macos":{"dependency":"transitive","description":{"name":"file_selector_macos","sha256":"f42eacb83b318e183b1ae24eead1373ab1334084404c8c16e0354f9a3e55d385","url":"https://pub.dev"},"source":"hosted","version":"0.9.4"},"file_selector_platform_interface":{"dependency":"transitive","description":{"name":"file_selector_platform_interface","sha256":"a3994c26f10378a039faa11de174d7b78eb8f79e4dd0af2a451410c1a5c3f66b","url":"https://pub.dev"},"source":"hosted","version":"2.6.2"},"file_selector_web":{"dependency":"transitive","description":{"name":"file_selector_web","sha256":"c4c0ea4224d97a60a7067eca0c8fd419e708ff830e0c83b11a48faf566cec3e7","url":"https://pub.dev"},"source":"hosted","version":"0.9.4+2"},"file_selector_windows":{"dependency":"transitive","description":{"name":"file_selector_windows","sha256":"2ad726953f6e8affbc4df8dc78b77c3b4a060967a291e528ef72ae846c60fb69","url":"https://pub.dev"},"source":"hosted","version":"0.9.3+2"},"fixnum":{"dependency":"transitive","description":{"name":"fixnum","sha256":"25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1","url":"https://pub.dev"},"source":"hosted","version":"1.1.0"},"fl_chart":{"dependency":"direct main","description":{"name":"fl_chart","sha256":"94307bef3a324a0d329d3ab77b2f0c6e5ed739185ffc029ed28c0f9b019ea7ef","url":"https://pub.dev"},"source":"hosted","version":"0.69.0"},"flutter":{"dependency":"direct main","description":"flutter","source":"sdk","version":"0.0.0"},"flutter_lints":{"dependency":"direct dev","description":{"name":"flutter_lints","sha256":"5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1","url":"https://pub.dev"},"source":"hosted","version":"5.0.0"},"flutter_riverpod":{"dependency":"direct main","description":{"name":"flutter_riverpod","sha256":"0f1974eff5bbe774bf1d870e406fc6f29e3d6f1c46bd9c58e7172ff68a785d7d","url":"https://pub.dev"},"source":"hosted","version":"2.5.1"},"flutter_svg":{"dependency":"direct main","description":{"name":"flutter_svg","sha256":"7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2","url":"https://pub.dev"},"source":"hosted","version":"2.0.10+1"},"flutter_web_plugins":{"dependency":"transitive","description":"flutter","source":"sdk","version":"0.0.0"},"fpdart":{"dependency":"direct main","description":{"name":"fpdart","sha256":"7413acc5a6569a3fe8277928fc7487f3198530f0c4e635d0baef199ea36e8ee9","url":"https://pub.dev"},"source":"hosted","version":"1.1.0"},"google_identity_services_web":{"dependency":"transitive","description":{"name":"google_identity_services_web","sha256":"5be191523702ba8d7a01ca97c17fca096822ccf246b0a9f11923a6ded06199b6","url":"https://pub.dev"},"source":"hosted","version":"0.3.1+4"},"googleapis_auth":{"dependency":"transitive","description":{"name":"googleapis_auth","sha256":"befd71383a955535060acde8792e7efc11d2fccd03dd1d3ec434e85b68775938","url":"https://pub.dev"},"source":"hosted","version":"1.6.0"},"grpc":{"dependency":"direct main","description":{"name":"grpc","sha256":"5b99b7a420937d4361ece68b798c9af8e04b5bc128a7859f2a4be87427694813","url":"https://pub.dev"},"source":"hosted","version":"4.0.1"},"hotkey_manager":{"dependency":"direct main","description":{"name":"hotkey_manager","sha256":"06f0655b76c8dd322fb7101dc615afbdbf39c3d3414df9e059c33892104479cd","url":"https://pub.dev"},"source":"hosted","version":"0.2.3"},"hotkey_manager_linux":{"dependency":"direct overridden","description":{"path":"packages/hotkey_manager_linux","ref":"no-cooked-accel","resolved-ref":"7e5a662615fbc9f077c1567fd7a66ec34ad52b5e","url":"https://github.com/andrei-toterman/hotkey_manager.git"},"source":"git","version":"0.2.0"},"hotkey_manager_macos":{"dependency":"transitive","description":{"name":"hotkey_manager_macos","sha256":"03b5967e64357b9ac05188ea4a5df6fe4ed4205762cb80aaccf8916ee1713c96","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"hotkey_manager_platform_interface":{"dependency":"transitive","description":{"name":"hotkey_manager_platform_interface","sha256":"98ffca25b8cc9081552902747b2942e3bc37855389a4218c9d50ca316b653b13","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"hotkey_manager_windows":{"dependency":"transitive","description":{"name":"hotkey_manager_windows","sha256":"0d03ced9fe563ed0b68f0a0e1b22c9ffe26eb8053cb960e401f68a4f070e0117","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"http":{"dependency":"transitive","description":{"name":"http","sha256":"b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010","url":"https://pub.dev"},"source":"hosted","version":"1.2.2"},"http2":{"dependency":"transitive","description":{"name":"http2","sha256":"9ced024a160b77aba8fb8674e38f70875e321d319e6f303ec18e87bd5a4b0c1d","url":"https://pub.dev"},"source":"hosted","version":"2.3.0"},"http_parser":{"dependency":"transitive","description":{"name":"http_parser","sha256":"2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b","url":"https://pub.dev"},"source":"hosted","version":"4.0.2"},"intl":{"dependency":"direct main","description":{"name":"intl","sha256":"99f282cb0e02edcbbf8c6b3bbc7c90b65635156c412e58f3975a7e55284ce685","url":"https://pub.dev"},"source":"hosted","version":"0.20.0"},"js":{"dependency":"transitive","description":{"name":"js","sha256":"c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf","url":"https://pub.dev"},"source":"hosted","version":"0.7.1"},"json_annotation":{"dependency":"transitive","description":{"name":"json_annotation","sha256":"1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1","url":"https://pub.dev"},"source":"hosted","version":"4.9.0"},"lints":{"dependency":"transitive","description":{"name":"lints","sha256":"3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413","url":"https://pub.dev"},"source":"hosted","version":"5.0.0"},"local_notifier":{"dependency":"direct main","description":{"name":"local_notifier","sha256":"f6cfc933c6fbc961f4e52b5c880f68e41b2d3cd29aad557cc654fd211093a025","url":"https://pub.dev"},"source":"hosted","version":"0.1.6"},"logger":{"dependency":"direct main","description":{"name":"logger","sha256":"697d067c60c20999686a0add96cf6aba723b3aa1f83ecf806a8097231529ec32","url":"https://pub.dev"},"source":"hosted","version":"2.4.0"},"matcher":{"dependency":"transitive","description":{"name":"matcher","sha256":"d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb","url":"https://pub.dev"},"source":"hosted","version":"0.12.16+1"},"material_color_utilities":{"dependency":"transitive","description":{"name":"material_color_utilities","sha256":"f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec","url":"https://pub.dev"},"source":"hosted","version":"0.11.1"},"meta":{"dependency":"transitive","description":{"name":"meta","sha256":"bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7","url":"https://pub.dev"},"source":"hosted","version":"1.15.0"},"path":{"dependency":"transitive","description":{"name":"path","sha256":"087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af","url":"https://pub.dev"},"source":"hosted","version":"1.9.0"},"path_parsing":{"dependency":"transitive","description":{"name":"path_parsing","sha256":"e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf","url":"https://pub.dev"},"source":"hosted","version":"1.0.1"},"path_provider":{"dependency":"direct main","description":{"name":"path_provider","sha256":"fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378","url":"https://pub.dev"},"source":"hosted","version":"2.1.4"},"path_provider_android":{"dependency":"transitive","description":{"name":"path_provider_android","sha256":"6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7","url":"https://pub.dev"},"source":"hosted","version":"2.2.10"},"path_provider_foundation":{"dependency":"transitive","description":{"name":"path_provider_foundation","sha256":"f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16","url":"https://pub.dev"},"source":"hosted","version":"2.4.0"},"path_provider_linux":{"dependency":"transitive","description":{"name":"path_provider_linux","sha256":"f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279","url":"https://pub.dev"},"source":"hosted","version":"2.2.1"},"path_provider_platform_interface":{"dependency":"transitive","description":{"name":"path_provider_platform_interface","sha256":"88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334","url":"https://pub.dev"},"source":"hosted","version":"2.1.2"},"path_provider_windows":{"dependency":"transitive","description":{"name":"path_provider_windows","sha256":"bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7","url":"https://pub.dev"},"source":"hosted","version":"2.3.0"},"petitparser":{"dependency":"transitive","description":{"name":"petitparser","sha256":"c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27","url":"https://pub.dev"},"source":"hosted","version":"6.0.2"},"pinenacl":{"dependency":"transitive","description":{"name":"pinenacl","sha256":"57e907beaacbc3c024a098910b6240758e899674de07d6949a67b52fd984cbdf","url":"https://pub.dev"},"source":"hosted","version":"0.6.0"},"platform":{"dependency":"transitive","description":{"name":"platform","sha256":"9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65","url":"https://pub.dev"},"source":"hosted","version":"3.1.5"},"plugin_platform_interface":{"dependency":"transitive","description":{"name":"plugin_platform_interface","sha256":"4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02","url":"https://pub.dev"},"source":"hosted","version":"2.1.8"},"pointycastle":{"dependency":"transitive","description":{"name":"pointycastle","sha256":"4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe","url":"https://pub.dev"},"source":"hosted","version":"3.9.1"},"protobuf":{"dependency":"direct main","description":{"name":"protobuf","sha256":"68645b24e0716782e58948f8467fd42a880f255096a821f9e7d0ec625b00c84d","url":"https://pub.dev"},"source":"hosted","version":"3.1.0"},"quiver":{"dependency":"transitive","description":{"name":"quiver","sha256":"ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2","url":"https://pub.dev"},"source":"hosted","version":"3.2.2"},"riverpod":{"dependency":"transitive","description":{"name":"riverpod","sha256":"f21b32ffd26a36555e501b04f4a5dca43ed59e16343f1a30c13632b2351dfa4d","url":"https://pub.dev"},"source":"hosted","version":"2.5.1"},"rxdart":{"dependency":"direct main","description":{"name":"rxdart","sha256":"5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962","url":"https://pub.dev"},"source":"hosted","version":"0.28.0"},"screen_retriever":{"dependency":"transitive","description":{"name":"screen_retriever","sha256":"6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90","url":"https://pub.dev"},"source":"hosted","version":"0.1.9"},"shared_preferences":{"dependency":"direct main","description":{"name":"shared_preferences","sha256":"746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051","url":"https://pub.dev"},"source":"hosted","version":"2.3.2"},"shared_preferences_android":{"dependency":"transitive","description":{"name":"shared_preferences_android","sha256":"480ba4345773f56acda9abf5f50bd966f581dac5d514e5fc4a18c62976bbba7e","url":"https://pub.dev"},"source":"hosted","version":"2.3.2"},"shared_preferences_foundation":{"dependency":"transitive","description":{"name":"shared_preferences_foundation","sha256":"c4b35f6cb8f63c147312c054ce7c2254c8066745125264f0c88739c417fc9d9f","url":"https://pub.dev"},"source":"hosted","version":"2.5.2"},"shared_preferences_linux":{"dependency":"transitive","description":{"name":"shared_preferences_linux","sha256":"580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"shared_preferences_platform_interface":{"dependency":"transitive","description":{"name":"shared_preferences_platform_interface","sha256":"57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"shared_preferences_web":{"dependency":"transitive","description":{"name":"shared_preferences_web","sha256":"d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e","url":"https://pub.dev"},"source":"hosted","version":"2.4.2"},"shared_preferences_windows":{"dependency":"transitive","description":{"name":"shared_preferences_windows","sha256":"94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"sky_engine":{"dependency":"transitive","description":"flutter","source":"sdk","version":"0.0.99"},"source_span":{"dependency":"transitive","description":{"name":"source_span","sha256":"53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c","url":"https://pub.dev"},"source":"hosted","version":"1.10.0"},"sprintf":{"dependency":"transitive","description":{"name":"sprintf","sha256":"1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23","url":"https://pub.dev"},"source":"hosted","version":"7.0.0"},"stack_trace":{"dependency":"transitive","description":{"name":"stack_trace","sha256":"9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377","url":"https://pub.dev"},"source":"hosted","version":"1.12.0"},"state_notifier":{"dependency":"transitive","description":{"name":"state_notifier","sha256":"b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb","url":"https://pub.dev"},"source":"hosted","version":"1.0.0"},"stream_channel":{"dependency":"transitive","description":{"name":"stream_channel","sha256":"ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7","url":"https://pub.dev"},"source":"hosted","version":"2.1.2"},"string_scanner":{"dependency":"transitive","description":{"name":"string_scanner","sha256":"688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3","url":"https://pub.dev"},"source":"hosted","version":"1.3.0"},"synchronized":{"dependency":"direct main","description":{"name":"synchronized","sha256":"69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225","url":"https://pub.dev"},"source":"hosted","version":"3.3.0+3"},"term_glyph":{"dependency":"transitive","description":{"name":"term_glyph","sha256":"a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84","url":"https://pub.dev"},"source":"hosted","version":"1.2.1"},"test_api":{"dependency":"transitive","description":{"name":"test_api","sha256":"664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c","url":"https://pub.dev"},"source":"hosted","version":"0.7.3"},"tray_menu":{"dependency":"direct main","description":{"path":".","ref":"7c1394c","resolved-ref":"7c1394c46aac4598ebdd3fa6670e4ea2904a4d31","url":"https://github.com/andrei-toterman/tray_menu.git"},"source":"git","version":"0.0.1"},"two_dimensional_scrollables":{"dependency":"direct main","description":{"name":"two_dimensional_scrollables","sha256":"74ce1f35a8c74370b322049c9d00bf098938661e9f67054eae0f618e6dc0cb62","url":"https://pub.dev"},"source":"hosted","version":"0.3.2"},"typed_data":{"dependency":"transitive","description":{"name":"typed_data","sha256":"facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c","url":"https://pub.dev"},"source":"hosted","version":"1.3.2"},"uni_platform":{"dependency":"transitive","description":{"name":"uni_platform","sha256":"e02213a7ee5352212412ca026afd41d269eb00d982faa552f419ffc2debfad84","url":"https://pub.dev"},"source":"hosted","version":"0.1.3"},"url_launcher":{"dependency":"direct main","description":{"name":"url_launcher","sha256":"21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3","url":"https://pub.dev"},"source":"hosted","version":"6.3.0"},"url_launcher_android":{"dependency":"transitive","description":{"name":"url_launcher_android","sha256":"e35a698ac302dd68e41f73250bd9517fe3ab5fa4f18fe4647a0872db61bacbab","url":"https://pub.dev"},"source":"hosted","version":"6.3.10"},"url_launcher_ios":{"dependency":"transitive","description":{"name":"url_launcher_ios","sha256":"e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e","url":"https://pub.dev"},"source":"hosted","version":"6.3.1"},"url_launcher_linux":{"dependency":"transitive","description":{"name":"url_launcher_linux","sha256":"e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af","url":"https://pub.dev"},"source":"hosted","version":"3.2.0"},"url_launcher_macos":{"dependency":"transitive","description":{"name":"url_launcher_macos","sha256":"769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672","url":"https://pub.dev"},"source":"hosted","version":"3.2.1"},"url_launcher_platform_interface":{"dependency":"transitive","description":{"name":"url_launcher_platform_interface","sha256":"552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029","url":"https://pub.dev"},"source":"hosted","version":"2.3.2"},"url_launcher_web":{"dependency":"transitive","description":{"name":"url_launcher_web","sha256":"772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e","url":"https://pub.dev"},"source":"hosted","version":"2.3.3"},"url_launcher_windows":{"dependency":"transitive","description":{"name":"url_launcher_windows","sha256":"49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185","url":"https://pub.dev"},"source":"hosted","version":"3.1.2"},"uuid":{"dependency":"transitive","description":{"name":"uuid","sha256":"a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff","url":"https://pub.dev"},"source":"hosted","version":"4.5.1"},"vector_graphics":{"dependency":"transitive","description":{"name":"vector_graphics","sha256":"32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3","url":"https://pub.dev"},"source":"hosted","version":"1.1.11+1"},"vector_graphics_codec":{"dependency":"transitive","description":{"name":"vector_graphics_codec","sha256":"c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da","url":"https://pub.dev"},"source":"hosted","version":"1.1.11+1"},"vector_graphics_compiler":{"dependency":"transitive","description":{"name":"vector_graphics_compiler","sha256":"12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81","url":"https://pub.dev"},"source":"hosted","version":"1.1.11+1"},"vector_math":{"dependency":"transitive","description":{"name":"vector_math","sha256":"80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803","url":"https://pub.dev"},"source":"hosted","version":"2.1.4"},"web":{"dependency":"transitive","description":{"name":"web","sha256":"97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27","url":"https://pub.dev"},"source":"hosted","version":"0.5.1"},"win32":{"dependency":"direct main","description":{"name":"win32","sha256":"4d45dc9069dba4619dc0ebd93c7cec5e66d8482cb625a370ac806dcc8165f2ec","url":"https://pub.dev"},"source":"hosted","version":"5.5.5"},"window_manager":{"dependency":"direct main","description":{"name":"window_manager","sha256":"ab8b2a7f97543d3db2b506c9d875e637149d48ee0c6a5cb5f5fd6e0dac463792","url":"https://pub.dev"},"source":"hosted","version":"0.4.2"},"window_size":{"dependency":"direct main","description":{"path":"plugins/window_size","ref":"6c66ad2","resolved-ref":"6c66ad23ee79749f30a8eece542cf54eaf157ed8","url":"https://github.com/google/flutter-desktop-embedding.git"},"source":"git","version":"0.1.0"},"xdg_directories":{"dependency":"transitive","description":{"name":"xdg_directories","sha256":"faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d","url":"https://pub.dev"},"source":"hosted","version":"1.0.4"},"xml":{"dependency":"transitive","description":{"name":"xml","sha256":"b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226","url":"https://pub.dev"},"source":"hosted","version":"6.5.0"},"xterm":{"dependency":"direct main","description":{"path":".","ref":"4.0.0+mp","resolved-ref":"ff2309c1581c025ba8b9f65e6619fe2fe2252827","url":"https://github.com/levkropp/xterm.dart"},"source":"git","version":"4.0.0"},"zmodem":{"dependency":"transitive","description":{"name":"zmodem","sha256":"3b7e5b29f3a7d8aee472029b05165a68438eff2f3f7766edf13daba1e297adbf","url":"https://pub.dev"},"source":"hosted","version":"0.0.6"}},"sdks":{"dart":">=3.5.0 <4.0.0","flutter":">=3.24.0"}} +{"packages":{"args":{"dependency":"transitive","description":{"name":"args","sha256":"7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a","url":"https://pub.dev"},"source":"hosted","version":"2.5.0"},"asn1lib":{"dependency":"transitive","description":{"name":"asn1lib","sha256":"6b151826fcc95ff246cd219a0bf4c753ea14f4081ad71c61939becf3aba27f70","url":"https://pub.dev"},"source":"hosted","version":"1.5.5"},"async":{"dependency":"direct main","description":{"name":"async","sha256":"947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c","url":"https://pub.dev"},"source":"hosted","version":"2.11.0"},"basics":{"dependency":"direct main","description":{"name":"basics","sha256":"41ff8aded84ae174d1df5cce0bcac3ab9070caac9f7da35fd2cc638dfee6163f","url":"https://pub.dev"},"source":"hosted","version":"0.10.0"},"boolean_selector":{"dependency":"transitive","description":{"name":"boolean_selector","sha256":"6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66","url":"https://pub.dev"},"source":"hosted","version":"2.1.1"},"built_collection":{"dependency":"direct main","description":{"name":"built_collection","sha256":"376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100","url":"https://pub.dev"},"source":"hosted","version":"5.1.1"},"characters":{"dependency":"transitive","description":{"name":"characters","sha256":"04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605","url":"https://pub.dev"},"source":"hosted","version":"1.3.0"},"clock":{"dependency":"transitive","description":{"name":"clock","sha256":"cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf","url":"https://pub.dev"},"source":"hosted","version":"1.1.1"},"collection":{"dependency":"direct main","description":{"name":"collection","sha256":"ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a","url":"https://pub.dev"},"source":"hosted","version":"1.18.0"},"convert":{"dependency":"transitive","description":{"name":"convert","sha256":"0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592","url":"https://pub.dev"},"source":"hosted","version":"3.1.1"},"cross_file":{"dependency":"transitive","description":{"name":"cross_file","sha256":"7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670","url":"https://pub.dev"},"source":"hosted","version":"0.3.4+2"},"crypto":{"dependency":"transitive","description":{"name":"crypto","sha256":"ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27","url":"https://pub.dev"},"source":"hosted","version":"3.0.5"},"dartssh2":{"dependency":"direct main","description":{"path":".","ref":"2.10.0+mp","resolved-ref":"e7c66932cf7ca8eba083268fa3230222c8cd0722","url":"https://github.com/andrei-toterman/dartssh2.git"},"source":"git","version":"2.10.0"},"equatable":{"dependency":"transitive","description":{"name":"equatable","sha256":"c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2","url":"https://pub.dev"},"source":"hosted","version":"2.0.5"},"extended_text":{"dependency":"direct main","description":{"name":"extended_text","sha256":"b0cdd240b4ddf61d18d7e33e7775195971f2d033bd69706fa897446dc96c3b81","url":"https://pub.dev"},"source":"hosted","version":"14.1.0"},"extended_text_library":{"dependency":"transitive","description":{"name":"extended_text_library","sha256":"55d09098ec56fab0d9a8a68950ca0bbf2efa1327937f7cec6af6dfa066234829","url":"https://pub.dev"},"source":"hosted","version":"12.0.0"},"ffi":{"dependency":"direct main","description":{"name":"ffi","sha256":"16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6","url":"https://pub.dev"},"source":"hosted","version":"2.1.3"},"file":{"dependency":"transitive","description":{"name":"file","sha256":"5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c","url":"https://pub.dev"},"source":"hosted","version":"7.0.0"},"file_selector":{"dependency":"direct main","description":{"name":"file_selector","sha256":"5019692b593455127794d5718304ff1ae15447dea286cdda9f0db2a796a1b828","url":"https://pub.dev"},"source":"hosted","version":"1.0.3"},"file_selector_android":{"dependency":"transitive","description":{"name":"file_selector_android","sha256":"8bcc3af859e9d47fab9c7dc315537406511a894ab578e198bd8f9ed745ea5a01","url":"https://pub.dev"},"source":"hosted","version":"0.5.1+2"},"file_selector_ios":{"dependency":"transitive","description":{"name":"file_selector_ios","sha256":"38ebf91ecbcfa89a9639a0854ccaed8ab370c75678938eebca7d34184296f0bb","url":"https://pub.dev"},"source":"hosted","version":"0.5.3"},"file_selector_linux":{"dependency":"transitive","description":{"name":"file_selector_linux","sha256":"045d372bf19b02aeb69cacf8b4009555fb5f6f0b7ad8016e5f46dd1387ddd492","url":"https://pub.dev"},"source":"hosted","version":"0.9.2+1"},"file_selector_macos":{"dependency":"transitive","description":{"name":"file_selector_macos","sha256":"f42eacb83b318e183b1ae24eead1373ab1334084404c8c16e0354f9a3e55d385","url":"https://pub.dev"},"source":"hosted","version":"0.9.4"},"file_selector_platform_interface":{"dependency":"transitive","description":{"name":"file_selector_platform_interface","sha256":"a3994c26f10378a039faa11de174d7b78eb8f79e4dd0af2a451410c1a5c3f66b","url":"https://pub.dev"},"source":"hosted","version":"2.6.2"},"file_selector_web":{"dependency":"transitive","description":{"name":"file_selector_web","sha256":"c4c0ea4224d97a60a7067eca0c8fd419e708ff830e0c83b11a48faf566cec3e7","url":"https://pub.dev"},"source":"hosted","version":"0.9.4+2"},"file_selector_windows":{"dependency":"transitive","description":{"name":"file_selector_windows","sha256":"2ad726953f6e8affbc4df8dc78b77c3b4a060967a291e528ef72ae846c60fb69","url":"https://pub.dev"},"source":"hosted","version":"0.9.3+2"},"fixnum":{"dependency":"transitive","description":{"name":"fixnum","sha256":"25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1","url":"https://pub.dev"},"source":"hosted","version":"1.1.0"},"fl_chart":{"dependency":"direct main","description":{"name":"fl_chart","sha256":"94307bef3a324a0d329d3ab77b2f0c6e5ed739185ffc029ed28c0f9b019ea7ef","url":"https://pub.dev"},"source":"hosted","version":"0.69.0"},"flutter":{"dependency":"direct main","description":"flutter","source":"sdk","version":"0.0.0"},"flutter_lints":{"dependency":"direct dev","description":{"name":"flutter_lints","sha256":"5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1","url":"https://pub.dev"},"source":"hosted","version":"5.0.0"},"flutter_riverpod":{"dependency":"direct main","description":{"name":"flutter_riverpod","sha256":"0f1974eff5bbe774bf1d870e406fc6f29e3d6f1c46bd9c58e7172ff68a785d7d","url":"https://pub.dev"},"source":"hosted","version":"2.5.1"},"flutter_svg":{"dependency":"direct main","description":{"name":"flutter_svg","sha256":"7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2","url":"https://pub.dev"},"source":"hosted","version":"2.0.10+1"},"flutter_web_plugins":{"dependency":"transitive","description":"flutter","source":"sdk","version":"0.0.0"},"fpdart":{"dependency":"direct main","description":{"name":"fpdart","sha256":"7413acc5a6569a3fe8277928fc7487f3198530f0c4e635d0baef199ea36e8ee9","url":"https://pub.dev"},"source":"hosted","version":"1.1.0"},"google_identity_services_web":{"dependency":"transitive","description":{"name":"google_identity_services_web","sha256":"5be191523702ba8d7a01ca97c17fca096822ccf246b0a9f11923a6ded06199b6","url":"https://pub.dev"},"source":"hosted","version":"0.3.1+4"},"googleapis_auth":{"dependency":"transitive","description":{"name":"googleapis_auth","sha256":"befd71383a955535060acde8792e7efc11d2fccd03dd1d3ec434e85b68775938","url":"https://pub.dev"},"source":"hosted","version":"1.6.0"},"grpc":{"dependency":"direct main","description":{"name":"grpc","sha256":"5b99b7a420937d4361ece68b798c9af8e04b5bc128a7859f2a4be87427694813","url":"https://pub.dev"},"source":"hosted","version":"4.0.1"},"hotkey_manager":{"dependency":"direct main","description":{"name":"hotkey_manager","sha256":"06f0655b76c8dd322fb7101dc615afbdbf39c3d3414df9e059c33892104479cd","url":"https://pub.dev"},"source":"hosted","version":"0.2.3"},"hotkey_manager_linux":{"dependency":"direct overridden","description":{"path":"packages/hotkey_manager_linux","ref":"no-cooked-accel","resolved-ref":"7e5a662615fbc9f077c1567fd7a66ec34ad52b5e","url":"https://github.com/andrei-toterman/hotkey_manager.git"},"source":"git","version":"0.2.0"},"hotkey_manager_macos":{"dependency":"transitive","description":{"name":"hotkey_manager_macos","sha256":"03b5967e64357b9ac05188ea4a5df6fe4ed4205762cb80aaccf8916ee1713c96","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"hotkey_manager_platform_interface":{"dependency":"transitive","description":{"name":"hotkey_manager_platform_interface","sha256":"98ffca25b8cc9081552902747b2942e3bc37855389a4218c9d50ca316b653b13","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"hotkey_manager_windows":{"dependency":"transitive","description":{"name":"hotkey_manager_windows","sha256":"0d03ced9fe563ed0b68f0a0e1b22c9ffe26eb8053cb960e401f68a4f070e0117","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"http":{"dependency":"transitive","description":{"name":"http","sha256":"b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010","url":"https://pub.dev"},"source":"hosted","version":"1.2.2"},"http2":{"dependency":"transitive","description":{"name":"http2","sha256":"9ced024a160b77aba8fb8674e38f70875e321d319e6f303ec18e87bd5a4b0c1d","url":"https://pub.dev"},"source":"hosted","version":"2.3.0"},"http_parser":{"dependency":"transitive","description":{"name":"http_parser","sha256":"2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b","url":"https://pub.dev"},"source":"hosted","version":"4.0.2"},"intl":{"dependency":"direct main","description":{"name":"intl","sha256":"99f282cb0e02edcbbf8c6b3bbc7c90b65635156c412e58f3975a7e55284ce685","url":"https://pub.dev"},"source":"hosted","version":"0.20.0"},"js":{"dependency":"transitive","description":{"name":"js","sha256":"c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf","url":"https://pub.dev"},"source":"hosted","version":"0.7.1"},"json_annotation":{"dependency":"transitive","description":{"name":"json_annotation","sha256":"1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1","url":"https://pub.dev"},"source":"hosted","version":"4.9.0"},"lints":{"dependency":"transitive","description":{"name":"lints","sha256":"3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413","url":"https://pub.dev"},"source":"hosted","version":"5.0.0"},"local_notifier":{"dependency":"direct main","description":{"name":"local_notifier","sha256":"f6cfc933c6fbc961f4e52b5c880f68e41b2d3cd29aad557cc654fd211093a025","url":"https://pub.dev"},"source":"hosted","version":"0.1.6"},"logger":{"dependency":"direct main","description":{"name":"logger","sha256":"697d067c60c20999686a0add96cf6aba723b3aa1f83ecf806a8097231529ec32","url":"https://pub.dev"},"source":"hosted","version":"2.4.0"},"matcher":{"dependency":"transitive","description":{"name":"matcher","sha256":"d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb","url":"https://pub.dev"},"source":"hosted","version":"0.12.16+1"},"material_color_utilities":{"dependency":"transitive","description":{"name":"material_color_utilities","sha256":"f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec","url":"https://pub.dev"},"source":"hosted","version":"0.11.1"},"meta":{"dependency":"transitive","description":{"name":"meta","sha256":"bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7","url":"https://pub.dev"},"source":"hosted","version":"1.15.0"},"path":{"dependency":"transitive","description":{"name":"path","sha256":"087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af","url":"https://pub.dev"},"source":"hosted","version":"1.9.0"},"path_parsing":{"dependency":"transitive","description":{"name":"path_parsing","sha256":"e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf","url":"https://pub.dev"},"source":"hosted","version":"1.0.1"},"path_provider":{"dependency":"direct main","description":{"name":"path_provider","sha256":"fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378","url":"https://pub.dev"},"source":"hosted","version":"2.1.4"},"path_provider_android":{"dependency":"transitive","description":{"name":"path_provider_android","sha256":"6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7","url":"https://pub.dev"},"source":"hosted","version":"2.2.10"},"path_provider_foundation":{"dependency":"transitive","description":{"name":"path_provider_foundation","sha256":"f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16","url":"https://pub.dev"},"source":"hosted","version":"2.4.0"},"path_provider_linux":{"dependency":"transitive","description":{"name":"path_provider_linux","sha256":"f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279","url":"https://pub.dev"},"source":"hosted","version":"2.2.1"},"path_provider_platform_interface":{"dependency":"transitive","description":{"name":"path_provider_platform_interface","sha256":"88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334","url":"https://pub.dev"},"source":"hosted","version":"2.1.2"},"path_provider_windows":{"dependency":"transitive","description":{"name":"path_provider_windows","sha256":"bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7","url":"https://pub.dev"},"source":"hosted","version":"2.3.0"},"petitparser":{"dependency":"transitive","description":{"name":"petitparser","sha256":"c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27","url":"https://pub.dev"},"source":"hosted","version":"6.0.2"},"pinenacl":{"dependency":"transitive","description":{"name":"pinenacl","sha256":"57e907beaacbc3c024a098910b6240758e899674de07d6949a67b52fd984cbdf","url":"https://pub.dev"},"source":"hosted","version":"0.6.0"},"platform":{"dependency":"transitive","description":{"name":"platform","sha256":"9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65","url":"https://pub.dev"},"source":"hosted","version":"3.1.5"},"plugin_platform_interface":{"dependency":"transitive","description":{"name":"plugin_platform_interface","sha256":"4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02","url":"https://pub.dev"},"source":"hosted","version":"2.1.8"},"pointycastle":{"dependency":"transitive","description":{"name":"pointycastle","sha256":"4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe","url":"https://pub.dev"},"source":"hosted","version":"3.9.1"},"protobuf":{"dependency":"direct main","description":{"name":"protobuf","sha256":"579fe5557eae58e3adca2e999e38f02441d8aa908703854a9e0a0f47fa857731","url":"https://pub.dev"},"source":"hosted","version":"4.1.0"},"quiver":{"dependency":"transitive","description":{"name":"quiver","sha256":"ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2","url":"https://pub.dev"},"source":"hosted","version":"3.2.2"},"riverpod":{"dependency":"transitive","description":{"name":"riverpod","sha256":"f21b32ffd26a36555e501b04f4a5dca43ed59e16343f1a30c13632b2351dfa4d","url":"https://pub.dev"},"source":"hosted","version":"2.5.1"},"rxdart":{"dependency":"direct main","description":{"name":"rxdart","sha256":"5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962","url":"https://pub.dev"},"source":"hosted","version":"0.28.0"},"screen_retriever":{"dependency":"transitive","description":{"name":"screen_retriever","sha256":"6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90","url":"https://pub.dev"},"source":"hosted","version":"0.1.9"},"shared_preferences":{"dependency":"direct main","description":{"name":"shared_preferences","sha256":"746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051","url":"https://pub.dev"},"source":"hosted","version":"2.3.2"},"shared_preferences_android":{"dependency":"transitive","description":{"name":"shared_preferences_android","sha256":"480ba4345773f56acda9abf5f50bd966f581dac5d514e5fc4a18c62976bbba7e","url":"https://pub.dev"},"source":"hosted","version":"2.3.2"},"shared_preferences_foundation":{"dependency":"transitive","description":{"name":"shared_preferences_foundation","sha256":"c4b35f6cb8f63c147312c054ce7c2254c8066745125264f0c88739c417fc9d9f","url":"https://pub.dev"},"source":"hosted","version":"2.5.2"},"shared_preferences_linux":{"dependency":"transitive","description":{"name":"shared_preferences_linux","sha256":"580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"shared_preferences_platform_interface":{"dependency":"transitive","description":{"name":"shared_preferences_platform_interface","sha256":"57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"shared_preferences_web":{"dependency":"transitive","description":{"name":"shared_preferences_web","sha256":"d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e","url":"https://pub.dev"},"source":"hosted","version":"2.4.2"},"shared_preferences_windows":{"dependency":"transitive","description":{"name":"shared_preferences_windows","sha256":"94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"sky_engine":{"dependency":"transitive","description":"flutter","source":"sdk","version":"0.0.99"},"source_span":{"dependency":"transitive","description":{"name":"source_span","sha256":"53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c","url":"https://pub.dev"},"source":"hosted","version":"1.10.0"},"sprintf":{"dependency":"transitive","description":{"name":"sprintf","sha256":"1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23","url":"https://pub.dev"},"source":"hosted","version":"7.0.0"},"stack_trace":{"dependency":"transitive","description":{"name":"stack_trace","sha256":"9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377","url":"https://pub.dev"},"source":"hosted","version":"1.12.0"},"state_notifier":{"dependency":"transitive","description":{"name":"state_notifier","sha256":"b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb","url":"https://pub.dev"},"source":"hosted","version":"1.0.0"},"stream_channel":{"dependency":"transitive","description":{"name":"stream_channel","sha256":"ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7","url":"https://pub.dev"},"source":"hosted","version":"2.1.2"},"string_scanner":{"dependency":"transitive","description":{"name":"string_scanner","sha256":"688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3","url":"https://pub.dev"},"source":"hosted","version":"1.3.0"},"synchronized":{"dependency":"direct main","description":{"name":"synchronized","sha256":"69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225","url":"https://pub.dev"},"source":"hosted","version":"3.3.0+3"},"term_glyph":{"dependency":"transitive","description":{"name":"term_glyph","sha256":"a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84","url":"https://pub.dev"},"source":"hosted","version":"1.2.1"},"test_api":{"dependency":"transitive","description":{"name":"test_api","sha256":"664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c","url":"https://pub.dev"},"source":"hosted","version":"0.7.3"},"tray_menu":{"dependency":"direct main","description":{"path":".","ref":"7c1394c","resolved-ref":"7c1394c46aac4598ebdd3fa6670e4ea2904a4d31","url":"https://github.com/andrei-toterman/tray_menu.git"},"source":"git","version":"0.0.1"},"two_dimensional_scrollables":{"dependency":"direct main","description":{"name":"two_dimensional_scrollables","sha256":"74ce1f35a8c74370b322049c9d00bf098938661e9f67054eae0f618e6dc0cb62","url":"https://pub.dev"},"source":"hosted","version":"0.3.2"},"typed_data":{"dependency":"transitive","description":{"name":"typed_data","sha256":"facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c","url":"https://pub.dev"},"source":"hosted","version":"1.3.2"},"uni_platform":{"dependency":"transitive","description":{"name":"uni_platform","sha256":"e02213a7ee5352212412ca026afd41d269eb00d982faa552f419ffc2debfad84","url":"https://pub.dev"},"source":"hosted","version":"0.1.3"},"url_launcher":{"dependency":"direct main","description":{"name":"url_launcher","sha256":"21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3","url":"https://pub.dev"},"source":"hosted","version":"6.3.0"},"url_launcher_android":{"dependency":"transitive","description":{"name":"url_launcher_android","sha256":"e35a698ac302dd68e41f73250bd9517fe3ab5fa4f18fe4647a0872db61bacbab","url":"https://pub.dev"},"source":"hosted","version":"6.3.10"},"url_launcher_ios":{"dependency":"transitive","description":{"name":"url_launcher_ios","sha256":"e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e","url":"https://pub.dev"},"source":"hosted","version":"6.3.1"},"url_launcher_linux":{"dependency":"transitive","description":{"name":"url_launcher_linux","sha256":"e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af","url":"https://pub.dev"},"source":"hosted","version":"3.2.0"},"url_launcher_macos":{"dependency":"transitive","description":{"name":"url_launcher_macos","sha256":"769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672","url":"https://pub.dev"},"source":"hosted","version":"3.2.1"},"url_launcher_platform_interface":{"dependency":"transitive","description":{"name":"url_launcher_platform_interface","sha256":"552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029","url":"https://pub.dev"},"source":"hosted","version":"2.3.2"},"url_launcher_web":{"dependency":"transitive","description":{"name":"url_launcher_web","sha256":"772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e","url":"https://pub.dev"},"source":"hosted","version":"2.3.3"},"url_launcher_windows":{"dependency":"transitive","description":{"name":"url_launcher_windows","sha256":"49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185","url":"https://pub.dev"},"source":"hosted","version":"3.1.2"},"uuid":{"dependency":"transitive","description":{"name":"uuid","sha256":"a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff","url":"https://pub.dev"},"source":"hosted","version":"4.5.1"},"vector_graphics":{"dependency":"transitive","description":{"name":"vector_graphics","sha256":"32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3","url":"https://pub.dev"},"source":"hosted","version":"1.1.11+1"},"vector_graphics_codec":{"dependency":"transitive","description":{"name":"vector_graphics_codec","sha256":"c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da","url":"https://pub.dev"},"source":"hosted","version":"1.1.11+1"},"vector_graphics_compiler":{"dependency":"transitive","description":{"name":"vector_graphics_compiler","sha256":"12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81","url":"https://pub.dev"},"source":"hosted","version":"1.1.11+1"},"vector_math":{"dependency":"transitive","description":{"name":"vector_math","sha256":"80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803","url":"https://pub.dev"},"source":"hosted","version":"2.1.4"},"web":{"dependency":"transitive","description":{"name":"web","sha256":"97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27","url":"https://pub.dev"},"source":"hosted","version":"0.5.1"},"win32":{"dependency":"direct main","description":{"name":"win32","sha256":"4d45dc9069dba4619dc0ebd93c7cec5e66d8482cb625a370ac806dcc8165f2ec","url":"https://pub.dev"},"source":"hosted","version":"5.5.5"},"window_manager":{"dependency":"direct main","description":{"name":"window_manager","sha256":"ab8b2a7f97543d3db2b506c9d875e637149d48ee0c6a5cb5f5fd6e0dac463792","url":"https://pub.dev"},"source":"hosted","version":"0.4.2"},"window_size":{"dependency":"direct main","description":{"path":"plugins/window_size","ref":"6c66ad2","resolved-ref":"6c66ad23ee79749f30a8eece542cf54eaf157ed8","url":"https://github.com/google/flutter-desktop-embedding.git"},"source":"git","version":"0.1.0"},"xdg_directories":{"dependency":"transitive","description":{"name":"xdg_directories","sha256":"faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d","url":"https://pub.dev"},"source":"hosted","version":"1.0.4"},"xml":{"dependency":"transitive","description":{"name":"xml","sha256":"b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226","url":"https://pub.dev"},"source":"hosted","version":"6.5.0"},"xterm":{"dependency":"direct main","description":{"path":".","ref":"4.0.0+mp","resolved-ref":"ff2309c1581c025ba8b9f65e6619fe2fe2252827","url":"https://github.com/levkropp/xterm.dart"},"source":"git","version":"4.0.0"},"zmodem":{"dependency":"transitive","description":{"name":"zmodem","sha256":"3b7e5b29f3a7d8aee472029b05165a68438eff2f3f7766edf13daba1e297adbf","url":"https://pub.dev"},"source":"hosted","version":"0.0.6"}},"sdks":{"dart":">=3.5.0 <4.0.0","flutter":">=3.24.0"}} diff --git a/pkgs/by-name/ne/nextcloud-client/package.nix b/pkgs/by-name/ne/nextcloud-client/package.nix index dcf4d86a9f70..1f32c3a48dc8 100644 --- a/pkgs/by-name/ne/nextcloud-client/package.nix +++ b/pkgs/by-name/ne/nextcloud-client/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { pname = "nextcloud-client"; - version = "3.16.4"; + version = "3.16.5"; outputs = [ "out" @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "nextcloud-releases"; repo = "desktop"; tag = "v${version}"; - hash = "sha256-8P73YitjuU9SGDBNimqJsvSfGOE9lNCVUNN3f4KXWSY="; + hash = "sha256-Xul3NGHResU/ZGP/C7v2bnhcxqGn3CjwjwnaPVmUhfM="; }; patches = [ diff --git a/pkgs/by-name/ni/nixos-anywhere/package.nix b/pkgs/by-name/ni/nixos-anywhere/package.nix index 424813cec2a5..7652fa819ead 100644 --- a/pkgs/by-name/ni/nixos-anywhere/package.nix +++ b/pkgs/by-name/ni/nixos-anywhere/package.nix @@ -31,12 +31,12 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "nixos-anywhere"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixos-anywhere"; rev = finalAttrs.version; - hash = "sha256-xzalz30m0iTVfxPMf0nROg5j/xvg6NhHsX04+ym1E9w="; + hash = "sha256-hVTCvMnwywxQ6rGgO7ytBiSpVuLOHNgm3w3vE8UNaQY="; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' diff --git a/pkgs/by-name/nu/nusmv/package.nix b/pkgs/by-name/nu/nusmv/package.nix index 456970b7ee0a..0e7bcad3cc9e 100644 --- a/pkgs/by-name/nu/nusmv/package.nix +++ b/pkgs/by-name/nu/nusmv/package.nix @@ -7,32 +7,32 @@ stdenv.mkDerivation rec { pname = "NuSMV"; - version = "2.6.0"; + version = "2.7.0"; src = with stdenv; fetchurl ( if isx86_64 && isLinux then { - url = "https://nusmv.fbk.eu/distrib/NuSMV-${version}-linux64.tar.gz"; - sha256 = "1370x2vwjndv9ham5q399nn84hvhm1gj1k7pq576qmh4pi12xc8i"; + url = "https://nusmv.fbk.eu/distrib/${version}/NuSMV-${version}-linux64.tar.xz"; + sha256 = "019d1pa5aw58n11is1024hs8d520b3pp2iyix78vp04yv7wd42l8"; } - else if isx86_32 && isLinux then + else if isx86_64 && isDarwin then { - url = "https://nusmv.fbk.eu/distrib/NuSMV-${version}-linux32.tar.gz"; - sha256 = "1qf41czwbqxlrmv0rv2daxgz2hljza5xks85sx3dhwpjy2iav9jb"; + url = "https://nusmv.fbk.eu/distrib/${version}/NuSMV-${version}-macos-universal.tar.xz"; + sha256 = "098wllv4yx284qv9nsi8kd5pgh10cr1hig01a1p2rxgfmrki52wm"; } else - throw "only linux x86_64 and x86_32 are currently supported" + throw "only linux and mac x86_64 are currently supported" ); - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; installPhase = '' install -m755 -D bin/NuSMV $out/bin/NuSMV install -m755 -D bin/ltl2smv $out/bin/ltl2smv cp -r include $out/include - cp -r share $out/share + cp -r lib $out/lib ''; meta = with lib; { @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { homepage = "https://nusmv.fbk.eu/"; maintainers = with maintainers; [ mgttlinger ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/by-name/pi/pinact/package.nix b/pkgs/by-name/pi/pinact/package.nix index 81849bb79419..60d5fbc98252 100644 --- a/pkgs/by-name/pi/pinact/package.nix +++ b/pkgs/by-name/pi/pinact/package.nix @@ -47,7 +47,11 @@ buildGoModule (finalAttrs: { versionCheckProgramArg = "version"; passthru = { - updateScript = nix-update-script { }; + updateScript = nix-update-script { + extraArgs = [ + "--version-regex=^v([\\d\\.]+)$" + ]; + }; }; ldflags = [ diff --git a/pkgs/by-name/pl/plutovg/package.nix b/pkgs/by-name/pl/plutovg/package.nix index 88b1d186081a..7e795b499e6e 100644 --- a/pkgs/by-name/pl/plutovg/package.nix +++ b/pkgs/by-name/pl/plutovg/package.nix @@ -6,15 +6,23 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "plutovg"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "sammycage"; repo = "plutovg"; tag = "v${finalAttrs.version}"; - hash = "sha256-xNWwACKGU5UIJviVZ3wU4GMuRxKn/rR8jBsZQpZiFZ8="; + hash = "sha256-989MA60nc1Tzp/4RzT0iYHz4JBJkU9zgEjEswa4vDpk="; }; + cmakeFlags = [ + # the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly + # (setting it to an absolute path causes include files to go to $out/$out/include, + # because the absolute path is interpreted with root at $out). + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_LIBDIR=lib" + ]; + nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/pm/pm2/package.nix b/pkgs/by-name/pm/pm2/package.nix index 731c0c8b0561..a4c66208e2c9 100644 --- a/pkgs/by-name/pm/pm2/package.nix +++ b/pkgs/by-name/pm/pm2/package.nix @@ -7,13 +7,13 @@ buildNpmPackage rec { pname = "pm2"; - version = "6.0.6"; + version = "6.0.8"; src = fetchFromGitHub { owner = "Unitech"; repo = "pm2"; rev = "v${version}"; - hash = "sha256-ji6IOlPSEj+qpSusF3OX056KuZDL3JjvaTNT/UQTiqA="; + hash = "sha256-roSHLJsDeNAa9z9O/hgy9P4ho5zeLz1+w0a8U0Ix2ao="; # Requested patch upstream: https://github.com/Unitech/pm2/pull/5985 postFetch = '' @@ -21,7 +21,7 @@ buildNpmPackage rec { ''; }; - npmDepsHash = "sha256-b+SSal4eNruQOMNAFoLLJdzfFhz1T3EieDv4kTwwA1Y="; + npmDepsHash = "sha256-6xUGO1vrzU5pi33ZaiRB6L5gY8p7ES93effyGdhsV5o="; dontNpmBuild = true; diff --git a/pkgs/by-name/pr/protoc-gen-dart/package.nix b/pkgs/by-name/pr/protoc-gen-dart/package.nix index 4eb95f412bbb..6b2610cd709e 100644 --- a/pkgs/by-name/pr/protoc-gen-dart/package.nix +++ b/pkgs/by-name/pr/protoc-gen-dart/package.nix @@ -1,18 +1,18 @@ { lib, - fetchFromGitHub, buildDartApplication, + fetchFromGitHub, }: buildDartApplication rec { pname = "protoc-gen-dart"; - version = "21.1.2"; + version = "22.3.0"; src = fetchFromGitHub { owner = "google"; repo = "protobuf.dart"; tag = "protoc_plugin-v${version}"; - hash = "sha256-luptbRgOtOBapWmyIJ35GqOClpcmDuKSPu3QoDfp2FU="; + hash = "sha256-P2h1M7Wga0qOrI/sTUrQ6k/a5gqKVqAfs/J1eGFHHwg="; }; sourceRoot = "${src.name}/protoc_plugin"; diff --git a/pkgs/by-name/pr/protoc-gen-dart/pubspec.lock.json b/pkgs/by-name/pr/protoc-gen-dart/pubspec.lock.json index 05723b64b240..13b7eb5483a6 100644 --- a/pkgs/by-name/pr/protoc-gen-dart/pubspec.lock.json +++ b/pkgs/by-name/pr/protoc-gen-dart/pubspec.lock.json @@ -4,47 +4,41 @@ "dependency": "transitive", "description": { "name": "_fe_analyzer_shared", - "sha256": "45cfa8471b89fb6643fe9bf51bd7931a76b8f5ec2d65de4fb176dba8d4f22c77", + "sha256": "e55636ed79578b9abca5fecf9437947798f5ef7456308b5cb85720b793eac92f", "url": "https://pub.dev" }, "source": "hosted", - "version": "73.0.0" - }, - "_macros": { - "dependency": "transitive", - "description": "dart", - "source": "sdk", - "version": "0.3.2" + "version": "82.0.0" }, "analyzer": { "dependency": "transitive", "description": { "name": "analyzer", - "sha256": "4959fec185fe70cce007c57e9ab6983101dbe593d2bf8bbfb4453aaec0cf470a", + "sha256": "904ae5bb474d32c38fb9482e2d925d5454cda04ddd0e55d2e6826bc72f6ba8c0", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.8.0" + "version": "7.4.5" }, "args": { "dependency": "transitive", "description": { "name": "args", - "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6", + "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.0" + "version": "2.7.0" }, "async": { "dependency": "transitive", "description": { "name": "async", - "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63", + "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.12.0" + "version": "2.13.0" }, "boolean_selector": { "dependency": "transitive", @@ -56,8 +50,28 @@ "source": "hosted", "version": "2.1.2" }, + "checked_yaml": { + "dependency": "transitive", + "description": { + "name": "checked_yaml", + "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "cli_config": { + "dependency": "transitive", + "description": { + "name": "cli_config", + "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, "collection": { - "dependency": "direct dev", + "dependency": "direct main", "description": { "name": "collection", "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", @@ -80,11 +94,11 @@ "dependency": "transitive", "description": { "name": "coverage", - "sha256": "e3493833ea012784c740e341952298f1cc77f1f01b1bbc3eb4eecf6984fb7f43", + "sha256": "4b8701e48a58f7712492c9b1f7ba0bb9d525644dd66d023b62e1fc8cdb560c8a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.11.1" + "version": "1.14.0" }, "crypto": { "dependency": "transitive", @@ -140,11 +154,11 @@ "dependency": "transitive", "description": { "name": "glob", - "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", + "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.3" }, "http_multi_server": { "dependency": "transitive", @@ -180,11 +194,21 @@ "dependency": "transitive", "description": { "name": "js", - "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf", + "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.1" + "version": "0.7.2" + }, + "json_annotation": { + "dependency": "transitive", + "description": { + "name": "json_annotation", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.9.0" }, "lints": { "dependency": "transitive", @@ -206,16 +230,6 @@ "source": "hosted", "version": "1.3.0" }, - "macros": { - "dependency": "transitive", - "description": { - "name": "macros", - "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.2-main.4" - }, "matcher": { "dependency": "direct dev", "description": { @@ -230,11 +244,11 @@ "dependency": "transitive", "description": { "name": "meta", - "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", + "sha256": "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.16.0" + "version": "1.17.0" }, "mime": { "dependency": "transitive", @@ -260,11 +274,11 @@ "dependency": "transitive", "description": { "name": "package_config", - "sha256": "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67", + "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.2.0" }, "path": { "dependency": "direct main", @@ -290,21 +304,31 @@ "dependency": "direct main", "description": { "name": "protobuf", - "sha256": "68645b24e0716782e58948f8467fd42a880f255096a821f9e7d0ec625b00c84d", + "sha256": "579fe5557eae58e3adca2e999e38f02441d8aa908703854a9e0a0f47fa857731", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.0" + "version": "4.1.0" }, "pub_semver": { "dependency": "transitive", "description": { "name": "pub_semver", - "sha256": "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd", + "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.5" + "version": "2.2.0" + }, + "pubspec_parse": { + "dependency": "transitive", + "description": { + "name": "pubspec_parse", + "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.0" }, "shelf": { "dependency": "transitive", @@ -340,11 +364,11 @@ "dependency": "transitive", "description": { "name": "shelf_web_socket", - "sha256": "cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67", + "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.1" + "version": "3.0.0" }, "source_map_stack_trace": { "dependency": "transitive", @@ -390,11 +414,11 @@ "dependency": "transitive", "description": { "name": "stream_channel", - "sha256": "4ac0537115a24d772c408a2520ecd0abb99bca2ea9c4e634ccbdbfae64fe17ec", + "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.3" + "version": "2.1.4" }, "string_scanner": { "dependency": "transitive", @@ -420,31 +444,31 @@ "dependency": "direct dev", "description": { "name": "test", - "sha256": "8391fbe68d520daf2314121764d38e37f934c02fd7301ad18307bd93bd6b725d", + "sha256": "65e29d831719be0591f7b3b1a32a3cda258ec98c58c7b25f7b84241bc31215bb", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.25.14" + "version": "1.26.2" }, "test_api": { "dependency": "transitive", "description": { "name": "test_api", - "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd", + "sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.4" + "version": "0.7.6" }, "test_core": { "dependency": "transitive", "description": { "name": "test_core", - "sha256": "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa", + "sha256": "80bf5a02b60af04b09e14f6fe68b921aad119493e26e490deaca5993fef1b05a", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.8" + "version": "0.6.11" }, "typed_data": { "dependency": "transitive", @@ -460,11 +484,11 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02", + "sha256": "6f82e9ee8e7339f5d8b699317f6f3afc17c80a68ebef1bc0d6f52a678c14b1e6", "url": "https://pub.dev" }, "source": "hosted", - "version": "15.0.0" + "version": "15.0.1" }, "watcher": { "dependency": "transitive", @@ -480,31 +504,31 @@ "dependency": "transitive", "description": { "name": "web", - "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb", + "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.1.1" }, "web_socket": { "dependency": "transitive", "description": { "name": "web_socket", - "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83", + "sha256": "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.6" + "version": "1.0.1" }, "web_socket_channel": { "dependency": "transitive", "description": { "name": "web_socket_channel", - "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f", + "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.1" + "version": "3.0.3" }, "webkit_inspection_protocol": { "dependency": "transitive", @@ -528,6 +552,6 @@ } }, "sdks": { - "dart": ">=3.5.0 <4.0.0" + "dart": ">=3.7.0-0 <4.0.0" } } diff --git a/pkgs/by-name/pr/protoc-gen-dart/update.sh b/pkgs/by-name/pr/protoc-gen-dart/update.sh index 888315460c49..81ca066de57c 100755 --- a/pkgs/by-name/pr/protoc-gen-dart/update.sh +++ b/pkgs/by-name/pr/protoc-gen-dart/update.sh @@ -25,6 +25,7 @@ src="$(nix-build --no-link "$NIXPKGS_DIR" -A protoc-gen-dart.src)/protoc_plugin" cp $src/pubspec.* . if ! test -f pubspec.lock; then + sed -i '/resolution: workspace/d' pubspec.yaml dart pub update fi diff --git a/pkgs/by-name/pr/proxmox-backup-client/0001-cargo-re-route-dependencies-not-available-on-crates..patch b/pkgs/by-name/pr/proxmox-backup-client/0001-cargo-re-route-dependencies-not-available-on-crates..patch index c1ba7aa5290f..37d230f52c57 100644 --- a/pkgs/by-name/pr/proxmox-backup-client/0001-cargo-re-route-dependencies-not-available-on-crates..patch +++ b/pkgs/by-name/pr/proxmox-backup-client/0001-cargo-re-route-dependencies-not-available-on-crates..patch @@ -1,19 +1,19 @@ -From 15345a1ca0a52f2e977361002fe984609704ec90 Mon Sep 17 00:00:00 2001 +From fe701cc514b479ca01d18d7f1ab1da6acbc93273 Mon Sep 17 00:00:00 2001 From: Christoph Heiss -Date: Tue, 24 Dec 2024 17:40:48 +0100 -Subject: [PATCH 1/3] cargo: re-route dependencies not available on crates.io +Date: Thu, 5 Jun 2025 11:26:24 +0200 +Subject: [PATCH 1/5] cargo: re-route dependencies not available on crates.io to git repos Signed-off-by: Christoph Heiss --- - Cargo.toml | 147 ++++++++++------------------------------------------- - 1 file changed, 26 insertions(+), 121 deletions(-) + Cargo.toml | 146 ++++++++++------------------------------------------- + 1 file changed, 27 insertions(+), 119 deletions(-) diff --git a/Cargo.toml b/Cargo.toml -index 9354fb17..d2014429 100644 +index d38321e3..99d712da 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -42,8 +42,6 @@ members = [ +@@ -41,8 +41,6 @@ members = [ "proxmox-backup-banner", "proxmox-backup-client", @@ -22,23 +22,7 @@ index 9354fb17..d2014429 100644 "pxar-bin", ] -@@ -112,7 +110,6 @@ pbs-tools = { path = "pbs-tools" } - # regular crates - anyhow = "1.0" - async-trait = "0.1.56" --apt-pkg-native = "0.3.2" - base64 = "0.13" - bitflags = "2.4" - bytes = "1.0" -@@ -126,7 +123,6 @@ flate2 = "1.0" - foreign-types = "0.3" - futures = "0.3" - h2 = { version = "0.4", features = [ "stream" ] } --handlebars = "3.0" - hex = "0.4.3" - http = "0.2" - hyper = { version = "0.14", features = [ "full" ] } -@@ -162,139 +158,48 @@ xdg = "2.2" +@@ -160,138 +158,48 @@ xdg = "2.2" zstd = { version = "0.12", features = [ "bindgen" ] } zstd-safe = "6.0" @@ -55,7 +39,6 @@ index 9354fb17..d2014429 100644 -futures.workspace = true -h2.workspace = true -hex.workspace = true --http.workspace = true -hyper.workspace = true -libc.workspace = true -log.workspace = true @@ -116,13 +99,13 @@ index 9354fb17..d2014429 100644 -proxmox-time.workspace = true -proxmox-uuid.workspace = true -proxmox-worker-task.workspace = true +-pbs-api-types.workspace = true - -# in their respective repo -proxmox-acme.workspace = true -pxar.workspace = true - -# proxmox-backup workspace/internal crates --pbs-api-types.workspace = true -pbs-buildcfg.workspace = true -pbs-client.workspace = true -pbs-config.workspace = true @@ -136,7 +119,9 @@ index 9354fb17..d2014429 100644 # Local path overrides # NOTE: You must run `cargo update` after changing this for it to take effect! [patch.crates-io] - +-#pbs-api-types = { path = "../proxmox/pbs-api-types" } ++pbs-api-types = { path = "../proxmox/pbs-api-types" } + #proxmox-acme = { path = "../proxmox/proxmox-acme" } #proxmox-apt = { path = "../proxmox/proxmox-apt" } -#proxmox-apt-api-types = { path = "../proxmox/proxmox-apt-api-types" } -#proxmox-async = { path = "../proxmox/proxmox-async" } @@ -196,7 +181,6 @@ index 9354fb17..d2014429 100644 +proxmox-uuid = { path = "../proxmox/proxmox-uuid" } +proxmox-worker-task = { path = "../proxmox/proxmox-worker-task" } - #proxmox-acme = { path = "../proxmox/proxmox-acme" } -#pathpatterns = {path = "../pathpatterns" } -#pxar = { path = "../pxar" } +pathpatterns = {path = "../pathpatterns" } @@ -205,5 +189,5 @@ index 9354fb17..d2014429 100644 [features] default = [] -- -2.47.0 +2.49.0 diff --git a/pkgs/by-name/pr/proxmox-backup-client/0002-docs-Add-target-path-fixup-variable.patch b/pkgs/by-name/pr/proxmox-backup-client/0002-docs-add-target-path-fixup-variable.patch similarity index 70% rename from pkgs/by-name/pr/proxmox-backup-client/0002-docs-Add-target-path-fixup-variable.patch rename to pkgs/by-name/pr/proxmox-backup-client/0002-docs-add-target-path-fixup-variable.patch index a052c9b7fba0..5f09aa9c95a1 100644 --- a/pkgs/by-name/pr/proxmox-backup-client/0002-docs-Add-target-path-fixup-variable.patch +++ b/pkgs/by-name/pr/proxmox-backup-client/0002-docs-add-target-path-fixup-variable.patch @@ -1,7 +1,7 @@ -From fbfbc075c7451cda415fc5678cf5bce8bb11dc78 Mon Sep 17 00:00:00 2001 +From b71b5bab3fadc663d322e3ef2faa8f098423fb03 Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Tue, 24 Dec 2024 17:22:35 +0100 -Subject: [PATCH 2/3] docs: Add target path fixup variable +Subject: [PATCH 2/5] docs: add target path fixup variable Signed-off-by: Christoph Heiss --- @@ -9,10 +9,10 @@ Signed-off-by: Christoph Heiss 1 file changed, 1 insertion(+) diff --git a/docs/Makefile b/docs/Makefile -index 66da6037..a9939131 100644 +index c57cbbc2..fa00729e 100644 --- a/docs/Makefile +++ b/docs/Makefile -@@ -92,6 +92,7 @@ API_VIEWER_FILES := \ +@@ -94,6 +94,7 @@ API_VIEWER_FILES := \ SPHINXOPTS = -E SPHINXBUILD = sphinx-build BUILDDIR = output @@ -21,5 +21,5 @@ index 66da6037..a9939131 100644 ifeq ($(BUILD_MODE), release) COMPILEDIR := ../target/$(DEB_HOST_RUST_TYPE)/release -- -2.47.0 +2.49.0 diff --git a/pkgs/by-name/pr/proxmox-backup-client/0003-cargo-use-local-patched-h2-dependency.patch b/pkgs/by-name/pr/proxmox-backup-client/0003-cargo-use-local-patched-h2-dependency.patch index 4a92350d3ebd..fdac6856b983 100644 --- a/pkgs/by-name/pr/proxmox-backup-client/0003-cargo-use-local-patched-h2-dependency.patch +++ b/pkgs/by-name/pr/proxmox-backup-client/0003-cargo-use-local-patched-h2-dependency.patch @@ -1,7 +1,7 @@ -From 3fc7e2ab65ad6a8af360fafa84b97f551fa1b619 Mon Sep 17 00:00:00 2001 +From 88f8ac1e5d158ad0a46177b813fd7557cc5e3fbe Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Tue, 24 Dec 2024 17:35:40 +0100 -Subject: [PATCH 3/3] cargo: use local patched h2 dependency +Subject: [PATCH 3/5] cargo: use local patched h2 dependency Signed-off-by: Christoph Heiss --- @@ -9,7 +9,7 @@ Signed-off-by: Christoph Heiss 1 file changed, 2 insertions(+) diff --git a/Cargo.toml b/Cargo.toml -index d2014429..54f951c8 100644 +index 99d712da..091696f1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -201,6 +201,8 @@ proxmox-worker-task = { path = "../proxmox/proxmox-worker-task" } @@ -22,5 +22,5 @@ index d2014429..54f951c8 100644 default = [] #valgrind = ["valgrind_request"] -- -2.47.0 +2.49.0 diff --git a/pkgs/by-name/pr/proxmox-backup-client/0004-docs-drop-all-but-client-man-pages.patch b/pkgs/by-name/pr/proxmox-backup-client/0004-docs-drop-all-but-client-man-pages.patch new file mode 100644 index 000000000000..4db8088010d2 --- /dev/null +++ b/pkgs/by-name/pr/proxmox-backup-client/0004-docs-drop-all-but-client-man-pages.patch @@ -0,0 +1,83 @@ +From 846d0b9c8f62340cb0703c59d16414b05a15382a Mon Sep 17 00:00:00 2001 +From: Thomas Lamprecht +Date: Tue, 29 Nov 2022 17:20:28 +0100 +Subject: [PATCH 4/5] docs: drop all but client man pages + +Signed-off-by: Thomas Lamprecht +Signed-off-by: Christoph Heiss +--- + docs/Makefile | 19 ------------------- + docs/conf.py | 24 ------------------------ + 2 files changed, 43 deletions(-) + +diff --git a/docs/Makefile b/docs/Makefile +index fa00729e..53a420b5 100644 +--- a/docs/Makefile ++++ b/docs/Makefile +@@ -1,27 +1,8 @@ + include ../defines.mk + + GENERATED_SYNOPSIS := \ +- config/acl/roles.rst \ +- config/datastore/config.rst \ +- config/domains/config.rst \ +- config/media-pool/config.rst \ +- config/notifications-priv/config.rst \ +- config/notifications/config.rst \ +- config/remote/config.rst \ +- config/sync/config.rst \ +- config/tape-job/config.rst \ +- config/tape/config.rst \ +- config/user/config.rst \ +- config/verification/config.rst \ +- config/prune/config.rst \ +- pmt/synopsis.rst \ +- pmtx/synopsis.rst \ + proxmox-backup-client/catalog-shell-synopsis.rst \ + proxmox-backup-client/synopsis.rst \ +- proxmox-backup-debug/synopsis.rst \ +- proxmox-backup-manager/synopsis.rst \ +- proxmox-file-restore/synopsis.rst \ +- proxmox-tape/synopsis.rst \ + pxar/synopsis.rst \ + + MAN1_PAGES := \ +diff --git a/docs/conf.py b/docs/conf.py +index a7fa1079..345a0170 100644 +--- a/docs/conf.py ++++ b/docs/conf.py +@@ -93,31 +93,7 @@ rst_epilog += f"\n.. |pbs-copyright| replace:: Copyright (C) {copyright}" + man_pages = [ + # CLI + ('proxmox-backup-client/man1', 'proxmox-backup-client', 'Command line tool for Backup and Restore', [author], 1), +- ('proxmox-backup-manager/man1', 'proxmox-backup-manager', 'Command line tool to manage and configure the backup server.', [author], 1), +- ('proxmox-backup-debug/man1', 'proxmox-backup-debug', 'Debugging command line tool for Backup and Restore', [author], 1), +- ('proxmox-backup-proxy/man1', 'proxmox-backup-proxy', 'Proxmox Backup Public API Server', [author], 1), +- ('proxmox-backup/man1', 'proxmox-backup', 'Proxmox Backup Local API Server', [author], 1), +- ('proxmox-file-restore/man1', 'proxmox-file-restore', 'CLI tool for restoring files and directories from Proxmox Backup Server archives', [author], 1), +- ('proxmox-tape/man1', 'proxmox-tape', 'Proxmox Tape Backup CLI Tool', [author], 1), + ('pxar/man1', 'pxar', 'Proxmox File Archive CLI Tool', [author], 1), +- ('pmt/man1', 'pmt', 'Control Linux Tape Devices', [author], 1), +- ('pmtx/man1', 'pmtx', 'Control SCSI media changer devices (tape autoloaders)', [author], 1), +- ('pbs2to3/man1', 'pbs2to3', 'Proxmox Backup Server upgrade checker script for 2.4+ to current 3.x major upgrades', [author], 1), +- # configs +- ('config/acl/man5', 'acl.cfg', 'Access Control Configuration', [author], 5), +- ('config/datastore/man5', 'datastore.cfg', 'Datastore Configuration', [author], 5), +- ('config/domains/man5', 'domains.cfg', 'Realm Configuration', [author], 5), +- ('config/media-pool/man5', 'media-pool.cfg', 'Media Pool Configuration', [author], 5), +- ('config/node/man5', 'proxmox-backup.node.cfg', 'Proxmox Backup Server - Node Configuration', [author], 5), +- ('config/remote/man5', 'remote.cfg', 'Remote Server Configuration', [author], 5), +- ('config/sync/man5', 'sync.cfg', 'Synchronization Job Configuration', [author], 5), +- ('config/tape-job/man5', 'tape-job.cfg', 'Tape Job Configuration', [author], 5), +- ('config/tape/man5', 'tape.cfg', 'Tape Drive and Changer Configuration', [author], 5), +- ('config/user/man5', 'user.cfg', 'User Configuration', [author], 5), +- ('config/verification/man5', 'verification.cfg', 'Verification Job Configuration', [author], 5), +- ('config/prune/man5', 'prune.cfg', 'Prune Job Configuration', [author], 5), +- ('config/notifications/man5', 'notifications.cfg', 'Notification target/matcher configuration', [author], 5), +- ('config/notifications-priv/man5', 'notifications-priv.cfg', 'Notification target secrets', [author], 5), + ] + + +-- +2.49.0 + diff --git a/pkgs/by-name/pr/proxmox-backup-client/0005-Revert-h2-switch-to-legacy-feature.patch b/pkgs/by-name/pr/proxmox-backup-client/0005-Revert-h2-switch-to-legacy-feature.patch new file mode 100644 index 000000000000..535191c61d0e --- /dev/null +++ b/pkgs/by-name/pr/proxmox-backup-client/0005-Revert-h2-switch-to-legacy-feature.patch @@ -0,0 +1,198 @@ +From b1a06f6a63a63410f89bd0d2968a6fdb7ce2352d Mon Sep 17 00:00:00 2001 +From: Christoph Heiss +Date: Thu, 5 Jun 2025 12:01:10 +0200 +Subject: [PATCH 5/5] Revert "h2: switch to legacy feature" + +This reverts commit 168ed370263e84a6235968c615b856b9280debe1. + +It's a Proxmox-specific workaround (see also the commit description +itself) and does not apply here. + +Signed-off-by: Christoph Heiss +--- + Cargo.toml | 2 +- + examples/h2client.rs | 6 +++--- + examples/h2s-client.rs | 6 +++--- + pbs-client/src/backup_writer.rs | 8 ++++---- + pbs-client/src/http_client.rs | 12 +++++------- + pbs-client/src/pipe_to_stream.rs | 2 +- + 6 files changed, 17 insertions(+), 19 deletions(-) + +diff --git a/Cargo.toml b/Cargo.toml +index 091696f1..063f62f8 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -122,7 +122,7 @@ env_logger = "0.11" + flate2 = "1.0" + foreign-types = "0.3" + futures = "0.3" +-h2 = { version = "0.4", features = [ "legacy", "stream" ] } ++h2 = { version = "0.4", features = [ "stream" ] } + handlebars = "3.0" + hex = "0.4.3" + hickory-resolver = { version = "0.24.1", default-features = false, features = [ "system-config", "tokio-runtime" ] } +diff --git a/examples/h2client.rs b/examples/h2client.rs +index e44c43fa..1dcb4498 100644 +--- a/examples/h2client.rs ++++ b/examples/h2client.rs +@@ -10,7 +10,7 @@ use tokio::net::TcpStream; + // Simple H2 client to test H2 download speed using h2server.rs + + struct Process { +- body: h2::legacy::RecvStream, ++ body: h2::RecvStream, + trailers: bool, + bytes: usize, + } +@@ -50,7 +50,7 @@ impl Future for Process { + } + + fn send_request( +- mut client: h2::legacy::client::SendRequest, ++ mut client: h2::client::SendRequest, + ) -> impl Future> { + println!("sending request"); + +@@ -78,7 +78,7 @@ async fn run() -> Result<(), Error> { + let conn = TcpStream::connect(std::net::SocketAddr::from(([127, 0, 0, 1], 8008))).await?; + conn.set_nodelay(true).unwrap(); + +- let (client, h2) = h2::legacy::client::Builder::new() ++ let (client, h2) = h2::client::Builder::new() + .initial_connection_window_size(1024 * 1024 * 1024) + .initial_window_size(1024 * 1024 * 1024) + .max_frame_size(4 * 1024 * 1024) +diff --git a/examples/h2s-client.rs b/examples/h2s-client.rs +index 86b3a931..a12b5a48 100644 +--- a/examples/h2s-client.rs ++++ b/examples/h2s-client.rs +@@ -10,7 +10,7 @@ use tokio::net::TcpStream; + // Simple H2 client to test H2 download speed using h2s-server.rs + + struct Process { +- body: h2::legacy::RecvStream, ++ body: h2::RecvStream, + trailers: bool, + bytes: usize, + } +@@ -50,7 +50,7 @@ impl Future for Process { + } + + fn send_request( +- mut client: h2::legacy::client::SendRequest, ++ mut client: h2::client::SendRequest, + ) -> impl Future> { + println!("sending request"); + +@@ -94,7 +94,7 @@ async fn run() -> Result<(), Error> { + .await + .map_err(|err| format_err!("connect failed - {}", err))?; + +- let (client, h2) = h2::legacy::client::Builder::new() ++ let (client, h2) = h2::client::Builder::new() + .initial_connection_window_size(1024 * 1024 * 1024) + .initial_window_size(1024 * 1024 * 1024) + .max_frame_size(4 * 1024 * 1024) +diff --git a/pbs-client/src/backup_writer.rs b/pbs-client/src/backup_writer.rs +index 32542506..1253ef56 100644 +--- a/pbs-client/src/backup_writer.rs ++++ b/pbs-client/src/backup_writer.rs +@@ -56,7 +56,7 @@ pub struct UploadOptions { + } + + struct ChunkUploadResponse { +- future: h2::legacy::client::ResponseFuture, ++ future: h2::client::ResponseFuture, + size: usize, + } + +@@ -143,7 +143,7 @@ impl BackupWriter { + param: Option, + content_type: &str, + data: Vec, +- ) -> Result { ++ ) -> Result { + let request = + H2Client::request_builder("localhost", method, path, param, Some(content_type)) + .unwrap(); +@@ -514,7 +514,7 @@ impl BackupWriter { + } + + fn response_queue() -> ( +- mpsc::Sender, ++ mpsc::Sender, + oneshot::Receiver>, + ) { + let (verify_queue_tx, verify_queue_rx) = mpsc::channel(100); +@@ -537,7 +537,7 @@ impl BackupWriter { + tokio::spawn( + ReceiverStream::new(verify_queue_rx) + .map(Ok::<_, Error>) +- .try_for_each(move |response: h2::legacy::client::ResponseFuture| { ++ .try_for_each(move |response: h2::client::ResponseFuture| { + response + .map_err(Error::from) + .and_then(H2Client::h2api_response) +diff --git a/pbs-client/src/http_client.rs b/pbs-client/src/http_client.rs +index c95def07..8f6f8b41 100644 +--- a/pbs-client/src/http_client.rs ++++ b/pbs-client/src/http_client.rs +@@ -863,7 +863,7 @@ impl HttpClient { + + let max_window_size = (1 << 31) - 2; + +- let (h2, connection) = h2::legacy::client::Builder::new() ++ let (h2, connection) = h2::client::Builder::new() + .initial_connection_window_size(max_window_size) + .initial_window_size(max_window_size) + .max_frame_size(4 * 1024 * 1024) +@@ -1008,11 +1008,11 @@ impl Drop for HttpClient { + + #[derive(Clone)] + pub struct H2Client { +- h2: h2::legacy::client::SendRequest, ++ h2: h2::client::SendRequest, + } + + impl H2Client { +- pub fn new(h2: h2::legacy::client::SendRequest) -> Self { ++ pub fn new(h2: h2::client::SendRequest) -> Self { + Self { h2 } + } + +@@ -1092,7 +1092,7 @@ impl H2Client { + &self, + request: Request<()>, + data: Option, +- ) -> impl Future> { ++ ) -> impl Future> { + self.h2 + .clone() + .ready() +@@ -1109,9 +1109,7 @@ impl H2Client { + }) + } + +- pub async fn h2api_response( +- response: Response, +- ) -> Result { ++ pub async fn h2api_response(response: Response) -> Result { + let status = response.status(); + + let (_head, mut body) = response.into_parts(); +diff --git a/pbs-client/src/pipe_to_stream.rs b/pbs-client/src/pipe_to_stream.rs +index 3fc942d3..ae689851 100644 +--- a/pbs-client/src/pipe_to_stream.rs ++++ b/pbs-client/src/pipe_to_stream.rs +@@ -8,7 +8,7 @@ use std::task::{Context, Poll}; + use anyhow::{format_err, Error}; + use bytes::Bytes; + use futures::{ready, Future}; +-use h2::legacy::SendStream; ++use h2::SendStream; + + pub struct PipeToSendStream { + body_tx: SendStream, +-- +2.49.0 + diff --git a/pkgs/by-name/pr/proxmox-backup-client/Cargo.lock b/pkgs/by-name/pr/proxmox-backup-client/Cargo.lock index f7420ac3d37e..9c10cf28e635 100644 --- a/pkgs/by-name/pr/proxmox-backup-client/Cargo.lock +++ b/pkgs/by-name/pr/proxmox-backup-client/Cargo.lock @@ -19,9 +19,9 @@ checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "ahash" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" dependencies = [ "cfg-if", "once_cell", @@ -45,10 +45,71 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] -name = "anyhow" -version = "1.0.95" +name = "anstream" +version = "0.6.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" +checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd" + +[[package]] +name = "anstyle-parse" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882" +dependencies = [ + "anstyle", + "once_cell_polyfill", + "windows-sys 0.59.0", +] + +[[package]] +name = "anyhow" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" + +[[package]] +name = "async-trait" +version = "0.1.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5" +dependencies = [ + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", +] [[package]] name = "atomic-waker" @@ -64,9 +125,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "backtrace" -version = "0.3.74" +version = "0.3.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" +checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002" dependencies = [ "addr2line", "cfg-if", @@ -91,23 +152,20 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bindgen" -version = "0.69.5" +version = "0.71.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" +checksum = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.1", "cexpr", "clang-sys", "itertools", - "lazy_static", - "lazycell", - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2 1.0.95", + "quote 1.0.40", "regex", "rustc-hash", "shlex", - "syn 2.0.91", - "which", + "syn 2.0.101", ] [[package]] @@ -118,9 +176,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.6.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" [[package]] name = "block-buffer" @@ -133,21 +191,21 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.16.0" +version = "3.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" [[package]] name = "bytes" -version = "1.9.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" +checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" [[package]] name = "cc" -version = "1.2.5" +version = "1.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31a0499c1dc64f458ad13872de75c0eb7e3fdb0e67964610c914b034fc5956e" +checksum = "d0fc897dc1e865cc67c0e05a836d9d3f1df3cbe442aa4a9473b18e12624a4951" dependencies = [ "jobserver", "libc", @@ -160,7 +218,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" dependencies = [ - "nom", + "nom 7.1.3", ] [[package]] @@ -201,6 +259,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "colorchoice" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" + [[package]] name = "const_format" version = "0.2.34" @@ -216,8 +280,8 @@ version = "0.2.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d57c2eccfb16dbac1f4e61e206105db5820c9d26c3c472bc17c774259ef7744" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2 1.0.95", + "quote 1.0.40", "unicode-xid 0.2.6", ] @@ -239,9 +303,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" dependencies = [ "libc", ] @@ -265,6 +329,12 @@ dependencies = [ "typenum", ] +[[package]] +name = "data-encoding" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476" + [[package]] name = "digest" version = "0.10.7" @@ -302,22 +372,22 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 2.0.91", + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", ] [[package]] name = "either" -version = "1.13.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" [[package]] name = "email-encoding" -version = "0.3.1" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea3d894bbbab314476b265f9b2d46bf24b123a36dd0e96b06a1b49545b9d9dcc" +checksum = "9298e6504d9b9e780ed3f7dfd43a61be8cd0e09eb07f7706a945b0072b6670b6" dependencies = [ "base64 0.22.1", "memchr", @@ -355,29 +425,51 @@ dependencies = [ ] [[package]] -name = "env_logger" -version = "0.10.2" +name = "enum-as-inner" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc" +dependencies = [ + "heck", + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", +] + +[[package]] +name = "env_filter" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0" dependencies = [ - "humantime", - "is-terminal", "log", "regex", - "termcolor", +] + +[[package]] +name = "env_logger" +version = "0.11.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "jiff", + "log", ] [[package]] name = "equivalent" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "errno" -version = "0.3.10" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" +checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18" dependencies = [ "libc", "windows-sys 0.59.0", @@ -406,7 +498,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5" dependencies = [ "cfg-if", - "rustix", + "rustix 0.38.44", "windows-sys 0.48.0", ] @@ -424,9 +516,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.35" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" +checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece" dependencies = [ "crc32fast", "miniz_oxide", @@ -516,9 +608,9 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 2.0.91", + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", ] [[package]] @@ -563,13 +655,25 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" dependencies = [ "cfg-if", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" +dependencies = [ + "cfg-if", + "libc", + "r-efi", + "wasi 0.14.2+wasi-0.2.4", ] [[package]] @@ -580,9 +684,9 @@ checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "glob" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" +checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" [[package]] name = "h2" @@ -605,7 +709,7 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.7" +version = "0.4.10" dependencies = [ "atomic-waker", "bytes", @@ -646,15 +750,15 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.15.2" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" +checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3" [[package]] -name = "hermit-abi" -version = "0.4.0" +name = "heck" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hex" @@ -666,23 +770,59 @@ dependencies = [ ] [[package]] -name = "home" -version = "0.5.11" +name = "hickory-proto" +version = "0.24.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" +checksum = "92652067c9ce6f66ce53cc38d1169daa36e6e7eb7dd3b63b5103bd9d97117248" dependencies = [ - "windows-sys 0.59.0", + "async-trait", + "cfg-if", + "data-encoding", + "enum-as-inner", + "futures-channel", + "futures-io", + "futures-util", + "idna", + "ipnet", + "once_cell", + "rand", + "thiserror 1.0.69", + "tinyvec", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "hickory-resolver" +version = "0.24.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbb117a1ca520e111743ab2f6688eddee69db4e0ea242545a604dce8a66fd22e" +dependencies = [ + "cfg-if", + "futures-util", + "hickory-proto", + "ipconfig", + "lru-cache", + "once_cell", + "parking_lot", + "rand", + "resolv-conf", + "smallvec", + "thiserror 1.0.69", + "tokio", + "tracing", ] [[package]] name = "hostname" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" +checksum = "a56f203cd1c76362b69e3863fd987520ac36cf70a8c92627449b2f64a8cf7d65" dependencies = [ "cfg-if", "libc", - "windows", + "windows-link", ] [[package]] @@ -709,9 +849,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.9.5" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" +checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" [[package]] name = "httpdate" @@ -719,12 +859,6 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - [[package]] name = "hyper" version = "0.14.32" @@ -751,21 +885,22 @@ dependencies = [ [[package]] name = "icu_collections" -version = "1.5.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47" dependencies = [ "displaydoc", + "potential_utf", "yoke", "zerofrom", "zerovec", ] [[package]] -name = "icu_locid" -version = "1.5.0" +name = "icu_locale_core" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a" dependencies = [ "displaydoc", "litemap", @@ -774,31 +909,11 @@ dependencies = [ "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" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979" dependencies = [ "displaydoc", "icu_collections", @@ -806,67 +921,54 @@ dependencies = [ "icu_properties", "icu_provider", "smallvec", - "utf16_iter", - "utf8_iter", - "write16", "zerovec", ] [[package]] name = "icu_normalizer_data" -version = "1.5.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" +checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3" [[package]] name = "icu_properties" -version = "1.5.1" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b" dependencies = [ "displaydoc", "icu_collections", - "icu_locid_transform", + "icu_locale_core", "icu_properties_data", "icu_provider", - "tinystr", + "potential_utf", + "zerotrie", "zerovec", ] [[package]] name = "icu_properties_data" -version = "1.5.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" +checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632" [[package]] name = "icu_provider" -version = "1.5.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af" dependencies = [ "displaydoc", - "icu_locid", - "icu_provider_macros", + "icu_locale_core", "stable_deref_trait", "tinystr", "writeable", "yoke", "zerofrom", + "zerotrie", "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 1.0.92", - "quote 1.0.37", - "syn 2.0.91", -] - [[package]] name = "idna" version = "1.0.3" @@ -880,9 +982,9 @@ dependencies = [ [[package]] name = "idna_adapter" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" dependencies = [ "icu_normalizer", "icu_properties", @@ -890,54 +992,92 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.7.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" +checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" dependencies = [ "equivalent", - "hashbrown 0.15.2", + "hashbrown 0.15.3", ] [[package]] -name = "is-terminal" -version = "0.4.13" +name = "ipconfig" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" +checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.52.0", + "socket2", + "widestring", + "windows-sys 0.48.0", + "winreg", ] +[[package]] +name = "ipnet" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" + +[[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.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" + +[[package]] +name = "jiff" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a194df1107f33c79f4f93d02c80798520551949d59dfad22b6157048a88cca93" +dependencies = [ + "jiff-static", + "log", + "portable-atomic", + "portable-atomic-util", + "serde", +] + +[[package]] +name = "jiff-static" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c6e1db7ed32c6c71b759497fae34bf7933636f75a251b9e736555da426f6442" +dependencies = [ + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", +] [[package]] name = "jobserver" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a" dependencies = [ + "getrandom 0.3.3", "libc", ] [[package]] name = "js-sys" -version = "0.3.76" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" dependencies = [ "once_cell", "wasm-bindgen", @@ -949,17 +1089,11 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - [[package]] name = "lettre" -version = "0.11.11" +version = "0.11.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4c9a167ff73df98a5ecc07e8bf5ce90b583665da3d1762eb1f775ad4d0d6f5" +checksum = "87ffd14fa289730e3ad68edefdc31f603d56fe716ec38f2076bb7410e09147c2" dependencies = [ "base64 0.22.1", "chumsky", @@ -972,7 +1106,7 @@ dependencies = [ "idna", "mime", "native-tls", - "nom", + "nom 8.0.0", "percent-encoding", "quoted_printable", "socket2", @@ -982,18 +1116,18 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.169" +version = "0.2.172" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" +checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" [[package]] name = "libloading" -version = "0.8.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" +checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667" dependencies = [ "cfg-if", - "windows-targets 0.52.6", + "windows-targets 0.53.0", ] [[package]] @@ -1002,7 +1136,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.1", "libc", "redox_syscall", ] @@ -1018,22 +1152,53 @@ dependencies = [ ] [[package]] -name = "linux-raw-sys" -version = "0.4.14" +name = "linked-hash-map" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-raw-sys" +version = "0.4.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" + +[[package]] +name = "linux-raw-sys" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" [[package]] name = "litemap" -version = "0.7.4" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" +checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" + +[[package]] +name = "lock_api" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765" +dependencies = [ + "autocfg", + "scopeguard", +] [[package]] name = "log" -version = "0.4.22" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" + +[[package]] +name = "lru-cache" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" +dependencies = [ + "linked-hash-map", +] [[package]] name = "memchr" @@ -1073,29 +1238,29 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.8.2" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394" +checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a" dependencies = [ "adler2", ] [[package]] name = "mio" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" +checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c" dependencies = [ "libc", - "wasi", - "windows-sys 0.52.0", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.59.0", ] [[package]] name = "native-tls" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e" dependencies = [ "libc", "log", @@ -1153,6 +1318,15 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "nom" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405" +dependencies = [ + "memchr", +] + [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -1174,17 +1348,23 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.20.2" +version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" + +[[package]] +name = "once_cell_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" [[package]] name = "openssl" -version = "0.10.68" +version = "0.10.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" +checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.1", "cfg-if", "foreign-types", "libc", @@ -1199,22 +1379,22 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 2.0.91", + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", ] [[package]] name = "openssl-probe" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" [[package]] name = "openssl-sys" -version = "0.9.104" +version = "0.9.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" +checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571" dependencies = [ "cc", "libc", @@ -1228,6 +1408,29 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" +[[package]] +name = "parking_lot" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.52.6", +] + [[package]] name = "pathpatterns" version = "0.3.0" @@ -1238,7 +1441,7 @@ dependencies = [ [[package]] name = "pbs-api-types" -version = "0.1.0" +version = "0.2.2" dependencies = [ "anyhow", "const_format", @@ -1259,19 +1462,19 @@ dependencies = [ [[package]] name = "pbs-buildcfg" -version = "3.3.2" +version = "3.4.2" [[package]] name = "pbs-client" version = "0.1.0" dependencies = [ "anyhow", - "bitflags 2.6.0", + "bitflags 2.9.1", "bytes", "futures", - "h2 0.4.7", + "h2 0.4.10", "hex", - "http", + "hickory-resolver", "hyper", "libc", "nix 0.26.4", @@ -1324,6 +1527,7 @@ dependencies = [ "proxmox-shared-memory", "proxmox-sys", "proxmox-time", + "proxmox-uuid", "regex", "serde", "serde_json", @@ -1335,6 +1539,7 @@ version = "0.1.0" dependencies = [ "anyhow", "base64 0.13.1", + "const_format", "crc32fast", "endian_trait", "futures", @@ -1356,10 +1561,12 @@ dependencies = [ "proxmox-schema", "proxmox-serde", "proxmox-sys", + "proxmox-systemd", "proxmox-time", "proxmox-uuid", "proxmox-worker-task", "pxar", + "regex", "serde", "serde_json", "tokio", @@ -1423,7 +1630,7 @@ name = "pbs-tape" version = "0.1.0" dependencies = [ "anyhow", - "bitflags 2.6.0", + "bitflags 2.9.1", "endian_trait", "hex", "libc", @@ -1457,7 +1664,7 @@ dependencies = [ "foreign-types", "hex", "libc", - "nom", + "nom 7.1.3", "openssl", "proxmox-async", "proxmox-human-byte", @@ -1476,20 +1683,20 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.15" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc" +checksum = "198db74531d58c70a361c42201efde7e2591e976d518caf7662a47dc5720e7b6" dependencies = [ "memchr", - "thiserror 2.0.9", + "thiserror 2.0.12", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.7.15" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "816518421cfc6887a0d62bf441b6ffb4536fcc926395a69e1a85852d4363f57e" +checksum = "d725d9cfd79e87dccc9341a2ef39d1b6f6353d68c4b33c177febbe1a402c97c5" dependencies = [ "pest", "pest_generator", @@ -1497,22 +1704,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.15" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d1396fd3a870fc7838768d171b4616d5c91f6cc25e377b673d714567d99377b" +checksum = "db7d01726be8ab66ab32f9df467ae8b1148906685bbe75c82d1e65d7f5b3f841" dependencies = [ "pest", "pest_meta", - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 2.0.91", + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", ] [[package]] name = "pest_meta" -version = "2.7.15" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e58089ea25d717bfd31fb534e4f3afcc2cc569c70de3e239778991ea3b7dea" +checksum = "7f9f832470494906d1fca5329f8ab5791cc60beb230c74815dff541cbd2b5ca0" dependencies = [ "once_cell", "pest", @@ -1521,9 +1728,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] name = "pin-utils" @@ -1533,9 +1740,42 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" +checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" + +[[package]] +name = "portable-atomic" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" + +[[package]] +name = "portable-atomic-util" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507" +dependencies = [ + "portable-atomic", +] + +[[package]] +name = "potential_utf" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585" +dependencies = [ + "zerovec", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" +dependencies = [ + "zerocopy", +] [[package]] name = "proc-macro2" @@ -1548,26 +1788,26 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.92" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" dependencies = [ "unicode-ident", ] [[package]] name = "proxmox-api-macro" -version = "1.2.1" +version = "1.3.3" dependencies = [ "anyhow", - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 2.0.91", + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", ] [[package]] name = "proxmox-apt-api-types" -version = "1.0.2" +version = "1.0.3" dependencies = [ "proxmox-config-digest", "proxmox-schema", @@ -1589,7 +1829,7 @@ dependencies = [ [[package]] name = "proxmox-auth-api" -version = "0.4.6" +version = "0.4.8" dependencies = [ "anyhow", "const_format", @@ -1601,7 +1841,7 @@ dependencies = [ [[package]] name = "proxmox-backup" -version = "3.3.2" +version = "3.4.2" [[package]] name = "proxmox-backup-banner" @@ -1676,7 +1916,7 @@ dependencies = [ [[package]] name = "proxmox-config-digest" -version = "0.1.0" +version = "0.1.1" dependencies = [ "anyhow", "hex", @@ -1699,7 +1939,7 @@ dependencies = [ [[package]] name = "proxmox-http" -version = "0.9.4" +version = "0.9.5" dependencies = [ "anyhow", "base64 0.13.1", @@ -1715,6 +1955,7 @@ dependencies = [ "serde_json", "tokio", "tokio-openssl", + "tower-service", "ureq", "url", ] @@ -1730,7 +1971,7 @@ dependencies = [ [[package]] name = "proxmox-human-byte" -version = "0.1.3" +version = "0.1.4" dependencies = [ "anyhow", "proxmox-schema", @@ -1752,7 +1993,7 @@ version = "1.4.0" [[package]] name = "proxmox-log" -version = "0.2.7" +version = "0.2.9" dependencies = [ "anyhow", "nix 0.26.4", @@ -1767,7 +2008,7 @@ dependencies = [ [[package]] name = "proxmox-notify" -version = "0.5.1" +version = "0.5.5" dependencies = [ "anyhow", "base64 0.13.1", @@ -1795,7 +2036,7 @@ dependencies = [ [[package]] name = "proxmox-router" -version = "3.0.0" +version = "3.1.1" dependencies = [ "anyhow", "env_logger", @@ -1812,12 +2053,12 @@ dependencies = [ "serde", "serde_json", "serde_plain", - "unicode-width", + "unicode-width 0.1.14", ] [[package]] name = "proxmox-schema" -version = "3.2.0" +version = "4.0.0" dependencies = [ "anyhow", "const_format", @@ -1830,7 +2071,7 @@ dependencies = [ [[package]] name = "proxmox-section-config" -version = "2.1.1" +version = "3.0.0" dependencies = [ "anyhow", "hex", @@ -1875,14 +2116,14 @@ dependencies = [ name = "proxmox-sortable-macro" version = "0.1.3" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 2.0.91", + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", ] [[package]] name = "proxmox-sys" -version = "0.6.5" +version = "0.6.7" dependencies = [ "anyhow", "libc", @@ -1905,13 +2146,13 @@ dependencies = [ [[package]] name = "proxmox-time" -version = "2.0.3" +version = "2.0.4" dependencies = [ "anyhow", - "bitflags 2.6.0", + "bitflags 2.9.1", "js-sys", "libc", - "nom", + "nom 7.1.3", ] [[package]] @@ -1931,9 +2172,9 @@ dependencies = [ [[package]] name = "psm" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "200b9ff220857e53e184257720a14553b2f4aa02577d2ed9842d45d4b9654810" +checksum = "6e944464ec8536cd1beb0bbfd96987eb5e3b72f2ecdafdc5c769a37f1fa2ae1f" dependencies = [ "cc", ] @@ -1987,11 +2228,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.37" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" dependencies = [ - "proc-macro2 1.0.92", + "proc-macro2 1.0.95", ] [[package]] @@ -2000,6 +2241,12 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "640c9bd8497b02465aeef5375144c26062e0dcd5939dfcbb0f5db76cb8c17c73" +[[package]] +name = "r-efi" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" + [[package]] name = "radix_trie" version = "0.2.1" @@ -2011,12 +2258,42 @@ dependencies = [ ] [[package]] -name = "redox_syscall" -version = "0.5.8" +name = "rand" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ - "bitflags 2.6.0", + "libc", + "rand_chacha", + "rand_core", +] + +[[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", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.16", +] + +[[package]] +name = "redox_syscall" +version = "0.5.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af" +dependencies = [ + "bitflags 2.9.1", ] [[package]] @@ -2025,7 +2302,7 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ - "getrandom", + "getrandom 0.2.16", "libredox", "thiserror 1.0.69", ] @@ -2059,6 +2336,12 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" +[[package]] +name = "resolv-conf" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95325155c684b1c89f7765e30bc1c42e4a6da51ca513615660cb8a62ef9a88e3" + [[package]] name = "rustc-demangle" version = "0.1.24" @@ -2067,20 +2350,33 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" -version = "1.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" [[package]] name = "rustix" -version = "0.38.42" +version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" +checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.1", "errno", "libc", - "linux-raw-sys", + "linux-raw-sys 0.4.15", + "windows-sys 0.59.0", +] + +[[package]] +name = "rustix" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266" +dependencies = [ + "bitflags 2.9.1", + "errno", + "libc", + "linux-raw-sys 0.9.4", "windows-sys 0.59.0", ] @@ -2108,9 +2404,12 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.10.1" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37" +checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79" +dependencies = [ + "zeroize", +] [[package]] name = "rustyline" @@ -2131,16 +2430,16 @@ dependencies = [ "scopeguard", "smallvec", "unicode-segmentation", - "unicode-width", + "unicode-width 0.1.14", "utf8parse", "winapi", ] [[package]] name = "ryu" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" [[package]] name = "same-file" @@ -2172,7 +2471,7 @@ version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.1", "core-foundation", "core-foundation-sys", "libc", @@ -2181,9 +2480,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.13.0" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1863fd3768cd83c56a7f60faa4dc0d403f1b6df0a38c3c25f44b7894e45370d5" +checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32" dependencies = [ "core-foundation-sys", "libc", @@ -2191,29 +2490,29 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.216" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.216" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 2.0.91", + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", ] [[package]] name = "serde_json" -version = "1.0.134" +version = "1.0.140" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" +checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" dependencies = [ "itoa", "memchr", @@ -2232,9 +2531,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.8" +version = "0.10.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ "cfg-if", "cpufeatures", @@ -2258,9 +2557,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.2" +version = "1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410" dependencies = [ "libc", ] @@ -2282,9 +2581,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.2" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9" [[package]] name = "smawk" @@ -2294,9 +2593,9 @@ checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" [[package]] name = "socket2" -version = "0.5.8" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" +checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" dependencies = [ "libc", "windows-sys 0.52.0", @@ -2310,9 +2609,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "stacker" -version = "0.1.17" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "799c883d55abdb5e98af1a7b3f23b9b6de8ecada0ecac058672d7635eb48ca7b" +checksum = "cddb07e32ddb770749da91081d8d0ac3a16f1a569a18b20348cd371f5dead06b" dependencies = [ "cc", "cfg-if", @@ -2340,31 +2639,31 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.91" +version = "2.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53cbcb5a243bd33b7858b1d7f4aca2153490815872d86d955d6ea29f743c035" +checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", + "proc-macro2 1.0.95", + "quote 1.0.40", "unicode-ident", ] [[package]] name = "synstructure" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 2.0.91", + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", ] [[package]] name = "tar" -version = "0.4.43" +version = "0.4.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c65998313f8e17d0d553d28f91a0df93e4dbbbf770279c7bc21ca0f09ea1a1f6" +checksum = "1d863878d212c87a19c1a610eb53bb01fe12951c0501cf5a0d65f724914a667a" dependencies = [ "filetime", "libc", @@ -2373,35 +2672,26 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.14.0" +version = "3.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" +checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1" dependencies = [ - "cfg-if", "fastrand", + "getrandom 0.3.3", "once_cell", - "rustix", + "rustix 1.0.7", "windows-sys 0.59.0", ] -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - [[package]] name = "textwrap" -version = "0.16.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" +checksum = "c13547615a44dc9c452a8a534638acdf07120d4b6847c8178705da06306a3057" dependencies = [ "smawk", "unicode-linebreak", - "unicode-width", + "unicode-width 0.2.0", ] [[package]] @@ -2415,11 +2705,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.9" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc" +checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" dependencies = [ - "thiserror-impl 2.0.9", + "thiserror-impl 2.0.12", ] [[package]] @@ -2428,20 +2718,20 @@ version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 2.0.91", + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", ] [[package]] name = "thiserror-impl" -version = "2.0.9" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4" +checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 2.0.91", + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", ] [[package]] @@ -2456,19 +2746,34 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.7.6" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b" dependencies = [ "displaydoc", "zerovec", ] [[package]] -name = "tokio" -version = "1.42.0" +name = "tinyvec" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" +checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.45.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75ef51a33ef1da925cea3e4eb122833cb377c61439ca401b770f54902b806779" dependencies = [ "backtrace", "bytes", @@ -2483,13 +2788,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 2.0.91", + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", ] [[package]] @@ -2516,9 +2821,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.13" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078" +checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df" dependencies = [ "bytes", "futures-core", @@ -2550,9 +2855,9 @@ version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 2.0.91", + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", ] [[package]] @@ -2609,9 +2914,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "typenum" -version = "1.17.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" +checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" [[package]] name = "ucd-trie" @@ -2631,9 +2936,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.14" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" [[package]] name = "unicode-linebreak" @@ -2653,6 +2958,12 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" +[[package]] +name = "unicode-width" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" + [[package]] name = "unicode-xid" version = "0.1.0" @@ -2690,12 +3001,6 @@ dependencies = [ "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" @@ -2710,9 +3015,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "valuable" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" +checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" [[package]] name = "vcpkg" @@ -2752,10 +3057,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] -name = "wasm-bindgen" -version = "0.2.99" +name = "wasi" +version = "0.14.2+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" +checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" +dependencies = [ + "wit-bindgen-rt", +] + +[[package]] +name = "wasm-bindgen" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if", "once_cell", @@ -2764,58 +3078,55 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", "log", - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 2.0.91", + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" dependencies = [ - "quote 1.0.37", + "quote 1.0.40", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 2.0.91", + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] [[package]] -name = "which" -version = "4.4.2" +name = "widestring" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix", -] +checksum = "dd7cf3379ca1aac9eea11fba24fd7e315d621f8dfe35c8d7d2be8b793726e07d" [[package]] name = "winapi" @@ -2849,23 +3160,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.52.0" +name = "windows-link" +version = "0.1.1" 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.6", -] +checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38" [[package]] name = "windows-sys" @@ -2918,13 +3216,29 @@ dependencies = [ "windows_aarch64_gnullvm 0.52.6", "windows_aarch64_msvc 0.52.6", "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm", + "windows_i686_gnullvm 0.52.6", "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-targets" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b" +dependencies = [ + "windows_aarch64_gnullvm 0.53.0", + "windows_aarch64_msvc 0.53.0", + "windows_i686_gnu 0.53.0", + "windows_i686_gnullvm 0.53.0", + "windows_i686_msvc 0.53.0", + "windows_x86_64_gnu 0.53.0", + "windows_x86_64_gnullvm 0.53.0", + "windows_x86_64_msvc 0.53.0", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" @@ -2937,6 +3251,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" @@ -2949,6 +3269,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" + [[package]] name = "windows_i686_gnu" version = "0.48.5" @@ -2961,12 +3287,24 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +[[package]] +name = "windows_i686_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" + [[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_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" + [[package]] name = "windows_i686_msvc" version = "0.48.5" @@ -2979,6 +3317,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +[[package]] +name = "windows_i686_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" @@ -2991,6 +3335,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +[[package]] +name = "windows_x86_64_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" @@ -3003,6 +3353,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" @@ -3016,26 +3372,44 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] -name = "write16" -version = "1.0.0" +name = "windows_x86_64_msvc" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" +checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "wit-bindgen-rt" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" +dependencies = [ + "bitflags 2.9.1", +] [[package]] name = "writeable" -version = "0.5.5" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" +checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb" [[package]] name = "xattr" -version = "1.3.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +checksum = "0d65cbf2f12c15564212d48f4e3dfb87923d25d611f2aed18f4cb23f0413d89e" dependencies = [ "libc", - "linux-raw-sys", - "rustix", + "rustix 1.0.7", ] [[package]] @@ -3046,9 +3420,9 @@ checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" [[package]] name = "yoke" -version = "0.7.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" +checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc" dependencies = [ "serde", "stable_deref_trait", @@ -3058,62 +3432,79 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" +checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 2.0.91", + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", "synstructure", ] [[package]] name = "zerocopy" -version = "0.7.35" +version = "0.8.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.35" +version = "0.8.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 2.0.91", + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", ] [[package]] name = "zerofrom" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" +checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" +checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 2.0.91", + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", "synstructure", ] [[package]] -name = "zerovec" -version = "0.10.4" +name = "zeroize" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" + +[[package]] +name = "zerotrie" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] + +[[package]] +name = "zerovec" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428" dependencies = [ "yoke", "zerofrom", @@ -3122,13 +3513,13 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.10.3" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f" dependencies = [ - "proc-macro2 1.0.92", - "quote 1.0.37", - "syn 2.0.91", + "proc-macro2 1.0.95", + "quote 1.0.40", + "syn 2.0.101", ] [[package]] @@ -3152,9 +3543,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.13+zstd.1.5.6" +version = "2.0.15+zstd.1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" +checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237" dependencies = [ "bindgen", "cc", diff --git a/pkgs/by-name/pr/proxmox-backup-client/package.nix b/pkgs/by-name/pr/proxmox-backup-client/package.nix index 833f668aacf5..e19b41c293c6 100644 --- a/pkgs/by-name/pr/proxmox-backup-client/package.nix +++ b/pkgs/by-name/pr/proxmox-backup-client/package.nix @@ -21,20 +21,20 @@ let pname = "proxmox-backup-client"; - version = "3.3.2"; + version = "3.4.2"; proxmox-backup_src = fetchgit { url = "git://git.proxmox.com/git/proxmox-backup.git"; - tag = "v${version}"; + rev = "37f1949335cad801f7cdaa0173cc114590a37e4e"; name = "proxmox-backup"; - hash = "sha256-0piUftzuK9e8KbOe+bc3SXWa0DlnEgk5iNGWGn4fw7Y="; + hash = "sha256-OW6GG/4IcEw8XOSSB5EoN+jyoOaL0ZtavJahnKOuAqI="; }; proxmox_src = fetchgit { url = "git://git.proxmox.com/git/proxmox.git"; - rev = "df6b705f564ff145faa14770db6493bc5da8cab3"; + rev = "e47fdf411be61b15382bc3baa3064f1e7cb03fa2"; name = "proxmox"; - hash = "sha256-6fQVK+G5FMPy+29hScMkvQ+MQQryYs8f8oooq1YGXbg="; + hash = "sha256-jSU00D75sx40VS8rgF+D6h120FMaD1Jfq4e8l+8D5BQ="; }; proxmox-fuse_src = fetchgit { @@ -63,11 +63,9 @@ let name = "h2"; owner = "hyperium"; repo = "h2"; - rev = "v0.4.7"; - hash = "sha256-GcO4321Jqt1w7jbvQKd0GXIjptyz+tlN2SuxHoBJ/9k="; + rev = "v0.4.10"; + hash = "sha256-PasHCbU466ByHIbDQpMMgzjg2dMRveOButHeVSknSEQ="; }; - - aurPatchCommit = "6f83f58d54bc7186211d0cfa637c652b13e0dfee"; in rustPlatform.buildRustPackage { @@ -85,7 +83,7 @@ rustPlatform.buildRustPackage { sourceRoot = proxmox-backup_src.name; # These patches are essentially un-upstreamable, due to being "workarounds" related to the - # project structure. + # project structure and upstream/Debian-specific packaging. cargoPatches = [ # A lot of Rust crates `proxmox-backup-client` depends on are only available through git (or # Debian packages). This patch redirects all these dependencies to a local, relative path, which @@ -94,17 +92,16 @@ rustPlatform.buildRustPackage { # `make docs` assumes that the binaries are located under `target/{debug,release}`, but due # to how `buildRustPackage` works, they get put under `target/$RUSTC_TARGET/{debug,release}`. # This patch simply fixes that up. - ./0002-docs-Add-target-path-fixup-variable.patch + ./0002-docs-add-target-path-fixup-variable.patch # Need to use a patched version of the `h2` crate (with a downgraded dependency, see also postPatch). # This overrides it in the Cargo.toml as needed. ./0003-cargo-use-local-patched-h2-dependency.patch # This patch prevents the generation of the man-pages for other components inside the repo, # which would require them too be built too. Thus avoid wasting resources and just skip them. - (fetchpatch { - name = "0002-docs-drop-all-but-client-man-pages.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/0002-docs-drop-all-but-client-man-pages.patch?h=proxmox-backup-client&id=${aurPatchCommit}"; - hash = "sha256-AlIGfJZGaZl2NBVfuFxpDL6bgyvXA2Wcz7UWSrnQa24="; - }) + ./0004-docs-drop-all-but-client-man-pages.patch + # Upstream uses a patched version of the h2 crate (see [0]), which does not apply here. + # [0] https://git.proxmox.com/?p=debcargo-conf.git;a=blob;f=src/h2/debian/patches/add-legacy.patch;h=0913da317 + ./0005-Revert-h2-switch-to-legacy-feature.patch ]; postPatch = '' diff --git a/pkgs/by-name/re/redmine/Gemfile b/pkgs/by-name/re/redmine/Gemfile index 8d0d2183e7a2..19138ab112f1 100644 --- a/pkgs/by-name/re/redmine/Gemfile +++ b/pkgs/by-name/re/redmine/Gemfile @@ -82,8 +82,6 @@ group :test do gem 'bundle-audit', require: false end -gem "webrick" - local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") if File.exist?(local_gemfile) eval_gemfile local_gemfile diff --git a/pkgs/by-name/re/redmine/Gemfile.local b/pkgs/by-name/re/redmine/Gemfile.local new file mode 100644 index 000000000000..192455d12b9b --- /dev/null +++ b/pkgs/by-name/re/redmine/Gemfile.local @@ -0,0 +1 @@ +gem 'webrick' diff --git a/pkgs/by-name/sh/shh/package.nix b/pkgs/by-name/sh/shh/package.nix index e2b894df6760..8bc26f187235 100644 --- a/pkgs/by-name/sh/shh/package.nix +++ b/pkgs/by-name/sh/shh/package.nix @@ -19,40 +19,24 @@ let in rustPlatform.buildRustPackage rec { pname = "shh"; - version = "2025.4.12"; + version = "2025.6.4"; src = fetchFromGitHub { owner = "desbma"; repo = "shh"; tag = "v${version}"; - hash = "sha256-+JWz0ya6gi8pPERnpAcQIe7zZUzWGxha+9/gizMVtEw="; + hash = "sha256-rhn7qy/cF1vjCFnEoVzVmKNcI/TBUEMxp5pzzC8c9bw="; }; - cargoHash = "sha256-rrOH76LHYSEeuNiMIICpAO7U/sz5V0JRO22mbIICQWw="; - - # needs to be done this way to bypass patch conflicts - cargoPatches = [ - (fetchpatch { - # to be removed after next release - name = "refactor-man-page-generation-command.patch"; - url = "https://github.com/desbma/shh/commit/849b9a6646981c83a72a977b6398371e29d3b928.patch"; - hash = "sha256-LZlUFfPtt2ScTxQbQ9j3Kzvp7T4MCFs92cJiI3YbWns="; - }) - (fetchpatch { - # to be removed after next release - name = "support-shell-auto-complete.patch"; - url = "https://github.com/desbma/shh/commit/74914dc8cfd74dbd7e051a090cc4c1f561b8cdde.patch"; - hash = "sha256-WgKRQAEwSpXdQUnrZC1Bp4RfKg2J9kPkT1k6R2wwgT8="; - }) - ]; + cargoHash = "sha256-hk4IG/FOwrLrV7kPDQigkpWwQzmvf1LvyrIesMYO3jk="; patches = [ ./fix_run_checks.patch (fetchpatch { # to be removed after next release - name = "feat-static-strace-path-support-at-compile-time.patch"; - url = "https://github.com/desbma/shh/commit/da62ceeb227de853be06610721744667c6fe994b.patch"; - hash = "sha256-p/W7HRZZ4TpIwrWN8wQB/SH3C8x3ZLXzwGV50oK/znQ="; + name = "support-kernels-without-kernel-unprivileged_userns_clone.patch"; + url = "https://github.com/desbma/shh/commit/f103b06c756dbb43aec615b590680cc99cbb0f00.patch"; + hash = "sha256-K68tU7EN51jUayoP+WAUuvqqB2eqyDXnAdLsWEd/eAM="; }) ]; diff --git a/pkgs/by-name/su/super-productivity/package.nix b/pkgs/by-name/su/super-productivity/package.nix index 78fe7df51084..787b57039a6e 100644 --- a/pkgs/by-name/su/super-productivity/package.nix +++ b/pkgs/by-name/su/super-productivity/package.nix @@ -7,27 +7,25 @@ makeDesktopItem, nix-update-script, npm-lockfile-fix, - python3, stdenv, }: buildNpmPackage rec { pname = "super-productivity"; - version = "12.0.5"; + version = "13.0.10"; src = fetchFromGitHub { owner = "johannesjo"; repo = "super-productivity"; tag = "v${version}"; - hash = "sha256-+Xw1WZXvZUOdA/ZpLdLCQAy8cmQ9QTiSDRMgj5+jeNw="; + hash = "sha256-2K/6T4f9tLlrKimT/DPSdoz8LHij5nsaF6BWSQf6u7U="; postFetch = '' ${lib.getExe npm-lockfile-fix} -r $out/package-lock.json ''; }; - npmDepsHash = "sha256-SAmSvdPlJFDE6TQCr932MfPzlwDtGcm4YdHesVA6j8c="; - npmFlags = [ "--legacy-peer-deps" ]; + npmDepsHash = "sha256-l9P11ZvLYiTu/cVPQIw391ZTJ0K+cNPUzoVMsdze2uo="; makeCacheWritable = true; env = { @@ -36,19 +34,11 @@ buildNpmPackage rec { CSC_IDENTITY_AUTO_DISCOVERY = "false"; }; - nativeBuildInputs = - [ copyDesktopItems ] - ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ - (python3.withPackages (ps: [ ps.setuptools ])) - ]; + nativeBuildInputs = [ copyDesktopItems ]; - # package.json does not include `core-js` and the comment suggests - # it is only needed on some mobile platforms postPatch = '' substituteInPlace electron-builder.yaml \ --replace-fail "notarize: true" "notarize: false" - substituteInPlace src/polyfills.ts \ - --replace-fail "import 'core-js/es/object';" "" ''; buildPhase = '' @@ -58,8 +48,8 @@ buildNpmPackage rec { cp -r ${electron.dist} electron-dist chmod -R u+w electron-dist - npm run buildFrontend:prod:es6 - npm run electron:build + npm run prepare + npm run build npm exec electron-builder -- --dir \ -c.electronDist=electron-dist \ -c.electronVersion=${electron.version} @@ -79,18 +69,12 @@ buildNpmPackage rec { '' else '' - mkdir -p $out/share/super-productivity/{app,defaults,static/plugins,static/resources/plugins} - cp -r app-builds/*-unpacked/{locales,resources{,.pak}} "$out/share/super-productivity/app" - - for size in 16 32 48 64 128 256 512 1024; do - local sizexsize="''${size}x''${size}" - mkdir -p $out/share/icons/hicolor/$sizexsize/apps - cp -v build/icons/$sizexsize.png \ - $out/share/icons/hicolor/$sizexsize/apps/super-productivity.png - done + mkdir -p $out/share/{super-productivity,icons/hicolor/scalable/apps} + cp -r app-builds/*-unpacked/resources/app.asar $out/share/super-productivity + cp electron/assets/icons/ico-circled.svg $out/share/icons/hicolor/scalable/apps/super-productivity.svg makeWrapper '${lib.getExe electron}' "$out/bin/super-productivity" \ - --add-flags "$out/share/super-productivity/app/resources/app.asar" \ + --add-flags "$out/share/super-productivity/app.asar" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ --set-default ELECTRON_FORCE_IS_PACKAGED 1 \ --inherit-argv0 @@ -110,8 +94,11 @@ buildNpmPackage rec { type = "Application"; icon = "super-productivity"; startupWMClass = "superProductivity"; - comment = builtins.replaceStrings [ "\n" ] [ " " ] meta.longDescription; - categories = [ "Utility" ]; + comment = "ToDo list and Time Tracking"; + categories = [ + "Office" + "ProjectManagement" + ]; }) ]; diff --git a/pkgs/by-name/ty/typstyle/package.nix b/pkgs/by-name/ty/typstyle/package.nix index c44d84075025..078f44f4d80a 100644 --- a/pkgs/by-name/ty/typstyle/package.nix +++ b/pkgs/by-name/ty/typstyle/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "typstyle"; - version = "0.13.9"; + version = "0.13.10"; src = fetchFromGitHub { owner = "Enter-tainer"; repo = "typstyle"; tag = "v${finalAttrs.version}"; - hash = "sha256-FQ/YBjhFaG9PGb8H3LnOlDcgWrYMy1VvFCHJlLEH32k="; + hash = "sha256-q1WnpjN9Ue0yTm6q5hmcVrDj5oxUhyY71GiiVn1QcpM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-btybQpV5Rl9qgd6+4U4smGpr1RqMlXN82m+N7nni2yA="; + cargoHash = "sha256-Ov+RpV/ONjY/zc8PbIo/TXS3TzJUokaccrFfTEjpxok="; # Disabling tests requiring network access checkFlags = [ diff --git a/pkgs/by-name/un/unblob/package.nix b/pkgs/by-name/un/unblob/package.nix index 47a22f5b1761..f6228fdcedf6 100644 --- a/pkgs/by-name/un/unblob/package.nix +++ b/pkgs/by-name/un/unblob/package.nix @@ -14,11 +14,13 @@ lziprecover, lzop, p7zip, + partclone, sasquatch, sasquatch-v4be, simg2img, ubi_reader, unar, + upx, zstd, versionCheckHook, }: @@ -37,13 +39,14 @@ let ubi_reader simg2img unar + upx zstd lz4 - ]; + ] ++ lib.optional stdenvNoCC.isLinux partclone; in python3.pkgs.buildPythonApplication rec { pname = "unblob"; - version = "25.4.14"; + version = "25.5.26"; pyproject = true; disabled = python3.pkgs.pythonOlder "3.9"; @@ -51,14 +54,14 @@ python3.pkgs.buildPythonApplication rec { owner = "onekey-sec"; repo = "unblob"; tag = version; - hash = "sha256-kWZGQX8uSKdFW+uauunHcruXhJ5XpBfyDY7gPyWGK90="; + hash = "sha256-vTakXZFAcD3cmd+y4CwYg3X4O4NmtOzuqMLWLMX2Duk="; forceFetchGit = true; fetchLFS = true; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-lGsDax7+CUACeYChDqdPsVbKE/hH94CPek6UBVz1eqs="; + hash = "sha256-NirDPuAcKuNquMs9mBZoEkQf+QJ+cMd7JXjj1anB9Zw="; }; strictDeps = true; diff --git a/pkgs/by-name/ve/veilid/package.nix b/pkgs/by-name/ve/veilid/package.nix index 50829eaca45e..77dc996b04fe 100644 --- a/pkgs/by-name/ve/veilid/package.nix +++ b/pkgs/by-name/ve/veilid/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "veilid"; - version = "0.4.6"; + version = "0.4.7"; src = fetchFromGitLab { owner = "veilid"; repo = "veilid"; rev = "v${version}"; - hash = "sha256-bKll7VB6LjkmmhN5lmjcSeP2zZbyWnl4XiZbZe3tKgg="; + hash = "sha256-SEmXZvv6951Ln87/sRQwr4FgGRSvowGyeyApfF+JnJ4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-505gf4P/Hlo8KFynhAQdBagzEqGXhydhTTknat/jWmk="; + cargoHash = "sha256-2fZAds4wNLd/mWh7EWpP2hqspBfAtTHIEe+dFag7Lw4="; nativeBuildInputs = [ capnproto diff --git a/pkgs/by-name/ve/velero/package.nix b/pkgs/by-name/ve/velero/package.nix index c953ee711cb7..f8a3bc3a2cf7 100644 --- a/pkgs/by-name/ve/velero/package.nix +++ b/pkgs/by-name/ve/velero/package.nix @@ -6,21 +6,21 @@ installShellFiles, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "velero"; version = "1.16.1"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "velero"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-KfVMWoBScpHINmT5PlnPY+I5Ec1NRgEXKMtL0M7WyhE="; }; ldflags = [ "-s" "-w" - "-X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=v${version}" + "-X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=v${finalAttrs.version}" "-X github.com/vmware-tanzu/velero/pkg/buildinfo.ImageRegistry=velero" "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean" "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none" @@ -38,7 +38,7 @@ buildGoModule rec { doCheck = false; # Tests expect a running cluster see https://github.com/vmware-tanzu/velero/tree/main/test/e2e doInstallCheck = true; installCheckPhase = '' - $out/bin/velero version --client-only | grep ${version} > /dev/null + $out/bin/velero version --client-only | grep ${finalAttrs.version} > /dev/null ''; nativeBuildInputs = [ installShellFiles ]; @@ -48,14 +48,14 @@ buildGoModule rec { installShellCompletion velero.{bash,zsh} ''; - meta = with lib; { - description = "A utility for managing disaster recovery, specifically for your Kubernetes cluster resources and persistent volumes"; + meta = { + description = "Utility for managing disaster recovery, specifically for your Kubernetes cluster resources and persistent volumes"; homepage = "https://velero.io/"; - changelog = "https://github.com/vmware-tanzu/velero/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = [ - maintainers.mbode - maintainers.bryanasdev000 + changelog = "https://github.com/vmware-tanzu/velero/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + mbode + bryanasdev000 ]; }; -} +}) diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix index 2cb333913c17..62fab4ed0ae6 100644 --- a/pkgs/by-name/vi/victoriametrics/package.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -14,13 +14,13 @@ buildGoModule (finalAttrs: { pname = "VictoriaMetrics"; - version = "1.117.1"; + version = "1.118.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; tag = "v${finalAttrs.version}"; - hash = "sha256-Y3Ai5e9bJnGlWfxOMWMhesJ/eHrklSbR+YmR1EgzFS0="; + hash = "sha256-a84n9fuGdiG0o/1/9q3etTwoFbOL01y88ubTI/yIIBA="; }; vendorHash = null; @@ -78,8 +78,11 @@ buildGoModule (finalAttrs: { __darwinAllowLocalNetworking = true; - passthru.tests = { - inherit (nixosTests) victoriametrics; + passthru = { + tests = { + inherit (nixosTests) victoriametrics; + }; + updateScript = ./update.sh; }; meta = { diff --git a/pkgs/by-name/vi/victoriametrics/update.sh b/pkgs/by-name/vi/victoriametrics/update.sh new file mode 100755 index 000000000000..84f2f275740e --- /dev/null +++ b/pkgs/by-name/vi/victoriametrics/update.sh @@ -0,0 +1,13 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p curl jq nix-update + +set -ex + +curl_github() { + curl -L ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "$@" +} + +latestRelease=$(curl_github https://api.github.com/repos/VictoriaMetrics/VictoriaMetrics/releases/latest | jq -r ".tag_name") +latestVersion="$(expr "$latestRelease" : 'v\(.*\)')" + +nix-update --version "$latestVersion" victoriametrics diff --git a/pkgs/by-name/zi/zita-resampler/package.nix b/pkgs/by-name/zi/zita-resampler/package.nix index 3f812c470350..274080edc871 100644 --- a/pkgs/by-name/zi/zita-resampler/package.nix +++ b/pkgs/by-name/zi/zita-resampler/package.nix @@ -4,13 +4,13 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zita-resampler"; - version = "1.8.0"; + version = "1.11.2"; src = fetchurl { - url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; - sha256 = "sha256-5XRPI8VN0Vs/eDpoe9h57uKmkKRUWhW0nEzwN6pGSqI="; + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/zita-resampler-${finalAttrs.version}.tar.xz"; + hash = "sha256-qlxU5pYGmvJvPx/tSpYxE8wSN83f1XrlhCq8sazVSSw="; }; makeFlags = [ @@ -21,24 +21,17 @@ stdenv.mkDerivation rec { postPatch = '' cd source - substituteInPlace Makefile \ - --replace 'ldconfig' "" '' + lib.optionalString (!stdenv.hostPlatform.isx86_64) '' substituteInPlace Makefile \ - --replace '-DENABLE_SSE2' "" + --replace-fail '-DENABLE_SSE2' "" ''; - fixupPhase = '' - ln -s $out/lib/libzita-resampler.so.$version $out/lib/libzita-resampler.so.1 - ''; - meta = { description = "Resample library by Fons Adriaensen"; - version = version; homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.magnetophon ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/zi/zizmor/package.nix b/pkgs/by-name/zi/zizmor/package.nix index 4a41f7e0b07c..8ea79dc39004 100644 --- a/pkgs/by-name/zi/zizmor/package.nix +++ b/pkgs/by-name/zi/zizmor/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "zizmor"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "zizmorcore"; repo = "zizmor"; tag = "v${finalAttrs.version}"; - hash = "sha256-llxIuWgaRNJsl/piQ1BMqvE2MKnSnR5qxjLFqZ5z13I="; + hash = "sha256-nBeoPbabqE5aCccvioZJo0IosdMN+iKqgaFu0krzRA8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-OVGaHLA/VzF8wGrWrHaKpYDcp4ZeR9mf2s5I+u5ddcs="; + cargoHash = "sha256-PQ3ij90raSV6o1EEvf2sw3lmMfX3t/ni8RmUAwo8epk="; nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ installShellFiles diff --git a/pkgs/development/python-modules/breezy/Cargo.lock b/pkgs/development/python-modules/breezy/Cargo.lock index 582919223ddf..db5dbd76c7e8 100644 --- a/pkgs/development/python-modules/breezy/Cargo.lock +++ b/pkgs/development/python-modules/breezy/Cargo.lock @@ -19,7 +19,7 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "breezy" -version = "3.3.10" +version = "3.3.12" dependencies = [ "pyo3", ] @@ -50,9 +50,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.171" +version = "0.2.172" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" +checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" [[package]] name = "memchr" @@ -71,9 +71,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.21.1" +version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "portable-atomic" @@ -83,9 +83,9 @@ checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" [[package]] name = "proc-macro2" -version = "1.0.94" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" dependencies = [ "unicode-ident", ] @@ -193,7 +193,7 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "rio-py" -version = "3.3.10" +version = "3.3.12" dependencies = [ "lazy_static", "pyo3", @@ -202,9 +202,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.100" +version = "2.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" +checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" dependencies = [ "proc-macro2", "quote", diff --git a/pkgs/development/python-modules/breezy/default.nix b/pkgs/development/python-modules/breezy/default.nix index a0b6b806c81d..67a8ff0b944c 100644 --- a/pkgs/development/python-modules/breezy/default.nix +++ b/pkgs/development/python-modules/breezy/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "breezy"; - version = "3.3.10"; + version = "3.3.12"; pyproject = true; disabled = pythonOlder "3.7"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "breezy-team"; repo = "breezy"; rev = "brz-${version}"; - hash = "sha256-AzMDab8SUJ8JJukqxVsqf7HdCTcVMLyFFTInPwAmSqs="; + hash = "sha256-V/SnzpslFGjISg+YxViFa+Lpnn0+9enPA3xmvwfXnUM="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }; diff --git a/pkgs/servers/pingvin-share/backend.nix b/pkgs/servers/web-apps/pingvin-share/backend.nix similarity index 93% rename from pkgs/servers/pingvin-share/backend.nix rename to pkgs/servers/web-apps/pingvin-share/backend.nix index 0fe2cddcefdf..787f9b4870c9 100644 --- a/pkgs/servers/pingvin-share/backend.nix +++ b/pkgs/servers/web-apps/pingvin-share/backend.nix @@ -31,7 +31,7 @@ buildNpmPackage { prisma ]; - npmDepsHash = "sha256-o++v2dy9Cq2DW1owY8ea2wRr8wxr0bzuswd3ljM5Rbg="; + npmDepsHash = "sha256-bc2suSGa7YTonIhUxEtNzdIUeUBubwJ6upW2tydVCnU="; makeCacheWritable = true; npmFlags = [ "--legacy-peer-deps" ]; diff --git a/pkgs/servers/pingvin-share/default.nix b/pkgs/servers/web-apps/pingvin-share/default.nix similarity index 79% rename from pkgs/servers/pingvin-share/default.nix rename to pkgs/servers/web-apps/pingvin-share/default.nix index d230a01ca261..08a1907646b7 100644 --- a/pkgs/servers/pingvin-share/default.nix +++ b/pkgs/servers/web-apps/pingvin-share/default.nix @@ -5,12 +5,12 @@ }: let - version = "1.11.1"; + version = "1.13.0"; src = fetchFromGitHub { owner = "stonith404"; repo = "pingvin-share"; rev = "v${version}"; - hash = "sha256-ye26VyfeKcQk1gTLxVqsYmrqK0nqmU2Cl+fIrWdryLQ="; + hash = "sha256-FWc0Yo2Phh8ee5izHj0ol1pwLSVJgIqyeaJo1o4drsM="; }; in diff --git a/pkgs/servers/pingvin-share/frontend.nix b/pkgs/servers/web-apps/pingvin-share/frontend.nix similarity index 92% rename from pkgs/servers/pingvin-share/frontend.nix rename to pkgs/servers/web-apps/pingvin-share/frontend.nix index 92035856fbde..bf320dd95531 100644 --- a/pkgs/servers/pingvin-share/frontend.nix +++ b/pkgs/servers/web-apps/pingvin-share/frontend.nix @@ -23,7 +23,7 @@ buildNpmPackage { buildInputs = [ vips ]; nativeBuildInputs = [ pkg-config ]; - npmDepsHash = "sha256-OLlh1YLS+fKw9Mcc2y724+WyK/j80McM2nGDLf2UzPA="; + npmDepsHash = "sha256-ykq98Bd67TY/t8JYraii7XnCIoSLk454decdHpQGorw="; makeCacheWritable = true; npmFlags = [ "--legacy-peer-deps" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7859b890c551..98c69f0c092c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9289,7 +9289,7 @@ with pkgs; physfs ; - pingvin-share = callPackage ../servers/pingvin-share { }; + pingvin-share = callPackage ../servers/web-apps/pingvin-share { }; pipelight = callPackage ../tools/misc/pipelight { stdenv = stdenv_32bit; @@ -12979,8 +12979,6 @@ with pkgs; kapow = libsForQt5.callPackage ../applications/misc/kapow { }; - kchmviewer = libsForQt5.callPackage ../applications/misc/kchmviewer { }; - okteta = libsForQt5.callPackage ../applications/editors/okteta { }; k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { };