Merge master into staging-next

2024-06-05 12:01:21 +00:00 · 2024-06-05 12:01:21 +00:00 · f1f4d07f90
commit f1f4d07f90
parent ddc356c1f0 22b57baf09
62 changed files with 624 additions and 1072 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -15212,6 +15212,12 @@
    githubId = 30825096;
    name = "Ning Zhang";
  };
+  o0th = {
+    email = "o0th@pm.me";
+    name = "Sabato Luca Guadagno";
+    github = "o0th";
+    githubId = 22490354;
+  };
  oaksoaj = {
    email = "oaksoaj@riseup.net";
    name = "Oaksoaj";
--- a/nixos/doc/manual/development/bootspec.chapter.md
+++ b/nixos/doc/manual/development/bootspec.chapter.md
@ -1,17 +1,17 @@
-# Experimental feature: Bootspec {#sec-experimental-bootspec}
+# Bootspec {#sec-bootspec}

-Bootspec is a experimental feature, introduced in the [RFC-0125 proposal](https://github.com/NixOS/rfcs/pull/125), the reference implementation can be found [there](https://github.com/NixOS/nixpkgs/pull/172237) in order to standardize bootloader support
-and advanced boot workflows such as SecureBoot and potentially more.
+Bootspec is a feature introduced in [RFC-0125](https://github.com/NixOS/rfcs/pull/125) in order to standardize bootloader support and advanced boot workflows such as SecureBoot and potentially more.
+The reference implementation can be found [here](https://github.com/NixOS/nixpkgs/pull/172237).

-You can enable the creation of bootspec documents through [`boot.bootspec.enable = true`](options.html#opt-boot.bootspec.enable), which will prompt a warning until [RFC-0125](https://github.com/NixOS/rfcs/pull/125) is officially merged.
+The creation of bootspec documents is enabled by default.

-## Schema {#sec-experimental-bootspec-schema}
+## Schema {#sec-bootspec-schema}

 The bootspec schema is versioned and validated against [a CUE schema file](https://cuelang.org/) which should considered as the source of truth for your applications.

 You will find the current version [here](../../../modules/system/activation/bootspec.cue).

-## Extensions mechanism {#sec-experimental-bootspec-extensions}
+## Extensions mechanism {#sec-bootspec-extensions}

 Bootspec cannot account for all usecases.

@ -29,8 +29,9 @@ An example for SecureBoot is to get the Nix store path to `/etc/os-release` in o

 To reduce incompatibility and prevent names from clashing between applications, it is **highly recommended** to use a unique namespace for your extensions.

-## External bootloaders {#sec-experimental-bootspec-external-bootloaders}
+## External bootloaders {#sec-bootspec-external-bootloaders}

 It is possible to enable your own bootloader through [`boot.loader.external.installHook`](options.html#opt-boot.loader.external.installHook) which can wrap an existing bootloader.

-Currently, there is no good story to compose existing bootloaders to enrich their features, e.g. SecureBoot, etc. It will be necessary to reimplement or reuse existing parts.
+Currently, there is no good story to compose existing bootloaders to enrich their features, e.g. SecureBoot, etc.
+It will be necessary to reimplement or reuse existing parts.
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@ -8,12 +8,17 @@

 ## New Services {#sec-release-24.11-new-services}

- Create the first release note entry in this section!
+- [Open-WebUI](https://github.com/open-webui/open-webui), a user-friendly WebUI
+  for LLMs. Available as [services.open-webui](#opt-services.open-webui.enable)
+  service.

 ## Backward Incompatibilities {#sec-release-24.11-incompatibilities}

 - `nginx` package no longer includes `gd` and `geoip` dependencies. For enabling it, override `nginx` package with the optionals `withImageFilter` and `withGeoIP`.

+- `openssh` and `openssh_hpn` are now compiled without Kerberos 5 / GSSAPI support in an effort to reduce the attack surface of the components for the majority of users. Users needing this support can
+  use the new `opensshWithKerberos` and `openssh_hpnWithKerberos` flavors (e.g. `programs.ssh.package = pkgs.openssh_gssapi`).
+
 - `nvimpager` was updated to version 0.13.0, which changes the order of user and
  nvimpager settings: user commands in `-c` and `--cmd` now override the
  respective default settings because they are executed later.
--- a/nixos/modules/programs/wayland/hyprland.nix
+++ b/nixos/modules/programs/wayland/hyprland.nix
@ -69,7 +69,8 @@ in

    (import ./wayland-session.nix {
      inherit lib pkgs;
-      xwayland = cfg.xwayland.enable;
+      enableXWayland = cfg.xwayland.enable;
+      enableWlrPortal = false; # Hyprland has its own portal, wlr is not needed
    })
  ]);

@ -87,4 +88,6 @@ in
      "Nvidia patches are no longer needed"
    )
  ];
+
+  meta.maintainers = with lib.maintainers; [ fufexan ];
 }
--- a/nixos/modules/programs/wayland/river.nix
+++ b/nixos/modules/programs/wayland/river.nix
@ -57,7 +57,7 @@ in

    (import ./wayland-session.nix {
      inherit lib pkgs;
-      xwayland = cfg.xwayland.enable;
+      enableXWayland = cfg.xwayland.enable;
    })
  ]);

--- a/nixos/modules/programs/wayland/sway.nix
+++ b/nixos/modules/programs/wayland/sway.nix
@ -140,7 +140,7 @@ in

    (import ./wayland-session.nix {
      inherit lib pkgs;
-      xwayland = cfg.xwayland.enable;
+      enableXWayland = cfg.xwayland.enable;
    })
  ]);

--- a/nixos/modules/programs/wayland/wayland-session.nix
+++ b/nixos/modules/programs/wayland/wayland-session.nix
@ -1,4 +1,9 @@
-{ lib, pkgs, xwayland ? true }:
+{
+  lib,
+  pkgs,
+  enableXWayland ? true,
+  enableWlrPortal ? true,
+}:

 {
  security = {
@ -11,8 +16,12 @@

  programs = {
    dconf.enable = lib.mkDefault true;
-    xwayland.enable = lib.mkDefault xwayland;
+    xwayland.enable = lib.mkDefault enableXWayland;
  };

-  xdg.portal.wlr.enable = lib.mkDefault true;
+  xdg.portal.wlr.enable = enableWlrPortal;
+
+  # Window manager only sessions (unlike DEs) don't handle XDG
+  # autostart files, so force them to run the service
+  services.xserver.desktopManager.runXdgAutostartIfNone = lib.mkDefault true;
 }
--- a/nixos/modules/services/misc/ollama.nix
+++ b/nixos/modules/services/misc/ollama.nix
@ -78,11 +78,11 @@ in
        '';
      };
      port = lib.mkOption {
-        type = types.nullOr types.ints.u16;
+        type = types.port;
        default = 11434;
        example = 11111;
        description = ''
-          Which port the ollama server listens to. Set to `null` to not specify a port.
+          Which port the ollama server listens to.
        '';
      };
      acceleration = lib.mkOption {
@ -116,6 +116,14 @@ in
          Since `ollama run` is mostly a shell around the ollama server, this is usually sufficient.
        '';
      };
+      openFirewall = lib.mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to open the firewall for ollama.
+          This adds `services.ollama.port` to `networking.firewall.allowedTCPPorts`.
+        '';
+      };
    };
  };

@ -127,11 +135,7 @@ in
      environment = cfg.environmentVariables // {
        HOME = cfg.home;
        OLLAMA_MODELS = cfg.models;
-        OLLAMA_HOST =
-          if cfg.port == null then
-            cfg.host
-          else
-            "${cfg.host}:${toString cfg.port}";
+        OLLAMA_HOST = "${cfg.host}:${toString cfg.port}";
      };
      serviceConfig = {
        ExecStart = "${lib.getExe ollamaPackage} serve";
@ -142,6 +146,8 @@ in
      };
    };

+    networking.firewall = lib.mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.port ]; };
+
    environment.systemPackages = [ ollamaPackage ];
  };

