Merge staging-next into staging

2024-11-23 15:33:13 +00:00 · 2023-04-01 12:01:53 +00:00 · 2023-04-01 12:01:53 +00:00 · 7f0e9a3d13
commit 7f0e9a3d13
parent d86df1eda1 511548a510
13 changed files with 1019 additions and 498 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -2757,6 +2757,15 @@
    githubId = 2245737;
    name = "Christopher Mark Poole";
  };
+  christoph-heiss = {
+    email = "christoph@c8h4.io";
+    github = "christoph-heiss";
+    githubId = 7571069;
+    name = "Christoph Heiss";
+    keys = [{
+      fingerprint = "9C56 1D64 30B2 8D6B DCBC 9CEB 73D5 E7FD EE3D E49A";
+    }];
+  };
  chuahou = {
    email = "human+github@chuahou.dev";
    github = "chuahou";
--- a/nixos/modules/services/x11/window-managers/qtile.nix
+++ b/nixos/modules/services/x11/window-managers/qtile.nix
@ -27,8 +27,7 @@ in
      type = types.enum [ "x11" "wayland" ];
      default = "x11";
      description = lib.mdDoc ''
-          Backend to use in qtile:
-          <option>x11</option> or <option>wayland</option>.
+          Backend to use in qtile: `x11` or `wayland`.
      '';
    };

