Merge master into staging-next

2024-10-29 12:06:00 +00:00 · 2024-10-29 12:06:00 +00:00 · 6bc001ea3b
commit 6bc001ea3b
parent 49341a2f27 09e2e58692
123 changed files with 4378 additions and 8615 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -978,6 +978,12 @@
    githubId = 173595;
    name = "Caleb Maclennan";
  };
+  alex = {
+    email = "alexander.cinnamon927@passmail.net";
+    github = "alexanderjkslfj";
+    githubId = 117545308;
+    name = "Alex";
+  };
  ALEX11BR = {
    email = "alexioanpopa11@gmail.com";
    github = "ALEX11BR";
@ -7205,6 +7211,11 @@
    githubId = 183879;
    name = "Florian Klink";
  };
+  florensie = {
+    github = "florensie";
+    githubId = 13403842;
+    name = "Florens Pauwels";
+  };
  florentc = {
    github = "florentc";
    githubId = 1149048;
@ -9545,6 +9556,12 @@
    githubId = 1318743;
    name = "Ivar";
  };
+  iv-nn = {
+    name = "iv-nn";
+    github = "iv-nn";
+    githubId = 49885246;
+    keys = [ { fingerprint = "6358 EF87 86E0 EF2F 1628  103F BAB5 F165 1C71 C9C3"; } ];
+  };
  ivyfanchiang = {
    email = "dev@ivyfanchiang.ca";
    github = "hexadecimalDinosaur";
@ -18078,6 +18095,12 @@
    name = "Roland Conybeare";
    keys = [ { fingerprint = "bw5Cr/4ul1C2UvxopphbZbFI1i5PCSnOmPID7mJ/Ogo"; } ];
  };
+  rc-zb = {
+    name = "Xiao Haifan";
+    email = "rc-zb@outlook.com";
+    github = "rc-zb";
+    githubId = 161540043;
+  };
  rdnetto = {
    email = "rdnetto@gmail.com";
    github = "rdnetto";
@ -19234,6 +19257,12 @@
    githubId = 695473;
    name = "Sascha Grunert";
  };
+  satoqz = {
+    email = "mail@satoqz.net";
+    github = "satoqz";
+    githubId = 40795431;
+    name = "satoqz";
+  };
  saturn745 = {
    email = "git-commits.rk7uq@aleeas.com";
    github = "saturn745";
@ -21914,6 +21943,12 @@
    githubId = 2164118;
    name = "Tobias Bora";
  };
+  tobifroe = {
+    email = "hi@froelich.dev";
+    github = "tobifroe";
+    githubId = 40638719;
+    name = "Tobias Frölich";
+  };
  tobim = {
    email = "nix@tobim.fastmail.fm";
    github = "tobim";
--- a/nixos/modules/programs/zsh/oh-my-zsh.nix
+++ b/nixos/modules/programs/zsh/oh-my-zsh.nix
@ -87,6 +87,15 @@ in
            Without this option it would default to the read-only nix store.
          '';
        };
+
+        preLoaded = lib.mkOption {
+          type = lib.types.lines;
+          default = "";
+          description = ''
+            Shell commands executed before the `oh-my-zsh` is loaded.
+            For example, to disable async git prompt write `zstyle ':omz:alpha:lib:git' async-prompt force` (more information https://github.com/ohmyzsh/ohmyzsh?tab=readme-ov-file#async-git-prompt)
+          '';
+        };
      };
    };

@ -120,6 +129,7 @@ in
          ZSH_CACHE_DIR=${cfg.cacheDir}
        ''}

+        ${cfg.preLoaded}
        source $ZSH/oh-my-zsh.sh
      '';

--- a/nixos/modules/services/monitoring/nezha-agent.nix
+++ b/nixos/modules/services/monitoring/nezha-agent.nix
@ -92,6 +92,14 @@ in
          Address to the dashboard
        '';
      };
+      extraFlags = lib.mkOption {
+        type = lib.types.listOf lib.types.str;
+        default = [ ];
+        example = [ "--gpu" ];
+        description = ''
+          Extra command-line flags passed to nezha-agent.
+        '';
+      };
    };
  };

@ -125,6 +133,7 @@ in
        ++ lib.optional cfg.gpu "--gpu"
        ++ lib.optional cfg.temperature "--temperature"
        ++ lib.optional cfg.useIPv6CountryCode "--use-ipv6-countrycode"
+        ++ cfg.extraFlags
      );
      wantedBy = [ "multi-user.target" ];
    };
--- a/nixos/modules/services/networking/soju.nix
+++ b/nixos/modules/services/networking/soju.nix
@ -12,7 +12,7 @@ let
  tlsCfg = optionalString (cfg.tlsCertificate != null)
    "tls ${cfg.tlsCertificate} ${cfg.tlsCertificateKey}";
  logCfg = optionalString cfg.enableMessageLogging
-    "log fs ${stateDir}/logs";
+    "message-store fs ${stateDir}/logs";

  configFile = pkgs.writeText "soju.conf" ''
    ${listenCfg}
--- a/nixos/modules/services/networking/tailscale.nix
+++ b/nixos/modules/services/networking/tailscale.nix
@ -29,6 +29,12 @@ in {
      description = "Username or user ID of the user allowed to to fetch Tailscale TLS certificates for the node.";
    };