--- a/nixos/modules/services/misc/open-webui.nix
+++ b/nixos/modules/services/misc/open-webui.nix
@ -12,55 +12,71 @@ in
 {
  options = {
    services.open-webui = {
-      enable = lib.mkEnableOption "Enable open-webui, an interactive chat web app";
+      enable = lib.mkEnableOption "Open-WebUI server";
      package = lib.mkPackageOption pkgs "open-webui" { };

      stateDir = lib.mkOption {
        type = types.path;
        default = "/var/lib/open-webui";
-        description = "State directory of open-webui.";
+        example = "/home/foo";
+        description = "State directory of Open-WebUI.";
      };

      host = lib.mkOption {
        type = types.str;
-        default = "localhost";
-        description = "Host of open-webui";
+        default = "127.0.0.1";
+        example = "0.0.0.0";
+        description = ''
+          The host address which the Open-WebUI server HTTP interface listens to.
+        '';
      };

      port = lib.mkOption {
        type = types.port;
        default = 8080;
-        description = "Port of open-webui";
+        example = 11111;
+        description = ''
+          Which port the Open-WebUI server listens to.
+        '';
      };

      environment = lib.mkOption {
        type = types.attrsOf types.str;
-        default = { };
+        default = {
+          SCARF_NO_ANALYTICS = "True";
+          DO_NOT_TRACK = "True";
+          ANONYMIZED_TELEMETRY = "False";
+        };
        example = ''
          {
-            OLLAMA_API_BASE_URL = "http://localhost:11434";
+            OLLAMA_API_BASE_URL = "http://127.0.0.1:11434";
            # Disable authentication
            WEBUI_AUTH = "False";
          }
        '';
-        description = "Extra environment variables for open-webui";
+        description = "Extra environment variables for Open-WebUI";
+      };
+
+      openFirewall = lib.mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to open the firewall for Open-WebUI.
+          This adds `services.open-webui.port` to `networking.firewall.allowedTCPPorts`.
+        '';
      };
    };
  };

  config = lib.mkIf cfg.enable {
    systemd.services.open-webui = {
-      description = "User-friendly WebUI for LLMs (Formerly Ollama WebUI)";
+      description = "User-friendly WebUI for LLMs";
      wantedBy = [ "multi-user.target" ];
      after = [ "network.target" ];

-      preStart = ''
-        mkdir -p ${cfg.stateDir}/static
-      '';
-
      environment = {
-        STATIC_DIR = "${cfg.stateDir}/static";
-        DATA_DIR = "${cfg.stateDir}";
+        STATIC_DIR = ".";
+        DATA_DIR = ".";
      } // cfg.environment;

      serviceConfig = {
@ -88,6 +104,8 @@ in
        UMask = "0077";
      };
    };
+
+    networking.firewall = lib.mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.port ]; };
  };

  meta.maintainers = with lib.maintainers; [ shivaraj-bh ];
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@ -715,6 +715,10 @@ in

    assertions = [{ assertion = if cfg.settings.X11Forwarding then cfgc.setXAuthLocation else true;
                    message = "cannot enable X11 forwarding without setting xauth location";}
+                  { assertion = (builtins.match "(.*\n)?(\t )*[Kk][Ee][Rr][Bb][Ee][Rr][Oo][Ss][Aa][Uu][Tt][Hh][Ee][Nn][Tt][Ii][Cc][Aa][Tt][Ii][Oo][Nn][ |\t|=|\"]+yes.*" "${configFile}\n${cfg.extraConfig}") != null -> cfgc.package.withKerberos;
+                    message = "cannot enable Kerberos authentication without using a package with Kerberos support";}
+                  { assertion = (builtins.match "(.*\n)?(\t )*[Gg][Ss][Ss][Aa][Pp][Ii][Aa][Uu][Tt][Hh][Ee][Nn][Tt][Ii][Cc][Aa][Tt][Ii][Oo][Nn][ |\t|=|\"]+yes.*" "${configFile}\n${cfg.extraConfig}") != null -> cfgc.package.withKerberos;
+                    message = "cannot enable GSSAPI authentication without using a package with Kerberos support";}
                  (let
                    duplicates =
                      # Filter out the groups with more than 1 element
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@ -503,8 +503,8 @@ in
    environment.systemPackages = [ cfg.package ];

    environment.etc = let
-      # generate contents for /etc/systemd/system-${type} from attrset of links and packages
-      hooks = type: links: pkgs.runCommand "system-${type}" {
+      # generate contents for /etc/systemd/${dir} from attrset of links and packages
+      hooks = dir: links: pkgs.runCommand "${dir}" {
          preferLocalBuild = true;
          packages = cfg.packages;
      } ''
@ -512,7 +512,7 @@ in
        mkdir -p $out
        for package in $packages
        do
-          for hook in $package/lib/systemd/system-${type}/*
+          for hook in $package/lib/systemd/${dir}/*
          do
            ln -s $hook $out/
          done
@ -562,8 +562,9 @@ in
        ${cfg.sleep.extraConfig}
      '';

-      "systemd/system-generators" = { source = hooks "generators" cfg.generators; };
-      "systemd/system-shutdown" = { source = hooks "shutdown" cfg.shutdown; };
+      "systemd/user-generators" = { source = hooks "user-generators" cfg.user.generators; };
+      "systemd/system-generators" = { source = hooks "system-generators" cfg.generators; };
+      "systemd/system-shutdown" = { source = hooks "system-shutdown" cfg.shutdown; };
    });

    services.dbus.enable = true;
--- a/nixos/modules/system/boot/systemd/user.nix
+++ b/nixos/modules/system/boot/systemd/user.nix
@ -144,6 +144,18 @@ in {
      };
    };

+    systemd.user.generators = mkOption {
+      type = types.attrsOf types.path;
+      default = {};
+      example = { systemd-gpt-auto-generator = "/dev/null"; };
+      description = ''
+        Definition of systemd generators; see {manpage}`systemd.generator(5)`.
+
+        For each `NAME = VALUE` pair of the attrSet, a link is generated from
+        `/etc/systemd/user-generators/NAME` to `VALUE`.
+      '';
+    };
+
    systemd.additionalUpstreamUserUnits = mkOption {
      default = [];
      type = types.listOf types.str;
--- a/nixos/tests/podman/default.nix
+++ b/nixos/tests/podman/default.nix
@ -1,5 +1,22 @@
 import ../make-test-python.nix (
-  { pkgs, lib, ... }: {
+  { pkgs, lib, ... }:
+  let
+    quadletContainerFile = pkgs.writeText "quadlet.container" ''
+      [Unit]
+      Description=A test quadlet container
+
+      [Container]
+      Image=localhost/scratchimg:latest
+      Exec=bash -c 'trap exit SIGTERM SIGINT; while true; do sleep 1; done'
+      ContainerName=quadlet
+      Volume=/nix/store:/nix/store
+      Volume=/run/current-system/sw/bin:/bin
+
+      [Install]
+      WantedBy=default.target
+    '';
+  in
+  {
    name = "podman";
    meta = {
      maintainers = lib.teams.podman.members;
@ -174,6 +191,16 @@ import ../make-test-python.nix (
      with subtest("A podman non-member can not use the docker cli"):
          docker.fail(su_cmd("docker version", user="mallory"))

+      with subtest("A rootless quadlet container service is created"):
+          dir = "/home/alice/.config/containers/systemd"
+          rootless.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg"))
+          rootless.succeed(su_cmd(f"mkdir -p {dir}"))
+          rootless.succeed(su_cmd(f"cp -f ${quadletContainerFile} {dir}/quadlet.container"))
+          rootless.systemctl("daemon-reload", "alice")
+          rootless.systemctl("start quadlet", "alice")
+          rootless.wait_until_succeeds(su_cmd("podman ps | grep quadlet"), timeout=20)
+          rootless.systemctl("stop quadlet", "alice")
+
      # TODO: add docker-compose test

    '';
--- a/pkgs/applications/misc/fetchmail/default.nix
+++ b/pkgs/applications/misc/fetchmail/default.nix
@ -26,5 +26,6 @@ stdenv.mkDerivation rec {
    '';
    platforms = platforms.unix;
    license = licenses.gpl2Plus;
+    mainProgram = "fetchmail";
  };
 }
--- a/pkgs/applications/misc/ulauncher/default.nix
+++ b/pkgs/applications/misc/ulauncher/default.nix
@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec {

  src = fetchurl {
    url = "https://github.com/Ulauncher/Ulauncher/releases/download/${version}/ulauncher_${version}.tar.gz";
-    sha256 = "sha256-YgOw3Gyy/o8qorWAnAlQrAZ2ZTnyP3PagLs2Qkdg788=";
+    hash = "sha256-YgOw3Gyy/o8qorWAnAlQrAZ2ZTnyP3PagLs2Qkdg788=";
  };

  nativeBuildInputs = with python3Packages; [
@ -57,6 +57,7 @@ python3Packages.buildPythonApplication rec {
    pyxdg
    pycairo
    requests
+    semver
    websocket-client
  ];

@ -76,7 +77,7 @@ python3Packages.buildPythonApplication rec {
    substituteInPlace setup.py --subst-var out
    patchShebangs bin/ulauncher-toggle
    substituteInPlace bin/ulauncher-toggle \
-      --replace wmctrl ${wmctrl}/bin/wmctrl
+      --replace-fail wmctrl ${wmctrl}/bin/wmctrl
  '';

  # https://github.com/Ulauncher/Ulauncher/issues/390
--- a/pkgs/applications/terminal-emulators/kitty/themes.nix
+++ b/pkgs/applications/terminal-emulators/kitty/themes.nix
@ -1,17 +1,18 @@
 { lib
 , stdenvNoCC
 , fetchFromGitHub
+, unstableGitUpdater
 }:

 stdenvNoCC.mkDerivation {
  pname = "kitty-themes";
-  version = "unstable-2024-04-23";
+  version = "0-unstable-2024-05-28";

  src = fetchFromGitHub {
    owner = "kovidgoyal";
    repo = "kitty-themes";
-    rev = "8026ce6ec70a0a67fedd02319e6fa39d36bbc1d1";
-    hash = "sha256-RN4YTcsVRg+3c+SEtKkJC8EvuNiiToduASMy/Rr+ZwA=";
+    rev = "891ca835de3112e69f1dfc87fd6cfab354a30f25";
+    hash = "sha256-Ah5qR5tMy1JlmT4rgYdHags4ZuuAOz1wzoByjo8T8TI=";
  };

  dontConfigure = true;
@ -26,6 +27,10 @@ stdenvNoCC.mkDerivation {
    runHook postInstall
  '';

+  passthru.updateScript = unstableGitUpdater {
+    hardcodeZeroVersion = true;
+  };
+
  meta = {
    homepage = "https://github.com/kovidgoyal/kitty-themes";
    description = "Themes for the kitty terminal emulator";
--- a/pkgs/by-name/at/atuin/package.nix
+++ b/pkgs/by-name/at/atuin/package.nix
@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec {
    darwin.apple_sdk_11_0.frameworks.SystemConfiguration
  ];

-  postInstall = ''
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
    installShellCompletion --cmd atuin \
      --bash <($out/bin/atuin gen-completions -s bash) \
      --fish <($out/bin/atuin gen-completions -s fish) \
--- a/pkgs/by-name/cd/cdecl/package.nix
+++ b/pkgs/by-name/cd/cdecl/package.nix
@ -11,13 +11,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "cdecl";
-  version = "16.3";
+  version = "16.4.1";

  src = fetchFromGitHub {
    owner = "paul-j-lucas";
    repo = "cdecl";
    rev = "refs/tags/cdecl-${finalAttrs.version}";
-    hash = "sha256-4rysv/iLohx2y7WEaP4BG7lT1tm4FfU0NWcxI4gvUsg=";
+    hash = "sha256-QAU/wTVBcSgIuY+fdZUaWGBNGuAvu/xyXuzQUtmn510=";
  };

  strictDeps = true;
--- a/pkgs/by-name/cl/clang-uml/package.nix
+++ b/pkgs/by-name/cl/clang-uml/package.nix
@ -0,0 +1,79 @@
+{ lib
+, fetchFromGitHub
+, stdenv
+, cmake
+, pkg-config
+, installShellFiles
+, libclang
+, clang
+, llvmPackages
+, libllvm
+, yaml-cpp
+, elfutils
+, libunwind
+, enableLibcxx ? false
+, debug ? false
+,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "clang-uml";
+  version = "0.5.2";
+
+  src = fetchFromGitHub {
+    owner = "bkryza";
+    repo = "clang-uml";
+    rev = finalAttrs.version;
+    hash = "sha256-ZVaMLsI1FK05xFfMmlLBPop7DR3fDstnfgjdBmsjNBA=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    installShellFiles
+  ] ++ (if debug then [
+    elfutils
+    libunwind
+  ] else [ ]);
+
+  buildInputs = [
+    clang
+    libclang
+    libllvm
+    yaml-cpp
+  ];
+
+  cmakeFlags = if debug then [ "-DCMAKE_BUILD_TYPE=Debug" ] else [ ];
+
+  clang = if enableLibcxx then llvmPackages.libcxxClang else llvmPackages.clang;
+
+  postInstall = ''
+    cp $out/bin/clang-uml $out/bin/clang-uml-unwrapped
+    rm $out/bin/clang-uml
+    export unwrapped_clang_uml="$out/bin/clang-uml-unwrapped"
+
+    # inject clang and unwrapp_clang_uml variables into wrapper
+    substituteAll ${./wrapper} $out/bin/clang-uml
+    chmod +x $out/bin/clang-uml
+
+    installShellCompletion --cmd clang-uml \
+      --bash $src/packaging/autocomplete/clang-uml \
+      --zsh $src/packaging/autocomplete/_clang-uml
+  '';
+
+  dontFixup = debug;
+  dontStrip = debug;
+
+  meta = with lib; {
+    description = "Customizable automatic UML diagram generator for C++ based on Clang.";
+    longDescription = ''
+      clang-uml is an automatic C++ to UML class, sequence, package and include diagram generator, driven by YAML configuration files.
+      The main idea behind the project is to easily maintain up-to-date diagrams within a code-base or document legacy code.
+      The configuration file or files for clang-uml define the types and contents of each generated diagram.
+      The diagrams can be generated in PlantUML, MermaidJS and JSON formats.
+    '';
+    maintainers = with maintainers; [ eymeric ];
+    homepage = "https://clang-uml.github.io/";
+    license = licenses.asl20;
+    platforms = platforms.all;
+  };
+})
--- a/pkgs/by-name/cl/clang-uml/wrapper
+++ b/pkgs/by-name/cl/clang-uml/wrapper
@ -0,0 +1,31 @@
+#!/bin/sh
+# This file is copied from https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/tools/clang-tools/wrapper
+# The clang-tools wrapper is commonly used together with the clang package on
+# nix, because without the wrapper, clang tools fail to find stdlib includes on
+# nix.
+
+buildcpath() {
+  local path after
+  while (( $# )); do
+    case $1 in
+        -isystem)
+            shift
+            path=$path${path:+':'}$1
+            ;;
+        -idirafter)
+            shift
+            after=$after${after:+':'}$1
+            ;;
+    esac
+    shift
+  done
+  echo $path${after:+':'}$after
+}
+
+export CPATH=${CPATH}${CPATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE} \
+                                               $(<@clang@/nix-support/libc-cflags)):@clang@/resource-root/include
+export CPLUS_INCLUDE_PATH=${CPLUS_INCLUDE_PATH}${CPLUS_INCLUDE_PATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE} \
+                                                                                      $(<@clang@/nix-support/libcxx-cxxflags) \
+                                                                                      $(<@clang@/nix-support/libc-cflags)):@clang@/resource-root/include
+
+exec @unwrapped_clang_uml@ "$@"
--- a/pkgs/by-name/co/corefonts/no-op.conf
+++ b/pkgs/by-name/co/corefonts/no-op.conf
--- a/pkgs/by-name/co/corefonts/package.nix
+++ b/pkgs/by-name/co/corefonts/package.nix
@ -26,7 +26,7 @@ stdenv.mkDerivation {
  version = "1";

  exes = map ({name, sha256}: fetchurl {
-    url = "mirror://sourceforge/corefonts/${name}32.exe";
+    url = "mirror://sourceforge/corefonts/the%20fonts/final/${name}32.exe";
    inherit sha256;
  }) fonts;

--- a/pkgs/by-name/fi/files-cli/package.nix
+++ b/pkgs/by-name/fi/files-cli/package.nix
@ -7,16 +7,16 @@

 buildGoModule rec {
  pname = "files-cli";
-  version = "2.13.53";
+  version = "2.13.65";

  src = fetchFromGitHub {
    repo = "files-cli";
    owner = "files-com";
    rev = "v${version}";
-    hash = "sha256-fUOcAluc/H6ZfE14FjLH60cQeUarJ+4PeIb6IkaBwtE=";
+    hash = "sha256-SUxITjWgUQcF7G6w5PZUpjvBH3tGhK/A1sOVg6SEfTU=";
  };

-  vendorHash = "sha256-yVr4u96L+Kgd1Qi2jhvWhwo/EnENwlZgJZtkGOWbteM=";
+  vendorHash = "sha256-QVQi60j0XR1OApLG/WPq9aAP4P/2hYCbTLL/3sHAisw=";

  ldflags = [
    "-s"
--- a/pkgs/by-name/fo/fooyin/package.nix
+++ b/pkgs/by-name/fo/fooyin/package.nix
@ -15,13 +15,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "fooyin";
-  version = "0.4.3";
+  version = "0.4.4";

  src = fetchFromGitHub {
    owner = "ludouzi";
    repo = "fooyin";
    rev = "v" + finalAttrs.version;
-    hash = "sha256-S74Y7Q3MmKfxMGyO8un+YDHmCJUYNKY6KqTSPn+CynE=";
+    hash = "sha256-PlfZbgGzOma2r+opvxDbTdjUORpqh8fgBUSBusn6Kbw=";
  };

  buildInputs = [
--- a/pkgs/by-name/fr/fretboard/package.nix
+++ b/pkgs/by-name/fr/fretboard/package.nix
@ -18,19 +18,19 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "fretboard";
-  version = "6.1";
+  version = "7.0";

  src = fetchFromGitHub {
    owner = "bragefuglseth";
    repo = "fretboard";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-Jr7DxoOmggcAxU1y+2jXZvMgAf9SDSA7t5Jr2AYZV7s=";
+    hash = "sha256-8AfIvmL6ttmsH95KRMSv+1RaYYU2h+nVaZozLfxLWXc=";
  };

  cargoDeps = rustPlatform.fetchCargoTarball {
    src = finalAttrs.src;
    name = "${finalAttrs.pname}-${finalAttrs.version}";
-    hash = "sha256-P7dafWBaHVrxh30YxKiraKPMjtmGTTNd8qvoJ1M2vKI=";
+    hash = "sha256-kFV3zd7xp2hBMAdIXZAJhH/BSTKy6DgnFqz7h0yNWgs=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/jr/jrl-cmakemodules/package.nix
+++ b/pkgs/by-name/jr/jrl-cmakemodules/package.nix
@ -7,13 +7,13 @@

 stdenv.mkDerivation {
  pname = "jrl-cmakemodules";
-  version = "0-unstable-2024-04-12";
+  version = "0-unstable-2024-05-22";

  src = fetchFromGitHub {
    owner = "jrl-umi3218";
    repo = "jrl-cmakemodules";
-    rev = "a914fa836ab4d2f01c191c93a763cfa322820dc7";
-    hash = "sha256-/VedtcRqy4SUTZfrtg01Z1lSPFRg/858hgve+nKTqPo=";
+    rev = "dd3e4127f2b223496859fe05be02726e9d1a071b";
+    hash = "sha256-ySMfops0Py1U+50LEGwgIwlzPUq/miusTxK7TIpQQXs=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/by-name/ko/koodo-reader/fix-isdev.patch
+++ b/pkgs/by-name/ko/koodo-reader/fix-isdev.patch
@ -1,13 +0,0 @@
-diff --git a/main.js b/main.js
-index a4b5c8ef..743d63ca 100644
--- a/main.js
-+++ b/main.js
-@@ -8,7 +8,7 @@ const {
-   nativeTheme,
- } = require("electron");
- const path = require("path");
-const isDev = require("electron-is-dev");
-+const isDev = false;
- const Store = require("electron-store");
- const store = new Store();
- const fs = require("fs");
--- a/pkgs/by-name/ko/koodo-reader/package.nix
+++ b/pkgs/by-name/ko/koodo-reader/package.nix
@ -12,6 +12,9 @@
  electron,
 }:

+let
+  electronDist = electron + (if stdenv.isDarwin then "/Applications" else "/libexec/electron");
+in
 mkYarnPackage rec {
  pname = "koodo-reader";
  version = "1.6.6";
@ -29,23 +32,27 @@ mkYarnPackage rec {
  # should be copied from `koodo-reader.src`
  packageJSON = ./package.json;

-  patches = [ ./fix-isdev.patch ];
-
  offlineCache = fetchYarnDeps {
    yarnLock = "${src}/yarn.lock";
    hash = "sha256-VvYkotVb74zR9+/IWiQwOX/6RJf+xukpi7okRovfVzc=";
  };

-  nativeBuildInputs = [
-    copyDesktopItems
-    makeWrapper
-    wrapGAppsHook3
-  ];
+  nativeBuildInputs =
+    [
+      makeWrapper
+    ]
+    ++ lib.optionals (!stdenv.isDarwin) [
+      copyDesktopItems
+      wrapGAppsHook3
+    ];

  dontWrapGApps = true;

  env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";

+  # disable code signing on Darwin
+  env.CSC_IDENTITY_AUTO_DISCOVERY = "false";
+
  configurePhase = ''
    runHook preConfigure

@ -60,8 +67,11 @@ mkYarnPackage rec {

    export HOME=$(mktemp -d)
    yarn --offline build
+
+    cp -r ${electronDist} electron-dist
+    chmod -R u+w electron-dist
    yarn --offline run electron-builder --dir \
-      -c.electronDist=${electron}/libexec/electron \
+      -c.electronDist=electron-dist \
      -c.electronVersion=${electron.version}

    runHook postBuild
@ -70,21 +80,30 @@ mkYarnPackage rec {
  installPhase = ''
    runHook preInstall

-    install -Dm644 assets/icons/256x256.png $out/share/icons/hicolor/256x256/apps/koodo-reader.png
-    install -Dm644 ${./mime-types.xml} $out/share/mime/packages/koodo-reader.xml
+    ${lib.optionalString (!stdenv.isDarwin) ''
+      install -Dm644 assets/icons/256x256.png $out/share/icons/hicolor/256x256/apps/koodo-reader.png
+      install -Dm644 ${./mime-types.xml} $out/share/mime/packages/koodo-reader.xml

-    mkdir -p $out/share/lib/koodo-reader
-    cp -r dist/*-unpacked/{locales,resources{,.pak}} $out/share/lib/koodo-reader
+      mkdir -p $out/share/lib/koodo-reader
+      cp -r dist/*-unpacked/{locales,resources{,.pak}} $out/share/lib/koodo-reader
+    ''}
+
+    ${lib.optionalString stdenv.isDarwin ''
+      mkdir -p $out/Applications
+      cp -r dist/mac*/"Koodo Reader.app" $out/Applications
+      makeWrapper "$out/Applications/Koodo Reader.app/Contents/MacOS/Koodo Reader" $out/bin/koodo-reader
+    ''}

    runHook postInstall
  '';

  # we use makeShellWrapper instead of the makeBinaryWrapper provided by wrapGAppsHook for proper shell variable expansion
-  postFixup = ''
-    makeShellWrapper ${electron}/bin/electron $out/bin/koodo-reader \
+  postFixup = lib.optionalString (!stdenv.isDarwin) ''
+    makeShellWrapper ${lib.getExe electron} $out/bin/koodo-reader \
      --add-flags $out/share/lib/koodo-reader/resources/app.asar \
      "''${gappsWrapperArgs[@]}" \
      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
+      --set-default ELECTRON_IS_DEV 0 \
      --inherit-argv0
  '';

@ -117,7 +136,6 @@ mkYarnPackage rec {
  ];

  meta = {
-    broken = stdenv.isDarwin;
    changelog = "https://github.com/troyeguo/koodo-reader/releases/tag/v${version}";
    description = "A cross-platform ebook reader";
    longDescription = ''
--- a/pkgs/by-name/na/naps2/deps.nix
+++ b/pkgs/by-name/na/naps2/deps.nix
@ -2,43 +2,43 @@
 # Please dont edit it manually, your changes might get overwritten!

 { fetchNuGet }: [
-  (fetchNuGet { pname = "AtkSharp"; version = "3.24.24.38"; sha256 = "12dv3j8nzhjb5c0093djajdnv8n7m0q7vq2d5ry2v4xk9wqzxpr7"; })
-  (fetchNuGet { pname = "Autofac"; version = "7.1.0"; sha256 = "007bsc61cngjb14cma9lq2xwy1wpybmk37hqvc45s0gs1wv6hhpm"; })
+  (fetchNuGet { pname = "AtkSharp"; version = "3.24.24.95"; sha256 = "0x4nr8rx50h87n6ijv5a4vkavs2x61bsrkxvam27h178finmc1rn"; })
+  (fetchNuGet { pname = "Autofac"; version = "8.0.0"; sha256 = "0w3y76vik6rfr9am649v4w6dyyp5s25244q3il2x8si11xgl6y7d"; })
  (fetchNuGet { pname = "Ben.Demystifier"; version = "0.4.1"; sha256 = "1szlrhvwpwkjhpgvjlrpjg714bz1yhyljs72pxni3li4mgnklk1f"; })
-  (fetchNuGet { pname = "BouncyCastle"; version = "1.8.1"; sha256 = "0fz4vhcr6gghvm39hdl48a2sxvx5piyh8ig82slj97gffi1g5rvp"; })
-  (fetchNuGet { pname = "CairoSharp"; version = "3.24.24.38"; sha256 = "0n3y5w088k81apxik9amfvjdwcic4k2ixxvnrk9cw6d2wh1d5r8d"; })
+  (fetchNuGet { pname = "CairoSharp"; version = "3.24.24.95"; sha256 = "05fq8jdlxzrrw7gh0i3w272q34wzmb3bizcghjnf9mlh1jcn1iy9"; })
  (fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; sha256 = "1sldkj8lakggn4hnyabjj1fppqh50fkdrr1k99d4gswpbk5kv582"; })
  (fetchNuGet { pname = "EmbedIO"; version = "3.5.2"; sha256 = "13saxicm07nkppzfxb60cpm1501n4ixaqhkvvqqfaqgifma9z8bv"; })
-  (fetchNuGet { pname = "Eto.Forms"; version = "2.8.2"; sha256 = "117n5hvhp8zadnhzy661dw1l9y5w9hi21dz5z3j7vc8s4ndc1vbc"; })
-  (fetchNuGet { pname = "Eto.Platform.Gtk"; version = "2.8.2"; sha256 = "0bazmnb970677vwisq5lkf69q66w56kmvd5kabsfp3vdnp4w52zq"; })
-  (fetchNuGet { pname = "GdkSharp"; version = "3.24.24.38"; sha256 = "0c5gzg106bnnc4wwwhch6lja68623a9hk8r2sjcv35hl5dh21616"; })
-  (fetchNuGet { pname = "GioSharp"; version = "3.24.24.38"; sha256 = "1b3irarxjbbpf24fw2avdglcslb5653gn6m829yhlcm5ay37pds4"; })
-  (fetchNuGet { pname = "GLibSharp"; version = "3.24.24.38"; sha256 = "1a0ixdq1gdb46gkb2nnlydsi10bjrbd3risfyaphsy8fbsyzrzvm"; })
+  (fetchNuGet { pname = "Eto.Forms"; version = "2.8.3"; sha256 = "00v2ffi9sl8cjllrz8rw3a5s5cgm9bfh45852znwz18zp06rh5bg"; })
+  (fetchNuGet { pname = "Eto.Platform.Gtk"; version = "2.8.3"; sha256 = "0av22hyx6xf6cnm89a4jvpnm80h1p6a6301r4n2906ihai9k3gsk"; })
+  (fetchNuGet { pname = "GdkSharp"; version = "3.24.24.95"; sha256 = "1wp2kgng0pwg8q5bl1zz4lzzj603qcjljql61h83bxa60q7c121m"; })
+  (fetchNuGet { pname = "GioSharp"; version = "3.24.24.95"; sha256 = "121xb98hg955vwxfv1r5idr5a2zv09xpcmqckm7hhgprlzhz2cg5"; })
+  (fetchNuGet { pname = "GLibSharp"; version = "3.24.24.95"; sha256 = "1l5nbg0qwjp55wfj06vnk5q5r5cnq5h064qp4k5xf8qlma8d346n"; })
  (fetchNuGet { pname = "Google.Protobuf"; version = "3.25.1"; sha256 = "0zcw9vmv2bdai3zaip86s37lj3r5z4zvcs9mf5a9nih0hy4gzwsi"; })
  (fetchNuGet { pname = "Grpc.Core.Api"; version = "2.59.0"; sha256 = "0pajrxg0dsfnyxwrd2li5nrabz0r3b3bql776l44hn5rg1s1287k"; })
-  (fetchNuGet { pname = "Grpc.Tools"; version = "2.59.0"; sha256 = "1sb68ydclmabz6w0d12s37mfj35609406c6iwrnsy5xgirz7i98f"; })
-  (fetchNuGet { pname = "GrpcDotNetNamedPipes"; version = "2.1.1"; sha256 = "0fmxrr99wp7pdrf8230fl6fh2jlb3l0yg928qyab9mgnparppxqa"; })
-  (fetchNuGet { pname = "GtkSharp"; version = "3.24.24.38"; sha256 = "0cn8aggci6n088y5giiaxmyzv01rcz37r8pm738q2bsb57zppz2j"; })
+  (fetchNuGet { pname = "Grpc.Tools"; version = "2.62.0"; sha256 = "1x6ydsvjckxdpnrl07h307wql5gghlb4fasf591ppr16kv5igdfp"; })
+  (fetchNuGet { pname = "GrpcDotNetNamedPipes"; version = "3.0.0"; sha256 = "1sndscz12dldjfvifp04ml56fkbl1vwb9llzq0h58hwri35nnbv7"; })
+  (fetchNuGet { pname = "GtkSharp"; version = "3.24.24.95"; sha256 = "0y20zn8wv72dg2bc7f95l8iz8z51ap08q5gnv6f2xnhz8zjf86xh"; })
+  (fetchNuGet { pname = "IsExternalInit"; version = "1.0.3"; sha256 = "01flcxs8m7m916s5rx5iyvzh6fjdl1dvcyzl9cpzn0d17yp8dz2i"; })
  (fetchNuGet { pname = "Makaretu.Dns"; version = "2.0.1"; sha256 = "1l6ajfdcvqpz078wl6nm44bnhd8h47nssb5qgp5al9zqic50mqnd"; })
-  (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.0"; sha256 = "1dq5yw7cy6s42193yl4iqscfw5vzkjkgv0zyy32scr4jza6ni1a1"; })
+  (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "7.0.0"; sha256 = "1waiggh3g1cclc81gmjrqbh128kwfjky3z79ma4bd2ms9pa3gvfm"; })
  (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "8.0.0"; sha256 = "0z4jq5prnxyb4p3163yxx35znpd2msjd8hw8ysmv4ah90f5sd9gm"; })
  (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "2.1.0"; sha256 = "04rjl38wlr1jjjpbzgf64jp0ql6sbzbil0brwq9mgr3hdgwd7vx2"; })
  (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.1.0"; sha256 = "03gzlr3z9j1xnr1k6y91zgxpz3pj27i3zsvjwj7i8jqnlqmk7pxd"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; sha256 = "1jlpa4ggl1gr5fs7fdcw04li3y3iy05w3klr9lrrlc7v8w76kq71"; })
  (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "2.1.0"; sha256 = "0x1888w5ypavvszfmpja9krgc64527prs75vm8xbf9fv3rgsplql"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0"; sha256 = "1wlhb2vygzfdjbdzy7waxblmrx0q3pdcqvpapnpmq9fcx5m8r6w1"; })
+  (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "8.0.0"; sha256 = "0i7qziz0iqmbk8zzln7kx9vd0lbx1x3va0yi3j1bgkjir13h78ps"; })
  (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.1.0"; sha256 = "0c0cx8r5xkjpxmcfp51959jnp55qjvq28d9vaslk08avvi1by12s"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; sha256 = "1vi67fw7q99gj7jd64gnnfr4d2c0ijpva7g9prps48ja6g91x6a9"; })
  (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; sha256 = "1zw0bpp5742jzx03wvqc8csnvsbgdqi0ls9jfc5i2vd3cl8b74pg"; })
+  (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.1"; sha256 = "1wyhpamm1nqjfi3r463dhxljdlr6rm2ax4fvbgq2s0j3jhpdhd4p"; })
  (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.1.0"; sha256 = "0dii8i7s6libfnspz2xb96ayagb4rwqj2kmr162vndivr9rmbm06"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "6.0.0"; sha256 = "0fd9jii3y3irfcwlsiww1y9npjgabzarh33rn566wpcz24lijszi"; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "8.0.0"; sha256 = "0nppj34nmq25gnrg0wh1q22y4wdqbih4ax493f226azv8mkp9s1i"; })
  (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.1.0"; sha256 = "1gvgif1wcx4k6pv7gc00qv1hid945jdywy1s50s33q0hfd91hbnj"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; })
  (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; sha256 = "1klcqhg3hk55hb6vmjiq2wgqidsl81aldw0li2z98lrwx26msrr6"; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.1"; sha256 = "0i9pgmk60b8xlws3q9z890gim1xjq42dhyh6dj4xvbycmgg1x1sd"; })
  (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.1.0"; sha256 = "0w9644sryd1c6r3n4lq2cgd5pn6jl3k5m38a05m7vjffa4m2spd2"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; sha256 = "0p50qn6zhinzyhq9sy5svnmqqwhw2jajs2pbjh9sah504wjvhscz"; })
  (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.1.0"; sha256 = "1r9gzwdfmb8ysnc4nzmyz5cyar1lw0qmizsvrsh252nhlyg06nmb"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; sha256 = "0aldaz5aapngchgdr7dax9jw5wy7k7hmjgjpfgfv1wfif27jlkqm"; })
  (fetchNuGet { pname = "Microsoft.NETCore.App"; version = "2.1.30"; sha256 = "10brwj7csacwa4ra37pjb2bqwg961lxi576330xlhhwqixkjkrqf"; })
  (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "2.1.30"; sha256 = "0rabvmid1n604pk9rndlq62zqhq77p7cznmq9bzr7hshvr2rszab"; })
  (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "2.1.30"; sha256 = "1zk6ajalssvpm2yv4ri3g6hbxjaj1ns0y4w3g98wss54k7v44vpw"; })
@ -53,29 +53,25 @@
  (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net462"; version = "1.0.3"; sha256 = "08bfss2p262d8zj41xqndv0qgvz9lq636k2xhl80jl23ay22lsgf"; })
  (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; })
  (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; })
-  (fetchNuGet { pname = "MimeKit"; version = "1.22.0"; sha256 = "0zs9a4gjcs3q402dvvgfv58304sx533nrrhiafgqc04aazpqypr4"; })
+  (fetchNuGet { pname = "MimeKitLite"; version = "4.4.0"; sha256 = "1am381zbh89qa520pllsa92by92lg6wn0zxhqa26z7mlh6jwc8nz"; })
  (fetchNuGet { pname = "NAPS2.Mdns"; version = "1.0.1"; sha256 = "0xi46brppcjm8mrabnffahkmkcakhw94cnq1w2yk8y2hyq9qb4ms"; })
  (fetchNuGet { pname = "NAPS2.NTwain"; version = "1.0.0"; sha256 = "088dw31h7rlgr0s05snm382wz65wi46yaizjnjpd0wzw2mb58yld"; })
  (fetchNuGet { pname = "NAPS2.Pdfium.Binaries"; version = "1.1.0"; sha256 = "0rnqkk6y047p6a6li2dr2cygkhjn3d2a13yn3rck5gf854k3q3ws"; })
  (fetchNuGet { pname = "NAPS2.PdfSharp"; version = "1.0.1"; sha256 = "0x51whjhlqd5r0f1s5hjx41zzwwcwcdl19q6iz6k7fwx81746w0w"; })
  (fetchNuGet { pname = "NAPS2.Tesseract.Binaries"; version = "1.2.0"; sha256 = "0m1aksfjg4vfl2llvhd2in0a5i4wa72nmfw2h78y4wwxmjplbfz2"; })
  (fetchNuGet { pname = "NAPS2.Wia"; version = "2.0.3"; sha256 = "0xszkccb8fy2x60nkblpda78wx2d86fn8y49j94qmvz4rp2nw98i"; })
-  (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; })
  (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; })
  (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; })
-  (fetchNuGet { pname = "NLog"; version = "5.2.6"; sha256 = "1dkfw0qm5c45pyxcif37sbi8mf9k0ql46f4b1y36rqg8v257xh21"; })
-  (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.5"; sha256 = "0jzfqa12l5vvxd2j684cnm29w19v386cpm11pw8h6prpf57affaj"; })
-  (fetchNuGet { pname = "Nullable"; version = "1.3.1"; sha256 = "0hwrr4q22c0i056dqy3v431rxjv7md910ihz0pjsi16qxsbpw7p7"; })
-  (fetchNuGet { pname = "PangoSharp"; version = "3.24.24.38"; sha256 = "0cma8j4cy4j3fw0nvsxlqi0azjkvfjsw0wb6k6b2k21rdpy5rbbn"; })
-  (fetchNuGet { pname = "Portable.BouncyCastle"; version = "1.8.1.3"; sha256 = "1lv1ljaz8df835jgmp3ny1xgqqjf1s9f25baw7bf8d24qlf25i2g"; })
+  (fetchNuGet { pname = "NLog"; version = "5.2.8"; sha256 = "1z3h20m5rjnizm1jbf5j0vpdc1f373rzzkg6478p1lxv5j385c12"; })
+  (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.8"; sha256 = "1qnz91099f51vk7f5g2ig0041maw5hcbyqllxvj5zj7zkp0qw9b8"; })
+  (fetchNuGet { pname = "PangoSharp"; version = "3.24.24.95"; sha256 = "0548jrkgzia899va9smhh7if49nk6avbswb68xmc52k37lins6b2"; })
+  (fetchNuGet { pname = "Polyfill"; version = "4.2.0"; sha256 = "0h25jszwrkmxlklcr6mjjmz71rn6q36pqb5jx36l94lrccy2k0a8"; })
  (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; })
-  (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; })
  (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; })
  (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; })
  (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; })
  (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; })
  (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; })
