Merge staging-next into staging

2023-07-03 18:01:46 +00:00 · 2023-07-03 18:01:46 +00:00 · 0f844d9b01
commit 0f844d9b01
parent afae8eadb8 d5a546b27d
56 changed files with 3013 additions and 2426 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -4486,12 +4486,6 @@
    githubId = 424946;
    name = "James Earl Douglas";
  };
-  earthengine = {
-    email = "earthengine@skiff.com";
-    github = "ee2500";
-    githubId = 134107129;
-    name = "EarthEngine";
-  };
  ebbertd = {
    email = "daniel@ebbert.nrw";
    github = "ebbertd";
@ -10405,6 +10399,15 @@
    githubId = 683809;
    name = "Jeffrey Brent McBeth";
  };
+  mccurdyc = {
+    email = "mccurdyc22@gmail.com";
+    github = "mccurdyc";
+    githubId = 5546264;
+    name = "Colton J. McCurdy";
+    keys = [{
+      fingerprint = "D709 03C8 0BE9 ACDC 14F0  3BFB 77BF E531 397E DE94";
+    }];
+  };
  mcmtroffaes = {
    email = "matthias.troffaes@gmail.com";
    github = "mcmtroffaes";
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@ -539,14 +539,12 @@ in {

    # systemd initrd
    boot.initrd.systemd.users = mkOption {
-      visible = false;
      description = ''
        Users to include in initrd.
      '';
      default = {};
      type = types.attrsOf (types.submodule ({ name, ... }: {
        options.uid = mkOption {
-          visible = false;
          type = types.int;
          description = ''
            ID of the user in initrd.
@ -555,7 +553,6 @@ in {
          default = cfg.users.${name}.uid;
        };
        options.group = mkOption {
-          visible = false;
          type = types.singleLineStr;
          description = ''
            Group the user belongs to in initrd.
@ -567,14 +564,12 @@ in {
    };

    boot.initrd.systemd.groups = mkOption {
-      visible = false;
      description = ''
        Groups to include in initrd.
      '';
      default = {};
      type = types.attrsOf (types.submodule ({ name, ... }: {
        options.gid = mkOption {
-          visible = false;
          type = types.int;
          description = ''
            ID of the group in initrd.
--- a/nixos/modules/hardware/all-firmware.nix
+++ b/nixos/modules/hardware/all-firmware.nix
@ -55,7 +55,6 @@ in {
        intel2200BGFirmware
        rtl8192su-firmware
        rt5677-firmware
-        rtl8723bs-firmware
        rtl8761b-firmware
        rtw88-firmware
        zd1211fw
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@ -296,7 +296,6 @@ in
      packages = mkOption {
        type = types.listOf types.path;
        default = [];
-        visible = false;
        description = lib.mdDoc ''
          *This will only be used when systemd is used in stage 1.*

@ -311,7 +310,6 @@ in
      binPackages = mkOption {
        type = types.listOf types.path;
        default = [];
-        visible = false;
        description = lib.mdDoc ''
          *This will only be used when systemd is used in stage 1.*

--- a/nixos/modules/services/system/dbus.nix
+++ b/nixos/modules/services/system/dbus.nix
@ -22,7 +22,7 @@ in
  options = {

    boot.initrd.systemd.dbus = {
-      enable = mkEnableOption (lib.mdDoc "dbus in stage 1") // { visible = false; };
+      enable = mkEnableOption (lib.mdDoc "dbus in stage 1");
    };

    services.dbus = {
--- a/nixos/modules/tasks/bcache.nix
+++ b/nixos/modules/tasks/bcache.nix
@ -1,8 +1,12 @@
 { config, lib, pkgs, ... }:

 {
-  options.boot.initrd.services.bcache.enable = (lib.mkEnableOption (lib.mdDoc "bcache support in the initrd")) // {
-    visible = false; # only works with systemd stage 1
+  options.boot.initrd.services.bcache.enable = lib.mkEnableOption (lib.mdDoc "bcache support in the initrd") // {
+    description = lib.mdDoc ''
+      *This will only be used when systemd is used in stage 1.*
+
+      Whether to enable bcache support in the initrd.
+    '';
  };

  config = {
--- a/nixos/modules/tasks/lvm.nix
+++ b/nixos/modules/tasks/lvm.nix
@ -25,8 +25,12 @@ in {
    boot.vdo.enable = mkEnableOption (lib.mdDoc "support for booting from VDOLVs");
  };

-  options.boot.initrd.services.lvm.enable = (mkEnableOption (lib.mdDoc "enable booting from LVM2 in the initrd")) // {
-    visible = false;
+  options.boot.initrd.services.lvm.enable = mkEnableOption (lib.mdDoc "booting from LVM2 in the initrd") // {
+    description = lib.mdDoc ''
+      *This will only be used when systemd is used in stage 1.*
+
+      Whether to enable booting from LVM2 in the initrd.
+    '';
  };

  config = mkMerge [
--- a/nixos/modules/tasks/swraid.nix
+++ b/nixos/modules/tasks/swraid.nix
@ -5,8 +5,12 @@
 in {

  options.boot.initrd.services.swraid = {
-    enable = (lib.mkEnableOption (lib.mdDoc "swraid support using mdadm")) // {
-      visible = false; # only has effect when the new stage 1 is in place
+    enable = lib.mkEnableOption (lib.mdDoc "swraid support using mdadm") // {
+      description = ''
+        *This will only be used when systemd is used in stage 1.*
+
+        Whether to enable swraid support using mdadm.
+      '';
    };

    mdadmConf = lib.mkOption {
--- a/pkgs/applications/audio/ptcollab/default.nix
+++ b/pkgs/applications/audio/ptcollab/default.nix
@ -3,28 +3,38 @@
 , stdenv
 , fetchFromGitHub
 , nix-update-script
-, qmake
-, pkg-config
-, qtbase
-, qtmultimedia
 , libvorbis
+, pkg-config
+, qmake
+, qtbase
+, qttools
+, qtmultimedia
 , rtmidi
 }:

 mkDerivation rec {
  pname = "ptcollab";
-  version = "0.6.4.5";
+  version = "0.6.4.6";

  src = fetchFromGitHub {
    owner = "yuxshao";
    repo = "ptcollab";
    rev = "v${version}";
-    sha256 = "sha256-O7CNPMS0eRcqt2xAtyEFyLSV8U2xbxuV1DpBxZAFwQs=";
+    hash = "sha256-G0QQV0mvrrBAC2LSy45/NnEbHHA8/E0SZKJXvuVidRE=";
  };

-  nativeBuildInputs = [ qmake pkg-config ];
+  nativeBuildInputs = [
+    pkg-config
+    qmake
+    qttools
+  ];

-  buildInputs = [ qtbase qtmultimedia libvorbis rtmidi ];
+  buildInputs = [
+    libvorbis
+    qtbase
+    qtmultimedia
+    rtmidi
+  ];

  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
    # Move appbundles to Applications before wrapping happens
--- a/pkgs/applications/audio/samplebrain/default.nix
+++ b/pkgs/applications/audio/samplebrain/default.nix
@ -0,0 +1,62 @@
+{ lib
+, stdenv
+, fetchFromGitLab
+, fftw
+, liblo
+, libsndfile
+, makeDesktopItem
+, portaudio
+, qmake
+, qtbase
+, wrapQtAppsHook
+}:
+
+stdenv.mkDerivation rec {
+  pname = "samplebrain";
+  version = "0.18.5";
+
+  src = fetchFromGitLab {
+    owner = "then-try-this";
+    repo = "samplebrain";
+    rev = "v${version}_release";
+    hash = "sha256-/pMHmwly5Dar7w/ZawvR3cWQHw385GQv/Wsl1E2w5p4=";
+  };
+
+  nativeBuildInputs = [
+    qmake
+    wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    fftw
+    liblo
+    libsndfile
+    portaudio
+    qtbase
+  ];
+
+  desktopItem = makeDesktopItem {
+    type = "Application";
+    desktopName = pname;
+    name = pname;
+    comment = "A sample masher designed by Aphex Twin";
+    exec = pname;
+    icon = pname;
+    categories = [ "Audio" ];
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp samplebrain $out/bin
+    install -m 444 -D desktop/samplebrain.svg $out/share/icons/hicolor/scalable/apps/samplebrain.svg
+  '';
+
+  meta = with lib; {
+    description = "A custom sample mashing app";
+    homepage = "https://thentrythis.org/projects/samplebrain";
+    changelog = "https://gitlab.com/then-try-this/samplebrain/-/releases/v${version}_release";
+    maintainers = with maintainers; [ mitchmindtree ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
--- a/pkgs/applications/backup/proxmox-backup-client/0001-docs-Add-target-path-fixup-variable.patch
+++ b/pkgs/applications/backup/proxmox-backup-client/0001-docs-Add-target-path-fixup-variable.patch
--- 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
@ -1,182 +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 | 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
@ -1,72 +0,0 @@
-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/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,24 +1,37 @@
-{
-  lib, fetchgit, rustPlatform, pkg-config, openssl, fuse3, libuuid, acl,
-  libxcrypt, git, installShellFiles, sphinx, stdenv,
+{ lib,
+  fetchgit,
+  rustPlatform,
+  pkg-config,
+  openssl,
+  fuse3,
+  libuuid,
+  acl,
+  libxcrypt,
+  git,
+  installShellFiles,
+  sphinx,
+  stdenv,
+  fetchpatch,
+  testers,
+  proxmox-backup-client,
 }:

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

  srcs = [
    (fetchgit {
      url = "git://git.proxmox.com/git/proxmox-backup.git";
      rev = "v${version}";
      name = "proxmox-backup";
-      hash = "sha256-DWzNRi675ZP9HGc/uPvnV/FBTJUNZ4K5RtU9NFRQCcA=";
+      hash = "sha256-a6dPBZBBh//iANXoPmOdgxYO0qNszOYI3QtrjQr4Cxc=";
    })
    (fetchgit {
      url = "git://git.proxmox.com/git/proxmox.git";
-      rev = "5df815f660e4f3793e974eb8130224538350bb12";
+      rev = "2a070da0651677411a245f1714895235b1caf584";
      name = "proxmox";
-      hash = "sha256-Vn1poqkIWcR2rNiAr+ENLNthgk3pMCivzXnUX9hvZBw=";
+      hash = "sha256-WH6oW2MB2yN1Y2zqOuXewI9jHqev/xLcJtb7D1J4aUE=";
    })
    (fetchgit {
      url = "git://git.proxmox.com/git/proxmox-fuse.git";
@ -36,10 +49,28 @@ rustPlatform.buildRustPackage rec {

  sourceRoot = "proxmox-backup";

+  # These patches are essentially un-upstreamable, due to being "workarounds" related to the
+  # project structure.
  cargoPatches = [
-    ./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
+    # 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
+    # works in combination with the other three repos being checked out.
+    (fetchpatch {
+      name = "0001-re-route-dependencies-not-available-on-crates.io-to-.patch";
+      url = "https://aur.archlinux.org/cgit/aur.git/plain/0001-re-route-dependencies-not-available-on-crates.io-to-.patch?h=proxmox-backup-client&id=83a1f4dfcb04bd181b11954b1d9f5ddfcb72b3d0";
+      hash = "sha256-2YZtjbpYSbRk6rmpjKJeIO+V0YN5PrKsISONXMj4RG0=";
+    })
+    # 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=83a1f4dfcb04bd181b11954b1d9f5ddfcb72b3d0";
+      hash = "sha256-oJKQs4SwJvX5Zd0/l/vVr66aPO7Y4AC8byJHg9t1IhY=";
+    })
+    # `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.
+    ./0001-docs-Add-target-path-fixup-variable.patch
  ];

  postPatch = ''
@ -84,9 +115,15 @@ rustPlatform.buildRustPackage rec {
  nativeBuildInputs = [ git pkg-config rustPlatform.bindgenHook installShellFiles sphinx ];
  buildInputs = [ openssl fuse3 libuuid acl libxcrypt ];

+  passthru.tests.version = testers.testVersion {
+    package = proxmox-backup-client;
+    command = "${pname} version";
+  };
+
  meta = with lib; {
    description = "The command line client for Proxmox Backup Server";
    homepage = "https://pbs.proxmox.com/docs/backup-client.html";
+    changelog = "https://git.proxmox.com/?p=proxmox-backup.git;a=blob;f=debian/changelog;hb=refs/tags/v${version}";
    license = licenses.agpl3Only;
    maintainers = with maintainers; [ cofob christoph-heiss ];
    platforms = platforms.linux;
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@ -930,8 +930,8 @@ let
        mktplcRef = {
          name = "composer-php-vscode";
          publisher = "devsense";
-          version = "1.34.13295";
-          sha256 = "sha256-1gmw9GKG6ak/TIDq8aI63KmiHhup9EsCS583Oc6jQ0I=";
+          version = "1.36.13428";
+          sha256 = "sha256-dzRuD0XBWU+xUtr86eN8zbZ6bVIq1BP0/EqgQG4JbvY=";
        };
        meta = {
          changelog = "https://marketplace.visualstudio.com/items/DEVSENSE.composer-php-vscode/changelog";
@ -948,25 +948,25 @@ let
          sources = {
            "x86_64-linux" = {
              arch = "linux-x64";
-              sha256 = "sha256-L56vG9U2fqtaZIXQ5xepwLibOs/WyHQj/t2EIY7ZXvM=";
+              sha256 = "sha256-x4Vsr/79vZuNPGQqwOVdIMi2Ba9DfnKM1AjxCZbzJms=";
            };
            "x86_64-darwin" = {
              arch = "darwin-x64";
-              sha256 = "0rx2dkaz0qpmck1k4hg0jpksixhwcrq0sndimx0f44jcnc7aby21";
+              sha256 = "0c9jcjavkjiv92cd4wrvgcv70igghi5ha96hg7h63cgmxg7b87gk";
            };
            "aarch64-linux" = {
              arch = "linux-arm64";
-              sha256 = "13swwh1br6ry64hlq1yjbrbq71vyg44h0pb907zdjabwim27y88x";
+              sha256 = "0b3w3ssxymf9p1h4amnqimbsjf1wpxsi55b05wgqwh2w2zfxd91l";
            };
            "aarch64-darwin" = {
              arch = "darwin-arm64";
-              sha256 = "0fsisxc3vcyqk634xbk2rdcw2g8ablv3n46y6bz20i0npa4clhpa";
+              sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73";
            };
          };
        in {
          name = "phptools-vscode";
          publisher = "devsense";
-          version = "1.34.13295";
+          version = "1.36.13428";
        } // sources.${stdenv.system};

        nativeBuildInputs = [
@ -997,8 +997,8 @@ let
        mktplcRef = {
          name = "profiler-php-vscode";
          publisher = "devsense";
-          version = "1.34.13295";
-          sha256 = "sha256-ZGklnPnSaHCGCRukVHie5ShvX94rXp2z3e/5PP2dq7I=";
+          version = "1.36.13428";
+          sha256 = "sha256-/CT83LdQkEvsWrQX30bgnklgGKduYC0LqZ8gaexqu60=";
        };
        meta = {
          changelog = "https://marketplace.visualstudio.com/items/DEVSENSE.profiler-php-vscode/changelog";
--- a/pkgs/applications/misc/gallery-dl/default.nix
+++ b/pkgs/applications/misc/gallery-dl/default.nix
@ -2,13 +2,13 @@

 buildPythonApplication rec {
  pname = "gallery-dl";
-  version = "1.25.6";
+  version = "1.25.7";
  format = "setuptools";

  src = fetchPypi {
    inherit version;
    pname = "gallery_dl";
-    sha256 = "sha256-CCTO/1t6lIK2nQKtqgWq0HAm760t5tOhg8v99zUkY/U=";
+    sha256 = "sha256-iBv7Zh/kWY/kY01mniabGNSIp3PLiYK6IMINw51fNdk=";
  };

  propagatedBuildInputs = [
--- a/pkgs/applications/misc/oranda/default.nix
+++ b/pkgs/applications/misc/oranda/default.nix
@ -2,40 +2,34 @@
 , rustPlatform
 , fetchFromGitHub
 , pkg-config
-, bzip2
 , oniguruma
 , openssl
-, xz
-, zstd
 , stdenv
 , darwin
 }:

 rustPlatform.buildRustPackage rec {
  pname = "oranda";
-  version = "0.0.3";
+  version = "0.1.0";

  src = fetchFromGitHub {
    owner = "axodotdev";
    repo = "oranda";
    rev = "v${version}";
-    hash = "sha256-MT0uwLDrofCFyyYiUOogF2kNs6EPS1qxPz0gdK+Tkkg=";
+    hash = "sha256-bhMScPxf1svC6C8MvSHsVFrNzJYCkcR4mPJzK4OIoOU=";
  };

-  cargoHash = "sha256-dAnZc1VvOubfn7mnpttaB6FotN3Xc+t9Qn0n5uzv1Qg=";
+  cargoHash = "sha256-Zan5dTW/2k4rOl20lQwJWnzIiytKF2i+1oEW4o3k/vQ=";

  nativeBuildInputs = [
    pkg-config
  ];

  buildInputs = [
-    bzip2
    oniguruma
    openssl
-    xz
-    zstd
  ] ++ lib.optionals stdenv.isDarwin [
-    darwin.apple_sdk.frameworks.Security
+    darwin.apple_sdk.frameworks.CoreServices
  ];

  # requires internet access
@ -45,7 +39,6 @@ rustPlatform.buildRustPackage rec {

  env = {
    RUSTONIG_SYSTEM_LIBONIG = true;
-    ZSTD_SYS_USE_PKG_CONFIG = true;
  };

  meta = with lib; {
--- a/pkgs/applications/networking/cluster/kubectl-gadget/default.nix
+++ b/pkgs/applications/networking/cluster/kubectl-gadget/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "kubectl-gadget";
-  version = "0.17.0";
+  version = "0.18.0";

  src = fetchFromGitHub {
    owner = "inspektor-gadget";
    repo = "inspektor-gadget";
    rev = "v${version}";
-    hash = "sha256-7G6yot4VctwBf9MfcwXZLlon1NdaXQn7LSvkVf9y5kA=";
+    hash = "sha256-dn2iN6eBAX3U20omKfi3cEPpMpg/1MUjrdnSQ6eJYRM=";
  };

-  vendorHash = "sha256-RwUL8Mh9K2OIKzpKNtj6pHsFmSH0uZpouyMMeP22JQs=";
+  vendorHash = "sha256-26VQPKjUNcyKJFeoxfcm9RfozcBpms+6NDozxABnDuc=";

  CGO_ENABLED = 0;

--- a/pkgs/applications/science/biology/veryfasttree/default.nix
+++ b/pkgs/applications/science/biology/veryfasttree/default.nix
@ -1,17 +1,18 @@
-{ lib, stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake, llvmPackages}:

 stdenv.mkDerivation rec {
  pname   = "veryfasttree";
-  version = "3.1.1";
+  version = "4.0";

  src = fetchFromGitHub {
    owner = "citiususc";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-AOzbxUnrn1qgscjdOKf4dordnSKtIg3nSVaYWK1jbuc=";
+    hash = "sha256-ue3/2UTIQA6av+66xvGApLi9x0kM5vAmGHHTrboOaeQ=";
  };

  nativeBuildInputs = [ cmake ];
+  buildInputs = lib.optional stdenv.cc.isClang llvmPackages.openmp;

  installPhase = ''
    install -m755 -D VeryFastTree $out/bin/VeryFastTree
@ -22,5 +23,6 @@ stdenv.mkDerivation rec {
    license     = licenses.gpl3Plus;
    homepage    = "https://github.com/citiususc/veryfasttree";
    maintainers = with maintainers; [ thyol ];
+    platforms   = platforms.all;
  };
 }
--- a/pkgs/desktops/gnome/extensions/paperwm/default.nix
+++ b/pkgs/desktops/gnome/extensions/paperwm/default.nix
@ -6,13 +6,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "gnome-shell-extension-paperwm";
-  version = "44.3.0";
+  version = "44.3.1";

  src = fetchFromGitHub {
    owner = "paperwm";
    repo = "PaperWM";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-zVxsfoIMTBhd2eXI+mP3FWe68UGiCIh+5RsXBKk16jE=";
+    hash = "sha256-QTeUbhqHi1fMhw5cgT5S6JGgDaPhBuMwn4nRcp7mSMU=";
  };

  dontConfigure = true;
--- a/pkgs/development/interpreters/elixir/1.15.nix
+++ b/pkgs/development/interpreters/elixir/1.15.nix
@ -1,7 +1,7 @@
 { mkDerivation }:
 mkDerivation {
-  version = "1.15.1";
-  sha256 = "sha256-TP97vnhX+ZZGmOzAfqKf0dSqObPMh+34xcVpFnSb11w=";
+  version = "1.15.2";
+  sha256 = "sha256-JLDjLO78p1i3FqGCbgl22SZFGPxJxKGKskzAJhHV8NE=";
  # https://hexdocs.pm/elixir/1.15.0/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp
  minimumOTPVersion = "24";
  escriptPath = "lib/elixir/scripts/generate_app.escript";
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@ -205,12 +205,12 @@ stdenv.mkDerivation rec {

  __darwinAllowLocalNetworking = true;

-  meta = {
+  meta = with lib; {
+    changelog = "https://github.com/OSGeo/gdal/blob/${src.rev}/NEWS.md";
    description = "Translator library for raster geospatial data formats";
    homepage = "https://www.gdal.org/";
-    changelog = "https://github.com/OSGeo/gdal/blob/${src.rev}/NEWS.md";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ marcweber dotlambda ];
-    platforms = lib.platforms.unix;
+    license = licenses.mit;
+    maintainers = with maintainers; teams.geospatial.members ++ [ marcweber dotlambda ];
+    platforms = platforms.unix;
  };
 }
--- a/pkgs/development/libraries/proj/default.nix
+++ b/pkgs/development/libraries/proj/default.nix
@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: rec {
    description = "Cartographic Projections Library";
    homepage = "https://proj.org/";
    license = licenses.mit;
+    maintainers = with maintainers; teams.geospatial.members ++ [ dotlambda ];
    platforms = platforms.unix;
-    maintainers = with maintainers; [ dotlambda ];
  };
 })
--- a/pkgs/development/libraries/science/math/mongoose/default.nix
+++ b/pkgs/development/libraries/science/math/mongoose/default.nix
@ -1,17 +1,16 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 , cmake
 , blas
 }:

 let
-  suitesparseVersion = "7.0.1";
+  suitesparseVersion = "7.1.0";
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  pname = "mongoose";
-  version = "3.0.4";
+  version = "3.0.5";

  outputs = [ "bin" "out" "dev" ];

@ -19,7 +18,7 @@ stdenv.mkDerivation rec {
    owner = "DrTimothyAldenDavis";
    repo = "SuiteSparse";
    rev = "v${suitesparseVersion}";
-    hash = "sha256-EIreweeOx44YDxlnxnJ7l31Ie1jSx6y87VAyEX+4NsQ=";
+    hash = "sha256-UizybioU1J01PLBpu+PfnSzWScGTvMuJN5j9PjuZRwE=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/libraries/sregex/default.nix
+++ b/pkgs/development/libraries/sregex/default.nix
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
    homepage = "https://github.com/openresty/sregex";
    description = "A non-backtracking NFA/DFA-based Perl-compatible regex engine matching on large data streams";
    license = licenses.bsd3;
-    maintainers = with maintainers; [ earthengine ];
+    maintainers = with maintainers; [];
    platforms = platforms.all;
  };
 }
--- a/pkgs/development/php-packages/composer/default.nix
+++ b/pkgs/development/php-packages/composer/default.nix
@ -1,12 +1,12 @@
 { mkDerivation, fetchurl, makeBinaryWrapper, unzip, lib, php }:

-mkDerivation rec {
+mkDerivation (finalAttrs: {
  pname = "composer";
-  version = "2.5.7";
+  version = "2.5.8";

  src = fetchurl {
-    url = "https://github.com/composer/composer/releases/download/${version}/composer.phar";
-    sha256 = "sha256-klbEwcgDudDLemahq2xzfkjEPMbfe47J7CSXpyS/RN4=";
+    url = "https://github.com/composer/composer/releases/download/${finalAttrs.version}/composer.phar";
+    hash = "sha256-8Hk0+tRPkEjA3IdaUGzKMcwnlNauv8GGfzsfv0jc4sU=";
  };

  dontUnpack = true;
@ -23,11 +23,11 @@ mkDerivation rec {
    runHook postInstall
  '';

-  meta = with lib; {
+  meta = {
+    changelog = "https://github.com/composer/composer/releases/tag/${finalAttrs.version}";
    description = "Dependency Manager for PHP";
-    license = licenses.mit;
    homepage = "https://getcomposer.org/";
-    changelog = "https://github.com/composer/composer/releases/tag/${version}";
-    maintainers = with maintainers; [ offline ] ++ teams.php.members;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ offline ] ++ lib.teams.php.members;
  };
-}
+})
--- a/pkgs/development/python-modules/add-trailing-comma/default.nix
+++ b/pkgs/development/python-modules/add-trailing-comma/default.nix
@ -8,16 +8,16 @@

 buildPythonPackage rec {
  pname = "add-trailing-comma";
-  version = "2.4.0";
+  version = "3.0.0";
  format = "setuptools";

-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";

  src = fetchFromGitHub {
    owner = "asottile";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-/dA3OwBBMjykSYaIbvhJZj9Z8/0+mfL5pW4GqgMgops=";
+    hash = "sha256-uknXi7fsCWK5ngCEyfpkjovCtvL5v6OwN5kVoBpNZsY=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/django/4.nix
+++ b/pkgs/development/python-modules/django/4.nix
@ -42,14 +42,14 @@

 buildPythonPackage rec {
  pname = "Django";
-  version = "4.2.2";
+  version = "4.2.3";
  format = "pyproject";

  disabled = pythonOlder "3.10";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-Kmtvv/W1ndB77xC8sBm+4uqXowsqZW1RNGWWckMkut8=";
+    hash = "sha256-RadH4cWz1t8bFBsUgeGTsDP9H9vaP/Umd9yBr9qsuu0=";
  };

  patches = [
--- a/pkgs/development/python-modules/openstacksdk/default.nix
+++ b/pkgs/development/python-modules/openstacksdk/default.nix
@ -19,14 +19,14 @@

 buildPythonPackage rec {
  pname = "openstacksdk";
-  version = "1.2.0";
+  version = "1.3.1";
  format = "setuptools";

  disabled = pythonOlder "3.6";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-vEs0D96AUDuDm9pyoy631jDM3lwsH/SVKEDXn8pbzn8=";
+    hash = "sha256-+g/YOGv311SaOs65xOKai3BJp4GbhkD1awEFL4oQLMo=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/pysubs2/default.nix
+++ b/pkgs/development/python-modules/pysubs2/default.nix
@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, setuptools
+}:
+
+buildPythonPackage rec {
+  pname = "pysubs2";
+  version = "1.6.1";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "tkarabela";
+    repo = pname;
+    rev =  version;
+    hash = "sha256-0bW9aB6ERRQK3psqeU0Siyi/8drEGisAp8UtTfOKlp0=";
+  };
+
+  nativeBuildInputs = [
+    setuptools
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "pysubs2"
+  ];
+
+  meta = with lib; {
+    homepage = "https://github.com/tkarabela/pysubs2";
+    description = "A Python library for editing subtitle files";
+    license = licenses.mit;
+    maintainers = with maintainers; [ Benjamin-L ];
+  };
+}
--- a/pkgs/development/python-modules/sphinx-navtree/default.nix
+++ b/pkgs/development/python-modules/sphinx-navtree/default.nix
@ -1,20 +0,0 @@
-{ lib, fetchPypi, buildPythonPackage, sphinx }:
-
-buildPythonPackage rec {
-  version = "0.3.0";
-  pname = "sphinx-navtree";
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1nqcsbqwr8ihk1fv534i0naag1qw04f7ibcgl2j8csvkh8q90b4p";
-  };
-
-  propagatedBuildInputs = [ sphinx ];
-
-  meta = {
-    description = "Navigation tree customization for Sphinx";
-    homepage = "https://github.com/bintoro/sphinx-navtree";
-    license = lib.licenses.mit;
-    # not compatible with sphinx 3.3, not updated since 2016
-    broken = true;
-  };
-}
--- a/pkgs/development/python-modules/types-redis/default.nix
+++ b/pkgs/development/python-modules/types-redis/default.nix
@ -7,12 +7,12 @@

 buildPythonPackage rec {
  pname = "types-redis";
-  version = "4.5.5.2";
+  version = "4.6.0.1";
  format = "setuptools";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-L+gvN02d3fAH3q8j2B/dz9lSPZUivxFSPFxDvFsnCZ4=";
+    hash = "sha256-ElTVJd56ReLvqstpaeZ60d1cw1mgkgIiAFg6PwSGhmk=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/zipstream-ng/default.nix
+++ b/pkgs/development/python-modules/zipstream-ng/default.nix
@ -7,7 +7,7 @@

 buildPythonPackage rec {
  pname = "zipstream-ng";
-  version = "1.5.0";
+  version = "1.6.0";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
    owner = "pR0Ps";
    repo = "zipstream-ng";
    rev = "refs/tags/v${version}";
-    hash = "sha256-4pS2t5IEIUHGJRaO6f9r8xnvXWA6p1EsDQ/jpD8CMLI=";
+    hash = "sha256-mY0dbHho/K1nTmhlv8i8KPa4HW7epBhfEksX3E2df2M=";
  };

  pythonImportsCheck = [
--- a/pkgs/development/tools/misc/clojure-lsp/default.nix
+++ b/pkgs/development/tools/misc/clojure-lsp/default.nix
@ -2,18 +2,18 @@

 buildGraalvmNativeImage rec {
  pname = "clojure-lsp";
-  version = "2023.05.04-19.38.01";
+  version = "2023.07.01-22.35.41";

  src = fetchFromGitHub {
    owner = pname;
    repo = pname;
    rev = version;
-    sha256 = "sha256-TWbOR0/YYO0O+4w2ACADOrp8EmyEfFAq2FQOUDEafjw=";
+    sha256 = "sha256-/gpynrmu9O6nRH5TzfXwxbPbpk7c6ZzwR6cp8F2puUM=";
  };

  jar = fetchurl {
    url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar";
-    sha256 = "48503b147a247cef4c106084b0c15e10bb0f1de8f0b15d528ca9d66e76bba465";
+    sha256 = "90457834b079eea57d07b62a1281ebe91b7449d61da0f6e20d5b9f8f8163e525";
  };

  extraNativeImageBuildArgs = [
--- a/pkgs/games/doom-ports/doomrunner/default.nix
+++ b/pkgs/games/doom-ports/doomrunner/default.nix
@ -0,0 +1,60 @@
+{ lib
+, stdenv
+, qtbase
+, qmake
+, makeDesktopItem
+, wrapQtAppsHook
+, imagemagick
+, fetchFromGitHub
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "doomrunner";
+  version = "1.7.2";
+
+  src = fetchFromGitHub {
+    owner = "Youda008";
+    repo = "DoomRunner";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-a+f1L7WKdSwMlmXvvIkN+CPvW7Wh0gr4WuXsYKotfPE=";
+  };
+
+  buildInputs = [ qtbase ];
+  nativeBuildInputs = [ qmake wrapQtAppsHook imagemagick ];
+
+  makeFlags = [
+    "INSTALL_ROOT=${placeholder "out"}"
+  ];
+
+  postInstall = ''
+    mkdir -p $out/{bin,share/applications}
+    install -Dm755 $out/usr/bin/DoomRunner $out/bin/DoomRunner
+
+    for size in 16 24 32 48 64 128; do
+      mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
+      convert -background none -resize "$size"x"$size" $PWD/Resources/DoomRunner.ico -flatten $out/share/icons/hicolor/"$size"x"$size"/apps/DoomRunner.png
+    done;
+
+    install -m 444 -D "$desktopItem/share/applications/"* -t $out/share/applications/
+    rm -rf $out/usr
+  '';
+
+  desktopItem = makeDesktopItem {
+    name = "DoomRunner";
+    desktopName = "DoomRunner";
+    comment = "Preset-oriented graphical launcher of ZDoom and derivatives";
+    categories = [ "Game" ];
+    icon = "DoomRunner";
+    type = "Application";
+    exec = "DoomRunner";
+  };
+
+  meta = with lib; {
+    description = "Graphical launcher of ZDoom and derivatives";
+    homepage = "https://github.com/Youda008/DoomRunner/";
+    changelog = "https://github.com/Youda008/DoomRunner/blob/${finalAttrs.src.rev}/changelog.txt";
+    license = licenses.gpl3Only;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ keenanweaver ];
+  };
+})
--- a/pkgs/os-specific/darwin/hexfiend/default.nix
+++ b/pkgs/os-specific/darwin/hexfiend/default.nix
@ -0,0 +1,27 @@
+{ stdenv, lib, fetchurl, undmg }:
+
+stdenv.mkDerivation rec {
+  pname = "hexfiend";
+  version = "2.16.0";
+
+  src = fetchurl {
+    url = "https://github.com/HexFiend/HexFiend/releases/download/v${version}/Hex_Fiend_${lib.versions.majorMinor version}.dmg";
+    sha256 = "sha256-jO57bW5TyuQ0mjKKsSwDoGLp2TZ1d+m159flVGaVrLc=";
+  };
+
+  sourceRoot = "Hex Fiend.app";
+  nativeBuildInputs = [ undmg ];
+  installPhase = ''
+    mkdir -p "$out/Applications/Hex Fiend.app"
+    cp -R . "$out/Applications/Hex Fiend.app"
+  '';
+
+  meta = with lib; {
+    description = "Open-source macOS hex editor";
+    homepage = "http://hexfiend.com/";
+    changelog = "https://hexfiend.github.io/HexFiend/ReleaseNotes.html";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ eliandoran ];
+    platforms = [ "x86_64-darwin" ];
+  };
+}
--- a/pkgs/servers/kanidm/Cargo.lock
+++ b/pkgs/servers/kanidm/Cargo.lock
--- a/pkgs/servers/kanidm/default.nix
+++ b/pkgs/servers/kanidm/default.nix
@ -23,8 +23,8 @@ rustPlatform.buildRustPackage rec {
  src = fetchFromGitHub {
    owner = pname;
    repo = pname;
-    rev = "refs/tags/v${version}";
-    hash = "sha256-ZlUn7m5xgMWWIr9y/dkM/yZ2KF2LdkaxqtHsMcxAT/M=";
+    rev = "f5924443f08e462067937a5dd0e2c19e5e1255da";
+    hash = "sha256-kJUxVrGpczIdOqKQbgRp1xERfKP6C0SDQgWdjtSuvZ8=";
  };

  cargoLock = {
--- a/pkgs/servers/matrix-synapse/sliding-sync/default.nix
+++ b/pkgs/servers/matrix-synapse/sliding-sync/default.nix
@ -0,0 +1,37 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule rec {
+  pname = "matrix-sliding-sync";
+  version = "0.99.3";
+
+  src = fetchFromGitHub {
+    owner = "matrix-org";
+    repo = "sliding-sync";
+    rev = "v${version}";
+    hash = "sha256-lmmOq0gkvrIXQmy3rbTga0cC85t0LWjDOqrH1NWUpdA=";
+  };
+
+  vendorHash = "sha256-447P2TbBUEHmHubHiiZCrFVCj2/tmEuYFzLo27UyCk4=";
+
+  subPackages = [ "cmd/syncv3" ];
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.GitCommit=${src.rev}"
+  ];
+
+  # requires a running matrix-synapse
+  doCheck = false;
+
+  meta = with lib; {
+    description = "A sliding sync implementation of MSC3575 for matrix";
+    homepage = "https://github.com/matrix-org/sliding-sync";
+    license = with licenses; [ asl20 ];
+    maintainers = with maintainers; [ SuperSandro2000 emilylange ];
+    mainProgram = "syncv3";
+  };
+}
--- a/pkgs/servers/nosql/mongodb/6.0.nix
+++ b/pkgs/servers/nosql/mongodb/6.0.nix
@ -6,8 +6,8 @@ let
  };
 in
 buildMongoDB {
-  version = "6.0.6";
-  sha256 = "sha256-/AUe87fCM/BFJy3sPSuRBrOWMoE8zHIGhKYf/5NNCjc=";
+  version = "6.0.7";
+  sha256 = "sha256-Mva0rVYaUZ2gtqAwBk8BHrrhqjb4/K7NQQ1LYGzY78U=";
  patches = [
    (fetchpatch {
      name = "mongodb-6.1.0-rc-more-specific-cache-alignment-types.patch";
--- a/pkgs/servers/peertube/default.nix
+++ b/pkgs/servers/peertube/default.nix
@ -1,18 +1,49 @@
-{ lib, stdenv, callPackage, fetchurl, fetchFromGitHub, fetchYarnDeps, nixosTests
-, brotli, fixup_yarn_lock, jq, nodejs, which, yarn
+{ lib
+, stdenv
+, callPackage
+, fetchurl
+, fetchFromGitHub
+, fetchYarnDeps
+, nixosTests
+, brotli
+, fixup_yarn_lock
+, jq
+, nodejs
+, which
+, yarn
 }:
 let
-  arch =
-    if stdenv.hostPlatform.system == "x86_64-linux" then "linux-x64"
-    else throw "Unsupported architecture: ${stdenv.hostPlatform.system}";
-
-  bcrypt_version = "5.1.0";
-  bcrypt_lib = fetchurl {
-    url = "https://github.com/kelektiv/node.bcrypt.js/releases/download/v${bcrypt_version}/bcrypt_lib-v${bcrypt_version}-napi-v3-${arch}-glibc.tar.gz";
-    hash = "sha256-I1ceMi7h6flvKBmMIU1qjAU1S6z5MzguHDul3g1zMKw=";
+  bcryptHostPlatformAttrs = {
+    x86_64-linux = {
+      arch = "linux-x64";
+      libc = "glibc";
+      hash = "sha256-I1ceMi7h6flvKBmMIU1qjAU1S6z5MzguHDul3g1zMKw=";
+    };
+    aarch64-linux = {
+      arch = "linux-arm64";
+      libc = "glibc";
+      hash = "sha256-q8BR7kILYV8i8ozDkpcuKarf4s1TgRqOrUeLqjdWEQ0=";
+    };
+    x86_64-darwin = {
+      arch = "darwin-x64";
+      libc = "unknown";
+      hash = "sha256-ONnXtRxcYFuFz+rmVTg+yEKe6J/vfKahX2i6k8dQStg=";
+    };
+    aarch64-darwin = {
+      arch = "darwin-arm64";
+      libc = "unknown";
+      hash = "sha256-VesAcT/IF2cvJVncJoqZcAvFxw32SN70C60GLU2kmVI=";
+    };
  };
-
-in stdenv.mkDerivation rec {
+  bcryptAttrs = bcryptHostPlatformAttrs."${stdenv.hostPlatform.system}" or
+    (throw "Unsupported architecture: ${stdenv.hostPlatform.system}");
+  bcryptVersion = "5.1.0";
+  bcryptLib = fetchurl {
+    url = "https://github.com/kelektiv/node.bcrypt.js/releases/download/v${bcryptVersion}/bcrypt_lib-v${bcryptVersion}-napi-v3-${bcryptAttrs.arch}-${bcryptAttrs.libc}.tar.gz";
+    inherit (bcryptAttrs) hash;
+  };
+in
+stdenv.mkDerivation rec {
  pname = "peertube";
  version = "5.1.0";

@ -62,11 +93,11 @@ in stdenv.mkDerivation rec {

    # Fix bcrypt node module
    cd ~/node_modules/bcrypt
-    if [ "${bcrypt_version}" != "$(cat package.json | jq -r .version)" ]; then
+    if [ "${bcryptVersion}" != "$(cat package.json | jq -r .version)" ]; then
      echo "Mismatching version please update bcrypt in derivation"
      exit
    fi
-    mkdir -p ./lib/binding && tar -C ./lib/binding -xf ${bcrypt_lib}
+    mkdir -p ./lib/binding && tar -C ./lib/binding -xf ${bcryptLib}

    # Return to home directory
    cd ~
@ -122,7 +153,7 @@ in stdenv.mkDerivation rec {
    '';
    license = licenses.agpl3Plus;
    homepage = "https://joinpeertube.org/";
-    platforms = [ "x86_64-linux" ];
+    platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
    maintainers = with maintainers; [ immae izorkin mohe2015 stevenroose ];
  };
 }
--- a/pkgs/servers/prowlarr/default.nix
+++ b/pkgs/servers/prowlarr/default.nix
@ -21,15 +21,15 @@ let
  }.${stdenv.hostPlatform.system} or unsupported;

  hash = {
-    aarch64-darwin = "sha256-FFRzT4OSpiBkgr4euqJYznmF7DW8tEhhJQ6iuQoUwP0=";
-    aarch64-linux = "sha256-Syrx2vwDoy5a6NXPyhDkdrVIYC7+6y1uGw4wq55joK8=";
-    x86_64-darwin = "sha256-eXjDL8xlC8BwjMOplNTHuGPaYfKgupr/YgtSl3xYOuo=";
-    x86_64-linux = "sha256-T7qk9cCBsx226DovHq1i3A/RIQq+Y7XhW2BIwJR6l68=";
+    aarch64-darwin = "sha256-faCA+ATgeEVUg/3KdKcLVypU0wB7YHymXAsTT9Yqgbc=";
+    aarch64-linux = "sha256-m7Pe2wwwSyannSTROZ70uDczWjOlGeHRjewZgGE76mA=";
+    x86_64-darwin = "sha256-CoMeJPqS/9AMyjUvxA6lA989Xzebf3pE+Q27ebOwi6c=";
+    x86_64-linux = "sha256-WPsp0b7YfBKtIR6Y/V4mppctY+wh/gTJ0Vp1KRlZ2+A=";
  }.${stdenv.hostPlatform.system} or unsupported;

 in stdenv.mkDerivation rec {
  inherit pname;
-  version = "1.5.2.3484";
+  version = "1.6.3.3608";

  src = fetchurl {
    url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.master.${version}.${os}-core-${arch}.tar.gz";
--- a/pkgs/tools/admin/pgadmin/default.nix
+++ b/pkgs/tools/admin/pgadmin/default.nix
@ -14,14 +14,14 @@

 let
  pname = "pgadmin";
-  version = "7.3";
-  yarnSha256 = "sha256-gbFAeTB24EU0SWSAMnPus1rcgQmHcPySb6wXX3xKnvg=";
+  version = "7.4";
+  yarnSha256 = "sha256-rEKMUZksmR2jPwtXy6drNwAJktK/3Dee6EZVFHPngWs=";

  src = fetchFromGitHub {
    owner = "pgadmin-org";
    repo = "pgadmin4";
    rev = "REL-${lib.versions.major version}_${lib.versions.minor version}";
-    hash = "sha256-7qdM/CkrSy9g85WhaG57O9uqHIwQIpOThHKxGs+U0dQ=";
+    hash = "sha256-ksvSDySutTB9QX0Gh9jBjGlDyG/vEMhgadu91iNvznw=";
  };

  # keep the scope, as it is used throughout the derivation and tests
--- a/pkgs/tools/admin/pgadmin/update.sh
+++ b/pkgs/tools/admin/pgadmin/update.sh
@ -59,6 +59,7 @@ printf "Conversion done\n"

 printf "Will now do some regex substitution post-processing\n"
 sed -i -E "s|(.), |\1\", \"|g" yarn_v1.lock
+sed -i -E "s|npm:||g" yarn_v1.lock
 printf "Substituion done\n"

 printf "Will now add missing github packages back to the v1 yarn.lock file\n"
--- a/pkgs/tools/admin/pgadmin/yarn.lock
+++ b/pkgs/tools/admin/pgadmin/yarn.lock
--- a/pkgs/tools/misc/flowgger/default.nix
+++ b/pkgs/tools/misc/flowgger/default.nix
@ -37,6 +37,6 @@ rustPlatform.buildRustPackage rec {
    homepage = "https://github.com/awslabs/flowgger";
    description = "A fast, simple and lightweight data collector written in Rust";
    license = licenses.bsd2;
-    maintainers = with maintainers; [ earthengine ];
+    maintainers = with maintainers; [];
  };
 }
--- a/pkgs/tools/misc/gitrs/default.nix
+++ b/pkgs/tools/misc/gitrs/default.nix
@ -0,0 +1,42 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, openssl
+, pkg-config
+, libiconv
+, darwin
+, rustPlatform
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "gitrs";
+  version = "v0.3.6";
+
+  src = fetchFromGitHub {
+    owner = "mccurdyc";
+    repo = pname;
+    rev = version;
+    hash = "sha256-+43XJroPNWmdUC6FDL84rZWrJm5fzuUXfpDkAMyVQQg=";
+  };
+
+  cargoHash = "sha256-2TXm1JTs0Xkid91A5tdi6Kokm0K1NOPmlocwFXv48uw=";
+
+  nativeBuildInputs = [
+    pkg-config # for openssl
+  ];
+
+  buildInputs = [ openssl.dev ]
+    ++ lib.optionals stdenv.isDarwin [
+    libiconv
+    darwin.apple_sdk.frameworks.Security
+    darwin.apple_sdk.frameworks.SystemConfiguration
+  ];
+
+  meta = with lib; {
+    description = "A simple, opinionated, tool, written in Rust, for declaratively managing Git repos on your machine";
+    homepage = "https://github.com/mccurdyc/gitrs";
+    license = licenses.mit;
+    maintainers = with maintainers; [ mccurdyc ];
+    mainProgram = "gitrs";
+  };
+}
--- a/pkgs/tools/misc/rlwrap/default.nix
+++ b/pkgs/tools/misc/rlwrap/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "rlwrap";
-  version = "0.46";
+  version = "0.46.1";

  src = fetchFromGitHub {
    owner = "hanslub42";
    repo = "rlwrap";
-    rev = "v${version}";
-    sha256 = "sha256-NlpVg1AimJn3VAbUl2GK1kaLkqU1Djw7/2Uc21AY0Jo=";
+    rev = version;
+    sha256 = "sha256-yKJXfdxfaCsmPtI0KmTzfFKY+evUuytomVrLsSCYDGo=";
  };

  postPatch = ''
@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
    homepage = "https://github.com/hanslub42/rlwrap";
    license = licenses.gpl2Plus;
    platforms = platforms.unix;
-    maintainers = with maintainers; [ srapenne ];
+    maintainers = with maintainers; [ srapenne jlesquembre ];
  };
 }
--- a/pkgs/tools/misc/tmux/default.nix
+++ b/pkgs/tools/misc/tmux/default.nix
@ -1,12 +1,12 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 , autoreconfHook
 , bison
 , libevent
 , ncurses
 , pkg-config
+, runCommand
 , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd
 , withUtf8proc ? true, utf8proc # gets Unicode updates faster than glibc
 , withUtempter ? stdenv.isLinux && !stdenv.hostPlatform.isMusl, libutempter
@ -23,7 +23,7 @@ let

 in

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "tmux";
  version = "3.3a";

@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "tmux";
    repo = "tmux";
-    rev = version;
+    rev = finalAttrs.version;
    sha256 = "sha256-SygHxTe7N4y7SdzKixPFQvqRRL57Fm8zWYHfTpW+yVY=";
  };

@ -65,8 +65,25 @@ stdenv.mkDerivation rec {
  postInstall = ''
    mkdir -p $out/share/bash-completion/completions
    cp -v ${bashCompletion}/completions/tmux $out/share/bash-completion/completions/tmux
+  '' + lib.optionalString stdenv.isDarwin ''
+    mkdir $out/nix-support
+    echo "${finalAttrs.passthru.terminfo}" >> $out/nix-support/propagated-user-env-packages
  '';

+  passthru = {
+    terminfo = runCommand "tmux-terminfo" { nativeBuildInputs = [ ncurses ]; } (if stdenv.isDarwin then ''
+      mkdir -p $out/share/terminfo/74
+      cp -v ${ncurses}/share/terminfo/74/tmux $out/share/terminfo/74
+      # macOS ships an old version (5.7) of ncurses which does not include tmux-256color so we need to provide it from our ncurses.
+      # However, due to a bug in ncurses 5.7, we need to first patch the terminfo before we can use it with macOS.
+      # https://gpanders.com/blog/the-definitive-guide-to-using-tmux-256color-on-macos/
+      tic -o $out/share/terminfo -x <(TERMINFO_DIRS=${ncurses}/share/terminfo infocmp -x tmux-256color | sed 's|pairs#0x10000|pairs#32767|')
+    '' else ''
+      mkdir -p $out/share/terminfo/t
+      ln -sv ${ncurses}/share/terminfo/t/{tmux,tmux-256color,tmux-direct} $out/share/terminfo/t
+    '');
+  };
+
  meta = {
    homepage = "https://tmux.github.io/";
    description = "Terminal multiplexer";
@ -82,9 +99,9 @@ stdenv.mkDerivation rec {
        * Terminal locking, manually or after a timeout.
        * A clean, easily extended, BSD-licensed codebase, under active development.
    '';
-    changelog = "https://github.com/tmux/tmux/raw/${version}/CHANGES";
+    changelog = "https://github.com/tmux/tmux/raw/${finalAttrs.version}/CHANGES";
    license = lib.licenses.bsd3;
    platforms = lib.platforms.unix;
    maintainers = with lib.maintainers; [ thammers fpletz SuperSandro2000 srapenne ];
  };
-}
+})
--- a/pkgs/tools/networking/s5cmd/default.nix
+++ b/pkgs/tools/networking/s5cmd/default.nix
@ -2,17 +2,20 @@

 buildGoModule rec {
  pname = "s5cmd";
-  version = "2.0.0";
+  version = "2.1.0";

  src = fetchFromGitHub {
    owner = "peak";
    repo = "s5cmd";
    rev = "v${version}";
-    sha256 = "sha256-9G0GSMNLYeIrbq7zctM3OCRcEZF1giEt+u5g3lTX96M=";
+    hash = "sha256-uH6KE3sTPc2FfqOxr6cB3A8DOq+VjGsJ3KoK8riOKXk=";
  };

  vendorSha256 = null;

+  # Skip e2e tests requiring network access
+  excludedPackages = [ "./e2e" ];
+
  meta = with lib; {
    homepage = "https://github.com/peak/s5cmd";
    description = "Parallel S3 and local filesystem execution tool";
--- a/pkgs/tools/video/yaydl/default.nix
+++ b/pkgs/tools/video/yaydl/default.nix
@ -39,6 +39,6 @@ rustPlatform.buildRustPackage rec {
    homepage = "https://code.rosaelefanten.org/yaydl";
    description = "Yet another youtube down loader";
    license = licenses.cddl;
-    maintainers = with maintainers; [ earthengine ];
+    maintainers = with maintainers; [];
  };
 }
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@ -1496,6 +1496,7 @@ mapAliases ({
  rr-unstable = rr; # Added 2022-09-17
  rssglx = throw "'rssglx' has been renamed to/replaced by 'rss-glx'"; # Converted to throw 2022-02-22
  rssh = throw "rssh has been removed from nixpkgs: no upstream releases since 2012, several known CVEs"; # Added 2020-08-25
+  rtl8723bs-firmware = throw "rtl8723bs-firmware was added in mainline kernel version 4.12"; # Added 2023-07-03
  rtv = throw "rtv was archived by upstream. Consider using tuir, an actively maintained fork"; # Added 2021-08-08
  rtsp-simple-server = throw "rtsp-simple-server is rebranded as mediamtx, including default config path update"; # Added 2023-04-11
  rubyMinimal = throw "rubyMinimal was removed due to being unused";
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -3780,6 +3780,8 @@ with pkgs;

  grandperspective = callPackage ../os-specific/darwin/grandperspective { };

+  hexfiend = callPackage ../os-specific/darwin/hexfiend { };
+
  grb = callPackage ../applications/misc/grb { };

  kerf   = kerf_1; /* kerf2 is WIP */
@ -9544,6 +9546,8 @@ with pkgs;

  matrix-conduit = callPackage ../servers/matrix-conduit { };

+  matrix-sliding-sync = callPackage ../servers/matrix-synapse/sliding-sync { };
+
  matrix-synapse = callPackage ../servers/matrix-synapse { };

  matrix-synapse-plugins = recurseIntoAttrs matrix-synapse.plugins;
@ -17686,6 +17690,8 @@ with pkgs;

  mruby = callPackage ../development/compilers/mruby { };

+  samplebrain = libsForQt5.callPackage ../applications/audio/samplebrain { };
+
  scsh = callPackage ../development/interpreters/scsh { };

  scheme48 = callPackage ../development/interpreters/scheme48 { };
@ -36617,6 +36623,8 @@ with pkgs;
    inherit (darwin.apple_sdk.frameworks) Cocoa;
  };

+  doomrunner = qt5.callPackage ../games/doom-ports/doomrunner { };
+
  chocolate-doom = callPackage ../games/doom-ports/chocolate-doom { };

  crispy-doom = callPackage ../games/doom-ports/crispy-doom { };
@ -41218,4 +41226,6 @@ with pkgs;
  charasay = callPackage ../tools/misc/charasay { };

  waylyrics = callPackage ../applications/audio/waylyrics { };
+
+  gitrs = callPackage ../tools/misc/gitrs { };
 }
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@ -316,6 +316,7 @@ mapAliases ({
  sphinx_rtd_theme = sphinx-rtd-theme; # added 2022-08-03
  sphinxcontrib-autoapi = sphinx-autoapi; # added 2023-02=28
  sphinxcontrib_plantuml = sphinxcontrib-plantuml; # added 2021-08-02
+  sphinx-navtree = throw "sphinx-navtree has been removed since it is not compatible with sphinx 3.3 and unmaintained"; # added 2023-07-03
  sqlalchemy_migrate = sqlalchemy-migrate; # added 2021-10-28
  SQLAlchemy-ImageAttach = throw "sqlalchemy-imageattach has been removed as it is incompatible with sqlalchemy 1.4 and unmaintained"; # added 2022-04-23
  suds-jurko = throw "suds-jurko has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2023-02-27
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -7897,6 +7897,8 @@ self: super: with self; {

  pysolcast = callPackage ../development/python-modules/pysolcast { };

+  pysubs2 = callPackage ../development/python-modules/pysubs2 { };
+
  pysqlitecipher = callPackage ../development/python-modules/pysqlitecipher { };

  pysyncthru = callPackage ../development/python-modules/pysyncthru { };
@ -11737,8 +11739,6 @@ self: super: with self; {

  sphinx-material = callPackage ../development/python-modules/sphinx-material { };

-  sphinx-navtree = callPackage ../development/python-modules/sphinx-navtree { };
-
  sphinx-mdinclude = callPackage ../development/python-modules/sphinx-mdinclude { };

  sphinx_pypi_upload = callPackage ../development/python-modules/sphinx_pypi_upload { };