--- a/pkgs/applications/backup/proxmox-backup-client/0001-re-route-dependencies-not-available-on-crates.io-to-.patch
+++ b/pkgs/applications/backup/proxmox-backup-client/0001-re-route-dependencies-not-available-on-crates.io-to-.patch
@ -0,0 +1,182 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Thomas Lamprecht <thomas@lamprecht.org>
+Date: Wed, 18 May 2022 08:41:14 +0200
+Subject: [PATCH] re-route dependencies not available on crates.io to git repos
+
+Signed-off-by: Thomas Lamprecht <thomas@lamprecht.org>
+---
+ Cargo.toml | 130 +++++++++--------------------------------------------
+ 1 file changed, 21 insertions(+), 109 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index 0c86cd1b..7d5c282b 100644
+--- a/Cargo.toml
+++ b/Cargo.toml
+@@ -41,9 +41,6 @@ members = [
+ 
+     "proxmox-backup-banner",
+     "proxmox-backup-client",
+-    "proxmox-file-restore",
+-    "proxmox-restore-daemon",
+-    "proxmox-rrd",
+ 
+     "pxar-bin",
+ ]
+@@ -101,7 +98,6 @@ proxmox-rrd = { path = "proxmox-rrd" }
+ 
+ # regular crates
+ anyhow = "1.0"
+-apt-pkg-native = "0.3.2"
+ base64 = "0.13"
+ bitflags = "1.2.1"
+ bytes = "1.0"
+@@ -114,7 +110,6 @@ flate2 = "1.0"
+ foreign-types = "0.3"
+ futures = "0.3"
+ h2 = { version = "0.3", features = [ "stream" ] }
+-handlebars = "3.0"
+ hex = "0.4.3"
+ http = "0.2"
+ hyper = { version = "0.14", features = [ "full" ] }
+@@ -152,120 +147,37 @@ walkdir = "2"
+ xdg = "2.2"
+ zstd = { version = "0.6", features = [ "bindgen" ] }
+ 
+-[dependencies]
+-anyhow.workspace = true
+-apt-pkg-native.workspace = true
+-base64.workspace = true
+-bitflags.workspace = true
+-bytes.workspace = true
+-cidr.workspace = true
+-crc32fast.workspace = true
+-crossbeam-channel.workspace = true
+-endian_trait.workspace = true
+-flate2.workspace = true
+-futures.workspace = true
+-h2.workspace = true
+-handlebars.workspace = true
+-hex.workspace = true
+-http.workspace = true
+-hyper.workspace = true
+-lazy_static.workspace = true
+-libc.workspace = true
+-log.workspace = true
+-nix.workspace = true
+-nom.workspace = true
+-num-traits.workspace = true
+-once_cell.workspace = true
+-openssl.workspace = true
+-pam-sys.workspace = true
+-pam.workspace = true
+-percent-encoding.workspace = true
+-regex.workspace = true
+-rustyline.workspace = true
+-serde.workspace = true
+-serde_json.workspace = true
+-siphasher.workspace = true
+-syslog.workspace = true
+-termcolor.workspace = true
+-thiserror.workspace = true
+-tokio = { workspace = true, features = [ "fs", "io-util", "io-std", "macros", "net", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "time" ] }
+-tokio-openssl.workspace = true
+-tokio-stream.workspace = true
+-tokio-util = { workspace = true, features = [ "codec" ] }
+-tower-service.workspace = true
+-udev.workspace = true
+-url.workspace = true
+-walkdir.workspace = true
+-xdg.workspace = true
+-zstd.workspace = true
+-
+ #valgrind_request = { git = "https://github.com/edef1c/libvalgrind_request", version = "1.1.0", optional = true }
+ 
+-proxmox-async.workspace = true
+-proxmox-auth-api = { workspace = true, features = [ "api", "pam-authenticator" ] }
+-proxmox-compression.workspace = true
+-proxmox-http = { workspace = true, features = [ "client-trait", "proxmox-async", "rate-limited-stream" ] } # pbs-client doesn't use these
+-proxmox-io.workspace = true
+-proxmox-lang.workspace = true
+-proxmox-ldap.workspace = true
+-proxmox-metrics.workspace = true
+-proxmox-rest-server = { workspace = true, features = [ "rate-limited-stream" ] }
+-proxmox-router = { workspace = true, features = [ "cli", "server"] }
+-proxmox-schema = { workspace = true, features = [ "api-macro" ] }
+-proxmox-section-config.workspace = true
+-proxmox-serde = { workspace = true, features = [ "serde_json" ] }
+-proxmox-shared-memory.workspace = true
+-proxmox-sortable-macro.workspace = true
+-proxmox-subscription.workspace = true
+-proxmox-sys = { workspace = true, features = [ "timer" ] }
+-proxmox-tfa.workspace = true
+-proxmox-time.workspace = true
+-proxmox-uuid.workspace = true
+-
+-pathpatterns.workspace = true
+-proxmox-acme-rs.workspace = true
+-proxmox-apt.workspace = true
+-proxmox-openid.workspace = true
+-pxar.workspace = true
+-
+-pbs-api-types.workspace = true
+-pbs-buildcfg.workspace = true
+-pbs-client.workspace = true
+-pbs-config.workspace = true
+-pbs-datastore.workspace = true
+-pbs-key-config.workspace = true
+-pbs-tape.workspace = true
+-pbs-tools.workspace = true
+-proxmox-rrd.workspace = true
+-
+ # Local path overrides
+ # NOTE: You must run `cargo update` after changing this for it to take effect!
+ [patch.crates-io]
+ #proxmox-acme-rs = { path = "../proxmox-acme-rs" }
+-#proxmox-async = { path = "../proxmox/proxmox-async" }
+-#proxmox-auth-api = { path = "../proxmox/proxmox-auth-api" }
+-#proxmox-borrow = { path = "../proxmox/proxmox-borrow" }
+-#proxmox-compression = { path = "../proxmox/proxmox-compression" }
+-#proxmox-fuse = { path = "../proxmox-fuse" }
+-#proxmox-http = { path = "../proxmox/proxmox-http" }
+-#proxmox-io = { path = "../proxmox/proxmox-io" }
+-#proxmox-lang = { path = "../proxmox/proxmox-lang" }
+-#proxmox-rest-server = { path = "../proxmox/proxmox-rest-server" }
+-#proxmox-router = { path = "../proxmox/proxmox-router" }
+-#proxmox-schema = { path = "../proxmox/proxmox-schema" }
+-#proxmox-section-config = { path = "../proxmox/proxmox-section-config" }
+-#proxmox-serde = { path = "../proxmox/proxmox-serde" }
+-#proxmox-shared-memory = { path = "../proxmox/proxmox-shared-memory" }
+-#proxmox-subscription = { path = "../proxmox/proxmox-subscription" }
+-#proxmox-sys = { path = "../proxmox/proxmox-sys" }
+-#proxmox-tfa = { path = "../proxmox/proxmox-tfa" }
+-#proxmox-time = { path = "../proxmox/proxmox-time" }
+-#proxmox-uuid = { path = "../proxmox/proxmox-uuid" }
+proxmox-async = { path = "../proxmox/proxmox-async" }
+proxmox-auth-api = { path = "../proxmox/proxmox-auth-api" }
+proxmox-borrow = { path = "../proxmox/proxmox-borrow" }
+proxmox-compression = { path = "../proxmox/proxmox-compression" }
+proxmox-fuse = { path = "../proxmox-fuse" }
+proxmox-http = { path = "../proxmox/proxmox-http" }
+proxmox-io = { path = "../proxmox/proxmox-io" }
+proxmox-lang = { path = "../proxmox/proxmox-lang" }
+proxmox-rest-server = { path = "../proxmox/proxmox-rest-server" }
+proxmox-router = { path = "../proxmox/proxmox-router" }
+proxmox-schema = { path = "../proxmox/proxmox-schema" }
+proxmox-section-config = { path = "../proxmox/proxmox-section-config" }
+proxmox-serde = { path = "../proxmox/proxmox-serde" }
+proxmox-shared-memory = { path = "../proxmox/proxmox-shared-memory" }
+proxmox-sortable-macro = { path = "../proxmox/proxmox-sortable-macro" }
+proxmox-subscription = { path = "../proxmox/proxmox-subscription" }
+proxmox-sys = { path = "../proxmox/proxmox-sys" }
+proxmox-tfa = { path = "../proxmox/proxmox-tfa" }
+proxmox-time = { path = "../proxmox/proxmox-time" }
+proxmox-uuid = { path = "../proxmox/proxmox-uuid" }
+ 
+ #proxmox-apt = { path = "../proxmox-apt" }
+ #proxmox-openid = { path = "../proxmox-openid-rs" }
+ 
+-#pxar = { path = "../pxar" }
+pxar = { path = "../pxar" }
+ 
+ [features]
+ default = []
--- a/pkgs/applications/backup/proxmox-backup-client/0002-docs-drop-all-but-client-man-pages.patch
+++ b/pkgs/applications/backup/proxmox-backup-client/0002-docs-drop-all-but-client-man-pages.patch
@ -0,0 +1,72 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Thomas Lamprecht <thomas@lamprecht.org>
+Date: Tue, 29 Nov 2022 17:20:28 +0100
+Subject: [PATCH] docs: drop all but client man pages
+
+Signed-off-by: Thomas Lamprecht <thomas@lamprecht.org>
+---
+ docs/Makefile | 16 ----------------
+ docs/conf.py  | 19 -------------------
+ 2 files changed, 35 deletions(-)
+
+diff --git a/docs/Makefile b/docs/Makefile
+index b06badff..94130228 100644
+--- a/docs/Makefile
+++ b/docs/Makefile
+@@ -1,25 +1,9 @@
+ include ../defines.mk
+ 
+ GENERATED_SYNOPSIS := 						\
+-	proxmox-tape/synopsis.rst				\
+ 	proxmox-backup-client/synopsis.rst			\
+ 	proxmox-backup-client/catalog-shell-synopsis.rst 	\
+-	proxmox-backup-manager/synopsis.rst			\
+-	proxmox-backup-debug/synopsis.rst			\
+-	proxmox-file-restore/synopsis.rst			\
+ 	pxar/synopsis.rst					\
+-	pmtx/synopsis.rst					\
+-	pmt/synopsis.rst					\
+-	config/media-pool/config.rst				\
+-	config/tape/config.rst					\
+-	config/tape-job/config.rst				\
+-	config/user/config.rst					\
+-	config/remote/config.rst				\
+-	config/sync/config.rst					\
+-	config/verification/config.rst				\
+-	config/acl/roles.rst					\
+-	config/datastore/config.rst				\
+-	config/domains/config.rst
+ 
+ MAN1_PAGES := 				\
+ 	pxar.1				\
+diff --git a/docs/conf.py b/docs/conf.py
+index 8944926e..deeb63bf 100644
+--- a/docs/conf.py
+++ b/docs/conf.py
+@@ -93,26 +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),
+-    # 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/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),
+ ]
+ 
+ 
--- a/pkgs/applications/backup/proxmox-backup-client/0003-docs-Add-target-path-fixup-variable.patch
+++ b/pkgs/applications/backup/proxmox-backup-client/0003-docs-Add-target-path-fixup-variable.patch
@ -0,0 +1,33 @@
+From f8c26751c51c1618278689d8b3ce94496c579064 Mon Sep 17 00:00:00 2001
+From: Christoph Heiss <christoph@c8h4.io>
+Date: Fri, 10 Feb 2023 23:54:41 +0100
+Subject: [PATCH] docs: Add target path fixup variable
+
+Signed-off-by: Christoph Heiss <christoph@c8h4.io>
+---
+ docs/Makefile | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/docs/Makefile b/docs/Makefile
+index 94130228..f4766a64 100644
+--- a/docs/Makefile
+++ b/docs/Makefile
+@@ -67,12 +67,13 @@ API_VIEWER_FILES :=							\
+ SPHINXOPTS    =
+ SPHINXBUILD   = sphinx-build
+ BUILDDIR      = output
+RUSTC_TARGET ?=
+ 
+ ifeq ($(BUILD_MODE), release)
+-COMPILEDIR := ../target/release
+COMPILEDIR := ../target/$(RUSTC_TARGET)/release
+ SPHINXOPTS    += -t release
+ else
+-COMPILEDIR := ../target/debug
+COMPILEDIR := ../target/$(RUSTC_TARGET)/debug
+ SPHINXOPTS    += -t devbuild
+ endif
+ 
+-- 
+2.40.0
+
--- a/pkgs/applications/backup/proxmox-backup-client/Cargo.lock
+++ b/pkgs/applications/backup/proxmox-backup-client/Cargo.lock
--- a/pkgs/applications/backup/proxmox-backup-client/default.nix
+++ b/pkgs/applications/backup/proxmox-backup-client/default.nix
@ -1,40 +1,45 @@
-{ lib, fetchgit, rustPlatform, pkg-config, openssl, fuse3, libuuid, acl, libxcrypt }:
+{
+  lib, fetchgit, rustPlatform, pkg-config, openssl, fuse3, libuuid, acl,
+  libxcrypt, git, installShellFiles, sphinx, stdenv,
+}:

 rustPlatform.buildRustPackage rec {
  pname = "proxmox-backup-client";
-  version = "2.2.1";
+  version = "2.4.1";

  srcs = [
    (fetchgit {
      url = "git://git.proxmox.com/git/proxmox-backup.git";
      rev = "v${version}";
-      name = pname;
-      hash = "sha256-uOKQe/BzO69f/ggEPoZQ2Rn3quytQrUeH7be19QV3KI=";
+      name = "proxmox-backup";
+      hash = "sha256-DWzNRi675ZP9HGc/uPvnV/FBTJUNZ4K5RtU9NFRQCcA=";
    })
    (fetchgit {
      url = "git://git.proxmox.com/git/proxmox.git";
-      rev = "43b4440ef015d846161657490b18cf6ac7600fc4";
+      rev = "5df815f660e4f3793e974eb8130224538350bb12";
      name = "proxmox";
-      hash = "sha256-05Z+IRRIioFGn+iAYG04DyNsgw9gQrJ6qAArpCwoIb0=";
+      hash = "sha256-Vn1poqkIWcR2rNiAr+ENLNthgk3pMCivzXnUX9hvZBw=";
    })
    (fetchgit {
      url = "git://git.proxmox.com/git/proxmox-fuse.git";
-      rev = "d162ef9039878b871e2aa11b7d9a373ae512e2d1";
+      rev = "93099f76b6bbbc8a0bbaca9b459a1ce4dc5e0a79";
      name = "proxmox-fuse";
-      hash = "sha256-w33ViWpBkCkMAhZVXiOdqnGOn/tddNRgzn71WioTnBU=";
+      hash = "sha256-3l0lAZVFQC0MYaqZvB+S+ihb1fTkEgs5i9q463+cbvQ=";
    })
    (fetchgit {
      url = "git://git.proxmox.com/git/pxar.git";
-      rev = "6f3f889e98c5f4e60c3b2c6bce73bd506b548c21";
+      rev = "6ad046f9f92b40413f59cc5f4c23d2bafdf141f2";
      name = "pxar";
-      hash = "sha256-GtNq6+O1xnxuR7b4TTWLFxcsejRyadSlk85H8C+yUGA=";
+      hash = "sha256-I9kk27oN9BDQpnLDWltjZMrh2yJitCpcD/XAhkmtJUg=";
    })
  ];

-  sourceRoot = pname;
+  sourceRoot = "proxmox-backup";

  cargoPatches = [
-    ./re-route-dependencies.patch
+    ./0001-re-route-dependencies-not-available-on-crates.io-to-.patch
+    ./0002-docs-drop-all-but-client-man-pages.patch
+    ./0003-docs-Add-target-path-fixup-variable.patch
  ];

  postPatch = ''
@ -42,6 +47,26 @@ rustPlatform.buildRustPackage rec {
    rm .cargo/config
  '';

+  postBuild = ''
+    make -C docs \
+      DEB_VERSION=${version} DEB_VERSION_UPSTREAM=${version} \
+      RUSTC_TARGET=${stdenv.targetPlatform.config} \
+      BUILD_MODE=release \
+      proxmox-backup-client.1 pxar.1
+  '';
+
+  postInstall = ''
+    installManPage docs/output/man/proxmox-backup-client.1
+    installShellCompletion --cmd proxmox-backup-client \
+      --bash debian/proxmox-backup-client.bc \
+      --zsh zsh-completions/_proxmox-backup-client
+
+    installManPage docs/output/man/pxar.1
+    installShellCompletion --cmd pxar \
+      --bash debian/pxar.bc \
+      --zsh zsh-completions/_pxar
+  '';
+
  cargoLock = {
    lockFileContents = builtins.readFile ./Cargo.lock;
  };
@ -50,21 +75,21 @@ rustPlatform.buildRustPackage rec {
    "--package=proxmox-backup-client"
    "--bin=proxmox-backup-client"
    "--bin=dump-catalog-shell-cli"
-
    "--package=pxar-bin"
    "--bin=pxar"
  ];

  doCheck = false;

-  nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ];
+  nativeBuildInputs = [ git pkg-config rustPlatform.bindgenHook installShellFiles sphinx ];
  buildInputs = [ openssl fuse3 libuuid acl libxcrypt ];

  meta = with lib; {
    description = "The command line client for Proxmox Backup Server";
    homepage = "https://pbs.proxmox.com/docs/backup-client.html";
    license = licenses.agpl3Only;
-    maintainers = with maintainers; [ cofob ];
+    maintainers = with maintainers; [ cofob christoph-heiss ];
    platforms = platforms.linux;
+    mainProgram = pname;
  };
 }