+    disableTaildrop = mkOption {
+      default = false;
+      type = types.bool;
+      description = "Whether to disable the Taildrop feature for sending files between nodes.";
+    };
+
    package = lib.mkPackageOption pkgs "tailscale" {};

    openFirewall = mkOption {
@ -129,6 +135,8 @@ in {
        ''"FLAGS=--tun ${lib.escapeShellArg cfg.interfaceName} ${lib.concatStringsSep " " cfg.extraDaemonFlags}"''
      ] ++ (lib.optionals (cfg.permitCertUid != null) [
        "TS_PERMIT_CERT_UID=${cfg.permitCertUid}"
+      ]) ++ (lib.optionals (cfg.disableTaildrop) [
+        "TS_DISABLE_TAILDROP=true"
      ]);
      # Restart tailscaled with a single `systemctl restart` at the
      # end of activation, rather than a `stop` followed by a later
--- a/nixos/modules/services/web-apps/immich.nix
+++ b/nixos/modules/services/web-apps/immich.nix
@ -258,7 +258,7 @@ in
      postgresEnv
      // redisEnv
      // {
-        HOST = cfg.host;
+        IMMICH_HOST = cfg.host;
        IMMICH_PORT = toString cfg.port;
        IMMICH_MEDIA_LOCATION = cfg.mediaLocation;
        IMMICH_MACHINE_LEARNING_URL = "http://localhost:3003";
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@ -828,8 +828,10 @@ in {
  predictable-interface-names = handleTest ./predictable-interface-names.nix {};
  pretalx = runTest ./web-apps/pretalx.nix;
  pretix = runTest ./web-apps/pretix.nix;
-  printing-socket = handleTest ./printing.nix { socket = true; };
-  printing-service = handleTest ./printing.nix { socket = false; };
+  printing-socket = handleTest ./printing.nix { socket = true; listenTcp = true; };
+  printing-service = handleTest ./printing.nix { socket = false; listenTcp = true; };
+  printing-socket-notcp = handleTest ./printing.nix { socket = true; listenTcp = false; };
+  printing-service-notcp = handleTest ./printing.nix { socket = false; listenTcp = false; };
  private-gpt = handleTest ./private-gpt.nix {};
  privatebin = runTest ./privatebin.nix;
  privoxy = handleTest ./privoxy.nix {};
--- a/nixos/tests/printing.nix
+++ b/nixos/tests/printing.nix
@ -3,12 +3,17 @@
 import ./make-test-python.nix (
 { pkgs
 , socket ? true # whether to use socket activation
+, listenTcp ? true # whether to open port 631 on client
 , ...
 }:

+let
+  inherit (pkgs) lib;
+in
+
 {
  name = "printing";
-  meta = with pkgs.lib.maintainers; {
+  meta = with lib.maintainers; {
    maintainers = [ domenkozar matthewbauer ];
  };

@ -35,9 +40,10 @@ import ./make-test-python.nix (
    }];
  };

-  nodes.client = { ... }: {
+  nodes.client = { lib, ... }: {
    services.printing.enable = true;
    services.printing.startWhenNeeded = socket;
+    services.printing.listenAddresses = lib.mkIf (!listenTcp) [];
    # Add printer to the client as well, via IPP.
    hardware.printers.ensurePrinters = [{
      name = "DeskjetRemote";
@ -54,8 +60,8 @@ import ./make-test-python.nix (
    start_all()

    with subtest("Make sure that cups is up on both sides and printers are set up"):
-        server.wait_for_unit("cups.${if socket then "socket" else "service"}")
-        client.wait_for_unit("cups.${if socket then "socket" else "service"}")
+        server.wait_for_unit("ensure-printers.service")
+        client.wait_for_unit("ensure-printers.service")

    assert "scheduler is running" in client.succeed("lpstat -r")

@ -63,7 +69,7 @@ import ./make-test-python.nix (
        assert "/var/run/cups/cups.sock" in client.succeed("lpstat -H")

    with subtest("HTTP server is available too"):
-        client.succeed("curl --fail http://localhost:631/")
+        ${lib.optionalString listenTcp ''client.succeed("curl --fail http://localhost:631/")''}
        client.succeed(f"curl --fail http://{server.name}:631/")
        server.fail(f"curl --fail --connect-timeout 2 http://{client.name}:631/")

--- a/pkgs/README.md
+++ b/pkgs/README.md
@ -75,7 +75,7 @@ Now that this is out of the way. To add a package to Nixpkgs:

   - GNU cpio: [`pkgs/tools/archivers/cpio/default.nix`](tools/archivers/cpio/default.nix). Also a simple package. The generic builder in `stdenv` does everything for you. It has no dependencies beyond `stdenv`.

-   - GNU Multiple Precision arithmetic library (GMP): [`pkgs/development/libraries/gmp/5.1.x.nix`](development/libraries/gmp/5.1.x.nix). Also done by the generic builder, but has a dependency on `m4`.
+   - GNU Multiple Precision arithmetic library (GMP): [`pkgs/development/libraries/gmp`](development/libraries/gmp). Also done by the generic builder, but has a dependency on `m4`.

   - Pan, a GTK-based newsreader: [`pkgs/applications/networking/newsreaders/pan/default.nix`](applications/networking/newsreaders/pan/default.nix). Has an optional dependency on `gtkspell`, which is only built if `spellCheck` is `true`.

--- a/pkgs/applications/audio/stochas/default.nix
+++ b/pkgs/applications/audio/stochas/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "stochas";
-  version = "1.3.10";
+  version = "1.3.12";

  src = fetchFromGitHub {
    owner = "surge-synthesizer";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-L7dzUUQNCwcuQavUx9hBH0FX5KSocfeYUv5qBcPD2Vg=";
+    hash = "sha256-GrYzsyezunFLFVzBfYCbNC53K695eYto9338iAALiSk=";
    fetchSubmodules = true;
  };

--- a/pkgs/applications/blockchains/clightning/default.nix
+++ b/pkgs/applications/blockchains/clightning/default.nix
@ -24,11 +24,11 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "clightning";
-  version = "24.08.1";
+  version = "24.08.2";

  src = fetchurl {
    url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip";
-    hash = "sha256-2ZKvhNuzGftKwSdmMkHOwE9UEI5Ewn5HHSyyZUcCwB4=";
+    hash = "sha256-U54HNOreulhvCYeULyBbl/WHQ7F9WQnSCSMGg5WUAdg=";
  };

  # when building on darwin we need cctools to provide the correct libtool
--- a/pkgs/applications/editors/neovim/wrapper.nix
+++ b/pkgs/applications/editors/neovim/wrapper.nix
@ -29,7 +29,7 @@ let

    , withNodeJs ? false
    , withPerl ? false
-    , rubyEnv ? null
+    , withRuby ? true

    # wether to create symlinks in $out/bin/vi(m) -> $out/bin/nvim
    , vimAlias ? false
@ -127,8 +127,7 @@ let
          ;

    providerLuaRc = neovimUtils.generateProviderRc {
-      inherit (finalAttrs) withPython3 withNodeJs withPerl;
-      withRuby = rubyEnv != null;
+      inherit (finalAttrs) withPython3 withNodeJs withPerl withRuby;
    };

    # If configure != {}, we can't generate the rplugin.vim file with e.g
@ -155,10 +154,9 @@ let

      __structuredAttrs = true;
      dontUnpack = true;
-      inherit viAlias vimAlias withNodeJs withPython3 withPerl;
+      inherit viAlias vimAlias withNodeJs withPython3 withPerl withRuby;
      inherit wrapRc providerLuaRc packpathDirs;
      inherit python3Env rubyEnv;
-      withRuby = rubyEnv != null;
      inherit wrapperArgs generatedWrapperArgs;
      luaRcContent = rcContent;
      # Remove the symlinks created by symlinkJoin which we need to perform
@ -171,7 +169,7 @@ let
      + lib.optionalString finalAttrs.withPython3 ''
        makeWrapper ${python3Env.interpreter} $out/bin/nvim-python3 --unset PYTHONPATH --unset PYTHONSAFEPATH
      ''
-      + lib.optionalString (finalAttrs.rubyEnv != null) ''
+      + lib.optionalString (finalAttrs.withRuby) ''
        ln -s ${finalAttrs.rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby
      ''
      + lib.optionalString finalAttrs.withNodeJs ''
--- a/pkgs/applications/graphics/ipe/default.nix
+++ b/pkgs/applications/graphics/ipe/default.nix
@ -1,7 +1,7 @@
 { lib
 , stdenv
 , makeDesktopItem
-, fetchurl
+, fetchFromGitHub
 , pkg-config
 , copyDesktopItems
 , cairo
@ -23,11 +23,13 @@

 stdenv.mkDerivation rec {
  pname = "ipe";
-  version = "7.2.27";
+  version = "7.2.30";

-  src = fetchurl {
-    url = "https://github.com/otfried/ipe/releases/download/v${version}/ipe-${version}-src.tar.gz";
-    sha256 = "sha256-wx/bZy8kB7dpZsz58BeRGdS1BzbrIoafgEmLyFg7wZU=";
+  src = fetchFromGitHub {
+    owner = "otfried";
+    repo = "ipe";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-bvwEgEP/cinigixJr8e964sm6secSK+7Ul7WFfwM0gE=";
  };

  nativeBuildInputs = [ pkg-config copyDesktopItems wrapQtAppsHook ];
--- a/pkgs/applications/misc/dmenu-rs/default.nix
+++ b/pkgs/applications/misc/dmenu-rs/default.nix
@ -1,76 +0,0 @@
-{ stdenv
-, rustPlatform
-, lib
-, fetchFromGitHub
-, cargo
-, expat
-, fontconfig
-, libXft
-, libXinerama
-, m4
-, pkg-config
-, python3
-}:
-
-# The dmenu-rs package has extensive plugin support. However, this derivation
-# only builds the package with the default set of plugins. If you'd like to
-# further customize dmenu-rs you can build it from the source.
-# See: https://github.com/Shizcow/dmenu-rs#plugins
-stdenv.mkDerivation rec {
-  pname = "dmenu-rs";
-  version = "5.5.4";
-
-  src = fetchFromGitHub {
-    owner = "Shizcow";
-    repo = "dmenu-rs";
-    rev = version;
-    hash = "sha256-LdbTvuq1IbzWEoASscIh3j3VAHm+W3UekJNiMHTxSQI=";
-  };
-
-  nativeBuildInputs = [
-    cargo
-    m4
-    pkg-config
-    python3
-    rustPlatform.bindgenHook
-    rustPlatform.cargoSetupHook
-  ];
-
-  buildInputs = [
-    expat
-    fontconfig
-    libXft
-    libXinerama
-  ];
-
-  # The dmenu-rs repository does not include a Cargo.lock because of its
-  # dynamic build and plugin support. Generating it with make and checking it
-  # in to nixpkgs here was the easiest way to supply it to rustPlatform.
-  # See: https://github.com/Shizcow/dmenu-rs/issues/34#issuecomment-757415584
-  cargoDeps = rustPlatform.importCargoLock {
-    lockFile = ./Cargo.lock;
-  };
-
-  # Copy the Cargo.lock stored here in nixpkgs into the build directory.
-  postPatch = ''
-    cp ${./Cargo.lock} src/Cargo.lock
-  '';
-
-  cargoRoot = "src";
-
-  installFlags = [ "PREFIX=$(out)" ];
-
-  # Running make test requires an X11 server. It also runs dmenu, which then
-  # hangs on user input. It was too hard to figure out how to run these tests
-  # deterministically. See the original PR for some discussion on this.
-  doCheck = false;
-
-  meta = with lib; {
-    description = "Pixel perfect port of dmenu, rewritten in Rust with extensive plugin support";
-    homepage = "https://github.com/Shizcow/dmenu-rs";
-    license = with licenses; [ gpl3Only ];
-    maintainers = with maintainers; [ benjaminedwardwebb ];
-    platforms = platforms.linux;
-    broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
-  };
-}
--- a/pkgs/applications/misc/klayout/default.nix
+++ b/pkgs/applications/misc/klayout/default.nix
@ -5,13 +5,13 @@

 mkDerivation rec {
  pname = "klayout";
-  version = "0.29.7";
+  version = "0.29.8";

  src = fetchFromGitHub {
    owner = "KLayout";
    repo = "klayout";
    rev = "v${version}";
-    hash = "sha256-4GjCV/Z9al7Hrj7Ik/EvmLy5jPCsU/3Ti9HwOjzPKYc=";
+    hash = "sha256-cWLekSfyAOWI0ID9SlxN8XxHQR9oo1y5tTBn2schCtI=";
  };

  postPatch = ''
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@ -940,13 +940,13 @@
    "vendorHash": "sha256-0Atbzx1DjInPMa1lNxyNKfNMILjN4S814TlIAQeTfdI="
  },
  "opentelekomcloud": {
-    "hash": "sha256-jDPUTAXddTzO7PTZWqjFAQSj4ZUJVP4G/eHqcVPwlMU=",
+    "hash": "sha256-w98v/Vxcd1864lR7Tvt58TMZui5m8h3Z3uNs9AkIOJI=",
    "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
    "owner": "opentelekomcloud",
    "repo": "terraform-provider-opentelekomcloud",
-    "rev": "v1.36.20",
+    "rev": "v1.36.23",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-qMyMPKOpnRQERX95S9yn0Pmi7wLJy1+u4mFvMwHdRx8="
+    "vendorHash": "sha256-048tfvolxHHdqImBOgp7xIIpCJpx6QKUSi9fL9aIqh4="
  },
  "opsgenie": {
    "hash": "sha256-+msy9kPAryR0Ll5jKOd47DMjeMxEdSIfKZZKVHohQGY=",
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@ -45,14 +45,14 @@ let

  pname = "slack";

-  x86_64-darwin-version = "4.40.128";
-  x86_64-darwin-sha256 = "0hfgl2pfarnd9gh921rfz9s9kkvyf8fmmhgb6j87jgbwf8rjrjmm";
+  x86_64-darwin-version = "4.41.97";
+  x86_64-darwin-sha256 = "1akqchqknbz4vpr6xx0hjfnllcp9b1lnzhb2x9402bkmjh985ps4";

-  x86_64-linux-version = "4.40.128";
-  x86_64-linux-sha256 = "1p7ybwrsfy5iq5ggpz1p4mx58ilwzsvn7k149i5ifi0zifahwwdg";
+  x86_64-linux-version = "4.41.97";
+  x86_64-linux-sha256 = "15fa2ci9da0wrvxalaqpg412krcwwd1g84d0pa50i5vj1yl3sy3d";

-  aarch64-darwin-version = "4.40.128";
-  aarch64-darwin-sha256 = "0h6659lny80kxrqaf9qidirkw702wi7hjwwdhk9y0gcy87s9rqwd";
+  aarch64-darwin-version = "4.41.97";
+  aarch64-darwin-sha256 = "09m99yfsfjk71627fpbiryb4f3nrdrccijgfm9pshrvw3mr934r6";

  version = {
    x86_64-darwin = x86_64-darwin-version;
--- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix
@ -45,7 +45,7 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "kotatogram-desktop";
-  version = "0-unstable-2024-09-27";
+  version = "1.4.9-unstable-2024-09-27";

  src = fetchFromGitHub {
    owner = "kotatogram";
@ -58,6 +58,7 @@ stdenv.mkDerivation rec {
  patches = [
    ./macos.patch
    ./macos-opengl.patch
+    ./macos-qt5.patch
  ];

  postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
--- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos-qt5.patch
+++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos-qt5.patch
@ -0,0 +1,75 @@
+diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.h b/Telegram/SourceFiles/platform/mac/main_window_mac.h
+index 2a3a59b9cf..16b7b6cdde 100644
+--- a/Telegram/SourceFiles/platform/mac/main_window_mac.h
+++ b/Telegram/SourceFiles/platform/mac/main_window_mac.h
+@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+ #include "platform/platform_main_window.h"
+ #include "platform/mac/specific_mac_p.h"
+ #include "base/timer.h"
+#include "base/qt/qt_common_adapters.h"
+ 
+ #include <QtWidgets/QMenuBar>
+ #include <QtCore/QTimer>
+@@ -52,7 +53,7 @@ private:
+ 	bool nativeEvent(
+ 		const QByteArray &eventType,
+ 		void *message,
+-		qintptr *result) override;
+		base::NativeEventResult *result) override;
+ 
+ 	void hideAndDeactivate();
+ 	void updateDockCounter();
+diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.mm b/Telegram/SourceFiles/platform/mac/main_window_mac.mm
+index e95ef79f16..c3381926a9 100644
+--- a/Telegram/SourceFiles/platform/mac/main_window_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/main_window_mac.mm
+@@ -305,7 +305,7 @@ void MainWindow::updateWindowIcon() {
+ bool MainWindow::nativeEvent(
+ 		const QByteArray &eventType,
+ 		void *message,
+-		qintptr *result) {
+		base::NativeEventResult *result) {
+ 	if (message && eventType == "NSEvent") {
+ 		const auto event = static_cast<NSEvent*>(message);
+ 		if (PossiblyTextTypingEvent(event)) {
+diff --git a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
+index de28809077..2521428567 100644
+--- a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
+@@ -502,11 +502,11 @@ void Manager::Private::invokeIfNotFocused(Fn<void()> callback) {
+ 	} else {
+ 		if (!_processesInited) {
+ 			_processesInited = true;
+-			QObject::connect(&_dnd, &QProcess::finished, [=] {
+			QObject::connect(&_dnd, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), [=] {
+ 				_waitingDnd = false;
+ 				checkFocusState();
+ 			});
+-			QObject::connect(&_focus, &QProcess::finished, [=] {
+			QObject::connect(&_focus, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), [=] {
+ 				_waitingFocus = false;
+ 				checkFocusState();
+ 			});
+@@ -536,7 +536,7 @@ void Manager::Private::checkFocusState() {
+ 	}
+ 	const auto istrue = [](QProcess &process) {
+ 		const auto output = process.readAllStandardOutput();
+-		DEBUG_LOG(("Focus Check: %1").arg(output));
+		DEBUG_LOG(("Focus Check: %1").arg(QString::fromUtf8(output)));
+ 		const auto result = (output.trimmed() == u"true"_q);
+ 		return result;
+ 	};
+Submodule Telegram/lib_ui contains modified content
+diff --git a/Telegram/lib_ui/ui/rp_widget.cpp b/Telegram/lib_ui/ui/rp_widget.cpp
+index 0b57704..0d2ca01 100644
+--- a/Telegram/lib_ui/ui/rp_widget.cpp
+++ b/Telegram/lib_ui/ui/rp_widget.cpp
+@@ -62,7 +62,7 @@ TWidget::TWidget(QWidget *parent)
+ 		auto format = QSurfaceFormat::defaultFormat();
+ 		format.setSwapInterval(0);
+ #ifdef Q_OS_MAC
+-		format.setColorSpace(QColorSpace::SRgb);
+		format.setColorSpace(QSurfaceFormat::sRGBColorSpace);
+ #endif // Q_OS_MAC
+ 		QSurfaceFormat::setDefaultFormat(format);
+ 		return true;
--- a/pkgs/applications/radio/sdrangel/default.nix
+++ b/pkgs/applications/radio/sdrangel/default.nix
@ -1,64 +1,65 @@
-{ lib
-, stdenv
-, airspy
-, airspyhf
-, aptdec
-, boost
-, cm256cc
-, cmake
-, codec2
-, dab_lib
-, dsdcc
-, faad2
-, fetchFromGitHub
-, fftwFloat
-, glew
-, hackrf
-, hidapi
-, ffmpeg
-, libiio
-, libopus
-, libpulseaudio
-, libusb1
-, limesuite
-, libbladeRF
-, mbelib
-, ninja
-, opencv4
-, pkg-config
-, qtcharts
-, qtdeclarative
-, qtgamepad
-, qtgraphicaleffects
-, qtlocation
-, qtmultimedia
-, qtquickcontrols
-, qtquickcontrols2
-, qtserialport
-, qtspeech
-, qttools
-, qtwebsockets
-, qtwebengine
-, rtl-sdr
-, serialdv
-, sdrplay
-, sgp4
-, soapysdr-with-plugins
-, uhd
-, wrapQtAppsHook
-, zlib
-, withSDRplay ? false
+{
+  lib,
+  stdenv,
+  airspy,
+  airspyhf,
+  aptdec,
+  boost,
+  cm256cc,
+  cmake,
+  codec2,
+  dab_lib,
+  dsdcc,
+  faad2,
+  fetchFromGitHub,
+  fftwFloat,
+  flac,
+  glew,
+  hackrf,
+  hidapi,
+  ffmpeg,
+  libiio,
+  libopus,
+  libpulseaudio,
+  libusb1,
+  limesuite,
+  libbladeRF,
+  mbelib,
+  ninja,
+  opencv4,
+  pkg-config,
+  qt5compat,
+  qtcharts,
+  qtdeclarative,
+  qtlocation,
+  qtmultimedia,
+  qtscxml,
+  qtserialport,
+  qtspeech,
+  qttools,
+  qtwayland,
+  qtwebsockets,
+  qtwebengine,
+  rtl-sdr,
+  serialdv,
+  sdrplay,
+  sgp4,
+  soapysdr-with-plugins,
+  uhd,
+  wrapQtAppsHook,
+  zlib,
+  withSDRplay ? false,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "sdrangel";
-  version = "7.22.1";
+  version = "7.22.2";

  src = fetchFromGitHub {
    owner = "f4exb";
    repo = "sdrangel";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-Vhxs1KVUDCbl/9abZByUuy230PV4RrYrRjEXgYc8oZU=";
+    hash = "sha256-HFAQ+Pjl//F18O4TryU1zIiAqtb/mBXKipaqNCeeqQo=";
  };

  nativeBuildInputs = [
@ -80,6 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
    faad2
    ffmpeg
    fftwFloat
+    flac
    glew
    hackrf
    hidapi
@ -91,14 +93,12 @@ stdenv.mkDerivation (finalAttrs: {
    limesuite
    mbelib
    opencv4
+    qt5compat
    qtcharts
    qtdeclarative
-    qtgamepad
-    qtgraphicaleffects
    qtlocation
    qtmultimedia
-    qtquickcontrols
-    qtquickcontrols2
+    qtscxml
    qtserialport
    qtspeech
    qttools
@ -110,8 +110,7 @@ stdenv.mkDerivation (finalAttrs: {
    soapysdr-with-plugins
    uhd
    zlib
-  ]
-  ++ lib.optionals withSDRplay [ sdrplay ];
+  ] ++ lib.optionals stdenv.isLinux [ qtwayland ] ++ lib.optionals withSDRplay [ sdrplay ];

  cmakeFlags = [
    "-DAPT_DIR=${aptdec}"
@ -119,6 +118,7 @@ stdenv.mkDerivation (finalAttrs: {
    "-DSGP4_DIR=${sgp4}"
    "-DSOAPYSDR_DIR=${soapysdr-with-plugins}"
    "-Wno-dev"
+    "-DENABLE_QT6=ON"
  ];

  meta = {
@ -126,9 +126,12 @@ stdenv.mkDerivation (finalAttrs: {
    homepage = "https://github.com/f4exb/sdrangel";
    license = lib.licenses.gpl3Plus;
    longDescription = ''
-      SDRangel is an Open Source Qt5 / OpenGL 3.0+ SDR and signal analyzer frontend to various hardware.
+      SDRangel is an Open Source Qt6 / OpenGL 3.0+ SDR and signal analyzer frontend to various hardware.
    '';
-    maintainers = with lib.maintainers; [ alkeryn Tungsten842 ];
+    maintainers = with lib.maintainers; [
+      alkeryn
+      Tungsten842
+    ];
    platforms = lib.platforms.unix;
  };
 })
--- a/pkgs/applications/science/biology/dssp/default.nix
+++ b/pkgs/applications/science/biology/dssp/default.nix
@ -10,13 +10,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "dssp";
-  version = "4.4.8";
+  version = "4.4.10";

  src = fetchFromGitHub {
    owner = "PDB-REDO";
    repo = "dssp";
    rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-ThQInyVuf8ejkidne/T3GdPBbf3HeThDBwWQEWB+JMI=";
+    hash = "sha256-YNYpHjp9kEszXvLF3RrNg6gYd4GPvfRVtdkUwJ89qOc=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/version-management/gitnr/default.nix
+++ b/pkgs/applications/version-management/gitnr/default.nix
@ -11,16 +11,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "gitnr";
-  version = "0.1.3";
+  version = "0.2.2";

  src = fetchFromGitHub {
    owner = "reemus-dev";
    repo = "gitnr";
    rev = "v${version}";
-    hash = "sha256-Hsro0y/avI20cFQveQF17NiR3JCNlBKqXbaIce7uxBM=";
+    hash = "sha256-9vx+bGfYuJuafZUY2ZT4SAgrNcSXuMe1kHH/lrpItvM=";
  };

-  cargoHash = "sha256-Ahzm23AStSwDSgks9j/J15/zo+EH/NgbfCBc3xBcTwQ=";
+  cargoHash = "sha256-ZvF8X+IT7mrKaUaNS4NhYzX9P3hkhNNH/ActxG/6YZE=";

  nativeBuildInputs = [
    pkg-config
@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec {
    homepage = "https://github.com/reemus-dev/gitnr";
    changelog = "https://github.com/reemus-dev/gitnr/blob/${src.rev}/CHANGELOG.md";
    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = with maintainers; [ figsoda matthiasbeyer ];
    mainProgram = "gitnr";
  };
 }
--- a/pkgs/by-name/al/albert/package.nix
+++ b/pkgs/by-name/al/albert/package.nix
@ -14,13 +14,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "albert";
-  version = "0.26.4";
+  version = "0.26.6";

  src = fetchFromGitHub {
    owner = "albertlauncher";
    repo = "albert";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-MEpBZV1Fxoq24eT1hgyrp33qcaLqmQ+aAP974Yn8d2g=";
+    hash = "sha256-Z4YgqqtJPYMzpnMt74TX2Hi0AEMyhRc2QHSVuwuaxfE=";
    fetchSubmodules = true;
  };

--- a/pkgs/by-name/am/amberol/package.nix
+++ b/pkgs/by-name/am/amberol/package.nix
@ -22,20 +22,20 @@

 stdenv.mkDerivation rec {
  pname = "amberol";
-  version = "2024.1";
+  version = "2024.2";

  src = fetchFromGitLab {
    domain = "gitlab.gnome.org";
    owner = "World";
    repo = "amberol";
    rev = version;
-    hash = "sha256-WuyvTgh9Qc5WcgEssxkytwQpSACd82l5WKeMD0NFOp8=";
+    hash = "sha256-FK0TJFjknEFraY8T+PQ/ABiid36kEYIEhekgyx0y3aI=";
  };

  cargoDeps = rustPlatform.fetchCargoTarball {
    inherit src;
    name = "amberol-${version}";
-    hash = "sha256-C1ENyNUpgwGlZus/zIWD1mUrmWT9L0fH/1T4QaIxGJw=";
+    hash = "sha256-9YRd1iOh+l+Jy8eSwJP6pxonEofBkMpFqb+JAAFDbCA=";
  };

  postPatch = ''
--- a/pkgs/by-name/bi/biome/package.nix
+++ b/pkgs/by-name/bi/biome/package.nix
@ -12,16 +12,16 @@
 }:
 rustPlatform.buildRustPackage rec {
  pname = "biome";
-  version = "1.9.3";
+  version = "1.9.4";

  src = fetchFromGitHub {
    owner = "biomejs";
    repo = "biome";
    rev = "cli/v${version}";
-    hash = "sha256-GZV8M/yUDMom6xvSvSfDRjcMGm+thiaTR3fggkBLmRE=";
+    hash = "sha256-oK1tCPoTeUHvVdi+ym4J5xEj2NIi2zHQpNU1KUchQfY=";
  };

-  cargoHash = "sha256-5VZGyOQAz/p4r4v8CHOTcdgolw44HtZM0NuhTw4Wx3A=";
+  cargoHash = "sha256-4vITbsXfgNFoeWMHz7a9Rk7FrsEZRe75nHiyHSMujEQ=";

  nativeBuildInputs = [
    pkg-config
--- a/pkgs/by-name/da/daed/package.nix
+++ b/pkgs/by-name/da/daed/package.nix
@ -24,7 +24,7 @@ let

    pnpmDeps = pnpm.fetchDeps {
      inherit pname version src;
-      hash = "sha256-pNP/Ut5vRE+tqBYNHEkulCIeXnowHAIZKJe73cA0BB0=";
+      hash = "sha256-vqkiZzd5WOeJem0zUyMsJd6/aHHAjlsIQMkNf+SUvHY=";
    };

    nativeBuildInputs = [
--- a/pkgs/by-name/di/disko/package.nix
+++ b/pkgs/by-name/di/disko/package.nix
@ -11,12 +11,12 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "disko";
-  version = "1.8.2";
+  version = "1.9.0";
  src = fetchFromGitHub {
    owner = "nix-community";
    repo = "disko";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-O0QVhsj9I/hmcIqJ4qCqFyzvjYL+dtzJP0C5MFd8O/Y=";
+    hash = "sha256-CI27qHAbc3/tIe8sb37kiHNaeCqGxNimckCMj0lW5kg=";
  };
  nativeBuildInputs = [ makeWrapper ];
  buildInputs = [ bash ];
--- a/pkgs/applications/misc/dmenu-rs/Cargo.lock
+++ b/pkgs/applications/misc/dmenu-rs/Cargo.lock
--- a/pkgs/by-name/dm/dmenu-rs/enablePlugins.Cargo.lock
+++ b/pkgs/by-name/dm/dmenu-rs/enablePlugins.Cargo.lock
--- a/pkgs/by-name/dm/dmenu-rs/package.nix
+++ b/pkgs/by-name/dm/dmenu-rs/package.nix
@ -0,0 +1,114 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+
+  # nativeBuildInputs
+  cargo,
+  m4,
+  pkg-config,
+  python3,
+  rustPlatform,
+
+  # buildInputs
+  expat,
+  fontconfig,
+  libXft,
+  libXinerama,
+  aspell,
+  xclip,
+  xdg-utils,
+
+  enablePlugins ? false,
+}:
+
+# The dmenu-rs package has extensive plugin support. However, only two
+# variants of the package are presented here: one with no plugins and one with
+# all of the plugins that have been checked into the upstream repository. This
+# is because the set of plugins is defined at compile time and the dmenu-rs
+# build uses this set to dynamically generate a corresponding Cargo.lock file.
+# To work around this dynamic generation in nixpkgs, each variant's Cargo.lock
+# file has been generated in advance and then checked in here. If you'd like
+# to further customize dmenu-rs, either disabling specific plugins or enabling
+# additional plugins from outside of the dmenu-rs repository, you'll have to
+# build it from the source.
+# See: https://github.com/Shizcow/dmenu-rs#plugins
+let
+  cargoLockFile = if enablePlugins then ./enablePlugins.Cargo.lock else ./Cargo.lock;
+in
+stdenv.mkDerivation rec {
+  pname = "dmenu-rs";
+  version = "5.5.4";
+
+  src = fetchFromGitHub {
+    owner = "Shizcow";
+    repo = "dmenu-rs";
+    rev = "refs/tags/${version}";
+    hash = "sha256-05Ia+GHeL8PzOwR7H+NEVhKJVMPhlIaQLwGfvwOAl0g=";
+  };
+
+  nativeBuildInputs = [
+    cargo
+    m4
+    pkg-config
+    python3
+    rustPlatform.bindgenHook
+    rustPlatform.cargoSetupHook
+  ];
+
+  buildInputs =
+    [
+      expat
+      fontconfig
+      libXft
+      libXinerama
+    ]
+    ++ lib.optionals enablePlugins [
+      aspell
+      xclip
+      xdg-utils
+    ];
+
+  # The dmenu-rs repository does not include a Cargo.lock because of its
+  # dynamic build and plugin support. Generating it with make and checking it
+  # in to nixpkgs here was the easiest way to supply it to rustPlatform.
+  # See: https://github.com/Shizcow/dmenu-rs/issues/34#issuecomment-757415584
+  cargoDeps = rustPlatform.importCargoLock {
+    lockFile = cargoLockFile;
+  };
+
+  # Copy the Cargo.lock stored here in nixpkgs into the build directory.
+  postPatch =
+    ''
+      cp ${cargoLockFile} src/Cargo.lock
+    ''
+    + lib.optionalString enablePlugins ''
+      chmod +w src/Cargo.lock
+    '';
+
+  # Include all plugins in the dmenu-rs repository under src/plugins.
+  # See https://github.com/Shizcow/dmenu-rs/tree/master/src/plugins
+  preBuild = lib.optionalString enablePlugins ''
+    sed -i -E "s/PLUGINS =/PLUGINS = $(find src/plugins/ -mindepth 1 -maxdepth 1 -type d -printf "%f\n" | tr "\n" " ")/" config.mk
+  '';
+
+  cargoRoot = "src";
+
+  installFlags = [ "PREFIX=$(out)" ];
+
+  # Running make test requires an X11 server. It also runs dmenu, which then
+  # hangs on user input. It was too hard to figure out how to run these tests
+  # deterministically. See the original PR for some discussion on this.
+  doCheck = false;
+
+  meta = {
+    description =
+      "Pixel perfect port of dmenu, rewritten in Rust with extensive plugin support"
+      + lib.optionalString enablePlugins ", with all upstream plugins enabled";
+    homepage = "https://github.com/Shizcow/dmenu-rs";
+    license = with lib.licenses; [ gpl3Only ];
+    maintainers = with lib.maintainers; [ benjaminedwardwebb ];
+    platforms = lib.platforms.linux;
+    broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64;
+  };
+}
--- a/pkgs/by-name/dr/drone-scp/package.nix
+++ b/pkgs/by-name/dr/drone-scp/package.nix
@ -4,16 +4,16 @@
 }:
 buildGoModule rec {
  pname = "drone-scp";
-  version = "1.6.14";
+  version = "1.7.0";

  src = fetchFromGitHub {
    owner = "appleboy";
    repo = "drone-scp";
    rev = "v${version}";
-    hash = "sha256-RxpDlQ6lYT6XH5zrYZaRO5YsB++7Ujr7dvgsTtXIBfc=";
+    hash = "sha256-cVgKWdhmCdjEHGazZ1FMAOJMVyU5pl8aIgwFMhxlhzg=";
  };

-  vendorHash = "sha256-0/RGPvafOLT/O0l9ENoiHLmtOaP3DpjmXjmotuxF944=";
+  vendorHash = "sha256-2FEHklEa6TIB3jhmxR2yosPbtqMJcxeIDDnT2X2Xm+U=";

  # Needs a specific user...
  doCheck = false;
--- a/pkgs/by-name/ec/ecapture/package.nix
+++ b/pkgs/by-name/ec/ecapture/package.nix
@ -16,17 +16,18 @@
  mariadb,
  openssl,
  bash,
+  nix-update-script,
 }:

 buildGoModule rec {
  pname = "ecapture";
-  version = "0.8.7";
+  version = "0.8.8";

  src = fetchFromGitHub {
    owner = "gojue";
    repo = "ecapture";
    rev = "refs/tags/v${version}";
-    hash = "sha256-tkWbX/RGx+SbJn+vqPTgyStBwdhldd5hGuRj8wTwY9M=";
+    hash = "sha256-pw/qlYVw1ofYDrTWTQVdx/N9U2JjkB05c7IUXURd4B8=";
    fetchSubmodules = true;
  };

@ -103,6 +104,8 @@ buildGoModule rec {

  vendorHash = "sha256-j5AXZqup0nPUlGWvb4PCLKJFoQx/c4I3PxZB99TTTWA=";

+  passthru.updateScript = nix-update-script { };
+
  meta = {
    description = "Capture SSL/TLS text content without CA certificate Using eBPF";
    changelog = "https://github.com/gojue/ecapture/releases/tag/v${version}";
--- a/pkgs/by-name/ep/epic5/package.nix
+++ b/pkgs/by-name/ep/epic5/package.nix
@ -13,11 +13,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "epic5";
-  version = "3.0";
+  version = "3.0.1";

  src = fetchurl {
    url = "https://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/epic5-${finalAttrs.version}.tar.xz";
-    hash = "sha256-ltRzUME6PZkBnaDmoEsMf4Datt26WQvMZ527iswXeaE=";
+    hash = "sha256-F7lnxh5Yh08HdeH9CwYH+FxktjJYwaxNQInoETUqOUU=";
  };

  buildInputs =
--- a/pkgs/by-name/fl/flexget/package.nix
+++ b/pkgs/by-name/fl/flexget/package.nix
@ -5,7 +5,7 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "flexget";
-  version = "3.11.48";
+  version = "3.11.49";
  pyproject = true;

  # Fetch from GitHub in order to use `requirements.in`
@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
    owner = "Flexget";
    repo = "Flexget";
    rev = "refs/tags/v${version}";
-    hash = "sha256-EgRV0xRBgPInYbU9ZqJEyrbD58DIm2mYPRDSN6vrnjo=";
+    hash = "sha256-/c6nJNIo6gqeANftbtuOatU+JGYXdMQgrPI0/EdH9LI=";
  };

  # relax dep constrains, keep environment constraints
--- a/pkgs/by-name/go/gotestdox/package.nix
+++ b/pkgs/by-name/go/gotestdox/package.nix
@ -0,0 +1,35 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+buildGoModule rec {
+  pname = "gotestdox";
+  version = "0.2.2";
+
+  src = fetchFromGitHub {
+    owner = "bitfield";
+    repo = "gotestdox";
+    rev = "v${version}";
+    hash = "sha256-AZDXMwADOjcaMiofMWoHp+eSnD3a8iFtwpWDKl9Ess8=";
+  };
+
+  vendorHash = "sha256-kDSZ4RZTHDFmu7ernYRjg0PV7eBB2lH8q5wW3kTExDs=";
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Tool for formatting Go test results as readable documentation";
+    homepage = "https://github.com/bitfield/gotestdox";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ eljamm ];
+    mainProgram = "gotestdox";
+  };
+}
--- a/pkgs/by-name/gr/gromit-mpx/package.nix
+++ b/pkgs/by-name/gr/gromit-mpx/package.nix
@ -0,0 +1,70 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  gtk3,
+  glib,
+  pcre,
+  libappindicator-gtk3,
+  libpthreadstubs,
+  xorg,
+  libxkbcommon,
+  libepoxy,
+  at-spi2-core,
+  dbus,
+  libdbusmenu,
+  lz4,
+  wrapGAppsHook3,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "gromit-mpx";
+  version = "1.7.0";
+
+  src = fetchFromGitHub {
+    owner = "bk138";
+    repo = "gromit-mpx";
+    rev = finalAttrs.version;
+    hash = "sha256-jHw4V2ZvfpT3PUihe/O+9BPsv+udFg5seMbYmxOz8Yk=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    wrapGAppsHook3
+  ];
+
+  buildInputs = [
+    gtk3
+    glib
+    pcre
+    libappindicator-gtk3
+    libpthreadstubs
+    xorg.libXdmcp
+    libxkbcommon
+    libepoxy
+    at-spi2-core
+    dbus
+    libdbusmenu
+    lz4
+  ];
+
+  meta = with lib; {
+    description = "Desktop annotation tool";
+    longDescription = ''
+      Gromit-MPX (GRaphics Over MIscellaneous Things) is a small tool
+      to make annotations on the screen.
+    '';
+    homepage = "https://github.com/bk138/gromit-mpx";
+    changelog = "https://github.com/bk138/gromit-mpx/blob/${finalAttrs.version}/NEWS.md";
+    maintainers = with maintainers; [
+      pjones
+      gepbird
+    ];
+    platforms = platforms.linux;
+    license = licenses.gpl2Plus;
+    mainProgram = "gromit-mpx";
+  };
+})
--- a/pkgs/by-name/hy/hyperlink/package.nix
+++ b/pkgs/by-name/hy/hyperlink/package.nix
@ -5,22 +5,22 @@

 rustPlatform.buildRustPackage rec {
  pname = "hyperlink";
-  version = "0.1.32";
+  version = "0.1.35";

  src = fetchFromGitHub {
    owner = "untitaker";
    repo = "hyperlink";
    rev = version;
-    hash = "sha256-QejpyleugPWvr4p8JOMieswVtfQMGxtH+fb46mRLlH4=";
+    hash = "sha256-sx1OW056s40uhwwgGtNKiPkKSUy7/ZzSYGnjc0UKh/E=";
  };

-  cargoHash = "sha256-d0JwxxI6Quyan2lgymxGpROKR757LEOUIgJcs5c9Kmc=";
+  cargoHash = "sha256-4UEq9m5SWqmnzc++DjIeSq4ckTKgoxdt+8MekxiYGPE=";

  meta = with lib; {
    description = "Very fast link checker for CI";
    homepage = "https://github.com/untitaker/hyperlink";
    license = licenses.mit;
-    maintainers = [ ];
+    maintainers = with maintainers; [ samueltardieu ];
    mainProgram = "hyperlink";
  };
 }
--- a/pkgs/by-name/im/immich-machine-learning/package.nix
+++ b/pkgs/by-name/im/immich-machine-learning/package.nix
@ -25,9 +25,12 @@ python.pkgs.buildPythonApplication rec {

  pythonRelaxDeps = [
    "pydantic-settings"
+  ];
+
+  pythonRemoveDeps = [
+    # https://github.com/immich-app/immich/pull/13762
    "setuptools"
  ];
-  pythonRemoveDeps = [ "opencv-python-headless" ];

  build-system = with python.pkgs; [
    poetry-core
@ -38,7 +41,7 @@ python.pkgs.buildPythonApplication rec {
    with python.pkgs;
    [
      insightface
-      opencv4
+      opencv-python-headless
      pillow
      fastapi
      uvicorn
@ -47,7 +50,6 @@ python.pkgs.buildPythonApplication rec {
      aiocache
      rich
      ftfy
-      setuptools
      python-multipart
      orjson
      gunicorn
@ -88,11 +90,9 @@ python.pkgs.buildPythonApplication rec {
  };

  meta = {
-    description = "Self-hosted photo and video backup solution (machine learning component)";
-    homepage = "https://immich.app/";
-    license = lib.licenses.agpl3Only;
-    maintainers = with lib.maintainers; [ jvanbruegge ];
+    description = "${immich.meta.description} (machine learning component)";
+    homepage = "https://github.com/immich-app/immich/tree/main/machine-learning";
    mainProgram = "machine-learning";
-    inherit (immich.meta) platforms;
+    inherit (immich.meta) license maintainers platforms;
  };
 }
--- a/pkgs/by-name/im/immich/package.nix
+++ b/pkgs/by-name/im/immich/package.nix
@ -17,7 +17,7 @@
  cacert,
  unzip,
  # runtime deps
-  ffmpeg-headless,
+  jellyfin-ffmpeg,
  imagemagick,
  libraw,
  libheif,
@ -101,8 +101,8 @@ let

  web = buildNpmPackage' {
    pname = "immich-web";
-    inherit version;
-    src = "${src}/web";
+    inherit version src;
+    sourceRoot = "${src.name}/web";
    inherit (sources.components.web) npmDepsHash;

    preBuild = ''
@ -155,7 +155,7 @@ buildNpmPackage' {
  ];

  buildInputs = [
-    ffmpeg-headless
+    jellyfin-ffmpeg
    imagemagick
    libraw
    libheif
@ -198,7 +198,7 @@ buildNpmPackage' {
      --suffix PATH : "${
        lib.makeBinPath [
          perl
-          ffmpeg-headless
+          jellyfin-ffmpeg
        ]
      }"

--- a/pkgs/by-name/im/immich/sources.json
+++ b/pkgs/by-name/im/immich/sources.json
@ -1,22 +1,22 @@
 {
-  "version": "1.118.2",
-  "hash": "sha256-u2/Xs1SdAzmQ02pyXD9+ncamIKFcq8qMijnx7KFtrmU=",
+  "version": "1.119.0",
+  "hash": "sha256-mflVxz+Pxv7xS4onsjRQ1lMZ43U/rkuqO6vPRon7Gms=",
  "components": {
    "cli": {
-      "npmDepsHash": "sha256-RwfGq0fDPYo+ZP2xv+sMKmr3Tf8szbB8506c1PqiMM0=",
-      "version": "2.2.26"
+      "npmDepsHash": "sha256-QClG/WQK2MbVKuR0Wk9+TdSTAbemtFeg7GkKjvEjC4c=",
+      "version": "2.2.27"
    },
    "server": {
-      "npmDepsHash": "sha256-4jPvLCsI2gz+maBU3ZtrWZzJ6Zp2PTQwaCuCKr1hK/o=",
-      "version": "1.118.2"
+      "npmDepsHash": "sha256-9mMnOiKsTTO4PJUKYN668yjIELeFUgdqSx6Gf87UYVU=",
+      "version": "1.119.0"
    },
    "web": {
-      "npmDepsHash": "sha256-j6+EkcfwpaCP048v/kZv1xthp0DSylraJTeU4+LcDbw=",
-      "version": "1.118.2"
+      "npmDepsHash": "sha256-ieTGMywR26msYqmQOK/q/l3O6/Vkmu0TLFn956kK/xE=",
+      "version": "1.119.0"
    },
    "open-api/typescript-sdk": {
-      "npmDepsHash": "sha256-e+7BEFc46scLZDqCJNRhrczOEydSoiK9m7vSj/2ECaE=",
-      "version": "1.118.2"
+      "npmDepsHash": "sha256-NLvuHTVWuzv5G0ONu3S3K8AgyliTZowYQN0fzYhWtUQ=",
+      "version": "1.119.0"
    }
  }
 }
--- a/pkgs/by-name/iv/ivyterm/package.nix
+++ b/pkgs/by-name/iv/ivyterm/package.nix
@ -0,0 +1,51 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  wrapGAppsHook4,
+  cairo,
+  gdk-pixbuf,
+  glib,
+  gtk4,
+  libadwaita,
+  pango,
+  vte-gtk4,
+}:
+
+rustPlatform.buildRustPackage {
+  pname = "ivyterm";
+  version = "0-unstable-2024-10-23";
+
+  src = fetchFromGitHub {
+    owner = "Tomiyou";
+    repo = "ivyterm";
+    rev = "13ee76dfc88bc92807e328991c7a8586a5b13ac7";
+    hash = "sha256-vxDJwA+ZM3ROX9d1+o3cXj4LbaO9Wy5jFAVuAPOzCCI=";
+  };
+
+  cargoHash = "sha256-tdaI0diwRjqERmAiuKFhMw4AeqxgMq8YMsZWBjsmd0U=";
+
+  nativeBuildInputs = [
+    pkg-config
+    wrapGAppsHook4
+  ];
+
+  buildInputs = [
+    cairo
+    gdk-pixbuf
+    glib
+    gtk4
+    libadwaita
+    pango
+    vte-gtk4
+  ];
+
+  meta = {
+    description = "Terminal emulator implemented in gtk4-rs and VTE4";
+    homepage = "https://github.com/Tomiyou/ivyterm";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ genga898 ];
+    mainProgram = "ivyterm";
+  };
+}
--- a/pkgs/by-name/kl/klog-rs/package.nix
+++ b/pkgs/by-name/kl/klog-rs/package.nix
@ -0,0 +1,33 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  stdenv,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "klog-rs";
+  version = "0.0.3";
+
+  src = fetchFromGitHub {
+    owner = "tobifroe";
+    repo = "klog";
+    rev = version;
+    hash = "sha256-HEGxg277483ZZpXKFIBTAITKie/iBfbz9KmtqzlGC3E=";
+  };
+  cargoHash = "sha256-mOFzlq5AEks9vwjk2FxTGLyw6RkI44kml2t8r1UsdOk=";
+  checkFlags = [
+    # this integration test depends on a running kubernetes cluster
+    "--skip=k8s::tests::test_get_pod_list"
+  ];
+
+  meta = {
+    description = "Tool to tail logs of multiple Kubernetes pods simultaneously";
+    homepage = "https://github.com/tobifroe/klog";
+    changelog = "https://github.com/tobifroe/klog/releases/tag/${version}";
+    license = lib.licenses.mit;
+    mainProgram = "klog";
+    maintainers = with lib.maintainers; [ tobifroe ];
+    broken = stdenv.hostPlatform.isDarwin;
+  };
+}
--- a/pkgs/by-name/ko/kor/package.nix
+++ b/pkgs/by-name/ko/kor/package.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "kor";
-  version = "0.5.5";
+  version = "0.5.6";

  src = fetchFromGitHub {
    owner = "yonahd";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-/GXTfArNaD1Y6hpec3tNUSSNVqIq6QLpsZS7jWFi5g4=";
+    hash = "sha256-Gyz8Gjb/JGLdy9vQ7nTyRhcCa6XBPuB3va8n5qDec7s=";
  };

-  vendorHash = "sha256-FrO+ZyisuDLplpoKsGOwpxz+jXd36MEs5bFz3RujZDY=";
+  vendorHash = "sha256-MV3iL1a6AImOKRagUlvUJ9u5ng85SETqjaK+GUDXoxE=";

  preCheck = ''
    HOME=$(mktemp -d)
--- a/pkgs/by-name/li/libpkgconf/package.nix
+++ b/pkgs/by-name/li/libpkgconf/package.nix
@ -42,12 +42,12 @@ stdenv.mkDerivation (finalAttrs: {
  '';

  passthru.updateScript = gitUpdater {
-    url = "https://github.com/pkgconf/pkgconf.git";
+    url = "https://gitea.treehouse.systems/ariadne/pkgconf";
    rev-prefix = "pkgconf-";
  };

  meta = {
-    homepage = "https://github.com/pkgconf/pkgconf";
+    homepage = "https://gitea.treehouse.systems/ariadne/pkgconf";
    description = "Package compiler and linker metadata toolkit";
    longDescription = ''
      pkgconf is a program which helps to configure compiler and linker flags
@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
      functionality, to allow other tooling such as compilers and IDEs to
      discover and use libraries configured by pkgconf.
    '';
-    changelog = "https://github.com/pkgconf/pkgconf/blob/pkgconf-${finalAttrs.version}/NEWS";
+    changelog = "https://gitea.treehouse.systems/ariadne/pkgconf/src/tag/pkgconf-${finalAttrs.version}/NEWS";
    license = lib.licenses.isc;
    mainProgram = "pkgconf";
    maintainers = with lib.maintainers; [ zaninime AndersonTorres ];
--- a/pkgs/by-name/lu/luminous-ttv/package.nix
+++ b/pkgs/by-name/lu/luminous-ttv/package.nix
@ -0,0 +1,32 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "luminous-ttv";
+  version = "0.5.7";
+
+  src = fetchFromGitHub {
+    owner = "AlyoshaVasilieva";
+    repo = "luminous-ttv";
+    rev = "v${version}";
+    hash = "sha256-uaq5uiSp4lci27BxtqjdtUeiJvXhWo25lfFE+dQys6Y=";
+  };
+
+  cargoHash = "sha256-jbtHxarRQ8gpCBc/HZWSnkzMrlMMltpknUBV1SGVq/I=";
+
+  meta = {
+    description = "Rust server to retrieve and relay a playlist for Twitch livestreams/VODs";
+    homepage = "https://github.com/AlyoshaVasilieva/luminous-ttv";
+    downloadPage = "https://github.com/AlyoshaVasilieva/luminous-ttv/releases/latest";
+    changelog = "https://github.com/AlyoshaVasilieva/luminous-ttv/releases/tag/v${version}";
+    license = with lib.licenses; [
+      gpl3Only
+      mit
+    ];
+    mainProgram = "luminous-ttv";
+    maintainers = with lib.maintainers; [ alex ];
+  };
+}
--- a/pkgs/by-name/mm/mmdbctl/package.nix
+++ b/pkgs/by-name/mm/mmdbctl/package.nix
@ -0,0 +1,55 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  installShellFiles,
+  stdenv,
+  runCommand,
+  mmdbctl,
+  dbip-country-lite,
+}:
+
+buildGoModule rec {
+  pname = "mmdbctl";
+  version = "1.4.6";
+
+  src = fetchFromGitHub {
+    owner = "ipinfo";
+    repo = "mmdbctl";
+    rev = "refs/tags/mmdbctl-${version}";
+    hash = "sha256-6hJ9V8fHs84Lq48l3mB9nZka4rLneyxD4HMhWQYZ0cI=";
+  };
+
+  vendorHash = "sha256-5vd39j/gpRRkUccctKGU8+QL0vANm2FMyw6jTtoqJmw=";
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd mmdbctl \
+      --bash <($out/bin/mmdbctl completion bash) \
+      --fish <($out/bin/mmdbctl completion fish) \
+      --zsh <($out/bin/mmdbctl completion zsh)
+  '';
+
+  passthru.tests = {
+    simple = runCommand "${pname}-test" { } ''
+      ${lib.getExe mmdbctl} verify ${dbip-country-lite}/share/dbip/dbip-country-lite.mmdb | grep valid
+      ${lib.getExe mmdbctl} metadata ${dbip-country-lite}/share/dbip/dbip-country-lite.mmdb | grep DBIP-Country-Lite
+      touch $out
+    '';
+  };
+
+  meta = {
+    description = "MMDB file management CLI supporting various operations on MMDB database files";
+    homepage = "https://github.com/ipinfo/mmdbctl";
+    changelog = "https://github.com/ipinfo/mmdbctl/blob/${src.rev}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ moraxyc ];
+    mainProgram = "mmdbctl";
+  };
+}
--- a/pkgs/by-name/na/narsil/package.nix
+++ b/pkgs/by-name/na/narsil/package.nix
@ -14,16 +14,16 @@
 }:
 stdenv.mkDerivation rec {
  pname = "narsil";
-  version = "1.3.0-234-g228c4f0cb";
+  version = "1.3.0-350-ga51756908";

  src = fetchFromGitHub {
    owner = "NickMcConnell";
    repo = "NarSil";
    rev = version;
-    hash = "sha256-82ph8LTtaruaV97gdnqSQI8IfqO9wzYbR7WTGx086pQ=";
+    hash = "sha256-kpfgM+FpvSZLrgu6Smbjlr8QfI400+85wqUR+l0AJkA=";
  };

-  passthru.updateScript = nix-update-script { };
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch=main" ]; };

  nativeBuildInputs = [ autoreconfHook ];
  buildInputs =
--- a/pkgs/by-name/ne/newlisp/package.nix
+++ b/pkgs/by-name/ne/newlisp/package.nix
@ -0,0 +1,47 @@
+{
+  lib,
+  fetchurl,
+  stdenv,
+  libffi,
+  readline,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "newlisp";
+  version = "10.7.5";
+
+  src = fetchurl {
+    url = "https://www.newlisp.org/downloads/newlisp-${finalAttrs.version}.tgz";
+    hash = "sha256-3C0P9lHCsnW8SvOvi6WYUab7bh6t3CCudftgsekBJuw=";
+  };
+
+  buildInputs = [
+    libffi
+    readline
+  ];
+
+  configureScript = "./configure-alt";
+
+  doCheck = true;
+  checkTarget = "testall";
+
+  meta = {
+    description = "Lisp-like, general-purpose scripting language";
+    longDescription = ''
+      newLISP is a Lisp-like, general-purpose scripting language. It is
+      especially well-suited for applications in AI, simulation, natural
+      language processing, big data, machine learning and statistics. Because
+      of its small resource requirements, newLISP is excellent for embedded
+      systems applications. Most of the functions you will ever need are
+      already built in. This includes networking functions, support for
+      distributed and multicore processing, and Bayesian statistics.
+    '';
+    homepage = "https://www.newlisp.org/";
+    downloadPage = "https://www.newlisp.org/downloads/";
+    changelog = "https://www.newlisp.org/downloads/newlisp-${finalAttrs.version}/doc/CHANGES";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ rc-zb ];
+    mainProgram = "newlisp";
+    platforms = lib.platforms.linux;
+  };
+})
--- a/pkgs/by-name/ne/nezha-agent/package.nix
+++ b/pkgs/by-name/ne/nezha-agent/package.nix
@ -3,19 +3,17 @@
  buildGoModule,
  stdenv,
  fetchFromGitHub,
-  nezha-agent,
  versionCheckHook,
-  testers,
 }:
 buildGoModule rec {
  pname = "nezha-agent";
-  version = "0.20.2";
+  version = "0.20.3";

  src = fetchFromGitHub {
    owner = "nezhahq";
    repo = "agent";
    rev = "refs/tags/v${version}";
-    hash = "sha256-BM3FhCf9zfccC2xC/Fhz2/andZmPYsJojMRUA3M9NOQ=";
+    hash = "sha256-cLLiJbAr7TxVUNV31Y9TG8ZL4uqBCOnrOr1FM4+1U5c=";
  };

  vendorHash = "sha256-q6/265vVg6jCnDvs825nni8QFHkJpQz4xxC9MlJH2do=";
--- a/pkgs/applications/networking/cluster/nomad-pack/default.nix
+++ b/pkgs/applications/networking/cluster/nomad-pack/default.nix
@ -1,20 +1,21 @@
-{ lib
-, fetchFromGitHub
-, buildGoModule
+{
+  lib,
+  fetchFromGitHub,
+  buildGoModule,
 }:

 buildGoModule rec {
  pname = "nomad-pack";
-  version = "0.1.2";
+  version = "0.2.0";

  src = fetchFromGitHub {
    owner = "hashicorp";
-    repo = pname;
+    repo = "nomad-pack";
    rev = "v${version}";
-    sha256 = "sha256-5OTGBO2EMGPJ4J2Eu3pIlZmYGXYxgL/6uGQgdB+8nPk=";
+    sha256 = "sha256-dw6sueC1qibJYc6sbZX8HJlEf9R6O8dlE1aobw70UHw=";
  };

-  vendorHash = "sha256-8hWiVtya/TlVLUlYVJSjOzZUI8vsPm355ksIRPhB2rA=";
+  vendorHash = "sha256-BKYJ9FZXKpFwK3+mrZAXRkfitSY9jeOLLeC0BOsKc/A=";

  # skip running go tests as they require network access
  doCheck = false;
--- a/pkgs/by-name/ob/objfw/package.nix
+++ b/pkgs/by-name/ob/objfw/package.nix
@ -2,13 +2,12 @@
  autoconf,
  autogen,
  automake,
-  clang,
+  clangStdenv,
  fetchFromGitHub,
  lib,
-  stdenv,
 }:

-stdenv.mkDerivation (finalAttrs: {
+clangStdenv.mkDerivation (finalAttrs: {
  pname = "objfw";
  version = "1.1.7";

@ -20,7 +19,6 @@ stdenv.mkDerivation (finalAttrs: {
  };

  nativeBuildInputs = [
-    clang
    automake
    autogen
    autoconf
--- a/pkgs/by-name/op/open-webui/package.nix
+++ b/pkgs/by-name/op/open-webui/package.nix
@ -55,10 +55,6 @@ python3.pkgs.buildPythonApplication rec {
  pythonRelaxDeps = true;

  pythonRemoveDeps = [
-    # using `opencv4`
-    "opencv-python-headless"
-    # using `psycopg2` instead
-    "psycopg2-binary"
    "docker"
    "pytest"
    "pytest-docker"
@ -97,14 +93,14 @@ python3.pkgs.buildPythonApplication rec {
    markdown
    nltk
    openai
-    opencv4
+    opencv-python-headless
    openpyxl
    pandas
    passlib
    peewee
    peewee-migrate
    psutil
-    psycopg2
+    psycopg2-binary
    pydub
    pyjwt
    pymilvus
--- a/pkgs/by-name/pl/plasmusic-toolbar/package.nix
+++ b/pkgs/by-name/pl/plasmusic-toolbar/package.nix
@ -1,18 +1,19 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, kdePackages
-, nix-update-script
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  kdePackages,
+  nix-update-script,
 }:
-stdenv.mkDerivation (finalAttrs: {
+stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "plasmusic-toolbar";
-  version = "1.6.0";
+  version = "2.0.0";

  src = fetchFromGitHub {
    owner = "ccatterina";
    repo = "plasmusic-toolbar";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-tZ2xcoGZp2GWoKd4XjO2K4he3tKBHgxi0PdqY+5ULn0=";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-geT3QfZi0jNHxRcsGavcj5fnlPms1QgMgM4nAf/d2UI=";
  };

  installPhase = ''
@ -27,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
  meta = {
    description = "KDE Plasma widget that shows currently playing song information and provide playback controls.";
    homepage = "https://github.com/ccatterina/plasmusic-toolbar";
-    changelog = "https://github.com/ccatterina/plasmusic-toolbar/releases/tag/${finalAttrs.src.rev}";
+    changelog = "https://github.com/ccatterina/plasmusic-toolbar/releases/tag/v${finalAttrs.version}";
    license = lib.licenses.gpl3Only;
    maintainers = with lib.maintainers; [ HeitorAugustoLN ];
    inherit (kdePackages.kwindowsystem.meta) platforms;
--- a/pkgs/by-name/po/podlet/package.nix
+++ b/pkgs/by-name/po/podlet/package.nix
@ -0,0 +1,28 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "podlet";
+  version = "0.3.0";
+
+  src = fetchFromGitHub {
+    owner = "containers";
+    repo = "podlet";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-STkYCaXBoQSmFKpMdsKzqFGXHh9s0jeGi5K2itj8jmc=";
+  };
+
+  cargoHash = "sha256-G+X9b4PAQ+1TkzGIs1g+qz7HYjwPJ/CvaHMiOAn3dV8=";
+
+  meta = {
+    description = "Generate Podman Quadlet files from a Podman command, compose file, or existing object";
+    homepage = "https://github.com/containers/podlet";
+    changelog = "https://github.com/containers/podlet/blob/v${version}/CHANGELOG.md";
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ qwqawawow ];
+    mainProgram = "podlet";
+  };
+}
--- a/pkgs/by-name/pu/puffin/package.nix
+++ b/pkgs/by-name/pu/puffin/package.nix
@ -0,0 +1,26 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildGoModule,
+}:
+buildGoModule rec {
+  pname = "puffin";
+  version = "2.1.1";
+
+  src = fetchFromGitHub {
+    owner = "siddhantac";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-5lglIiVOsxnMbeR/E3O5TaMtoR5DJACWjStE4d7hDao=";
+  };
+
+  vendorHash = "sha256-ZxAqR3D5VUtbntktrpnywPG3m9rq1utO4fdum0Qe6TU=";
+
+  meta = {
+    description = "Beautiful terminal dashboard for hledger";
+    homepage = "https://github.com/siddhantac/puffin";
+    license = lib.licenses.mit;
+    mainProgram = "puffin";
+    maintainers = with lib.maintainers; [ renesat ];
+  };
+}
--- a/pkgs/by-name/re/repak/package.nix
+++ b/pkgs/by-name/re/repak/package.nix
@ -0,0 +1,34 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "repak";
+  version = "0.2.2";
+
+  src = fetchFromGitHub {
+    owner = "trumank";
+    repo = "repak";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-nl05EsR52YFSR9Id3zFynhrBIvaqVwUOdjPlSp19Gcc=";
+  };
+
+  cargoHash = "sha256-4RA3Nv4Wes3etrnZSnHRjJ3ukA6stJXDj3ftaCxGwuY=";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Unreal Engine .pak file library and CLI in rust";
+    homepage = "https://github.com/trumank/repak";
+    changelog = "https://github.com/trumank/repak/releases/tag/v${version}";
+    license = with lib.licenses; [
+      mit
+      asl20
+    ];
+    maintainers = with lib.maintainers; [ florensie ];
+    mainProgram = "repak";
+  };
+}
--- a/pkgs/by-name/re/revpfw3/package.nix
+++ b/pkgs/by-name/re/revpfw3/package.nix
@ -2,10 +2,13 @@
  lib,
  fetchgit,
  rustPlatform,
+  nix-update-script,
 }:
 rustPlatform.buildRustPackage rec {
  pname = "revpfw3";
-  version = "0.4.0";
+  version = "0.4.2";
+
+  passthru.updateScript = nix-update-script { };

  src = fetchgit {
    url = "https://git.tudbut.de/tudbut/revpfw3";
@ -13,7 +16,7 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-v8BtgQYdELui5Yu8kpE5f97MSo/WhNah+e1xXhZGJwM=";
  };

-  cargoHash = "sha256-0AVp6fQq/NCkvKcK5ALbFNxNkt0NgbOmGlmDBGxwONQ=";
+  cargoHash = "sha256-MmVN4NmwSZiWYh7uMAQ+OogJT1kRLoB2q6gVfoaer54=";

  meta = {
    description = "Reverse proxy to bypass the need for port forwarding";
--- a/pkgs/by-name/sq/sql-studio/package.nix
+++ b/pkgs/by-name/sq/sql-studio/package.nix
@ -0,0 +1,47 @@
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  buildNpmPackage,
+  fetchFromGitHub,
+}:
+let
+  pname = "sql-studio";
+  version = "0.1.27";
+
+  src = fetchFromGitHub {
+    owner = "frectonz";
+    repo = "sql-studio";
+    rev = version;
+    hash = "sha256-iSvxdqarHX0AvkMSzL2JFOm32OyMwVKt+Gn7odgwalU=";
+  };
+
+  ui = buildNpmPackage {
+    inherit version src;
+    pname = "${pname}-ui";
+    npmDepsHash = "sha256-kGukH0PKF7MtIO5UH+55fddj6Tv2dNLmOC6oytEhP3c=";
+    sourceRoot = "${src.name}/ui";
+    installPhase = ''
+      cp -pr --reflink=auto -- dist "$out/"
+    '';
+  };
+in
+rustPlatform.buildRustPackage {
+  inherit pname version src;
+
+  cargoHash = "sha256-BlYFbJEDap/k3oi9tFl4JpTyYh8ce7F3NIlOtOid59s=";
+
+  preBuild = ''
+    cp -pr --reflink=auto -- ${ui} ui/dist
+  '';
+
+  meta = {
+    description = "SQL Database Explorer [SQLite, libSQL, PostgreSQL, MySQL/MariaDB, DuckDB, ClickHouse]";
+    homepage = "https://github.com/frectonz/sql-studio";
+    mainProgram = "sql-studio";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.frectonz ];
+    platforms = lib.platforms.all;
+    broken = stdenv.isDarwin;
+  };
+}
--- a/pkgs/by-name/st/storcli/package.nix
+++ b/pkgs/by-name/st/storcli/package.nix
@ -7,12 +7,12 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "storcli";
-  version = "7.2904.00";
-  phase = "30";
+  version = "7.3103.00";
+  phase = "32";

  src = fetchzip {
    url = "https://docs.broadcom.com/docs-and-downloads/host-bus-adapters/host-bus-adapters-common-files/sas_sata_nvme_12g_p${finalAttrs.phase}/STORCLI_SAS3.5_P${finalAttrs.phase}.zip";
-    hash = "sha256-VfK71eiDonzWdR6g5zkXgRRi25vwoI4DDL6xy3zsfak=";
+    hash = "sha256-bOlIChZi2eWpc5QA+wXBQA4s+o/MVLVWsligjDpUXEU=";
  };

  nativeBuildInputs = [ rpmextract ];
--- a/pkgs/by-name/th/theattyr/package.nix
+++ b/pkgs/by-name/th/theattyr/package.nix
@ -0,0 +1,31 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "theattyr";
+  version = "0.1.10";
+
+  src = fetchFromGitHub {
+    owner = "orhun";
+    repo = "theattyr";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-gqgoG5JwGecm8MEqH36BvJyLuh6nDao1d9ydX1AlbgU=";
+  };
+
+  cargoHash = "sha256-LwJW1WTUa0iz4PeDOMmRr6H0XLhWOn9b4W3SUR+SHyc=";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "A terminal theater for playing VT100 art and animations";
+    homepage = "https://github.com/orhun/theattyr";
+    changelog = "https://github.com/orhun/theattyr/blob/${src.rev}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ a-kenji ];
+    mainProgram = "theattyr";
+  };
+}
--- a/pkgs/by-name/tu/turbocase/package.nix
+++ b/pkgs/by-name/tu/turbocase/package.nix
@ -0,0 +1,33 @@
+{
+  lib,
+  python3,
+  fetchFromGitea,
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "turbocase";
+  version = "1.8.0";
+  pyproject = true;
+
+  src = fetchFromGitea {
+    domain = "codeberg.org";
+    owner = "MartijnBraam";
+    repo = "TurboCase";
+    rev = version;
+    hash = "sha256-mwWN7XYKr/BD9r935oElqoQN87kdrrWjkmhURkAkjj4=";
+  };
+
+  build-system = [ python3.pkgs.setuptools ];
+
+  dependencies = [ python3.pkgs.sexpdata ];
+
+  pythonImportsCheck = [ "turbocase" ];
+
+  meta = {
+    description = "Generate an OpenSCAD case template from a KiCAD PCB";
+    homepage = "https://turbocase.org";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ MayNiklas ];
+    mainProgram = "turbocase";
+  };
+}
--- a/pkgs/by-name/uv/uv/Cargo.lock
+++ b/pkgs/by-name/uv/uv/Cargo.lock
@ -34,9 +34,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"

 [[package]]
 name = "anstream"
-version = "0.6.15"
+version = "0.6.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+checksum = "23a1e53f0f5d86382dafe1cf314783b2044280f406e7e1506368220ad11b1338"
 dependencies = [
 "anstyle",
 "anstyle-parse",
@ -73,19 +73,19 @@ dependencies = [

 [[package]]
 name = "anstyle-wincon"
-version = "3.0.4"
+version = "3.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
 dependencies = [
 "anstyle",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
 name = "anyhow"
-version = "1.0.90"
+version = "1.0.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37bf3594c4c988a53154954629820791dde498571819ae4ca50ca811e060cc95"
+checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8"

 [[package]]
 name = "arrayref"
@ -1330,9 +1330,9 @@ dependencies = [

 [[package]]
 name = "goblin"
-version = "0.8.2"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b363a30c165f666402fe6a3024d3bec7ebc898f96a4a23bd1c99f8dbf3f4f47"
+checksum = "53ab3f32d1d77146981dea5d6b1e8fe31eedcb7013e5e00d6ccd1259a4b4d923"
 dependencies = [
 "log",
 "plain",
@ -1620,9 +1620,9 @@ checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"

 [[package]]
 name = "insta"
-version = "1.40.0"
+version = "1.41.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6593a41c7a73841868772495db7dc1e8ecab43bb5c0b6da2059246c4b506ab60"
+checksum = "a1f72d3e19488cf7d8ea52d2fc0f8754fc933398b337cd3cbdb28aaeb35159ef"
 dependencies = [
 "console",
 "lazy_static",
@ -1810,9 +1810,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"

 [[package]]
 name = "libc"
-version = "0.2.159"
+version = "0.2.161"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
+checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"

 [[package]]
 name = "libmimalloc-sys"
@ -2468,9 +2468,9 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.88"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9"
+checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
 dependencies = [
 "unicode-ident",
 ]
@ -2686,9 +2686,9 @@ dependencies = [

 [[package]]
 name = "regex"
-version = "1.11.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
 "aho-corasick",
 "memchr",
@ -2978,9 +2978,9 @@ checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"

 [[package]]
 name = "rustix"
-version = "0.38.37"
+version = "0.38.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
+checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a"
 dependencies = [
 "bitflags 2.6.0",
 "errno",
@ -3181,9 +3181,9 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"

 [[package]]
 name = "serde"
-version = "1.0.210"
+version = "1.0.213"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+checksum = "3ea7893ff5e2466df8d720bb615088341b295f849602c6956047f8f80f0e9bc1"
 dependencies = [
 "serde_derive",
 ]
@ -3201,9 +3201,9 @@ dependencies = [

 [[package]]
 name = "serde_derive"
-version = "1.0.210"
+version = "1.0.213"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+checksum = "7e85ad2009c50b58e87caa8cd6dac16bdf511bbfb7af6c33df902396aa480fa5"
 dependencies = [
 "proc-macro2",
 "quote",
@ -3465,9 +3465,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "2.0.82"
+version = "2.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83540f837a8afc019423a8edb95b52a8effe46957ee402287f4292fae35be021"
+checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56"
 dependencies = [
 "proc-macro2",
 "quote",
@ -3629,18 +3629,18 @@ dependencies = [

 [[package]]
 name = "thiserror"
-version = "1.0.64"
+version = "1.0.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
+checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "1.0.64"
+version = "1.0.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
+checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602"
 dependencies = [
 "proc-macro2",
 "quote",
@ -3734,9 +3734,9 @@ source = "git+https://github.com/charliermarsh/tl.git?rev=6e25b2ee2513d75385101a

 [[package]]
 name = "tokio"
-version = "1.40.0"
+version = "1.41.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
+checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb"
 dependencies = [
 "backtrace",
 "bytes",
@ -4139,7 +4139,7 @@ checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"

 [[package]]
 name = "uv"
-version = "0.4.26"
+version = "0.4.28"
 dependencies = [
 "anstream",
 "anyhow",
@ -5290,7 +5290,7 @@ dependencies = [

 [[package]]
 name = "uv-version"
-version = "0.4.26"
+version = "0.4.28"

 [[package]]
 name = "uv-virtualenv"
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@ -15,14 +15,14 @@

 python3Packages.buildPythonApplication rec {
  pname = "uv";
-  version = "0.4.26";
+  version = "0.4.28";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "astral-sh";
    repo = "uv";
    rev = "refs/tags/${version}";
-    hash = "sha256-aeyKbuJXYJvpyxbyDWvx0FdK+Lg33xhVr5q0zbDob3M=";
+    hash = "sha256-QoEgwMhoqabwbtjOVOW+hgOUuDVZQQ5x+cF6kdWgFvc=";
  };

  cargoDeps = rustPlatform.importCargoLock {
--- a/pkgs/by-name/va/vale/package.nix
+++ b/pkgs/by-name/va/vale/package.nix
@ -10,7 +10,7 @@

 buildGoModule rec {
  pname = "vale";
-  version = "3.7.1";
+  version = "3.8.0";

  subPackages = [ "cmd/vale" ];

@ -18,10 +18,10 @@ buildGoModule rec {
    owner = "errata-ai";
    repo = "vale";
    rev = "v${version}";
-    hash = "sha256-jb+ap+XQMrSqstgexycpgO+M2YyENDeSmMQXrV2FiM4=";
+    hash = "sha256-0opa8F0cpC0uh51JDgofxl6e0oecxgkEufnLfxtkaOw=";
  };

-  vendorHash = "sha256-0AeG0/ALU/mkXxVKzqGhxXLqq2XYmnF/ZRaZkJ5eQxU=";
+  vendorHash = "sha256-EWAgzb3ruxYqaP+owcyGDzNnkPDYp0ttHwCgNXuuTbk=";

  ldflags = [
    "-s"
--- a/pkgs/by-name/wa/watchyourlan/package.nix
+++ b/pkgs/by-name/wa/watchyourlan/package.nix
@ -0,0 +1,40 @@
+{
+  buildGoModule,
+  fetchFromGitHub,
+  makeBinaryWrapper,
+  lib,
+  arp-scan,
+}:
+buildGoModule rec {
+  pname = "watchyourlan";
+  version = "2.0.4";
+
+  src = fetchFromGitHub {
+    owner = "aceberg";
+    repo = "WatchYourLAN";
+    rev = version;
+    hash = "sha256-nJYDGCkT8vCkxySLONG3OkWVkaBqXqSFgd7N1TTMAf4=";
+  };
+
+  vendorHash = "sha256-urSFoFkYllV+bsKIRV/azkbL30mbGeciYR7jy/fOE/w=";
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  nativeBuildInputs = [ makeBinaryWrapper ];
+
+  postFixup = ''
+    wrapProgram $out/bin/WatchYourLAN \
+      --prefix PATH : '${lib.makeBinPath [ arp-scan ]}'
+  '';
+
+  meta = {
+    description = "Lightweight network IP scanner with web GUI";
+    homepage = "https://github.com/aceberg/WatchYourLAN";
+    license = lib.licenses.mit;
+    mainProgram = "WatchYourLAN";
+    maintainers = [ lib.maintainers.iv-nn ];
+  };
+}
--- a/pkgs/by-name/x4/x4/package.nix
+++ b/pkgs/by-name/x4/x4/package.nix
@ -0,0 +1,50 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  openssl,
+  zlib,
+  stdenv,
+  darwin,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "x4";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "pwnwriter";
+    repo = "x4";
+    rev = "v${version}";
+    hash = "sha256-IF+8lu56fzYM79p7MiNpVLFIs2GKPlzw5pNXD/hT6BM=";
+  };
+
+  cargoHash = "sha256-p3iMqnRW/quk2AHr2nLgOTvtshZ+xo6DGvWDsDj+bvU=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs =
+    [
+      openssl
+      zlib
+    ]
+    ++ lib.optionals stdenv.isDarwin [
+      darwin.apple_sdk.frameworks.Security
+    ];
+
+  env = {
+    OPENSSL_NO_VENDOR = true;
+  };
+
+  meta = {
+    description = "Execute shell commands to server(s) via ssh protocol";
+    homepage = "https://github.com/pwnwriter/x4";
+    changelog = "https://github.com/pwnwriter/x4/blob/${src.rev}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pwnwriter ];
+    mainProgram = "x4";
+  };
+}
--- a/pkgs/development/coq-modules/mathcomp-analysis/default.nix
+++ b/pkgs/development/coq-modules/mathcomp-analysis/default.nix
@ -51,14 +51,25 @@ let
    ] null;

  # list of analysis packages sorted by dependency order
-  packages = [ "classical" "analysis" ];
+  packages = {
+    "classical" = [];
+    "reals" = [ "classical" ];
+    "altreals" = [ "reals" ];
+    "analysis" = [ "reals" ];
+    "reals-stdlib" = [ "reals" ];
+    "analysis-stdlib" = [ "analysis" "reals-stdlib" ];
+  };

  mathcomp_ = package: let
      classical-deps = [ mathcomp.algebra mathcomp-finmap ];
      analysis-deps = [ mathcomp.field mathcomp-bigenough ];
-      intra-deps = lib.optionals (package != "single") (map mathcomp_ (lib.head (lib.splitList (lib.pred.equal package) packages)));
-      pkgpath = if package == "single" then "."
-        else if package == "analysis" then "theories" else "${package}";
+      intra-deps = lib.optionals (package != "single") (map mathcomp_ packages.${package});
+      pkgpath = lib.switch package [
+        { case = "single"; out = "."; }
+        { case = "analysis"; out = "theories"; }
+        { case = "reals-stdlib"; out = "reals_stdlib"; }
+        { case = "analysis-stdlib"; out = "analysis_stdlib"; }
+      ] package;
      pname = if package == "single" then "mathcomp-analysis-single"
        else "mathcomp-${package}";
      derivation = mkCoqDerivation ({
@ -81,7 +92,7 @@ let
          license     = lib.licenses.cecill-c;
        };

-        passthru = lib.genAttrs packages mathcomp_;
+        passthru = lib.mapAttrs (package: deps: mathcomp_ package) packages;
      });
    # split packages didn't exist before 0.6, so bulding nothing in that case
    patched-derivation1 = derivation.overrideAttrs (o:
@ -94,7 +105,13 @@ let
         o.version != null && o.version != "dev" && lib.versions.isLt "0.6" o.version)
      { preBuild = ""; }
    );
-    patched-derivation = patched-derivation2.overrideAttrs (o:
+    # only packages classical and analysis existed before 1.7, so bulding nothing in that case
+    patched-derivation3 = patched-derivation2.overrideAttrs (o:
+      lib.optionalAttrs (o.pname != null && o.pname != "mathcomp-classical" && o.pname != "mathcomp-analysis" &&
+         o.version != null && o.version != "dev" && lib.versions.isLt "1.7" o.version)
+      { preBuild = ""; buildPhase = "echo doing nothing"; installPhase = "echo doing nothing"; }
+    );
+    patched-derivation = patched-derivation3.overrideAttrs (o:
      lib.optionalAttrs (o.version != null
        && (o.version == "dev" || lib.versions.isGe "0.3.4" o.version))
      {
--- a/pkgs/development/interpreters/wamr/default.nix
+++ b/pkgs/development/interpreters/wamr/default.nix
@ -6,13 +6,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "wamr";
-  version = "2.1.1";
+  version = "2.2.0";

  src = fetchFromGitHub {
    owner = "bytecodealliance";
    repo = "wasm-micro-runtime";
    rev = "WAMR-${finalAttrs.version}";
-    hash = "sha256-/DQ+dZ3VoijL7FdgRgPg3H7whhXhjIzjhCaqpjPYw4k=";
+    hash = "sha256-Rhn26TRyjkR30+zyosfooOGjhvG+ztYtJVQlRfzWEFo=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/development/interpreters/wasmtime/default.nix
+++ b/pkgs/development/interpreters/wasmtime/default.nix
@ -2,19 +2,19 @@

 rustPlatform.buildRustPackage rec {
  pname = "wasmtime";
-  version = "25.0.2";
+  version = "26.0.0";

  src = fetchFromGitHub {
    owner = "bytecodealliance";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-5Wu5gK3g7nkMDwUGkwnx400PRkb0jknX/GKeEAJ9Vgg=";
+    hash = "sha256-zcAYF/accq0Z0aKZLquFY+iDs1uh57sbZ/zXGqZ3KZI=";
    fetchSubmodules = true;
  };

  # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
  auditable = false;
-  cargoHash = "sha256-jLdVxWjfJSkfHcmw5i02gXI2uEUB7KxiEfdFtfc020U=";
+  cargoHash = "sha256-ufojfTrChL363AX/W8hT3pJYeYijqJ7azECuUGGmBx0=";
  cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ];

  outputs = [ "out" "dev" ];
--- a/pkgs/development/libraries/icu/default.nix
+++ b/pkgs/development/libraries/icu/default.nix
@ -7,8 +7,8 @@ let
 in
 {
  icu76 = make-icu {
-    version = "76.1rc";
-    hash = "sha256-HMY4hRYbF4Dsf1EGx+m0NRsCUA+Q/JGRpdGIgym/A5I=";
+    version = "76.1";
+    hash = "sha256-36y0a/5HR0EEcs4+EUS/KKEC/uqk44dbrJtMbPMPTz4=";
  };
  icu75 = make-icu {
    version = "75.1";
--- a/pkgs/development/libraries/icu/make-icu.nix
+++ b/pkgs/development/libraries/icu/make-icu.nix
@ -8,9 +8,9 @@ let

  pname = "icu4c";

-  #release = lib.replaceStrings [ "." ] [ "-" ] version;
+  release = lib.replaceStrings [ "." ] [ "-" ] version;
  # To test rc versions of ICU replace the line above with the line below.
-  release = lib.replaceStrings [ "." ] [ "-" ] (if lib.hasSuffix "rc" version then lib.replaceStrings [ "1" ] [ "" ] version else version);
+  #release = lib.replaceStrings [ "." ] [ "-" ] (if lib.hasSuffix "rc" version then lib.replaceStrings [ "1" ] [ "" ] version else version);

  baseAttrs = {
    src = fetchurl {
--- a/pkgs/development/libraries/libcifpp/default.nix
+++ b/pkgs/development/libraries/libcifpp/default.nix
@ -9,13 +9,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "libcifpp";
-  version = "7.0.4";
+  version = "7.0.7";

  src = fetchFromGitHub {
    owner = "PDB-REDO";
    repo = "libcifpp";
    rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-/dX77KRYmTIj8jxRzQRlpG/ktqDL1jjySux/JqHnE3I=";
+    hash = "sha256-wyDdSUOVey1VKftLLRka9Fp4MT+qNEawZQ5iySl3dk8=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/libraries/science/math/libtorch/bin.nix
+++ b/pkgs/development/libraries/science/math/libtorch/bin.nix
@ -19,7 +19,7 @@ let
  # this derivation. However, we should ensure on version bumps
  # that the CUDA toolkit for `passthru.tests` is still
  # up-to-date.
-  version = "2.3.0";
+  version = "2.5.0";
  device = if cudaSupport then "cuda" else "cpu";
  srcs = import ./binary-hashes.nix version;
  unavailable = throw "libtorch is not available for this platform";
--- a/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix
+++ b/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix
@ -1,19 +1,19 @@
 version: builtins.getAttr version {
- "2.3.0" = {
-     aarch64-darwin-cpu = {
-      name = "libtorch-macos-arm64-2.3.0.zip";
-      url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-arm64-2.3.0.zip";
-      hash = "sha256-l4qY1jbsECN5qm7dWJ2jSvKuQwQ/HI6G6Vq1Kh2rxkM=";
+  "2.5.0" = {
+    aarch64-darwin-cpu = {
+      name = "libtorch-macos-arm64-2.5.0.zip";
+      url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-arm64-2.5.0.zip";
+      hash = "sha256-4d9YKUuvAESBeG/WCUsQfEHwdB2z34grnlwWslj4970=";
    };
    x86_64-linux-cpu = {
-      name = "libtorch-cxx11-abi-shared-with-deps-2.3.0-cpu.zip";
-      url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-2.3.0%2Bcpu.zip";
-      hash = "sha256-dKAk6UusK2eQIcP0oMXh9cnufMpy5Ph4SGPkIPPV6ds=";
+      name = "libtorch-cxx11-abi-shared-with-deps-2.5.0-cpu.zip";
+      url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-2.5.0%2Bcpu.zip";
+      hash = "sha256-gUzPhc4Z8rTPhIm89pPoLP0Ww17ono+/xgMW46E/Tro=";
    };
    x86_64-linux-cuda = {
-      name = "libtorch-cxx11-abi-shared-with-deps-2.3.0-cu121.zip";
-      url = "https://download.pytorch.org/libtorch/cu121/libtorch-cxx11-abi-shared-with-deps-2.3.0%2Bcu121.zip";
-      hash = "sha256-6B+NF6q78I2WKFudn8bK+eNYDi1zQ7mdgv06fZbm2rE=";
+      name = "libtorch-cxx11-abi-shared-with-deps-2.5.0-cu124.zip";
+      url = "https://download.pytorch.org/libtorch/cu124/libtorch-cxx11-abi-shared-with-deps-2.5.0%2Bcu124.zip";
+      hash = "sha256-UaX47GAwyZ6UmzgY85TeAHmy3u52pBHhiyM5NAz7ens=";
    };
  };
 }
--- a/pkgs/development/libraries/science/math/libtorch/prefetch.sh
+++ b/pkgs/development/libraries/science/math/libtorch/prefetch.sh
@ -6,11 +6,10 @@ set -eou pipefail
 version=$1

 bucket="https://download.pytorch.org/libtorch"
-CUDA_VERSION=cu121
+CUDA_VERSION=cu124

 url_and_key_list=(
  "aarch64-darwin-cpu $bucket/cpu/libtorch-macos-arm64-${version}.zip libtorch-macos-arm64-${version}.zip"
-  "x86_64-darwin-cpu $bucket/cpu/libtorch-macos-x86_64-${version}.zip libtorch-macos-x86_64-${version}.zip"
  "x86_64-linux-cpu $bucket/cpu/libtorch-cxx11-abi-shared-with-deps-${version}%2Bcpu.zip libtorch-cxx11-abi-shared-with-deps-${version}-cpu.zip"
  "x86_64-linux-cuda $bucket/${CUDA_VERSION}/libtorch-cxx11-abi-shared-with-deps-${version}%2B${CUDA_VERSION}.zip libtorch-cxx11-abi-shared-with-deps-${version}-${CUDA_VERSION}.zip"
 )
--- a/pkgs/development/php-packages/phing/composer.lock
+++ b/pkgs/development/php-packages/phing/composer.lock
--- a/pkgs/development/php-packages/phing/default.nix
+++ b/pkgs/development/php-packages/phing/default.nix
@ -1,28 +1,26 @@
 {
  lib,
-  fetchFromGitHub,
+  fetchgit,
  php,
 }:

-(php.withExtensions ({ enabled, all }: enabled ++ (with all; [ xsl ]))).buildComposerProject
+(php.withExtensions ({ enabled, all }: enabled ++ (with all; [ xsl ]))).buildComposerProject2
  (finalAttrs: {
    pname = "phing";
-    version = "3.0.0-rc6";
+    version = "3.0.0";

-    src = fetchFromGitHub {
-      owner = "phingofficial";
-      repo = "phing";
-      rev = finalAttrs.version;
-      hash = "sha256-pOt6uQaz69WuHKYZhq6FFbjyHGrEc+Bf0Sw9uCS3Nrc=";
+    # Upstream no longer provides the composer.lock in their release artifact
+    src = fetchgit {
+      url = "https://github.com/phingofficial/phing";
+      rev = "refs/tags/${finalAttrs.version}";
+      hash = "sha256-PEJuEsVl6H4tdqOUvkuazVmyvsRvhBD5AA7EWkMHmFk=";
    };

-    # TODO: Open a PR against https://github.com/phingofficial/phing
-    # Their `composer.lock` is out of date therefore, we need to provide one
-    composerLock = ./composer.lock;
-    vendorHash = "sha256-ueTbbz3FGyRcRvlcJNirHdC77Tko4RKtYMFB3+4JdnQ=";
+    vendorHash = "sha256-P829cADIJ5Hl5gHXbgTkpWHGF1pCtUKvx1GMrbPLkik=";

    meta = {
      description = "PHing Is Not GNU make; it's a PHP project build system or build tool based on Apache Ant";
+      changelog = "https://github.com/phingofficial/phing/releases/tag/${finalAttrs.version}";
      homepage = "https://github.com/phingofficial/phing";
      license = lib.licenses.lgpl3;
      mainProgram = "phing";
--- a/pkgs/development/php-packages/php-cs-fixer/composer.lock
+++ b/pkgs/development/php-packages/php-cs-fixer/composer.lock
--- a/pkgs/development/php-packages/php-cs-fixer/default.nix
+++ b/pkgs/development/php-packages/php-cs-fixer/default.nix
@ -4,21 +4,21 @@
  php,
 }:

-php.buildComposerProject (finalAttrs: {
+php.buildComposerProject2 (finalAttrs: {
  pname = "php-cs-fixer";
-  version = "3.58.1";
+  version = "3.64.0";

  src = fetchFromGitHub {
    owner = "PHP-CS-Fixer";
    repo = "PHP-CS-Fixer";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-MBNFTHhApANDeHY0tTKbIP2EfVDH7mxwA42PKihzPug=";
+    hash = "sha256-N2m3U0HjwQtm7loqYfEl7kstqljXC8evp6GEh+Cd9Hs=";
  };

-  # Missing `composer.lock` from the repository.
-  # Issue open at https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7590
+  # Upstream doesn't provide a composer.lock.
+  # More info at https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7590
  composerLock = ./composer.lock;
-  vendorHash = "sha256-dryqtCUr2xkZgDRLKpQjyEpLGz8WiHtLY4fF/pCR10w=";
+  vendorHash = "sha256-cOKfvNjFl9QKwPZp81IHaRurRhmXgbydhdTWYknlGBM=";

  meta = {
    changelog = "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/releases/tag/v${finalAttrs.version}";
--- a/pkgs/development/python-modules/bytecode/default.nix
+++ b/pkgs/development/python-modules/bytecode/default.nix
@ -9,7 +9,7 @@

 buildPythonPackage rec {
  pname = "bytecode";
-  version = "0.15.1";
+  version = "0.16.0";
  format = "pyproject";
  disabled = pythonOlder "3.6";

@ -17,7 +17,7 @@ buildPythonPackage rec {
    owner = "vstinner";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-Jzsh0m00SiJjTP7hXMDmuR4XHmsCYdURuFDkVopGyIE=";
+    hash = "sha256-Nj/GKZC+zZt1M4Qd7CMXQCLwTIu64aidasH4PwBLtzw=";
  };

  nativeBuildInputs = [ setuptools-scm ];
--- a/pkgs/development/python-modules/cachier/default.nix
+++ b/pkgs/development/python-modules/cachier/default.nix
@ -18,7 +18,7 @@

 buildPythonPackage rec {
  pname = "cachier";
-  version = "3.1.0";
+  version = "3.1.1";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -27,7 +27,7 @@ buildPythonPackage rec {
    owner = "python-cachier";
    repo = "cachier";
    rev = "refs/tags/v${version}";
-    hash = "sha256-LphmYL8Jmry8Jmd5Eps68wD113JMWwyBl18pqdtl+DQ=";
+    hash = "sha256-LVGdPBDPj3c7eyOMt+JM0WynkJjmxzgsBlsfQCa8Wv0=";
  };

  pythonRemoveDeps = [ "setuptools" ];
--- a/pkgs/development/python-modules/diffenator2/default.nix
+++ b/pkgs/development/python-modules/diffenator2/default.nix
@ -27,14 +27,14 @@

 buildPythonPackage rec {
  pname = "diffenator2";
-  version = "0.4.4";
+  version = "0.4.5";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "googlefonts";
    repo = "diffenator2";
    rev = "refs/tags/v${version}";
-    hash = "sha256-FVdQW2iupAxHFmx6sC88yO2Vx3VvBhPJl55gA0fmvgo=";
+    hash = "sha256-Iu6ZA8s6XnOYSOwlt8WTmYW6oUTvcm4vLhYvVATOlBA=";
  };

  env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python";
--- a/pkgs/development/python-modules/django-json-widget/default.nix
+++ b/pkgs/development/python-modules/django-json-widget/default.nix
@ -0,0 +1,51 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  django,
+  pythonOlder,
+  setuptools,
+  python,
+  pytestCheckHook,
+  pytest-django,
+}:
+
+buildPythonPackage rec {
+  pname = "django-json-widget";
+  version = "2.0.1";
+  pyproject = true;
+
+  disabled = pythonOlder "3.6";
+
+  src = fetchFromGitHub {
+    owner = "jmrivas86";
+    repo = "django-json-widget";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-GY6rYY//n8kkWCJZk6OY+EOBv62ocNovNmE/ai8VCn4=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ django ];
+
+  nativeCheckInputs = [
+    pytest-django
+    pytestCheckHook
+  ];
+
+  preCheck = ''
+    export DJANGO_SETTINGS_MODULE=tests.settings
+  '';
+
+  pythonImportCheck = [ "django_json_widget" ];
+
+  meta = {
+    description = "Alternative widget that makes it easy to edit the jsonfield field of django";
+    homepage = "https://github.com/jmrivas86/django-json-widget";
+    changelog = "https://github.com/jmrivas86/django-json-widget/blob/v${version}/CHANGELOG.rst";
+    # Contradictory license specifications
+    # https://github.com/jmrivas86/django-json-widget/issues/93
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.onny ];
+  };
+}
--- a/pkgs/development/python-modules/django-stubs-ext/default.nix
+++ b/pkgs/development/python-modules/django-stubs-ext/default.nix
@ -13,7 +13,7 @@

 buildPythonPackage rec {
  pname = "django-stubs-ext";
-  version = "5.1.0";
+  version = "5.1.1";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -21,7 +21,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "django_stubs_ext";
    inherit version;
-    hash = "sha256-7X1RwLcxZRh5/HXzMfsIBtmLZ7+rRk6W4nJNtrRu+SY=";
+    hash = "sha256-23Nk5PUK5+U2CZPb1Yo6V+pLLn5bqw+9UlzNs+eXXRw=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/drf-writable-nested/default.nix
+++ b/pkgs/development/python-modules/drf-writable-nested/default.nix
@ -10,14 +10,14 @@

 buildPythonPackage rec {
  pname = "drf-writable-nested";
-  version = "0.7.0";
+  version = "0.7.1";
  format = "setuptools";

  src = fetchFromGitHub {
    owner = "beda-software";
    repo = "drf-writable-nested";
    rev = "refs/tags/v${version}";
-    hash = "sha256-/7MZAw0clzzlBdYchUVKldWT7WqtwdSe+016QAP0hqk=";
+    hash = "sha256-+I5HsqkjCrkF9MV90NGQuUhmLcDVsv20QIyDK9WxwdQ=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/easyocr/default.nix
+++ b/pkgs/development/python-modules/easyocr/default.nix
@ -2,10 +2,10 @@
  lib,
  buildPythonPackage,
  fetchFromGitHub,
+  setuptools,
  hdf5,
  numpy,
-  onnx,
-  opencv4,
+  opencv-python-headless,
  pillow,
  pyaml,
  pyclipper,
@ -16,12 +16,13 @@
  shapely,
  torch,
  torchvision,
+  python,
 }:

 buildPythonPackage rec {
  pname = "easyocr";
  version = "1.7.2";
-  format = "setuptools";
+  pyproject = true;

  disabled = pythonOlder "3.7";

@ -32,16 +33,22 @@ buildPythonPackage rec {
    hash = "sha256-9mrAxt2lphYtLW81lGO5SYHsnMnSA/VpHiY2NffD/Js=";
  };

-  postPatch = ''
-    substituteInPlace requirements.txt \
-      --replace "opencv-python-headless" "" \
-      --replace "ninja" ""
-  '';
+  build-system = [
+    setuptools
+  ];

-  propagatedBuildInputs = [
+  pythonRelaxDeps = [
+    "torchvision"
+  ];
+
+  pythonRemoveDeps = [
+    "ninja"
+  ];
+
+  dependencies = [
    hdf5
    numpy
-    opencv4
+    opencv-python-headless
    pillow
    pyaml
    pyclipper
@ -53,7 +60,19 @@ buildPythonPackage rec {
    torchvision
  ];

-  nativeCheckInputs = [ onnx ];
+  checkPhase = ''
+    runHook preCheck
+
+    export HOME="$(mktemp -d)"
+    pushd unit_test
+    ${python.interpreter} run_unit_test.py --easyocr "$out/${python.sitePackages}/easyocr"
+    popd
+
+    runHook postCheck
+  '';
+
+  # downloads detection model from the internet
+  doCheck = false;

  pythonImportsCheck = [ "easyocr" ];

--- a/pkgs/development/python-modules/etcd3/default.nix
+++ b/pkgs/development/python-modules/etcd3/default.nix
@ -11,12 +11,13 @@
  pytestCheckHook,
  six,
  tenacity,
+  setuptools,
 }:

 buildPythonPackage rec {
  pname = "etcd3";
  version = "0.12.0";
-  format = "setuptools";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "kragniz";
@ -25,7 +26,15 @@ buildPythonPackage rec {
    hash = "sha256-YM72+fkCDYXl6DORJa/O0sqXqHDWQcFLv2ifQ9kEHBo=";
  };

-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  env = {
+    # make protobuf compatible with old versions
+    # https://developers.google.com/protocol-buffers/docs/news/2022-05-06#python-updates
+    PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python";
+  };
+
+  dependencies = [
    grpcio
    protobuf
    six
@ -49,10 +58,10 @@ buildPythonPackage rec {

  pythonImportsCheck = [ "etcd3" ];

-  meta = with lib; {
+  meta = {
    description = "Python client for the etcd API v3";
    homepage = "https://github.com/kragniz/python-etcd3";
-    license = licenses.asl20;
-    maintainers = [ ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ moraxyc ];
  };
 }
--- a/pkgs/development/python-modules/etils/default.nix
+++ b/pkgs/development/python-modules/etils/default.nix
@ -29,14 +29,14 @@

 buildPythonPackage rec {
  pname = "etils";
-  version = "1.9.4";
+  version = "1.10.0";
  pyproject = true;

  disabled = pythonOlder "3.10";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-+tlQQU8KHKWMcMcJFbABT5lT3ZvPiqlRoPdf+b7L6yQ=";
+    hash = "sha256-Tqqdckj9Tut15E1HyimHWlzOoETMFKF0NXlL+KwRagU=";
  };

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

 buildPythonPackage rec {
  pname = "gsd";
-  version = "3.3.2";
+  version = "3.4.0";
  pyproject = true;

  disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
    owner = "glotzerlab";
    repo = "gsd";
    rev = "refs/tags/v${version}";
-    hash = "sha256-4NxZPu4DrwQW6qHeYairefabfN7J0+48tvVwi6ti4vk=";
+    hash = "sha256-4HJZZ5UUENHhKePfau6KT4E4qA9YCGpe/IMLyf5egsk=";
  };

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

 buildPythonPackage rec {
  pname = "intbitset";
-  version = "3.1.0";
+  version = "4.0.0";
  pyproject = true;

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-boPFun/aJSCqhWVCi7r4Qt63KT1mXzzYKByzklTS/3E=";
+    hash = "sha256-wUHtqhwXuRwph1N+Jp2VWra9w5Zq89624eDSDtvQndI=";
  };

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

 buildPythonPackage rec {
  pname = "itemloaders";
-  version = "1.3.1";
+  version = "1.3.2";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -22,7 +22,7 @@ buildPythonPackage rec {
    owner = "scrapy";
    repo = "itemloaders";
    rev = "refs/tags/v${version}";
-    hash = "sha256-u0/WsvLn2YlYd/FuH26T9qEGRGscipnOQbV9uPv4F+M=";
+    hash = "sha256-Hs3FodJAWZGeo+kMmcto5WW433RekwVuucaJl8TKc+0=";
  };

  nativeBuildInputs = [ setuptools ];
--- a/pkgs/development/python-modules/labelbox/default.nix
+++ b/pkgs/development/python-modules/labelbox/default.nix
@ -10,7 +10,7 @@
  nbconvert,
  nbformat,
  numpy,
-  opencv4,
+  opencv-python-headless,
  pillow,
  pydantic,
  pyproj,
@ -45,9 +45,10 @@ buildPythonPackage rec {

  sourceRoot = "${src.name}/libs/labelbox";

-  pythonRelaxDeps = [ "python-dateutil" ];
-
-  pythonRemoveDeps = [ "opencv-python-headless" ];
+  pythonRelaxDeps = [
+    "mypy"
+    "python-dateutil"
+  ];

  build-system = [ hatchling ];

@ -67,7 +68,7 @@ buildPythonPackage rec {
      shapely
      numpy
      pillow
-      opencv4
+      opencv-python-headless
      typeguard
      imagesize
      pyproj
--- a/pkgs/development/python-modules/libretranslate/default.nix
+++ b/pkgs/development/python-modules/libretranslate/default.nix
@ -30,14 +30,14 @@

 buildPythonPackage rec {
  pname = "libretranslate";
-  version = "1.6.1";
+  version = "1.6.2";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "LibreTranslate";
    repo = "LibreTranslate";
    rev = "refs/tags/v${version}";
-    hash = "sha256-c/MbO8KST2QnP32Y2FfXjJcfh6O7hqQFcZOn1U0FqRM=";
+    hash = "sha256-u0m9dTxwSGU50YplV24daSO+WY/At648OpIEZYMmqqo=";
  };

  build-system = [
--- a/pkgs/development/python-modules/limits/default.nix
+++ b/pkgs/development/python-modules/limits/default.nix
@ -90,6 +90,12 @@ buildPythonPackage rec {
    async-etcd = [ aetcd ];
  };

+  env = {
+    # make protobuf compatible with old versions
+    # https://developers.google.com/protocol-buffers/docs/news/2022-05-06#python-updates
+    PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python";
+  };
+
  doCheck = pythonOlder "3.12"; # SystemError in protobuf

  nativeCheckInputs = [
--- a/pkgs/development/python-modules/nutpie/default.nix
+++ b/pkgs/development/python-modules/nutpie/default.nix
@ -0,0 +1,98 @@
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchFromGitHub,
+  rustPlatform,
+
+  # build-system
+  cargo,
+  rustc,
+
+  # buildInputs
+  libiconv,
+
+  # dependencies
+  arviz,
+  pandas,
+  pyarrow,
+  xarray,
+
+  # tests
+  # bridgestan, (not packaged)
+  jax,
+  jaxlib,
+  numba,
+  pymc,
+  pytestCheckHook,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "nutpie";
+  version = "0.13.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "pymc-devs";
+    repo = "nutpie";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-XyUMCnHm5V7oFaf3W+nGpcHfq1ZFppeGMIMCU5OB87s=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoTarball {
+    inherit src;
+    name = "${pname}-${version}";
+    hash = "sha256-9lM1S42Bmnlb0opstZN2aOKYhBnP87Frq+fQxk0ez+c=";
+  };
+
+  build-system = [
+    cargo
+    rustPlatform.bindgenHook
+    rustPlatform.cargoSetupHook
+    rustPlatform.maturinBuildHook
+    rustc
+  ];
+
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];
+
+  dependencies = [
+    arviz
+    pandas
+    pyarrow
+    xarray
+  ];
+
+  pythonImportsCheck = [ "nutpie" ];
+
+  nativeCheckInputs = [
+    # bridgestan
+    numba
+    jax
+    jaxlib
+    pymc
+    pytestCheckHook
+    setuptools
+  ];
+
+  disabledTestPaths = [
+    # Require unpackaged bridgestan
+    "tests/test_stan.py"
+
+    # KeyError: "duplicate registration for <class 'numba.core.types.misc.SliceType'>"
+    "tests/test_pymc.py"
+  ];
+
+  # Currently, no test are working...
+  doCheck = false;
+
+  meta = {
+    description = "Python wrapper for nuts-rs";
+    homepage = "https://github.com/pymc-devs/nutpie";
+    changelog = "https://github.com/pymc-devs/nutpie/blob/${src.rev}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
--- a/pkgs/development/python-modules/open-clip-torch/default.nix
+++ b/pkgs/development/python-modules/open-clip-torch/default.nix
@ -29,14 +29,14 @@
 }:
 buildPythonPackage rec {
  pname = "open-clip-torch";
-  version = "2.28.0";
+  version = "2.29.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "mlfoundations";
    repo = "open_clip";
    rev = "refs/tags/v${version}";
-    hash = "sha256-wHqSADiKlRyJXf3CCrXlSj6tpVVSdO8GVsKInl+OMrc=";
+    hash = "sha256-X5nOWdGhIv+HiiauIezIkPh3G1Odtxr0HPygRp/D184=";
  };

  build-system = [ pdm-backend ];
--- a/pkgs/development/python-modules/opencv-python-headless/default.nix
+++ b/pkgs/development/python-modules/opencv-python-headless/default.nix
@ -0,0 +1,14 @@
+{
+  mkPythonMetaPackage,
+  opencv4,
+}:
+
+mkPythonMetaPackage {
+  pname = "opencv-python-headless";
+  inherit (opencv4) version;
+  dependencies = [ opencv4 ];
+  optional-dependencies = opencv4.optional-dependencies or { };
+  meta = {
+    inherit (opencv4.meta) description homepage;
+  };
+}
--- a/pkgs/development/python-modules/packageurl-python/default.nix
+++ b/pkgs/development/python-modules/packageurl-python/default.nix
@ -9,15 +9,15 @@

 buildPythonPackage rec {
  pname = "packageurl-python";
-  version = "0.15.6";
+  version = "0.16.0";
  pyproject = true;

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

  src = fetchPypi {
    pname = "packageurl_python";
    inherit version;
-    hash = "sha256-y8ia/RXV9NBdtPG2EpfluXpD9h8oeZ9tKCr/Rn7S7pY=";
+    hash = "sha256-aeO/ijky/pwkAPVqrrn4aRHs7i+TmNvhtY7DQ0C+Nl0=";
  };

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

 buildPythonPackage rec {
  pname = "plaid-python";
-  version = "24.0.0";
+  version = "27.0.0";
  pyproject = true;

  disabled = pythonOlder "3.6";
@ -19,7 +19,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "plaid_python";
    inherit version;
-    hash = "sha256-0LtYs2S1fGunmmPFl3cGa/lMtE7Ng+Xb4FruowjdWGM=";
+    hash = "sha256-nMDAJs9W2L3/wB7lOP5hMYF0ytqMVgDLOYzn9UsUVEw=";
  };

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

 buildPythonPackage rec {
  pname = "psd-tools";
-  version = "1.10.0";
+  version = "1.10.2";
  pyproject = true;

  disabled = pythonOlder "3.7";
@ -28,7 +28,7 @@ buildPythonPackage rec {
    owner = "psd-tools";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-H3Szd8/NjXCkWyG/q+6O5L0Iq5u/g4UNdEmhDqQsAY8=";
+    hash = "sha256-vBDFKWNksF8/h5Jp1VOxVWgAzPdOLhv0iDrNDVXzm54=";
  };

  build-system = [
--- a/Show More
+++ b/Show More