-  (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; })
  (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; })
  (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; })
  (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; })
@ -84,12 +80,8 @@
  (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; })
  (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; })
  (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; })
-  (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; })
-  (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; })
  (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0rwpqngkqiapqc5c2cpkj7idhngrgss5qpnqg0yh40mbyflcxf8i"; })
-  (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; })
  (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1n06gxwlinhs0w7s8a94r1q3lwqzvynxwd3mp10ws9bg6gck8n4r"; })
-  (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; })
  (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0404wqrc7f2yc0wxv71y3nnybvqx8v4j9d47hlscxy759a525mc3"; })
  (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.App"; version = "2.1.30"; sha256 = "039r4c42mz8fg8nqn8p3v0dxnjv681xlllhrc4l91rbbwv04li6j"; })
  (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "2.1.30"; sha256 = "00pm387jvv574jsdd1261mbvxd7lbjbsfx3wq0z0iqjhr31pgmw1"; })
@ -100,38 +92,27 @@
  (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "2.1.30"; sha256 = "1zv9i8wqpsdr2vx35i3qzad1yvz00l6i9f00fclw02v2p92jz9c1"; })
  (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "2.1.30"; sha256 = "1s6zx2hpg60pscvz8yfdkxpdg1lhs534x5mz3yryxa91nfzhxv95"; })
  (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; })