--- a/pkgs/applications/backup/proxmox-backup-client/re-route-dependencies.patch
+++ b/pkgs/applications/backup/proxmox-backup-client/re-route-dependencies.patch
@ -1,148 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Thomas Lamprecht <thomas@lamprecht.org>
-Date: Wed, 18 May 2022 08:41:14 +0200
-Subject: [PATCH] re-route dependencies not available on crates.io to git repos
-
-Signed-off-by: Thomas Lamprecht <thomas@lamprecht.org>
---
- Cargo.toml    | 112 +++++++-------------------------------------------
- 1 file changed, 15 insertions(+), 97 deletions(-)
-
-diff --git a/Cargo.toml b/Cargo.toml
-index 41980292..e7daaad5 100644
--- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -25,94 +25,12 @@ members = [
-     "pbs-config",
-     "pbs-datastore",
-     "pbs-fuse-loop",
-    "proxmox-rest-server",
-    "proxmox-rrd",
-    "pbs-tape",
-     "pbs-tools",
- 
-    "proxmox-backup-banner",
-     "proxmox-backup-client",
-    "proxmox-file-restore",
-    "proxmox-restore-daemon",
-     "pxar-bin",
- ]
- 
-[lib]
-name = "proxmox_backup"
-path = "src/lib.rs"
-
-[dependencies]
-apt-pkg-native = "0.3.2"
-base64 = "0.13"
-bitflags = "1.2.1"
-bytes = "1.0"
-cidr = "0.2.1"
-crc32fast = "1"
-endian_trait = { version = "0.6", features = ["arrays"] }
-flate2 = "1.0"
-anyhow = "1.0"
-thiserror = "1.0"
-futures = "0.3"
-h2 = { version = "0.3", features = [ "stream" ] }
-handlebars = "3.0"
-hex = "0.4.3"
-http = "0.2"
-hyper = { version = "0.14", features = [ "full" ] }
-lazy_static = "1.4"
-libc = "0.2"
-log = "0.4.17"
-nix = "0.19.1"
-num-traits = "0.2"
-once_cell = "1.3.1"
-openssl = "0.10.38" # currently patched!
-pam = "0.7"
-pam-sys = "0.5"
-percent-encoding = "2.1"
-regex = "1.5.5"
-rustyline = "7"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-siphasher = "0.3"
-syslog = "4.0"
-tokio = { version = "1.6", features = [ "fs", "io-util", "io-std", "macros", "net", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "time" ] }
-tokio-openssl = "0.6.1"
-tokio-stream = "0.1.0"
-tokio-util = { version = "0.6", features = [ "codec", "io" ] }
-tower-service = "0.3.0"
-udev = "0.4"
-url = "2.1"
-#valgrind_request = { git = "https://github.com/edef1c/libvalgrind_request", version = "1.1.0", optional = true }
-walkdir = "2"
-xdg = "2.2"
-nom = "5.1"
-crossbeam-channel = "0.5"
-
-# Used only by examples currently:
-zstd = { version = "0.6", features = [ "bindgen" ] }
-
-pathpatterns = "0.1.2"
-pxar = { version = "0.10.1", features = [ "tokio-io" ] }
-
-proxmox-http = { version = "0.6.1", features = [ "client", "http-helpers", "websocket" ] }
-proxmox-io = "1"
-proxmox-lang = "1.1"
-proxmox-router = { version = "1.2.2", features = [ "cli" ] }
-proxmox-schema = { version = "1.3.1", features = [ "api-macro" ] }
-proxmox-section-config = "1"
-proxmox-tfa = { version = "2", features = [ "api", "api-types" ] }
-proxmox-time = "1.1.2"
-proxmox-uuid = "1"
-proxmox-serde = "0.1"
-proxmox-shared-memory = "0.2"
-proxmox-sys = { version = "0.2", features = [ "sortable-macro" ] }
-proxmox-compression = "0.1"
-
-
-proxmox-acme-rs = "0.4"
-proxmox-apt = "0.8.0"
-proxmox-async = "0.4"
-proxmox-openid = "0.9.0"
-
- pbs-api-types = { path = "pbs-api-types" }
- pbs-buildcfg = { path = "pbs-buildcfg" }
- pbs-client = { path = "pbs-client" }
-@@ -126,22 +44,23 @@ pbs-tape = { path = "pbs-tape" }
- # Local path overrides
- # NOTE: You must run `cargo update` after changing this for it to take effect!
- [patch.crates-io]
-#proxmox = { path = "../proxmox/proxmox" }
-#proxmox-async = { path = "../proxmox/proxmox-async" }
-#proxmox-borrow = { path = "../proxmox/proxmox-borrow" }
-#proxmox-fuse = { path = "../proxmox-fuse" }
-#proxmox-http = { path = "../proxmox/proxmox-http" }
-#proxmox-io = { path = "../proxmox/proxmox-io" }
-#proxmox-lang = { path = "../proxmox/proxmox-lang" }
-#proxmox-router = { path = "../proxmox/proxmox-router" }
-#proxmox-schema = { path = "../proxmox/proxmox-schema" }
-#proxmox-section-config = { path = "../proxmox/proxmox-section-config" }
-#proxmox-shared-memory = { path = "../proxmox/proxmox-shared-memory" }
-#proxmox-sys = { path = "../proxmox/proxmox-sys" }
-+proxmox-async = { path = "../proxmox/proxmox-async" }
-+proxmox-compression = { path = "../proxmox/proxmox-compression" }
-+proxmox-borrow = { path = "../proxmox/proxmox-borrow" }
-+proxmox-fuse = { path = "../proxmox-fuse" }
-+proxmox-http = { path = "../proxmox/proxmox-http" }
-+proxmox-io = { path = "../proxmox/proxmox-io" }
-+proxmox-lang = { path = "../proxmox/proxmox-lang" }
-+proxmox-router = { path = "../proxmox/proxmox-router" }
-+proxmox-schema = { path = "../proxmox/proxmox-schema" }
-+proxmox-section-config = { path = "../proxmox/proxmox-section-config" }
-+proxmox-serde = { path = "../proxmox/proxmox-serde" }
-+proxmox-shared-memory = { path = "../proxmox/proxmox-shared-memory" }
-+proxmox-sys = { path = "../proxmox/proxmox-sys" }
- #proxmox-tfa = { path = "../proxmox/proxmox-tfa" }
-#proxmox-time = { path = "../proxmox/proxmox-time" }
-#proxmox-uuid = { path = "../proxmox/proxmox-uuid" }
-#pxar = { path = "../pxar" }
-+proxmox-time = { path = "../proxmox/proxmox-time" }
-+proxmox-uuid = { path = "../proxmox/proxmox-uuid" }
-+pxar = { path = "../pxar" }
- 
- [features]
- default = []
--- a/pkgs/applications/misc/tiv/default.nix
+++ b/pkgs/applications/misc/tiv/default.nix
@ -1,4 +1,9 @@
-{ lib, stdenv, fetchFromGitHub, imagemagick }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, makeWrapper
+, imagemagick
+}:

 stdenv.mkDerivation rec {
  pname = "tiv";
@ -11,12 +16,19 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-mCgybL4af19zqECN1pBV+WnxMq2ZtlK5GDTQO3u9CK0=";
  };

