Merge staging-next into staging

2024-09-09 18:07:47 +00:00 · 2024-09-09 18:07:47 +00:00 · 72eab84191
commit 72eab84191
parent 8cfce50366 a90b3d5ddb
50 changed files with 3085 additions and 583 deletions
--- a/nixos/modules/services/continuous-integration/hydra/default.nix
+++ b/nixos/modules/services/continuous-integration/hydra/default.nix
@ -246,7 +246,7 @@ in
      }
      {
        assertion = cfg.minSpareServers < cfg.maxSpareServers;
-        message = "services.hydra.minSpareServers cannot be bigger than servives.hydra.maxSpareServers";
+        message = "services.hydra.minSpareServers cannot be bigger than services.hydra.maxSpareServers";
      }
    ];

@ -311,6 +311,11 @@ in
      )
    ];

+    systemd.slices.system-hydra = {
+      description = "Hydra Slice";
+      documentation = [ "file://${cfg.package}/share/doc/hydra/index.html" "https://nixos.org/hydra/manual/" ];
+    };
+
    systemd.services.hydra-init =
      { wantedBy = [ "multi-user.target" ];
        requires = lib.optional haveLocalDB "postgresql.service";
@ -371,6 +376,7 @@ in
        serviceConfig.User = "hydra";
        serviceConfig.Type = "oneshot";
        serviceConfig.RemainAfterExit = true;
+        serviceConfig.Slice = "system-hydra.slice";
      };

    systemd.services.hydra-server =
@ -389,6 +395,7 @@ in
            User = "hydra-www";
            PermissionsStartOnly = true;
            Restart = "always";
+            Slice = "system-hydra.slice";
          };
      };

@ -408,6 +415,7 @@ in
            ExecStopPost = "${hydra-package}/bin/hydra-queue-runner --unlock";
            User = "hydra-queue-runner";
            Restart = "always";
+            Slice = "system-hydra.slice";

            # Ensure we can get core dumps.
            LimitCORE = "infinity";
@ -430,6 +438,7 @@ in
            User = "hydra";
            Restart = "always";
            WorkingDirectory = baseDir;
+            Slice = "system-hydra.slice";
          };
      };

@ -442,6 +451,7 @@ in
        serviceConfig =
          { ExecStart = "@${hydra-package}/bin/hydra-update-gc-roots hydra-update-gc-roots";
            User = "hydra";
+            Slice = "system-hydra.slice";
          };
        startAt = "2,14:15";
      };
@ -455,6 +465,7 @@ in
        serviceConfig =
          { ExecStart = "@${hydra-package}/bin/hydra-send-stats hydra-send-stats";
            User = "hydra";
+            Slice = "system-hydra.slice";
          };
      };

@ -474,6 +485,7 @@ in
            User = "hydra-queue-runner";
            Restart = "always";
            RestartSec = 5;
+            Slice = "system-hydra.slice";
          };
      };

@ -492,6 +504,7 @@ in
            fi
          '';
        startAt = "*:0/5";
+        serviceConfig.Slice = "system-hydra.slice";
      };

    # Periodically compress build logs. The queue runner compresses
@ -509,6 +522,7 @@ in
            find ${baseDir}/build-logs -type f -name "*.drv" -mtime +3 -size +0c | xargs -r $compression --force --quiet
          '';
        startAt = "Sun 01:45";
+        serviceConfig.Slice = "system-hydra.slice";
      };

    services.postgresql.enable = lib.mkIf haveLocalDB true;
--- a/nixos/modules/services/misc/snapper.nix
+++ b/nixos/modules/services/misc/snapper.nix
@ -4,17 +4,14 @@
  lib,
  ...
 }:
-
-with lib;
-
 let
  cfg = config.services.snapper;

  mkValue =
    v:
-    if isList v then
+    if lib.isList v then
      "\"${
