Merge master into staging-next

2024-09-11 15:08:33 +01:00 · 2024-09-09 06:05:06 +00:00 · 2024-09-09 06:05:06 +00:00 · 92d531057e
parent f2b767ea43 d01b5ff5b5
commit 92d531057e
52 changed files with 9532 additions and 262 deletions
--- a/doc/languages-frameworks/index.md
+++ b/doc/languages-frameworks/index.md
@ -67,6 +67,7 @@ dotnet.section.md
 emscripten.section.md
 gnome.section.md
 go.section.md
+gradle.section.md
 hare.section.md
 haskell.section.md
 hy.section.md
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@ -554,6 +554,13 @@ lib.mapAttrs mkLicense ({
    redistributable = true;
  };

+  fsl11Asl20 = {
+    fullName = "Functional Source License, Version 1.1, Apache 2.0 Future License";
+    url = "https://fsl.software/FSL-1.1-Apache-2.0.template.md";
+    free = false;
+    redistributable = true;
+  };
+
  ftl = {
    spdxId = "FTL";
    fullName = "Freetype Project License";
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -4386,6 +4386,12 @@

    keys = [ { fingerprint = "BBED 1B08 8CED 7F95 8917 FBE8 5004 F0FA D051 576D"; } ];
  };
+  cyewashish = {
+    name = "Cyewashish";
+    email = "wawashish@cyekaivy.dev";
+    github = "cyewashish";
+    githubId = 180875322;
+  };
  cynerd = {
    name = "Karel Kočí";
    email = "cynerd@email.cz";
@ -9083,6 +9089,12 @@
    githubId = 13622947;
    keys = [ { fingerprint = "1412 816B A9FA F62F D051 1975 D3E1 B013 B463 1293"; } ];
  };
+  istoph = {
+    email = "chr@istoph.de";
+    name = "Christoph Hüffelmann";
+    github = "istoph";
+    githubId = 114227790;
+  };
  ius = {
    email = "j.de.gram@gmail.com";
    name = "Joerie de Gram";
@ -20618,6 +20630,12 @@
    githubId = 27386;
    name = "Milan Svoboda";
  };
+  textshell = {
+    email = "textshell@uchuujin.de";
+    github = "textshell";
+    githubId = 6579711;
+    name = "Martin Hostettler";
+  };
  tfc = {
    email = "jacek@galowicz.de";
    matrix = "@jonge:ukvly.org";
@ -21404,6 +21422,13 @@
    githubId = 563054;
    name = "Thomas Tuegel";
  };
+  tudbut = {
+    name = "Daniella Hennig";
+    email = "nixpkgs@mail.tudbut.de";
+    matrix = "@tudbut:matrix.tudbut.de";
+    github = "tudbut";
+    githubId = 48156391;
+  };
  tu-maurice = {
    email = "valentin.gehrke+nixpkgs@zom.bi";
    github = "tu-maurice";
--- a/nixos/modules/services/misc/open-webui.nix
+++ b/nixos/modules/services/misc/open-webui.nix
@ -60,6 +60,17 @@ in
        '';
      };

+      environmentFile = lib.mkOption {
+        description = ''
+          Environment file to be passed to the systemd service.
+          Useful for passing secrets to the service to prevent them from being
+          world-readable in the Nix store.
+        '';
+        type = lib.types.nullOr lib.types.path;
+        default = null;
+        example = "/var/lib/secrets/openWebuiSecrets";
+      };
+
      openFirewall = lib.mkOption {
        type = types.bool;
        default = false;
@ -86,6 +97,7 @@ in

      serviceConfig = {
        ExecStart = "${lib.getExe cfg.package} serve --host ${cfg.host} --port ${toString cfg.port}";
+        EnvironmentFile = lib.optional (cfg.environmentFile != null) cfg.environmentFile;
        WorkingDirectory = cfg.stateDir;
        StateDirectory = "open-webui";
        RuntimeDirectory = "open-webui";
--- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
+++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
@ -216,7 +216,7 @@ in {
    consoleMode = mkOption {
      default = "keep";

-      type = types.enum [ "0" "1" "2" "auto" "max" "keep" ];
+      type = types.enum [ "0" "1" "2" "5" "auto" "max" "keep" ];

      description = ''
        The resolution of the console. The following values are valid:
@ -224,6 +224,7 @@ in {
        - `"0"`: Standard UEFI 80x25 mode
        - `"1"`: 80x50 mode, not supported by all devices
        - `"2"`: The first non-standard mode provided by the device firmware, if any
+        - `"5"`: Applicable for SteamDeck where this mode represent horizontal mode
        - `"auto"`: Pick a suitable mode automatically using heuristics
        - `"max"`: Pick the highest-numbered available mode
        - `"keep"`: Keep the mode selected by firmware (the default)
--- a/nixos/modules/virtualisation/podman/default.nix
+++ b/nixos/modules/virtualisation/podman/default.nix
@ -5,12 +5,16 @@ let

  inherit (lib) mkOption types;

-  podmanPackage = (pkgs.podman.override {
+  podmanPackage = pkgs.podman.override {
    extraPackages = cfg.extraPackages
      # setuid shadow
      ++ [ "/run/wrappers" ]
      ++ lib.optional (config.boot.supportedFilesystems.zfs or false) config.boot.zfs.package;
-  });
+    extraRuntimes = [ pkgs.runc ]
+      ++ lib.optionals (config.virtualisation.containers.containersConf.settings.network.default_rootless_network_cmd or "" == "slirp4netns") (with pkgs; [
+      slirp4netns
+    ]);
+  };

  # Provides a fake "docker" binary mapping to podman
  dockerCompat = pkgs.runCommand "${podmanPackage.pname}-docker-compat-${podmanPackage.version}"
--- a/nixos/tests/open-webui.nix
+++ b/nixos/tests/open-webui.nix
@ -1,6 +1,7 @@
-{ lib, ... }:
+{ config, lib, ... }:
 let
  mainPort = "8080";
+  webuiName = "NixOS Test";
 in
 {
  name = "open-webui";
@ -18,16 +19,31 @@ in
            # Requires network connection
            RAG_EMBEDDING_MODEL = "";
          };
+
+          # Test that environment variables can be
+          # overridden through a file.
+          environmentFile = config.node.pkgs.writeText "test.env" ''
+            WEBUI_NAME="${webuiName}"
+          '';
        };
      };
  };

  testScript = ''
+    import json
+
    machine.start()

    machine.wait_for_unit("open-webui.service")
    machine.wait_for_open_port(${mainPort})

    machine.succeed("curl http://127.0.0.1:${mainPort}")
+
+    # Load the Web UI config JSON and parse it.
+    webui_config_json = machine.succeed("curl http://127.0.0.1:${mainPort}/api/config")
+    webui_config = json.loads(webui_config_json)
+
+    # Check that the name was overridden via the environmentFile option.
+    assert webui_config["name"] == "${webuiName} (Open WebUI)"
  '';
 }
--- a/pkgs/applications/audio/pithos/default.nix
+++ b/pkgs/applications/audio/pithos/default.nix
@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, appstream-glib
+{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, appstream-glib, glib
 , wrapGAppsHook3, pythonPackages, gtk3, adwaita-icon-theme, gobject-introspection
 , libnotify, libsecret, gst_all_1 }:

@ -20,15 +20,13 @@ pythonPackages.buildPythonApplication rec {
    patchShebangs meson_post_install.py
  '';

-  nativeBuildInputs = [ meson ninja pkg-config appstream-glib wrapGAppsHook3 ];
+  nativeBuildInputs = [ meson ninja pkg-config appstream-glib wrapGAppsHook3 gobject-introspection ];

-  propagatedNativeBuildInputs = [
-    gobject-introspection
-  ];
+  buildInputs = [ gtk3 libnotify libsecret glib ]
+    ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad ]);

  propagatedBuildInputs =
-    [ gtk3 gobject-introspection libnotify libsecret adwaita-icon-theme ] ++
-    (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad ]) ++
+    [ adwaita-icon-theme ] ++
    (with pythonPackages; [ pygobject3 pylast ]);

  meta = with lib; {
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@ -30,21 +30,21 @@ let
  archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";

  sha256 = {
-    x86_64-linux = "0kfkn40a44ql6j4c8a1rsw5bqysj0i5k3qllq1rl2zglfx7v4vkk";
-    x86_64-darwin = "1iwl64wn5by6a4qdimxah76j90sv9as1908vgqxwhzj7plfcn6x5";
-    aarch64-linux = "02r8yl767cf972xyi0qky2yxli4jid3r474wg4lvhk7px4ajh4zj";
-    aarch64-darwin = "0d64dxm079v1v5c46c8brvmcdxawv70jyzp4hqnlxki1hpjxwbff";
-    armv7l-linux = "0ra50i827asq3y4d3qk9b3gnrrrq9vi5z14nw5wphgz139gqbxwj";
+    x86_64-linux = "0glnqj8kr7m6dq5nbygjwlgim8cngrh3idc10zp05rg0n364906v";
+    x86_64-darwin = "18xy36jha1ixd8lb0dg045ld9qivyjlds90i2k6rh974mx8jl7rj";
+    aarch64-linux = "1hdjmfjpdycsj78dfsjyidpg8mx7s66b4sb7xih87vfqvzhfmyw2";
+    aarch64-darwin = "1xjqq5fz8blprxjnck8zbn933y7kgx1hnq3nc887kp7q0879p9kr";
+    armv7l-linux = "07rnkswy2lv8wad0iiaknrd329bj1hdadzcklgd34dmqpgr28lij";
  }.${system} or throwSystem;
 in
  callPackage ./generic.nix rec {
    # Please backport all compatible updates to the stable release.
    # This is important for the extension ecosystem.
-    version = "1.92.2";
+    version = "1.93.0";
    pname = "vscode" + lib.optionalString isInsiders "-insiders";

    # This is used for VS Code - Remote SSH test
-    rev = "fee1edb8d6d72a0ddff41e5f71a671c23ed924b9";
+    rev = "4849ca9bdf9666755eb463db297b69e5385090e3";

    executableName = "code" + lib.optionalString isInsiders "-insiders";
    longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
@ -68,7 +68,7 @@ in
      src = fetchurl {
        name = "vscode-server-${rev}.tar.gz";
        url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
-        sha256 = "0n54l0s3p7nq3kc7jwdfsdq1k7p1v2ds17cwbfh3v9jifxqwws11";
+        sha256 = "00yjdgb48mclaamv8c9rz5d6p9pbqrik3y1pj60qqpqf29cj5p9s";
      };
    };

--- a/pkgs/applications/kde/keysmith.nix
+++ b/pkgs/applications/kde/keysmith.nix
@ -7,6 +7,7 @@
 , kdbusaddons
 , ki18n
 , kirigami2
+, kirigami-addons
 , kwindowsystem
 , libsodium
 , qtquickcontrols2
@ -24,6 +25,7 @@ mkDerivation rec {
    kdbusaddons
    ki18n
    kirigami2
+    kirigami-addons
    kwindowsystem
    libsodium
    qtquickcontrols2
--- a/pkgs/applications/misc/dasel/default.nix
+++ b/pkgs/applications/misc/dasel/default.nix
@ -1,4 +1,5 @@
 { lib
+, stdenv
 , buildGoModule
 , fetchFromGitHub
 , installShellFiles
@ -23,14 +24,14 @@ buildGoModule rec {

  nativeBuildInputs = [ installShellFiles ];

-  postInstall = ''
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
    installShellCompletion --cmd dasel \
      --bash <($out/bin/dasel completion bash) \
      --fish <($out/bin/dasel completion fish) \
      --zsh <($out/bin/dasel completion zsh)
  '';

-  doInstallCheck = true;
+  doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
  installCheckPhase = ''
    runHook preInstallCheck
    if [[ $($out/bin/dasel --version) == "dasel version ${version}" ]]; then
--- a/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/default.nix
@ -2,25 +2,34 @@

 stdenv.mkDerivation rec {
  pname = "obs-multi-rtmp";
-  version = "0.2.8.1-OBS28";
+  version = "0.6.0.1";

  src = fetchFromGitHub {
    owner = "sorayuki";
    repo = "obs-multi-rtmp";
    rev = version;
-    sha256 = "sha256-1W+c8Y0AmtKQmCIg8IDAaYYStQzDpZRuqw3vZEY5ncU=";
+    sha256 = "sha256-MRBQY9m6rj8HVdn58mK/Vh07FSm0EglRUaP20P3FFO4=";
  };

  nativeBuildInputs = [ cmake ];
  buildInputs = [ obs-studio qtbase ];

-  patches = [
-    # Patch cmake file to link against the obs build output, instead of its sources
-    ./fix-build.patch
+  cmakeFlags = [
+    (lib.cmakeBool "ENABLE_QT" true)
+    (lib.cmakeBool "ENABLE_FRONTEND_API" true)
+    (lib.cmakeBool "CMAKE_COMPILE_WARNING_AS_ERROR" false)
  ];

  dontWrapQtApps = true;

+  # install dirs changed after 0.5.0.3-OBS30
+  postInstall = ''
+    mkdir -p $out/{lib,share/obs/obs-plugins/}
+    mv $out/dist/obs-multi-rtmp/data $out/share/obs/obs-plugins/obs-multi-rtmp
+    mv $out/dist/obs-multi-rtmp/bin/64bit $out/lib/obs-plugins
+    rm -rf $out/dist
+  '';
+
  meta = with lib; {
    homepage = "https://github.com/sorayuki/obs-multi-rtmp/";
    changelog = "https://github.com/sorayuki/obs-multi-rtmp/releases/tag/${version}";
--- a/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/fix-build.patch
+++ b/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/fix-build.patch
@ -1,54 +0,0 @@
-From 72aeddb52c2b656bfec918097ad07a0ff092008b Mon Sep 17 00:00:00 2001
-From: Raphael Robatsch <raphael-git@tapesoftware.net>
-Date: Thu, 13 Oct 2022 21:34:21 +0200
-Subject: [PATCH] Link against OBS public interface instead of sources
-
---
- CMakeLists.txt | 22 ++++------------------
- 1 file changed, 4 insertions(+), 18 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 27e20f8..8725c5b 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -65,15 +65,9 @@ if (WIN32)
-         "/def:${CMAKE_CURRENT_BINARY_DIR}/obs-frontend-api.def"
-         "/out:${CMAKE_CURRENT_BINARY_DIR}/obs-frontend-api.lib"
-     )
-elseif (APPLE)
-    # macOS
-    find_library(_LIB_OBS "${LIB_OBS}.0.dylib" PATHS ${OBS_BIN_DIR} REQUIRED)
-    set(LIB_OBS "${_LIB_OBS}")
-elseif (UNIX)
-    # Linux
-    find_package(LibObs REQUIRED)
- else ()
-    message(FATAL_ERROR "Unsupported OS!")
-+    find_package(libobs REQUIRED)
-+    find_package(obs-frontend-api REQUIRED)
- endif ()
-
-
-@@ -96,18 +90,10 @@ if (WIN32)
-         "${CMAKE_CURRENT_BINARY_DIR}/version.rc"
-     )
- endif ()
-target_include_directories(obs-multi-rtmp PRIVATE
-    "${OBS_SRC_DIR}/libobs"
-    "${OBS_SRC_DIR}/UI/obs-frontend-api"
-)
-target_link_directories(obs-multi-rtmp PRIVATE
-    "${CMAKE_CURRENT_BINARY_DIR}"
-    ${OBS_BIN_DIR}
-)
- target_link_libraries(obs-multi-rtmp PRIVATE
-     Qt6::Widgets
-    ${LIB_OBS}
-    obs-frontend-api
-+    OBS::libobs
-+    OBS::obs-frontend-api
- )
-
- if (WIN32)
-- 
-2.37.3
--- a/pkgs/applications/virtualization/podman/default.nix
+++ b/pkgs/applications/virtualization/podman/default.nix
@ -23,7 +23,6 @@
 , runc
 , conmon
 , extraRuntimes ? lib.optionals stdenv.isLinux [ runc ]  # e.g.: runc, gvisor, youki
-, slirp4netns
 , fuse-overlayfs
 , util-linux
 , iptables
@ -59,7 +58,6 @@ let
      aardvark-dns
      catatonit # added here for the pause image and also set in `containersConf` for `init_path`
      netavark
-      slirp4netns
      passt
      conmon
      crun
--- a/pkgs/applications/virtualization/xen/4.16/default.nix
+++ b/pkgs/applications/virtualization/xen/4.16/default.nix
@ -1,57 +0,0 @@
-{
-  lib,
-  fetchpatch,
-  callPackage,
-  ocaml-ng,
-  ...
-}@genericDefinition:
-
-let
-  upstreamPatches = import ../generic/patches.nix {
-    inherit lib;
-    inherit fetchpatch;
-  };
-
-  upstreamPatchList = lib.lists.flatten (
-    with upstreamPatches;
-    [
-      XSA_458
-      XSA_460
-      XSA_461
-    ]
-  );
-in
-
-callPackage (import ../generic/default.nix {
-  pname = "xen";
-  branch = "4.16";
-  version = "4.16.6";
-  latest = false;
-  pkg = {
-    xen = {
-      rev = "4b33780de790bd438dd7cbb6143b410d94f0f049";
-      hash = "sha256-2kcmfKwBo3w1U5CSxLSYSteqvzcJaB+cA7keVb3amyA=";
-      patches = [ ] ++ upstreamPatchList;
-    };
-    qemu = {
-      rev = "c02cb236b5e4a76cf74e641cc35a0e3ebd3e52f3";
-      hash = "sha256-LwlPry04az9QQowaDG2la8PYlGOUMbZaQAsCHxj+pwM=";
-      patches = [ ];
-    };
-    seaBIOS = {
-      rev = "d239552ce7220e448ae81f41515138f7b9e3c4db";
-      hash = "sha256-UKMceJhIprN4/4Xe4EG2EvKlanxVcEi5Qcrrk3Ogiik=";
-      patches = [ ];
-    };
-    ovmf = {
-      rev = "7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5";
-      hash = "sha256-Qq2RgktCkJZBsq6Ch+6tyRHhme4lfcN7d2oQfxwhQt8=";
-      patches = [ ];
-    };
-    ipxe = {
-      rev = "3c040ad387099483102708bb1839110bc788cefb";
-      hash = "sha256-y2QdZEoGsGUQjrrvD8YRa8VoqcZSr4tjLM//I/MrsLI=";
-      patches = [ ];
-    };
-  };
-}) ({ ocamlPackages = ocaml-ng.ocamlPackages_4_14; } // genericDefinition)
--- a/pkgs/applications/virtualization/xen/generic/default.nix
+++ b/pkgs/applications/virtualization/xen/generic/default.nix
@ -105,7 +105,7 @@ let
  inherit (versionDefinition) pkg;

  # Mark versions older than minSupportedVersion as EOL.
-  minSupportedVersion = "4.16";
+  minSupportedVersion = "4.17";

  ## Pre-fetched Source Handling ##

@ -711,8 +711,6 @@ stdenv.mkDerivation (finalAttrs: {
    mainProgram = "xl";
    # Evaluates to x86_64-linux.
    platforms = lib.lists.intersectLists lib.platforms.linux lib.platforms.x86_64;
-    knownVulnerabilities = lib.lists.optionals (lib.strings.versionOlder version minSupportedVersion) [
-      "Xen ${version} is no longer supported by the Xen Security Team. See https://xenbits.xenproject.org/docs/unstable/support-matrix.html"
-    ];
+    knownVulnerabilities = lib.lists.optional (lib.strings.versionOlder version minSupportedVersion) "Xen ${version} is no longer supported by the Xen Security Team. See https://xenbits.xenproject.org/docs/unstable/support-matrix.html";
  };
 })
--- a/pkgs/applications/virtualization/xen/packages.nix
+++ b/pkgs/applications/virtualization/xen/packages.nix
@ -53,13 +53,4 @@ rec {
    withInternalIPXE = false;
    inherit (slim) meta;
  };
-
-  xen_4_16 = callPackage ./4.16/default.nix { inherit (standard) meta; };
-  xen_4_16-slim = xen_4_16.override {
-    withInternalQEMU = false;
-    withInternalSeaBIOS = false;
-    withInternalOVMF = false;
-    withInternalIPXE = false;
-    inherit (slim) meta;
-  };
 }
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix
@ -7,13 +7,13 @@
 }:
 mkHyprlandPlugin hyprland rec {
  pluginName = "hy3";
-  version = "0.42.0";
+  version = "0.43.0";

  src = fetchFromGitHub {
    owner = "outfoxxed";
    repo = "hy3";
    rev = "refs/tags/hl${version}";
-    hash = "sha256-gyhpW3Mv9RgWsB8jAMoA7yoMSb01ol0jyPFNsghaZ0w=";
+    hash = "sha256-hBvwaMlgBuR2cB1Kx6cA1z7x38HXUujNcHtBsKhaEZs=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hycov.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hycov.nix
@ -28,5 +28,6 @@ mkHyprlandPlugin hyprland rec {
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ donovanglover ];
    platforms = lib.platforms.linux;
+    broken = true; # Doesn't work after Hyprland v0.41.2 https://gitee.com/DreamMaoMao/hycov/issues/IANYC8#note_31512295_link
  };
 }
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix
@ -9,13 +9,13 @@

 mkHyprlandPlugin hyprland {
  pluginName = "hyprscroller";
-  version = "0-unstable-2024-09-01";
+  version = "0-unstable-2024-09-06";

  src = fetchFromGitHub {
    owner = "dawsers";
    repo = "hyprscroller";
-    rev = "5fe29fcbd7103782d55cfb50482c64c31189f02a";
-    hash = "sha256-Fr2OUEO2LgZsLILnXePuMMbzYBnGA9GyIlLWt2P7bLA=";
+    rev = "07671d7d42b92a85fc7e62cd8f02b0d9c52a8dea";
+    hash = "sha256-RLI202fBXz+mDXX5Em70FU+16ChbA/YtpORYiOSX8uc=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/by-name/_1/_1fps/package.nix
+++ b/pkgs/by-name/_1/_1fps/package.nix
@ -0,0 +1,35 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildGoModule,
+  xorg,
+}:
+buildGoModule rec {
+  pname = "1fps";
+  version = "0.1.10";
+
+  src = fetchFromGitHub {
+    owner = "1fpsvideo";
+    repo = "1fps";
+    rev = "v${version}";
+    hash = "sha256-3uPGFxEWmKQxQWPmotZI29GykUGQDjtDjFPps4QMs0M=";
+  };
+
+  proxyVendor = true;
+
+  vendorHash = "sha256-J3RGQhjpGURmXOwq19BbbNg5ERrUXHnSG5Id6gX7Nug=";
+
+  buildInputs = [
+    xorg.libX11
+    xorg.libXtst
+    xorg.libXi
+  ];
+
+  meta = {
+    description = "Encrypted Screen Sharing";
+    homepage = "https://1fps.video";
+    license = lib.licenses.fsl11Asl20;
+    maintainers = with lib.maintainers; [ renesat ];
+    mainProgram = "1fps";
+  };
+}
--- a/pkgs/by-name/cl/clash-verge-rev/Cargo-tauri.lock
+++ b/pkgs/by-name/cl/clash-verge-rev/Cargo-tauri.lock
--- a/pkgs/by-name/cl/clash-verge-rev/package.nix
+++ b/pkgs/by-name/cl/clash-verge-rev/package.nix
@ -1,66 +1,103 @@
 {
  lib,
-  autoPatchelfHook,
-  clash-meta,
-  dpkg,
-  fetchurl,
-  libayatana-appindicator,
-  nix-update-script,
-  openssl,
+  mihomo,
+  callPackage,
+  fetchFromGitHub,
+  dbip-country-lite,
  stdenv,
-  udev,
-  webkitgtk,
  wrapGAppsHook3,
+  v2ray-geoip,
+  v2ray-domain-list-community,
 }:
-
-stdenv.mkDerivation (finalAttrs: {
+let
  pname = "clash-verge-rev";
-  version = "1.7.5";
+  version = "1.7.7";

-  src = fetchurl {
-    url = "https://github.com/clash-verge-rev/clash-verge-rev/releases/download/v${finalAttrs.version}/clash-verge_${finalAttrs.version}_amd64.deb";
-    hash = "sha256-pVEP+A4W6xLShFXuXPA6P+HZT8Hqkj/HRW2LaOOBI6U=";
+  src = fetchFromGitHub {
+    owner = "clash-verge-rev";
+    repo = "clash-verge-rev";
+    rev = "v${version}";
+    hash = "sha256-5sd0CkUCV52wrBPo0IRIa1uqf2QNkjXuZhE33cZW3SY=";
  };

-  nativeBuildInputs = [
-    dpkg
-    wrapGAppsHook3
-    autoPatchelfHook
-  ];
+  src-service = fetchFromGitHub {
+    owner = "clash-verge-rev";
+    repo = "clash-verge-service";
+    rev = "e74e419f004275cbf35a427337d3f8c771408f07"; # no meaningful tags in this repo. The only way is updating manully every time.
+    hash = "sha256-HyRTOqPj4SnV9gktqRegxOYz9c8mQHOX+IrdZlHhYpo=";
+  };

-  buildInputs = [
-    openssl
-    webkitgtk
-  ];
+  service-cargo-hash = "sha256-NBeHR6JvdCp06Ug/UEtLY2tu3iCmlsCU0x8umRbJXLU=";

-  runtimeDependencies = [
-    (lib.getLib udev)
-    libayatana-appindicator
-  ];
+  service = callPackage ./service.nix {
+    inherit
+      version
+      src-service
+      service-cargo-hash
+      pname
+      ;
+  };

-  installPhase = ''
-    runHook preInstall
+  webui = callPackage ./webui.nix {
+    inherit
+      version
+      src
+      pname
+      ;
+  };

-    mkdir -p $out/bin
-    mv usr/* $out
+  sysproxy-hash = "sha256-TEC51s/viqXUoEH9rJev8LdC2uHqefInNcarxeogePk=";

-    runHook postInstall
-  '';
-
-  postFixup = ''
-    rm -f $out/bin/verge-mihomo
-    ln -sf ${lib.getExe clash-meta} $out/bin/verge-mihomo
-  '';
-
-  passthru.updateScript = nix-update-script { };
+  unwrapped = callPackage ./unwrapped.nix {
+    inherit
+      pname
+      version
+      src
+      sysproxy-hash
+      webui
+      meta
+      ;
+  };

  meta = {
    description = "Clash GUI based on tauri";
    homepage = "https://github.com/clash-verge-rev/clash-verge-rev";
-    license = lib.licenses.gpl3Plus;
+    license = lib.licenses.gpl3Only;
    mainProgram = "clash-verge";
-    maintainers = with lib.maintainers; [ Guanran928 ];
-    platforms = [ "x86_64-linux" ];
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    maintainers = with lib.maintainers; [
+      Guanran928
+      bot-wxt1221
+    ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
  };
-})
+in
+stdenv.mkDerivation {
+  inherit
+    pname
+    src
+    version
+    meta
+    ;
+
+  nativeBuildInputs = [
+    wrapGAppsHook3
+  ];
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/{bin,share,lib/clash-verge/resources}
+    cp -r ${unwrapped}/share/* $out/share
+    cp -r ${unwrapped}/bin/clash-verge $out/bin/clash-verge
+    # This can't be symbol linked. It will find mihomo in its runtime path
+    ln -s ${service}/bin/clash-verge-service $out/bin/clash-verge-service
+    ln -s ${mihomo}/bin/mihomo $out/bin/verge-mihomo
+    # people who want to use alpha build show override mihomo themselves. The alpha core entry was removed in clash-verge.
+    ln -s ${v2ray-geoip}/share/v2ray/geoip.dat $out/lib/clash-verge/resources/geoip.dat
+    ln -s ${v2ray-domain-list-community}/share/v2ray/geosite.dat $out/lib/clash-verge/resources/geosite.dat
+    ln -s ${dbip-country-lite.mmdb} $out/lib/clash-verge/resources/Country.mmdb
+    runHook postInstall
+  '';
+}
--- a/pkgs/by-name/cl/clash-verge-rev/service.nix
+++ b/pkgs/by-name/cl/clash-verge-rev/service.nix
@ -0,0 +1,33 @@
+{
+  version,
+  rustPlatform,
+  src-service,
+  pkg-config,
+  openssl,
+  pname,
+  webkitgtk,
+  service-cargo-hash,
+}:
+rustPlatform.buildRustPackage {
+  pname = "${pname}-service";
+  inherit version;
+
+  src = src-service;
+  sourceRoot = "${src-service.name}";
+
+  nativeBuildInputs = [
+    pkg-config
+    rustPlatform.cargoSetupHook
+  ];
+
+  buildInputs = [
+    openssl
+    webkitgtk
+  ];
+
+  env = {
+    OPENSSL_NO_VENDOR = 1;
+  };
+
+  cargoHash = service-cargo-hash;
+}
--- a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix
+++ b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix
@ -0,0 +1,68 @@
+{
+  pname,
+  version,
+  src,
+  libayatana-appindicator,
+  sysproxy-hash,
+  webui,
+  pkg-config,
+  rustPlatform,
+  makeDesktopItem,
+  meta,
+  webkitgtk,
+  openssl,
+}:
+rustPlatform.buildRustPackage {
+  inherit version src;
+  pname = "${pname}-unwrapped";
+  sourceRoot = "${src.name}/src-tauri";
+
+  cargoLock = {
+    lockFile = ./Cargo-tauri.lock;
+    outputHashes = {
+      "sysproxy-0.3.0" = sysproxy-hash;
+    };
+  };
+
+  env = {
+    OPENSSL_NO_VENDOR = 1;
+  };
+
+  postPatch = ''
+    substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
+      --replace "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
+    substituteInPlace ./tauri.conf.json \
+      --replace-fail '"distDir": "../dist",' '"distDir": "${webui}",' \
+      --replace-fail '"beforeBuildCommand": "pnpm run web:build"' '"beforeBuildCommand": ""'
+    sed -i -e '/externalBin/d' -e '/resources/d' tauri.conf.json
+  '';
+
+  nativeBuildInputs = [
+    pkg-config
+    rustPlatform.cargoSetupHook
+  ];
+
+  buildInputs = [
+    openssl
+    webkitgtk
+  ];
+
+  postInstall = ''
+    install -DT icons/128x128@2x.png $out/share/icons/hicolor/128x128@2/apps/clash-verge.png
+    install -DT icons/128x128.png $out/share/icons/hicolor/128x128/apps/clash-verge.png
+    install -DT icons/32x32.png $out/share/icons/hicolor/32x32/apps/clash-verge.png
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "clash-verge-rev";
+      exec = "clash-verge %u";
+      icon = "clash-verge-rev";
+      desktopName = "Clash Verge Rev";
+      genericName = meta.description;
+      mimeTypes = [ "x-scheme-handler/clash" ];
+      type = "Application";
+      terminal = false;
+    })
+  ];
+}
--- a/pkgs/by-name/cl/clash-verge-rev/webui.nix
+++ b/pkgs/by-name/cl/clash-verge-rev/webui.nix
@ -0,0 +1,43 @@
+{
+  version,
+  src,
+  pname,
+  pnpm,
+  nodejs,
+  stdenv,
+}:
+stdenv.mkDerivation {
+  inherit version src;
+  pname = "${pname}-webui";
+  pnpmDeps = pnpm.fetchDeps {
+    inherit pname version src;
+    hash = "sha256-DYsx1X1yXYEPFuMlvZtbJdefcCR8/wSUidFwsMy8oLk=";
+  };
+
+  nativeBuildInputs = [
+    nodejs
+    pnpm.configHook
+  ];
+
+  postPatch = ''
+    chmod -R +644 -- ./src/components/setting/mods/clash-core-viewer.tsx
+    chmod -R +644 -- ./src/components/setting/mods
+    sed -i -e '/Mihomo Alpha/d' ./src/components/setting/mods/clash-core-viewer.tsx
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+
+    node --max_old_space_size=1024000 ./node_modules/vite/bin/vite.js build
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    cp -r dist $out
+
+    runHook postInstall
+  '';
+}
--- a/pkgs/by-name/cl/clever-tools/package.nix
+++ b/pkgs/by-name/cl/clever-tools/package.nix
@ -1,9 +1,10 @@
-{ lib
-, buildNpmPackage
-, fetchFromGitHub
-, nodejs_18
-, installShellFiles
-, stdenv
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  nodejs_18,
+  installShellFiles,
+  stdenv,
 }:

 buildNpmPackage rec {
@ -26,11 +27,15 @@ buildNpmPackage rec {

  nativeBuildInputs = [ installShellFiles ];

-  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+  makeWrapperArgs = [ "--set NO_UPDATE_NOTIFIER true" ];
+
+  postInstall =
+    lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
      installShellCompletion --cmd clever \
        --bash <($out/bin/clever --bash-autocomplete-script $out/bin/clever) \
        --zsh <($out/bin/clever --zsh-autocomplete-script $out/bin/clever)
-  '' + ''
+    ''
+    + ''
      rm $out/bin/install-clever-completion
      rm $out/bin/uninstall-clever-completion
    '';
--- a/pkgs/by-name/de/debase/ignore-vendored-libgit2.patch
+++ b/pkgs/by-name/de/debase/ignore-vendored-libgit2.patch
@ -0,0 +1,31 @@
+diff --git a/Makefile b/Makefile
+index b0b682cb..513822d9 100644
+--- a/Makefile
+++ b/Makefile
+@@ -58,17 +58,14 @@ endif
+ 
+ INCDIRS =										\
+ 	-isystem ./lib/ncurses/include				\
+-	-iquote ./lib/libgit2/include				\
+ 	-iquote ./src								\
+ 	-iquote .
+ 
+ LIBDIRS =										\
+-	-L./lib/libgit2/build-$(PLATFORM)			\
+ 	-L./lib/ncurses/build-$(PLATFORM)
+ 
+ LIBS =											\
+ 	-lgit2										\
+-	-lz											\
+ 	-lpthread									\
+ 	-lformw										\
+ 	-lmenuw										\
+@@ -102,7 +99,7 @@ $(OBJS): | lib $(GITHASHHEADER)
+ # Libs: execute make from `lib` directory
+ .PHONY: lib
+ lib:
+-	$(MAKE) -C $@
+	$(MAKE) -C $@ ncurses/$(BUILDROOT)
+ 
+ # C rule
+ $(BUILDDIR)/%.o: %.c
--- a/pkgs/by-name/de/debase/package.nix
+++ b/pkgs/by-name/de/debase/package.nix
@ -0,0 +1,96 @@
+{
+  darwin,
+  fetchFromGitHub,
+  fetchpatch, # Delete at next version bump.
+  lib,
+  libgit2,
+  stdenv,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "debase";
+  # NOTE: When updating version, also update commit hash in prePatch.
+  version = "2";
+
+  src =
+    (fetchFromGitHub {
+      owner = "toasterllc";
+      repo = "debase";
+      rev = "refs/tags/v${version}";
+      hash = "sha256-6AavH8Ag+879ntcxJDbVgsg8V6U4cxwPQYPKvq2PpoQ=";
+      fetchSubmodules = true;
+    }).overrideAttrs
+      {
+        # Workaround to fetch git@github.com submodules.
+        # See https://github.com/NixOS/nixpkgs/issues/195117
+        #
+        # Already fixed in latest upstream, so delete at next version bump.
+        GIT_CONFIG_COUNT = 1;
+        GIT_CONFIG_KEY_0 = "url.https://github.com/.insteadOf";
+        GIT_CONFIG_VALUE_0 = "git@github.com:";
+      };
+
+  prePatch = ''
+    # xcrun is not available in the Darwin stdenv, but we don't need it anyway.
+    substituteInPlace Makefile \
+      --replace-fail 'xcrun dsymutil' dsymutil
+
+    # NOTE: Update this when updating version.
+    substituteInPlace Makefile \
+      --replace-fail 'git rev-parse HEAD' 'echo bbe9f1737ab229dd370640a4b5d5e742a051c13b' \
+      --replace-fail '$(GITHASHHEADER): .git/HEAD .git/index' '$(GITHASHHEADER):'
+  '';
+
+  patches = [
+    # Ignore debase's vendored copy of libgit2 in favor of the nixpkgs version.
+    ./ignore-vendored-libgit2.patch
+    # Already fixed in latest upstream, so delete at next version bump.
+    (fetchpatch {
+      url = "https://github.com/toasterllc/debase/commit/d483c5ac016ac2ef3600e93ae4022cd9d7781c83.patch";
+      hash = "sha256-vVQMOEiLTd46+UknZm8Y197sjyK/kTK/M+9sRX9AssY=";
+    })
+  ];
+
+  buildInputs = [
+    libgit2
+  ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.Foundation ];
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm755 build-${if stdenv.isDarwin then "mac" else "linux"}/release/debase $out/bin/debase
+    runHook postInstall
+  '';
+
+  enableParallelBuilding = true;
+
+  makeFlags = [
+    "ARCHS=${
+      if stdenv.isx86_64 then
+        "x86_64"
+      else if stdenv.isAarch64 then
+        "arm64"
+      else
+        abort "unsupported system: ${stdenv.system}"
+    }"
+  ];
+
+  meta = {
+    description = "TUI for drag-and-drop manipulation of git commits";
+    homepage = "https://toaster.llc/debase";
+    # The author has not yet specified a license.
+    # See https://github.com/toasterllc/debase/pull/4
+    license = lib.licenses.publicDomain;
+    mainProgram = "debase";
+    maintainers = with lib.maintainers; [
+      jeremyschlatter
+      aleksana
+    ];
+    platforms = [
+      # Only these systems are supported by Makefile
+      "x86_64-linux"
+      "x86_64-darwin"
+      "aarch64-linux"
+      "aarch64-darwin"
+    ];
+  };
+}
--- a/pkgs/by-name/fr/friture/package.nix
+++ b/pkgs/by-name/fr/friture/package.nix
@ -7,20 +7,18 @@

 python3Packages.buildPythonApplication rec {
  pname = "friture";
-  version = "0.49-unstable-2024-06-02";
+  version = "0.51";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "tlecomte";
-    repo = pname;
-    rev = "405bffa585ece0cb535c32d0f4f6ace932b40103";
-    hash = "sha256-4xvIlRuJ7WCFj1dEyvO9UOsye70nFlWjb9XU0owwgiM=";
+    repo = "friture";
+    rev = "v${version}";
+    hash = "sha256-1Swkk7bhQTSo17Gj0i1VNiIt+fSXgDIeWfJ9LpoUEHg=";
  };

-  pythonRelaxDeps = true;
-
  postPatch = ''
-    sed -i -e '/packages=\[/a "friture.playback",' pyproject.toml
+    sed -i -e 's/==.*"/"/' -e '/packages=\[/a "friture.playback",' pyproject.toml
  '';

  nativeBuildInputs =
--- a/pkgs/by-name/ge/geo/package.nix
+++ b/pkgs/by-name/ge/geo/package.nix
@ -0,0 +1,50 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+  testers,
+  geo,
+}:
+
+buildGoModule rec {
+  pname = "geo";
+  version = "1.1";
+
+  src = fetchFromGitHub {
+    owner = "MetaCubeX";
+    repo = "geo";
+    rev = "v${version}";
+    hash = "sha256-lwFBevf3iP90LgnfUqweCjPBJPr2vMFtRqQXXUC+cRA=";
+  };
+
+  postPatch = ''
+    substituteInPlace constant.go \
+      --replace-fail 'Version = "0.1"' 'Version = "${version}"'
+  '';
+
+  vendorHash = "sha256-FXvuojlMZRzi8TIQ2aPiDH7F9c+2dpe4PYzYWljfUIc=";
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { };
+    tests.version = testers.testVersion {
+      package = geo;
+      command = "${lib.getExe geo} --help";
+      version = "v${version}";
+    };
+  };
+
+  meta = {
+    description = "Easy way to manage all your Geo resources";
+    homepage = "https://github.com/MetaCubeX/geo";
+    changelog = "https://github.com/MetaCubeX/geo/releases/tag/v${version}";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ oluceps ];
+    mainProgram = "geo";
+  };
+}
--- a/pkgs/by-name/mo/motoc/Cargo.lock
+++ b/pkgs/by-name/mo/motoc/Cargo.lock
--- a/pkgs/by-name/mo/motoc/package.nix
+++ b/pkgs/by-name/mo/motoc/package.nix
@ -0,0 +1,42 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  openxr-loader,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "motoc";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "galister";
+    repo = "motoc";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-7p25F2bRba3LxS8UAkHvhb+GyOsKUMj7bhiK5ZJ0Jkk=";
+  };
+
+  cargoLock = {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "libmonado-rs-0.1.0" = "sha256-bbbo/Mkix6nUGLwplvj6m8IXOcZY5UoWc1xZnI67IlU=";
+      "openxr-0.19.0" = "sha256-kbEYoN4UvUEaZA9LJWEKx1X1r+l91GjTWs1hNXhr7cw=";
+    };
+  };
+
+  buildInputs = [
+    openxr-loader
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "MOnado Tracking Origin Calibration program";
+    homepage = "https://github.com/galister/motoc";
+    changelog = "https://github.com/galister/motoc/releases";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ pandapip1 ];
+    mainProgram = "motoc";
+  };
+}
--- a/pkgs/by-name/nw/nwg-clipman/package.nix
+++ b/pkgs/by-name/nw/nwg-clipman/package.nix
@ -0,0 +1,68 @@
+{
+  lib,
+  fetchFromGitHub,
+  python3Packages,
+  gobject-introspection,
+  wrapGAppsHook3,
+  gtk-layer-shell,
+  gtk3,
+  wl-clipboard,
+  cliphist,
+  nix-update-script,
+}:
+
+python3Packages.buildPythonPackage rec {
+  pname = "nwg-clipman";
+  version = "0.2.3";
+
+  src = fetchFromGitHub {
+    owner = "nwg-piotr";
+    repo = "nwg-clipman";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-qpI/yg7yBSwcgpv6lOBysxxsX0pI+ixZghkm+U6XIrs=";
+  };
+
+  build-system = [ python3Packages.setuptools ];
+
+  nativeBuildInputs = [
+    gobject-introspection
+    wrapGAppsHook3
+  ];
+
+  dontWrapGApps = true;
+
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
+  buildInputs = [
+    gtk-layer-shell
+    gtk3
+  ];
+
+  dependencies = with python3Packages; [ pygobject3 ];
+
+  nativeCheckInputs = [
+    wl-clipboard
+    cliphist
+  ];
+
+  postInstall = ''
+    install -Dm644 nwg-clipman.desktop -t $out/share/applications/
+    install -Dm644 nwg-clipman.svg -t $out/share/pixmaps/
+  '';
+
+  strictDeps = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "GTK3-based GUI for cliphist";
+    homepage = "https://github.com/nwg-piotr/nwg-clipman";
+    changelog = "https://github.com/nwg-piotr/nwg-clipman/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ averyanalex ];
+    platforms = lib.platforms.linux;
+    mainProgram = "nwg-clipman";
+  };
+}
--- a/pkgs/by-name/om/omekasy/package.nix
+++ b/pkgs/by-name/om/omekasy/package.nix
@ -0,0 +1,29 @@
+{
+  stdenv,
+  rustPlatform,
+  fetchFromGitHub,
+  lib,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "omekasy";
+  version = "1.2.3";
+
+  src = fetchFromGitHub {
+    owner = "ikanago";
+    repo = "omekasy";
+    rev = "v${version}";
+    hash = "sha256-oPhO+gRWrwgABc+gGXnIC519F5XVvewUHo2y54RoE4U=";
+  };
+
+  cargoHash = "sha256-6GjNn7FAcAihqNhPD18sUFe40ZQwXmFEQmoZNZL2trQ=";
+
+  buildNoDefaultFeatures = stdenv.targetPlatform.isWasi;
+
+  meta = {
+    description = "Command line application that converts alphanumeric characters to various styles defined in Unicode";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jcaesar ];
+    homepage = "https://github.com/ikanago/omekasy";
+    mainProgram = "omekasy";
+  };
+}
--- a/pkgs/by-name/re/revpfw3/package.nix
+++ b/pkgs/by-name/re/revpfw3/package.nix
@ -0,0 +1,25 @@
+{
+  lib,
+  fetchgit,
+  rustPlatform,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "revpfw3";
+  version = "0.4.0";
+
+  src = fetchgit {
+    url = "https://git.tudbut.de/tudbut/revpfw3";
+    rev = "v${version}";
+    hash = "sha256-v8BtgQYdELui5Yu8kpE5f97MSo/WhNah+e1xXhZGJwM=";
+  };
+
+  cargoHash = "sha256-0AVp6fQq/NCkvKcK5ALbFNxNkt0NgbOmGlmDBGxwONQ=";
+
+  meta = {
+    description = "Reverse proxy to bypass the need for port forwarding";
+    homepage = "https://git.tudbut.de/tudbut/revpfw3";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ tudbut ];
+    mainProgram = "revpfw3";
+  };
+}
--- a/pkgs/by-name/sn/sniffglue/package.nix
+++ b/pkgs/by-name/sn/sniffglue/package.nix
@ -9,16 +9,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "sniffglue";
-  version = "0.16.0";
+  version = "0.16.1";

  src = fetchFromGitHub {
    owner = "kpcyrd";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-MOw0WBdpo6dYXsjbUrqoIJl/sjQ4wSAcm4dPxDgTYgY=";
+    hash = "sha256-Pp/SJJQFpEU/4GKZQB8BjRGS4hqB850QbSb5WoG6Wh4=";
  };

-  cargoHash = "sha256-vnfviiXJ4L/j5M3N+LegOIvLuD6vYJB1QeBgZJVfDnI=";
+  cargoHash = "sha256-/MGrdo8cmodC3oVWk6y8C73gsLKROmNOI9aytPPzA8o=";

  nativeBuildInputs = [ pkg-config ];

--- a/pkgs/by-name/te/termpaint/0001-meson.build-use-prefix.patch
+++ b/pkgs/by-name/te/termpaint/0001-meson.build-use-prefix.patch
@ -0,0 +1,25 @@
+From 6275687b748bed9a6148164b085b82840b5e09c6 Mon Sep 17 00:00:00 2001
+From: laalsaas <laalsaas@systemli.org>
+Date: Sun, 18 Aug 2024 11:59:13 +0200
+Subject: [PATCH] meson.build: use-prefix
+
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 8a0c39c..5eb2435 100644
+--- a/meson.build
+++ b/meson.build
+@@ -111,7 +111,7 @@ main_lib_files = [
+ ]
+ 
+ main_lib_cargs += '-DTERMPAINT_RESCUE_EMBEDDED'
+-main_lib_cargs += '-DTERMPAINT_RESCUE_PATH="@0@"'.format(get_option('ttyrescue-path'))
+main_lib_cargs += '-DTERMPAINT_RESCUE_PATH="@0@"'.format(get_option('prefix') / get_option('ttyrescue-path'))
+ main_lib = library('termpaint', main_lib_files,
+   dependencies: lib_rt,
+   c_args: main_lib_cargs,
+-- 
+2.45.1
+
--- a/pkgs/by-name/te/termpaint/package.nix
+++ b/pkgs/by-name/te/termpaint/package.nix
@ -0,0 +1,50 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  meson,
+  ninja,
+  cmake,
+  pkg-config,
+  python3,
+}:
+stdenv.mkDerivation (final: {
+  name = "termpaint";
+  version = "0.3.0";
+
+  src = fetchFromGitHub {
+    owner = "termpaint";
+    repo = "termpaint";
+    rev = final.version;
+    hash = "sha256-AsbUJjz51pedmemI0racMgWRzpbIeNJrK/walFUniR4=";
+  };
+
+  patches = [ ./0001-meson.build-use-prefix.patch ];
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    python3
+  ];
+
+  mesonFlags = [
+    "-Dttyrescue-fexec-blob=false"
+    "-Dtools-path=libexec/"
+    "-Dttyrescue-path=libexec/"
+    "-Dttyrescue-install=true"
+  ];
+
+  doCheck = true;
+
+  meta = {
+    description = "Low level terminal interface library";
+    homepage = "https://github.com/termpaint/termpaint";
+    platforms = lib.platforms.unix;
+    license = lib.licenses.boost;
+    maintainers = with lib.maintainers; [
+      istoph
+      textshell
+    ];
+  };
+})
--- a/pkgs/development/php-packages/opentelemetry/default.nix
+++ b/pkgs/development/php-packages/opentelemetry/default.nix
@ -5,7 +5,7 @@
 }:

 let
-  version = "1.0.3";
+  version = "1.1.0beta2";
 in
 buildPecl rec {
  inherit version;
@ -15,7 +15,7 @@ buildPecl rec {
    owner = "open-telemetry";
    repo = "opentelemetry-php-instrumentation";
    rev = version;
-    hash = "sha256-KqLbKnAHxXbldNYVN7eMQ7NdZmPecu0UKHQdlUm7Ur0=";
+    hash = "sha256-gZby9wr5FN5mNG9YNVqQFYloxd4ws91Mz6IPn5OAGjs=";
  };

  sourceRoot = "${src.name}/ext";
--- a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix
+++ b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix
@ -5,6 +5,7 @@
  langgraph-checkpoint,
  orjson,
  psycopg,
+  psycopg-pool,
  langgraph-sdk,
  poetry-core,
  pythonOlder,
@ -12,11 +13,12 @@
  postgresqlTestHook,
  pytestCheckHook,
  pytest-asyncio,
+  stdenvNoCC,
 }:

 buildPythonPackage rec {
  pname = "langgraph-checkpoint-postgres";
-  version = "1.0.3";
+  version = "1.0.6";
  pyproject = true;

  disabled = pythonOlder "3.10";
@ -25,7 +27,7 @@ buildPythonPackage rec {
    owner = "langchain-ai";
    repo = "langgraph";
    rev = "refs/tags/checkpointpostgres==${version}";
-    hash = "sha256-U7Bymo+Nj82kwjxN33W2MT10jv+lioZUxIKUt8Yxh/s=";
+    hash = "sha256-F9sgZQQBFs5hDUsaR5BI9ERve9L8LTUvEKOgyz5ioqY=";
  };

  postgresqlTestSetupPost = ''
@ -41,8 +43,13 @@ buildPythonPackage rec {
    langgraph-checkpoint
    orjson
    psycopg
+    psycopg-pool
  ];

+  pythonRelaxDeps = [ "psycopg-pool" ];
+
+  doCheck = !(stdenvNoCC.isDarwin);
+
  pythonImportsCheck = [ "langgraph.checkpoint.postgres" ];

  nativeCheckInputs = [
--- a/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix
+++ b/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix
@ -13,7 +13,7 @@

 buildPythonPackage rec {
  pname = "langgraph-checkpoint-sqlite";
-  version = "1.0.0";
+  version = "1.0.2";
  pyproject = true;

  disabled = pythonOlder "3.9";
--- a/pkgs/development/python-modules/langgraph-checkpoint/default.nix
+++ b/pkgs/development/python-modules/langgraph-checkpoint/default.nix
@ -4,6 +4,7 @@
  dataclasses-json,
  fetchFromGitHub,
  langchain-core,
+  langgraph-sdk,
  poetry-core,
  pytest-asyncio,
  pytestCheckHook,
@ -12,7 +13,7 @@

 buildPythonPackage rec {
  pname = "langgraph-checkpoint";
-  version = "1.0.3";
+  version = "1.0.9";
  pyproject = true;

  disabled = pythonOlder "3.9";
@ -21,7 +22,7 @@ buildPythonPackage rec {
    owner = "langchain-ai";
    repo = "langgraph";
    rev = "refs/tags/checkpoint==${version}";
-    hash = "sha256-5JP9f2uHNo71btQ96sBPlS7JPqo35C3VEMeHN1cJSro=";
+    hash = "sha256-3gm+L67pPAKpY1kqnX1lPnca40KoBVZdRZ1Cy6D0dzU=";
  };

  sourceRoot = "${src.name}/libs/checkpoint";
@ -38,6 +39,10 @@ buildPythonPackage rec {
    pytestCheckHook
  ];

+  passthru = {
+    updateScript = langgraph-sdk.updateScript;
+  };
+
  meta = {
    changelog = "https://github.com/langchain-ai/langgraph/releases/tag/checkpoint==${version}";
    description = "Library with base interfaces for LangGraph checkpoint savers";
--- a/pkgs/development/python-modules/langgraph-sdk/default.nix
+++ b/pkgs/development/python-modules/langgraph-sdk/default.nix
@ -48,6 +48,9 @@ buildPythonPackage rec {
      set -eu -o pipefail
      nix-update --commit --version-regex '(.*)' python3Packages.langgraph
      nix-update --commit --version-regex 'sdk==(.*)' python3Packages.langgraph-sdk
+      nix-update --commit --version-regex 'checkpoint==(.*)' python3Packages.langgraph-checkpoint
+      nix-update --commit --version-regex 'checkpointpostgres==(.*)' python3Packages.langgraph-checkpoint-postgres
+      nix-update --commit --version-regex 'checkpointsqlite==(.*)' python3Packages.langgraph-checkpoint-sqlite
    '';
  };

--- a/pkgs/development/python-modules/nbconflux/default.nix
+++ b/pkgs/development/python-modules/nbconflux/default.nix
@ -2,27 +2,32 @@
  lib,
  buildPythonPackage,
  fetchFromGitHub,
-  isPy27,
  nbconvert,
  pytestCheckHook,
  requests,
  responses,
+  setuptools,
+  versioneer,
 }:

 buildPythonPackage rec {
  pname = "nbconflux";
  version = "0.7.0";
-  format = "setuptools";
-  disabled = isPy27; # no longer compatible with python 2 urllib
+  pyproject = true;

  src = fetchFromGitHub {
-    owner = "Valassis-Digital-Media";
+    owner = "vericast";
    repo = "nbconflux";
    rev = "refs/tags/${version}";
    hash = "sha256-kHIuboFKLVsu5zlZ0bM1BUoQR8f1l0XWcaaVI9bECJw=";
  };

-  propagatedBuildInputs = [
+  build-system = [
+    setuptools
+    versioneer
+  ];
+
+  dependencies = [
    nbconvert
    requests
  ];
@ -37,6 +42,11 @@ buildPythonPackage rec {
    ./setup-py.patch
  ];

+  postPatch = ''
+    # remove vendorized versioneer.py
+    rm versioneer.py
+  '';
+
  JUPYTER_PATH = "${nbconvert}/share/jupyter";
  disabledTests = [
    "test_post_to_confluence"
--- a/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix
+++ b/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix
@ -49,7 +49,7 @@ buildPythonPackage rec {

  pythonImportsCheck = [ "qcodes_contrib_drivers" ];

-  disabledTests = lib.optionals (stdenv.hostPlatform.system == "x86_64-darwin") [
+  disabledTests = lib.optionals (stdenv.isDarwin) [
    # At index 13 diff: 'sour6:volt 0.29000000000000004' != 'sour6:volt 0.29'
    "test_stability_diagram_external"
  ];
--- a/pkgs/development/python-modules/quantities/default.nix
+++ b/pkgs/development/python-modules/quantities/default.nix
@ -1,7 +1,8 @@
 {
  lib,
  buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
+  fetchpatch2,
  numpy,
  pytestCheckHook,
  pythonOlder,
@ -12,21 +13,31 @@
 buildPythonPackage rec {
  pname = "quantities";
  version = "0.15.0";
-  format = "setuptools";
+  pyproject = true;

  disabled = pythonOlder "3.8";

-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-nqMeKg11F88k1UaxQUbe+SkmOZk6YWzKYbh173lrSys=";
+  src = fetchFromGitHub {
+    owner = "python-quantities";
+    repo = "python-quantities";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-N20xfzGtM0VnfkJtzMytNLySTkgVz2xf1nEJxlwBSCI=";
  };

-  nativeBuildInputs = [
+  patches = [
+    (fetchpatch2 {
+      name = "prevent-arbitrary-code-eval.patch";
+      url = "https://github.com/python-quantities/python-quantities/pull/236.patch";
+      hash = "sha256-H1tOfXqNMIKY01m6o2PsfZG0CvnWNxW2qIWA5ce1lRk=";
+    })
+  ];
+
+  build-system = [
    setuptools
    setuptools-scm
  ];

-  propagatedBuildInputs = [ numpy ];
+  dependencies = [ numpy ];

  nativeCheckInputs = [ pytestCheckHook ];

--- a/pkgs/development/python-modules/ray/binary-hashes.nix
+++ b/pkgs/development/python-modules/ray/binary-hashes.nix
@ -1,11 +1,11 @@
 {
  cp310 = {
-    hash = "sha256-dnFaktwQ1/CQvftJD25tSXzI0hLaeBdNDeUWunAhzuQ=";
+    hash = "sha256-GZSq+Zlv/EUBmFZUXoF9UnrVcnYvGvdq1mmuTnhvz9Y=";
  };
  cp311 = {
-    hash = "sha256-tgjWhlYAy9NRaIKhm7O3E7bxYbFQzh7jHZIITQlAi5o=";
+    hash = "sha256-WHr1cMvl9s7cqFTxUQd0DmPGcge+6QBxPLLuOPbr8g8=";
  };
  cp312 = {
-    hash = "sha256-rqrFzgZXKxWUfJlbbWWmyHBqGyM27r7VuY6Qc/6Uq+A=";
+    hash = "sha256-LKGg3kHURi/XZFmKWYHPVfyVVZnzj5oa4Qho6Uxt2A0=";
  };
 }
--- a/pkgs/development/python-modules/ray/default.nix
+++ b/pkgs/development/python-modules/ray/default.nix
@ -56,7 +56,7 @@

 let
  pname = "ray";
-  version = "2.34.0";
+  version = "2.35.0";
 in
 buildPythonPackage rec {
  inherit pname version;
--- a/pkgs/development/python-modules/skops/default.nix
+++ b/pkgs/development/python-modules/skops/default.nix
@ -10,6 +10,7 @@
  matplotlib,
  pandas,
  scikit-learn,
+  stdenv,
  streamlit,
  tabulate,
 }:
@ -44,12 +45,17 @@ buildPythonPackage rec {
    streamlit
  ];
  pytestFlagsArray = [ "skops" ];
-  disabledTestPaths = [
+  disabledTestPaths =
+    [
      # try to download data from Huggingface Hub:
      "skops/hub_utils/tests"
      "skops/card/tests"
      # minor output formatting issue
      "skops/card/_model_card.py"
+    ]
+    ++ lib.optionals stdenv.isDarwin [
+      # Segfaults on darwin
+      "skops/io/tests/test_persist.py"
    ];

  pythonImportsCheck = [ "skops" ];
--- a/pkgs/tools/text/ripgrep/default.nix
+++ b/pkgs/tools/text/ripgrep/default.nix
@ -14,16 +14,16 @@ let
  rg = "${stdenv.hostPlatform.emulator buildPackages} $out/bin/rg";
 in rustPlatform.buildRustPackage rec {
  pname = "ripgrep";
-  version = "14.1.0";
+  version = "14.1.1";

  src = fetchFromGitHub {
    owner = "BurntSushi";
    repo = pname;
    rev = version;
-    hash = "sha256-CBU1GzgWMPTVsgaPMy39VRcENw5iWRUrRpjyuGiZpPI=";
+    hash = "sha256-gyWnahj1A+iXUQlQ1O1H1u7K5euYQOld9qWm99Vjaeg=";
  };

-  cargoHash = "sha256-8FxN5MhYduMkzym7Xx4dnVbWaBKv9pgbXMIRGiRRQew=";
+  cargoHash = "sha256-b+iA8iTYWlczBpNq9eyHrWG8LMU4WPBzaU6pQRht+yE=";

  nativeBuildInputs = [ installShellFiles ]
    ++ lib.optional withPCRE2 pkg-config;
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -2153,6 +2153,10 @@ with pkgs;

  delta = darwin.apple_sdk_11_0.callPackage ../applications/version-management/delta { };

+  debase = callPackage ../by-name/de/debase/package.nix {
+    stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
+  };
+
  diff-so-fancy = callPackage ../applications/version-management/diff-so-fancy { };

  forgejo-lts = callPackage ../by-name/fo/forgejo/lts.nix { };
@ -26918,7 +26922,6 @@ with pkgs;
  qemu_xen_4_19 = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xenPackages.xen_4_19-slim; });
  qemu_xen_4_18 = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xenPackages.xen_4_18-slim; });
  qemu_xen_4_17 = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xenPackages.xen_4_17-slim; });
-  qemu_xen_4_16 = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xenPackages.xen_4_16-slim; });
  qemu_xen = qemu_xen_4_19;

  qemu_test = lowPrio (qemu.override { hostCpuOnly = true; nixosTestRunner = true; });