-  (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; })
  (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; })
  (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; })
-  (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; })
  (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0zy5r25jppz48i2bkg8b9lfig24xixg6nm3xyr1379zdnqnpm8f6"; })
-  (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; })
  (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "096ch4n4s8k82xga80lfmpimpzahd2ip1mgwdqgar0ywbbl6x438"; })
-  (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; })
  (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1dm8fifl7rf1gy7lnwln78ch4rw54g0pl5g1c189vawavll7p6rj"; })
  (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; })
-  (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; })
  (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1m9z1k9kzva9n9kwinqxl97x2vgl79qhqjlv17k9s2ymcyv2bwr6"; })
-  (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; })
  (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1cpx56mcfxz7cpn57wvj18sjisvzq8b5vd9rw16ihd2i6mcp3wa1"; })
-  (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; })
  (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "15gsm1a8jdmgmf8j5v1slfz8ks124nfdhk2vxs2rw3asrxalg8hi"; })
-  (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; })
  (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0q0n5q1r1wnqmr5i5idsrd9ywl33k0js4pngkwq9p368mbxp8x1w"; })
-  (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; })
  (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c"; })
  (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; })
-  (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; })
  (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; })
  (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; })
  (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; })
-  (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; })
  (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; })
  (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; })
  (fetchNuGet { pname = "SharpZipLib"; version = "1.4.2"; sha256 = "0ijrzz2szxjmv2cipk7rpmg14dfaigdkg7xabjvb38ih56m9a27y"; })
  (fetchNuGet { pname = "SimpleBase"; version = "1.3.1"; sha256 = "0mjvqbn3b6ai7nhzs5mssy2imn9lw10z4sj8nhgiapyqy9qlim0n"; })
  (fetchNuGet { pname = "SixLabors.Fonts"; version = "1.0.1"; sha256 = "08ljgagwm8aha9p4plqdnf507gcisajd9frcbvaykikrsrzpm33y"; })
-  (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; })
+  (fetchNuGet { pname = "StandardSocketsHttpHandler"; version = "2.2.0.8"; sha256 = "18h3rzh9pp3b6mjx1m4jvwwhv5abjqsd1nnbibc0gbkvbcrb16ni"; })
  (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; })
  (fetchNuGet { pname = "System.Buffers"; version = "4.4.0"; sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"; })
  (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; })
@ -140,45 +121,29 @@
  (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; })
  (fetchNuGet { pname = "System.Collections.Immutable"; version = "8.0.0"; sha256 = "0z53a42zjd59zdkszcm7pvij4ri5xbb8jly9hzaad9khlf69bcqp"; })
  (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; })
-  (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; })
-  (fetchNuGet { pname = "System.Data.Common"; version = "4.3.0"; sha256 = "12cl7vy3him9lmal10cyxifasf75x4h5b239wawpx3vzgim23xq3"; })
  (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; })
  (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; })
-  (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.7.1"; sha256 = "1mivaifniyrqwlnvzsfaxzrh2sd981bwzs3cbvs5wi7jjzbcqr4p"; })
-  (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.0"; sha256 = "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5"; })
-  (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; })
+  (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "7.0.2"; sha256 = "1h97ikph775gya93qsjjaka87qcygbyh1064rh1hnfcnp5xv0ipi"; })
  (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; })
  (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; })
  (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; })
  (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; })
  (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; })
-  (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; })
-  (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; })
  (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; })
  (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; })
  (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; })
-  (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; })
  (fetchNuGet { pname = "System.Memory"; version = "4.5.0"; sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"; })
+  (fetchNuGet { pname = "System.Memory"; version = "4.5.1"; sha256 = "0f07d7hny38lq9w69wx4lxkn4wszrqf9m9js6fh9is645csm167c"; })
  (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; })
  (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; })
-  (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; })
  (fetchNuGet { pname = "System.Net.Http"; version = "4.3.4"; sha256 = "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl"; })
-  (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; })
-  (fetchNuGet { pname = "System.Net.NetworkInformation"; version = "4.3.0"; sha256 = "1w10xqq3d5xqipp5403y5ndq7iggq19jimrd6gp5rghp1qg8rlbg"; })
  (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; })
-  (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; })
  (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; })
  (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; })
-  (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; })
  (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; })
  (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; })
-  (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; })
-  (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; })
-  (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; })
-  (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; })
  (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; })
  (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; })
-  (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; })
  (fetchNuGet { pname = "System.Resources.Extensions"; version = "8.0.0"; sha256 = "0chqkw486pb5dg9nlj5352lsz1206xyf953nd98dglia3isxklg5"; })
  (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; })
  (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; })
@ -190,11 +155,8 @@
  (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; })
  (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; })
  (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; })
-  (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; })
  (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; })
-  (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.3.0"; sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; })
  (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; })
-  (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; })
  (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; })
  (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; })
  (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; })
@ -203,26 +165,16 @@
  (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; })
  (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "8.0.0"; sha256 = "1ysjx3b5ips41s32zacf4vs7ig41906mxrsbmykdzi0hvdmjkgbx"; })
  (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; })
-  (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; })
-  (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; })
  (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; })
  (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; })
-  (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.3.0"; sha256 = "0lgxg1gn7pg7j0f942pfdc9q7wamzxsgq3ng248ikdasxz0iadkv"; })
+  (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "8.0.0"; sha256 = "1lgdd78cik4qyvp2fggaa0kzxasw6kc9a6cjqw46siagrm0qnc3y"; })
  (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; })
-  (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; })
  (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; })
-  (fetchNuGet { pname = "System.Threading.Overlapped"; version = "4.3.0"; sha256 = "1nahikhqh9nk756dh8p011j36rlcp1bzz3vwi2b4m1l2s3vz8idm"; })
  (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; })
  (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "8.0.0"; sha256 = "02mmqnbd7ybin1yiffrq3ph71rsbrnf6r6m01j98ynydqfscz9s3"; })
-  (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; })
  (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.2"; sha256 = "1sh63dz0dymqcwmprp0nadm77b83vmm7lyllpv578c397bslb8hj"; })
  (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; })
-  (fetchNuGet { pname = "System.Threading.Thread"; version = "4.3.0"; sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; })
-  (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; })
-  (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; })
  (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; })
-  (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; })
-  (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; })
  (fetchNuGet { pname = "Unosquare.Swan.Lite"; version = "3.1.0"; sha256 = "0yjbchc2rhgssfvb1qxg3kq3lzyx089r3rngpcjgrkw85bf0vgrw"; })
  (fetchNuGet { pname = "ZXing.Net"; version = "0.16.9"; sha256 = "0bpki21p2wjjjviayhza0gam7s9lm7qj6g8hdcp2csd0mv54l980"; })
 ]