-        concatMapStringsSep " " (escape [
+        lib.concatMapStringsSep " " (lib.escape [
          "\\"
          " "
        ]) v
@ -23,7 +20,7 @@ let
      "yes"
    else if v == false then
      "no"
-    else if isString v then
+    else if lib.isString v then
      "\"${v}\""
    else
      builtins.toJSON v;
@ -33,14 +30,14 @@ let
  # "it's recommended to always specify the filesystem type"  -- man snapper-configs
  defaultOf = k: if k == "FSTYPE" then null else configOptions.${k}.default or null;

-  safeStr = types.strMatching "[^\n\"]*" // {
+  safeStr = lib.types.strMatching "[^\n\"]*" // {
    description = "string without line breaks or quotes";
    descriptionClass = "conjunction";
  };

  configOptions = {
-    SUBVOLUME = mkOption {
-      type = types.path;
+    SUBVOLUME = lib.mkOption {
+      type = lib.types.path;
      description = ''
        Path of the subvolume or mount point.
        This path is a subvolume and has to contain a subvolume named
@ -49,16 +46,16 @@ let
      '';
    };

-    FSTYPE = mkOption {
-      type = types.enum [ "btrfs" ];
+    FSTYPE = lib.mkOption {
+      type = lib.types.enum [ "btrfs" ];
      default = "btrfs";
      description = ''
        Filesystem type. Only btrfs is stable and tested.
      '';
    };

-    ALLOW_GROUPS = mkOption {
-      type = types.listOf safeStr;
+    ALLOW_GROUPS = lib.mkOption {
+      type = lib.types.listOf safeStr;
      default = [ ];
      description = ''
        List of groups allowed to operate with the config.
@ -67,8 +64,8 @@ let
      '';
    };

-    ALLOW_USERS = mkOption {
-      type = types.listOf safeStr;
+    ALLOW_USERS = lib.mkOption {
+      type = lib.types.listOf safeStr;
      default = [ ];
      example = [ "alice" ];
      description = ''
@ -79,64 +76,64 @@ let
      '';
    };

-    TIMELINE_CLEANUP = mkOption {
-      type = types.bool;
+    TIMELINE_CLEANUP = lib.mkOption {
+      type = lib.types.bool;
      default = false;
      description = ''
        Defines whether the timeline cleanup algorithm should be run for the config.
      '';
    };

-    TIMELINE_CREATE = mkOption {
-      type = types.bool;
+    TIMELINE_CREATE = lib.mkOption {
+      type = lib.types.bool;
      default = false;
      description = ''
        Defines whether hourly snapshots should be created.
      '';
    };

-    TIMELINE_LIMIT_HOURLY = mkOption {
-      type = types.int;
+    TIMELINE_LIMIT_HOURLY = lib.mkOption {
+      type = lib.types.int;
      default = 10;
      description = ''
        Limits for timeline cleanup.
      '';
    };

-    TIMELINE_LIMIT_DAILY = mkOption {
-      type = types.int;
+    TIMELINE_LIMIT_DAILY = lib.mkOption {
+      type = lib.types.int;
      default = 10;
      description = ''
        Limits for timeline cleanup.
      '';
    };

-    TIMELINE_LIMIT_WEEKLY = mkOption {
-      type = types.int;
+    TIMELINE_LIMIT_WEEKLY = lib.mkOption {
+      type = lib.types.int;
      default = 0;
      description = ''
        Limits for timeline cleanup.
      '';
    };

-    TIMELINE_LIMIT_MONTHLY = mkOption {
-      type = types.int;
+    TIMELINE_LIMIT_MONTHLY = lib.mkOption {
+      type = lib.types.int;
      default = 10;
      description = ''
        Limits for timeline cleanup.
      '';
    };

-    TIMELINE_LIMIT_QUARTERLY = mkOption {
-      type = types.int;
+    TIMELINE_LIMIT_QUARTERLY = lib.mkOption {
+      type = lib.types.int;
      default = 0;
      description = ''
        Limits for timeline cleanup.
      '';
    };

-    TIMELINE_LIMIT_YEARLY = mkOption {
-      type = types.int;
+    TIMELINE_LIMIT_YEARLY = lib.mkOption {
+      type = lib.types.int;
      default = 10;
      description = ''
        Limits for timeline cleanup.
@ -148,16 +145,16 @@ in
 {
  options.services.snapper = {

-    snapshotRootOnBoot = mkOption {
-      type = types.bool;
+    snapshotRootOnBoot = lib.mkOption {
+      type = lib.types.bool;
      default = false;
      description = ''
        Whether to snapshot root on boot
      '';
    };

-    snapshotInterval = mkOption {
-      type = types.str;
+    snapshotInterval = lib.mkOption {
+      type = lib.types.str;
      default = "hourly";
      description = ''
        Snapshot interval.
@ -167,9 +164,9 @@ in
      '';
    };

-    persistentTimer = mkOption {
+    persistentTimer = lib.mkOption {
      default = false;
-      type = types.bool;
+      type = lib.types.bool;
      example = true;
      description = ''
        Set the `Persistent` option for the
@ -179,8 +176,8 @@ in
      '';
    };

-    cleanupInterval = mkOption {
-      type = types.str;
+    cleanupInterval = lib.mkOption {
+      type = lib.types.str;
      default = "1d";
      description = ''
        Cleanup interval.
@ -190,17 +187,17 @@ in
      '';
    };

-    filters = mkOption {
-      type = types.nullOr types.lines;
+    filters = lib.mkOption {
+      type = lib.types.nullOr lib.types.lines;
      default = null;
      description = ''
        Global display difference filter. See man:snapper(8) for more details.
      '';
    };

-    configs = mkOption {
+    configs = lib.mkOption {
      default = { };
-      example = literalExpression ''
+      example = lib.literalExpression ''
        {
          home = {
            SUBVOLUME = "/home";
@ -216,14 +213,14 @@ in
        is valid here, even if NixOS doesn't document it.
      '';

-      type = types.attrsOf (
-        types.submodule {
-          freeformType = types.attrsOf (
-            types.oneOf [
-              (types.listOf safeStr)
-              types.bool
+      type = lib.types.attrsOf (
+        lib.types.submodule {
+          freeformType = lib.types.attrsOf (
+            lib.types.oneOf [
+              (lib.types.listOf safeStr)
+              lib.types.bool
              safeStr
-              types.number
+              lib.types.number
            ]
          );

@ -233,7 +230,7 @@ in
    };
  };

-  config = mkIf (cfg.configs != { }) (
+  config = lib.mkIf (cfg.configs != { }) (
    let
      documentation = [
        "man:snapper(8)"
@ -254,11 +251,11 @@ in
              SNAPPER_CONFIGS="${lib.concatStringsSep " " (builtins.attrNames cfg.configs)}"
            '';
          }
-          // (mapAttrs' (
+          // (lib.mapAttrs' (
            name: subvolume:
-            nameValuePair "snapper/configs/${name}" ({
+            lib.nameValuePair "snapper/configs/${name}" ({
              text = lib.generators.toKeyValue { inherit mkKeyValue; } (
-                filterAttrs (k: v: v != defaultOf k) subvolume
+                lib.filterAttrs (k: v: v != defaultOf k) subvolume
              );
            })
          ) cfg.configs)
@ -324,7 +321,7 @@ in
        unitConfig.ConditionPathExists = "/etc/snapper/configs/root";
      };

-      assertions = concatMap (
+      assertions = lib.concatMap (
        name:
        let
          sub = cfg.configs.${name};
@ -341,16 +338,16 @@ in
        ++
          map
            (attr: {
-              assertion = !(hasAttr attr sub);
+              assertion = !(lib.hasAttr attr sub);
              message = ''
-                The option definition `services.snapper.configs.${name}.${attr}' has been renamed to `services.snapper.configs.${name}.${toUpper attr}'.
+                The option definition `services.snapper.configs.${name}.${attr}' has been renamed to `services.snapper.configs.${name}.${lib.toUpper attr}'.
              '';
            })
            [
              "fstype"
              "subvolume"
            ]
-      ) (attrNames cfg.configs);
+      ) (lib.attrNames cfg.configs);
    }
  );

--- a/pkgs/applications/misc/gnome-frog/default.nix
+++ b/pkgs/applications/misc/gnome-frog/default.nix
@ -23,13 +23,13 @@

 python3Packages.buildPythonApplication rec {
  pname = "gnome-frog";
-  version = "1.5.1";
+  version = "1.5.2";

  src = fetchFromGitHub {
    owner = "TenderOwl";
    repo = "Frog";
    rev = "refs/tags/${version}";
-    sha256 = "sha256-zL6zuqHF1pTXT3l1mAFx2EL+0ThzjXfst/nEyNVorZg=";
+    sha256 = "sha256-Zu1xUGpjqpFiPQAAgaVYtnXI4jMtyywrJqn+38K5VHo=";
  };

  format = "other";
--- a/pkgs/applications/networking/avalanchego/default.nix
+++ b/pkgs/applications/networking/avalanchego/default.nix
@ -7,16 +7,16 @@

 buildGoModule rec {
  pname = "avalanchego";
-  version = "1.11.10";
+  version = "1.11.11";

  src = fetchFromGitHub {
    owner = "ava-labs";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-O+94hdRaPZYcU4ICiGGQ7CBKPMAT9qPCsMsHcurW+/4=";
+    hash = "sha256-9NhwxB5AeGvQgZbjNu5WWHiP194ws7s1WDtCntLr//g=";
  };

-  vendorHash = "sha256-jXtnPBlSeA1Q+2VY+It7XnORz6uW0ZLYX+csBTYolNE=";
+  vendorHash = "sha256-A8Bf/KzTFvC/hFLU1k6M89649wjoqnIXRQ1uJaTj9YA=";
  # go mod vendor has a bug, see: https://github.com/golang/go/issues/57529
  proxyVendor = true;

--- a/pkgs/applications/office/paperwork/src.nix
+++ b/pkgs/applications/office/paperwork/src.nix
@ -1,13 +1,13 @@
 {fetchFromGitLab}:
 rec {
-  version = "2.2.3";
+  version = "2.2.5";
  src = fetchFromGitLab {
    domain = "gitlab.gnome.org";
    repo = "paperwork";
    group = "World";
    owner = "OpenPaperwork";
    rev = version;
-    sha256 = "sha256-xQN1IUbTQEHtyW5F8Zbg2EUN5K87oYqnSdzo0gEeOfI=";
+    sha256 = "sha256-PRh0ohmPLwpM76qYfbExFqq4OK6Hm0fbdzrjXungSoY=";
  };
  sample_documents = fetchFromGitLab {
    domain = "gitlab.gnome.org";
--- a/pkgs/applications/science/logic/workcraft/default.nix
+++ b/pkgs/applications/science/logic/workcraft/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "workcraft";
-  version = "3.5.0";
+  version = "3.5.1";

  src = fetchurl {
    url = "https://github.com/workcraft/workcraft/releases/download/v${version}/workcraft-v${version}-linux.tar.gz";
-    sha256 = "sha256-ZOmc83OZVHIt/Sq6KQWuG4/xyeaETL8qJmmSjGcqL60=";
+    sha256 = "sha256-326iDxQ1t9iih2JVRO07C41V5DtkUzwkcNHCz5kLHT8=";
  };

  nativeBuildInputs = [ makeWrapper ];
--- a/pkgs/applications/version-management/git-branchless/default.nix
+++ b/pkgs/applications/version-management/git-branchless/default.nix
@ -1,15 +1,16 @@
-{ lib
-, fetchFromGitHub
-, git
-, libiconv
-, ncurses
-, openssl
-, pkg-config
-, rustPlatform
-, sqlite
-, stdenv
-, Security
-, SystemConfiguration
+{
+  lib,
+  fetchFromGitHub,
+  git,
+  libiconv,
+  ncurses,
+  openssl,
+  pkg-config,
+  rustPlatform,
+  sqlite,
+  stdenv,
+  Security,
+  SystemConfiguration,
 }:

 rustPlatform.buildRustPackage rec {
@ -27,15 +28,17 @@ rustPlatform.buildRustPackage rec {

  nativeBuildInputs = [ pkg-config ];

-  buildInputs = [
-    ncurses
-    openssl
-    sqlite
-  ] ++ lib.optionals stdenv.isDarwin [
-    Security
-    SystemConfiguration
-    libiconv
-  ];
+  buildInputs =
+    [
+      ncurses
+      openssl
+      sqlite
+    ]
+    ++ lib.optionals stdenv.isDarwin [
+      Security
+      SystemConfiguration
+      libiconv
+    ];

  postInstall = ''
    $out/bin/git-branchless install-man-pages $out/share/man
@ -50,6 +53,23 @@ rustPlatform.buildRustPackage rec {
    "--skip=test_switch_pty"
    "--skip=test_next_ambiguous_interactive"
    "--skip=test_switch_auto_switch_interactive"
+    "--skip=test_amend_undo"
+    "--skip=test_switch_pty"
+    "--skip=test_next_ambiguous_interactive"
+    "--skip=test_switch_auto_switch_interactive"
+    "--skip=test_move_branch_on_merge_conflict_resolution"
+    "--skip=test_move_branches_after_move"
+    "--skip=test_move_delete_checked_out_branch"
+    "--skip=test_move_no_reapply_squashed_commits"
+    "--skip=test_move_orphaned_root"
+    "--skip=test_restore_snapshot_basic"
+    "--skip=test_restore_snapshot_delete_file_only_in_index"
+    "--skip=test_restore_snapshot_deleted_files"
+    "--skip=test_sync_basic"
+    "--skip=test_sync_no_delete_main_branch"
+    "--skip=test_undo_doesnt_make_working_dir_dirty"
+    "--skip=test_undo_move_refs"
+    "--skip=test_undo_noninteractive"
  ];

  meta = with lib; {
@ -57,6 +77,9 @@ rustPlatform.buildRustPackage rec {
    homepage = "https://github.com/arxanas/git-branchless";
    license = licenses.gpl2Only;
    mainProgram = "git-branchless";
-    maintainers = with maintainers; [ nh2 hmenke ];
+    maintainers = with maintainers; [
+      nh2
+      hmenke
+    ];
  };
 }
--- a/pkgs/applications/video/davinci-resolve/default.nix
+++ b/pkgs/applications/video/davinci-resolve/default.nix
@ -34,7 +34,7 @@ let
  davinci = (
    stdenv.mkDerivation rec {
      pname = "davinci-resolve${lib.optionalString studioVariant "-studio"}";
-      version = "19.0";
+      version = "19.0.1";

      nativeBuildInputs = [
        (appimage-run.override { buildFHSEnv = buildFHSEnvChroot; } )
@ -55,8 +55,8 @@ let
          outputHashAlgo = "sha256";
          outputHash =
            if studioVariant
-            then "sha256-KxoUXHMlgWoa00GSq/DLVgyOjuv7k8aUwl20XvDRZvc="
-            else "sha256-XQP5RL/p/voQePLiBr1Hc+dBUZHW39XxDjyxKJyKXxw=";
+            then "sha256-dtwweoxUE/DwHoqwKCTp7vQUg09h4/TrNl92hpOKd1E="
+            else "sha256-MNaP0+sKBH4Ps5EMM5Gtdncai+rXZRmIQBXF5lVbDws=";

          impureEnvVars = lib.fetchers.proxyImpureEnvVars;

--- a/pkgs/applications/video/streamlink/default.nix
+++ b/pkgs/applications/video/streamlink/default.nix
@ -7,12 +7,12 @@

 python3Packages.buildPythonApplication rec {
  pname = "streamlink";
-  version = "6.9.0";
+  version = "6.10.0";
  pyproject = true;

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-LKmwsXuAvJ0JqEIsOQyzjYGa9VZkk5YL8hDY/uIhwX8=";
+    hash = "sha256-VI1fy8Oo4dXSn6IQoFlT+F9IyucLUqwuvkn5DoWRdSE=";
  };

  patches = [
--- a/pkgs/applications/window-managers/spectrwm/default.nix
+++ b/pkgs/applications/window-managers/spectrwm/default.nix
@ -1,18 +1,18 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, xorg }:
+{ lib, stdenv, fetchFromGitHub, libbsd, pkg-config, xorg }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "spectrwm";
-  version = "3.5.1";
+  version = "3.6.0";

  src = fetchFromGitHub {
    owner = "conformal";
    repo = "spectrwm";
    rev = "SPECTRWM_${lib.replaceStrings ["."] ["_"] finalAttrs.version}";
-    hash = "sha256-Nlzo35OsNqFbR6nl3nnGXDWmwc8JlP4tyDuIGtKTnIY=";
+    hash = "sha256-Dnn/iIrceiAVuMR8iMGcc7LqNhWC496eT5gNrYOInRU=";
  };

  nativeBuildInputs = [ pkg-config ];
-  buildInputs = with xorg; [
+  buildInputs = (with xorg; [
    libXrandr
    libXcursor
    libXft
@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
    xcbutil
    xcbutilkeysyms
    xcbutilwm
-  ];
+  ] ++ [ libbsd ]);

  prePatch = let
    subdir = if stdenv.isDarwin then "osx" else "linux";
--- a/pkgs/by-name/ca/catppuccin-fcitx5/package.nix
+++ b/pkgs/by-name/ca/catppuccin-fcitx5/package.nix
@ -6,13 +6,13 @@
 }:
 stdenvNoCC.mkDerivation {
  pname = "catppuccin-fcitx5";
-  version = "0-unstable-2022-10-05";
+  version = "0-unstable-2024-09-01";

  src = fetchFromGitHub {
    owner = "catppuccin";
    repo = "fcitx5";
-    rev = "ce244cfdf43a648d984719fdfd1d60aab09f5c97";
-    hash = "sha256-uFaCbyrEjv4oiKUzLVFzw+UY54/h7wh2cntqeyYwGps=";
+    rev = "3471b918d4b5aab2d3c3dd9f2c3b9c18fb470e8e";
+    hash = "sha256-1IqFVTEY6z8yNjpi5C+wahMN1kpt0OJATy5echjPXmc=";
  };

  dontConfigure = true;
--- a/pkgs/by-name/co/convco/package.nix
+++ b/pkgs/by-name/co/convco/package.nix
@ -11,16 +11,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "convco";
-  version = "0.5.2";
+  version = "0.6.0";

  src = fetchFromGitHub {
    owner = "convco";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-S5k0d29tuR0VkJrqCiWg1v+W2n9TrQCfMOInII4jxg0=";
+    hash = "sha256-TRuzHcGnvxDMd/XtbSXj4P+72ZL86Z2FgsqmYrKg/Ys=";
  };

-  cargoHash = "sha256-cYb3syf+k4V0pCpekQ2tY73Gl6rDc9YMCXs3TKRtgpo=";
+  cargoHash = "sha256-mT1bwCp/MdYbyc9IrC9WDmKfD6lfiqVL7TlenddTXt8=";

  nativeBuildInputs = [ cmake pkg-config ];

--- a/pkgs/applications/audio/ekho/default.nix
+++ b/pkgs/applications/audio/ekho/default.nix
@ -10,17 +10,17 @@
 , espeak-ng
 , sonic
 , utf8cpp
-, AudioUnit
+, darwin
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "ekho";
  version = "9.0";

  src = fetchFromGitHub {
    owner = "hgneng";
    repo = "ekho";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
    hash = "sha256-VYN9tR3BJXd3UA0V5vqQJNItJe1e1knZ+S7tLeaeYYk=";
  };

@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [ pkg-config autoconf automake libtool ];

  buildInputs = [ libsndfile libpulseaudio espeak-ng sonic utf8cpp ]
-    ++ lib.optionals stdenv.isDarwin [ AudioUnit ];
+    ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AudioUnit ];

  meta = with lib; {
    description = "Chinese text-to-speech software";
@ -51,5 +51,6 @@ stdenv.mkDerivation rec {
    license = licenses.gpl2Plus;
    platforms = platforms.linux ++ platforms.darwin;
    maintainers = with maintainers; [ aaronjheng ];
+    mainProgram = "ekho";
  };
-}
+})
--- a/pkgs/by-name/ex/exificient/package.nix
+++ b/pkgs/by-name/ex/exificient/package.nix
@ -0,0 +1,44 @@
+{
+  maven,
+  fetchFromGitHub,
+  lib,
+  makeWrapper,
+  jre,
+}:
+
+maven.buildMavenPackage rec {
+  pname = "exificient";
+  version = "1.0.7";
+
+  src = fetchFromGitHub {
+    owner = "EXIficient";
+    repo = "exificient";
+    rev = "exificient-${version}";
+    hash = "sha256-XrlZQf2BamYw8u1S2qQ6jV9mgyCEjBxKqPZCXMJzXmc=";
+  };
+
+  mvnHash = "sha256-/72Pi8WbKhPXu7Zb9r30znY1FHJc7FM42f7uQJqJnWo=";
+
+  mvnParameters = "package assembly:single -Dmaven.test.skip=true";
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    runHook preInstall
+    ls -al target/classes/com/siemens/
+    mkdir -p $out/bin $out/share/exificient
+    install -Dm644 target/exificient-jar-with-dependencies.jar $out/share/exificient
+
+    makeWrapper ${jre}/bin/java $out/bin/exificient \
+    --add-flags "-classpath $out/share/exificient/exificient-jar-with-dependencies.jar com.siemens.ct.exi.main.cmd.EXIficientCMD"
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Java implementation of the W3C Efficient Extensible Interchange (EXI) format specification";
+    homepage = "http://exificient.github.io/";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ samw ];
+    mainProgram = "exificient";
+  };
+}
--- a/pkgs/by-name/ff/fflogs/package.nix
+++ b/pkgs/by-name/ff/fflogs/package.nix
@ -5,10 +5,10 @@

 let
  pname = "fflogs";
-  version = "8.13.1";
+  version = "8.13.5";
  src = fetchurl {
    url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage";
-    hash = "sha256-NSLJo+6o30bF2+1c1mHdHGC5GoZUjzC0JYJ5x/tY4uQ=";
+    hash = "sha256-xEOTEU7biTw/bgmGs99Nobo8tYHnIkLghddX4BDY/o8=";
  };
  extracted = appimageTools.extractType2 { inherit pname version src; };
 in
--- a/pkgs/by-name/fu/furnace/package.nix
+++ b/pkgs/by-name/fu/furnace/package.nix
@ -28,14 +28,14 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "furnace";
-  version = "0.6.5";
+  version = "0.6.7";

  src = fetchFromGitHub {
    owner = "tildearrow";
    repo = "furnace";
    rev = "v${finalAttrs.version}";
    fetchSubmodules = true;
-    hash = "sha256-szDRaujlstRHbvuddi8HdYb00uHNyvAz+/Ex1mKfMXY=";
+    hash = "sha256-G5yjqsep+hDGXCqGNBKoMvV7JOD7ZZTxTPBl9VmG8RM=";
  };

  postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
@ -88,8 +88,6 @@ stdenv.mkDerivation (finalAttrs: {
    (lib.cmakeBool "USE_GLES" (withGL && preferGLES))
    (lib.cmakeBool "WITH_RENDER_METAL" false) # fails to build
    (lib.cmakeBool "WITH_RENDER_OPENGL1" (withGL && !preferGLES))
-    # New l10n code still has some fortify bugs
-    (lib.cmakeBool "WARNINGS_ARE_ERRORS" false)
    (lib.cmakeBool "FORCE_APPLE_BIN" true)
  ];

--- a/pkgs/by-name/gd/gdlv/package.nix
+++ b/pkgs/by-name/gd/gdlv/package.nix
@ -0,0 +1,45 @@
+{
+  lib,
+  stdenv,
+  buildGoModule,
+  fetchFromGitHub,
+  AppKit,
+  CoreGraphics,
+  Foundation,
+  Metal,
+}:
+buildGoModule rec {
+  pname = "gdlv";
+  version = "1.12.0";
+
+  src = fetchFromGitHub {
+    owner = "aarzilli";
+    repo = "gdlv";
+    rev = "v${version}";
+    hash = "sha256-6NU7bhURdXM4EjVnsXVf9XFOUgHyVEI0kr15q9OnUTQ=";
+  };
+
+  vendorHash = null;
+  subPackages = ".";
+
+  preBuild =
+    lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11.0")
+      ''
+        export MACOSX_DEPLOYMENT_TARGET=10.15
+      '';
+
+  buildInputs = lib.optionals stdenv.isDarwin [
+    AppKit
+    CoreGraphics
+    Foundation
+    Metal
+  ];
+
+  meta = with lib; {
+    description = "GUI frontend for Delve";
+    mainProgram = "gdlv";
+    homepage = "https://github.com/aarzilli/gdlv";
+    maintainers = with maintainers; [ mmlb ];
+    license = licenses.gpl3;
+  };
+}
--- a/pkgs/by-name/ge/gearlever/package.nix
+++ b/pkgs/by-name/ge/gearlever/package.nix
@ -16,18 +16,19 @@
  appimage-run,
  gtk4,
  bintools,
+  libnotify,
 }:

 python3Packages.buildPythonApplication rec {
  pname = "gearlever";
-  version = "2.0.6";
+  version = "2.0.7";
  pyproject = false; # Built with meson

  src = fetchFromGitHub {
    owner = "mijorus";
    repo = "gearlever";
-    rev = version;
-    hash = "sha256-+JuF0SL+2yVgkKPItt9Vq6SLcnxaMSWxIeVhY9XLX28=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-Zp0w6ZJFRV5IANF0sY/n8jqgG+3h9J2eV/dUP+we8PY=";
  };

  postPatch =
@ -79,6 +80,7 @@ python3Packages.buildPythonApplication rec {
        desktop-file-utils # update-desktop-database
        gtk4.dev # gtk4-launch
        bintools # readelf
+        libnotify # notify-send
      ]
    }"
  ];
--- a/pkgs/by-name/jd/jdt-language-server/package.nix
+++ b/pkgs/by-name/jd/jdt-language-server/package.nix
@ -6,15 +6,15 @@
 }:

 let
-  timestamp = "202408011337";
+  timestamp = "202408291433";
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "jdt-language-server";
-  version = "1.38.0";
+  version = "1.39.0";

  src = fetchurl {
    url = "https://download.eclipse.org/jdtls/milestones/${finalAttrs.version}/jdt-language-server-${finalAttrs.version}-${timestamp}.tar.gz";
-    hash = "sha256-uml3iKGfK6V7FjAqums0PGSZKMlfdrDRcElKwS0XrHg=";
+    hash = "sha256-8EbY8Il05udz8u1HQmbqsJiJxkWfJmNXn4t9SXvTRyk=";
  };

  sourceRoot = ".";
--- a/pkgs/by-name/ma/manifold/package.nix
+++ b/pkgs/by-name/ma/manifold/package.nix
@ -11,13 +11,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "manifold";
-  version = "2.5.1-unstable-2024-08-18";
+  version = "2.5.1-unstable-2024-09-06";

  src = fetchFromGitHub {
    owner = "elalish";
    repo = "manifold";
-    rev = "74e15b1574ebe6ae01d1fd2cffbe75aeeb7b8fab";
-    hash = "sha256-T/uaiHNJvk16XobjJlVbawKJ2ktFaCtI63kTFc6Z5Fc=";
+    rev = "6f009ca13fab71e53f118179742cc2bb40455721";
+    hash = "sha256-McP/Rdxss93YHZcPSSWaRjyGgUiQJ3mZXgzcHWldORU=";
  };

  nativeBuildInputs = [ cmake ];
@ -33,6 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
    "-DCMAKE_BUILD_TYPE=Release"
    "-DBUILD_SHARED_LIBS=ON"
    "-DMANIFOLD_TEST=ON"
+    "-DMANIFOLD_CROSS_SECTION=ON"
    "-DMANIFOLD_PAR=TBB"
  ];

--- a/pkgs/by-name/os/oscavmgr/Cargo.lock
+++ b/pkgs/by-name/os/oscavmgr/Cargo.lock
--- a/pkgs/by-name/os/oscavmgr/package.nix
+++ b/pkgs/by-name/os/oscavmgr/package.nix
@ -0,0 +1,63 @@
+{
+  fetchFromGitHub,
+  lib,
+  nix-update-script,
+  openssl,
+  openvr,
+  openxr-loader,
+  pkg-config,
+  rustPlatform,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "oscavmgr";
+  version = "0.4.1";
+
+  src = fetchFromGitHub {
+    owner = "galister";
+    repo = "oscavmgr";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-1cpisSevAU2zGNrpVEGvulBcWB5rWkWAIYI/0vjzRQE=";
+  };
+
+  cargoLock = {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "alvr_common-20.10.0" = "sha256-2d5+9rxCpqgLMab7i1pLKaY1qSKRxzPI7pgh54rQBdg=";
+      "openxr-0.19.0" = "sha256-kbEYoN4UvUEaZA9LJWEKx1X1r+l91GjTWs1hNXhr7cw=";
+      "settings-schema-0.2.0" = "sha256-luEdAKDTq76dMeo5kA+QDTHpRMFUg3n0qvyQ7DkId0k=";
+    };
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    openssl
+    openxr-loader
+  ];
+
+  postPatch = ''
+    alvr_session=$(echo $cargoDepsCopy/alvr_session-*/)
+    substituteInPlace "$alvr_session/build.rs" \
+      --replace-fail \
+        'alvr_filesystem::workspace_dir().join("openvr/headers/openvr_driver.h")' \
+        '"${openvr}/include/openvr/openvr_driver.h"'
+
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Face tracking & utilities for Resonite and VRChat";
+    homepage = "https://github.com/galister/oscavmgr";
+    changelog = "https://github.com/galister/oscavmgr/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      pandapip1
+      Scrumplex
+    ];
+    mainProgram = "oscavmgr";
+  };
+}
--- a/pkgs/by-name/ph/photini/package.nix
+++ b/pkgs/by-name/ph/photini/package.nix
@ -19,8 +19,7 @@ python3Packages.buildPythonApplication rec {

  build-system = with python3Packages; [ setuptools-scm ];
  dependencies = with python3Packages; [
-    pyqt6
-    pyqt6-webengine
+    pyside6
    cachetools
    appdirs
    chardet
@ -33,6 +32,7 @@ python3Packages.buildPythonApplication rec {
    gpxpy
    keyring
    pillow
+    toml
  ];

  passthru.updateScript = gitUpdater { };
--- a/pkgs/by-name/sh/shpool/package.nix
+++ b/pkgs/by-name/sh/shpool/package.nix
@ -9,13 +9,13 @@

 rustPlatform.buildRustPackage rec {
  pname = "shpool";
-  version = "0.6.3";
+  version = "0.7.0";

  src = fetchFromGitHub {
    owner = "shell-pool";
    repo = "shpool";
    rev = "v${version}";
-    hash = "sha256-RzXlwzCMZ5nDnNfQHzqY9Wu7gvG8y39yR2W3cfl208w=";
+    hash = "sha256-4d194y9scjXi5wpTRP66apApXl2R9N3ACAVXkXHfQDM=";
  };


@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
      --replace-fail '/usr/bin/shpool' "$out/bin/shpool"
  '';

-  cargoHash = "sha256-Xb/ohGzgXR8B6Zfd2pUqgpxK6WQnk2xF4bbCyz1g2os=";
+  cargoHash = "sha256-lkwgjrEaLuTY0sDSxa+wbT9LX09aCDp1wDUqNQE07Xw=";

  buildInputs = [
    linux-pam
--- a/pkgs/by-name/sn/snipaste/package.nix
+++ b/pkgs/by-name/sn/snipaste/package.nix
@ -5,20 +5,20 @@
 }:
 appimageTools.wrapType2 rec {
  pname = "snipaste";
-  version = "2.9-Beta2";
+  version = "2.9.2-Beta";

  src = fetchurl {
    url = "https://download.snipaste.com/archives/Snipaste-${version}-x86_64.AppImage";
-    hash = "sha256-VJvw3M1Ohfji/PoIxn4gc9KcFl6H1wRYW5Pbf1p5rlg=";
+    hash = "sha256-oV69uABjzkbQdwb+1wRRxszhrwI4uyzhQZ4aXBnyeo8=";
  };

-  meta = with lib; {
+  meta = {
    description = "Screenshot tools";
    homepage = "https://www.snipaste.com/";
-    license = licenses.unfree;
-    maintainers = with maintainers; [ luftmensch-luftmensch ];
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ luftmensch-luftmensch ];
    mainProgram = "snipaste";
    platforms = [ "x86_64-linux" ];
-    sourceProvenance = [ sourceTypes.binaryNativeCode ];
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
  };
 }
--- a/pkgs/by-name/sp/spotube/package.nix
+++ b/pkgs/by-name/sp/spotube/package.nix
@ -9,17 +9,19 @@
  makeWrapper,
  undmg,
  wrapGAppsHook3,
+  gtk3,
+  libsoup_3,
+  webkitgtk_4_1,

  libappindicator,
  libnotify,
-  libsecret,
  mpv-unwrapped,
  xdg-user-dirs,
 }:

 let
  pname = "spotube";
-  version = "3.7.1";
+  version = "3.8.0";

  meta = {
    description = "Open source, cross-platform Spotify client compatible across multiple platforms";
@ -53,7 +55,7 @@ let

    src = fetchArtifact {
      filename = "Spotube-macos-universal.dmg";
-      hash = "sha256-EYgjVXO/ztIsVYzEHe14YgXbQTclQIht9Qqr8ewHU8w=";
+      hash = "sha256-qQDbGRnia8JAclm2AgT2FCxhYS6WoNuDWIMbG76pDB0=";
    };

    sourceRoot = ".";
@ -77,7 +79,7 @@ let

    src = fetchArtifact {
      filename = "Spotube-linux-x86_64.deb";
-      hash = "sha256-JKp2RMYNfdBzywqlBpTaHL1iD+E71EL8xY+nzkdA3us=";
+      hash = "sha256-xgwHRaFeQ182kRhUzCEvMx56WyPnHu8aCDyQ5wzVKRw=";
    };

    nativeBuildInputs = [
@ -88,10 +90,12 @@ let
    ];

    buildInputs = [
+      gtk3
      libappindicator
      libnotify
-      libsecret
+      libsoup_3
      mpv-unwrapped
+      webkitgtk_4_1
    ];

    dontWrapGApps = true;
--- a/pkgs/by-name/te/terragrunt/package.nix
+++ b/pkgs/by-name/te/terragrunt/package.nix
@ -6,13 +6,13 @@

 buildGoModule rec {
  pname = "terragrunt";
-  version = "0.66.9";
+  version = "0.67.3";

  src = fetchFromGitHub {
    owner = "gruntwork-io";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-yL24oxuwdIMaMPQIZFHkp33B8x1TDwjXRkk9fQgMdrY=";
+    hash = "sha256-OYtPpy3ig5NMw1Usmi7VnZyqr0hzG71/5R4qOEczZ4Y=";
  };

  nativeBuildInputs = [ go-mockery ];
@ -21,7 +21,7 @@ buildGoModule rec {
    make generate-mocks
  '';

-  vendorHash = "sha256-Hg+9Zfv8IQpJEtLh5QHm6HLgn/RTlf723dePD4481fM=";
+  vendorHash = "sha256-NERvQoxT01ew/rCkEXrthsqF1mXjhxZANBL9ApTyd7o=";

  doCheck = false;

--- a/pkgs/by-name/xt/xtf/package.nix
+++ b/pkgs/by-name/xt/xtf/package.nix
@ -10,7 +10,7 @@

 stdenv.mkDerivation {
  pname = "xtf";
-  version = "0-unstable-2024-07-25";
+  version = "0-unstable-2024-08-30";

  outputs = [
    "out" # xtf-runner and test suite.
@ -20,8 +20,8 @@ stdenv.mkDerivation {

  src = fetchgit {
    url = "https://xenbits.xenproject.org/git-http/xtf.git";
-    rev = "f37c4574dd79d058c035be989ac6648508556a1a";
-    hash = "sha256-3eOKQXdyFX0iY90UruK8lLfnXQt+cOlvyW/KMj2hczQ=";
+    rev = "f503efe8e5cf8858ec0704f1aaa82d0bf50891a5";
+    hash = "sha256-ccI9FcrK7T4Zrv3przZ7qZhJ/ZsPPi+1KOIVCdFKKdc=";
  };

  nativeBuildInputs =
--- a/pkgs/data/fonts/gdouros/default.nix
+++ b/pkgs/data/fonts/gdouros/default.nix
@ -17,7 +17,7 @@ let
    inherit pname version;

    src = fetchzip {
-      url = "https://dn-works.com/wp-content/uploads/2020/UFAS-Fonts/${file}";
+      url = "https://web.archive.org/web/20240212172059/https://dn-works.com/wp-content/uploads/2020/UFAS-Fonts/${file}";
      stripRoot = false;
      inherit hash;
    };
@ -34,12 +34,12 @@ let

    meta = {
      inherit description;
-      # see https://dn-works.com/wp-content/uploads/2020/UFAS-Docs/License.pdf
+      # see https://web.archive.org/web/20240212172059/https://dn-works.com/wp-content/uploads/2020/UFAS-Docs/License.pdf
      # quite draconian: non-commercial, no modifications,
      # no redistribution, "a single instantiation and no
      # network installation"
      license = lib.licenses.unfree;
-      homepage = "https://dn-works.com/ufas/";
+      homepage = "https://web.archive.org/web/20240212172059/https://dn-works.com/ufas/";
    };
  };
 in
--- a/pkgs/development/libraries/libphonenumber/default.nix
+++ b/pkgs/development/libraries/libphonenumber/default.nix
@ -14,13 +14,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "libphonenumber";
-  version = "8.13.44";
+  version = "8.13.45";

  src = fetchFromGitHub {
    owner = "google";
    repo = "libphonenumber";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-DnYWHrOePDdQ9tZnKu8W9jnqpp5MjhjrrSfbD1jV/fU=";
+    hash = "sha256-oR6AvhB99LBNCtbGsCMghDGriTEzqVSEKfzdQyj+g6E=";
  };

  patches = [
--- a/pkgs/development/php-packages/mongodb/default.nix
+++ b/pkgs/development/php-packages/mongodb/default.nix
@ -16,13 +16,13 @@

 buildPecl rec {
  pname = "mongodb";
-  version = "1.19.3";
+  version = "1.19.4";

  src = fetchFromGitHub {
    owner = "mongodb";
    repo = "mongo-php-driver";
    rev = version;
-    hash = "sha256-gpnL4mXOD/MDG7xWxUpLLKfRD2w6HqNokC5358OkFSg=";
+    hash = "sha256-71CS9boQzW2NMmkQeOQjGaTx2CN3bkcfgO5NwV9J9JI=";
    fetchSubmodules = true;
  };

--- a/pkgs/development/python-modules/pdfminer-six/default.nix
+++ b/pkgs/development/python-modules/pdfminer-six/default.nix
@ -2,6 +2,7 @@
  lib,
  buildPythonPackage,
  fetchFromGitHub,
+  fetchpatch2,
  cryptography,
  charset-normalizer,
  pythonOlder,
@ -26,6 +27,13 @@ buildPythonPackage rec {
  };

  patches = [
+    # https://github.com/pdfminer/pdfminer.six/pull/1027
+    (fetchpatch2 {
+      name = "fix-dereference-MediaBox.patch";
+      url = "https://github.com/pdfminer/pdfminer.six/pull/1027/commits/ad101c152c71431a21bfa5a8dbe33b3ba385ceec.patch?full_index=1";
+      excludes = [ "CHANGELOG.md" ];
+      hash = "sha256-fsSXvN92MVtNFpAst0ctvGrbxVvoe4Nyz4wMZqJ1aw8=";
+    })
    (substituteAll {
      src = ./disable-setuptools-git-versioning.patch;
      inherit version;
@ -52,6 +60,12 @@ buildPythonPackage rec {

  nativeCheckInputs = [ pytestCheckHook ];

+  disabledTests = [
+    # The binary file samples/contrib/issue-1004-indirect-mediabox.pdf is
+    # stripped from fix-dereference-MediaBox.patch.
+    "test_contrib_issue_1004_mediabox"
+  ];
+
  passthru = {
    tests = {
      inherit ocrmypdf;
--- a/pkgs/development/python-modules/pygame-ce/default.nix
+++ b/pkgs/development/python-modules/pygame-ce/default.nix
@ -65,7 +65,9 @@ buildPythonPackage rec {

  postPatch =
    ''
+      # cython was pinned to fix windows build hangs (pygame-community/pygame-ce/pull/3015)
      substituteInPlace pyproject.toml \
+        --replace-fail '"cython<=3.0.10",' '"cython",' \
        --replace-fail '"meson<=1.5.0",' '"meson",' \
        --replace-fail '"sphinx<=7.2.6",' "" \
        --replace-fail '"ninja<=1.11.1.1",' ""
--- a/pkgs/development/python-modules/pyqt/pyqt6-sip.nix
+++ b/pkgs/development/python-modules/pyqt/pyqt6-sip.nix
@ -7,12 +7,12 @@

 buildPythonPackage rec {
  pname = "pyqt6-sip";
-  version = "13.6.0";
+  version = "13.8.0";

  src = fetchPypi {
    pname = "PyQt6_sip";
    inherit version;
-    hash = "sha256-JIbhWIBxlD1PZle6CQltyf/9IyKtLDAEHnjqPwN7V3g=";
+    hash = "sha256-L3TPPW2cq1FSvZ9J1XCy37h1U+u1xJGav94n9bn9adQ=";
  };

  # There is no test code and the check phase fails with:
--- a/pkgs/development/tools/analysis/snyk/default.nix
+++ b/pkgs/development/tools/analysis/snyk/default.nix
@ -8,16 +8,16 @@

 buildNpmPackage rec {
  pname = "snyk";
-  version = "1.1292.2";
+  version = "1.1293.0";

  src = fetchFromGitHub {
    owner = "snyk";
    repo = "cli";
    rev = "refs/tags/v${version}";
-    hash = "sha256-r7yQNxmvQ2RUUTX3zxEqnf7fgYJI/0kFqoPg60jI4ns=";
+    hash = "sha256-zCDxq+aP7StfgXTg6G/J4o5xjcKI4ak3N3Dh8cIUK8U=";
  };

-  npmDepsHash = "sha256-hS1TYrqyYiixKtZoxWU10hj1ZC2RqrZ7gndU5B195/M=";
+  npmDepsHash = "sha256-XPJoDhCncucFTv1B+YlMQxh3KkXleQGRvcSuYrXcL4g=";

  postPatch = ''
    substituteInPlace package.json \
--- a/pkgs/development/tools/gdlv/default.nix
+++ b/pkgs/development/tools/gdlv/default.nix
@ -1,39 +0,0 @@
-{ lib
-, stdenv
-, buildGoModule
-, fetchFromGitHub
-, Foundation
-, CoreGraphics
-, Metal
-, AppKit
-}:
-
-buildGoModule rec {
-  pname = "gdlv";
-  version = "1.10.0";
-
-  src = fetchFromGitHub {
-    owner = "aarzilli";
-    repo = "gdlv";
-    rev = "v${version}";
-    hash = "sha256-OPsQOFwV6jIX4ZOVwJmpTeQUr/zkfkqCr86HmPhYarI=";
-  };
-
-  preBuild = lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11.0") ''
-    export MACOSX_DEPLOYMENT_TARGET=10.15
-  '';
-
-  vendorHash = null;
-
-  subPackages = ".";
-
-  buildInputs = lib.optionals stdenv.isDarwin [ Foundation CoreGraphics Metal AppKit ];
-
-  meta = with lib; {
-    description = "GUI frontend for Delve";
-    mainProgram = "gdlv";
-    homepage = "https://github.com/aarzilli/gdlv";
-    maintainers = with maintainers; [ mmlb ];
-    license = licenses.gpl3;
-  };
-}
--- a/pkgs/development/tools/rust/sqlx-cli/default.nix
+++ b/pkgs/development/tools/rust/sqlx-cli/default.nix
@ -16,16 +16,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "sqlx-cli";
-  version = "0.8.0";
+  version = "0.8.2";

  src = fetchFromGitHub {
    owner = "launchbadge";
    repo = "sqlx";
    rev = "v${version}";
-    hash = "sha256-amccPHkgtBm52PG6Lnv5Hyqff2O56GH6mVTmK5oi3ao=";
+    hash = "sha256-hxqd0TrsKANCPgQf6JUP0p1BYhZdqfnWbtCQCBxF8Gs=";
  };

-  cargoHash = "sha256-ywKYq36G19jLg/H/OAHJv6VNSTcJ8gYUTJzE2zulKfc=";
+  cargoHash = "sha256-jDwfFHC19m20ECAo5VbFI6zht4gnZMYqTKsbyoVJJZU=";

  buildNoDefaultFeatures = true;
  buildFeatures = [
--- a/pkgs/development/tools/rust/typeshare/default.nix
+++ b/pkgs/development/tools/rust/typeshare/default.nix
@ -7,16 +7,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "typeshare";
-  version = "1.9.2";
+  version = "1.11.0";

  src = fetchFromGitHub {
    owner = "1password";
    repo = "typeshare";
    rev = "v${version}";
-    hash = "sha256-ccUeIywOHZYqfo4o0rKKswFmdPcQkwD18OP9v/wkfe0=";
+    hash = "sha256-hzlrhawHQOM12pYAHqmkk+PPI/3tJx8rFFQ9+znv9c8=";
  };

-  cargoHash = "sha256-mPA19+8Ti2fluOFn/oDvf62JZTtZNQRggMhf9cem5rU=";
+  cargoHash = "sha256-yHtKgQZlKJ/vmecjzMHkmA/0sbiNJdP0zoUSIowWttQ=";

  nativeBuildInputs = [ installShellFiles ];

--- a/pkgs/games/1oom/default.nix
+++ b/pkgs/games/1oom/default.nix
@ -17,13 +17,13 @@

 stdenv.mkDerivation rec {
  pname = "1oom";
-  version = "1.10.1";
+  version = "1.11";

  src = fetchFromGitHub {
    owner = "1oom-fork";
    repo = "1oom";
    rev = "refs/tags/v${version}";
-    hash = "sha256-M8UpdIOOMUMNY0e+Cxx/uoLBWKc2x7cv2d4VyLwcMng=";
+    hash = "sha256-xEHFuCOyuWmee6kgOc0WUk1iWWFqfFb42F7shGZmutQ=";
  };

  nativeBuildInputs = [ autoreconfHook ];
--- a/pkgs/games/steam/fhsenv.nix
+++ b/pkgs/games/steam/fhsenv.nix
@ -125,7 +125,6 @@ in buildFHSEnv rec {
    xorg.libXi
    xorg.libSM
    xorg.libICE
-    gnome2.GConf
    curl
    nspr
    nss
--- a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "dnsmasq_exporter";
-  version = "unstable-2024-05-06";
+  version = "0.3.0";

  src = fetchFromGitHub {
    owner = "google";
    repo = "dnsmasq_exporter";
-    rev = "03f84edc208fa88e31cf00533db42e7e0c9717ca";
-    hash = "sha256-YFQ4XO3vnj2Ka3D/LS5aG6WX+qOCVTlq5khDxLoQllo=";
+    rev = "v${version}";
+    hash = "sha256-2sOOJWEEseWwozIyZ7oes400rBjlxIrOOtkP3rSNFXo=";
  };

  vendorHash = "sha256-oD68TCNJKwjY3iwE/pUosMIMGOhsWj9cHC/+hq3xxI4=";
--- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "redis_exporter";
-  version = "1.62.0";
+  version = "1.63.0";

  src = fetchFromGitHub {
    owner = "oliver006";
    repo = "redis_exporter";
    rev = "v${version}";
-    sha256 = "sha256-EKI/oF0bAiwDYjkdEPi84R8H8wExaCxFK3uPx8MrHk8=";
+    sha256 = "sha256-OqQjKj2WA5AsXm26HAYhbmhDkFU0el8K831i67WMXlI=";
  };

-  vendorHash = "sha256-nrEglhb22LANgm6hiZToPVPfGpkpxpJ7TQlLW0Z7+/4=";
+  vendorHash = "sha256-wBViyiYj8Duq5KrXi+YFuAUVSAkCZsnhA3fLWRLcKmU=";

  ldflags = [
    "-X main.BuildVersion=${version}"
--- a/pkgs/servers/tracing/tempo/default.nix
+++ b/pkgs/servers/tracing/tempo/default.nix
@ -2,14 +2,14 @@

 buildGoModule rec {
  pname = "tempo";
-  version = "2.5.0";
+  version = "2.6.0";

  src = fetchFromGitHub {
    owner = "grafana";
    repo = "tempo";
    rev = "v${version}";
    fetchSubmodules = true;
-    hash = "sha256-SSAeJOOd282Mnmaj/W5sM8J64qvD9/0SvlbHUtXYYF8=";
+    hash = "sha256-jWoGKY+kC9VAK7jPFaGMJQkC/JeAiUjzqKhE2XjuJio=";
  };

  vendorHash = null;
--- a/pkgs/servers/web-apps/freshrss/default.nix
+++ b/pkgs/servers/web-apps/freshrss/default.nix
@ -8,13 +8,13 @@

 stdenvNoCC.mkDerivation rec {
  pname = "FreshRSS";
-  version = "1.24.2";
+  version = "1.24.3";

  src = fetchFromGitHub {
    owner = "FreshRSS";
    repo = "FreshRSS";
    rev = version;
-    hash = "sha256-NlaJ+iMBUd2hhf3IidxdPHuEr+cqOTQmtfisauxqr2Q=";
+    hash = "sha256-JgniYjw+Fk5EaXrXVjelBYBP1JOZarAF07iToiwnkdY=";
  };

  postPatch = ''
--- a/pkgs/tools/admin/meshcentral/default.nix
+++ b/pkgs/tools/admin/meshcentral/default.nix
@ -7,11 +7,11 @@
 }:

 yarn2nix-moretea.mkYarnPackage {
-  version = "1.1.27";
+  version = "1.1.29";

  src = fetchzip {
-    url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.27.tgz";
-    sha256 = "1m9wsny6b2lwis2ppalmc9qzn3b8pblgv1cszqbaywb835ll516g";
+    url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.29.tgz";
+    sha256 = "0ghwcndv753n3xkhi93jv0k9s0ch553g5q6b39fiv78ixa1f4h57";
  };

  patches = [ ./fix-js-include-paths.patch ];
@ -21,7 +21,7 @@ yarn2nix-moretea.mkYarnPackage {

  offlineCache = fetchYarnDeps {
    yarnLock = ./yarn.lock;
-    hash = "sha256-XQTHIFMxtb4G7gkksAU/oHajdNf0McFbubumW/8Gn1w=";
+    hash = "sha256-9fW6nZElij7P7rSS0xVxISpPpKdi9eOxQdmJ79jGSgw=";
  };

  # Tarball has CRLF line endings. This makes patching difficult, so let's convert them.
--- a/pkgs/tools/admin/meshcentral/package.json
+++ b/pkgs/tools/admin/meshcentral/package.json
@ -1,6 +1,6 @@
 {
  "name": "meshcentral",
-  "version": "1.1.27",
+  "version": "1.1.29",
  "keywords": [
    "Remote Device Management",
    "Remote Device Monitoring",
@ -45,7 +45,7 @@
    "cookie-session": "2.0.0",
    "express": "4.19.2",
    "express-handlebars": "5.3.5",
-    "express-ws": "4.0.0",
+    "express-ws": "5.0.2",
    "ipcheck": "0.1.0",
    "minimist": "1.2.8",
    "multiparty": "4.2.3",
@ -79,7 +79,7 @@
    "cookie-session": "2.0.0",
    "express": "4.19.2",
    "express-handlebars": "5.3.5",
-    "express-ws": "4.0.0",
+    "express-ws": "5.0.2",
    "ipcheck": "0.1.0",
    "minimist": "1.2.8",
    "multiparty": "4.2.3",
@ -120,6 +120,7 @@
    "archiver-zip-encrypted": "1.0.11",
    "googleapis": "128.0.0",
    "webdav": "4.11.3",
+    "minio": "8.0.1",
    "wildleek": "2.0.0",
    "yubikeyotp": "0.2.0",
    "otplib": "10.2.3",
--- a/pkgs/tools/admin/meshcentral/yarn.lock
+++ b/pkgs/tools/admin/meshcentral/yarn.lock
--- a/pkgs/tools/audio/beets/plugins/alternatives.nix
+++ b/pkgs/tools/audio/beets/plugins/alternatives.nix
@ -2,14 +2,14 @@

 python3Packages.buildPythonApplication rec {
  pname = "beets-alternatives";
-  version = "0.11.1";
+  version = "0.13.0";
  pyproject = true;

  src = fetchFromGitHub {
    repo = "beets-alternatives";
    owner = "geigerzaehler";
-    rev = "v${version}";
-    sha256 = "sha256-ORmF7YOQD4LvKiYo4Rzz+mzppOEvLics58aOK/IKcHc=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-i67Bzdh84TuVwcgwo5SgHFp1W04KF3VA6cbrFz82je0=";
  };

  nativeBuildInputs = [
--- a/pkgs/tools/system/stress-ng/default.nix
+++ b/pkgs/tools/system/stress-ng/default.nix
@ -5,13 +5,13 @@

 stdenv.mkDerivation rec {
  pname = "stress-ng";
-  version = "0.18.02";
+  version = "0.18.04";

  src = fetchFromGitHub {
    owner = "ColinIanKing";
    repo = pname;
    rev = "V${version}";
-    hash = "sha256-iyAW/vqo+V39kVygLRESI4D9yrTsC3DETrl3dmiGBdM=";
+    hash = "sha256-h7VBd3KFpDiIj84tWqXFIaDYzRkM8EaolOfdnycmHIA=";
  };

  postPatch = ''
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -26693,8 +26693,8 @@ with pkgs;

  ginkgo = callPackage ../development/tools/ginkgo { };

-  gdlv = darwin.apple_sdk_11_0.callPackage ../development/tools/gdlv {
-    inherit (darwin.apple_sdk_11_0.frameworks) Foundation CoreGraphics Metal AppKit;
+  gdlv = callPackage ../by-name/gd/gdlv/package.nix {
+    inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreGraphics Foundation Metal;
  };

  go-bindata = callPackage ../development/tools/go-bindata { };
@ -29502,10 +29502,6 @@ with pkgs;

  oed = callPackage ../applications/editors/oed { };

-  ekho = callPackage ../applications/audio/ekho {
-    inherit (darwin.apple_sdk.frameworks) AudioUnit;
-  };
-
  electron-cash = libsForQt5.callPackage ../applications/misc/electron-cash { };

  electrum = libsForQt5.callPackage ../applications/misc/electrum { };