+  nativeBuildInputs = [ makeWrapper ];
+
  buildInputs = [ imagemagick ];

  makeFlags = [ "prefix=$(out)" ];

  preConfigure = "cd src/main/cpp";

+  postFixup = ''
+    wrapProgram $out/bin/tiv \
+      --prefix PATH : ${lib.makeBinPath [ imagemagick ]}
+  '';
+
  meta = with lib; {
    homepage = "https://github.com/stefanhaustein/TerminalImageViewer";
    description = "Small C++ program to display images in a (modern) terminal using RGB ANSI codes and unicode block graphics characters";
--- a/pkgs/development/python-modules/sumo/default.nix
+++ b/pkgs/development/python-modules/sumo/default.nix
@ -18,7 +18,7 @@

 buildPythonPackage rec {
  pname = "sumo";
-  version = "2.3.5";
+  version = "2.3.6";
  format = "setuptools";

  disabled = pythonOlder "3.6";
@ -27,7 +27,7 @@ buildPythonPackage rec {
    owner = "SMTG-UCL";
    repo = "sumo";
    rev = "refs/tags/v${version}";
-    hash = "sha256-eGQOFTo/tg1aM/P1la3stE7RLxpACUdcJ7g1z3zSasc=";
+    hash = "sha256-HQIs2G2hdKQkQOBs2lijmx/0cI4o/FFJU866PjtrBAE=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/tools/azure-static-sites-client/versions.json
+++ b/pkgs/development/tools/azure-static-sites-client/versions.json
@ -20,20 +20,20 @@
  },
  {
    "version": "stable",
-    "buildId": "1.0.022651",
-    "publishDate": "2023-03-15T19:45:57.9352112Z",
+    "buildId": "1.0.022431",
+    "publishDate": "2023-02-21T18:46:09.9616432Z",
    "files": {
      "linux-x64": {
-        "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022651/linux/StaticSitesClient",
-        "sha": "89816326d56d4653cf8431b73d742d69222e87d2df9e7f87dca4c3819faed289"
+        "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022431/linux/StaticSitesClient",
+        "sha": "a0424f02b72b0e292e23fa1774a579f3a83cc2280af46a19682c11423e55a134"
      },
      "win-x64": {
-        "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022651/windows/StaticSitesClient.exe",
-        "sha": "d6f66a390e20634e320f7abfae5463705ba56d1f81e43015b78d6613a27881a3"
+        "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022431/windows/StaticSitesClient.exe",
+        "sha": "78476f93e8357ebd5b6676c66747c6f0432084615a5cecaa43e4afbda2533176"
      },
      "osx-x64": {
-        "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022651/macOS/StaticSitesClient",
-        "sha": "2a8a9d9d47d9c4f1bc4d8a87508f9f2d95bfb4568803d8fe2ce1feb6a032ef1f"
+        "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022431/macOS/StaticSitesClient",
+        "sha": "0f2dc106903167d5900d9875321fd99a11349d21177b4794495b45e3df175755"
      }
    }
  },
--- a/pkgs/os-specific/linux/firmware/fwupd/default.nix
+++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix
@ -2,7 +2,6 @@

 { stdenv
 , lib
-, fetchurl
 , fetchFromGitHub
 , gi-docgen
 , pkg-config
@ -28,7 +27,6 @@
 , ninja
 , gcab
 , gnutls
-, pandoc
 , protobufc
 , python3
 , wrapGAppsNoGuiHook
@ -124,7 +122,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "fwupd";
-  version = "1.8.12";
+  version = "1.8.13";

  # libfwupd goes to lib
  # daemon, plug-ins and libfwupdplugin go to out
@ -135,7 +133,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "fwupd";
    repo = "fwupd";
    rev = finalAttrs.version;
-    hash = "sha256-a4F7skyukl4jW3apGi1ie/EcuGlkZoszyZdtLFuJewA=";
+    hash = "sha256-UBKFC/hq4kkrjkuHTqIimbR332Vk/X4VQeYROGeAVi8=";
  };

  patches = [
@ -171,7 +169,6 @@ stdenv.mkDerivation (finalAttrs: {
    valgrind
    gcab
    gnutls
-    pandoc
    protobufc # for protoc
    python
    wrapGAppsNoGuiHook
--- a/pkgs/servers/heisenbridge/default.nix
+++ b/pkgs/servers/heisenbridge/default.nix
@ -17,13 +17,13 @@ let
 in
 python.pkgs.buildPythonApplication rec {
  pname = "heisenbridge";
-  version = "1.13.1";
+  version = "1.14.2";

  src = fetchFromGitHub {
    owner = "hifi";
    repo = pname;
    rev = "refs/tags/v${version}";
-    sha256 = "sha256-sgZql9373xKT7Hi8M5TIZTOkS2AOFoKA1DXYa2f2IkA=";
+    sha256 = "sha256-qp0LVcmWf5lZ52h0V58S6FoIM8RLOd6Y3FRb85j7KRg=";
  };

  postPatch = ''