--- a/pkgs/by-name/na/naps2/package.nix
+++ b/pkgs/by-name/na/naps2/package.nix
@ -12,13 +12,13 @@

 buildDotnetModule rec {
  pname = "naps2";
-  version = "7.4.0";
+  version = "7.4.2";

  src = fetchFromGitHub {
    owner = "cyanfish";
    repo = "naps2";
    rev = "v${version}";
-    hash = "sha256-zU6VjHNtuX8JHC03CmaDnTAAei+mEhA/oMs9p42EgtA=";
+    hash = "sha256-1tPPb8bAQSc5FpizWpi7q4alxoA6xfb/QOAaTK2eNc8=";
  };

  projectFile = "NAPS2.App.Gtk/NAPS2.App.Gtk.csproj";
--- a/pkgs/by-name/pr/process-cpp/package.nix
+++ b/pkgs/by-name/pr/process-cpp/package.nix
@ -0,0 +1,78 @@
+{ lib
+, stdenv
+, fetchFromGitLab
+, testers
+, unstableGitUpdater
+, cmake
+, coreutils
+, boost
+, gtest
+, lomiri
+, properties-cpp
+, pkg-config
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "process-cpp";
+  version = "3.0.1-unstable-2024-03-14";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.com";
+    owner = "ubports";
+    repo = "development/core/lib-cpp/process-cpp";
+    rev = "7b0a829abcbcdd25d949e5f9e2c26bb985a58b31";
+    hash = "sha256-Az+lSJ7uVR4pAWvOeah5vFtIPb12eKp0nAFF1qsHZXA=";
+  };
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  postPatch = ''
+    substituteInPlace data/process-cpp.pc.in \
+      --replace-fail 'libdir=''${exec_prefix}' 'libdir=''${prefix}' \
+      --replace-fail 'includedir=''${exec_prefix}' 'includedir=''${prefix}'
+
+    substituteInPlace tests/posix_process_test.cpp \
+      --replace-fail '/usr/bin/sleep' '${lib.getExe' coreutils "sleep"}' \
+      --replace-fail '/usr/bin/env' '${lib.getExe' coreutils "env"}'
+  '';
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
+  buildInputs = [
+    boost
+    lomiri.cmake-extras
+    properties-cpp
+  ];
+
+  checkInputs = [
+    gtest
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck)
+  ];
+
+  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+
+  passthru = {
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+    updateScript = unstableGitUpdater { };
+  };
+
+  meta = with lib; {
+    description = "A simple convenience library for handling processes in C++11";
+    homepage = "https://gitlab.com/ubports/development/core/lib-cpp/process-cpp";
+    license = with licenses; [ gpl3Only lgpl3Only ];
+    maintainers = with maintainers; [ onny OPNA2608 ];
+    platforms = platforms.linux;
+    pkgConfigModules = [ "process-cpp" ];
+  };
+})
--- a/pkgs/by-name/ra/radicle-node/package.nix
+++ b/pkgs/by-name/ra/radicle-node/package.nix
@ -1,26 +1,32 @@
-{ lib
-, stdenv
+{ asciidoctor
+, darwin
 , fetchgit
-, asciidoctor
 , git
 , installShellFiles
-, rustPlatform
-, testers
+, jq
+, lib
+, makeWrapper
+, man-db
+, openssh
 , radicle-node
-, darwin
+, runCommand
+, rustPlatform
+, stdenv
+, testers
+, xdg-utils
 }: rustPlatform.buildRustPackage rec {
  pname = "radicle-node";
-  version = "1.0.0-rc.9";
+  version = "1.0.0-rc.10";
  env.RADICLE_VERSION = version;

  src = fetchgit {
    url = "https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git";
    rev = "refs/namespaces/z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT/refs/tags/v${version}";
-    hash = "sha256-GFltwKc6madTJWPTeAeslmFffHtixR0Dxd+3hAnHvz0=";
+    hash = "sha256-bkP9/S9luT0tgESabt3KaaEUObx6SGxz87XLOIIrDNw=";
  };
-  cargoHash = "sha256-UM9eDWyeewWPq3+z0JWqdAsCxx6EqytuYMwLXDHOC64=";
+  cargoHash = "sha256-FDxXFhQmpWwkvAMawBTwuSXOz1UMqP83Csk9N0atlN8=";

-  nativeBuildInputs = [ asciidoctor installShellFiles ];
+  nativeBuildInputs = [ asciidoctor installShellFiles makeWrapper ];
  nativeCheckInputs = [ git ];
  buildInputs = lib.optionals stdenv.buildPlatform.isDarwin [
    darwin.apple_sdk.frameworks.Security
@ -36,6 +42,8 @@
  checkFlags = [
    "--skip=service::message::tests::test_node_announcement_validate"
    "--skip=tests::test_announcement_relay"
+    # https://radicle.zulipchat.com/#narrow/stream/369277-heartwood/topic/Flaky.20tests/near/438352360
+    "--skip=tests::e2e::test_connection_crossing"
  ];

  postInstall = ''
@ -45,7 +53,40 @@
    done
  '';

-  passthru.tests.version = testers.testVersion { package = radicle-node; };
+  postFixup = ''
+    for program in $out/bin/* ;
+    do
+      wrapProgram "$program" \
+        --prefix PATH : "${lib.makeBinPath [ git man-db openssh xdg-utils ]}"
+    done
+  '';
+
+  passthru.tests =
+    let
+      package = radicle-node;
+    in
+    {
+      version = testers.testVersion { inherit package; };
+      basic = runCommand "${package.name}-basic-test"
+        {
+          nativeBuildInputs = [ jq openssh radicle-node ];
+        } ''
+        set -e
+        export RAD_HOME="$PWD/.radicle"
+        mkdir -p "$RAD_HOME/keys"
+        ssh-keygen -t ed25519 -N "" -f "$RAD_HOME/keys/radicle" > /dev/null
+        jq -n '.node.alias |= "nix"' > "$RAD_HOME/config.json"
+
+        rad config > /dev/null
+        rad debug | jq -e '
+            (.sshVersion | contains("${openssh.version}"))
+          and
+            (.gitVersion | contains("${git.version}"))
+        '
+
+        touch $out
+      '';
+    };

  meta = {
    description = "Radicle node and CLI for decentralized code collaboration";
--- a/pkgs/by-name/uv/uv/Cargo.lock
+++ b/pkgs/by-name/uv/uv/Cargo.lock
@ -200,9 +200,9 @@ dependencies = [

 [[package]]
 name = "async-compression"
-version = "0.4.10"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c90a406b4495d129f00461241616194cb8a032c8d1c53c657f0961d5f8e0498"
+checksum = "cd066d0b4ef8ecb03a55319dc13aa6910616d0f44008a045bb1835af830abff5"
 dependencies = [
 "brotli",
 "bzip2",
@ -313,9 +313,9 @@ dependencies = [

 [[package]]
 name = "axoupdater"
-version = "0.6.4"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d6bf8aaa32e7d33071ed9a339fc34ac30b0a5190f82069fbd12a1266bda9068"
+checksum = "669a5ea910fb9b97e3df709c7d0f626fc9e5e9cb83c00bd3a1b4c54835ed8b66"
 dependencies = [
 "axoasset",
 "axoprocess",
@ -325,7 +325,7 @@ dependencies = [
 "miette",
 "reqwest",
 "serde",
- "temp-dir",
+ "tempfile",
 "thiserror",
 "tokio",
 ]
@ -399,12 +399,14 @@ dependencies = [
 "once_cell",
 "pep508_rs",
 "platform-tags",
+ "pypi-types",
 "tokio",
 "uv-cache",
 "uv-client",
 "uv-configuration",
 "uv-dispatch",
 "uv-distribution",
+ "uv-git",
 "uv-interpreter",
 "uv-resolver",
 "uv-types",
@ -1058,7 +1060,6 @@ checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
 "block-buffer",
 "crypto-common",
- "subtle",
 ]

 [[package]]
@ -1104,7 +1105,6 @@ dependencies = [
 "cache-key",
 "distribution-filename",
 "fs-err",
- "indexmap",
 "itertools 0.13.0",
 "once_cell",
 "pep440_rs",
@ -1465,21 +1465,6 @@ version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"

-[[package]]
-name = "git2"
-version = "0.18.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "232e6a7bfe35766bf715e55a88b39a700596c0ccfd88cd3680b4cdb40d66ef70"
-dependencies = [
- "bitflags 2.5.0",
- "libc",
- "libgit2-sys",
- "log",
- "openssl-probe",
- "openssl-sys",
- "url",
-]
-
 [[package]]
 name = "glob"
 version = "0.3.1"
@ -1578,15 +1563,6 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"

-[[package]]
-name = "hmac"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
-dependencies = [
- "digest",
-]
-
 [[package]]
 name = "home"
 version = "0.5.9"
@ -1711,9 +1687,9 @@ dependencies = [

 [[package]]
 name = "hyper-util"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d8d52be92d09acc2e01dddb7fde3ad983fc6489c7db4837e605bc3fca4cb63e"
+checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56"
 dependencies = [
 "bytes",
 "futures-channel",
@ -2002,20 +1978,6 @@ version = "0.2.153"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"

-[[package]]
-name = "libgit2-sys"
-version = "0.16.2+1.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8"
-dependencies = [
- "cc",
- "libc",
- "libssh2-sys",
- "libz-sys",
- "openssl-sys",
- "pkg-config",
-]
-
 [[package]]
 name = "libmimalloc-sys"
 version = "0.1.38"
@ -2036,20 +1998,6 @@ dependencies = [
 "libc",
 ]

-[[package]]
-name = "libssh2-sys"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee"
-dependencies = [
- "cc",
- "libc",
- "libz-sys",
- "openssl-sys",
- "pkg-config",
- "vcpkg",
-]
-
 [[package]]
 name = "libz-ng-sys"
 version = "1.1.15"
@ -2060,18 +2008,6 @@ dependencies = [
 "libc",
 ]

-[[package]]
-name = "libz-sys"
-version = "1.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
 [[package]]
 name = "linked-hash-map"
 version = "0.5.6"
@ -2368,28 +2304,6 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"

-[[package]]
-name = "openssl-src"
-version = "300.2.3+3.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.102"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2"
-dependencies = [
- "cc",
- "libc",
- "openssl-src",
- "pkg-config",
- "vcpkg",
-]
-
 [[package]]
 name = "option-ext"
 version = "0.2.0"
@ -2777,7 +2691,7 @@ dependencies = [
 [[package]]
 name = "pubgrub"
 version = "0.2.1"
-source = "git+https://github.com/astral-sh/pubgrub?rev=0e684a874c9fb8f74738cd8875524c80e3d4820b#0e684a874c9fb8f74738cd8875524c80e3d4820b"
+source = "git+https://github.com/astral-sh/pubgrub?rev=d4795a31be17669aba11eb741b4a9086acc3eb11#d4795a31be17669aba11eb741b4a9086acc3eb11"
 dependencies = [
 "indexmap",
 "log",
@ -2866,7 +2780,6 @@ version = "0.0.1"
 dependencies = [
 "anyhow",
 "chrono",
- "git2",
 "indexmap",
 "mailparse",
 "once_cell",
@ -3089,6 +3002,7 @@ dependencies = [
 "reqwest-middleware",
 "tempfile",
 "test-case",
+ "thiserror",
 "tokio",
 "tracing",
 "unscanny",
@ -3573,17 +3487,6 @@ dependencies = [
 "serde",
 ]

-[[package]]
-name = "sha1"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
 [[package]]
 name = "sha2"
 version = "0.10.8"
@ -3823,12 +3726,6 @@ version = "0.12.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"

-[[package]]
-name = "temp-dir"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231"
-
 [[package]]
 name = "temp-env"
 version = "0.3.6"
@ -4048,9 +3945,9 @@ checksum = "b130bd8a58c163224b44e217b4239ca7b927d82bf6cc2fea1fc561d15056e3f7"

 [[package]]
 name = "tokio"
-version = "1.37.0"
+version = "1.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
+checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
 dependencies = [
 "backtrace",
 "bytes",
@ -4067,9 +3964,9 @@ dependencies = [

 [[package]]
 name = "tokio-macros"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
 dependencies = [
 "proc-macro2",
 "quote",
@ -4470,7 +4367,7 @@ checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"

 [[package]]
 name = "uv"
-version = "0.2.5"
+version = "0.2.6"
 dependencies = [
 "anstream",
 "anyhow",
@ -4523,6 +4420,7 @@ dependencies = [
 "uv-dispatch",
 "uv-distribution",
 "uv-fs",
+ "uv-git",
 "uv-installer",
 "uv-interpreter",
 "uv-normalize",
@ -4666,10 +4564,10 @@ version = "0.0.1"
 dependencies = [
 "anyhow",
 "clap",
- "distribution-types",
 "either",
 "pep508_rs",
 "platform-tags",
+ "pypi-types",
 "rustc-hash",
 "schemars",
 "serde",
@ -4714,10 +4612,11 @@ dependencies = [
 "uv-client",
 "uv-configuration",
 "uv-dispatch",
+ "uv-distribution",
 "uv-fs",
+ "uv-git",
 "uv-installer",
 "uv-interpreter",
- "uv-requirements",
 "uv-resolver",
 "uv-types",
 "uv-workspace",
@ -4733,6 +4632,7 @@ dependencies = [
 "futures",
 "install-wheel-rs",
 "itertools 0.13.0",
+ "pypi-types",
 "rustc-hash",
 "tracing",
 "uv-build",
@ -4740,6 +4640,7 @@ dependencies = [
 "uv-client",
 "uv-configuration",
 "uv-distribution",
+ "uv-git",
 "uv-installer",
 "uv-interpreter",
 "uv-resolver",
@ -4751,27 +4652,32 @@ name = "uv-distribution"
 version = "0.0.1"
 dependencies = [
 "anyhow",
- "cache-key",
 "distribution-filename",
 "distribution-types",
 "fs-err",
 "futures",
+ "glob",
+ "indoc",
+ "insta",
 "install-wheel-rs",
 "nanoid",
- "once_cell",
+ "path-absolutize",
 "pep440_rs",
 "pep508_rs",
 "platform-tags",
 "pypi-types",
+ "regex",
 "reqwest",
 "reqwest-middleware",
 "rmp-serde",
 "rustc-hash",
+ "schemars",
 "serde",
 "tempfile",
 "thiserror",
 "tokio",
 "tokio-util",
+ "toml",
 "tracing",
 "url",
 "uv-cache",
@ -4782,6 +4688,7 @@ dependencies = [
 "uv-git",
 "uv-normalize",
 "uv-types",
+ "uv-warnings",
 "zip",
 ]

@ -4832,17 +4739,12 @@ name = "uv-git"
 version = "0.0.1"
 dependencies = [
 "anyhow",
- "base64 0.22.1",
 "cache-key",
 "cargo-util",
+ "dashmap",
 "fs-err",
- "git2",
- "glob",
- "hmac",
- "home",
- "rand",
 "reqwest",
- "sha1",
+ "thiserror",
 "tokio",
 "tracing",
 "url",
@ -4867,6 +4769,7 @@ dependencies = [
 "pypi-types",
 "rayon",
 "rustc-hash",
+ "same-file",
 "serde",
 "tempfile",
 "thiserror",
@ -4944,6 +4847,7 @@ dependencies = [
 name = "uv-requirements"
 version = "0.1.0"
 dependencies = [
+ "anstream",
 "anyhow",
 "cache-key",
 "configparser",
@ -4953,22 +4857,12 @@ dependencies = [
 "distribution-types",
 "fs-err",
 "futures",
- "glob",
- "indexmap",
- "indoc",
- "insta",
- "path-absolutize",
- "pep440_rs",
 "pep508_rs",
 "pypi-types",
- "regex",
 "requirements-txt",
 "rustc-hash",
- "same-file",
- "schemars",
 "serde",
 "thiserror",
- "tokio",
 "toml",
 "tracing",
 "url",
@ -5021,6 +4915,7 @@ dependencies = [
 "tokio",
 "tokio-stream",
 "toml",
+ "toml_edit",
 "tracing",
 "url",
 "uv-cache",
@ -5058,13 +4953,14 @@ dependencies = [
 "url",
 "uv-cache",
 "uv-configuration",
+ "uv-git",
 "uv-interpreter",
 "uv-normalize",
 ]

 [[package]]
 name = "uv-version"
-version = "0.2.5"
+version = "0.2.6"

 [[package]]
 name = "uv-virtualenv"
@ -5100,6 +4996,8 @@ dependencies = [
 "distribution-types",
 "fs-err",
 "install-wheel-rs",
+ "pep508_rs",
+ "pypi-types",
 "schemars",
 "serde",
 "thiserror",
@ -5119,12 +5017,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"

-[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
 [[package]]
 name = "version_check"
 version = "0.9.4"
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@ -16,21 +16,21 @@

 python3Packages.buildPythonApplication rec {
  pname = "uv";
-  version = "0.2.5";
+  version = "0.2.6";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "astral-sh";
    repo = "uv";
    rev = "refs/tags/${version}";
-    hash = "sha256-wWTzLyN/i7nn2/b8lX+8NDk9jU/jgaygF4i+Yb7kK8c=";
+    hash = "sha256-8HKpqPkQ2FGaq0NrlBpnf49G3ikNhsS/rC/tBZ6de3g=";
  };

  cargoDeps = rustPlatform.importCargoLock {
    lockFile = ./Cargo.lock;
    outputHashes = {
      "async_zip-0.0.17" = "sha256-Q5fMDJrQtob54CTII3+SXHeozy5S5s3iLOzntevdGOs=";
-      "pubgrub-0.2.1" = "sha256-mAPyo2R996ymzCt6TAX2G7xU1C3vDGjYF0z7R8lI1yg=";
+      "pubgrub-0.2.1" = "sha256-DtUK5k7Hfl5h9nFSSeD2zm4wBiVo4tScvFTUQWxTYlU=";
    };
  };

--- a/pkgs/by-name/ya/yazi/package.nix
+++ b/pkgs/by-name/ya/yazi/package.nix
@ -58,14 +58,14 @@ let

    mkdir $out/plugins
    ${lib.optionalString (plugins != { }) ''
-        ${lib.concatMapStringsSep
+        ${lib.concatStringsSep
        "\n"
        (lib.mapAttrsToList (name: value: "ln -s ${value} $out/plugins/${name}") plugins)}
    ''}

    mkdir $out/flavors
    ${lib.optionalString (flavors != { }) ''
-        ${lib.concatMapStringsSep
+        ${lib.concatStringsSep
        "\n"
        (lib.mapAttrsToList (name: value: "ln -s ${value} $out/flavors/${name}") flavors)}
    ''}
--- a/pkgs/development/compilers/clasp/clasp-pin-repos-commits.patch
+++ b/pkgs/development/compilers/clasp/clasp-pin-repos-commits.patch
@ -1,90 +0,0 @@
-diff --git a/repos.sexp b/repos.sexp
-index d31d4d62d..cd3238585 100644
--- a/repos.sexp
-+++ b/repos.sexp
-@@ -5,17 +5,17 @@
- ;;;;   4. src/ - C/C++ dependencies for iclasp
- ;;;;   5. extensions/ - extensions and their dependencies
- ((:name :ansi-test
-  :repository "https://gitlab.common-lisp.net/yitzchak/ansi-test"
-+  :repository "https://github.com/clasp-developers/ansi-test.git"
-   :directory "dependencies/ansi-test/"
-  :branch "add-expected-failures")
-+  :commit "33ae7c1ddd3e814bbe6f55b9e7a6a92b39404664")
-  (:name :cl-bench
-  :repository "https://gitlab.common-lisp.net/ansi-test/cl-bench.git"
-+  :repository "https://github.com/clasp-developers/cl-bench.git"
-   :directory "dependencies/cl-bench/"
-  :branch "master")
-+  :commit "7d184b4ef2a6272f0e3de88f6c243edb20f7071a")
-  (:name :cl-who
-   :repository "https://github.com/edicl/cl-who.git"
-   :directory "dependencies/cl-who/"
-  :branch "master")
-+  :commit "07dafe9b351c32326ce20b5804e798f10d4f273d")
-  (:name :quicklisp-client
-   :repository "https://github.com/quicklisp/quicklisp-client.git"
-   :directory "dependencies/quicklisp-client/"
-@@ -23,21 +23,21 @@
-  (:name :shasht
-   :repository "https://github.com/yitzchak/shasht.git"
-   :directory "dependencies/shasht/"
-  :branch "master")
-+  :commit "f38e866990c6b5381a854d63f7ea0227c87c2f6d")
-  (:name :trivial-do
-   :repository "https://github.com/yitzchak/trivial-do.git"
-   :directory "dependencies/trivial-do/"
-  :branch "master")
-+  :commit "a19f93227cb80a6bec8846655ebcc7998020bd7e")
-  (:name :trivial-gray-streams
-   :repository "https://github.com/trivial-gray-streams/trivial-gray-streams.git"
-   :directory "dependencies/trivial-gray-streams/"
-  :branch "master")
-+  :commit "2b3823edbc78a450db4891fd2b566ca0316a7876")
-  (:name :acclimation
-   :repository "https://github.com/robert-strandh/Acclimation.git"
-   :directory "src/lisp/kernel/contrib/Acclimation/"
-   :commit "dd15c86b0866fc5d8b474be0da15c58a3c04c45c")
-  (:name :alexandria
-  :repository "https://gitlab.common-lisp.net/alexandria/alexandria.git"
-+  :repository "https://github.com/clasp-developers/alexandria.git"
-   :directory "src/lisp/kernel/contrib/alexandria/"
-   :commit "v1.4")
-  (:name :anaphora
-@@ -128,7 +128,7 @@
-  (:name :lparallel
-   :repository "https://github.com/yitzchak/lparallel.git"
-   :directory "src/lisp/kernel/contrib/lparallel/"
-  :branch "fix-asdf-feature"
-+  :commit "9c98bf629328b27a5a3fbb7a637afd1db439c00f"
-   :extension :cando)
-  (:name :parser.common-rules
-   :repository "https://github.com/scymtym/parser.common-rules.git"
-@@ -150,9 +150,9 @@
-   :commit "87a447a8eaef9cf4fd1c16d407a49f9adaf8adad"
-   :extension :cando)
-  (:name :trivial-features ; Needed both by the host and eclasp
-  :repository "https://github.com/yitzchak/trivial-features.git"
-+  :repository "https://github.com/trivial-features/trivial-features.git"
-   :directory "src/lisp/kernel/contrib/trivial-features/"
-  :branch "asdf-feature")
-+  :commit "d249a62aaf022902398a7141ae17217251fc61db")
-  (:name :trivial-garbage
-   :repository "https://github.com/trivial-garbage/trivial-garbage.git"
-   :directory "src/lisp/kernel/contrib/trivial-garbage/"
-@@ -176,7 +176,7 @@
-   :directory "src/lisp/kernel/contrib/usocket/"
-   :commit "7ad6582cc1ce9e7fa5931a10e73b7d2f2688fa81")
-  (:name :asdf
-  :repository "https://gitlab.common-lisp.net/asdf/asdf.git"
-+  :repository "https://github.com/clasp-developers/asdf.git"
-   :directory "src/lisp/modules/asdf/"
-   :commit "3.3.5")
-  (:name :mps
-@@ -205,4 +205,4 @@
-   :repository "https://github.com/seqan/seqan.git"
-   :directory "extensions/seqan-clasp/seqan/"
-   :commit "f5f658343c366c9c3d44ba358ffc9317e78a09ed"
-  :extension :seqan-clasp))
-\ No newline at end of file
-+  :extension :seqan-clasp))
--- a/pkgs/development/compilers/clasp/default.nix
+++ b/pkgs/development/compilers/clasp/default.nix
@ -1,8 +1,7 @@
 { lib
 , llvmPackages_15
-, fetchFromGitHub
+, fetchzip
 , sbcl
-, git
 , pkg-config
 , fmt_9
 , gmpxx
@ -15,39 +14,28 @@

 let
  inherit (llvmPackages_15) stdenv llvm libclang;
-
-  # Gathered from https://github.com/clasp-developers/clasp/raw/2.2.0/repos.sexp
-  dependencies = import ./dependencies.nix {
-    inherit fetchFromGitHub;
-  };
-
-  # Shortened version of `_defaultUnpack`
-  unpackDependency = elem: ''
-    mkdir -p "source/${elem.directory}"
-    cp -pr --reflink=auto -- ${elem.src}/* "source/${elem.directory}"
-    chmod -R u+w -- "source/${elem.directory}"
-  '';
 in

-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
  pname = "clasp";
-  version = "2.2.0";
+  version = "2.6.0";

-  src = fetchFromGitHub {
-    owner = "clasp-developers";
-    repo = "clasp";
-    rev = "2.2.0";
-    hash = "sha256-gvUqUb0dftW1miiBcAPJur0wOunox4y2SUYeeJpR9R4=";
+  src = fetchzip {
+    url = "https://github.com/clasp-developers/clasp/releases/download/${version}/clasp-${version}.tar.gz";
+    hash = "sha256-SiQ4RMha6dMV7V2fh+UxtAIgEEH/6/hF9fe+bPtoGIw=";
  };

  patches = [
-    ./clasp-pin-repos-commits.patch
    ./remove-unused-command-line-argument.patch
  ];

+  # Workaround for https://github.com/clasp-developers/clasp/issues/1590
+  postPatch = ''
+    echo '(defmethod configure-unit (c (u (eql :git))))' >> src/koga/units.lisp
+  '';
+
  nativeBuildInputs = [
    sbcl
-    git
    pkg-config
    fmt_9
    gmpxx
@ -61,13 +49,12 @@ stdenv.mkDerivation {

  ninjaFlags = [ "-C" "build" ];

-  postUnpack = lib.concatStringsSep "\n" (builtins.map unpackDependency dependencies);
-
  configurePhase = ''
    export SOURCE_DATE_EPOCH=1
    export ASDF_OUTPUT_TRANSLATIONS=$(pwd):$(pwd)/__fasls
    sbcl --script koga \
      --skip-sync \
+      --build-mode=bytecode-faso \
      --cc=$NIX_CC/bin/cc \
      --cxx=$NIX_CC/bin/c++ \
      --reproducible-build \
--- a/pkgs/development/compilers/clasp/dependencies.nix
+++ b/pkgs/development/compilers/clasp/dependencies.nix
@ -1,457 +0,0 @@
-# Gathered from https://github.com/clasp-developers/clasp/raw/2.2.0/repos.sexp
-# Generated using https://gist.github.com/philiptaron/8ea1394b049c2ca975e4b03965d9ac00
-# and then light editing using Vim
-
-{ fetchFromGitHub }:
-
-[
-  {
-    directory = "dependencies/ansi-test/";
-    src = fetchFromGitHub {
-      owner = "clasp-developers";
-      repo = "ansi-test";
-      rev = "33ae7c1ddd3e814bbe6f55b9e7a6a92b39404664";
-      hash = "sha256-dGF7CScvfPNMRxQXJM4v6Vfc/VjdUXNz0yCjUOsYM3I=";
-    };
-  }
-
-  {
-    directory = "dependencies/cl-bench/";
-    src = fetchFromGitHub {
-      owner = "clasp-developers";
-      repo = "cl-bench";
-      rev = "7d184b4ef2a6272f0e3de88f6c243edb20f7071a";
-      hash = "sha256-7ZEIWNEj7gzYFMTqW7nnZgjNE1zoTAMeJHj547gRtPs=";
-    };
-  }
-
-  {
-    directory = "dependencies/cl-who/";
-    src = fetchFromGitHub {
-      owner = "edicl";
-      repo = "cl-who";
-      rev = "07dafe9b351c32326ce20b5804e798f10d4f273d";
-      hash = "sha256-5T762W3qetAjXtHP77ko6YZR6w5bQ04XM6QZPELQu+U=";
-    };
-  }
-
-  {
-    directory = "dependencies/quicklisp-client/";
-    src = fetchFromGitHub {
-      owner = "quicklisp";
-      repo = "quicklisp-client";
-      rev = "8b63e00b3a2b3f96e24c113d7601dd03a128ce94";
-      hash = "sha256-1HLVPhl8aBaeG8dRLxBh0j0X/0wqFeNYK1CEfiELToA=";
-    };
-  }
-
-  {
-    directory = "dependencies/shasht/";
-    src = fetchFromGitHub {
-      owner = "yitzchak";
-      repo = "shasht";
-      rev = "f38e866990c6b5381a854d63f7ea0227c87c2f6d";
-      hash = "sha256-Ki5JNevMvVZoUz3tP6cv7qA4xDLzjd2MXmf4x9ew5bw=";
-    };
-  }
-
-  {
-    directory = "dependencies/trivial-do/";
-    src = fetchFromGitHub {
-      owner = "yitzchak";
-      repo = "trivial-do";
-      rev = "a19f93227cb80a6bec8846655ebcc7998020bd7e";
-      hash = "sha256-Tjd9VJan6pQpur292xtklvb28MDGGjq2+ub5T6o6FG8=";
-    };
-  }
-
-  {
-    directory = "dependencies/trivial-gray-streams/";
-    src = fetchFromGitHub {
-      owner = "trivial-gray-streams";
-      repo = "trivial-gray-streams";
-      rev = "2b3823edbc78a450db4891fd2b566ca0316a7876";
-      hash = "sha256-9vN74Gum7ihKSrCygC3hRLczNd15nNCWn5r60jjHN8I=";
-    };
-  }
-
-  {
-    directory = "src/lisp/kernel/contrib/Acclimation/";
-    src = fetchFromGitHub {
-      owner = "robert-strandh";
-      repo = "Acclimation";
-      rev = "dd15c86b0866fc5d8b474be0da15c58a3c04c45c";
-      hash = "sha256-AuoVdv/MU73A8X+GsxyG0K+xgzCKLQfbpu79oTERgmI=";
-    };
-  }
-
-  {
-    directory = "src/lisp/kernel/contrib/alexandria/";
-    src = fetchFromGitHub {
-      owner = "clasp-developers";
-      repo = "alexandria";
-      rev = "49e82add16cb9f1ffa72c77cd687271247181ff3";
-      hash = "sha256-1Hzxt65dZvgOFIljjjlSGgKYkj+YBLwJCACi5DZsKmQ=";
-    };
-  }
-
-  {
-    directory = "src/lisp/kernel/contrib/anaphora/";
-    src = fetchFromGitHub {
-      owner = "spwhitton";
-      repo = "anaphora";
-      rev = "bcf0f7485eec39415be1b2ec6ca31cf04a8ab5c5";
-      hash = "sha256-CzApbUmdDmD+BWPcFGJN0rdZu991354EdTDPn8FSRbc=";
-    };
-  }
-
-  {
-    directory = "src/lisp/kernel/contrib/architecture.builder-protocol/";
-    src = fetchFromGitHub {
-      owner = "scymtym";
-      repo = "architecture.builder-protocol";
-      rev = "0c1a9ebf9ab14e699c2b9c85fc20265b8c5364dd";
-      hash = "sha256-AdZeI4UCMnmuYpmSaWqIt+egdkNN3kzEn/zOqIBTnww=";
-    };
-  }
-
-  {
-    directory = "src/lisp/kernel/contrib/array-utils/";
-    src = fetchFromGitHub {
-      owner = "Shinmera";
-      repo = "array-utils";
-      rev = "5acd90fa3d9703cea33e3825334b256d7947632f";
-      hash = "sha256-Br3H39F+hqYnTgYtVezuRhwRQJwJlxohu+M033sYPOI=";
-    };
-  }
-
-  {
-    directory = "src/lisp/kernel/contrib/babel/";
-    src = fetchFromGitHub {
-      owner = "cl-babel";
-      repo = "babel";
-      rev = "f892d0587c7f3a1e6c0899425921b48008c29ee3";
-      hash = "sha256-U2E8u3ZWgH9eG4SV/t9CE1dUpcthuQMXgno/W1Ow2RE=";
-    };
-  }
-
-  {
-    directory = "src/lisp/kernel/contrib/bordeaux-threads/";
-    src = fetchFromGitHub {
-      owner = "sionescu";
-      repo = "bordeaux-threads";
-      rev = "3d25cd01176f7c9215ebc792c78313cb99ff02f9";
-      hash = "sha256-KoOaIKQZaZgEbtM6PGVwQn/xg+/slt+uloR4EaMlBeg=";
-    };
-  }
-
-  {
-    directory = "src/lisp/kernel/contrib/cffi/";
-    src = fetchFromGitHub {
-      owner = "cffi";
-      repo = "cffi";
-      rev = "9c912e7b89eb09dd347d3ebae16e4dc5f53e5717";
-      hash = "sha256-umt0HmX7M3SZM2VSrxqxUmNt9heTG/Ulwzphs2NRYTs=";
-    };
-  }
-
-  {
-    directory = "src/lisp/kernel/contrib/cl-markup/";
-    src = fetchFromGitHub {
-      owner = "arielnetworks";
-      repo = "cl-markup";
-      rev = "e0eb7debf4bdff98d1f49d0f811321a6a637b390";
-      hash = "sha256-50LZDaNfXhOZ6KoTmXClo5Bo2D9q1zbdCLSFkwqZhoI=";
-    };
-  }
-
-  {
-    directory = "src/lisp/kernel/contrib/cl-ppcre/";
-    src = fetchFromGitHub {
-      owner = "edicl";
-      repo = "cl-ppcre";
-      rev = "b4056c5aecd9304e80abced0ef9c89cd66ecfb5e";
-      hash = "sha256-6xeiSeYVwzAaisLQP/Bjqlc/Rhw8JMy0FT93hDQi5Y8=";
-    };
-  }
-
-  {
-    directory = "src/lisp/kernel/contrib/cl-svg/";
-    src = fetchFromGitHub {
-      owner = "wmannis";
-      repo = "cl-svg";
-      rev = "1e988ebd2d6e2ee7be4744208828ef1b59e5dcdc";
-      hash = "sha256-nwOvHGK0wIOZxAnZ68xyOhchAp8CBl/wsfRI42v8NYc=";
-    };
-  }
-
-  {
-    directory = "src/lisp/kernel/contrib/Cleavir/";
-    src = fetchFromGitHub {
-      owner = "s-expressionists";
-      repo = "Cleavir";
-      rev = "a73d313735447c63b4b11b6f8984f9b1e3e74ec9";
-      hash = "sha256-VQ8sB5W7JYnVsvfx2j7d2LQcECst79MCIW9QSuwm8GA=";
-    };
-  }
-
-  {
-    directory = "src/lisp/kernel/contrib/closer-mop/";
-    src = fetchFromGitHub {
-      owner = "pcostanza";
-      repo = "closer-mop";
-      rev = "d4d1c7aa6aba9b4ac8b7bb78ff4902a52126633f";
-      hash = "sha256-bHBYMBz45EOY727d4BWP75gRV4nzRAWxAlivPRzYrKo=";
-    };
-  }
-
-  {
-    directory = "src/lisp/kernel/contrib/Concrete-Syntax-Tree/";
-    src = fetchFromGitHub {
-      owner = "s-expressionists";
-      repo = "Concrete-Syntax-Tree";
-      rev = "4f01430c34f163356f3a2cfbf0a8a6963ff0e5ac";
-      hash = "sha256-0XfLkihztWUhqu7DrFiuwcEx/x+EILEivPfsHb5aMZk=";
-    };
-  }
-
-  {
-    directory = "src/lisp/kernel/contrib/documentation-utils/";
-    src = fetchFromGitHub {
-      owner = "Shinmera";
-      repo = "documentation-utils";
-      rev = "98630dd5f7e36ae057fa09da3523f42ccb5d1f55";
-      hash = "sha256-uMUyzymyS19ODiUjQbE/iJV7HFeVjB45gbnWqfGEGCU=";
-    };
-  }
-
-  {
-    directory = "src/lisp/kernel/contrib/Eclector/";
-    src = fetchFromGitHub {
-      owner = "s-expressionists";
-      repo = "Eclector";
-      rev = "dddb4d8af3eae78017baae7fb9b99e73d2a56e6b";
-      hash = "sha256-OrkWEI5HGlmejH9gg7OwJz2QXgAgE3kDHwen5yzhKgM=";
-    };
-  }
-
-  {
-    directory = "src/lisp/kernel/contrib/esrap/";
-    src = fetchFromGitHub {
-      owner = "scymtym";
-      repo = "esrap";
-      rev = "7588b430ad7c52f91a119b4b1c9a549d584b7064";
-      hash = "sha256-C0GiTyRna9BMIMy1/XdMZAkhjpLaoAEF1+ps97xQyMY=";
-    };
-  }
-
-  {
-    directory = "src/lisp/kernel/contrib/global-vars/";
-    src = fetchFromGitHub {
-      owner = "lmj";
-      repo = "global-vars";
-      rev = "c749f32c9b606a1457daa47d59630708ac0c266e";
-      hash = "sha256-bXxeNNnFsGbgP/any8rR3xBvHE9Rb4foVfrdQRHroxo=";
-    };
-  }
-
-  {
-    directory = "src/lisp/kernel/contrib/let-plus/";
-    src = fetchFromGitHub {
-      owner = "sharplispers";
-      repo = "let-plus";
-      rev = "455e657e077235829b197f7ccafd596fcda69e30";
-      hash = "sha256-SyZRx9cyuEN/h4t877TOWw35caQqMf2zSGZ9Qg22gAE=";
-    };
-  }
-
-  {
-    directory = "src/lisp/kernel/contrib/cl-netcdf/";
-    src = fetchFromGitHub {
-      owner = "clasp-developers";
-      repo = "cl-netcdf";
-      rev = "593c6c47b784ec02e67580aa12a7775ed6260200";
-      hash = "sha256-3VCTSsIbk0GovCM+rWPZj2QJdYq+UZksjfRd18UYY5s=";
-    };
-  }
-
-  {
-    directory = "src/lisp/kernel/contrib/lparallel/";
-    src = fetchFromGitHub {
-      owner = "yitzchak";
-      repo = "lparallel";
-      rev = "9c98bf629328b27a5a3fbb7a637afd1db439c00f";
-      hash = "sha256-sUM1WKXxZk7un64N66feXh21m7yzJsdcaWC3jIOd2W4=";
-    };
-  }
-
-  {
-    directory = "src/lisp/kernel/contrib/parser.common-rules/";
-    src = fetchFromGitHub {
-      owner = "scymtym";
-      repo = "parser.common-rules";
-      rev = "b7652db5e3f98440dce2226d67a50e8febdf7433";
-      hash = "sha256-ik+bteIjBN6MfMFiRBjn/nP7RBzv63QgoRKVi4F8Ho0=";
-    };
-  }
-
-  {
-    directory = "src/lisp/kernel/contrib/plump/";
-    src = fetchFromGitHub {
-      owner = "Shinmera";
-      repo = "plump";
-      rev = "d8ddda7514e12f35510a32399f18e2b26ec69ddc";
-      hash = "sha256-FjeZAWD81137lXWyN/RIr+L+anvwh/Glze497fcpHUY=";
-    };
-  }
-
-  {
-    directory = "src/lisp/kernel/contrib/split-sequence/";
-    src = fetchFromGitHub {
-      owner = "sharplispers";
-      repo = "split-sequence";
-      rev = "89a10b4d697f03eb32ade3c373c4fd69800a841a";
-      hash = "sha256-faF2EiQ+xXWHX9JlZ187xR2mWhdOYCpb4EZCPNoZ9uQ=";
-    };
-  }
-
-  {
-    directory = "src/lisp/kernel/contrib/static-vectors/";
-    src = fetchFromGitHub {
-      owner = "sionescu";
-      repo = "static-vectors";
-      rev = "87a447a8eaef9cf4fd1c16d407a49f9adaf8adad";
-      hash = "sha256-q4E+VPX/pOyuCdzJZ6CFEIiR58E6JIxJySROl/WcMyI=";
-    };
-  }
-
-  {
-    directory = "src/lisp/kernel/contrib/trivial-features/";
-    src = fetchFromGitHub {
-      owner = "trivial-features";
-      repo = "trivial-features";
-      rev = "d249a62aaf022902398a7141ae17217251fc61db";
-      hash = "sha256-g50OSfrMRH5hTRy077C1kCln2vz0Qeb1oq9qHh7zY2Q=";
-    };
-  }
-
-  {
-    directory = "src/lisp/kernel/contrib/trivial-garbage/";
-    src = fetchFromGitHub {
-      owner = "trivial-garbage";
-      repo = "trivial-garbage";
-      rev = "b3af9c0c25d4d4c271545f1420e5ea5d1c892427";
-      hash = "sha256-CCLZHHW3/0Id0uHxrbjf/WM3yC8netkcQ8p9Qtssvc4=";
-    };
-  }
-
-  {
-    directory = "src/lisp/kernel/contrib/trivial-http/";
-    src = fetchFromGitHub {
-      owner = "gwkkwg";
-      repo = "trivial-http";
-      rev = "ca45656587f36378305de1a4499c308acc7a03af";
-      hash = "sha256-0VKWHJYn1XcXVNHduxKiABe7xFUxj8M4/u92Usvq54o=";
-    };
-  }
-
-  {
-    directory = "src/lisp/kernel/contrib/trivial-indent/";
-    src = fetchFromGitHub {
-      owner = "Shinmera";
-      repo = "trivial-indent";
-      rev = "8d92e94756475d67fa1db2a9b5be77bc9c64d96c";
-      hash = "sha256-G+YCIB3bKN4RotJUjT/6bnivSBalseFRhIlwsEm5EUk=";
-    };
-  }
-
-  {
-    directory = "src/lisp/kernel/contrib/trivial-with-current-source-form/";
-    src = fetchFromGitHub {
-      owner = "scymtym";
-      repo = "trivial-with-current-source-form";
-      rev = "3898e09f8047ef89113df265574ae8de8afa31ac";
-      hash = "sha256-IKJOyJYqGBx0b6Oomddvb+2K6q4W508s3xnplleMJIQ=";
-    };
-  }
-
-  {
-    directory = "src/lisp/kernel/contrib/usocket/";
-    src = fetchFromGitHub {
-      owner = "usocket";
-      repo = "usocket";
-      rev = "7ad6582cc1ce9e7fa5931a10e73b7d2f2688fa81";
-      hash = "sha256-0HiItuc6fV70Rpk/5VevI1I0mGnY1JJvhnyPpx6r0uo=";
-    };
-  }
-
-  {
-    directory = "src/lisp/modules/asdf/";
-    src = fetchFromGitHub {
-      owner = "clasp-developers";
-      repo = "asdf";
-      rev = "97b279faf3cc11a5cfdd19b5325025cc8ec1e7bd";
-      hash = "sha256-4LhF+abor5NK4HgbGCYM5kSaH7TLISW5w5HXYOm4wqw=";
-    };
-  }
-
-  {
-    directory = "src/mps/";
-    src = fetchFromGitHub {
-      owner = "Ravenbrook";
-      repo = "mps";
-      rev = "b8a05a3846430bc36c8200f24d248c8293801503";
-      hash = "sha256-Zuc77cdap0xNYEqM8IkMQMUMY0f5QZ84uFmKgXjDXeA=";
-    };
-  }
-
-  {
-    directory = "src/bdwgc/";
-    src = fetchFromGitHub {
-      owner = "ivmai";
-      repo = "bdwgc";
-      rev = "036becee374b84fed5d56a6df3ae097b7cc0ff73";
-      hash = "sha256-WB1sFfVL6lWL+DEypg3chCJS/w0J4tPGi5tL1o3W73U=";
-    };
-  }
-
-  {
-    directory = "src/libatomic_ops/";
-    src = fetchFromGitHub {
-      owner = "ivmai";
-      repo = "libatomic_ops";
-      rev = "4b7d0b9036f9a645b03010dad1c7b7f86ea75772";
-      hash = "sha256-zThdbX2/l5/ZZVYobJf9KAd+IjIDIrk+08SUhTQs2gE=";
-    };
-  }
-
-  {
-    directory = "extensions/cando/";
-    src = fetchFromGitHub {
-      owner = "cando-developers";
-      repo = "cando";
-      rev = "a6934eddfce2ff1cb7131affce427ce652392f08";
-      hash = "sha256-AUmBLrk7lofJNagvI3KhPebvV8GkrDbBXrsAa3a1Bwo=";
-    };
-  }
-
-  {
-    directory = "extensions/seqan-clasp/";
-    src = fetchFromGitHub {
-      owner = "clasp-developers";
-      repo = "seqan-clasp";
-      rev = "5caa2e1e6028525276a6b6ba770fa6e334563d58";
-      hash = "sha256-xAvAd/kBr8n9SSw/trgWTqDWQLmpOp8+JX5L+JO2+Ls=";
-    };
-  }
-
-  {
-    directory = "extensions/seqan-clasp/seqan/";
-    src = fetchFromGitHub {
-      owner = "seqan";
-      repo = "seqan";
-      rev = "f5f658343c366c9c3d44ba358ffc9317e78a09ed";
-      hash = "sha256-AzZlONf7SNxCa9+SKQFC/rA6fx6rhWH96caZSmKnlsU=";
-    };
-  }
-]
--- a/pkgs/development/interpreters/lfe/2.1.nix
+++ b/pkgs/development/interpreters/lfe/2.1.nix
@ -1,7 +1,7 @@
 { mkDerivation }:

 mkDerivation {
-  version = "2.1.3";
-  hash = "sha256-HUOVBzUaU0ixIfPPctwR2TPijxJjcFY3dJ8Z7Ot2bpE=";
-  maximumOTPVersion = "26";
+  version = "2.1.4";
+  hash = "sha256-mDavRI2it0SrSR0iBItm2MfjI+F/zCy38YSd2KpE0Hs=";
+  maximumOTPVersion = "27";
 }
--- a/pkgs/development/libraries/crocoddyl/default.nix
+++ b/pkgs/development/libraries/crocoddyl/default.nix
@ -10,14 +10,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "crocoddyl";
-  version = "2.0.2";
+  version = "2.1.0";

  src = fetchFromGitHub {
    owner = "loco-3d";
    repo = finalAttrs.pname;
    rev = "v${finalAttrs.version}";
-    fetchSubmodules = true;
-    hash = "sha256-MsAXHfxLNlIK/PbtVTjvBN1Jk3dyGEkfpj3/98nExj4=";
+    hash = "sha256-SVV9sleDXLm2QJmNgL25XLHC3y5bfKab4GSlE8jbT8w=";
  };

  strictDeps = true;
@ -50,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
  pythonImportsCheck = [
    "crocoddyl"
  ];
-  checkInputs = lib.optionals (pythonSupport) [
+  checkInputs = lib.optionals pythonSupport [
    python3Packages.scipy
  ];

--- a/pkgs/development/libraries/example-robot-data/default.nix
+++ b/pkgs/development/libraries/example-robot-data/default.nix
@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, fetchpatch
 , cmake
 , pythonSupport ? false
 , python3Packages
@ -20,6 +21,16 @@ stdenv.mkDerivation (finalAttrs: {

  strictDeps = true;

+  patches = [
+    # Temporary patch for pinocchio v3.0.0 compatibility.
+    # Should be removed on next example-robot-data release
+    (fetchpatch {
+      name = "pin3.patch";
+      url = "https://github.com/Gepetto/example-robot-data/pull/217/commits/a605ceec857005cde153ec5895e227205eb7a5c3.patch";
+      hash = "sha256-cvAWFytrU2XVggo/nCg8cuLcaZBTACXg6LxjL/6YMPs=";
+    })
+  ];
+
  nativeBuildInputs = [
    cmake
  ];
--- a/pkgs/development/libraries/pinocchio/default.nix
+++ b/pkgs/development/libraries/pinocchio/default.nix
@ -15,13 +15,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "pinocchio";
-  version = "2.7.1";
+  version = "3.0.0";

  src = fetchFromGitHub {
    owner = "stack-of-tasks";
    repo = finalAttrs.pname;
    rev = "v${finalAttrs.version}";
-    hash = "sha256-Ks5dvKi5iutjM+iovDOYGx3vsr45JWRqGOXV8+Ko4gg=";
+    hash = "sha256-h4NzfS27+jWyHbegxF+pgN6JzJdVAoM16J6G/9uNJc4=";
  };

  # example-robot-data models are used in checks.
--- a/pkgs/development/libraries/process-cpp/default.nix
+++ b/pkgs/development/libraries/process-cpp/default.nix
@ -1,50 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitLab
-, cmake
-, boost
-, properties-cpp
-, pkg-config
-}:
-
-stdenv.mkDerivation rec {
-  pname = "process-cpp";
-  version = "unstable-2021-05-11";
-
-  src = fetchFromGitLab {
-    domain = "gitlab.com";
-    owner = "ubports";
-    repo = "development/core/lib-cpp/process-cpp";
-    rev = "ee6d99a3278343f5fdcec7ed3dad38763e257310";
-    sha256 = "sha256-jDYXKCzrg/ZGFC2xpyfkn/f7J3t0cdOwHK2mLlYWNN0=";
-  };
-
-  postPatch = ''
-    # Excludes tests from tainting nativeBuildInputs with their dependencies when not being run
-    # Tests fail upon verifying OOM score adjustment via /proc/<pid>/oom_score
-    # [ RUN      ] LinuxProcess.adjusting_proc_oom_score_adj_works
-    # /build/source/tests/linux_process_test.cpp:83: Failure
-    # Value of: is_approximately_equal(oom_score.value, core::posix::linux::proc::process::OomScoreAdj::max_value())
-    #   Actual: false (333 > 10)
-    # Expected: true
-    sed -i '/tests/d' CMakeLists.txt
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-  ];
-
-  buildInputs = [
-    boost
-    properties-cpp
-  ];
-
-  meta = with lib; {
-    description = "A simple convenience library for handling processes in C++11";
-    homepage = "https://gitlab.com/ubports/development/core/lib-cpp/process-cpp";
-    license = with licenses; [ gpl3Only lgpl3Only ];
-    maintainers = with maintainers; [ onny ];
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/development/libraries/sqlcipher/default.nix
+++ b/pkgs/development/libraries/sqlcipher/default.nix
@ -13,13 +13,13 @@

 stdenv.mkDerivation rec {
  pname = "sqlcipher";
-  version = "4.5.7";
+  version = "4.6.0";

  src = fetchFromGitHub {
    owner = "sqlcipher";
    repo = "sqlcipher";
    rev = "v${version}";
-    hash = "sha256-0cPb78CTxrCdDZAY8hyt7Kid5DKszDl1v+6XNKyNrLM=";
+    hash = "sha256-ds+0ckQiHikNMr4Xf/wCWwQySpadGgnccENd6u6gIzQ=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/lisp-modules/asdf/3.3.nix
+++ b/pkgs/development/lisp-modules/asdf/3.3.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, texinfo, texLive, perl }:
+{ lib, stdenv, fetchurl, fetchpatch, texinfo, texLive, perl }:

 stdenv.mkDerivation rec {
  pname = "asdf";
@ -9,6 +9,14 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-NkjvNlLqJnBAfOxC9ECTtmuS5K+0v5ZXOw2xt8l7vgk=";
  };

+  patches = [
+    # Clasp bytecode support
+    (fetchpatch {
+      url = "https://github.com/clasp-developers/asdf/compare/fe6e3ab741c71ecebc8503e20637d4c940326421..615771b3d0ee6ebb158134769e88ba421c2ea7d1.diff";
+      hash = "sha256-jrv/vH4uxLVvaCK4UicNzIePQ12lscA0auwgTMb4QwI=";
+    })
+  ];
+
  strictDeps = true;
  nativeBuildInputs = [
    texinfo
--- a/pkgs/development/ocaml-modules/functoria/default.nix
+++ b/pkgs/development/ocaml-modules/functoria/default.nix
@ -12,7 +12,8 @@ buildDunePackage {

  propagatedBuildInputs = [ cmdliner rresult astring fmt logs bos fpath emile uri ];

-  doCheck = true;
+  # Tests are not compatible with cmdliner 1.3
+  doCheck = false;
  checkInputs = [ alcotest functoria-runtime ];

  meta = with lib; {
--- a/pkgs/development/python-modules/dropbox/default.nix
+++ b/pkgs/development/python-modules/dropbox/default.nix
@ -7,7 +7,6 @@
  requests,
  six,
  stone,
-  urllib3,
  mock,
  pytest-mock,
  pytestCheckHook,
@ -18,7 +17,7 @@

 buildPythonPackage rec {
  pname = "dropbox";
-  version = "12.0.0";
+  version = "12.0.2";
  pyproject = true;

  disabled = pythonOlder "3.7";
@ -32,7 +31,7 @@ buildPythonPackage rec {
    owner = "dropbox";
    repo = "dropbox-sdk-python";
    rev = "refs/tags/v${version}";
-    hash = "sha256-0MDm6NB+0vkN8QRSHvuDYEyYhYQWQD4jsctyd5fLdwE=";
+    hash = "sha256-9Fsh06V226vIyJhrlLkh9Xr4UGoEIISnIFCtuKqI218=";
  };

  build-system = [ setuptools ];
@ -41,7 +40,6 @@ buildPythonPackage rec {
    requests
    six
    stone
-    urllib3
  ];

  nativeCheckInputs = [
@ -69,9 +67,7 @@ buildPythonPackage rec {
  # https://github.com/dropbox/dropbox-sdk-python/commit/75596daf316b4a806f18057e2797a15bdf83cf6d
  # This will be the last major version to support Python 2, so version bounds might be more reasonable again in the future.
  pythonRelaxDeps = [
-    "requests"
    "stone"
-    "urllib3"
  ];

  # Set SCOPED_USER_DROPBOX_TOKEN environment variable to a valid value.
--- a/pkgs/development/python-modules/ionhash/default.nix
+++ b/pkgs/development/python-modules/ionhash/default.nix
@ -46,5 +46,6 @@ buildPythonPackage rec {
    homepage = "https://github.com/amzn/ion-hash-python";
    license = licenses.asl20;
    maintainers = [ maintainers.terlar ];
+    broken = true; # last successful build 2023-09-28
  };
 }
--- a/pkgs/development/python-modules/openai/default.nix
+++ b/pkgs/development/python-modules/openai/default.nix
@ -25,7 +25,7 @@

 buildPythonPackage rec {
  pname = "openai";
-  version = "1.30.4";
+  version = "1.31.0";
  pyproject = true;

  disabled = pythonOlder "3.7.1";
@ -34,7 +34,7 @@ buildPythonPackage rec {
    owner = "openai";
    repo = "openai-python";
    rev = "refs/tags/v${version}";
-    hash = "sha256-tzHU5yO7o7wxdqYnp7tBctvWGY7SYq5u6VnU3iPGPuk=";
+    hash = "sha256-En7lqi9dF3DLX+LkwgCeagt2//0JZgANZPVlFM0fHZs=";
  };

  build-system = [
--- a/pkgs/development/tools/dump_syms/default.nix
+++ b/pkgs/development/tools/dump_syms/default.nix
@ -17,7 +17,7 @@

 let
  pname = "dump_syms";
-  version = "2.3.1";
+  version = "2.3.3";
 in
 rustPlatform.buildRustPackage {
  inherit pname version;
@ -26,10 +26,10 @@ rustPlatform.buildRustPackage {
    owner = "mozilla";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-mSup3AMYsPu/Az6QXhdCFSxGcIpel4zNN0g/95gPDS0=";
+    hash = "sha256-pZlWA7LZeMb+ZhnfQh9MzvDDlre1kkPc6aSVNZcVi/w=";
  };

-  cargoSha256 = "sha256-INzCyF/tvCp4L6Btrw8AGTBAgdFiBlywzO3+SSE4beI=";
+  cargoSha256 = "sha256-srphb7jFSJB08hSShk3f5QYPoYu8UwbUzkzn0zpMqyg=";

  nativeBuildInputs = [
    pkg-config
@ -54,7 +54,7 @@ rustPlatform.buildRustPackage {
  };

  meta = with lib; {
-    changelog = "https://github.com/mozilla/dump_syms/releases/tag/v${version}";
+    changelog = "https://github.com/mozilla/dump_syms/blob/v${version}/CHANGELOG.md";
    description = "Command-line utility for parsing the debugging information the compiler provides in ELF or stand-alone PDB files";
    mainProgram = "dump_syms";
    license = licenses.asl20;
--- a/pkgs/development/tools/misc/gef/default.nix
+++ b/pkgs/development/tools/misc/gef/default.nix
@ -21,13 +21,13 @@ let

 in stdenv.mkDerivation rec {
  pname = "gef";
-  version = "2024.01";
+  version = "2024.06";

  src = fetchFromGitHub {
    owner = "hugsy";
    repo = "gef";
    rev = version;
-    sha256 = "sha256-uSUr2NFvj7QIlvG3RWYm7A9Xx7a4JYkbAQld7c7+C7g=";
+    sha256 = "sha256-fo8hC2T2WDcG0MQffPm2QBPR89EPiqctkUJC40PeyWg=";
  };

  dontBuild = true;
--- a/pkgs/misc/tmux-plugins/default.nix
+++ b/pkgs/misc/tmux-plugins/default.nix
@ -818,4 +818,23 @@ in rec {
      sha256 = "hRvkBf+YrWycecnDixAsD4CAHg3KsioomfJ/nLl5Zgs=";
    };
  };
+
+  tmux-nova = mkTmuxPlugin rec {
+    pluginName = "tmux-nova";
+    rtpFilePath = "nova.tmux";
+    version = "1.2.0";
+    src = fetchFromGitHub {
+      owner = "o0th";
+      repo = "tmux-nova";
+      rev = "v${version}";
+      sha256 = "16llz3nlyw88lyd8mmj27i0ncyhpfjj5c1yikngf7nxcqsbjmcnh";
+    };
+    meta = with lib; {
+      homepage = "https://github.com/o0th/tmux-nova";
+      description = "tmux-nova theme";
+      license = licenses.mit;
+      platforms = platforms.unix;
+      maintainers = with maintainers; [ o0th ];
+    };
+  };
 }
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@ -38,12 +38,12 @@ in

 stdenv.mkDerivation rec {
  pname = "rabbitmq-server";
-  version = "3.12.13";
+  version = "3.13.3";

  # when updating, consider bumping elixir version in all-packages.nix
  src = fetchurl {
    url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz";
-    hash = "sha256-UjUkiS8ay66DDzeW9EXOJPQVHHxC1sXT8mCn+KVXSQ4=";
+    hash = "sha256-CPnoPK3tBKKmIo8IioUCUWkw6+sdvzRaAngseRZ8eUM=";
  };

  nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync python3 ];
@ -85,12 +85,12 @@ stdenv.mkDerivation rec {
    vm-test = nixosTests.rabbitmq;
  };

-  meta = with lib; {
+  meta = {
    homepage = "https://www.rabbitmq.com/";
    description = "An implementation of the AMQP messaging protocol";
    changelog = "https://github.com/rabbitmq/rabbitmq-server/releases/tag/v${version}";
-    license = licenses.mpl20;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ turion ];
+    license = lib.licenses.mpl20;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ turion ];
  };
 }
--- a/pkgs/servers/homepage-dashboard/default.nix
+++ b/pkgs/servers/homepage-dashboard/default.nix
@ -33,7 +33,7 @@ buildNpmPackage rec {
    owner = "gethomepage";
    repo = "homepage";
    rev = "v${version}";
-    hash = "sha256-EgZhk3NtuIjvFab0y9UdGYDR+Iw/0vg/uFxnzqKuloo=";
+    hash = "sha256-K1brnHA4e8lHIXwpajdY6f+3/pgP8My4QznoYLmZNWw=";
  };

  npmDepsHash = "sha256-jYZUVwrOxoAbfHHSBkN5IlYhC6yZVVwRoZErkbYrjUs=";
--- a/pkgs/tools/audio/acousticbrainz-client/default.nix
+++ b/pkgs/tools/audio/acousticbrainz-client/default.nix
@ -1,42 +0,0 @@
-{ lib, fetchFromGitHub, python3Packages, essentia-extractor }:
-
-python3Packages.buildPythonApplication rec {
-  pname = "acousticbrainz-client";
-  version = "0.1";
-
-  src = fetchFromGitHub {
-    owner = "MTG";
-    repo = "acousticbrainz-client";
-    rev = version;
-    sha256 = "1g1nxh58939vysfxplrgdz366dlqnic05pkzbqh75m79brg4yrv1";
-  };
-
-  propagatedBuildInputs = [ essentia-extractor python3Packages.requests ];
-
-  postPatch = ''
-    # The installer needs the streaming_extractor_music binary in the source directoy,
-    # so we provide a symlink to it.
-    ln -s ${essentia-extractor}/bin/streaming_extractor_music streaming_extractor_music
-  '';
-
-  postInstall = ''
-    # The installer includes a copy of the streaming_extractor_music binary (not a symlink),
-    # which we don't need, because the wrapper adds essentia-extractor/binary to PATH.
-    rm $out/bin/streaming_extractor_music
-  '';
-
-  # Tests seem to be broken, but the tool works
-  doCheck = false;
-
-  pythonImportsCheck = [ "abz" ];
-
-  meta = with lib; {
-    description = "A client to upload data to an AcousticBrainz server";
-    license = licenses.gpl3Plus;
-    homepage = "https://github.com/MTG/acousticbrainz-client";
-    # essentia-extractor is only available for those platforms
-    platforms = [ "x86_64-linux" "i686-linux" ];
-    maintainers = with maintainers; [ ];
-    mainProgram = "abzsubmit";
-  };
-}
--- a/pkgs/tools/audio/beets/builtin-plugins.nix
+++ b/pkgs/tools/audio/beets/builtin-plugins.nix
@ -13,8 +13,7 @@
 , ...
 }: {
  absubmit = {
-    enable = lib.elem stdenv.hostPlatform.system essentia-extractor.meta.platforms;
-    wrapperBins = [ essentia-extractor ];
+    deprecated = true;
    testPaths = [ ];
  };
  acousticbrainz.propagatedBuildInputs = [ python3Packages.requests ];
--- a/pkgs/tools/audio/beets/common.nix
+++ b/pkgs/tools/audio/beets/common.nix
@ -55,7 +55,15 @@ let
  };

  basePlugins = lib.mapAttrs (_: a: { builtin = true; } // a) (import ./builtin-plugins.nix inputs);
-  allPlugins = lib.mapAttrs (n: a: mkPlugin { name = n; } // a) (lib.recursiveUpdate basePlugins pluginOverrides);
+  pluginOverrides' = lib.mapAttrs
+    (plugName: lib.throwIf
+      (basePlugins.${plugName}.deprecated or false)
+      "beets evaluation error: Plugin ${plugName} was enabled in pluginOverrides, but it has been removed. Remove the override to fix evaluation."
+    )
+    pluginOverrides
+  ;
+
+  allPlugins = lib.mapAttrs ( n: a: mkPlugin { name = n; } // a) (lib.recursiveUpdate basePlugins pluginOverrides');
  builtinPlugins = lib.filterAttrs (_: p: p.builtin) allPlugins;
  enabledPlugins = lib.filterAttrs (_: p: p.enable) allPlugins;
  disabledPlugins = lib.filterAttrs (_: p: !p.enable) allPlugins;
--- a/pkgs/tools/misc/tbls/default.nix
+++ b/pkgs/tools/misc/tbls/default.nix
@ -9,16 +9,16 @@

 buildGoModule rec {
  pname = "tbls";
-  version = "1.75.0";
+  version = "1.76.0";

  src = fetchFromGitHub {
    owner = "k1LoW";
    repo = "tbls";
    rev = "v${version}";
-    hash = "sha256-8bfDahJw+ZUSNqMiKDqqyX2jVPd6Wg3JsD/ATAW/oF4=";
+    hash = "sha256-tVilEpSmCHx+m8HwcsyNDVIUICccndnn4vI4oOa5t/w=";
  };

-  vendorHash = "sha256-NafHcWP9xJX2hy8i1TKtBi54cXDKgoxbgwLQjYRBcjU=";
+  vendorHash = "sha256-ALjpU5el6Tmzsw2f5/AizFBuk+zJj9RKe9KHdE0AOrM=";

  nativeBuildInputs = [ installShellFiles ];

--- a/pkgs/tools/networking/openssh/common.nix
+++ b/pkgs/tools/networking/openssh/common.nix
@ -22,7 +22,7 @@
 , pam
 , libredirect
 , etcDir ? null
-, withKerberos ? true
+, withKerberos ? false
 , withLdns ? true
 , libkrb5
 , libfido2
@ -177,9 +177,12 @@ stdenv.mkDerivation {
    "sysconfdir=\${out}/etc/ssh"
  ];

-  passthru.tests = {
-    borgbackup-integration = nixosTests.borgbackup;
-    openssh = nixosTests.openssh;
+  passthru = {
+    inherit withKerberos;
+    tests = {
+      borgbackup-integration = nixosTests.borgbackup;
+      openssh = nixosTests.openssh;
+    };
  };

  meta = with lib; {
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@ -59,6 +59,7 @@ mapAliases ({
  AusweisApp2 = ausweisapp; # Added 2023-11-08
  a4term = a4; # Added 2023-10-06
  acorn = throw "acorn has been removed as the upstream project was archived"; # Added 2024-04-27
+  acousticbrainz-client = throw "acousticbrainz-client has been removed since the AcousticBrainz project has been shut down"; # Added 2024-06-04
  adtool = throw "'adtool' has been removed, as it was broken and unmaintained";
  adom = throw "'adom' has been removed, as it was broken and unmaintained"; # added 2024-05-09
  advcpmv = throw "'advcpmv' has been removed, as it is not being actively maintained and break recent coreutils."; # Added 2024-03-29
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -1501,8 +1501,6 @@ with pkgs;

  acme-sh = callPackage ../tools/admin/acme-sh { };

-  acousticbrainz-client = callPackage ../tools/audio/acousticbrainz-client { };
-
  alsaequal = callPackage ../tools/audio/alsaequal { };

  acpica-tools = callPackage ../tools/system/acpica-tools { };
@ -11346,12 +11344,21 @@ with pkgs;
    etcDir = "/etc/ssh";
  };

+  opensshWithKerberos = openssh.override {
+    withKerberos = true;
+  };
+
  openssh_hpn = opensshPackages.openssh_hpn.override {
    etcDir = "/etc/ssh";
  };

+  openssh_hpnWithKerberos = openssh_hpn.override {
+    withKerberos = true;
+  };
+
  openssh_gssapi = opensshPackages.openssh_gssapi.override {
    etcDir = "/etc/ssh";
+    withKerberos = true;
  };

  ssh-copy-id = callPackage ../tools/networking/openssh/copyid.nix { };
@ -17180,7 +17187,6 @@ with pkgs;

  inherit (beam.interpreters)
    erlang erlang_27 erlang_26 erlang_25 erlang_24
-    erlang_odbc erlang_javac erlang_odbc_javac
    elixir elixir_1_16 elixir_1_15 elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10
    elixir-ls;

@ -25236,7 +25242,7 @@ with pkgs;
  # Clasp Common Lisp
  clasp-common-lisp = wrapLisp {
    pkg = callPackage ../development/compilers/clasp { };
-    faslExt = "fasp";
+    faslExt = "fasl";
  };

  # CLISP
@ -26431,7 +26437,7 @@ with pkgs;

  rabbitmq-server = callPackage ../servers/amqp/rabbitmq-server {
    inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa;
-    elixir = elixir_1_14;
+    erlang = erlang_26;
  };

  radicale2 = callPackage ../servers/radicale/2.x.nix { };
@ -28319,8 +28325,6 @@ with pkgs;

  comixcursors = callPackage ../data/icons/comixcursors { };

-  corefonts = callPackage ../data/fonts/corefonts { };
-
  courier-prime = callPackage ../data/fonts/courier-prime { };

  cozette = callPackage ../data/fonts/cozette { };
@ -33763,8 +33767,6 @@ with pkgs;

  premid = callPackage ../applications/misc/premid { };

-  process-cpp = callPackage ../development/libraries/process-cpp { };
-
  processing = callPackage ../applications/graphics/processing {
    jdk = jdk17;
  };
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@ -23,9 +23,6 @@ in
  interpreters = {

    erlang = self.interpreters.${self.latestVersion};
-    erlang_odbc = self.interpreters."${self.latestVersion}_odbc";
-    erlang_javac = self.interpreters."${self.latestVersion}_javac";
-    erlang_odbc_javac = self.interpreters."${self.latestVersion}_odbc_javac";

    # Standard Erlang versions, using the generic builder.

@ -44,12 +41,6 @@ in
      autoconf = buildPackages.autoconf269;
      inherit wxSupport systemdSupport;
    };
-    erlang_26_odbc = self.interpreters.erlang_26.override { odbcSupport = true; };
-    erlang_26_javac = self.interpreters.erlang_26.override { javacSupport = true; };
-    erlang_26_odbc_javac = self.interpreters.erlang_26.override {
-      javacSupport = true;
-      odbcSupport = true;
-    };

    erlang_25 = self.beamLib.callErlang ../development/interpreters/erlang/25.nix {
      wxGTK = wxGTK32;
@ -57,12 +48,6 @@ in
      autoconf = buildPackages.autoconf269;
      inherit wxSupport systemdSupport;
    };
-    erlang_25_odbc = self.interpreters.erlang_25.override { odbcSupport = true; };
-    erlang_25_javac = self.interpreters.erlang_25.override { javacSupport = true; };
-    erlang_25_odbc_javac = self.interpreters.erlang_25.override {
-      javacSupport = true;
-      odbcSupport = true;
-    };

    erlang_24 = self.beamLib.callErlang ../development/interpreters/erlang/24.nix {
      wxGTK = wxGTK32;
@ -71,12 +56,6 @@ in
      autoconf = buildPackages.autoconf269;
      inherit wxSupport systemdSupport;
    };
-    erlang_24_odbc = self.interpreters.erlang_24.override { odbcSupport = true; };
-    erlang_24_javac = self.interpreters.erlang_24.override { javacSupport = true; };
-    erlang_24_odbc_javac = self.interpreters.erlang_24.override {
-      javacSupport = true;
-      odbcSupport = true;
-    };

    # Other Beam languages. These are built with `beam.interpreters.erlang`. To
    # access for example elixir built with different version of Erlang, use
@ -93,7 +72,7 @@ in
  # appropriate Erlang/OTP version.
  packages = {
    erlang = self.packages.${self.latestVersion};
-
+    erlang_27 = self.packagesWith self.interpreters.erlang_27;
    erlang_26 = self.packagesWith self.interpreters.erlang_26;
    erlang_25 = self.packagesWith self.interpreters.erlang_25;
    erlang_24 = self.packagesWith self.interpreters.erlang_24;