Merge staging-next into staging

2024-11-22 15:03:28 +00:00 · 2024-08-17 12:01:34 +00:00 · 2024-08-17 12:01:34 +00:00 · dfd7616ef8
commit dfd7616ef8
parent 58f7a24c80 fe40496879
57 changed files with 668 additions and 467 deletions
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@ -455,7 +455,7 @@ rec {

      1. Takes a function `p`, or a path to a Nix file that contains a function `p`, which takes an attribute set and returns value of arbitrary type `a`,
      2. Takes an attribute set `args` with explicit attributes to pass to `p`,
-      3. Calls `f` with attributes from the original attribute set `attrs` passed to `newScope` updated with `args, i.e. `attrs // args`, if they match the attributes in the argument of `p`.
+      3. Calls `f` with attributes from the original attribute set `attrs` passed to `newScope` updated with `args`, i.e. `attrs // args`, if they match the attributes in the argument of `p`.

      All such functions `p` will be called with the same value for `attrs`.

--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@ -728,6 +728,12 @@ lib.mapAttrs mkLicense ({
    redistributable = false;
  };

+  databricks-license = {
+    fullName = "Databricks License";
+    url = "https://www.databricks.com/legal/db-license";
+    free = false;
+  };
+
  fair = {
    fullName = "Fair License";
    spdxId = "Fair";
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -8024,6 +8024,13 @@
    githubId = 62279738;
    name = "Håkon Arvidsen";
  };
+  HaskellHegemonie = {
+    name = "HaskellHegemonie";
+    email = "haskellisierer@proton.me";
+    github = "HaskellHegemonie";
+    githubId = 73712423;
+    keys = [ { fingerprint = "A559 0A2A 5B06 1923 3917  5F13 5622 C205 6513 577B"; } ];
+  };
  haslersn = {
    email = "haslersn@fius.informatik.uni-stuttgart.de";
    github = "haslersn";
--- a/nixos/modules/programs/regreet.nix
+++ b/nixos/modules/programs/regreet.nix
@ -27,7 +27,7 @@ in
    package = lib.mkPackageOption pkgs [ "greetd" "regreet" ] { };

    settings = lib.mkOption {
-      type = lib.types.either lib.types.path settingsFormat.type;
+      type = settingsFormat.type;
      default = { };
      description = ''
        ReGreet configuration file. Refer
@ -141,7 +141,7 @@ in

    fonts.packages = [ cfg.font.package ];

-    programs.regreet.settings = {
+    programs.regreet.settings.GTK = {
      cursor_theme_name = cfg.cursorTheme.name;
      font_name = "${cfg.font.name} ${toString cfg.font.size}";
      icon_theme_name = cfg.iconTheme.name;
@ -160,9 +160,7 @@ in
        else {text = cfg.extraCss;};

      "greetd/regreet.toml".source =
-        if lib.isPath cfg.settings
-        then cfg.settings
-        else settingsFormat.generate "regreet.toml" cfg.settings;
+        settingsFormat.generate "regreet.toml" cfg.settings;
    };

    systemd.tmpfiles.settings."10-regreet" = let
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@ -11256,6 +11256,18 @@ final: prev:
    meta.homepage = "https://github.com/levouh/tint.nvim/";
  };

+  tiny-inline-diagnostic-nvim = buildVimPlugin {
+    pname = "tiny-inline-diagnostic.nvim";
+    version = "2024-08-10";
+    src = fetchFromGitHub {
+      owner = "rachartier";
+      repo = "tiny-inline-diagnostic.nvim";
+      rev = "7b212b214aed37d8ae1a26ac6ca9593223a23ddb";
+      sha256 = "0zf3l8fx7vbq352ip3lrvvhrkkwp8n7n5i2lh5ps8j0jqaxswr33";
+    };
+    meta.homepage = "https://github.com/rachartier/tiny-inline-diagnostic.nvim/";
+  };
+
  tlib_vim = buildVimPlugin {
    pname = "tlib_vim";
    version = "2022-07-22";
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@ -944,6 +944,7 @@ https://github.com/ron89/thesaurus_query.vim/,,
 https://github.com/itchyny/thumbnail.vim/,,
 https://github.com/vim-scripts/timestamp.vim/,,
 https://github.com/levouh/tint.nvim/,HEAD,
+https://github.com/rachartier/tiny-inline-diagnostic.nvim/,HEAD,
 https://github.com/tomtom/tinykeymap_vim/,,tinykeymap
 https://github.com/tomtom/tlib_vim/,,
 https://github.com/wellle/tmux-complete.vim/,,
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@ -1213,6 +1213,23 @@ let
        meta.license = lib.licenses.mit;
      };

+      databricks.databricks = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "databricks";
+          publisher = "databricks";
+          version = "2.3.1";
+          hash = "sha256-Qa839ygG8Z3aD/ZSshe2hg0ee3ZFU8xRrJ5E0cUjfCU=";
+        };
+        meta = {
+          changelog = "https://marketplace.visualstudio.com/items/databricks.databricks/changelog";
+          description = "Databricks extension for Visual Studio Code";
+          downloadPage = "https://marketplace.visualstudio.com/items?itemName=databricks.databricks";
+          homepage = "https://github.com/databricks/databricks-vscode";
+          license = lib.licenses.databricks-license;
+          maintainers = [ lib.maintainers.softinio ];
+        };
+      };
+
      davidanson.vscode-markdownlint = buildVscodeMarketplaceExtension {
        mktplcRef = {
          name = "vscode-markdownlint";
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@ -15,11 +15,11 @@ let
  archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";

  sha256 = {
-    x86_64-linux = "0am2g0vpb2fgqqs9m5v9dx8w47l2xnjy7bf3rr0bjr4yv4qn7g0n";
-    x86_64-darwin = "0520kpdfa2k1qlgnmnzisbbq0n4h119nfgnaljymsviw1ix02v7k";
-    aarch64-linux = "0r6sqyfcj3qs2iqpfhdjcd8jfazkmyxx0f92qpxlc6a5gllm3hlj";
-    aarch64-darwin = "03b0akbkmqp1fm6i61dx09lln8m3598xigi4wr0rkdsy0yq2vpl8";
-    armv7l-linux = "1sdml7bhrrn2qskhzs4ymibq7cw4nhjimxi8fmaj94dk5yri4wd3";
+    x86_64-linux = "1qddnqjq61c8m9klzkf4ic2zjgcwzpa0mjmraqfyga8njqham8z5";
+    x86_64-darwin = "1fkpijnm1z84x1bv9w4qvwrydcv9i2jsldvp96gby7f3gp69asaw";
+    aarch64-linux = "1k8whwqk0di2knld4gxyjwngh5kfa4pa4fr1scg7pfwfx9dnkljd";
+    aarch64-darwin = "0wgag225ji108zdrfbmp3iviyl3ha6gblcxp5ilc39pi50dms4gv";
+    armv7l-linux = "00w4238av273qznbnxdw4vvjj0iv8rrzb15aazvirb22d2slk9hr";
  }.${system} or throwSystem;

  sourceRoot = lib.optionalString (!stdenv.isDarwin) ".";
@ -29,7 +29,7 @@ in

    # Please backport all compatible updates to the stable release.
    # This is important for the extension ecosystem.
-    version = "1.91.1.24193";
+    version = "1.92.2.24228";
    pname = "vscodium";

    executableName = "codium";
--- a/pkgs/applications/misc/sc-im/default.nix
+++ b/pkgs/applications/misc/sc-im/default.nix
@ -16,13 +16,13 @@

 stdenv.mkDerivation rec {
  pname = "sc-im";
-  version = "0.8.3";
+  version = "0.8.4";

  src = fetchFromGitHub {
    owner = "andmarti1424";
    repo = "sc-im";
    rev = "v${version}";
-    sha256 = "sha256-QlnxMe0WsRX9J2xzpf2Udcf9+N3MvQWqmYl2YKsGpYM=";
+    sha256 = "sha256-nNOifSYbmJjuw6c8TerIQRlhCwbs7GnzD2J7O3vs0gI=";
  };

  sourceRoot = "${src.name}/src";
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@ -6,17 +6,17 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ])
    if stdenv.isAarch64 then
      rec {
        pname = "brave";
-        version = "1.68.137";
+        version = "1.68.141";
        url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-        hash = "sha256-9HMgLZ/iK5xJByZuvD8n5cv+aK5oZRm2Xbm4NhgWpCk=";
+        hash = "sha256-3Zd1H67rFDar/68ilcxPuAQOllh8SMm//9+h+m1MKes=";
        platform = "aarch64-linux";
      }
    else if stdenv.isx86_64 then
      rec {
        pname = "brave";
-        version = "1.68.137";
+        version = "1.68.141";
        url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-        hash = "sha256-lEW4bv/BWjV8ncB8TMbLMSoQCW960kWP9DaZkEws428=";
+        hash = "sha256-soSwRj8acXA2KDgCpcFZh2AFEVX43ZI7IpmvXKv5mFo=";
        platform = "x86_64-linux";
      }
    else
--- a/pkgs/applications/version-management/delta/default.nix
+++ b/pkgs/applications/version-management/delta/default.nix
@ -11,16 +11,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "delta";
-  version = "0.17.0-unstable-2024-08-12";
+  version = "0.18.0";

  src = fetchFromGitHub {
    owner = "dandavison";
-    repo = pname;
-    rev = "a01141b72001f4c630d77cf5274267d7638851e4";
-    hash = "sha256-My51pQw5a2Y2VTu39MmnjGfmCavg8pFqOmOntUildS0=";
+    repo = "delta";
+    rev = "refs/tags/${version}";
+    hash = "sha256-1UOVRAceZ4QlwrHWqN7YI2bMyuhwLnxJWpfyaHNNLYg=";
  };

-  cargoHash = "sha256-Rlc3Bc6Jh89KLLEWBWQB5GjoeIuHnwIVZN/MVFMjY24=";
+  cargoHash = "sha256-/h7djtaTm799gjNrC6vKulwwuvrTHjlsEXbK2lDH+rc=";

  nativeBuildInputs = [
    installShellFiles
--- a/pkgs/applications/virtualization/docker/compose.nix
+++ b/pkgs/applications/virtualization/docker/compose.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "docker-compose";
-  version = "2.29.1";
+  version = "2.29.2";

  src = fetchFromGitHub {
    owner = "docker";
    repo = "compose";
    rev = "v${version}";
-    hash = "sha256-6GZtKfPBE9Wl6ccwU1OY+9rq+IZr2qpOB4Vlxidhisw=";
+    hash = "sha256-UR2O8xBfoFew9G7RjyfXpdA0BcilKBp9Maj3Z+T7Kbw=";
  };

  postPatch = ''
@ -16,7 +16,7 @@ buildGoModule rec {
    rm -rf e2e/
  '';

-  vendorHash = "sha256-CkXCAqHOlSc3jHqVUYovT8YDnlCZewpLv3sC0ADgwL0=";
+  vendorHash = "sha256-5pBpTXayAo/YbZsYwBuEU8CSTQGzKoyQ5QLzh2McCt8=";

  ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];

--- a/pkgs/by-name/ba/baresip/package.nix
+++ b/pkgs/by-name/ba/baresip/package.nix
@ -1,30 +1,33 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, zlib
-, openssl
-, libre
-, librem
-, pkg-config
-, gst_all_1
-, cairo
-, gtk3
-, mpg123
-, alsa-lib
-, SDL2
-, libv4l
-, celt
-, libsndfile
-, srtp
-, ffmpeg
-, gsm
-, speex
-, portaudio
-, spandsp3
-, libuuid
-, libvpx
-, cmake
-, dbusSupport ? true
+{
+  SDL2,
+  alsa-lib,
+  cairo,
+  celt,
+  cmake,
+  fetchFromGitHub,
+  ffmpeg,
+  glib,
+  gsm,
+  gst_all_1,
+  gtk3,
+  lib,
+  libre,
+  librem,
+  libsndfile,
+  libuuid,
+  libv4l,
+  libvpx,
+  mpg123,
+  openssl,
+  pipewire,
+  pkg-config,
+  portaudio,
+  spandsp3,
+  speex,
+  srtp,
+  stdenv,
+  zlib,
+  dbusSupport ? true,
 }:
 stdenv.mkDerivation rec {
  version = "3.10.1";
@ -35,83 +38,47 @@ stdenv.mkDerivation rec {
    rev = "v${version}";
    hash = "sha256-0huZP1hopHaN5R1Hki6YutpvoASfIHzHMl/Y4czHHMo=";
  };
-  prePatch = lib.optionalString (!dbusSupport) ''
+  prePatch = ''
+    substituteInPlace cmake/FindGTK3.cmake --replace GTK3_CFLAGS_OTHER ""
+  '' + lib.optionalString (!dbusSupport) ''
    substituteInPlace cmake/modules.cmake --replace 'list(APPEND MODULES ctrl_dbus)' ""
  '';
-  nativeBuildInputs = [ pkg-config cmake ];
+  nativeBuildInputs = [ cmake pkg-config ];
  buildInputs = [
-    zlib
-    openssl
-    libre
-    librem
-    cairo
-    gtk3
-    mpg123
-    alsa-lib
    SDL2
-    libv4l
+    alsa-lib
+    cairo
    celt
-    libsndfile
-    srtp
    ffmpeg
    gsm
-    speex
+    gtk3
+    libre
+    librem
+    libsndfile
+    libuuid
+    libv4l
+    libvpx
+    mpg123
+    openssl
+    pipewire
    portaudio
    spandsp3
-    libuuid
-    libvpx
+    speex
+    srtp
+    zlib
  ] ++ (with gst_all_1; [ gstreamer gst-libav gst-plugins-base gst-plugins-bad gst-plugins-good ]);

  cmakeFlags = [
    "-DCMAKE_SKIP_BUILD_RPATH=ON"
    "-Dre_DIR=${libre}/include/re"
+    "-DGL_INCLUDE_DIRS=${lib.getDev glib}/include/glib-2.0"
+    "-DGLIB_INCLUDE_DIRS=${glib.out}/lib/glib-2.0/include"
+    "-DGST_INCLUDE_DIRS=${lib.getDev gst_all_1.gstreamer}/include/gstreamer-1.0"
  ];

  makeFlags = [
-    "LIBRE_MK=${libre}/share/re/re.mk"
-    "LIBRE_SO=${libre}/lib"
-    "LIBREM_PATH=${librem}"
    "PREFIX=$(out)"
-    "USE_VIDEO=1"
    "CCACHE_DISABLE=1"
-
-    "USE_ALSA=1"
-    "USE_AMR=1"
-    "USE_CAIRO=1"
-    "USE_CELT=1"
-    "USE_CONS=1"
-    "USE_EVDEV=1"
-    "USE_FFMPEG=1"
-    "USE_GSM=1"
-    "USE_GST1=1"
-    "USE_GTK=1"
-    "USE_L16=1"
-    "USE_MPG123=1"
-    "USE_OSS=1"
-    "USE_PLC=1"
-    "USE_VPX=1"
-    "USE_PORTAUDIO=1"
-    "USE_SDL=1"
-    "USE_SNDFILE=1"
-    "USE_SPEEX=1"
-    "USE_SPEEX_AEC=1"
-    "USE_SPEEX_PP=1"
-    "USE_SPEEX_RESAMP=1"
-    "USE_SRTP=1"
-    "USE_STDIO=1"
-    "USE_SYSLOG=1"
-    "USE_UUID=1"
-    "USE_V4L2=1"
-    "USE_X11=1"
-
-    "USE_BV32="
-    "USE_COREAUDIO="
-    "USE_G711=1"
-    "USE_G722=1"
-    "USE_G722_1="
-    "USE_ILBC="
-    "USE_OPUS="
-    "USE_SILK="
  ]
  ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}"
  ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}"
@ -123,6 +90,73 @@ stdenv.mkDerivation rec {
    -DHAVE_INTTYPES_H -D__GLIBC__
    -D__need_timeval -D__need_timespec -D__need_time_t '';

+  doInstallCheck = true;
+  # CMake feature detection is prone to breakage between upgrades:
+  # spot-check that the optional modules we care about were compiled
+  postInstallCheck = lib.concatMapStringsSep "\n" (m: "test -x $out/lib/baresip/modules/${m}.so") [
+    "account"
+    "alsa"
+    "aubridge"
+    "auconv"
+    "aufile"
+    "auresamp"
+    "ausine"
+    "avcodec"
+    "avfilter"
+    "avformat"
+    "cons"
+    "contact"
+    "ctrl_dbus"
+    "ctrl_tcp"
+    "debug_cmd"
+    "dtls_srtp"
+    "ebuacip"
+    "echo"
+    "evdev"
+    "fakevideo"
+    "g711"
+    "g722"
+    "g726"
+    "gst"
+    "gtk"
+    "httpd"
+    "httpreq"
+    "ice"
+    "l16"
+    "menu"
+    "mixausrc"
+    "mixminus"
+    "multicast"
+    "mwi"
+    "natpmp"
+    "netroam"
+    "pcp"
+    "pipewire"
+    "plc"
+    "portaudio"
+    "presence"
+    "rtcpsummary"
+    "sdl"
+    "selfview"
+    "serreg"
+    "snapshot"
+    "sndfile"
+    "srtp"
+    "stdio"
+    "stun"
+    "swscale"
+    "syslog"
+    "turn"
+    "uuid"
+    "v4l2"
+    "vidbridge"
+    "vidinfo"
+    "vp8"
+    "vp9"
+    "vumeter"
+    "x11"
+  ];
+
  meta = {
    description = "Modular SIP User-Agent with audio and video support";
    homepage = "https://github.com/baresip/baresip";
--- a/pkgs/by-name/ba/bato/package.nix
+++ b/pkgs/by-name/ba/bato/package.nix
@ -0,0 +1,39 @@
+{
+  lib,
+  pkg-config,
+  cmake,
+  libnotify,
+  rustPlatform,
+  fetchFromGitHub,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "bato";
+  version = "0.1.7";
+
+  src = fetchFromGitHub {
+    owner = "doums";
+    repo = "bato";
+    rev = "v${version}";
+    hash = "sha256-i2gw8vXiKutq26ACzkVXH3kED7jAngSv2mNo9P3qXnA=";
+  };
+
+  cargoHash = "sha256-cqrSyZjfBSfF015nwOcRy2rkE4XzFPxJCQZGrqZXLEA=";
+
+  nativeBuildInputs = [
+    pkg-config
+    cmake
+  ];
+
+  buildInputs = [ libnotify ];
+
+  meta = {
+    description = "Small program to send battery notifications";
+    homepage = "https://github.com/doums/bato";
+    changelog = "https://github.com/doums/bato/releases/tag/v${version}";
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ HaskellHegemonie ];
+    platforms = lib.platforms.linux;
+    mainProgram = "bato";
+  };
+}
--- a/pkgs/by-name/el/elasticsearch-curator/package.nix
+++ b/pkgs/by-name/el/elasticsearch-curator/package.nix
@ -9,16 +9,18 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "elasticsearch-curator";
-  version = "8.0.15";
-  format = "pyproject";
+  version = "8.0.16";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "elastic";
    repo = "curator";
    rev = "refs/tags/v${version}";
-    hash = "sha256-pW928jT9oL76RJuJgH7nhCvgWPzXixzqBKVYsaJy9xw=";
+    hash = "sha256-nSBsLzem+eZBM0ebhW1Omh+pYYPYdly/VraM89iJe3E=";
  };

+  pythonRelaxDeps = [ "es-client" ];
+
  build-system = with python3.pkgs; [ hatchling ];

  dependencies = with python3.pkgs; [
--- a/pkgs/by-name/go/godot_4/package.nix
+++ b/pkgs/by-name/go/godot_4/package.nix
@ -7,6 +7,7 @@
  fontconfig,
  installShellFiles,
  lib,
+  libdecor,
  libGL,
  libpulseaudio,
  libX11,
@ -24,6 +25,8 @@
  stdenv,
  udev,
  vulkan-loader,
+  wayland,
+  wayland-scanner,
  withDbus ? true,
  withDebug ? false,
  withFontconfig ? true,
@ -34,13 +37,15 @@
  withTarget ? "editor",
  withTouch ? true,
  withUdev ? true,
+  # Wayland in Godot requires X11 until upstream fix is merged
+  # https://github.com/godotengine/godot/pull/73504
+  withWayland ? true,
+  withX11 ? true,
 }:
-
 assert lib.asserts.assertOneOf "withPrecision" withPrecision [
  "single"
  "double"
 ];
-
 let
  mkSconsFlagsFromAttrSet = lib.mapAttrsToList (
    k: v: if builtins.isString v then "${k}=${v}" else "${k}=${builtins.toJSON v}"
@ -101,6 +106,8 @@ stdenv.mkDerivation rec {
    speechd = withSpeechd; # Use Speech Dispatcher for Text-to-Speech support
    touch = withTouch; # Enable touch events
    udev = withUdev; # Use udev for gamepad connection callbacks
+    wayland = withWayland; # Compile with Wayland support
+    x11 = withX11; # Compile with X11 support
  };

  enableParallelBuilding = true;
@ -117,12 +124,15 @@ stdenv.mkDerivation rec {
    installShellFiles
    pkg-config
    scons
-  ];
+  ] ++ lib.optionals withWayland [ wayland-scanner ];

  runtimeDependencies =
    [
      alsa-lib
      libGL
+      vulkan-loader
+    ]
+    ++ lib.optionals withX11 [
      libX11
      libXcursor
      libXext
@ -132,7 +142,10 @@ stdenv.mkDerivation rec {
      libxkbcommon
      libXrandr
      libXrender
-      vulkan-loader
+    ]
+    ++ lib.optionals withWayland [
+      libdecor
+      wayland
    ]
    ++ lib.optionals withDbus [
      dbus
--- a/pkgs/by-name/ni/nix-ld-rs/package.nix
+++ b/pkgs/by-name/ni/nix-ld-rs/package.nix
@ -1,54 +0,0 @@
-{
-  stdenv,
-  fetchFromGitHub,
-  nixosTests,
-  rustPlatform,
-  lib,
-}:
-
-rustPlatform.buildRustPackage {
-  name = "nix-ld-rs";
-
-  src = fetchFromGitHub {
-    owner = "nix-community";
-    repo = "nix-ld-rs";
-    rev = "f7154a6aedba4917c8cc72b805b79444b5bfafca";
-    sha256 = "sha256-tx6gO6NR4BnYVhoskyvQY9l6/8sK0HwoDHvsYcvIlgo=";
-  };
-
-  cargoHash = "sha256-4IDu5qAgF4Zq4GOsimuy8NiRCN9PXM+8oVzD2GO3QmM=";
-
-  hardeningDisable = [ "stackprotector" ];
-
-  NIX_SYSTEM = stdenv.system;
-  RUSTC_BOOTSTRAP = "1";
-
-  preCheck = ''
-    export NIX_LD=${stdenv.cc.bintools.dynamicLinker}
-  '';
-
-  postInstall = ''
-    mkdir -p $out/libexec
-    ln -s $out/bin/nix-ld-rs $out/libexec/nix-ld-rs
-    ln -s $out/bin/nix-ld-rs $out/libexec/nix-ld
-
-    mkdir -p $out/nix-support
-
-    ldpath=/${stdenv.hostPlatform.libDir}/$(basename ${stdenv.cc.bintools.dynamicLinker})
-    echo "$ldpath" > $out/nix-support/ldpath
-    mkdir -p $out/lib/tmpfiles.d/
-    cat > $out/lib/tmpfiles.d/nix-ld.conf <<EOF
-      L+ $ldpath - - - - $out/libexec/nix-ld-rs
-    EOF
-  '';
-
-  passthru.tests = nixosTests.nix-ld;
-
-  meta = with lib; {
-    description = "Run unpatched dynamic binaries on NixOS (rust version)";
-    homepage = "https://github.com/nix-community/nix-ld-rs";
-    license = licenses.mit;
-    maintainers = with maintainers; [ mic92 ];
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/by-name/op/ophcrack-cli/package.nix
+++ b/pkgs/by-name/op/ophcrack-cli/package.nix
@ -1,73 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, fetchpatch
-, autoreconfHook
-, libtool
-, zlib
-, pkg-config
-, openssl
-, freetype
-, expat
-}:
-
-stdenv.mkDerivation rec {
-  pname = "ophcrack";
-  version = "3.8.0";
-
-  src = fetchurl {
-    url = "https://sourceforge.net/projects/ophcrack/files/ophcrack/3.8.0/ophcrack-3.8.0.tar.bz2";
-    hash = "sha256-BIpt9XmDo6WjGsfE7BLfFqpJ5lKilnbZPU75WdUK7uA=";
-  };
-
-  nativeBuildInputs = [
-    autoreconfHook
-    libtool
-    expat
-  ];
-
-  buildInputs = [
-    zlib
-    openssl
-    freetype
-    pkg-config
-  ];
-
-  patches = [
-    (fetchpatch {
-      url = "https://salsa.debian.org/pkg-security-team/ophcrack/-/raw/c60118b40802e1162dcebfe5f881cf973b2334d3/debian/patches/fix_spelling_error.diff";
-      hash = "sha256-Fc044hTU4Mtdym+HukGAwGzaLm7aVzV9KpvHvFUG2Sc=";
-    })
-    (fetchpatch {
-      url = "https://salsa.debian.org/pkg-security-team/ophcrack/-/raw/e19d993a7dbf131d13128366e2aac270a685befc/debian/patches/qmake_crossbuild.diff";
-      hash = "sha256-sOKXOBpAYGLacU6IxjRzy3HCnGm4DFowDL2qP+DzG8M=";
-    })
-  ];
-
-  configureFlags = [
-    "--with-libssl=yes"
-    "--disable-gui"
-  ];
-
-  buildPhase = ''
-    runHook preBuild
-
-    make
-
-    runHook postBuild
-  '';
-
-  postInstall = ''
-    mv $out/bin/ophcrack $out/bin/ophcrack-cli
-  '';
-
-  meta = with lib; {
-    description = "Free Windows password cracker based on rainbow tables";
-    homepage = "https://ophcrack.sourceforge.io";
-    license = with licenses; [ gpl2Plus ];
-    maintainers = with maintainers; [ tochiaha ];
-    mainProgram = "ophcrack-cli";
-    platforms = platforms.all;
-  };
-}
-
--- a/pkgs/by-name/op/ophcrack/package.nix
+++ b/pkgs/by-name/op/ophcrack/package.nix
@ -0,0 +1,63 @@
+{
+  lib,
+  stdenv,
+  libsForQt5,
+  fetchurl,
+  fetchpatch,
+  pkg-config,
+  openssl,
+  expat,
+  enableGui ? true,
+}:
+stdenv.mkDerivation rec {
+
+  pname = "ophcrack";
+  version = "3.8.0";
+
+  src = fetchurl {
+    url = "mirror://ophcrack/ophcrack/${version}/ophcrack-${version}.tar.bz2";
+    hash = "sha256-BIpt9XmDo6WjGsfE7BLfFqpJ5lKilnbZPU75WdUK7uA=";
+  };
+
+  patches = [
+    (fetchpatch {
+      url = "https://salsa.debian.org/pkg-security-team/ophcrack/-/raw/c60118b40802e1162dcebfe5f881cf973b2334d3/debian/patches/fix_spelling_error.diff";
+      hash = "sha256-Fc044hTU4Mtdym+HukGAwGzaLm7aVzV9KpvHvFUG2Sc=";
+    })
+    (fetchpatch {
+      url = "https://salsa.debian.org/pkg-security-team/ophcrack/-/raw/e19d993a7dbf131d13128366e2aac270a685befc/debian/patches/qmake_crossbuild.diff";
+      hash = "sha256-sOKXOBpAYGLacU6IxjRzy3HCnGm4DFowDL2qP+DzG8M=";
+    })
+  ];
+
+  nativeBuildInputs = [ pkg-config ] ++ lib.optional enableGui libsForQt5.wrapQtAppsHook;
+  buildInputs =
+    [ openssl ]
+    ++ (if enableGui then [ libsForQt5.qtcharts ] else [ expat ]) ++ lib.optional stdenv.isDarwin expat;
+
+  configureFlags =
+    [ "--with-libssl" ]
+    ++ (
+      if enableGui then
+        [
+          "--enable-gui"
+          "--with-qt5charts"
+        ]
+      else
+        [ "--disable-gui" ]
+    );
+
+  installPhase = lib.optional stdenv.isDarwin ''
+    mkdir -p $out/bin
+    cp -R src/ophcrack $out/bin
+  '';
+
+  meta = {
+    description = "Free Windows password cracker based on rainbow tables";
+    homepage = "https://ophcrack.sourceforge.io";
+    license = with lib.licenses; [ gpl2Plus ];
+    maintainers = with lib.maintainers; [ tochiaha ];
+    mainProgram = "ophcrack";
+    platforms = lib.platforms.all;
+  };
+}
--- a/pkgs/by-name/qu/quill-log/package.nix
+++ b/pkgs/by-name/qu/quill-log/package.nix
@ -7,13 +7,13 @@

 stdenv.mkDerivation rec {
  pname = "quill-log";
-  version = "6.1.0";
+  version = "6.1.2";

  src = fetchFromGitHub {
    owner = "odygrd";
    repo = "quill";
    rev = "v${version}";
-    hash = "sha256-6m3ijZlQ8NB+uGtsxAfLgryKUwlroqexK3IuC2FG3J4=";
+    hash = "sha256-hnSdyaVOPppa6KCgD6NoD4PKn0jI4iGGPg3Tnx0KX3w=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/development/tools/language-servers/ruff-lsp/default.nix
+++ b/pkgs/development/tools/language-servers/ruff-lsp/default.nix
@ -1,30 +1,25 @@
-{ lib
-, stdenv
-, pythonOlder
-, buildPythonPackage
-, fetchFromGitHub
-, ruff
-, pygls
-, lsprotocol
-, hatchling
-, typing-extensions
-, packaging
-, pytestCheckHook
-, python-lsp-jsonrpc
-, pytest-asyncio
+{
+  lib,
+  python3,
+  fetchFromGitHub,
+  stdenv,
+  ruff,
+  nix-update-script,
+  testers,
+  ruff-lsp,
 }:

-buildPythonPackage rec {
+python3.pkgs.buildPythonApplication rec {
  pname = "ruff-lsp";
-  version = "0.0.54";
+  version = "0.0.55";
  pyproject = true;
-  disabled = pythonOlder "3.7";
+  disabled = python3.pythonOlder "3.7";

  src = fetchFromGitHub {
    owner = "astral-sh";
    repo = "ruff-lsp";
    rev = "refs/tags/v${version}";
-    hash = "sha256-VSuEjrRiHWA78DWQgbj0D+GFjhXrREUOHUcQpFqflcw=";
+    hash = "sha256-FFIZ8fDAPK03tnkjd2AUrz7iL8S9FziJQJKOxAisu48=";
  };

  postPatch = ''
@ -32,11 +27,9 @@ buildPythonPackage rec {
    sed -i '/"ruff>=/d' pyproject.toml
  '';

-  build-system = [
-    hatchling
-  ];
+  build-system = with python3.pkgs; [ hatchling ];

-  dependencies = [
+  dependencies = with python3.pkgs; [
    packaging
    pygls
    lsprotocol
@ -46,7 +39,7 @@ buildPythonPackage rec {
  # fails in linux sandbox
  doCheck = stdenv.isDarwin;

-  nativeCheckInputs = [
+  nativeCheckInputs = with python3.pkgs; [
    pytestCheckHook
    pytest-asyncio
    python-lsp-jsonrpc
@ -63,12 +56,20 @@ buildPythonPackage rec {
    "--unset PYTHONPATH"
  ];

+  passthru = {
+    updateScript = nix-update-script { };
+    tests.version = testers.testVersion { package = ruff-lsp; };
+  };
+
  meta = {
    changelog = "https://github.com/astral-sh/ruff-lsp/releases/tag/v${version}";
    description = "Language Server Protocol implementation for Ruff";
    homepage = "https://github.com/astral-sh/ruff-lsp";
    license = lib.licenses.mit;
    mainProgram = "ruff-lsp";
-    maintainers = with lib.maintainers; [ figsoda kalekseev ];
+    maintainers = with lib.maintainers; [
+      figsoda
+      kalekseev
+    ];
  };
 }
--- a/pkgs/by-name/sh/shell-gpt/package.nix
+++ b/pkgs/by-name/sh/shell-gpt/package.nix
@ -6,14 +6,14 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "shell-gpt";
-  version = "1.4.3";
+  version = "1.4.4";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "TheR1D";
    repo = "shell_gpt";
    rev = "refs/tags/${version}";
-    hash = "sha256-T37L4U1kOrrIQJ2znq2UupD3pyit9xd8rAsEwUvGiQ8=";
+    hash = "sha256-4/5CLzIq+RXVTJk4chrd65GeazRp8VFKdOMt3fT+mbI=";
  };

  pythonRelaxDeps = [
--- a/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix
+++ b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix
@ -1,23 +1,23 @@
 {
-  version = "1.13.2";
+  version = "1.14.0";

  x86_64-linux = {
-    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.13.2/linux/amd64/sysdig-cli-scanner";
-    hash = "sha256-nFQ+xDiB7CA9mfQlRiTH/FvyZMKZ0YH8Gzn4ZuZ/Ucc=";
+    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.14.0/linux/amd64/sysdig-cli-scanner";
+    hash = "sha256-EkwfoK/F2bl83J2cCjfC3s9ESpk5yrnv3+sFO94nzvw=";
  };

  aarch64-linux = {
-    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.13.2/linux/arm64/sysdig-cli-scanner";
-    hash = "sha256-IscMTVzEbWImFZa7uXNp2K6Gplnq2LZoVPoAo5oIZ1U=";
+    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.14.0/linux/arm64/sysdig-cli-scanner";
+    hash = "sha256-EkhhiV+x7Iv1nYp0+/+mpnVDVT1GpqW3Yh3VPOkM61g=";
  };

  x86_64-darwin = {
-    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.13.2/darwin/amd64/sysdig-cli-scanner";
-    hash = "sha256-Xgip9cquafpRuYcXnnCF5ptFi774EocBZ535b/LzXUQ=";
+    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.14.0/darwin/amd64/sysdig-cli-scanner";
+    hash = "sha256-VQCvAOTEgdso32XMGqPflYzX3t5GhrzxAjZzft0wuFs=";
  };

  aarch64-darwin = {
-    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.13.2/darwin/arm64/sysdig-cli-scanner";
-    hash = "sha256-l/u8UV9O5/mFrNHpyIaKvXbVCQ+Fh6binJLv7MCHrtM=";
+    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.14.0/darwin/arm64/sysdig-cli-scanner";
+    hash = "sha256-BELMtP3VRS+xb15LXCx5F/5XwtJn3DF6R5aluq1WHPc=";
  };
 }
--- a/pkgs/by-name/to/tokyonight-gtk-theme/package.nix
+++ b/pkgs/by-name/to/tokyonight-gtk-theme/package.nix
@ -6,7 +6,12 @@
  sassc,
  gnome-themes-extra,
  gtk-engine-murrine,
-  colorVariants ? [] # default: install all icons
+  unstableGitUpdater,
+  colorVariants ? [ ],
+  sizeVariants ? [ ],
+  themeVariants ? [ ],
+  tweakVariants ? [ ],
+  iconVariants ? [ ],
 }:

 let
@ -15,45 +20,109 @@ let
    "dark"
    "light"
  ];
-
+  sizeVariantList = [
+    "compact"
+    "standard"
+  ];
+  themeVariantList = [
+    "default"
+    "green"
+    "grey"
+    "orange"
+    "pink"
+    "purple"
+    "red"
+    "teal"
+    "yellow"
+    "all"
+  ];
+  tweakVariantList = [
+    "moon"
+    "storm"
+    "black"
+    "float"
+    "outline"
+    "macos"
+  ];
+  iconVariantList = [
+    "Dark-Cyan"
+    "Dark"
+    "Light"
+    "Moon"
+  ];
 in
-lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants
+lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib.checkListOfEnum
+  "${pname}: sizeVariants"
+  sizeVariantList
+  sizeVariants
+  lib.checkListOfEnum
+  "${pname}: themeVariants"
+  themeVariantList
+  themeVariants
+  lib.checkListOfEnum
+  "${pname}: tweakVariants"
+  tweakVariantList
+  tweakVariants
+  lib.checkListOfEnum
+  "${pname}: iconVariants"
+  iconVariantList
+  iconVariants

-stdenvNoCC.mkDerivation {
-  inherit pname;
-  version = "0-unstable-2024-06-27";
+  stdenvNoCC.mkDerivation
+  {
+    inherit pname;
+    version = "0-unstable-2024-07-22";

-  src = fetchFromGitHub {
-    owner = "Fausto-Korpsvart";
-    repo = "Tokyonight-GTK-Theme";
-    rev = "2f566d89856516bef988df3cc32261f752299886";
-    hash = "sha256-oKqLb66N4swHfhjUZJIGryE0D9MkuLdKFQa6j3TFmOg=";
-  };
+    src = fetchFromGitHub {
+      owner = "Fausto-Korpsvart";
+      repo = "Tokyonight-GTK-Theme";
+      rev = "a9a25010e9fbfca783c3c27258dbad76a9cc7842";
+      hash = "sha256-HbrDDiMej4DjvskGItele/iCUY1NzlWlu3ZneA76feM=";
+    };

-  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+    propagatedUserEnvPkgs = [ gtk-engine-murrine ];

-  nativeBuildInputs = [ gnome.gnome-shell sassc ];
-  buildInputs = [ gnome-themes-extra ];
+    nativeBuildInputs = [
+      gnome.gnome-shell
+      sassc
+    ];
+    buildInputs = [ gnome-themes-extra ];

-  dontBuild = true;
+    dontBuild = true;

-  postPatch = ''
-    patchShebangs themes/install.sh
-  '';
+    passthru.updateScript = unstableGitUpdater { };

-  installPhase = ''
-    runHook preInstall
-    mkdir -p $out/share/themes
-    cd themes
-    ./install.sh -n Tokyonight -c ${lib.concatStringsSep " " (if colorVariants != [] then colorVariants else colorVariantList)} --tweaks macos -d "$out/share/themes"
-    runHook postInstall
-  '';
+    postPatch = ''
+      patchShebangs themes/install.sh
+    '';

-  meta = with lib; {
-    description = "GTK theme based on the Tokyo Night colour palette";
-    homepage = "https://github.com/Fausto-Korpsvart/Tokyonight-GTK-Theme";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ garaiza-93 Madouura d3vil0p3r ];
-    platforms = platforms.unix;
-  };
-}
+    installPhase = ''
+      runHook preInstall
+      mkdir -p $out/share/themes
+      cd themes
+      ./install.sh -n Tokyonight \
+      ${lib.optionalString (colorVariants != [ ]) "-c " + toString colorVariants} \
+      ${lib.optionalString (sizeVariants != [ ]) "-s " + toString sizeVariants} \
+      ${lib.optionalString (themeVariants != [ ]) "-t " + toString themeVariants} \
+      ${lib.optionalString (tweakVariants != [ ]) "--tweaks " + toString tweakVariants} \
+      -d "$out/share/themes"
+      cd ../icons
+      ${lib.optionalString (iconVariants != [ ]) ''
+        mkdir -p $out/share/icons
+        cp -a ${toString (map (v: "Tokyonight-${v}") iconVariants)} $out/share/icons/
+      ''}
+      runHook postInstall
+    '';
+
+    meta = {
+      description = "GTK theme based on the Tokyo Night colour palette";
+      homepage = "https://github.com/Fausto-Korpsvart/Tokyonight-GTK-Theme";
+      license = lib.licenses.gpl3Plus;
+      maintainers = with lib.maintainers; [
+        garaiza-93
+        Madouura
+        d3vil0p3r
+      ];
+      platforms = lib.platforms.unix;
+    };
+  }
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@ -73,7 +73,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "webkitgtk";
-  version = "2.44.2";
+  version = "2.44.3";
  name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "6.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}";

  outputs = [ "out" "dev" "devdoc" ];
@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: {

  src = fetchurl {
    url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
-    hash = "sha256-Uj9CyP8kgyrdF2Mfbqr+j5MDr+MW7xp+GES5Uqf3Uhs=";
+    hash = "sha256-3ILQQuysqYGkhSNXwG5SNXQzGc8QqUzTatQbl4g6C1Q=";
  };

  patches = lib.optionals stdenv.isLinux [
--- a/pkgs/development/python-modules/aiogram/default.nix
+++ b/pkgs/development/python-modules/aiogram/default.nix
@ -26,7 +26,7 @@

 buildPythonPackage rec {
  pname = "aiogram";
-  version = "3.10.0";
+  version = "3.12.0";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -35,7 +35,7 @@ buildPythonPackage rec {
    owner = "aiogram";
    repo = "aiogram";
    rev = "refs/tags/v${version}";
-    hash = "sha256-7GTZvYyD6ypaH6PuOoh6TVboyS6nf8BFGgKvD59K6gc=";
+    hash = "sha256-5W7GuWZsUjTwjgKnNs7j4wZhOME1Giz757cM3sKuSQY=";
  };

  build-system = [ hatchling ];
--- a/pkgs/development/python-modules/aiohomekit/default.nix
+++ b/pkgs/development/python-modules/aiohomekit/default.nix
@ -76,14 +76,14 @@ buildPythonPackage rec {

  meta = with lib; {
    description = "Python module that implements the HomeKit protocol";
-    mainProgram = "aiohomekitctl";
    longDescription = ''
      This Python library implements the HomeKit protocol for controlling
      Homekit accessories.
    '';
    homepage = "https://github.com/Jc2k/aiohomekit";
    changelog = "https://github.com/Jc2k/aiohomekit/releases/tag/${version}";
-    license = with licenses; [ asl20 ];
+    license = licenses.asl20;
    maintainers = with maintainers; [ fab ];
+    mainProgram = "aiohomekitctl";
  };
 }
--- a/pkgs/development/python-modules/aioquic/default.nix
+++ b/pkgs/development/python-modules/aioquic/default.nix
@ -15,14 +15,14 @@

 buildPythonPackage rec {
  pname = "aioquic";
-  version = "1.1.0";
+  version = "1.2.0";
  pyproject = true;

  disabled = pythonOlder "3.8";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-p5HFeYuutCoS+ij9Mn2gTQjxh5XpOIkXi0svSf6Lv0M=";
+    hash = "sha256-+RJjuz9xlIxciRW01Q7jcABPIKQW9n+rPcyQVWx+cZk=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/aioruckus/default.nix
+++ b/pkgs/development/python-modules/aioruckus/default.nix
@ -2,19 +2,19 @@
  lib,
  aiohttp,
  buildPythonPackage,
+  cryptography,
  fetchFromGitHub,
  pytest-asyncio,
  pytestCheckHook,
  pythonOlder,
  setuptools,
-  wheel,
  xmltodict,
 }:

 buildPythonPackage rec {
  pname = "aioruckus";
-  version = "0.34";
-  format = "pyproject";
+  version = "0.40";
+  pyproject = true;

  disabled = pythonOlder "3.10";

@ -22,33 +22,31 @@ buildPythonPackage rec {
    owner = "ms264556";
    repo = "aioruckus";
    rev = "refs/tags/v${version}";
-    hash = "sha256-SPj1w1jAJFBsWj1+N8srAbvlh+yB3ZTT7aDcZTnmUto=";
+    hash = "sha256-oEm0+ktEJHJPg4PUPfSmG9SyVRDrxs7kosQ0tIY+bRc=";
  };

  postPatch = ''
    substituteInPlace pyproject.toml \
-      --replace "setuptools>=68.1" "setuptools"
+      --replace-fail "setuptools>=68.1" "setuptools"
  '';

-  nativeBuildInputs = [
-    setuptools
-    wheel
-  ];
+  build-system = [ setuptools ];

-  propagatedBuildInputs = [
+  dependencies = [
    aiohttp
+    cryptography
    xmltodict
  ];

-  pythonImportsCheck = [ "aioruckus" ];
-
  nativeCheckInputs = [
    pytest-asyncio
    pytestCheckHook
  ];

+  pythonImportsCheck = [ "aioruckus" ];
+
  disabledTests = [
-    # these require a local ruckus device
+    # Those tests require a local ruckus device
    "test_ap_info"
    "test_authentication_error"
    "test_connect_success"
--- a/pkgs/development/python-modules/aiorussound/default.nix
+++ b/pkgs/development/python-modules/aiorussound/default.nix
@ -9,14 +9,14 @@

 buildPythonPackage rec {
  pname = "aiorussound";
-  version = "2.3.1";
+  version = "2.3.2";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "noahhusby";
    repo = "aiorussound";
    rev = "refs/tags/${version}";
-    hash = "sha256-wFpW+X10dGezMnzjGJsXyWMy6H8PtzhQFRCaf+A2L74=";
+    hash = "sha256-lQDHwm6dpernRYktu6eqV8uP7FHHHAU28viLg0q58+8=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/aiosql/default.nix
+++ b/pkgs/development/python-modules/aiosql/default.nix
@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "aiosql";
-  version = "10.2";
+  version = "10.4";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -28,7 +28,7 @@ buildPythonPackage rec {
    owner = "nackjicholson";
    repo = "aiosql";
    rev = "refs/tags/${version}";
-    hash = "sha256-o88pKxvK7fT+ocemiY58yA6fTmgg8+QsztHU3OvcDAo=";
+    hash = "sha256-TETZxIbC7pdak3m1rBwDg7L1yah/bin6iOZD/uANh48=";
  };

  sphinxRoot = "docs/source";
--- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix
+++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix
@ -17,7 +17,7 @@

 buildPythonPackage rec {
  pname = "coinmetrics-api-client";
-  version = "2024.7.11.18";
+  version = "2024.8.16.10";
  pyproject = true;

  disabled = pythonOlder "3.9";
@ -27,7 +27,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    inherit version;
    pname = "coinmetrics_api_client";
-    hash = "sha256-o8SVup50hD2BzQQ3Z5wANHWEhZDOl0FH7iTmYTJnkYw=";
+    hash = "sha256-HYNmDN3gzmQ7gcUSSXI7/TwDDFPDZJUSu9P0Xz1z2Tk=";
  };

  pythonRelaxDeps = [ "typer" ];
--- a/pkgs/development/python-modules/cyclopts/default.nix
+++ b/pkgs/development/python-modules/cyclopts/default.nix
@ -19,7 +19,7 @@

 buildPythonPackage rec {
  pname = "cyclopts";
-  version = "2.9.6";
+  version = "2.9.7";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -28,7 +28,7 @@ buildPythonPackage rec {
    owner = "BrianPugh";
    repo = "cyclopts";
    rev = "refs/tags/v${version}";
-    hash = "sha256-KXqeCUbSLHzeIMDpfaNj5aVxDtVP6dlctBDbukKPLSA=";
+    hash = "sha256-RLRhZ5WneZ5aiBRtj9H6tPIZfKFd5O7wYKc8BLVPmZ8=";
  };

  build-system = [
--- a/pkgs/development/python-modules/distributed/default.nix
+++ b/pkgs/development/python-modules/distributed/default.nix
@ -25,16 +25,16 @@

 buildPythonPackage rec {
  pname = "distributed";
-  version = "2024.8.0";
+  version = "2024.8.1";
  pyproject = true;

-  disabled = pythonOlder "3.9";
+  disabled = pythonOlder "3.10";

  src = fetchFromGitHub {
    owner = "dask";
    repo = "distributed";
    rev = "refs/tags/${version}";
-    hash = "sha256-7Z/KKm9C/n4yFKv9KHmGhIUeddwCIZL1A/SBGJKDlbI=";
+    hash = "sha256-LKf0z/xGvMVjoG02G2doS/XOiDN2/PmR72rCmwaQqtM=";
  };

  postPatch = ''
@ -77,7 +77,7 @@ buildPythonPackage rec {
  meta = {
    description = "Distributed computation in Python";
    homepage = "https://distributed.readthedocs.io/";
-    changelog = "https://github.com/dask/distributed/blob/${version}/docs/source/changelog.rst";
+    changelog = "https://github.com/dask/distributed/releases/tag/${version}";
    license = lib.licenses.bsd3;
    maintainers = with lib.maintainers; [ teh ];
  };
--- a/pkgs/development/python-modules/ecs-logging/default.nix
+++ b/pkgs/development/python-modules/ecs-logging/default.nix
@ -8,7 +8,7 @@

 buildPythonPackage rec {
  pname = "ecs-logging";
-  version = "2.1.0";
+  version = "2.2.0";
  format = "pyproject";

  disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
    owner = "elastic";
    repo = "ecs-logging-python";
    rev = "refs/tags/${version}";
-    hash = "sha256-Gf44bT3/gmHy+yaQ1+bhCFB33ym2G14tzNqTQyC3BJU=";
+    hash = "sha256-djCEutZqcyRfRme+omiwl3ofBUBli71TnfVu59i7vlE=";
  };

  nativeBuildInputs = [ flit-core ];
--- a/pkgs/development/python-modules/fastcore/default.nix
+++ b/pkgs/development/python-modules/fastcore/default.nix
@ -9,7 +9,7 @@

 buildPythonPackage rec {
  pname = "fastcore";
-  version = "1.7.0";
+  version = "1.7.1";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -18,7 +18,7 @@ buildPythonPackage rec {
    owner = "fastai";
    repo = "fastcore";
    rev = "refs/tags/${version}";
-    hash = "sha256-8pbAUemswRP+K8kh23u1AbVfv28+3Ykzla4cWzSFMfc=";
+    hash = "sha256-eb4J5aGrcpOcO0GBI1cwOsRxw0guvDiAPZjdFPB5SVQ=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/griffe/default.nix
+++ b/pkgs/development/python-modules/griffe/default.nix
@ -6,6 +6,7 @@
  fetchFromGitHub,
  git,
  jsonschema,
+  mkdocstrings,
  pdm-backend,
  pytestCheckHook,
  pythonOlder,
@ -13,7 +14,7 @@

 buildPythonPackage rec {
  pname = "griffe";
-  version = "0.47.0";
+  version = "1.0.0";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -22,12 +23,15 @@ buildPythonPackage rec {
    owner = "mkdocstrings";
    repo = "griffe";
    rev = "refs/tags/${version}";
-    hash = "sha256-NkS8cD0G/nbquQfMVcdbTLnJx26PQnqWB8UnBTNIBdE=";
+    hash = "sha256-GRj60qL+gXjUUAxhyTN7f1Jkuucl0+MstbDEqGVx3zs=";
  };

  build-system = [ pdm-backend ];

-  dependencies = [ colorama ];
+  dependencies = [
+    colorama
+    mkdocstrings
+  ];

  nativeCheckInputs = [
    git
--- a/pkgs/development/python-modules/minidump/default.nix
+++ b/pkgs/development/python-modules/minidump/default.nix
@ -8,17 +8,17 @@

 buildPythonPackage rec {
  pname = "minidump";
-  version = "0.0.23";
+  version = "0.0.24";
  pyproject = true;

  disabled = pythonOlder "3.6";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-R+tza5C/2egkajScmilp/8qowoSklYVfEB+f0KMNBqQ=";
+    hash = "sha256-964JuUTzsXzPXOzGb5/1p6RbBTR0oTrrAS9MkgRHBDc=";
  };

-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];

  # Upstream doesn't have tests
  doCheck = false;
@ -27,10 +27,10 @@ buildPythonPackage rec {

  meta = with lib; {
    description = "Python library to parse and read Microsoft minidump file format";
-    mainProgram = "minidump";
    homepage = "https://github.com/skelsec/minidump";
    changelog = "https://github.com/skelsec/minidump/releases/tag/${version}";
-    license = with licenses; [ mit ];
+    license = licenses.mit;
    maintainers = with maintainers; [ fab ];
+    mainProgram = "minidump";
  };
 }
--- a/pkgs/development/python-modules/mkdocstrings-python/default.nix
+++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix
@ -12,7 +12,7 @@

 buildPythonPackage rec {
  pname = "mkdocstrings-python";
-  version = "1.10.5";
+  version = "1.10.8";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -21,7 +21,7 @@ buildPythonPackage rec {
    owner = "mkdocstrings";
    repo = "python";
    rev = "refs/tags/${version}";
-    hash = "sha256-LRBo404TGxWBQdhN3gTyDHjB389hcHCfZK/oEFdjpOY=";
+    hash = "sha256-3fXT2cV9jXkBNqK0LhKh8V11YLz+ulR3yAtq3GVOkTU=";
  };

  build-system = [ pdm-backend ];
--- a/pkgs/development/python-modules/model-checker/default.nix
+++ b/pkgs/development/python-modules/model-checker/default.nix
@ -2,14 +2,15 @@
  lib,
  buildPythonPackage,
  fetchPypi,
-  setuptools,
  pythonOlder,
+  setuptools,
+  tqdm,
  z3-solver,
 }:

 buildPythonPackage rec {
  pname = "model-checker";
-  version = "0.4.12";
+  version = "0.5.6";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -17,7 +18,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "model_checker";
    inherit version;
-    hash = "sha256-bgVtOpWx5jytVxSz/WKLqLm+hVKbwIy+Fy5nEj/Nwt4=";
+    hash = "sha256-dt2/1qY0kyD0K0/d1NJa3q0NrwinmWb8Zd/Shtqj9Ow=";
  };

  # z3 does not provide a dist-info, so python-runtime-deps-check will fail
@ -26,7 +27,10 @@ buildPythonPackage rec {
  build-system = [ setuptools ];


-  dependencies = [ z3-solver ];
+  dependencies = [
+    tqdm
+    z3-solver
+  ];

  # Tests have multiple issues, ImportError, TypeError, etc.
  # Check with the next release > 0.3.13
--- a/pkgs/development/python-modules/myjwt/default.nix
+++ b/pkgs/development/python-modules/myjwt/default.nix
@ -20,23 +20,18 @@

 buildPythonPackage rec {
  pname = "myjwt";
-  version = "1.6.1";
+  version = "2.1.0";
  pyproject = true;

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

  src = fetchFromGitHub {
    owner = "mBouamama";
    repo = "MyJWT";
    rev = "refs/tags/${version}";
-    hash = "sha256-qdDA8DpJ9kAPTvCkQcPBHNlUqxwsS0vAESglvUygXhg=";
+    hash = "sha256-jqBnxo7Omn5gLMCQ7SNbjo54nyFK7pn94796z2Qc9lg=";
  };

-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "1.6.0" "${version}"
-  '';
-
  pythonRelaxDeps = [
    "cryptography"
    "pyopenssl"
--- a/pkgs/development/python-modules/optimum/default.nix
+++ b/pkgs/development/python-modules/optimum/default.nix
@ -31,7 +31,7 @@

 buildPythonPackage rec {
  pname = "optimum";
-  version = "1.21.3";
+  version = "1.21.4";
  pyproject = true;

  disabled = pythonOlder "3.7";
@ -40,7 +40,7 @@ buildPythonPackage rec {
    owner = "huggingface";
    repo = "optimum";
    rev = "refs/tags/v${version}";
-    hash = "sha256-eEfKWBwhtDkoAhsLH8P2ybM7aF/d2yREIv7/5RVz0Z8=";
+    hash = "sha256-ElF+RmZjsXhaA8yhTEK2kp5gigGheyJL36R8e0hSgzA=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/rstcheck/default.nix
+++ b/pkgs/development/python-modules/rstcheck/default.nix
@ -16,7 +16,7 @@

 buildPythonPackage rec {
  pname = "rstcheck";
-  version = "6.2.1";
+  version = "6.2.4";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -25,7 +25,7 @@ buildPythonPackage rec {
    owner = "rstcheck";
    repo = "rstcheck";
    rev = "refs/tags/v${version}";
-    hash = "sha256-S04l+x/rIc/XSvq2lSKCQp6KK5mmKI2mOgPgJ3WKe5M=";
+    hash = "sha256-CB8UtYAJpPrUOGgHOIp9Ts0GaID6GdtKHWD/ihxRoNg=";
  };

  build-system = [
--- a/pkgs/development/python-modules/webexteamssdk/default.nix
+++ b/pkgs/development/python-modules/webexteamssdk/default.nix
@ -2,41 +2,34 @@
  lib,
  buildPythonPackage,
  fetchFromGitHub,
-  future,
  pyjwt,
  pythonOlder,
  requests,
  requests-toolbelt,
-  setuptools,
-  versioneer,
+  poetry-core,
+  poetry-dynamic-versioning,
 }:

 buildPythonPackage rec {
  pname = "webexteamssdk";
-  version = "1.6.1";
+  version = "2.0.1";
  pyproject = true;

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

  src = fetchFromGitHub {
    owner = "CiscoDevNet";
    repo = "webexteamssdk";
    rev = "refs/tags/v${version}";
-    hash = "sha256-xlkmXl4tVm48drXmkUijv9GNXzJcDnfSKbOMciPIRRo=";
+    hash = "sha256-ENAUUicVO/Br7k+RFHCGzQ7BIG0CP7jTYM3tzs5EAZQ=";
  };

-  postPatch = ''
-    # Remove vendorized versioneer
-    rm versioneer.py
-  '';
-
  build-system = [
-    setuptools
-    versioneer
+    poetry-core
+    poetry-dynamic-versioning
  ];

  dependencies = [
-    future
    pyjwt
    requests
    requests-toolbelt
@ -45,13 +38,13 @@ buildPythonPackage rec {
  # Tests require a Webex Teams test domain
  doCheck = false;

-  pythonImportsCheck = [ "webexteamssdk" ];
+  pythonImportsCheck = [ "webexpythonsdk" ];

  meta = with lib; {
    description = "Python module for Webex Teams APIs";
    homepage = "https://github.com/CiscoDevNet/webexteamssdk";
    changelog = "https://github.com/WebexCommunity/WebexPythonSDK/releases/tag/v${version}";
-    license = with licenses; [ mit ];
+    license = licenses.mit;
    maintainers = with maintainers; [ fab ];
  };
 }
--- a/pkgs/development/python-modules/wsgi-intercept/default.nix
+++ b/pkgs/development/python-modules/wsgi-intercept/default.nix
@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "wsgi-intercept";
-  version = "1.13.0";
+  version = "1.13.1";
  pyproject = true;

  disabled = pythonOlder "3.7";
@ -22,12 +22,12 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "wsgi_intercept";
    inherit version;
-    hash = "sha256-daA+HQHdtCAC+1a4Ss0qeo7OJe/dIGREoTqfH7z6k0w=";
+    hash = "sha256-eb1sY5qxH36r5dGK2aIPYu6CocQ1EkqHbP/YA49sJME=";
  };

-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];

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

  nativeCheckInputs = [
    httplib2
@ -51,6 +51,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Module that acts as a WSGI application in place of a real URI for testing";
    homepage = "https://github.com/cdent/wsgi-intercept";
+    changelog = "https://github.com/cdent/wsgi-intercept/releases/tag/v${version}";
    license = licenses.mit;
    maintainers = with maintainers; [ mikecm ];
  };
--- a/pkgs/development/tools/analysis/checkov/default.nix
+++ b/pkgs/development/tools/analysis/checkov/default.nix
@ -6,14 +6,14 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "checkov";
-  version = "3.2.223";
+  version = "3.2.228";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "bridgecrewio";
    repo = "checkov";
    rev = "refs/tags/${version}";
-    hash = "sha256-NK1Ka3m9XQJish5d8Z0UiaTLEDot+rekEjC5peZ7FV4=";
+    hash = "sha256-9I17CEG5c9nLqfGe2OlOmgRv3zCw7klRhLe9youZEa4=";
  };

  patches = [ ./flake8-compat-5.x.patch ];
--- a/pkgs/development/tools/language-servers/typst-lsp/default.nix
+++ b/pkgs/development/tools/language-servers/typst-lsp/default.nix
@ -44,12 +44,15 @@ rustPlatform.buildRustPackage rec {
    export HOME=$(mktemp -d)
  '';

-  meta = with lib; {
+  meta = {
    description = "Brand-new language server for Typst";
    homepage = "https://github.com/nvarner/typst-lsp";
    mainProgram = "typst-lsp";
    changelog = "https://github.com/nvarner/typst-lsp/releases/tag/${src.rev}";
-    license = with licenses; [ asl20 mit ];
-    maintainers = with maintainers; [ figsoda GaetanLepage ];
+    license = with lib.licenses; [ asl20 mit ];
+    maintainers = with lib.maintainers; [ figsoda GaetanLepage ];
+    # Incompatible with Rust >= 1.80
+    # Fix to be merged upstream: https://github.com/nvarner/typst-lsp/pull/515
+    broken = true;
  };
 }
--- a/pkgs/development/tools/wasmserve/default.nix
+++ b/pkgs/development/tools/wasmserve/default.nix
@ -1,17 +1,18 @@
-{ buildGoModule
-, lib
-, fetchFromGitHub
+{
+  buildGoModule,
+  lib,
+  fetchFromGitHub,
 }:

 buildGoModule rec {
  pname = "wasmserve";
-  version = "1.0.0";
+  version = "1.1.0";

  src = fetchFromGitHub {
    owner = "hajimehoshi";
    repo = "wasmserve";
    rev = "v${version}";
-    hash = "sha256-KlCbUre6yIorE1ZM++Rto8vgwVGsC1wZj1xCd3AwQy0=";
+    hash = "sha256-e+pHwk+xJVc+Ki0iJC2B+W8ZN4mEawEQNyGhwITBDlo=";
  };

  vendorHash = null;
--- a/pkgs/games/osu-lazer/bin.nix
+++ b/pkgs/games/osu-lazer/bin.nix
@ -7,22 +7,22 @@

 let
  pname = "osu-lazer-bin";
-  version = "2024.816.0";
+  version = "2024.817.0";

  src = {
    aarch64-darwin = fetchzip {
      url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip";
-      hash = "sha256-i56sgECdFVDcWDqEjKjXEjrlLEdfiBAvriRg7s19W2E=";
+      hash = "sha256-ssyKy9CDN5LcyaQE7o56VoXoYYVU1zksMT3GxdMu2lA=";
      stripRoot = false;
    };
    x86_64-darwin = fetchzip {
      url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip";
-      hash = "sha256-4pzal/ddWGxueOirroyHk+b09YVeaNtE7hmmR8uY9GY=";
+      hash = "sha256-6yGMZ+rMnzuu0NNBD0BBSV5YvuGibIkhBL3HQWqudzo=";
      stripRoot = false;
    };
    x86_64-linux = fetchurl {
      url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
-      hash = "sha256-5DlVwDVhiKCm1uwI0roV3Zj0BuXxVWxQsxgr0n95vXs=";
+      hash = "sha256-AruD0XoJJm3+LQ+WH2CqKb+7S/VjG6YmdWhsH5l3/uM=";
    };
  }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported.");

--- a/pkgs/games/osu-lazer/default.nix
+++ b/pkgs/games/osu-lazer/default.nix
@ -17,13 +17,13 @@

 buildDotnetModule rec {
  pname = "osu-lazer";
-  version = "2024.816.0";
+  version = "2024.817.0";

  src = fetchFromGitHub {
    owner = "ppy";
    repo = "osu";
    rev = version;
-    hash = "sha256-OzXxvQDCYoHiPj6WzLbNsJXxngg0w02wbU9LNPCkK8Y=";
+    hash = "sha256-X6YaNHwNtHSqjV4oKQmYUd1aadbHSmr3EZDoq6epAkE=";
  };

  projectFile = "osu.Desktop/osu.Desktop.csproj";
--- a/pkgs/os-specific/linux/hyperv-daemons/default.nix
+++ b/pkgs/os-specific/linux/hyperv-daemons/default.nix
@ -1,9 +1,20 @@
-{ stdenv, lib, python2, python3, kernel, makeWrapper, writeText
-, gawk, iproute2 }:
+{
+  stdenv,
+  lib,
+  python2,
+  python3,
+  kernel,
+  makeWrapper,
+  writeText,
+  gawk,
+  iproute2,
+}:

 let
  libexec = "libexec/hypervkvpd";

+  fcopy_name = (if lib.versionOlder kernel.version "6.10" then "fcopy" else "fcopy_uio");
+
  daemons = stdenv.mkDerivation rec {
    pname = "hyperv-daemons-bin";
    inherit (kernel) src version;
@ -26,7 +37,7 @@ let
    installPhase = ''
      runHook preInstall

-      for f in fcopy kvp vss ; do
+      for f in ${fcopy_name} kvp vss ; do
        install -Dm755 hv_''${f}_daemon -t $out/bin
      done

@ -39,11 +50,17 @@ let

    postFixup = ''
      wrapProgram $out/bin/hv_kvp_daemon \
-        --prefix PATH : $out/bin:${lib.makeBinPath [ gawk iproute2 ]}
+        --prefix PATH : $out/bin:${
+          lib.makeBinPath [
+            gawk
+            iproute2
+          ]
+        }
    '';
  };

-  service = bin: title: check:
+  service =
+    bin: title: check:
    writeText "hv-${bin}.service" ''
      [Unit]
      Description=Hyper-V ${title} daemon
@ -61,21 +78,30 @@ let
      WantedBy=hyperv-daemons.target
    '';

-in stdenv.mkDerivation {
+in
+stdenv.mkDerivation {
  pname = "hyperv-daemons";
  inherit (kernel) version;

  # we just stick the bins into out as well as it requires "out"
-  outputs = [ "bin" "lib" "out" ];
+  outputs = [
+    "bin"
+    "lib"
+    "out"
+  ];

  buildInputs = [ daemons ];

  buildCommand = ''
    system=$lib/lib/systemd/system

-    install -Dm444 ${service "fcopy" "file copy (FCOPY)"        "hv_fcopy" } $system/hv-fcopy.service
-    install -Dm444 ${service "kvp"   "key-value pair (KVP)"     "hv_kvp"   } $system/hv-kvp.service
-    install -Dm444 ${service "vss"   "volume shadow copy (VSS)" "hv_vss"   } $system/hv-vss.service
+    install -Dm444 ${
+      service "${
+        fcopy_name
+      }" "file copy (FCOPY)" "/sys/bus/vmbus/devices/eb765408-105f-49b6-b4aa-c123b64d17d4/uio"
+    } $system/hv-fcopy.service
+    install -Dm444 ${service "kvp" "key-value pair (KVP)" "hv_kvp"} $system/hv-kvp.service
+    install -Dm444 ${service "vss" "volume shadow copy (VSS)" "hv_vss"} $system/hv-vss.service

    cat > $system/hyperv-daemons.target <<EOF
    [Unit]
--- a/pkgs/tools/security/jadx/default.nix
+++ b/pkgs/tools/security/jadx/default.nix
@ -5,7 +5,7 @@
  gradle,
  jdk,
  quark-engine,
-  makeWrapper,
+  makeBinaryWrapper,
  imagemagick,
  makeDesktopItem,
  copyDesktopItems,
@ -23,11 +23,16 @@ stdenv.mkDerivation (finalAttrs: {
    hash = "sha256-+F+PHAd1+FmdAlQkjYDBsUYCUzKXG19ZUEorfvBUEg0=";
  };

+  patches = [
+    # Remove use of launch4j - contains platform binaries not able to be cached by mitmCache
+    ./no-native-deps.diff
+  ];
+
  nativeBuildInputs = [
    gradle
    jdk
    imagemagick
-    makeWrapper
+    makeBinaryWrapper
    copyDesktopItems
  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ];

@ -83,7 +88,9 @@ stdenv.mkDerivation (finalAttrs: {
  ];

  meta = with lib; {
+    changelog = "https://github.com/skylot/jadx/releases/tag/v${finalAttrs.version}";
    description = "Dex to Java decompiler";
+    homepage = "https://github.com/skylot/jadx";
    longDescription = ''
      Command line and GUI tools for produce Java source code from Android Dex
      and Apk files.
--- a/pkgs/tools/security/jadx/deps.json
+++ b/pkgs/tools/security/jadx/deps.json
@ -145,13 +145,6 @@
   "module": "sha256-akesUDZOZZhFlAH7hvm2z832N7mzowRbHMM8v0xAghg=",
   "pom": "sha256-rrO3CiTBA+0MVFQfNfXFEdJ85gyuN2pZbX1lNpf4zJU="
  },
-  "com/thoughtworks/xstream#xstream-parent/1.4.20": {
-   "pom": "sha256-ERiJ4wIWWg9EpU3k23BSUNHeDckbp4oZih0ieDRL7uc="
-  },
-  "com/thoughtworks/xstream#xstream/1.4.20": {
-   "jar": "sha256-h98PC+V8kgN9ARD7siWjC2UXAtwnVlPSha/P7zG8LoE=",
-   "pom": "sha256-c9gezjnpSh0tf80BhGYqo9QQa/6XCbeTlkiS4+f0/cQ="
-  },
  "commons-codec#commons-codec/1.16.0": {
   "jar": "sha256-VllfsgsLhbyR0NUD2tULt/G5r8Du1d/6bLslkpAASE0=",
   "pom": "sha256-bLWVeBnfOTlW/TEaOgw/XuwevEm6Wy0J8/ROYWf6PnQ="
@ -165,21 +158,9 @@
   "module": "sha256-eYp7cGdyE27iijLt2GOx6fgWE6NJhAXXS+ilyb6/9U8=",
   "pom": "sha256-20U7urXn2opDE5sNzTuuZykzIfKcTZH1p5XZ/2xS3d8="
  },
-  "edu/sc/seis/launch4j#edu.sc.seis.launch4j.gradle.plugin/3.0.5": {
-   "pom": "sha256-Nplw/agsRFMGIjSqxiwBbqw5nY8C2VKdUe28QY0fzPs="
-  },
-  "edu/sc/seis/launch4j#launch4j/3.0.5": {
-   "jar": "sha256-4x62k3vvPwCsxAPkraf7ihY4ATiQ0bNSVmiFBocx7WM=",
-   "module": "sha256-+hiZBJpE2pdEnjoBvCx9rC01t0npPPdsBDSuzjT9ux8=",
-   "pom": "sha256-UvTlC0T2dzuebNq7jmmveQc4IW+8ZxJ1G77tGKFCknk="
-  },
  "io/fabric8#kubernetes-client-bom/5.12.2": {
   "pom": "sha256-6qA8FpVlaNVKa6Q31J1Ay/DdjpOXf5hDGCQldrZQvDs="
  },
-  "io/github/x-stream#mxparser/1.2.2": {
-   "jar": "sha256-ru7iOjMD2BG8qHkOp/JbU0MUhhwDz/Ntr9zCGAlp65c=",
-   "pom": "sha256-I1AiQk4S8zGB9iraGcxEKAGbaXZXw8OSzjVxYKQi+qg="
-  },
  "io/netty#netty-bom/4.1.86.Final": {
   "pom": "sha256-EnFsH+ZM9b2qcETTfROq46iIIbkdR5hCDEanR2kXiv0="
  },
@ -189,12 +170,6 @@
  "jakarta/platform#jakartaee-api-parent/9.0.0": {
   "pom": "sha256-9l3PFLbh2RSOGYo5D6/hVfrKCTJT3ekAMH8+DqgsrTs="
  },
-  "net/sf/launch4j#launch4j/3.50": {
-   "pom": "sha256-1716EuPm1bR/Ou0p/4g89cTKnie3GWkQZnkzH6N+xy0="
-  },
-  "net/sf/launch4j#launch4j/3.50/core": {
-   "jar": "sha256-2U8eT20fHhl9Es7vpwot75OMzxbig+mjx0Cmb/WGvW8="
-  },
  "org/apache#apache/23": {
   "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw="
  },
@ -619,10 +594,6 @@
  },
  "se/patrikerdes/use-latest-versions#se.patrikerdes.use-latest-versions.gradle.plugin/0.2.18": {
   "pom": "sha256-6DCee4xZSPaNwK2dl7lOwIsfw5lm2eXsrsNOzFbMnnI="
-  },
-  "xmlpull#xmlpull/1.1.3.1": {
-   "jar": "sha256-NOCO5iEWBxy7acDtcNFaelsgjWJ5jFnyEgu4kpMky2M=",
-   "pom": "sha256-jxD/2N8NPpgZyMyEAnCcaySLxTqVTvbkVHDZrjpXNfs="
  }
 },
 "https://repo.maven.apache.org/maven2": {
@ -905,12 +876,6 @@
  "net/java#jvnet-parent/3": {
   "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o="
  },
-  "net/sf/launch4j#launch4j/3.50": {
-   "pom": "sha256-1716EuPm1bR/Ou0p/4g89cTKnie3GWkQZnkzH6N+xy0="
-  },
-  "net/sf/launch4j#launch4j/3.50/workdir-mac": {
-   "jar": "sha256-ciYD+rZJnfaTUvdmC5+Y8MSF6aREBAD/f6PWJ/kXOyQ="
-  },
  "net/sf/saxon#Saxon-HE/10.6": {
   "jar": "sha256-bQjfguTthrarsaAse3SiaPz8XgBOg7tP8AbsOlCb01Y=",
   "pom": "sha256-otbdpDjoZKuTXzG0O1MFLE6HEalQVkJxkZBRPnb0Ekg="
--- a/pkgs/tools/security/jadx/no-native-deps.diff
+++ b/pkgs/tools/security/jadx/no-native-deps.diff
@ -0,0 +1,68 @@
+diff --git a/jadx-gui/build.gradle.kts b/jadx-gui/build.gradle.kts
+index 09f2c05f..bdb641b0 100644
+--- a/jadx-gui/build.gradle.kts
+++ b/jadx-gui/build.gradle.kts
+@@ -1,7 +1,6 @@
+ plugins {
+ 	id("jadx-kotlin")
+ 	id("application")
+-	id("edu.sc.seis.launch4j") version "3.0.5"
+ 	id("com.github.johnrengelman.shadow") version "8.1.1"
+ 	id("org.beryx.runtime") version "1.13.1"
+ }
+@@ -101,24 +100,6 @@
+ 	}
+ }
+ 
+-launch4j {
+-	mainClassName.set(application.mainClass.get())
+-	copyConfigurable.set(listOf<Any>())
+-	setJarTask(tasks.shadowJar.get())
+-	icon.set("$projectDir/src/main/resources/logos/jadx-logo.ico")
+-	outfile.set("jadx-gui-$jadxVersion.exe")
+-	copyright.set("Skylot")
+-	windowTitle.set("jadx")
+-	companyName.set("jadx")
+-	jreMinVersion.set("11")
+-	jvmOptions.set(application.applicationDefaultJvmArgs.toSet())
+-	requires64Bit.set(true)
+-	initialHeapPercent.set(5)
+-	maxHeapSize.set(4096)
+-	maxHeapPercent.set(70)
+-	downloadUrl.set("https://www.oracle.com/java/technologies/downloads/#jdk17-windows")
+-	bundledJrePath.set(if (project.hasProperty("bundleJRE")) "%EXEDIR%/jre" else "%JAVA_HOME%")
+-}
+ 
+ runtime {
+ 	addOptions("--strip-debug", "--compress", "2", "--no-header-files", "--no-man-pages")
+@@ -137,30 +118,6 @@
+ 	}
+ }
+ 
+-val copyDistWinWithJre by tasks.registering(Copy::class) {
+-	group = "jadx"
+-	dependsOn(tasks.named("runtime"), tasks.named("createExe"))
+-	from(runtime.jreDir) {
+-		include("**/*")
+-		into("jre")
+-	}
+-	from(tasks.named("createExe").get().outputs) {
+-		include("*.exe")
+-	}
+-	into(layout.buildDirectory.dir("jadx-gui-$jadxVersion-with-jre-win"))
+-	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+-}
+-
+-val distWinWithJre by tasks.registering(Zip::class) {
+-	group = "jadx"
+-	dependsOn(copyDistWinWithJre)
+-	archiveFileName.set("jadx-gui-$jadxVersion-with-jre-win.zip")
+-	from(copyDistWinWithJre.get().outputs) {
+-		include("**/*")
+-	}
+-	into(layout.buildDirectory.asFile)
+-	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+-}
+ 
+ val addNewNLSLines by tasks.registering(JavaExec::class) {
+ 	group = "jadx"
--- a/pkgs/tools/text/shfmt/default.nix
+++ b/pkgs/tools/text/shfmt/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "shfmt";
-  version = "3.8.0";
+  version = "3.9.0";

  src = fetchFromGitHub {
    owner = "mvdan";
    repo = "sh";
    rev = "v${version}";
-    sha256 = "sha256-2AnSmwl4ID7QxF8k1fl50S47KjKs9PwVpxchUIlhVo0=";
+    hash = "sha256-sYfMMKBqaYf3dfFcxE9awUMW+Hk7ps0/zpVFHul7GWM=";
  };

-  vendorHash = "sha256-rWAnWohbQZyPlOWqWwcxPMDABxumCo4M8fBUx54q76c=";
+  vendorHash = "sha256-xm5qKSg7OU++mVtTeRwefL3J1Uf+a0nFdtlD7eulI8s=";

  subPackages = [ "cmd/shfmt" ];

--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@ -1012,6 +1012,7 @@ mapAliases ({
  neoload = throw "'neoload' has been removed as it is broken and unmaintained"; # Added 2024-03-02
  nitrokey-udev-rules = libnitrokey; # Added 2023-03-25
  nix-direnv-flakes = nix-direnv;
+  nix-ld-rs = nix-ld; # Added 2024-08-17
  nix-repl = throw (
    # Added 2018-08-26
    "nix-repl has been removed because it's not maintained anymore, " +
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -11009,6 +11009,8 @@ with pkgs;

  openfec = callPackage ../development/libraries/openfec { };

+  ophcrack-cli = ophcrack.override { enableGui = false; };
+
  ophis = python3Packages.callPackage ../development/compilers/ophis { };

  open-ecard = callPackage ../tools/security/open-ecard { };
@ -17382,8 +17384,6 @@ with pkgs;

  postgres-lsp = callPackage ../development/tools/language-servers/postgres-lsp { };

-  ruff-lsp = python3Packages.callPackage ../development/tools/language-servers/ruff-lsp { };
-
  rune-languageserver = callPackage ../development/tools/language-servers/rune-languageserver { };

  svls = callPackage ../development/tools/language-servers/svls { };