Merge master into staging-next

2025-06-05 19:18:52 +00:00
parent 7f22dba658 66576dcd9e
commit 14627fc3be
56 changed files with 1688 additions and 1141 deletions
@@ -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;
-  };
-}
@@ -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 ];
@@ -0,0 +1,34 @@
+From 2bbe75fe0bc87ab4c1e16c5a18c6200224391629 Mon Sep 17 00:00:00 2001
+From: Nicole Patricia Mazzuca <nicole@streganil.no>
+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(<part>)`, 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 <nicole@streganil.no>
+Acked-by: Robin Jarry <robin@jarry.cc>
+---
+ 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]
@@ -0,0 +1,41 @@
+From 93bec0de8ed5ab3d6b1f01026fe2ef20fa154329 Mon Sep 17 00:00:00 2001
+From: Robin Jarry <robin@jarry.cc>
+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 <eco@ecocode.net>
+Signed-off-by: Robin Jarry <robin@jarry.cc>
+---
+ 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 := ""
@@ -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
@@ -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=";
      };
    };
  };
@@ -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";
@@ -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}" ];
@@ -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",
@@ -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";
@@ -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;
  };
 }
@@ -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;
  };
 }
@@ -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",
@@ -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";
  };
-}
+})
@@ -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}");
@@ -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 <QString>
+#include <QDebug>
+ #include "vendor.h"
+
+ Q_CORE_EXPORT void qt_call_post_routines();
@@ -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
@@ -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 = ''
@@ -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}")
  ];

@@ -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;
+  };
+})
@@ -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;
  };
-}
+})
@@ -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 = [
@@ -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 = ''
@@ -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;
  };
 }
@@ -47,7 +47,11 @@ buildGoModule (finalAttrs: {
  versionCheckProgramArg = "version";

  passthru = {
-    updateScript = nix-update-script { };
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version-regex=^v([\\d\\.]+)$"
+      ];
+    };
  };

  ldflags = [
@@ -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
  ];
@@ -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;

@@ -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";
@@ -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"
  }
 }
@@ -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

@@ -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 <christoph@c8h4.io>
-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 <christoph@c8h4.io>
 ---
- 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

@@ -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 <christoph@c8h4.io>
 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 <christoph@c8h4.io>
 ---
@@ -9,10 +9,10 @@ Signed-off-by: Christoph Heiss <christoph@c8h4.io>
 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

@@ -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 <christoph@c8h4.io>
 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 <christoph@c8h4.io>
 ---
@@ -9,7 +9,7 @@ Signed-off-by: Christoph Heiss <christoph@c8h4.io>
 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

@@ -0,0 +1,83 @@
+From 846d0b9c8f62340cb0703c59d16414b05a15382a Mon Sep 17 00:00:00 2001
+From: Thomas Lamprecht <thomas@lamprecht.org>
+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 <thomas@lamprecht.org>
+Signed-off-by: Christoph Heiss <christoph@c8h4.io>
+---
+ 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
+
@@ -0,0 +1,198 @@
+From b1a06f6a63a63410f89bd0d2968a6fdb7ce2352d Mon Sep 17 00:00:00 2001
+From: Christoph Heiss <christoph@c8h4.io>
+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 <christoph@c8h4.io>
+---
+ 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<bytes::Bytes>,
+    mut client: h2::client::SendRequest<bytes::Bytes>,
+ ) -> impl Future<Output = Result<usize, Error>> {
+     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<bytes::Bytes>,
+    mut client: h2::client::SendRequest<bytes::Bytes>,
+ ) -> impl Future<Output = Result<usize, Error>> {
+     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<Value>,
+         content_type: &str,
+         data: Vec<u8>,
+-    ) -> Result<h2::legacy::client::ResponseFuture, Error> {
+    ) -> Result<h2::client::ResponseFuture, Error> {
+         let request =
+             H2Client::request_builder("localhost", method, path, param, Some(content_type))
+                 .unwrap();
+@@ -514,7 +514,7 @@ impl BackupWriter {
+     }
+ 
+     fn response_queue() -> (
+-        mpsc::Sender<h2::legacy::client::ResponseFuture>,
+        mpsc::Sender<h2::client::ResponseFuture>,
+         oneshot::Receiver<Result<(), Error>>,
+     ) {
+         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<bytes::Bytes>,
+    h2: h2::client::SendRequest<bytes::Bytes>,
+ }
+ 
+ impl H2Client {
+-    pub fn new(h2: h2::legacy::client::SendRequest<bytes::Bytes>) -> Self {
+    pub fn new(h2: h2::client::SendRequest<bytes::Bytes>) -> Self {
+         Self { h2 }
+     }
+ 
+@@ -1092,7 +1092,7 @@ impl H2Client {
+         &self,
+         request: Request<()>,
+         data: Option<bytes::Bytes>,
+-    ) -> impl Future<Output = Result<h2::legacy::client::ResponseFuture, Error>> {
+    ) -> impl Future<Output = Result<h2::client::ResponseFuture, Error>> {
+         self.h2
+             .clone()
+             .ready()
+@@ -1109,9 +1109,7 @@ impl H2Client {
+             })
+     }
+ 
+-    pub async fn h2api_response(
+-        response: Response<h2::legacy::RecvStream>,
+-    ) -> Result<Value, Error> {
+    pub async fn h2api_response(response: Response<h2::RecvStream>) -> Result<Value, Error> {
+         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<Bytes>,
+-- 
+2.49.0
+
@@ -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 = ''
@@ -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
@@ -0,0 +1 @@
+gem 'webrick'
@@ -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=";
    })
  ];

@@ -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"
+      ];
    })
  ];

@@ -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 = [
@@ -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;
@@ -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
@@ -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
    ];
  };
-}
+})
@@ -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 = {
@@ -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
@@ -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;
  };
-}
+})
@@ -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
@@ -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",
@@ -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; };
@@ -31,7 +31,7 @@ buildNpmPackage {
    prisma
  ];

-  npmDepsHash = "sha256-o++v2dy9Cq2DW1owY8ea2wRr8wxr0bzuswd3ljM5Rbg=";
+  npmDepsHash = "sha256-bc2suSGa7YTonIhUxEtNzdIUeUBubwJ6upW2tydVCnU=";
  makeCacheWritable = true;
  npmFlags = [ "--legacy-peer-deps" ];

@@ -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

@@ -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" ];

@@ -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 { };