Merge master into staging-next

2024-08-11 18:01:11 +00:00 · 2024-08-11 18:01:11 +00:00 · a473a12c7d
commit a473a12c7d
parent ea41e82c90 0507de31f8
66 changed files with 1214 additions and 1031 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -19732,6 +19732,12 @@
    githubId = 12984845;
    name = "Subhrajyoti Sen";
  };
+  sudoforge = {
+    github = "sudoforge";
+    githubId = 3893293;
+    name = "sudoforge";
+    keys = [ { fingerprint = "7EBCE51F278D30AE1C34036341BF61468C327D5A"; } ];
+  };
  sudosubin = {
    email = "sudosubin@gmail.com";
    github = "sudosubin";
--- a/nixos/modules/services/audio/snapserver.nix
+++ b/nixos/modules/services/audio/snapserver.nix
@ -37,6 +37,7 @@ let
        "&${key}=${value}";
    in
      "--stream.stream=\"${opt.type}://" + os opt.location + "?" + os' "name=" name
+        + os' "&sampleformat=" opt.sampleFormat + os' "&codec=" opt.codec
        + concatStrings (mapAttrsToList flatten opt.query) + "\"";

  optionalNull = val: ret:
--- a/nixos/modules/services/backup/borgmatic.nix
+++ b/nixos/modules/services/backup/borgmatic.nix
@ -26,8 +26,8 @@ let
    freeformType = settingsFormat.type;
    options = {
      source_directories = mkOption {
-        type = nullOr (listOf str);
-        default = null;
+        type = listOf str;
+        default = [];
        description = ''
          List of source directories and files to backup. Globs and tildes are
          expanded. Do not backslash spaces in path names.
@ -35,8 +35,8 @@ let
        example = [ "/home" "/etc" "/var/log/syslog*" "/home/user/path with spaces" ];
      };
      repositories = mkOption {
-        type = nullOr (listOf repository);
-        default = null;
+        type = listOf repository;
+        default = [];
        description = ''
          A required list of local or remote repositories with paths and
          optional labels (which can be used with the --repository flag to
--- a/pkgs/applications/editors/vscode/generic.nix
+++ b/pkgs/applications/editors/vscode/generic.nix
@ -1,5 +1,6 @@
 { stdenv
 , lib
+, copyDesktopItems
 , makeDesktopItem
 , unzip
 , libsecret
@ -122,38 +123,38 @@ in
    inherit rev vscodeServer;
  };

-  desktopItem = makeDesktopItem {
-    name = executableName;
-    desktopName = longName;
-    comment = "Code Editing. Redefined.";
-    genericName = "Text Editor";
-    exec = "${executableName} %F";
-    icon = "vs${executableName}";
-    startupNotify = true;
-    startupWMClass = shortName;
-    categories = [ "Utility" "TextEditor" "Development" "IDE" ];
-    mimeTypes = [ "text/plain" "inode/directory" ];
-    keywords = [ "vscode" ];
-    actions.new-empty-window = {
-      name = "New Empty Window";
-      exec = "${executableName} --new-window %F";
+  desktopItems = [
+    (makeDesktopItem {
+      name = executableName;
+      desktopName = longName;
+      comment = "Code Editing. Redefined.";
+      genericName = "Text Editor";
+      exec = "${executableName} %F";
      icon = "vs${executableName}";
-    };
-  };
-
-  urlHandlerDesktopItem = makeDesktopItem {
-    name = executableName + "-url-handler";
-    desktopName = longName + " - URL Handler";
-    comment = "Code Editing. Redefined.";
-    genericName = "Text Editor";
-    exec = executableName + " --open-url %U";
-    icon = "vs${executableName}";
-    startupNotify = true;
-    categories = [ "Utility" "TextEditor" "Development" "IDE" ];
-    mimeTypes = [ "x-scheme-handler/vs${executableName}" ];
-    keywords = [ "vscode" ];
-    noDisplay = true;
-  };
+      startupNotify = true;
+      startupWMClass = shortName;
+      categories = [ "Utility" "TextEditor" "Development" "IDE" ];
+      keywords = [ "vscode" ];
+      actions.new-empty-window = {
+        name = "New Empty Window";
+        exec = "${executableName} --new-window %F";
+        icon = "vs${executableName}";
+      };
+    })
+    (makeDesktopItem {
+      name = executableName + "-url-handler";
+      desktopName = longName + " - URL Handler";
+      comment = "Code Editing. Redefined.";
+      genericName = "Text Editor";
+      exec = executableName + " --open-url %U";
+      icon = "vs${executableName}";
+      startupNotify = true;
+      categories = [ "Utility" "TextEditor" "Development" "IDE" ];
+      mimeTypes = [ "x-scheme-handler/vs${executableName}" ];
+      keywords = [ "vscode" ];
+      noDisplay = true;
+    })
+  ];

  buildInputs = [ libsecret libXScrnSaver libxshmfence ]
    ++ lib.optionals (!stdenv.isDarwin) [ alsa-lib at-spi2-atk libkrb5 mesa nss nspr systemd xorg.libxkbfile ];
@ -164,6 +165,7 @@ in
    ++ lib.optionals stdenv.isLinux [
    autoPatchelfHook
    asar
+    copyDesktopItems
    # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651
    (buildPackages.wrapGAppsHook3.override { inherit (buildPackages) makeWrapper; })
  ];
@ -184,10 +186,6 @@ in

    ln -s "$out/lib/vscode/bin/${sourceExecutableName}" "$out/bin/${executableName}"

-    mkdir -p "$out/share/applications"
-    ln -s "$desktopItem/share/applications/${executableName}.desktop" "$out/share/applications/${executableName}.desktop"
-    ln -s "$urlHandlerDesktopItem/share/applications/${executableName}-url-handler.desktop" "$out/share/applications/${executableName}-url-handler.desktop"
-
    # These are named vscode.png, vscode-insiders.png, etc to match the name in upstream *.deb packages.
    mkdir -p "$out/share/pixmaps"
    cp "$out/lib/vscode/resources/app/resources/linux/code.png" "$out/share/pixmaps/vs${executableName}.png"
--- a/pkgs/applications/emulators/wine/sources.nix
+++ b/pkgs/applications/emulators/wine/sources.nix
@ -69,9 +69,9 @@ in rec {

  unstable = fetchurl rec {
    # NOTE: Don't forget to change the hash for staging as well.
-    version = "9.14";
+    version = "9.15";
    url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz";
-    hash = "sha256-JFcvSc80c/ye8qGtHN31Ec4O9D2qVUE7RyCmw+PInqY=";
+    hash = "sha256-ea3vQ23WjdvXAXhnCjwjqpjor9VUCsD0I0WJTEWLeN0=";
    inherit (stable) patches;

    ## see http://wiki.winehq.org/Gecko
@ -117,7 +117,7 @@ in rec {
  staging = fetchFromGitLab rec {
    # https://gitlab.winehq.org/wine/wine-staging
    inherit (unstable) version;
-    hash = "sha256-IvT56lWULfA5MFLEjnpnNX4OhjQwR6XqBGJ3i4nqJrk=";
+    hash = "sha256-ss0B1MsDd37xTTFT86bEfVOt5mEAuHj14rTnGboO9i8=";
    domain = "gitlab.winehq.org";
    owner = "wine";
    repo = "wine-staging";
--- a/pkgs/applications/graphics/hugin/default.nix
+++ b/pkgs/applications/graphics/hugin/default.nix
@ -13,7 +13,7 @@
 , fftw
 , flann
 , gettext
-, glew-egl
+, glew
 , ilmbase
 , lcms2
 , lensfun
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
    fftw
    flann
    gettext
-    glew-egl
+    glew
    ilmbase
    lcms2
    lensfun
--- a/pkgs/applications/networking/cluster/helmfile/default.nix
+++ b/pkgs/applications/networking/cluster/helmfile/default.nix
@ -8,16 +8,16 @@

 buildGoModule rec {
  pname = "helmfile";
-  version = "0.167.0";
+  version = "0.167.1";

  src = fetchFromGitHub {
    owner = "helmfile";
    repo = "helmfile";
    rev = "v${version}";
-    hash = "sha256-a3HkpnO54NtaYhQsCXye2aWKhMq8mRj1nnevwK/4RZs=";
+    hash = "sha256-v5H5CQtLUmWCAh1Fhnf63gObxz3Wchpczi4gsPOh2ps=";
  };

-  vendorHash = "sha256-2d0B/qq0uERCFgTJDxvhc2FWQ/ffODbD1Z6aFWHX0Ew=";
+  vendorHash = "sha256-QVFCPTGhYcCya9MGtj0vVZ3BJCcJeaxENrrJVef0H4Y=";

  proxyVendor = true; # darwin/linux hash mismatch

--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
@ -38,6 +38,7 @@
 , xdg-utils
 , microsoft-gsl
 , rlottie
+, ada
 , stdenv
 , darwin
 , lld
@ -62,14 +63,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "telegram-desktop";
-  version = "5.2.3";
+  version = "5.3.2";

  src = fetchFromGitHub {
    owner = "telegramdesktop";
    repo = "tdesktop";
    rev = "v${finalAttrs.version}";
    fetchSubmodules = true;
-    hash = "sha256-VSMSlR3rIUTYQ4GLQrVMZNrSAFfh3aJo6p92xgXMrvo=";
+    hash = "sha256-fTXZdos0iIHmgWCKOU+B3tpxzLsUUtqx92Od75OdZH8=";
  };

  patches = [
@ -130,6 +131,7 @@ stdenv.mkDerivation (finalAttrs: {
    tg_owt
    microsoft-gsl
    rlottie
+    ada
  ] ++ lib.optionals stdenv.isLinux [
    qtwayland
    gtk3
@ -183,13 +185,12 @@ stdenv.mkDerivation (finalAttrs: {
  };

  cmakeFlags = [
-    "-Ddisable_autoupdate=ON"
+    (lib.cmakeBool "DESKTOP_APP_DISABLE_AUTOUPDATE" true)
    # We're allowed to used the API ID of the Snap package:
-    "-DTDESKTOP_API_ID=611335"
-    "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c"
+    (lib.cmakeFeature "TDESKTOP_API_ID" "611335")
+    (lib.cmakeFeature "TDESKTOP_API_HASH" "d524b414d21f4d37f08684c1df41ac9c")
    # See: https://github.com/NixOS/nixpkgs/pull/130827#issuecomment-885212649
-    "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF"
-    "-DDESKTOP_APP_DISABLE_SCUDO=ON"
+    (lib.cmakeBool "DESKTOP_APP_USE_PACKAGED_FONTS" false)
  ];

  preBuild = ''
@ -219,17 +220,17 @@ stdenv.mkDerivation (finalAttrs: {
    updateScript = nix-update-script { };
  };

-  meta = with lib; {
+  meta = {
    description = "Telegram Desktop messaging app";
    longDescription = ''
      Desktop client for the Telegram messenger, based on the Telegram API and
      the MTProto secure protocol.
    '';
-    license = licenses.gpl3Only;
-    platforms = platforms.all;
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.all;
    homepage = "https://desktop.telegram.org/";
-    changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v${version}";
-    maintainers = with maintainers; [ nickcao ];
+    changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v${finalAttrs.version}";
+    maintainers = with lib.maintainers; [ nickcao ];
    mainProgram = if stdenv.hostPlatform.isLinux then "telegram-desktop" else "Telegram";
  };
 })
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix
@ -1,79 +1,117 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch
-, pkg-config, cmake, ninja, yasm
-, libjpeg, openssl, libopus, ffmpeg, alsa-lib, libpulseaudio, protobuf
-, openh264, usrsctp, libevent, libvpx
-, libX11, libXtst, libXcomposite, libXdamage, libXext, libXrender, libXrandr, libXi
-, glib, abseil-cpp, pcre, util-linuxMinimal, libselinux, libsepol, pipewire
-, mesa, libepoxy, libglvnd, unstableGitUpdater, darwin
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  pkg-config,
+  cmake,
+  crc32c,
+  python3,
+  libjpeg,
+  openssl,
+  libopus,
+  ffmpeg,
+  openh264,
+  libvpx,
+  libXi,
+  libXfixes,
+  libXtst,
+  libXcomposite,
+  libXdamage,
+  libXext,
+  libXrender,
+  libXrandr,
+  glib,
+  abseil-cpp,
+  pipewire,
+  mesa,
+  libGL,
+  unstableGitUpdater,
+  darwin,
 }:

 stdenv.mkDerivation {
  pname = "tg_owt";
-  version = "0-unstable-2024-06-15";
+  version = "0-unstable-2024-08-02";

  src = fetchFromGitHub {
    owner = "desktop-app";
    repo = "tg_owt";
-    rev = "c9cc4390ab951f2cbc103ff783a11f398b27660b";
-    sha256 = "sha256-FfWmSYaeryTDbsGJT3R7YK1oiyJcrR7YKKBOF+9PmpY=";
+    rev = "c425281150317753d7bc5182c6572abe20f9a784";
+    sha256 = "sha256-EHQyGE2S2F2UqNl7VDb38pcdv3amm8lGqWZds5ZoHRE=";
    fetchSubmodules = true;
  };

-  outputs = [ "out" "dev" ];
+  outputs = [
+    "out"
+    "dev"
+  ];

-  nativeBuildInputs = [ pkg-config cmake ninja yasm ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    python3
+  ];

-  buildInputs = [
-    libjpeg libopus ffmpeg protobuf openh264 usrsctp libevent libvpx abseil-cpp
-  ] ++ lib.optionals stdenv.isLinux [
-    libX11 libXtst libXcomposite libXdamage libXext libXrender libXrandr libXi
-    glib pcre util-linuxMinimal libselinux libsepol pipewire alsa-lib libpulseaudio
-    mesa libepoxy libglvnd
-  ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
-    Cocoa
-    AppKit
-    IOKit
-    IOSurface
-    Foundation
-    AVFoundation
-    CoreMedia
-    VideoToolbox
-    CoreGraphics
-    CoreVideo
-    OpenGL
-    Metal
-    MetalKit
-    CoreFoundation
-    ApplicationServices
-  ]);
+  buildInputs =
+    [
+      openssl
+      libjpeg
+      libopus
+      ffmpeg
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      glib
+      libXi
+      libXcomposite
+      libXdamage
+      libXext
+      libXfixes
+      libXrender
+      libXrandr
+      libXtst
+      pipewire
+      mesa
+      libGL
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin (
+      with darwin.apple_sdk.frameworks;
+      [
+        Cocoa
+        AppKit
+        IOKit
+        IOSurface
+        Foundation
+        AVFoundation
+        CoreMedia
+        VideoToolbox
+        CoreGraphics
+        CoreVideo
+        Metal
+        MetalKit
+        CoreFoundation
+        ApplicationServices
+      ]
+    );

-  patches = [
-    # GCC 12 Fix
-    (fetchpatch {
-      url = "https://github.com/desktop-app/tg_owt/pull/101/commits/86d2bcd7afb8706663d29e30f65863de5a626142.patch";
-      hash = "sha256-iWS0mB8R0vqPU/0qf6Ax54UCAKYDVCPac2mi/VHbFm0=";
-    })
-    # additional fix for GCC 12 + musl
-    (fetchpatch {
-      url = "https://git.alpinelinux.org/aports/plain/community/tg_owt/gcc12.patch?id=8120df03fa3b6db5b8ff92c7a52b680290ad6e20";
-      hash = "sha256-ikgxUH1e7pz0n0pKUemrPXXa4UkECX+w467M9gU68zs=";
-    })
+  propagatedBuildInputs = [
+    abseil-cpp
+    crc32c
+    openh264
+    libvpx
  ];

  cmakeFlags = [
    # Building as a shared library isn't officially supported and may break at any time.
-    "-DBUILD_SHARED_LIBS=OFF"
-  ];
-
-  propagatedBuildInputs = [
-    # Required for linking downstream binaries.
-    abseil-cpp openh264 usrsctp libevent libvpx openssl
+    (lib.cmakeBool "BUILD_SHARED_LIBS" false)
  ];

  passthru.updateScript = unstableGitUpdater { };

-  meta = with lib; {
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ oxalica ];
+  meta = {
+    description = "Fork of Google's webrtc library for telegram-desktop";
+    homepage = "https://github.com/desktop-app/tg_owt";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ oxalica ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
  };
 }
--- a/pkgs/applications/office/zotero/default.nix
+++ b/pkgs/applications/office/zotero/default.nix
@ -3,99 +3,58 @@
 , fetchurl
 , wrapGAppsHook3
 , makeDesktopItem
+, alsa-lib
 , atk
 , cairo
-, coreutils
-, curl
-, cups
 , dbus-glib
-, dbus
-, dconf
-, fontconfig
-, freetype
 , gdk-pixbuf
 , glib
-, glibc
 , gtk3
-, libX11
-, libXScrnSaver
-, libxcb
-, libXcomposite
-, libXcursor
-, libXdamage
-, libXext
-, libXfixes
-, libXi
-, libXinerama
-, libXrender
-, libXt
-, libnotify
-, adwaita-icon-theme
-, libGLU
 , libGL
-, nspr
-, nss
+, libva
+, xorg
+, mesa
 , pango
-, gsettings-desktop-schemas
+, pciutils
 }:

 stdenv.mkDerivation rec {
  pname = "zotero";
-  version = "6.0.35";
+  version = "7.0";

  src = fetchurl {
-    url =
-      "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
-    hash = "sha256-HAVLmamEPuFf0548/iEXes+f4XnQ7kU1u9hyOYhVyZ0=";
+    url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
+    hash = "sha256-0CAiK8HY/udup51zB6I2o4jvOHvSJGm+5JehHk8F/Io=";
  };

-  nativeBuildInputs = [ wrapGAppsHook3 ];
-  buildInputs =
-    [ gsettings-desktop-schemas glib gtk3 adwaita-icon-theme dconf ];
-
-  dontConfigure = true;
-  dontBuild = true;
-  dontStrip = true;
  dontPatchELF = true;
+  nativeBuildInputs = [ wrapGAppsHook3 ];

  libPath = lib.makeLibraryPath [
-    stdenv.cc.cc
+    alsa-lib
    atk
    cairo
-    curl
-    cups
    dbus-glib
-    dbus
-    fontconfig
-    freetype
    gdk-pixbuf
    glib
-    glibc
    gtk3
-    libX11
-    libXScrnSaver
-    libXcomposite
-    libXcursor
-    libxcb
-    libXdamage
-    libXext
-    libXfixes
-    libXi
-    libXinerama
-    libXrender
-    libXt
-    libnotify
-    libGLU
    libGL
-    nspr
-    nss
+    libva
+    xorg.libX11
+    xorg.libXcomposite
+    xorg.libXcursor
+    xorg.libXdamage
+    xorg.libXext
+    xorg.libXfixes
+    xorg.libXi
+    xorg.libXrandr
+    xorg.libXtst
+    xorg.libxcb
+    mesa
    pango
+    pciutils
  ] + ":" + lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ];

-  postPatch = ''
-    sed -i '/pref("app.update.enabled", true);/c\pref("app.update.enabled", false);' defaults/preferences/prefs.js
-  '';
-
  desktopItem = makeDesktopItem {
    name = "zotero";
    exec = "zotero -url %U";
@ -111,22 +70,29 @@ stdenv.mkDerivation rec {
  installPhase = ''
    runHook preInstall

+    # Copy package contents to the output directory
    mkdir -p "$prefix/usr/lib/zotero-bin-${version}"
    cp -r * "$prefix/usr/lib/zotero-bin-${version}"
    mkdir -p "$out/bin"
    ln -s "$prefix/usr/lib/zotero-bin-${version}/zotero" "$out/bin/"

-    # install desktop file and icons.
+    # Install desktop file and icons
    mkdir -p $out/share/applications
    cp ${desktopItem}/share/applications/* $out/share/applications/
-    for size in 16 32 48 256; do
-      install -Dm444 chrome/icons/default/default$size.png \
+    for size in 32 64 128; do
+      install -Dm444 icons/icon''${size}.png \
        $out/share/icons/hicolor/''${size}x''${size}/apps/zotero.png
    done
+    install -Dm444 icons/symbolic.svg \
+      $out/share/icons/hicolor/symbolic/apps/zotero-symbolic.svg

+    runHook postInstall
+  '';
+
+  postFixup = ''
    for executable in \
-      zotero-bin plugin-container \
-      updater minidump-analyzer
+      zotero-bin plugin-container updater vaapitest \
+      minidump-analyzer glxtest
    do
      if [ -e "$out/usr/lib/zotero-bin-${version}/$executable" ]; then
        patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
@ -136,23 +102,15 @@ stdenv.mkDerivation rec {
    find . -executable -type f -exec \
      patchelf --set-rpath "$libPath" \
        "$out/usr/lib/zotero-bin-${version}/{}" \;
-
-    runHook postInstall
-  '';
-
-  preFixup = ''
-    gappsWrapperArgs+=(
-      --prefix PATH : ${lib.makeBinPath [ coreutils ]}
-    )
  '';

  meta = with lib; {
    homepage = "https://www.zotero.org";
    description = "Collect, organize, cite, and share your research sources";
+    mainProgram = "zotero";
    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
    license = licenses.agpl3Only;
    platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ i077 ];
-    mainProgram = "zotero";
+    maintainers = with maintainers; [ atila justanotherariel ];
  };
 }
--- a/pkgs/applications/office/zotero/zotero.sh
+++ b/pkgs/applications/office/zotero/zotero.sh
@ -1,3 +0,0 @@
-#!@bash@/bin/bash
-
-exec "@firefox@/bin/firefox" -app "@out@/libexec/zotero/application.ini" "${@}"
--- a/pkgs/applications/science/electronics/nvc/default.nix
+++ b/pkgs/applications/science/electronics/nvc/default.nix
@ -15,13 +15,13 @@

 stdenv.mkDerivation rec {
  pname = "nvc";
-  version = "1.13.1";
+  version = "1.13.2";

  src = fetchFromGitHub {
    owner = "nickg";
    repo = "nvc";
    rev = "r${version}";
-    hash = "sha256-mi/ruW+KLOeT6QpyRr+ZRtyOAyXsoKiO5WKAuXz5Wc4=";
+    hash = "sha256-ir4/zwGaIGMUP8kVqoXV1Kn2A8yJYVQHJpb1sVfhOSI=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/version-management/git-bug/default.nix
+++ b/pkgs/applications/version-management/git-bug/default.nix
@ -38,7 +38,7 @@ buildGoModule rec {
    description = "Distributed bug tracker embedded in Git";
    homepage = "https://github.com/MichaelMure/git-bug";
    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ royneary DeeUnderscore ];
+    maintainers = with maintainers; [ royneary DeeUnderscore sudoforge ];
    mainProgram = "git-bug";
  };
 }
--- a/pkgs/by-name/ad/ada/package.nix
+++ b/pkgs/by-name/ad/ada/package.nix
@ -0,0 +1,37 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "ada";
+  version = "2.9.0";
+
+  src = fetchFromGitHub {
+    owner = "ada-url";
+    repo = "ada";
+    rev = "v${version}";
+    hash = "sha256-1p9qe7n9dAzJ2opxfBsGXv9IeRdXraHVm7MBXr+QVbQ=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  cmakeFlags = [
+    # uses CPM that requires network access
+    (lib.cmakeBool "ADA_TOOLS" false)
+    (lib.cmakeBool "ADA_TESTING" false)
+  ];
+
+  meta = {
+    description = "WHATWG-compliant and fast URL parser written in modern C";
+    homepage = "https://github.com/ada-url/ada";
+    license = with lib.licenses; [
+      asl20
+      mit
+    ];
+    maintainers = with lib.maintainers; [ nickcao ];
+    platforms = lib.platforms.all;
+  };
+}
--- a/pkgs/by-name/ce/centerpiece/package.nix
+++ b/pkgs/by-name/ce/centerpiece/package.nix
@ -13,16 +13,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "centerpiece";
-  version = "1.1.0";
+  version = "1.1.1";

  src = fetchFromGitHub {
    owner = "friedow";
    repo = "centerpiece";
    rev = "v${version}";
-    hash = "sha256-1sKUGTBS9aTCQPuhkwv9fZ8F3N6yn98927fpp1e4fBU=";
+    hash = "sha256-tZNwMPL1ITWVvoywojsd5j0GIVQt6pOKFLwi7jwqLKg=";
  };

-  cargoHash = "sha256-b7gI6Z5fiOA/Q2BbsmmGrKHgMzbICKPeK2i6YjlLnDo=";
+  cargoHash = "sha256-d5qGuQ8EnIkE/PhI9t4JxtnNbvh3rse9NpowZ+ESZuU=";

  nativeBuildInputs = [ pkg-config ];
  buildInputs = [
--- a/pkgs/by-name/ga/gate/package.nix
+++ b/pkgs/by-name/ga/gate/package.nix
@ -5,7 +5,7 @@

 let
  pname = "gate";
-  version = "0.38.2";
+  version = "0.39.2";
 in
 buildGoModule {
  inherit pname version;
@ -14,10 +14,10 @@ buildGoModule {
    owner = "minekube";
    repo = "gate";
    rev = "refs/tags/v${version}";
-    hash = "sha256-lNZRDSBaEE4b3pJ1oOf9yd8l+lFJmnhyy4TahBlQDv0=";
+    hash = "sha256-ocstveux4nSev6jUx0niGxjKk0ljEhhagmHpUKncrQY=";
  };

-  vendorHash = "sha256-H8mVlwaEux6PSHfVwFpfa+efmWApCKl6eYx6vA57Hfc=";
+  vendorHash = "sha256-e+XIftRRP0Dig6nIRdxE1x60RU8oXChTyyLIEGOQ5Yc=";

  ldflags = [ "-s" "-w" ];

--- a/pkgs/by-name/ha/hadolint-sarif/package.nix
+++ b/pkgs/by-name/ha/hadolint-sarif/package.nix
@ -7,14 +7,14 @@
 }:
 rustPlatform.buildRustPackage rec {
  pname = "hadolint-sarif";
-  version = "0.6.0";
+  version = "0.6.5";

  src = fetchCrate {
    inherit pname version;
-    hash = "sha256-7i3fhXZJ82+a4kbMPMxW8dV42qxQfQggwkm8FA1TUkw=";
+    hash = "sha256-wMb/taAAR0W8YVowNik0S8nFSmsD6LAQ5Egn0k52U74=";
  };

-  cargoHash = "sha256-DXCdxpvWaOn/g7kuqgmtGkd94NVnjPI9VkDCuPg7wCw=";
+  cargoHash = "sha256-OpUUmte/NfMNbyO3H4ikJF5ALnvfNkUBwFhIN9vefd0=";

  nativeInstallCheckInputs = [ versionCheckHook ];
  doInstallCheck = true;
--- a/pkgs/by-name/ha/harmonia/package.nix
+++ b/pkgs/by-name/ha/harmonia/package.nix
@ -3,6 +3,8 @@
 , fetchFromGitHub
 , libsodium
 , nixVersions
+, nlohmann_json
+, openssl
 , pkg-config
 , rustPlatform
 , nix-update-script
@ -11,27 +13,29 @@

 rustPlatform.buildRustPackage rec {
  pname = "harmonia";
-  version = "0.8.0";
+  version = "1.0.0";

  src = fetchFromGitHub {
    owner = "nix-community";
-    repo = pname;
-    rev = "refs/tags/${pname}-v${version}";
-    hash = "sha256-+V0V/l9Q7HR3J0aH1UWc1qHrpGiRWd6B4R+3MECFORg=";
+    repo = "harmonia";
+    rev = "refs/tags/harmonia-v${version}";
+    hash = "sha256-S5UU6/JZzp4mJKplhpJjcACr+M1rQCFQFWuyk9Wwumg=";
  };

-  cargoHash = "sha256-3Nx1YXjbYVOD7pYgI9Cp5Vsxv1j1XeX6pCl4+Q1OtVs=";
+  cargoHash = "sha256-iCltPaWNq9vWgPfjNYikoU25X8wzlM4ruYI+WgHYv7U=";

  doCheck = false;

  nativeBuildInputs = [
-    pkg-config nixVersions.nix_2_21
+    pkg-config nixVersions.nix_2_24
  ];

  buildInputs = [
    boost
    libsodium
-    nixVersions.nix_2_21
+    openssl
+    nlohmann_json
+    nixVersions.nix_2_24
  ];

  passthru = {
--- a/pkgs/by-name/ij/ijq/package.nix
+++ b/pkgs/by-name/ij/ijq/package.nix
@ -0,0 +1,57 @@
+{
+  buildGoModule,
+  fetchFromSourcehut,
+  lib,
+  jq,
+  installShellFiles,
+  makeBinaryWrapper,
+  scdoc,
+}:
+
+buildGoModule rec {
+  pname = "ijq";
+  version = "1.1.1";
+
+  src = fetchFromSourcehut {
+    owner = "~gpanders";
+    repo = "ijq";
+    rev = "v${version}";
+    hash = "sha256-rnSpXMadZW6I+7tIYqr1Cb4z00gdREsqin/r6OXaDMA=";
+  };
+
+  vendorHash = "sha256-zRa8MPWFvcoVm+LstbSAl1VY3oWMujZPjWS/ti1VXjE=";
+
+  nativeBuildInputs = [
+    installShellFiles
+    makeBinaryWrapper
+    scdoc
+  ];
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.Version=${version}"
+  ];
+
+  postBuild = ''
+    scdoc < ijq.1.scd > ijq.1
+    installManPage ijq.1
+  '';
+
+  postInstall = ''
+    wrapProgram "$out/bin/ijq" \
+      --prefix PATH : "${lib.makeBinPath [ jq ]}"
+  '';
+
+  meta = with lib; {
+    description = "Interactive wrapper for jq";
+    mainProgram = "ijq";
+    homepage = "https://git.sr.ht/~gpanders/ijq";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [
+      justinas
+      mattpolzin
+      SuperSandro2000
+    ];
+  };
+}
--- a/pkgs/by-name/le/leetgo/package.nix
+++ b/pkgs/by-name/le/leetgo/package.nix
@ -6,16 +6,16 @@

 buildGoModule rec {
  pname = "leetgo";
-  version = "1.4.7";
+  version = "1.4.8";

  src = fetchFromGitHub {
    owner = "j178";
    repo = "leetgo";
    rev = "v${version}";
-    hash = "sha256-K/PaQakX0ZLu2Uh906kZ4p8J+GV7ewAeSVFMMQiKYBA=";
+    hash = "sha256-4Y/NwgLNBdd2uL7oiIdM1I08ZnLjreHf397s/vhS+Ac=";
  };

-  vendorHash = "sha256-4QSfZzYLjPdGKLySP57fK9n6WXdCYzb3sWibfP85jLE=";
+  vendorHash = "sha256-zpS+6Z31m6g67we4JaQ0sPodqC315lgftqGzZkelDCU=";

  nativeBuildInputs = [ installShellFiles ];

--- a/pkgs/by-name/le/lefthook/package.nix
+++ b/pkgs/by-name/le/lefthook/package.nix
@ -6,7 +6,7 @@

 let
  pname = "lefthook";
-  version = "1.7.4";
+  version = "1.7.12";
 in
 buildGoModule {
  inherit pname version;
@ -15,10 +15,10 @@ buildGoModule {
    owner = "evilmartians";
    repo = "lefthook";
    rev = "v${version}";
-    hash = "sha256-KrTQrHPDDFCo9XG/wrY9ZNFpch12nMLg5CWYddV2OfA=";
+    hash = "sha256-lPjxd3a97abPUJxazgL+BQmGOMqF9RlP/6qEgjS5aXw=";
  };

-  vendorHash = "sha256-ralnfqrP6R58Wjc/AWRf1motWZICPagZxHCkqVcwYoo=";
+  vendorHash = "sha256-YrBFcRQoqZPe/USZj3oJK5KR7y0LimCVGS9w4uNMG6M=";

  nativeBuildInputs = [ installShellFiles ];

--- a/pkgs/by-name/me/melonDS/package.nix
+++ b/pkgs/by-name/me/melonDS/package.nix
@ -2,6 +2,7 @@
  lib,
  SDL2,
  cmake,
+  enet,
  extra-cmake-modules,
  fetchFromGitHub,
  libGL,
@ -26,13 +27,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "melonDS";
-  version = "0.9.5-unstable-2024-08-05";
+  version = "0.9.5-unstable-2024-08-11";

  src = fetchFromGitHub {
    owner = "melonDS-emu";
    repo = "melonDS";
-    rev = "dd386d12a94252364b5e0706ec719c390faf90b8";
-    hash = "sha256-pgTtRNifyziioY+GN4BQFVFHlKKK1Da5XioLUnGRGpQ=";
+    rev = "e290c42360f5f2ae7182c5430234545f3b066876";
+    hash = "sha256-idsUxEsR9MPAY3arH4UNEsB6Cds4yZUaZOilqUQCnDE";
  };

  nativeBuildInputs = [
@ -44,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
  buildInputs =
    [
      SDL2
+      enet
      extra-cmake-modules
      libarchive
      libslirp
@ -74,13 +76,6 @@ stdenv.mkDerivation (finalAttrs: {
      "--prefix DYLD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpcap ]}"
    ];

-  installPhase = lib.optionalString stdenv.isDarwin ''
-    runHook preInstall
-    mkdir -p $out/Applications
-    cp -r melonDS.app $out/Applications/
-    runHook postInstall
-  '';
-
  passthru = {
    updateScript = unstableGitUpdater { };
  };
--- a/pkgs/by-name/mo/mouse-actions/package.nix
+++ b/pkgs/by-name/mo/mouse-actions/package.nix
@ -10,16 +10,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "mouse-actions";
-  version = "0.4.4";
+  version = "0.4.5";

  src = fetchFromGitHub {
    owner = "jersou";
    repo = "mouse-actions";
    rev = "v${version}";
-    hash = "sha256-02E4HrKIoBV3qZPVH6Tjz9Bv/mh5C8amO1Ilmd+YO5g=";
+    hash = "sha256-44F4CdsDHuN2FuijnpfmoFy4a/eAbYOoBYijl9mOctg=";
  };

-  cargoHash = "sha256-5SUVZlrXIPtlu9KBzucZDCp5t5t8Z4/Nfht2Pw5agVI=";
+  cargoHash = "sha256-N7BaEvQyKtM8hkDJJTlFKzfq01KMiGZ0fuXHcKctfLc=";

  buildInputs = [
    libX11
--- a/pkgs/development/tools/misc/n98-magerun2/default.nix
+++ b/pkgs/development/tools/misc/n98-magerun2/default.nix
@ -1,6 +1,7 @@
-{ lib
-, fetchFromGitHub
-, php
+{
+  lib,
+  fetchFromGitHub,
+  php,
 }:

 php.buildComposerProject (finalAttrs: {
--- a/pkgs/tools/package-management/nix-update/default.nix
+++ b/pkgs/tools/package-management/nix-update/default.nix
@ -9,14 +9,14 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "nix-update";
-  version = "1.4.0";
+  version = "1.5.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "Mic92";
    repo = pname;
    rev = version;
-    hash = "sha256-gldeiq/R7EIvMZ3tkedSSumBour47LFrwDEiNS9tSSA=";
+    hash = "sha256-zWkJs6anDddTiUestnqGVfG1GErLJr5EarWI3DcKZpU=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/ph/phraze/package.nix
+++ b/pkgs/by-name/ph/phraze/package.nix
@ -10,18 +10,18 @@

 rustPlatform.buildRustPackage rec {
  pname = "phraze";
-  version = "0.3.13";
+  version = "0.3.14";

  src = fetchFromGitHub {
    owner = "sts10";
    repo = "phraze";
    rev = "v${version}";
-    hash = "sha256-xjkS1Ehqh2LfuIwAtj6V7Q9DcuERk7PyJKJEuDE7A34=";
+    hash = "sha256-wfvnzKoxFgIizbPrt8v9na6n/qjnjS368P1iOEh5VNw=";
  };

  doCheck = true;

-  cargoHash = "sha256-jsQlcGRZqa4HHUS3Xc9OZUbI6pHalt9A3fVaz+Th1l0=";
+  cargoHash = "sha256-HEsXGlNpr/1NiJobjtwftI8HIfz0AnRtxMvh3Pf2gDo=";

  nativeBuildInputs = [ installShellFiles ];

--- a/pkgs/by-name/pi/picocrypt-cli/package.nix
+++ b/pkgs/by-name/pi/picocrypt-cli/package.nix
@ -5,17 +5,17 @@

 buildGoModule rec {
  pname = "picocrypt-cli";
-  version = "2.04";
+  version = "2.05";

  src = fetchFromGitHub {
    owner = "Picocrypt";
    repo = "CLI";
    rev = version;
-    hash = "sha256-LWU/u+5AJgBS9IAA3fq5jQLlst+kpEqtRZvjkBSMG2E=";
+    hash = "sha256-9VvPgATij6WkOVaRDAmwjRshzPk6UCTlaiYJzceTHFQ=";
  };

  sourceRoot = "${src.name}/picocrypt";
-  vendorHash = "sha256-5bdiXy/c4FYu544lyL/ac3KF/1zWIPG/bmrpdZa9YV8=";
+  vendorHash = "sha256-UNyBDWdl9G8Rt3BLWZyuh1bv4jd9TZ9sOfUAgDPzjlw=";

  ldflags = [
    "-s"
--- a/pkgs/by-name/pl/platformsh/versions.json
+++ b/pkgs/by-name/pl/platformsh/versions.json
@ -1,19 +1,19 @@
 {
-  "version": "5.0.16",
+  "version": "5.0.18",
  "darwin-amd64": {
-    "hash": "sha256-07HuCcR/2MpRbYfszyezZjTO4r8JQif4jdDClKoKsNc=",
-    "url": "https://github.com/platformsh/cli/releases/download/5.0.16/platform_5.0.16_darwin_all.tar.gz"
+    "hash": "sha256-hvkEd57DawG4K6uS/9uIzJWVECHuJNcu3V17BBpU3Ts=",
+    "url": "https://github.com/platformsh/cli/releases/download/5.0.18/platform_5.0.18_darwin_all.tar.gz"
  },
  "darwin-arm64": {
-    "hash": "sha256-07HuCcR/2MpRbYfszyezZjTO4r8JQif4jdDClKoKsNc=",
-    "url": "https://github.com/platformsh/cli/releases/download/5.0.16/platform_5.0.16_darwin_all.tar.gz"
+    "hash": "sha256-hvkEd57DawG4K6uS/9uIzJWVECHuJNcu3V17BBpU3Ts=",
+    "url": "https://github.com/platformsh/cli/releases/download/5.0.18/platform_5.0.18_darwin_all.tar.gz"
  },
  "linux-amd64": {
-    "hash": "sha256-Z9GPvvwNP2FdPUuFkDNPDKT7Pp+H6ymRvrTiPcooe3c=",
-    "url": "https://github.com/platformsh/cli/releases/download/5.0.16/platform_5.0.16_linux_amd64.tar.gz"
+    "hash": "sha256-za57D3hWyDQCU0lHynAYAz6iWkkqqjqvbzwX4UlcS7o=",
+    "url": "https://github.com/platformsh/cli/releases/download/5.0.18/platform_5.0.18_linux_amd64.tar.gz"
  },
  "linux-arm64": {
-    "hash": "sha256-3615mSWDq4DJD3554ELkAh+rEIJ/OOtLrdDoojAjZf8=",
-    "url": "https://github.com/platformsh/cli/releases/download/5.0.16/platform_5.0.16_linux_arm64.tar.gz"
+    "hash": "sha256-nBChIo0whl2QnLI9evcpsDdBJS5gIvN7bh13p2G0YjE=",
+    "url": "https://github.com/platformsh/cli/releases/download/5.0.18/platform_5.0.18_linux_arm64.tar.gz"
  }
 }
--- a/pkgs/desktops/plasma-5/3rdparty/addons/polonium.nix
+++ b/pkgs/desktops/plasma-5/3rdparty/addons/polonium.nix
@ -1,7 +1,7 @@
 { lib
 , fetchFromGitHub
 , buildNpmPackage
-, plasma-framework
+, libsForQt5
 }:

 # how to update:
@ -28,7 +28,7 @@ buildNpmPackage rec {
  # manually do the install
  buildFlags = [ "res" "src" ];

-  nativeBuildInputs = [ plasma-framework ];
+  nativeBuildInputs = with libsForQt5; [ plasma-framework ];

  dontNpmBuild = true;

@ -45,7 +45,11 @@ buildNpmPackage rec {
  meta = with lib; {
    description = "Auto-tiler that uses KWin 6.0+ tiling functionality";
    license = licenses.mit;
-    maintainers = with maintainers; [ peterhoeg kotatsuyaki ];
-    inherit (plasma-framework.meta) platforms;
+    maintainers = with maintainers; [
+      peterhoeg
+      kotatsuyaki
+      HeitorAugustoLN
+    ];
+    inherit (libsForQt5.plasma-framework.meta) platforms;
  };
 }
--- a/pkgs/by-name/sa/sarif-fmt/package.nix
+++ b/pkgs/by-name/sa/sarif-fmt/package.nix
@ -8,14 +8,14 @@
 }:
 rustPlatform.buildRustPackage rec {
  pname = "sarif-fmt";
-  version = "0.6.0";
+  version = "0.6.5";

  src = fetchCrate {
    inherit pname version;
-    hash = "sha256-2B0ylCTRaCglS+iTvM0L5RSAObS8k40g7hqKPo/7Zqc=";
+    hash = "sha256-Zflwjj5ArNmE/7Im/O09kG07ZekCyz5jU2S3vpnlXT8=";
  };

-  cargoHash = "sha256-oYLMCuAln9jkOHOjW5zuD7ZUKju8KkZw/A2sV1MZuC4=";
+  cargoHash = "sha256-hCtVfGutgvncb05zt+lSNdlrDO+UruSUahzrxaERjFE=";

  # `test_clippy` (the only test we enable) is broken on Darwin
  # because `--enable-profiler` is not enabled in rustc on Darwin
--- a/pkgs/by-name/sh/shellcheck-sarif/package.nix
+++ b/pkgs/by-name/sh/shellcheck-sarif/package.nix
@ -7,14 +7,14 @@
 }:
 rustPlatform.buildRustPackage rec {
  pname = "shellcheck-sarif";
-  version = "0.6.0";
+  version = "0.6.5";

  src = fetchCrate {
    inherit pname version;
-    hash = "sha256-ZVzUEhhiL5KeOck6Jmg1LKyQ3oHc6OQXSrSlC1s6qpA=";
+    hash = "sha256-fvOxZd6xLyOm1OjK24Xx6uHz2e8eyIklX1kUAuRGcyY=";
  };

-  cargoHash = "sha256-ftTGtvpIR8NymkJkUTZzV7KdS0aHutu4WAZ4CQZd3jE=";
+  cargoHash = "sha256-jHOCjZ6NAU8YmAc2T1aCSaa2Yx9wkP361LZ2MKAWVLA=";

  nativeInstallCheckInputs = [ versionCheckHook ];
  doInstallCheck = true;
--- a/pkgs/by-name/sr/srb2/package.nix
+++ b/pkgs/by-name/sr/srb2/package.nix
@ -7,6 +7,7 @@
 , nasm
 , libopenmpt
 , game-music-emu
+, libGLU
 , libpng
 , SDL2
 , SDL2_mixer
@ -80,6 +81,11 @@ stdenv.mkDerivation (finalAttrs: {
    ./thirdparty.patch
  ];

+  postPatch = ''
+    substituteInPlace ./src/sdl/ogl_sdl.c \
+      --replace libGLU.so.1 ${libGLU}/lib/libGLU.so.1
+  '';
+
  desktopItems = [
    (makeDesktopItem rec {
      name = "Sonic Robo Blast 2";
--- a/pkgs/desktops/plasma-5/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@ -184,7 +184,6 @@ let
        kzones = callPackage ./3rdparty/kwin/scripts/kzones.nix { };
        lightly = callPackage ./3rdparty/lightly { };
        parachute = callPackage ./3rdparty/kwin/scripts/parachute.nix { };
-        polonium = callPackage ./3rdparty/addons/polonium.nix { };
      };

    } // lib.optionalAttrs config.allowAliases {
--- a/pkgs/development/compilers/yosys/plugins/synlig.nix
+++ b/pkgs/development/compilers/yosys/plugins/synlig.nix
@ -1,7 +1,6 @@
 { stdenv
 , lib
 , fetchFromGitHub
-, fetchpatch
 , pkg-config
 , antlr4
 , capnproto
@ -16,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
  plugin = "synlig";

  # The module has automatic regular releases, with date + short git hash
-  GIT_VERSION = "2023-11-28-b8ed72d";
+  GIT_VERSION = "2024-08-07-fd4b2bd";

  # Derive our package version from GIT_VERSION, remove hash, just keep date.
  version = builtins.concatStringsSep "-" (
@ -26,19 +25,10 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "chipsalliance";
    repo  = "synlig";
    rev   = "${finalAttrs.GIT_VERSION}";
-    hash  = "sha256-jdA3PBodecqriGWU/BzWtQ5gyu62pZHv+1NvFrwsTTk=";
+    hash  = "sha256-yj+SBq6PqgPBcgz2zHZ9AUppllG/dqetU7lWPkFC+iE=";
    fetchSubmodules = false;  # we use all dependencies from nix
  };

-  patches = [
-    (fetchpatch {
-      # Fixes https://github.com/chipsalliance/synlig/issues/2299
-      name = "make-compile-for-yosys-0.37.patch";
-      url = "https://github.com/chipsalliance/synlig/commit/3dd46d4769c20b6dd1163310f8e56560b351a211.patch";
-      hash = "sha256-OP/2HA/Ukt6o5aKgoBk19P6T/33btU/x6VnoIVXct1g=";
-    })
-  ];
-
  nativeBuildInputs = [
    pkg-config
  ];
@ -97,6 +87,5 @@ stdenv.mkDerivation (finalAttrs: {
    license     = licenses.asl20;
    maintainers = with maintainers; [ hzeller ];
    platforms   = platforms.all;
-    broken      = versionAtLeast yosys.version "0.39";
  };
 })
--- a/pkgs/development/interpreters/php/8.3.nix
+++ b/pkgs/development/interpreters/php/8.3.nix
@ -2,8 +2,8 @@

 let
  base = callPackage ./generic.nix (_args // {
-    version = "8.3.9";
-    hash = "sha256-lu3G2Ct1A6ZlBUH8R3q9VFbfKN+qjJOI/54x2f4eMRI=";
+    version = "8.3.10";
+    hash = "sha256-5YQZnDULRjQ8NwabucwgrYk8sEx0fIme8bBercDuo7A=";
  });
 in
 base.withExtensions ({ all, ... }: with all; ([
--- a/pkgs/development/libraries/glew/default.nix
+++ b/pkgs/development/libraries/glew/default.nix
@ -1,6 +1,14 @@
-{ lib, stdenv, fetchurl, fetchpatch, cmake, libGLU, libXmu, libXi, libXext
+{ lib
+, stdenv
+, fetchurl
+, fetchpatch
+, cmake
+, libGLU
+, libXmu
+, libXi
+, libXext
 , OpenGL
-, enableEGL ? false
+, enableEGL ? (!stdenv.isDarwin)
 , testers
 }:

@ -19,7 +27,14 @@ stdenv.mkDerivation (finalAttrs: {
    # https://github.com/nigels-com/glew/pull/342
    (fetchpatch {
      url = "https://github.com/nigels-com/glew/commit/966e53fa153175864e151ec8a8e11f688c3e752d.diff";
-      sha256 = "sha256-xsSwdAbdWZA4KVoQhaLlkYvO711i3QlHGtv6v1Omkhw=";
+      hash = "sha256-xsSwdAbdWZA4KVoQhaLlkYvO711i3QlHGtv6v1Omkhw=";
+    })
+
+    # don't make EGL support disable GLX, use the same patch as ArchLinux
+    # https://gitlab.archlinux.org/archlinux/packaging/packages/glew/-/blob/ca08ff5d4cd3548a593eb1118d0a84b0c3670349/egl+glx.patch
+    (fetchpatch {
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/glew/-/raw/ca08ff5d4cd3548a593eb1118d0a84b0c3670349/egl+glx.patch?inline=false";
+      hash = "sha256-IG3FPhhaor1kshEH3Kr8yzIHqBhczRwCqH7ZeDwlzGE=";
    })
  ];

--- a/pkgs/development/python-modules/customtkinter/0001-Add-Missing-Cfg-Packages.patch
+++ b/pkgs/development/python-modules/customtkinter/0001-Add-Missing-Cfg-Packages.patch
@ -0,0 +1,15 @@
+diff --git a/setup.cfg b/setup.cfg
+index 5f95b7f..9250e4f 100644
+--- a/setup.cfg
+++ b/setup.cfg
+@@ -22,6 +22,10 @@ repository = https://github.com/tomschimansky/customtkinter
+ python_requires = >=3.7
+ packages =
+     customtkinter
+    customtkinter.assets.fonts
+    customtkinter.assets.fonts.Roboto
+    customtkinter.assets.icons
+    customtkinter.assets.themes
+     customtkinter.windows
+     customtkinter.windows.widgets
+     customtkinter.windows.widgets.appearance_mode
--- a/pkgs/development/python-modules/customtkinter/default.nix
+++ b/pkgs/development/python-modules/customtkinter/default.nix
@ -2,11 +2,12 @@
  lib,
  buildPythonPackage,
  pythonOlder,
-  fetchPypi,
+  fetchFromGitHub,
  setuptools,
-  wheel,
  tkinter,
  darkdetect,
+  packaging,
+  typing-extensions,
 }:
 let
  pname = "customtkinter";
@ -17,20 +18,26 @@ buildPythonPackage {
  pyproject = true;
  disabled = pythonOlder "3.7";

-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-/Y2zuvqWHJgu5gMNuoC0wuJYWGMHVrUTmG2xkRPY0gc=";
+  src = fetchFromGitHub {
+    owner = "TomSchimansky";
+    repo = "CustomTkinter";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-1g2wdXbUv5xNnpflFLXvU39s16kmwvuegKWd91E3qm4=";
  };

-  nativeBuildInputs = [
+  build-system = [
    setuptools
-    wheel
+    tkinter
  ];
-  buildInputs = [ tkinter ];
-  propagatedBuildInputs = [ darkdetect ];

-  # No tests
-  doCheck = false;
+  dependencies = [
+    darkdetect
+    packaging
+    typing-extensions
+  ];
+
+  patches = [ ./0001-Add-Missing-Cfg-Packages.patch ];
+
  pythonImportsCheck = [ "customtkinter" ];

  meta = {
--- a/pkgs/development/python-modules/neoteroi-mkdocs/default.nix
+++ b/pkgs/development/python-modules/neoteroi-mkdocs/default.nix
@ -15,14 +15,14 @@
 }:
 buildPythonPackage rec {
  pname = "neoteroi-mkdocs";
-  version = "1.0.5";
+  version = "1.1.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "Neoteroi";
    repo = "mkdocs-plugins";
    rev = "refs/tags/v${version}";
-    hash = "sha256-gpU3G1PeZTKO4fWr4x8Ek0GIBEP3oRAgu7OFn2OZbRE=";
+    hash = "sha256-qizF1Y3BUyr0ekoATJVa62q7gvpbMW3fIKViov2tFTI=";
  };

  buildInputs = [ hatchling ];
--- a/pkgs/development/python-modules/onnx/default.nix
+++ b/pkgs/development/python-modules/onnx/default.nix
@ -25,7 +25,7 @@ let
 in
 buildPythonPackage rec {
  pname = "onnx";
-  version = "1.16.1";
+  version = "1.16.2";
  format = "setuptools";

  disabled = pythonOlder "3.8";
@ -34,7 +34,7 @@ buildPythonPackage rec {
    owner = pname;
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-I1wwfn91hdH3jORIKny0Xc73qW2P04MjkVCgcaNnQUE=";
+    hash = "sha256-JmxnsHRrzj2QzPz3Yndw0MmgZJ8MDYxHjuQ7PQkQsDg=";
  };

  build-system = [
--- a/pkgs/development/python-modules/pyinstrument/default.nix
+++ b/pkgs/development/python-modules/pyinstrument/default.nix
@ -9,7 +9,7 @@

 buildPythonPackage rec {
  pname = "pyinstrument";
-  version = "4.7.0";
+  version = "4.7.2";
  format = "pyproject";

  disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
    owner = "joerick";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-XB4ebWxTIX7WP2iLhhV2bHqoAau+mHnNnCSjEIQF/rM=";
+    hash = "sha256-X28GRYlGrlDUcY+7teaCiJkG+kQ7p367TK0zOjfHi5o=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/redshift-connector/default.nix
+++ b/pkgs/development/python-modules/redshift-connector/default.nix
@ -16,7 +16,7 @@

 buildPythonPackage rec {
  pname = "redshift-connector";
-  version = "2.1.2";
+  version = "2.1.3";
  format = "setuptools";

  disabled = pythonOlder "3.6";
@ -25,7 +25,7 @@ buildPythonPackage rec {
    owner = "aws";
    repo = "amazon-redshift-python-driver";
    rev = "refs/tags/v${version}";
-    hash = "sha256-sQRnnibkuA+Ejk6TDxDSdtIkkW7CMafYh9zQ/xtuCV4=";
+    hash = "sha256-NjUgmvmy0buBFpXjcEsZU0F2JNeXE3GBpkaxClvo4T0=";
  };

  # remove addops as they add test directory and coverage parameters to pytest
--- a/pkgs/development/python-modules/reorder-python-imports/default.nix
+++ b/pkgs/development/python-modules/reorder-python-imports/default.nix
@ -1,30 +1,30 @@
 {
  lib,
  buildPythonPackage,
+  classify-imports,
  fetchFromGitHub,
  pytestCheckHook,
  pythonOlder,
-  aspy-refactor-imports,
-  classify-imports,
+  setuptools,
 }:

 buildPythonPackage rec {
  pname = "reorder-python-imports";
-  version = "3.12.0";
-  format = "setuptools";
+  version = "3.13.0";
+  pyproject = true;
+
  disabled = pythonOlder "3.8";

  src = fetchFromGitHub {
    owner = "asottile";
    repo = "reorder_python_imports";
-    rev = "v${version}";
-    hash = "sha256-bKv9APbraR2359IzzkzXs4sEXrTvGK3J4LO3wFHOti0=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-N0hWrrUeojlUDZx2Azs/y2kCaknQ62hHdp0J2ZXPElY=";
  };

-  propagatedBuildInputs = [
-    aspy-refactor-imports
-    classify-imports
-  ];
+  build-system = [ setuptools ];
+
+  dependencies = [ classify-imports ];

  pythonImportsCheck = [ "reorder_python_imports" ];

@ -36,9 +36,9 @@ buildPythonPackage rec {

  meta = with lib; {
    description = "Tool for automatically reordering python imports";
-    mainProgram = "reorder-python-imports";
    homepage = "https://github.com/asottile/reorder_python_imports";
    license = licenses.mit;
    maintainers = with maintainers; [ gador ];
+    mainProgram = "reorder-python-imports";
  };
 }
--- a/pkgs/development/tools/database/clickhouse-backup/default.nix
+++ b/pkgs/development/tools/database/clickhouse-backup/default.nix
@ -7,16 +7,16 @@

 buildGoModule rec {
  pname = "clickhouse-backup";
-  version = "2.5.21";
+  version = "2.5.27";

  src = fetchFromGitHub {
    owner = "Altinity";
    repo = "clickhouse-backup";
    rev = "v${version}";
-    hash = "sha256-DjmhDUHC7278J9ByUlzXUF2s1GxRVNbRaYdlyy+5D/w=";
+    hash = "sha256-IU0M+Dq6jiEXz79fZiRkFqSF/R2piZyBOxsTGF1Ug2E=";
  };

-  vendorHash = "sha256-w3bfCn8A2ETJ6i1hm1FTNpTDXPFXF4vvkFAZCO/y7HE=";
+  vendorHash = "sha256-IEqxC4EzkEZnZru6U9O7U9kf375YKqBeyeJPqzaWbuM=";

  ldflags = [
    "-X main.version=${version}"
--- a/pkgs/development/tools/ijq/default.nix
+++ b/pkgs/development/tools/ijq/default.nix
@ -1,37 +0,0 @@
-{ buildGoModule, fetchFromSourcehut, lib, jq, installShellFiles, makeWrapper, scdoc }:
-
-buildGoModule rec {
-  pname = "ijq";
-  version = "1.1.0";
-
-  src = fetchFromSourcehut {
-    owner = "~gpanders";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-KtWJwIofMKW+03DFY4UWf3ni1DKuH289svh8iOPo1so=";
-  };
-
-  vendorHash = "sha256-oMkL4qZUS47h9izDad7Ar0Npd6toIZQuy1YIdEoJ2AM=";
-
-  nativeBuildInputs = [ installShellFiles makeWrapper scdoc ];
-
-  ldflags = [ "-s" "-w" "-X main.Version=${version}" ];
-
-  postBuild = ''
-    scdoc < ijq.1.scd > ijq.1
-    installManPage ijq.1
-  '';
-
-  postInstall = ''
-    wrapProgram "$out/bin/ijq" \
-      --prefix PATH : "${lib.makeBinPath [ jq ]}"
-  '';
-
-  meta = with lib; {
-    description = "Interactive wrapper for jq";
-    mainProgram = "ijq";
-    homepage = "https://git.sr.ht/~gpanders/ijq";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ justinas SuperSandro2000 ];
-  };
-}
--- a/pkgs/development/tools/protolint/default.nix
+++ b/pkgs/development/tools/protolint/default.nix
@ -1,13 +1,13 @@
 { lib, buildGoModule, fetchFromGitHub }:
 buildGoModule rec {
  pname = "protolint";
-  version = "0.50.4";
+  version = "0.50.5";

  src = fetchFromGitHub {
    owner = "yoheimuta";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-YUQ9DXsb45ggFi/sOeuONTO0hpmtxl/GLL1X6YKVE1g=";
+    hash = "sha256-dJurnM+AXdAd0/WBfnGT8KfpLmKHd5YAIZvMj5HHibI=";
  };

  vendorHash = "sha256-pjDVOD6McJdER+BbUckKt4WW/AXsCxdA2nNn8iWSlGE=";
--- a/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock
+++ b/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock
--- a/pkgs/development/tools/rust/cargo-shuttle/default.nix
+++ b/pkgs/development/tools/rust/cargo-shuttle/default.nix
@ -1,22 +1,23 @@
-{ lib
-, rustPlatform
-, fetchFromGitHub
-, pkg-config
-, openssl
-, zlib
-, stdenv
-, darwin
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  openssl,
+  zlib,
+  stdenv,
+  darwin,
 }:

 rustPlatform.buildRustPackage rec {
  pname = "cargo-shuttle";
-  version = "0.45.0";
+  version = "0.47.0";

  src = fetchFromGitHub {
    owner = "shuttle-hq";
    repo = "shuttle";
    rev = "v${version}";
-    hash = "sha256-bjGyLfeo11Y55WqPwcUxnNkexozlxC61/rSa65gBGZ4=";
+    hash = "sha256-AJ+7IUxi5SRRWw0EHh9JmQHkdQU3Mhd1Nmo1peEG2zg=";
  };

  cargoLock = {
@ -29,19 +30,22 @@ rustPlatform.buildRustPackage rec {
    };
  };

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

-  buildInputs = [
-    openssl
-    zlib
-  ] ++ lib.optionals stdenv.isDarwin [
-    darwin.apple_sdk.frameworks.CoreServices
-    darwin.apple_sdk.frameworks.SystemConfiguration
-  ];
+  buildInputs =
+    [
+      openssl
+      zlib
+    ]
+    ++ lib.optionals stdenv.isDarwin [
+      darwin.apple_sdk.frameworks.CoreServices
+      darwin.apple_sdk.frameworks.SystemConfiguration
+    ];

-  cargoBuildFlags = [ "-p" "cargo-shuttle" ];
+  cargoBuildFlags = [
+    "-p"
+    "cargo-shuttle"
+  ];

  cargoTestFlags = cargoBuildFlags ++ [
    # other tests are failing for different reasons
--- a/pkgs/games/blightmud/default.nix
+++ b/pkgs/games/blightmud/default.nix
@ -15,16 +15,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
  pname = "blightmud";
-  version = "5.3.0";
+  version = "5.3.1";

  src = fetchFromGitHub {
    owner = pname;
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-e9Uo0IJYL9/6/nNL27zfUYnsTwDaOJOcR2CY6t++jDE=";
+    hash = "sha256-9GUul5EoejcnCQqq1oX+seBtxttYIUhgcexaZk+7chk=";
  };

-  cargoHash = "sha256-QSgTpmSojZrwZ0RsUL6c2xO310RZX3gkyGl6oNf6pYI=";
+  cargoHash = "sha256-84m5dihmiEGrFCajqaMW05MQtBceLodBzqtjW+zh6kg=";

  buildFeatures = lib.optional withTTS "tts";

--- a/pkgs/games/mindustry/default.nix
+++ b/pkgs/games/mindustry/default.nix
@ -18,7 +18,6 @@
 , alsa-lib
 , alsa-plugins
 , glew
-, glew-egl

 # for soloud
 , libpulseaudio ? null
@ -45,8 +44,6 @@ let

  jdk = jdk17;

-  selectedGlew = if enableWayland then glew-egl else glew;
-
  Mindustry = fetchFromGitHub {
    owner = "Anuken";
    repo = "Mindustry";
@ -146,8 +143,8 @@ stdenv.mkDerivation {

  buildInputs = lib.optionals enableClient [
    SDL2
-    selectedGlew
    alsa-lib
+    glew
  ];
  nativeBuildInputs = [
    pkg-config
@ -171,7 +168,7 @@ stdenv.mkDerivation {
    pushd ../Arc
    gradle jnigenBuild
    gradle jnigenJarNativesDesktop
-    glewlib=${lib.getLib selectedGlew}/lib/libGLEW.so
+    glewlib=${lib.getLib glew}/lib/libGLEW.so
    sdllib=${lib.getLib SDL2}/lib/libSDL2.so
    patchelf backends/backend-sdl/libs/linux64/libsdl-arc*.so \
      --add-needed $glewlib \
@ -203,7 +200,7 @@ stdenv.mkDerivation {
      # This can cause issues.
      # See https://github.com/NixOS/nixpkgs/issues/109798.
      echo "# Retained runtime dependencies: " >> $out/bin/mindustry
-      for dep in ${SDL2.out} ${alsa-lib.out} ${selectedGlew.out}; do
+      for dep in ${SDL2.out} ${alsa-lib.out} ${glew.out}; do
        echo "# $dep" >> $out/bin/mindustry
      done

--- a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix
+++ b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix
@ -7,11 +7,11 @@

 stdenvNoCC.mkDerivation rec {
  pname = "linux-firmware";
-  version = "20240709";
+  version = "20240811";

  src = fetchzip {
    url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${version}.tar.gz";
-    hash = "sha256-BopPZDVQMmhLo9qTpozIea2amaZNQvwhgEIcpKMPAKs=";
+    hash = "sha256-sfQIXXBU5oIDmTpWExDc0drO8QH9lBL8opPO3mSk98E=";
  };

  nativeBuildInputs = [
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@ -4,8 +4,8 @@
        "hash": "sha256:1ssw0cfzssczykg47gvvnpkzk2nvq3sl258nvxgypk3an1xc4xzs"
    },
    "6.1": {
-        "version": "6.1.103",
-        "hash": "sha256:0ws59jjd71vhwbzkn0wqaby3yb8kjbc4clgza8aqhl4gi5pp1d2y"
+        "version": "6.1.104",
+        "hash": "sha256:0xlrfm15c7cx1r3lndjgcwv29dyzr79wq09nbkhrf4r4j9j35yjw"
    },
    "5.15": {
        "version": "5.15.164",
@ -24,8 +24,8 @@
        "hash": "sha256:0c7bhb31hpbbw1is1ykppk9lm0x025yyd4hrmlg1s6yg75rxqkal"
    },
    "6.6": {
-        "version": "6.6.44",
-        "hash": "sha256:1n6ckxx0i4dbq018b56q1wkwq944jhjy225swrpn65a9jfb848ck"
+        "version": "6.6.45",
+        "hash": "sha256:0ygiqh4zdg9ndqgyv9fiv4h0cgmgxa7ff28nkjas1r370wjfs6qj"
    },
    "6.8": {
        "version": "6.8.12",
@ -36,7 +36,7 @@
        "hash": "sha256:08ngskni7d9wi93vlwcmbdg7sb2jl1drhhzn62k9nsrg1r7crrss"
    },
    "6.10": {
-        "version": "6.10.3",
-        "hash": "sha256:1666dypfg193l5460maadki4hc291hr7k9fw74nq21fxczyj4pzs"
+        "version": "6.10.4",
+        "hash": "sha256:1y2m2pqrvsgr9ng72nnh4yvsprkvkznhnmn4p8g78350bzyrvip2"
    }
 }
--- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
@ -6,7 +6,7 @@
 , ... } @ args:

 let
-  version = "5.10.222-rt114"; # updated by ./update-rt.sh
+  version = "5.10.223-rt115"; # updated by ./update-rt.sh
  branch = lib.versions.majorMinor version;
  kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in buildLinux (args // {
@ -18,14 +18,14 @@ in buildLinux (args // {

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
-    sha256 = "1jshn64g165rdshyjvq38ni6pkbskp50048pbz407fss7f00cbbv";
+    sha256 = "189b3yl4lsjzh6qpza0phj8hgsvnyh38cgrd70rnqw3rddmdh2fa";
  };

  kernelPatches = let rt-patch = {
    name = "rt";
    patch = fetchurl {
      url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-      sha256 = "0ylq8ffl9ivd1rh1fidmviyhzvknfh46my8iiqyfyg7y5z0cl1pg";
+      sha256 = "1kxm1ibc2krzjwvhhlz6h7047mir52x2cafg3pvp2kdpls8kw3jf";
    };
  }; in [ rt-patch ] ++ kernelPatches;

--- a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix
@ -6,7 +6,7 @@
 , ... } @ args:

 let
-  version = "6.6.43-rt38"; # updated by ./update-rt.sh
+  version = "6.6.44-rt39"; # updated by ./update-rt.sh
  branch = lib.versions.majorMinor version;
  kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in buildLinux (args // {
@ -19,14 +19,14 @@ in buildLinux (args // {

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";
-    sha256 = "0pha226h5011kl5r2iiddxi0rib3xraslmcdjjnil2kq38d3pn0a";
+    sha256 = "1n6ckxx0i4dbq018b56q1wkwq944jhjy225swrpn65a9jfb848ck";
  };

  kernelPatches = let rt-patch = {
    name = "rt";
    patch = fetchurl {
      url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-      sha256 = "0flxji623fy11l7z2syj5nlpkjfrc2nkqfpqvbgwzqpzms028mzj";
+      sha256 = "0c6a75b33xyzwp779j35xyz9gp9njmqvg84425yrnmykdl5fwfqh";
    };
  }; in [ rt-patch ] ++ kernelPatches;

--- a/pkgs/os-specific/linux/nvme-cli/default.nix
+++ b/pkgs/os-specific/linux/nvme-cli/default.nix
@ -9,13 +9,13 @@

 stdenv.mkDerivation rec {
  pname = "nvme-cli";
-  version = "2.10";
+  version = "2.10.2";

  src = fetchFromGitHub {
    owner = "linux-nvme";
    repo = "nvme-cli";
    rev = "v${version}";
-    hash = "sha256-pFSVCbGiJ+8T2Eeew1M6TZC5Vh46OJDmf7hfU9M26Iw=";
+    hash = "sha256-8vxalIHA4DRQuI18PRmzrlyG1XHcbKPkZgVB5Yqq9EU=";
  };

  mesonFlags = [
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@ -21,16 +21,16 @@ let
 in
 buildGoModule rec {
  pname = "minio";
-  version = "2024-07-16T23-46-41Z";
+  version = "2024-08-03T04-33-23Z";

  src = fetchFromGitHub {
    owner = "minio";
    repo = "minio";
    rev = "RELEASE.${version}";
-    hash = "sha256-L94lp3HTGALm6Ipd99R6cXOqeJZCLu4ORTCzlKX4o7A=";
+    hash = "sha256-bzEGckelhq5jJGm6dbdPsIBqksv/jY6hQUf/STQUsoE=";
  };

-  vendorHash = "sha256-UUUqOZh6GGDBhuEdC3+KZeFtb1hm1WjfeN/DM+tcenI=";
+  vendorHash = "sha256-ytkiQ/g0BwHyr6LY4SGBBmfRRCFTsBtDHClyRBboGCk=";

  doCheck = false;

--- a/pkgs/tools/misc/faketty/default.nix
+++ b/pkgs/tools/misc/faketty/default.nix
@ -2,14 +2,14 @@

 rustPlatform.buildRustPackage rec {
  pname = "faketty";
-  version = "1.0.17";
+  version = "1.0.18";

  src = fetchCrate {
    inherit pname version;
-    hash = "sha256-JUvQg8WLk5+O+3fbbQSUW6Mtp9TrYlrt+uwMAzm082Q=";
+    hash = "sha256-b6rHyg1rHMihmJ1okH11uDvOsqNydfK/c1cAgP6Tvx0=";
  };

-  cargoHash = "sha256-Y+jcq2twIGDbHTA6aBGnyN9Old993Y/2j/fKnXhZGYU=";
+  cargoHash = "sha256-LeTZkGhr1yTPG6OoukRB2+pcEAZKtjd9b60MLBi0Xl8=";

  postPatch = ''
    patchShebangs tests/test.sh
--- a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix
+++ b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix
@ -8,13 +8,13 @@

 buildGoModule rec {
  pname = "steampipe-plugin-aws";
-  version = "0.144.0";
+  version = "0.145.0";

  src = fetchFromGitHub {
    owner = "turbot";
    repo = "steampipe-plugin-aws";
    rev = "refs/tags/v${version}";
-    hash = "sha256-ZPTB8qbR0qJOJ7mQZuU370/s97kWJc7TtTuSqjqrleA=";
+    hash = "sha256-Nh+GlnAA3dwRD0EFhUXqPXJtwUMmLzUtwFSJcaECpbc=";
  };

  vendorHash = "sha256-h0+ffKSyEU7lSqbL+LwqRZp563AlAGpzMbtg3qdOjrk=";
--- a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix
+++ b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix
@ -8,13 +8,13 @@

 buildGoModule rec {
  pname = "steampipe-plugin-github";
-  version = "0.42.0";
+  version = "0.43.0";

  src = fetchFromGitHub {
    owner = "turbot";
    repo = "steampipe-plugin-github";
    rev = "refs/tags/v${version}";
-    hash = "sha256-GtlUSIjRLlO/ICdWV9QNjLyBwM+/Jpt4INIaHst4Tao=";
+    hash = "sha256-Kr9JXVLd0E7IG5dq9liS5uQNAX535urETwZytKRaZIA=";
  };

  vendorHash = "sha256-UivLueePtstJtAWbl7li8FzZ41Q2kF9FYzVYdQ4172g=";
--- a/pkgs/tools/security/cnspec/default.nix
+++ b/pkgs/tools/security/cnspec/default.nix
@ -6,18 +6,18 @@

 buildGoModule rec {
  pname = "cnspec";
-  version = "11.16.0";
+  version = "11.16.1";

  src = fetchFromGitHub {
    owner = "mondoohq";
    repo = "cnspec";
    rev = "refs/tags/v${version}";
-    hash = "sha256-xXN+1t5/0bLjX7lfuKTJDw0cN87LdFCuzYaaVt1plac=";
+    hash = "sha256-juEMrdMu2UJ/o4M6qLD3dmKub8F/QAtdARZhhTgXKcE=";
  };

  proxyVendor = true;

-  vendorHash = "sha256-S4RvRGtIUjJ/vDehUrsozxbvZckw/7hpguTCcR6mbCc=";
+  vendorHash = "sha256-dCdm6cdMnVxrUEl17Ki+veCAefgVSFeTs7GLJCWBM8w=";

  subPackages = [ "apps/cnspec" ];

--- a/pkgs/tools/system/netdata/default.nix
+++ b/pkgs/tools/system/netdata/default.nix
@ -43,7 +43,8 @@ stdenv.mkDerivation rec {

  strictDeps = true;

-  nativeBuildInputs = [ cmake pkg-config makeWrapper go ninja ];
+  nativeBuildInputs = [ cmake pkg-config makeWrapper go ninja ]
+    ++ lib.optionals withCups [ cups.dev ];
  # bash is only used to rewrite shebangs
  buildInputs = [ bash curl jemalloc json_c libuv zlib libyaml ]
    ++ lib.optionals stdenv.isDarwin [ CoreFoundation IOKit libossp_uuid ]
--- a/pkgs/tools/text/fanficfare/default.nix
+++ b/pkgs/tools/text/fanficfare/default.nix
@ -2,12 +2,12 @@

 python3Packages.buildPythonApplication rec {
  pname = "fanficfare";
-  version = "4.36.0";
+  version = "4.37.0";
  pyproject = true;

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-gsaY02x8hJr0NzR5Q9VB3KkAFnotjrWXRoUjFpBJB0w=";
+    hash = "sha256-Wh/eWseR+SSVYUqNG6krYCgS1gipSJGTJ+fi6uZNCO8=";
  };

  nativeBuildInputs = with python3Packages; [
--- a/pkgs/tools/text/ruplacer/default.nix
+++ b/pkgs/tools/text/ruplacer/default.nix
@ -2,16 +2,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "ruplacer";
-  version = "0.8.3";
+  version = "0.9.0";

  src = fetchFromGitHub {
    owner = "TankerHQ";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-rndWKi/EDQzTWAw2deddhTXdmIfuEVM54MOfS4mNf+Y=";
+    sha256 = "sha256-N71oiOlhMMDq0VhujV4SgnnKMQRi5SdplrTjK2vyhUE=";
  };

-  cargoHash = "sha256-DkhmMdpUcka6Wkyz6hEfqB2gUpsGNziGv+23rVfwXN8=";
+  cargoHash = "sha256-EyLompGEin12q6SC1M1D0QsE42HVEq5O/E99qi54cGo=";

  buildInputs = (lib.optional stdenv.isDarwin Security);

--- a/pkgs/tools/wayland/mpvpaper/default.nix
+++ b/pkgs/tools/wayland/mpvpaper/default.nix
@ -6,7 +6,7 @@
 , wayland-protocols
 , wayland-scanner
 , egl-wayland
-, glew-egl
+, glew
 , mpv
 , pkg-config
 , fetchFromGitHub
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
    wayland
    wayland-protocols
    egl-wayland
-    glew-egl
+    glew
    mpv
  ];

--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@ -518,6 +518,7 @@ mapAliases ({
  }; # Added 2021-01-14

  gitter = throw "gitter has been removed since the client has been abandoned by upstream with the backend migration to Matrix"; # Added 2023-09-18
+  glew-egl = lib.warn "'glew-egl' is now provided by 'glew' directly" glew; # Added 2024-08-11
  glide = throw "'glide' has been removed as it is unmaintained, please use Go modules instead"; # Added 2023-12-26
  glfw-wayland = glfw; # Added 2024-04-19
  gmailieer = lieer; # Added 2020-04-19
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -705,8 +705,6 @@ with pkgs;

  n98-magerun = callPackage ../development/tools/misc/n98-magerun { };

-  n98-magerun2 = callPackage ../development/tools/misc/n98-magerun2 { };
-
  prisma-engines = callPackage ../development/tools/database/prisma-engines {
    inherit (darwin.apple_sdk.frameworks) Security;
  };
@ -2684,7 +2682,6 @@ with pkgs;
  ppsspp-sdl = let
    argset = {
      ffmpeg = ffmpeg_4;
-      glew = glew.override { enableEGL = argset.forceWayland; };
      enableQt = false;
      enableVulkan = true;
      forceWayland = false;
@ -2695,7 +2692,6 @@ with pkgs;
  ppsspp-sdl-wayland = let
    argset = {
      ffmpeg = ffmpeg_4;
-      glew = glew.override { enableEGL = argset.forceWayland; };
      enableQt = false;
      enableVulkan = false; # https://github.com/hrydgard/ppsspp/issues/13845
      forceWayland = true;
@ -2706,7 +2702,6 @@ with pkgs;
  ppsspp-qt = let
    argset = {
      ffmpeg = ffmpeg_4;
-      glew = glew.override { enableEGL = argset.forceWayland; };
      enableQt = true;
      enableVulkan = false; # https://github.com/hrydgard/ppsspp/issues/11628
      forceWayland = false;
@ -8935,8 +8930,6 @@ with pkgs;
    packages = config.ihaskell.packages or (_: []);
  };

-  ijq = callPackage ../development/tools/ijq { };
-
  iruby = callPackage ../applications/editors/jupyter-kernels/iruby { };

  ike-scan = callPackage ../tools/security/ike-scan { };
@ -20398,11 +20391,6 @@ with pkgs;
  glew110 = callPackage ../development/libraries/glew/1.10.nix {
    inherit (darwin.apple_sdk.frameworks) AGL OpenGL;
  };
-  glew-egl = callPackage ../development/libraries/glew {
-    inherit (darwin.apple_sdk.frameworks) OpenGL;
-    enableEGL = true;
-  };
-
  glfw = glfw3;
  glfw-wayland-minecraft = callPackage ../development/libraries/glfw/3.x-wayland-minecraft.nix {};
  glfw2 = callPackage ../development/libraries/glfw/2.x.nix { };
@ -33641,8 +33629,6 @@ with pkgs;
  bambu-studio = callPackage ../applications/misc/bambu-studio {
    inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good;

-    glew = glew-egl;
-
    wxGTK31 = wxGTK31.override {
      withCurl = true;
      withPrivateFonts = true;
@ -38788,8 +38774,6 @@ with pkgs;

  nix-query-tree-viewer = callPackage ../tools/nix/nix-query-tree-viewer { };

-  nix-update = callPackage ../tools/package-management/nix-update { };
-
  nix-update-source = callPackage ../tools/package-management/nix-update-source { };

  nix-script = callPackage ../tools/nix/nix-script { };