Merge master into staging-next

2025-06-04 06:06:10 +00:00 · 2025-06-04 06:06:10 +00:00 · 68cbd06ed0
commit 68cbd06ed0
parent 2c9e477cff 8e10b6becd
108 changed files with 1455 additions and 860 deletions
--- a/doc/build-helpers/testers.chapter.md
+++ b/doc/build-helpers/testers.chapter.md
@ -40,6 +40,26 @@ If the `moduleNames` argument is omitted, `hasPkgConfigModules` will use `meta.p

 :::

+## `hasCmakeConfigModules` {#tester-hasCmakeConfigModules}
+
+Checks whether a package exposes a given list of `*config.cmake` modules.
+Note the moduleNames used in cmake find_package are case sensitive.
+
+:::{.example #ex-hascmakeconfigmodules}
+
+# Check that `*config.cmake` modules are exposed using explicit module names
+
+```nix
+{
+  passthru.tests.cmake-config = testers.hasCmakeConfigModules {
+    package = finalAttrs.finalPackage;
+    moduleNames = [ "Foo" ];
+  };
+}
+```
+
+:::
+
 ## `lycheeLinkCheck` {#tester-lycheeLinkCheck}

 Check a packaged static site's links with the [`lychee` package](https://search.nixos.org/packages?show=lychee&type=packages&query=lychee).
--- a/doc/redirects.json
+++ b/doc/redirects.json
@ -1709,6 +1709,12 @@
  "ex-haspkgconfigmodules-explicitmodules": [
    "index.html#ex-haspkgconfigmodules-explicitmodules"
  ],
+  "tester-hasCmakeConfigModules": [
+    "index.html#tester-hasCmakeConfigModules"
+  ],
+  "ex-hascmakeconfigmodules": [
+    "index.html#ex-hascmakeconfigmodules"
+  ],
  "tester-lycheeLinkCheck": [
    "index.html#tester-lycheeLinkCheck"
  ],
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -17895,6 +17895,12 @@
    githubId = 810877;
    name = "Tom Doggett";
  };
+  noiioiu = {
+    github = "noiioiu";
+    githubId = 151288161;
+    name = "noiioiu";
+    keys = [ { fingerprint = "99CC 06D6 1456 3689 CE75  58F3 BF51 F00D 0748 2A89"; } ];
+  };
  noisersup = {
    email = "patryk@kwiatek.xyz";
    github = "noisersup";
--- a/nixos/modules/programs/yazi.nix
+++ b/nixos/modules/programs/yazi.nix
@ -76,7 +76,7 @@ in
      example = lib.literalExpression ''
        {
          foo = ./foo;
-          bar = pkgs.bar;
+          inherit (pkgs.yaziPlugins) bar;
        }
      '';
    };
@ -97,7 +97,7 @@ in
      example = lib.literalExpression ''
        {
          foo = ./foo;
-          bar = pkgs.bar;
+          inherit (pkgs.yaziPlugins) bar;
        }
      '';
    };
--- a/nixos/tests/tracee.nix
+++ b/nixos/tests/tracee.nix
@ -20,13 +20,15 @@ import ./make-test-python.nix (
          # Test_EventFilters/trace_only_events_from_"dockerd"_binary_and_contain_it's_pid
          # require docker/dockerd
          virtualisation.docker.enable = true;
-
-          environment.systemPackages = with pkgs; [
-            # required by Test_EventFilters/trace_events_from_ls_and_which_binary_in_separate_scopes
-            which
-            # the go integration tests as a binary
-            tracee.passthru.tests.integration-test-cli
-          ];
+          environment = {
+            variables.PATH = "/tmp/testdir";
+            systemPackages = with pkgs; [
+              # 'ls', 'uname' and 'who' are required by many tests in event_filters_test.go
+              coreutils
+              # the go integration tests as a binary
+              tracee.passthru.tests.integration-test-cli
+            ];
+          };
        };
    };

@ -38,11 +40,18 @@ import ./make-test-python.nix (
          # the policies and run tracee myself but doesn't work in the integration
          # test either with the automatic run or running the commands by hand
          # while it's searching.
-          "Test_EventFilters/comm:_event:_args:_trace_event_set_in_a_specific_policy_with_args_from_ls_command"
+          "Test_EventFilters/comm:_event:_data:_trace_event_magic_write_set_in_multiple_policies_using_multiple_filter_types"
+          "Test_EventFilters/comm:_event:_data:_trace_event_security_file_open_and_magic_write_using_multiple_filter_types"
+          "Test_EventFilters/comm:_event:_data:_trace_event_security_file_open_and_magic_write_using_multiple_filter_types_combined"
+          "Test_EventFilters/comm:_event:_data:_trace_event_security_file_open_set_in_multiple_policies_\\(with_and_without_in-kernel_filter\\)"
+          "Test_EventFilters/comm:_event:_data:_trace_event_security_file_open_set_in_multiple_policies_using_multiple_filter_types"
+          "Test_EventFilters/comm:_event:_data:_trace_event_set_in_a_specific_policy_with_data_from_ls_command"
          "Test_EventFilters/comm:_event:_trace_events_set_in_two_specific_policies_from_ls_and_uname_commands"
-
-          # worked at some point, seems to be flakey
-          "Test_EventFilters/pid:_event:_args:_trace_event_sched_switch_with_args_from_pid_0"
+          "Test_EventFilters/pid:_event:_data:_trace_event_sched_switch_with_data_from_pid_0"
+          "Test_EventsDependencies/non_existing_ksymbol_dependency_with_sanity"
+          "Test_EventsDependencies/non_existing_probe_function_with_sanity"
+          "Test_EventsDependencies/sanity_of_exec_test_event"
+          "Test_TraceeCapture/capture_packet_context"
        ];
      in
      ''
@ -61,11 +70,11 @@ import ./make-test-python.nix (
          )

        with subtest("run integration tests"):
-          # Test_EventFilters/trace_event_set_in_a_specific_scope expects to be in a dir that includes "integration"
+          # Test_EventFilters/comm:_event:_data:_trace_event_set_in_a_specific_policy_with_data_from_ls_command expects to be in a dir that includes "integration"
          # tests must be ran with 1 process
          print(machine.succeed(
            'mkdir /tmp/integration',
-            'cd /tmp/integration && export PATH="/tmp/testdir:$PATH" && integration.test -test.v -test.parallel 1 -test.skip="^${builtins.concatStringsSep "$|^" skippedTests}$"'
+            'cd /tmp/integration && integration.test -test.v -test.parallel 1 -test.skip="^${builtins.concatStringsSep "$|^" skippedTests}$"'
          ))
      '';
  }
--- a/pkgs/applications/audio/librespot/default.nix
+++ b/pkgs/applications/audio/librespot/default.nix
@ -15,6 +15,8 @@
  libpulseaudio,
  withRodio ? true,
  withAvahi ? false,
+  withMDNS ? true,
+  withDNS-SD ? false,
  avahi-compat,
 }:

@ -44,13 +46,15 @@ rustPlatform.buildRustPackage rec {
  buildInputs =
    [ openssl ]
    ++ lib.optional withALSA alsa-lib
-    ++ lib.optional withAvahi avahi-compat
+    ++ lib.optional withDNS-SD avahi-compat
    ++ lib.optional withPortAudio portaudio
    ++ lib.optional withPulseAudio libpulseaudio;

  buildNoDefaultFeatures = true;
  buildFeatures =
    lib.optional withRodio "rodio-backend"
+    ++ lib.optional withMDNS "with-libmdns"
+    ++ lib.optional withDNS-SD "with-dns-sd"
    ++ lib.optional withALSA "alsa-backend"
    ++ lib.optional withAvahi "with-avahi"
    ++ lib.optional withPortAudio "portaudio-backend"
--- a/pkgs/applications/audio/mopidy/mopidy.nix
+++ b/pkgs/applications/audio/mopidy/mopidy.nix
@ -24,30 +24,32 @@ pythonPackages.buildPythonApplication rec {

  nativeBuildInputs = [ wrapGAppsNoGuiHook ];

-  buildInputs = with gst_all_1; [
-    glib-networking
-    gst-plugins-bad
-    gst-plugins-base
-    gst-plugins-good
-    gst-plugins-ugly
-    # Required patches for the Spotify plugin (https://github.com/mopidy/mopidy-spotify/releases/tag/v5.0.0a3)
-    (gst-plugins-rs.overrideAttrs (
-      newAttrs: oldAttrs: {
-        cargoDeps = oldAttrs.cargoDeps.overrideAttrs (oldAttrs': {
-          vendorStaging = oldAttrs'.vendorStaging.overrideAttrs {
-            inherit (newAttrs) patches;
-            outputHash = "sha256-urRYH5N1laBq1/SUEmwFKAtsHAC+KWYfYp+fmb7Ey7s=";
-          };
-        });
+  buildInputs =
+    with gst_all_1;
+    [
+      glib-networking
+      gst-plugins-bad
+      gst-plugins-base
+      gst-plugins-good
+      gst-plugins-ugly
+      # Required patches for the Spotify plugin (https://github.com/mopidy/mopidy-spotify/releases/tag/v5.0.0a3)
+      (gst-plugins-rs.overrideAttrs (
+        newAttrs: oldAttrs: {
+          cargoDeps = oldAttrs.cargoDeps.overrideAttrs (oldAttrs': {
+            vendorStaging = oldAttrs'.vendorStaging.overrideAttrs {
+              inherit (newAttrs) patches;
+              outputHash = "sha256-urRYH5N1laBq1/SUEmwFKAtsHAC+KWYfYp+fmb7Ey7s=";
+            };
+          });

-        # https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1801/
-        patches = oldAttrs.patches or [ ] ++ [
-          ./spotify-access-token-auth.patch
-        ];
-      }
-    ))
-    pipewire
-  ];
+          # https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1801/
+          patches = oldAttrs.patches or [ ] ++ [
+            ./spotify-access-token-auth.patch
+          ];
+        }
+      ))
+    ]
+    ++ lib.optional (!stdenv.hostPlatform.isDarwin) pipewire;

  propagatedBuildInputs =
    [ gobject-introspection ]
@ -73,12 +75,12 @@ pythonPackages.buildPythonApplication rec {
    inherit (nixosTests) mopidy;
  };

-  meta = with lib; {
+  meta = {
    homepage = "https://www.mopidy.com/";
    description = "Extensible music server that plays music from local disk, Spotify, SoundCloud, and more";
    mainProgram = "mopidy";
-    license = licenses.asl20;
-    maintainers = [ maintainers.fpletz ];
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.fpletz ];
    hydraPlatforms = [ ];
  };
 }
--- a/pkgs/applications/audio/mopidy/tidal.nix
+++ b/pkgs/applications/audio/mopidy/tidal.nix
@ -1,20 +1,25 @@
 {
  lib,
  python3Packages,
-  fetchPypi,
+  fetchFromGitHub,
  mopidy,
 }:

 python3Packages.buildPythonApplication rec {
  pname = "Mopidy-Tidal";
-  version = "0.3.2";
+  version = "0.3.9";
+  pyproject = true;

-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-ekqhzKyU2WqTOeRR1ZSZA9yW3UXsLBsC2Bk6FZrQgmc=";
+  src = fetchFromGitHub {
+    owner = "tehkillerbee";
+    repo = "mopidy-tidal";
+    rev = "v${version}";
+    hash = "sha256-RFhuxsb6nQPYxkaeAEABQdCwjbmnOw5pnmYnx6gNCcg=";
  };

-  propagatedBuildInputs = [
+  build-system = [ python3Packages.poetry-core ];
+
+  dependencies = [
    mopidy
    python3Packages.tidalapi
  ];
@ -26,10 +31,11 @@ python3Packages.buildPythonApplication rec {

  pytestFlagsArray = [ "tests/" ];

-  meta = with lib; {
+  meta = {
    description = "Mopidy extension for playing music from Tidal";
    homepage = "https://github.com/tehkillerbee/mopidy-tidal";
-    license = licenses.mit;
+    changelog = "https://github.com/tehkillerbee/mopidy-tidal/releases/tag/v${version}";
+    license = lib.licenses.mit;
    maintainers = [ ];
  };
 }
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@ -2449,8 +2449,8 @@ let
        mktplcRef = {
          name = "vscode-vibrancy-continued";
          publisher = "illixion";
-          version = "1.1.52";
-          hash = "sha256-biSWnICmVPTf/zounQd6IfIPBMVDQzXjcCTgp5J00nA=";
+          version = "1.1.53";
+          hash = "sha256-6yhyGMX1U9clMNkcQRjNfa+HpLvWVI1WvhTUyn4g3ZY=";
        };
        meta = {
          downloadPage = "https://marketplace.visualstudio.com/items?itemName=illixion.vscode-vibrancy-continued";
--- a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix
@ -14,19 +14,19 @@ let
    {
      x86_64-linux = {
        arch = "linux-x64";
-        hash = "sha256-130QnFYclUmvlqWZ62g8/rMZsJF43heXi9thp+RHfLo=";
+        hash = "sha256-pEmDg//DyZvSiJdvqlNH7kuK6Dz3w2tpeAPpUTVCraI=";
      };
      aarch64-linux = {
        arch = "linux-arm64";
-        hash = "sha256-K+ZfHzxOwp4lTC0929am/KOs8RdVk5MXGP8JTYP7pX4=";
+        hash = "sha256-Vh7VkYH93wVS+WzGsGZ/w+DzbE5Z4y4KFl2SvmAgcVI=";
      };
      x86_64-darwin = {
        arch = "darwin-x64";
-        hash = "sha256-H4N/nKWwv9IdQkjHeb1Q5VXoNguWXHZkB0s3MCfG17Y=";
+        hash = "sha256-Lmru00/I43IP9Wf3wtXsnh5rlzWPdvMtNImJzN5ELsg=";
      };
      aarch64-darwin = {
        arch = "darwin-arm64";
-        hash = "sha256-WyO18JIs3FCfcHh6p9YvrCk9SX/vSHQM2uI+AL9zFbo=";
+        hash = "sha256-lh7YX65p/88GeAHAAGHovektYci3sXrXgdSyXJwfUF4=";
      };
    }
    .${system} or (throw "Unsupported system: ${system}");
@ -38,7 +38,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
    # Please update the corresponding binary (typos-lsp)
    # when updating this extension.
    # See pkgs/by-name/ty/typos-lsp/package.nix
-    version = "0.1.37";
+    version = "0.1.38";
    inherit (extInfo) hash arch;
  };

--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/qt-6.9.patch
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/qt-6.9.patch
@ -1,44 +0,0 @@
-diff --git a/Telegram/SourceFiles/media/view/media_view_pip.cpp b/Telegram/SourceFiles/media/view/media_view_pip.cpp
-index 4e1d7c136..7c8f95888 100644
--- a/Telegram/SourceFiles/media/view/media_view_pip.cpp
-+++ b/Telegram/SourceFiles/media/view/media_view_pip.cpp
-@@ -362,6 +362,10 @@ void PipPanel::init() {
- 	) | rpl::filter(rpl::mappers::_1) | rpl::start_with_next([=] {
- 		// Workaround Qt's forced transient parent.
- 		Ui::Platform::ClearTransientParent(widget());
-+	}, rp()->lifetime());
-+
-+	rp()->shownValue(
-+	) | rpl::filter(rpl::mappers::_1) | rpl::start_with_next([=] {
- 		Ui::Platform::SetWindowMargins(widget(), _padding);
- 	}, rp()->lifetime());
- 
-Submodule Telegram/lib_base contains modified content
-diff --git a/Telegram/lib_base/base/platform/linux/base_linux_xdp_utilities.cpp b/Telegram/lib_base/base/platform/linux/base_linux_xdp_utilities.cpp
-index 8aca67c..6b781fb 100644
--- a/Telegram/lib_base/base/platform/linux/base_linux_xdp_utilities.cpp
-+++ b/Telegram/lib_base/base/platform/linux/base_linux_xdp_utilities.cpp
-@@ -16,7 +16,11 @@
- #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
- #include <qpa/qplatformintegration.h>
- #include <private/qguiapplication_p.h>
-+#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
-+#include <private/qdesktopunixservices_p.h>
-+#else // Qt >= 6.9.0
- #include <private/qgenericunixservices_p.h>
-+#endif // Qt < 6.9.0
- #endif // Qt >= 6.5.0
- 
- #include <sstream>
-@@ -39,7 +43,10 @@ std::string ParentWindowID(QWindow *window) {
- 	}
- 
- #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
-	if (const auto services = dynamic_cast<QGenericUnixServices*>(
-+#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
-+	using QDesktopUnixServices = QGenericUnixServices;
-+#endif // Qt < 6.9.0
-+	if (const auto services = dynamic_cast<QDesktopUnixServices*>(
- 			QGuiApplicationPrivate::platformIntegration()->services())) {
- 		return services->portalWindowIdentifier(window).toStdString();
- 	}
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
@ -8,6 +8,7 @@
  ninja,
  clang,
  python3,
+  tdlib,
  tg_owt ? callPackage ./tg_owt.nix { inherit stdenv; },
  qtbase,
  qtimageformats,
@ -46,24 +47,16 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "telegram-desktop-unwrapped";
-  version = "5.13.1";
+  version = "5.14.3";

  src = fetchFromGitHub {
    owner = "telegramdesktop";
    repo = "tdesktop";
    rev = "v${finalAttrs.version}";
    fetchSubmodules = true;
-    hash = "sha256-E9d5jWw4HeCO4sqDB0tXXgxM91kg1Gixi9B0xZQYe14=";
+    hash = "sha256-nNYQpWbBK+E/LAbwTWpNUhs2+wb8iuMfqkxJKjaFmhg=";
  };

-  # Combined backport to fix Qt 6.9 issues:
-  # - https://github.com/telegramdesktop/tdesktop/commit/8b92ab25c776899c5432bf935447cac6f0b3ea2d
-  # - https://github.com/telegramdesktop/tdesktop/commit/c261c3367a11eeef69e6e346d339706dc4f00406
-  # FIXME: remove in next update
-  patches = [
-    ./qt-6.9.patch
-  ];
-
  postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
    substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp \
      --replace-fail '"libasound.so.2"' '"${lib.getLib alsa-lib}/lib/libasound.so.2"'
@ -104,6 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
      microsoft-gsl
      boost
      ada
+      (tdlib.override { tde2eOnly = true; })
    ]
    ++ lib.optionals stdenv.hostPlatform.isLinux [
      protobuf
--- a/pkgs/applications/version-management/gitlab-triage/Gemfile
+++ b/pkgs/applications/version-management/gitlab-triage/Gemfile
@ -1,3 +1,6 @@
 source 'https://rubygems.org' do
  gem 'gitlab-triage'
+  # Extra dependencies
+  gem 'csv'
+  gem 'racc'
 end
--- a/pkgs/applications/version-management/gitlab-triage/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab-triage/Gemfile.lock
@ -4,42 +4,66 @@ GEM
 GEM
  remote: https://rubygems.org/
  specs:
-    activesupport (7.0.3)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activesupport (8.0.2)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
      i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    concurrent-ruby (1.1.10)
-    gitlab-triage (1.23.1)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
+    base64 (0.2.0)
+    benchmark (0.4.0)
+    bigdecimal (3.2.0)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.3)
+    csv (3.3.4)
+    drb (2.2.3)
+    gitlab-triage (1.44.5)
      activesupport (>= 5.1)
-      globalid (~> 0.4)
+      globalid (~> 1.0, >= 1.0.1)
+      graphql (< 2.1.0)
      graphql-client (~> 0.16)
-      httparty (~> 0.17)
-    globalid (0.6.0)
-      activesupport (>= 5.0)
-    graphql (2.0.11)
-    graphql-client (0.18.0)
+      httparty (~> 0.20.0)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
+    graphql (2.0.32)
+      base64
+    graphql-client (0.25.0)
      activesupport (>= 3.0)
-      graphql
+      graphql (>= 1.13.0)
    httparty (0.20.0)
      mime-types (~> 3.0)
      multi_xml (>= 0.5.2)
-    i18n (1.10.0)
+    i18n (1.14.7)
      concurrent-ruby (~> 1.0)
-    mime-types (3.4.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2022.0105)
-    minitest (5.16.2)
-    multi_xml (0.6.0)
-    tzinfo (2.0.4)
+    logger (1.7.0)
+    mime-types (3.7.0)
+      logger
+      mime-types-data (~> 3.2025, >= 3.2025.0507)
+    mime-types-data (3.2025.0527)
+    minitest (5.25.5)
+    multi_xml (0.7.2)
+      bigdecimal (~> 3.1)
+    racc (1.8.1)
+    securerandom (0.4.1)
+    tzinfo (2.0.6)
      concurrent-ruby (~> 1.0)
+    uri (1.0.3)

 PLATFORMS
  ruby
  x86_64-linux

 DEPENDENCIES
+  csv!
  gitlab-triage!
+  racc!

 BUNDLED WITH
-   2.3.9
+   2.6.6
--- a/pkgs/applications/version-management/gitlab-triage/default.nix
+++ b/pkgs/applications/version-management/gitlab-triage/default.nix
@ -13,7 +13,7 @@ bundlerApp {

  meta = with lib; {
    description = "GitLab's issues and merge requests triage, automated!";
-    homepage = "https://gitlab.com/gitlab-org/gitlab-triage";
+    homepage = "https://gitlab.com/gitlab-org/ruby/gems/gitlab-triage";
    license = licenses.mit;
    maintainers = [ ];
    mainProgram = "gitlab-triage";
--- a/pkgs/applications/version-management/gitlab-triage/gemset.nix
+++ b/pkgs/applications/version-management/gitlab-triage/gemset.nix
@ -1,34 +1,103 @@
 {
  activesupport = {
    dependencies = [
+      "base64"
+      "benchmark"
+      "bigdecimal"
      "concurrent-ruby"
+      "connection_pool"
+      "drb"
      "i18n"
+      "logger"
      "minitest"
+      "securerandom"
      "tzinfo"
+      "uri"
    ];
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0z05zyc57f8ywvdvls6nx93vrhyyzzpgz729mwampz1qb8vvcspj";
+      sha256 = "0pm40y64wfc50a9sj87kxvil2102rmpdcbv82zf0r40vlgdwsrc5";
      type = "gem";
    };
-    version = "7.0.3";
+    version = "8.0.2";
+  };
+  base64 = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g";
+      type = "gem";
+    };
+    version = "0.2.0";
+  };
+  benchmark = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg";
+      type = "gem";
+    };
+    version = "0.4.0";
+  };
+  bigdecimal = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0qh7m151nyl3x3f467smrnpvkyinwjz96cdj5vh092yr0x7c687j";
+      type = "gem";
+    };
+    version = "3.2.0";
  };
  concurrent-ruby = {
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14";
+      sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1";
      type = "gem";
    };
-    version = "1.1.10";
+    version = "1.3.5";
+  };
+  connection_pool = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0nrhsk7b3sjqbyl1cah6ibf1kvi3v93a7wf4637d355hp614mmyg";
+      type = "gem";
+    };
+    version = "2.5.3";
+  };
+  csv = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1kfqg0m6vqs6c67296f10cr07im5mffj90k2b5dsm51liidcsvp9";
+      type = "gem";
+    };
+    version = "3.3.4";
+  };
+  drb = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0wrkl7yiix268s2md1h6wh91311w95ikd8fy8m5gx589npyxc00b";
+      type = "gem";
+    };
+    version = "2.2.3";
  };
  gitlab-triage = {
    dependencies = [
      "activesupport"
      "globalid"
+      "graphql"
      "graphql-client"
      "httparty"
    ];
@ -36,10 +105,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1vs120wyqm12xy66nv0723cy3m66g5lhhdd37izbc9qwyq03m729";
+      sha256 = "0ya6ynljc05z4qzw6w8x9djf31ai4awp5w6xz1m9x4ks6qg1x8kw";
      type = "gem";
    };
-    version = "1.23.1";
+    version = "1.44.5";
  };
  globalid = {
    dependencies = [ "activesupport" ];
@ -47,20 +116,21 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1xk28839pi36yzlqgh7k5wqmiphz7wg2c2r2wzfvs2s7g63hy3nv";
+      sha256 = "1sbw6b66r7cwdx3jhs46s4lr991969hvigkjpbdl7y3i31qpdgvh";
      type = "gem";
    };
-    version = "0.6.0";
+    version = "1.2.1";
  };
  graphql = {
+    dependencies = [ "base64" ];
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "18k3wh73mb7rs469wfn4m10d1rlg2v9chd89nf7vy8z3yjbf9nl4";
+      sha256 = "1m21l38fw11hq5ihns8pzydv7c584kdxh6s1rya98z2zzqrirshf";
      type = "gem";
    };
-    version = "2.0.11";
+    version = "2.0.32";
  };
  graphql-client = {
    dependencies = [
@ -71,10 +141,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "02r5qvfr176n051mp1c79xbpjhjqm92kk4118r0fbp131y0xralq";
+      sha256 = "1xajv9r03xdn0s382xnwiwnwpy4q443bigdx3l7kczdv95bc8rly";
      type = "gem";
    };
-    version = "0.18.0";
+    version = "0.25.0";
  };
  httparty = {
    dependencies = [
@ -96,51 +166,85 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg";
+      sha256 = "03sx3ahz1v5kbqjwxj48msw3maplpp2iyzs22l4jrzrqh4zmgfnf";
      type = "gem";
    };
-    version = "1.10.0";
+    version = "1.14.7";
  };
-  mime-types = {
-    dependencies = [ "mime-types-data" ];
+  logger = {
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb";
+      sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr";
      type = "gem";
    };
-    version = "3.4.1";
+    version = "1.7.0";
+  };
+  mime-types = {
+    dependencies = [
+      "logger"
+      "mime-types-data"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0mjyxl7c0xzyqdqa8r45hqg7jcw2prp3hkp39mdf223g4hfgdsyw";
+      type = "gem";
+    };
+    version = "3.7.0";
  };
  mime-types-data = {
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q";
+      sha256 = "00ks975j562zlcjg95g5qlzdc7mrc71byg8ln1fyl9yv1iw8v00i";
      type = "gem";
    };
-    version = "3.2022.0105";
+    version = "3.2025.0527";
  };
  minitest = {
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "14a9ign0hj3z3j4cpfplj2djaskx3skzyx4fl3x53d7saxmhrgn1";
+      sha256 = "0mn7q9yzrwinvfvkyjiz548a4rmcwbmz2fn9nyzh4j1snin6q6rr";
      type = "gem";
    };
-    version = "5.16.2";
+    version = "5.25.5";
  };
  multi_xml = {
+    dependencies = [ "bigdecimal" ];
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0lmd4f401mvravi1i1yq7b2qjjli0yq7dfc4p1nj5nwajp7r6hyj";
+      sha256 = "1kl7ax7zcj8czlxs6vn3kdhpnz1dwva4y5zwnavssfv193f9cyih";
      type = "gem";
    };
-    version = "0.6.0";
+    version = "0.7.2";
+  };
+  racc = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa";
+      type = "gem";
+    };
+    version = "1.8.1";
+  };
+  securerandom = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1cd0iriqfsf1z91qg271sm88xjnfd92b832z49p1nd542ka96lfc";
+      type = "gem";
+    };
+    version = "0.4.1";
  };
  tzinfo = {
    dependencies = [ "concurrent-ruby" ];
@ -148,9 +252,19 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z";
+      sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd";
      type = "gem";
    };
-    version = "2.0.4";
+    version = "2.0.6";
+  };
+  uri = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "04bhfvc25b07jaiaf62yrach7khhr5jlr5bx6nygg8pf11329wp9";
+      type = "gem";
+    };
+    version = "1.0.3";
  };
 }
--- a/pkgs/build-support/testers/default.nix
+++ b/pkgs/build-support/testers/default.nix
@ -225,6 +225,8 @@
      );
  hasPkgConfigModules = callPackage ./hasPkgConfigModules/tester.nix { };

+  hasCmakeConfigModules = callPackage ./hasCmakeConfigModules/tester.nix { };
+
  testMetaPkgConfig = callPackage ./testMetaPkgConfig/tester.nix { };

  shellcheck = callPackage ./shellcheck/tester.nix { };
--- a/pkgs/build-support/testers/hasCmakeConfigModules/tester.nix
+++ b/pkgs/build-support/testers/hasCmakeConfigModules/tester.nix
@ -0,0 +1,86 @@
+# Static arguments
+{
+  lib,
+  runCommandCC,
+  cmake,
+}:
+
+# Tester arguments
+{
+  package,
+  moduleNames,
+  # Extra nativeBuildInputs needed to pass the cmake find_package test, e.g. pkg-config.
+  nativeBuildInputs ? [ ],
+  # buildInputs is used to help pass the cmake find_package test.
+  # The purpose of buildInputs here is to allow us to iteratively add
+  # any missing dependencies required by the *Config.cmake module
+  # during testing. This allows us to test and fix the CMake setup
+  # without rebuilding the finalPackage each time. Once all required
+  # packages are properly added to the finalPackage's propagateBuildInputs,
+  # this buildInputs should be set to an empty list [].
+  buildInputs ? [ ],
+  # Extra cmakeFlags needed to pass the cmake find_package test.
+  # Can be used to set verbose/debug flags.
+  cmakeFlags ? [ ],
+  testName ? "check-cmake-config-${package.pname or package.name}",
+  version ? package.version or null,
+  versionCheck ? false,
+}:
+
+runCommandCC testName
+  {
+    inherit moduleNames versionCheck cmakeFlags;
+    version = if versionCheck then version else null;
+    nativeBuildInputs = [
+      cmake
+    ] ++ nativeBuildInputs;
+    buildInputs = [ package ] ++ buildInputs;
+    meta =
+      {
+        description = "Test whether ${package.name} exposes cmake-config modules ${lib.concatStringsSep ", " moduleNames}";
+      }
+      # Make sure licensing info etc is preserved, as this is a concern for e.g. cache.nixos.org,
+      # as hydra can't check this meta info in dependencies.
+      # The test itself is just Nixpkgs, with MIT license.
+      // builtins.intersectAttrs {
+        available = throw "unused";
+        broken = throw "unused";
+        insecure = throw "unused";
+        license = throw "unused";
+        maintainers = throw "unused";
+        teams = throw "unused";
+        platforms = throw "unused";
+        unfree = throw "unused";
+        unsupported = throw "unused";
+      } package.meta;
+  }
+  ''
+    touch "$out"
+    notFound=0
+    for moduleName in $moduleNames; do
+      echo "checking cmake-config module $moduleName"
+
+      cat <<EOF > CMakeLists.txt
+    cmake_minimum_required(VERSION 3.14)
+    project(CheckCmakeModule)
+
+    find_package($moduleName $version EXACT NO_MODULE REQUIRED)
+    EOF
+
+      echoCmd 'cmake flags' $cmakeFlags
+      set +e
+      cmake . $cmakeFlags
+      r=$?
+      set -e
+      if [[ $r = 0 ]]; then
+        echo "✅ cmake-config module $moduleName exists"
+      else
+        echo "❌ cmake-config module $moduleName was not found"
+        ((notFound+=1))
+      fi
+    done
+
+    if [[ $notFound -ne 0 ]]; then
+      exit 1
+    fi
+  ''
--- a/pkgs/build-support/testers/hasCmakeConfigModules/tests.nix
+++ b/pkgs/build-support/testers/hasCmakeConfigModules/tests.nix
@ -0,0 +1,73 @@
+# cd nixpkgs
+# nix-build -A tests.testers.hasCmakeConfigModules
+{
+  lib,
+  testers,
+  boost,
+  mpi,
+  eigen,
+  runCommand,
+}:
+
+lib.recurseIntoAttrs {
+
+  boost-versions-match = testers.hasCmakeConfigModules {
+    package = boost;
+    moduleNames = [
+      "Boost"
+      "boost_math"
+    ];
+    versionCheck = true;
+  };
+
+  boost-versions-mismatch = testers.testBuildFailure (
+    testers.hasCmakeConfigModules {
+      package = boost;
+      moduleNames = [
+        "Boost"
+        "boost_math"
+      ];
+      version = "1.2.3"; # Deliberately-incorrect version number
+      versionCheck = true;
+    }
+  );
+
+  boost-no-versionCheck = testers.hasCmakeConfigModules {
+    package = boost;
+    moduleNames = [
+      "Boost"
+      "boost_math"
+    ];
+    version = "1.2.3"; # Deliberately-incorrect version number
+    versionCheck = false;
+  };
+
+  boost-has-boost_mpi = testers.hasCmakeConfigModules {
+    package = boost.override { useMpi = true; };
+    moduleNames = [
+      "boost_mpi"
+    ];
+    buildInputs = [ mpi ];
+  };
+
+  boost_mpi-does-not-have-mpi = testers.testBuildFailure (
+    testers.hasCmakeConfigModules {
+      package = boost.override { useMpi = true; };
+      moduleNames = [
+        "boost_mpi"
+      ];
+    }
+  );
+
+  eigen-has-Eigen = testers.hasCmakeConfigModules {
+    package = eigen;
+    moduleNames = [ "Eigen3" ];
+  };
+
+  eigen-does-not-have-eigen = testers.testBuildFailure (
+    testers.hasCmakeConfigModules {
+      package = eigen;
+      moduleNames = [ "eigen3" ];
+    }
+  );
+}
--- a/pkgs/build-support/testers/test/default.nix
+++ b/pkgs/build-support/testers/test/default.nix
@ -37,6 +37,8 @@ lib.recurseIntoAttrs {

  hasPkgConfigModules = pkgs.callPackage ../hasPkgConfigModules/tests.nix { };

+  hasCmakeConfigModules = pkgs.callPackage ../hasCmakeConfigModules/tests.nix { };
+
  shellcheck = pkgs.callPackage ../shellcheck/tests.nix { };

  shfmt = pkgs.callPackages ../shfmt/tests.nix { };
--- a/pkgs/by-name/ad/adios2/package.nix
+++ b/pkgs/by-name/ad/adios2/package.nix
@ -11,7 +11,6 @@
  python3Packages,
  mpi,
  bzip2,
-  lz4,
  c-blosc2,
  hdf5-mpi,
  libfabric,
@ -22,8 +21,6 @@
  zeromq,
  zfp,
  zlib,
-  zlib-ng,
-  zstd,
  ucx,
  yaml-cpp,
  nlohmann_json,
@ -69,7 +66,6 @@ stdenv.mkDerivation (finalAttrs: {
    [
      mpi
      bzip2
-      lz4
      c-blosc2
      (hdf5-mpi.override { inherit mpi; })
      libfabric
@ -80,8 +76,6 @@ stdenv.mkDerivation (finalAttrs: {
      zeromq
      zfp
      zlib
-      zlib-ng # required by c-blocs2
-      zstd # required by c-blocs2
      yaml-cpp
      nlohmann_json

--- a/pkgs/by-name/al/algol68g/package.nix
+++ b/pkgs/by-name/al/algol68g/package.nix
@ -15,11 +15,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "algol68g";
-  version = "3.4.2";
+  version = "3.5.14";

  src = fetchurl {
    url = "https://jmvdveer.home.xs4all.nl/algol68g-${finalAttrs.version}.tar.gz";
-    hash = "sha256-hKiRMU98sZhGgHhjgtwUNSIv2iPgb4T+dgYw58IGK8Q=";
+    hash = "sha256-uIy8rIhUjohiQJ/K5EprsIISXMAx1w27I3cGo/9H9Wk=";
  };

  outputs = [
--- a/pkgs/by-name/al/altair/package.nix
+++ b/pkgs/by-name/al/altair/package.nix
@ -7,11 +7,11 @@

 let
  pname = "altair";
-  version = "8.2.3";
+  version = "8.2.5";

  src = fetchurl {
    url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage";
-    sha256 = "sha256-oOtQbTKD9UY+aXPqphGHeaXWxMI0/+9q82QaiQSXvwA=";
+    sha256 = "sha256-P0CVJFafrsvWzDWyJZEds812m3yUDpo4eocysEIQqrw=";
  };

  appimageContents = appimageTools.extract { inherit pname version src; };
--- a/pkgs/by-name/ar/art/package.nix
+++ b/pkgs/by-name/ar/art/package.nix
@ -1,7 +1,7 @@
 {
  lib,
  stdenv,
-  fetchFromBitbucket,
+  fetchFromGitHub,
  cmake,
  pkg-config,
  util-linux,
@ -40,13 +40,13 @@

 stdenv.mkDerivation rec {
  pname = "art";
-  version = "1.24.2";
+  version = "1.25.5";

-  src = fetchFromBitbucket {
-    owner = "agriggio";
-    repo = "art";
-    rev = version;
-    hash = "sha256-TpjmmDeXuxnlvCimsq6mZZk15VOVU3WGrPd3vmcIClI=";
+  src = fetchFromGitHub {
+    owner = "artpixls";
+    repo = "ART";
+    tag = version;
+    hash = "sha256-lKjYSKjZSJ9HtbmGWFR0bVv6hLnRzpklq2ueWirJ+Nw=";
  };

  nativeBuildInputs = [
@ -105,9 +105,9 @@ stdenv.mkDerivation rec {
  env.CXXFLAGS = "-include cstdint"; # needed at least with gcc13 on aarch64-linux

  meta = {
-    description = "A raw converter based on RawTherapee";
-    homepage = "https://bitbucket.org/agriggio/art/";
-    license = lib.licenses.gpl3Only;
+    description = "Raw converter based on RawTherapee";
+    homepage = "https://art.pixls.us";
+    license = lib.licenses.gpl3Plus;
    maintainers = with lib.maintainers; [ paperdigits ];
    mainProgram = "art";
    platforms = lib.platforms.linux;
--- a/pkgs/by-name/au/autopsy/package.nix
+++ b/pkgs/by-name/au/autopsy/package.nix
@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
    testdisk
    imagemagick
    jdkWithJfx
+    sleuthkit
  ];

  installPhase = ''
@ -44,9 +45,11 @@ stdenv.mkDerivation rec {
    # Run the provided setup script to make files executable and copy sleuthkit
    TSK_JAVA_LIB_PATH="${sleuthkit}/share/java" bash $out/unix_setup.sh -j '${jdkWithJfx}' -n autopsy

+    # --add-flags "--nosplash" -> https://github.com/sleuthkit/autopsy/issues/6980
    substituteInPlace $out/bin/autopsy \
      --replace-warn 'APPNAME=`basename "$PRG"`' 'APPNAME=autopsy'
    wrapProgram $out/bin/autopsy \
+      --add-flags "--nosplash" \
      --run 'export SOLR_LOGS_DIR="$HOME/.autopsy/dev/var/log"' \
      --run 'export SOLR_PID_DIR="$HOME/.autopsy/dev"' \
      --prefix PATH : "${
--- a/pkgs/by-name/ay/ayugram-desktop/package.nix
+++ b/pkgs/by-name/ay/ayugram-desktop/package.nix
@ -13,13 +13,13 @@ telegram-desktop.override {
  unwrapped = telegram-desktop.unwrapped.overrideAttrs (
    finalAttrs: previousAttrs: {
      pname = "ayugram-desktop-unwrapped";
-      version = "5.12.3";
+      version = "5.14.3";

      src = fetchFromGitHub {
        owner = "AyuGram";
        repo = "AyuGramDesktop";
        tag = "v${finalAttrs.version}";
-        hash = "sha256-Zjik+9J0YtabVW1VEkJr/Bl3SIakVQ8EiTLYm28rEIk=";
+        hash = "sha256-cirUnGtjEc8aQzXH0r5kVhobEqf63eoZ17Gg99e+FCQ=";
        fetchSubmodules = true;
      };

--- a/pkgs/by-name/az/azahar/package.nix
+++ b/pkgs/by-name/az/azahar/package.nix
@ -51,11 +51,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "azahar";
-  version = "2121.1";
+  version = "2121.2";

  src = fetchzip {
    url = "https://github.com/azahar-emu/azahar/releases/download/${finalAttrs.version}/azahar-unified-source-${finalAttrs.version}.tar.xz";
-    hash = "sha256-jadQsuU1SfvUc5DO5XqZXTe53U9XGOHScDGx66Oh18Q=";
+    hash = "sha256-zXkLew7tErPjygYIXPnimfZnekFMCzY+95TlW1DNQRc=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/bi/binaryninja-free/package.nix
+++ b/pkgs/by-name/bi/binaryninja-free/package.nix
@ -19,11 +19,11 @@
 }:
 stdenv.mkDerivation rec {
  pname = "binaryninja-free";
-  version = "5.0.7290";
+  version = "5.0.7486";

  src = fetchurl {
-    url = "https://web.archive.org/web/20250426133400/https://cdn.binary.ninja/installers/binaryninja_free_linux.zip";
-    hash = "sha256-Fzdv+454Ajj8IxmdcxvcDGePFsTmmyPpnfBXge4p8iU=";
+    url = "https://web.archive.org/web/20250526111956/https://cdn.binary.ninja/installers/binaryninja_free_linux.zip";
+    hash = "sha256-iZjIgokwnHJaY6OgrnDcto3Un5g42MqTWXKo6OL1Rcs=";
  };

  icon = fetchurl {
--- a/pkgs/by-name/bi/bitbox/package.nix
+++ b/pkgs/by-name/bi/bitbox/package.nix
@ -21,14 +21,14 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "bitbox";
-  version = "4.47.2";
+  version = "4.47.3";

  src = fetchFromGitHub {
    owner = "BitBoxSwiss";
    repo = "bitbox-wallet-app";
    rev = "v${version}";
    fetchSubmodules = true;
-    hash = "sha256-sRE+Nnb3oqiJEjqiyG+3/sZLp23nquw5+4VpbZVFCQ8=";
+    hash = "sha256-Rxlj9Xm78xI61ynOonokxii2jnemumWy6fX+82bDp+w=";
  };

  postPatch = ''
--- a/pkgs/by-name/ca/cargo-mobile2/package.nix
+++ b/pkgs/by-name/ca/cargo-mobile2/package.nix
@ -10,7 +10,7 @@

 let
  pname = "cargo-mobile2";
-  version = "0.20.0";
+  version = "0.20.1";
 in
 rustPlatform.buildRustPackage {
  inherit pname version;
@ -18,7 +18,7 @@ rustPlatform.buildRustPackage {
    owner = "tauri-apps";
    repo = "cargo-mobile2";
    rev = "cargo-mobile2-v${version}";
-    hash = "sha256-7/ol4Jb/2s007LeSMo6YYDT5vipsZZF6O4hfJ7ylHGg=";
+    hash = "sha256-gKqGmd34nNKMc3fl5lMH09oOGnmRaMDBwsbHhAeUMBc=";
  };

  # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at
@ -26,7 +26,7 @@ rustPlatform.buildRustPackage {
  # sourceRoot = "${src.name}/tooling/cli";

  useFetchCargoVendor = true;
-  cargoHash = "sha256-zSUT2zClpSlBDu6vgMv4TZn9Jp0Ych6EQKo1AwkSMXU=";
+  cargoHash = "sha256-QEZe+7/i0XygXxs7pwdS9WtYbE2pfrUuRQC0dm+WqTo=";

  preBuild = ''
    mkdir -p $out/share/
--- a/pkgs/by-name/ch/chatzone-desktop/package.nix
+++ b/pkgs/by-name/ch/chatzone-desktop/package.nix
@ -10,10 +10,10 @@

 let
  pname = "chatzone-desktop";
-  version = "5.3.0";
+  version = "5.3.2";
  src = fetchurl {
-    url = "https://cdn1.ozone.ru/s3/chatzone-clients/ci/5.3.0/736/chatzone-desktop-linux-5.3.0.AppImage";
-    hash = "sha256-aCu3ZqCBLU4oqf/MnAjwzF/y2CHX0NS9C+eXg46VaY4=";
+    url = "https://cdn1.ozone.ru/s3/chatzone-clients/ci/5.3.2/787/chatzone-desktop-linux-5.3.2.AppImage";
+    hash = "sha256-+GzrLNFhdzB+mOmSOiZP+W9sCSF2Mfdxu6Xkgmz1Fuo=";
  };
  appimageContents = appimageTools.extract { inherit pname version src; };
 in
--- a/pkgs/by-name/ch/chawan/package.nix
+++ b/pkgs/by-name/ch/chawan/package.nix
@ -9,20 +9,20 @@
  nim,
  pandoc,
  pkg-config,
+  brotli,
  zlib,
  unstableGitUpdater,
-  replaceVars,
 }:

 stdenv.mkDerivation {
  pname = "chawan";
-  version = "0-unstable-2025-04-18";
+  version = "0-unstable-2025-05-25";

  src = fetchFromSourcehut {
    owner = "~bptato";
    repo = "chawan";
-    rev = "656092f399d36c13a551b4a2474c8aded3388b1a";
-    hash = "sha256-GYCmRIswHFM+VehBlf8NSAt0ewrl7SVD0y9lLhFYkvo=";
+    rev = "e571c8b1ede3a3c6dc4a5a4d0c6c8f48473076d2";
+    hash = "sha256-OBXc4jnB5Y+KXO9J7P1Z2HXkNCS+xnG+IGWw8wb66J8=";
  };

  patches = [ ./mancha-augment-path.diff ];
@ -43,6 +43,7 @@ stdenv.mkDerivation {
    nim
    pandoc
    pkg-config
+    brotli
  ];

  buildInputs = [
--- a/pkgs/by-name/co/contour/package.nix
+++ b/pkgs/by-name/co/contour/package.nix
@ -85,19 +85,16 @@ stdenv.mkDerivation (finalAttrs: {
    ''
    + lib.optionalString stdenv.hostPlatform.isDarwin ''
      mkdir $out/Applications
-      installShellCompletion --zsh $out/contour.app/Contents/Resources/shell-integration/shell-integration.zsh
-      installShellCompletion --fish $out/contour.app/Contents/Resources/shell-integration/shell-integration.fish
      cp -r $out/contour.app/Contents/Resources/terminfo $terminfo/share
      mv $out/contour.app $out/Applications
      ln -s $out/bin $out/Applications/contour.app/Contents/MacOS
    ''
    + lib.optionalString stdenv.hostPlatform.isLinux ''
      mv $out/share/terminfo $terminfo/share/
-      installShellCompletion --zsh $out/share/contour/shell-integration/shell-integration.zsh
-      installShellCompletion --fish $out/share/contour/shell-integration/shell-integration.fish
    ''
    + ''
      echo "$terminfo" >> $out/nix-support/propagated-user-env-packages
+      rm -r $out/share/contour
    '';

  passthru.tests.test = nixosTests.terminal-emulators.contour;
--- a/pkgs/by-name/de/deskflow/package.nix
+++ b/pkgs/by-name/de/deskflow/package.nix
@ -34,13 +34,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "deskflow";
-  version = "1.21.2";
+  version = "1.22.0";

  src = fetchFromGitHub {
    owner = "deskflow";
    repo = "deskflow";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-gXFBn8hlI8MZ9Vy3goPjosn0JgvaAgZaFIGh/3rFdx8=";
+    hash = "sha256-tNHQHReeOUc5lCs4dI3a5UzeJao+RPWXH4KdWhPwESI=";
  };

  postPatch = ''
@ -101,13 +101,21 @@ stdenv.mkDerivation (finalAttrs: {
    runHook preCheck

    export QT_QPA_PLATFORM=offscreen
-    ./bin/unittests
-    ./bin/integtests
+    ./bin/legacytests

    runHook postCheck
  '';

-  passthru.updateScript = nix-update-script { };
+  postInstall = ''
+    install -Dm644 ../README.md ../doc/configuration.md -t $out/share/doc/deskflow
+  '';
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex"
+      "^v([0-9.]+)$"
+    ];
+  };

  meta = {
    homepage = "https://github.com/deskflow/deskflow";
@ -117,6 +125,7 @@ stdenv.mkDerivation (finalAttrs: {
    license = with lib; [
      licenses.gpl2Plus
      licenses.openssl
+      licenses.mit # share/applications/org.deskflow.deskflow.desktop
    ];
    platforms = lib.platforms.linux;
  };
--- a/pkgs/by-name/el/elmerfem/package.nix
+++ b/pkgs/by-name/el/elmerfem/package.nix
@ -14,19 +14,20 @@
  libsForQt5,
  tbb,
  vtkWithQt5,
+  llvmPackages,
 }:
 let
  opencascade-occt = opencascade-occt_7_6;
 in
 stdenv.mkDerivation rec {
  pname = "elmerfem";
-  version = "unstable-2023-09-18";
+  version = "9.0-unstable-2025-05-25";

  src = fetchFromGitHub {
    owner = "elmercsc";
    repo = "elmerfem";
-    rev = "0fcced06f91c93f44557efd6a5f10b2da5c7066c";
-    hash = "sha256-UuARDYW7D3a4dB6I86s2Ed5ecQxc+Y/es3YIeF2VyTc=";
+    rev = "2f7360ddf491c34f19fea9a723f340cca0fbe1d4";
+    hash = "sha256-2vzIFGh8+YrMxb5px6+aQyTerOAJmHOh2I7eterY6zI=";
  };

  hardeningDisable = [ "format" ];
@ -50,7 +51,7 @@ stdenv.mkDerivation rec {
    opencascade-occt
    tbb
    vtkWithQt5
-  ];
+  ] ++ lib.optional stdenv.cc.isClang llvmPackages.openmp;

  preConfigure = ''
    patchShebangs ./
@ -71,6 +72,7 @@ stdenv.mkDerivation rec {
    "-DCMAKE_INSTALL_LIBDIR=lib"
    "-DCMAKE_INSTALL_INCLUDEDIR=include"
    "-DCMAKE_OpenGL_GL_PREFERENCE=GLVND"
+    "-DUSE_MACOS_PACKAGE_MANAGER=False"
  ];

  meta = with lib; {
--- a/pkgs/by-name/fi/fiddler-everywhere/package.nix
+++ b/pkgs/by-name/fi/fiddler-everywhere/package.nix
@ -8,11 +8,11 @@

 let
  pname = "fiddler-everywhere";
-  version = "6.5.0";
+  version = "6.6.0";

  src = fetchurl {
    url = "https://downloads.getfiddler.com/linux/fiddler-everywhere-${version}.AppImage";
-    hash = "sha256-XEmQeEXqQpVASJ5NJEhZZOkIPbSbj/DOUbfbdAJXSRk=";
+    hash = "sha256-qSQx9uz8P6k/wdPpe7XwhQ6qCZp6IUoLOZnkDWMFS3E=";
  };

  appimageContents = appimageTools.extract {
--- a/pkgs/by-name/fi/fittrackee/package.nix
+++ b/pkgs/by-name/fi/fittrackee/package.nix
@ -8,14 +8,14 @@
 }:
 python3Packages.buildPythonApplication rec {
  pname = "fittrackee";
-  version = "0.9.10";
+  version = "0.10.2";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "SamR1";
    repo = "FitTrackee";
    tag = "v${version}";
-    hash = "sha256-004M7Uhsl0K8BX19eVU4NrvBeAyUJx/mBlC/R27y9jg=";
+    hash = "sha256-ZCQ4Ft2TSjS62DmGDpQ7gG5Spnf82v82i5nnZtg1UmA=";
  };

  build-system = [
@ -24,9 +24,11 @@ python3Packages.buildPythonApplication rec {

  pythonRelaxDeps = [
    "authlib"
+    "flask"
    "flask-limiter"
    "flask-migrate"
    "nh3"
+    "lxml"
    "pyopenssl"
    "pytz"
    "sqlalchemy"
@ -39,6 +41,8 @@ python3Packages.buildPythonApplication rec {
      babel
      click
      dramatiq
+      dramatiq-abort
+      fitdecode
      flask
      flask-bcrypt
      flask-dramatiq
@ -56,8 +60,9 @@ python3Packages.buildPythonApplication rec {
      pytz
      shortuuid
      sqlalchemy
-      staticmap
+      staticmap3
      ua-parser
+      xmltodict
    ]
    ++ dramatiq.optional-dependencies.redis
    ++ flask-limiter.optional-dependencies.redis;
@ -92,6 +97,9 @@ python3Packages.buildPythonApplication rec {
    homepage = "https://github.com/SamR1/FitTrackee";
    changelog = "https://github.com/SamR1/FitTrackee/blob/${src.tag}/CHANGELOG.md";
    license = lib.licenses.agpl3Only;
-    maintainers = with lib.maintainers; [ traxys ];
+    maintainers = with lib.maintainers; [
+      tebriel
+      traxys
+    ];
  };
 }
--- a/pkgs/by-name/fo/foonathan-memory/0001-Use-system-doctest.patch.patch
+++ b/pkgs/by-name/fo/foonathan-memory/0001-Use-system-doctest.patch.patch
@ -0,0 +1,26 @@
+From: =?utf-8?q?Timo_R=C3=B6hling?= <timo@gaussglocke.de>
+Date: Wed, 2 Dec 2020 15:59:22 +0100
+Subject: Use system doctest
+
+Forwarded: not-needed
+---
+ test/CMakeLists.txt | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index 37359ea..f269cfb 100644
+--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
+@@ -8,11 +8,7 @@ target_link_libraries(foonathan_memory_profiling foonathan_memory)
+ target_include_directories(foonathan_memory_profiling PRIVATE
+                             ${FOONATHAN_MEMORY_SOURCE_DIR}/include/foonathan/memory)
+ 
+-# Fetch doctest.
+-message(STATUS "Fetching doctest")
+-include(FetchContent)
+-FetchContent_Declare(doctest URL https://github.com/doctest/doctest/archive/refs/tags/v2.4.12.zip)
+-FetchContent_MakeAvailable(doctest)
+find_package(doctest REQUIRED)
+ 
+ set(tests
+     test_allocator.hpp
--- a/pkgs/by-name/fo/foonathan-memory/package.nix
+++ b/pkgs/by-name/fo/foonathan-memory/package.nix
@ -2,28 +2,25 @@
  stdenv,
  lib,
  fetchFromGitHub,
-  fetchpatch,
  cmake,
  doctest,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "foonathan-memory";
-  version = "0.7-3";
+  version = "0.7-4";

  src = fetchFromGitHub {
    owner = "foonathan";
    repo = "memory";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-nLBnxPbPKiLCFF2TJgD/eJKJJfzktVBW3SRW2m3WK/s=";
+    hash = "sha256-qGbI7SL6lDbJzn2hkqaYw35QAyvSPxcZTb0ltDkPUSo=";
  };

  patches = [
    # do not download doctest, use the system doctest instead
-    (fetchpatch {
-      url = "https://sources.debian.org/data/main/f/foonathan-memory/0.7.3-2/debian/patches/0001-Use-system-doctest.patch";
-      hash = "sha256-/MuDeeIh+7osz11VfsAsQzm9HMZuifff+MDU3bDDxRE=";
-    })
+    # originally from: https://sources.debian.org/data/main/f/foonathan-memory/0.7.3-2/debian/patches/0001-Use-system-doctest.patch
+    ./0001-Use-system-doctest.patch.patch
  ];

  outputs = [
@ -44,12 +41,13 @@ stdenv.mkDerivation (finalAttrs: {

  # fix a circular dependency between "out" and "dev" outputs
  postInstall = ''
-    mkdir -p $dev/lib
-    mv $out/lib/foonathan_memory $dev/lib/
+    mkdir -p $out/lib/cmake
+    mv $out/lib/foonathan_memory/cmake $out/lib/cmake/foonathan_memory
+    rmdir $out/lib/foonathan_memory
  '';

  meta = with lib; {
-    homepage = "https://github.com/foonathan/memory";
+    homepage = "https://memory.foonathan.net/";
    changelog = "https://github.com/foonathan/memory/releases/tag/${finalAttrs.src.rev}";
    description = "STL compatible C++ memory allocator library";
    mainProgram = "nodesize_dbg";
--- a/pkgs/by-name/ga/game-devices-udev-rules/package.nix
+++ b/pkgs/by-name/ga/game-devices-udev-rules/package.nix
@ -8,14 +8,14 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "game-devices-udev-rules";
-  version = "0.23";
+  version = "0.24";

  src = fetchFromGitea {
    domain = "codeberg.org";
    owner = "fabiscafe";
    repo = "game-devices-udev";
-    rev = finalAttrs.version;
-    hash = "sha256-dWWo3qXnxdLP68NuFKM4/Cw5yE6uAsWzj0vZa9UTT0U=";
+    tag = finalAttrs.version;
+    hash = "sha256-b2NBgGpRQ2pQZYQgiRSAt0loAxq1NEByRHVkQQRDOj0=";
  };

  nativeBuildInputs = [
@ -30,17 +30,17 @@ stdenv.mkDerivation (finalAttrs: {
    --replace-fail "/bin/sh" "${bash}/bin/bash"
  '';

-  meta = with lib; {
+  meta = {
    description = "Udev rules to make supported controllers available with user-grade permissions";
    homepage = "https://codeberg.org/fabiscafe/game-devices-udev";
-    license = licenses.mit;
+    license = lib.licenses.mit;
    longDescription = ''
      These udev rules are intended to be used as a package under 'services.udev.packages'.
      They will not be activated if installed as 'environment.systemPackages' or 'users.user.<user>.packages'.

      Additionally, you may need to enable 'hardware.uinput'.
    '';
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ keenanweaver ];
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ keenanweaver ];
  };
 })
--- a/pkgs/by-name/go/gokapi/go-1.24.patch
+++ b/pkgs/by-name/go/gokapi/go-1.24.patch
@ -1,13 +0,0 @@
-diff --git a/build/go-generate/copyStaticFiles.go b/build/go-generate/copyStaticFiles.go
-index 9f8a049..de21bdd 100644
--- a/build/go-generate/copyStaticFiles.go
-+++ b/build/go-generate/copyStaticFiles.go
-@@ -10,7 +10,7 @@ import (
- )
- 
- func main() {
-	copyFile(build.Default.GOROOT+"/misc/wasm/wasm_exec.js", "../../internal/webserver/web/static/js/wasm_exec.js")
-+	copyFile(build.Default.GOROOT+"/lib/wasm/wasm_exec.js", "../../internal/webserver/web/static/js/wasm_exec.js")
- 	copyFile("../../go.mod", "../../build/go.mod")
- 	copyFile("../../openapi.json", "../../internal/webserver/web/static/apidocumentation/openapi.json")
- }
--- a/pkgs/by-name/go/gokapi/package.nix
+++ b/pkgs/by-name/go/gokapi/package.nix
@ -9,30 +9,33 @@

 buildGoModule rec {
  pname = "gokapi";
-  version = "1.9.6";
+  version = "2.0.0";

  src = fetchFromGitHub {
    owner = "Forceu";
    repo = "Gokapi";
    tag = "v${version}";
-    hash = "sha256-RDEvKh3tUun7wt1nhtCim95wEN9V9RlztZ9zcw9nS1o=";
+    hash = "sha256-YhUHi1tR2bCFskBbAlFekuFzfZ2ER9G+TNCcfh5loS4=";
  };

-  vendorHash = "sha256-9GRAlgng+yq7q0VQz374jIOCjeDIIDD631BglM/FsQQ=";
+  vendorHash = "sha256-GeS+lfFw7jUuXX1qQPiu9eKjz6nswpRtbZXjqu4DnHg=";

-  patches = [
-    ./go-1.24.patch
-  ];
+  patches = [ ];

  # This is the go generate is ran in the upstream builder, but we have to run the components separately for things to work.
  preBuild = ''
+    # Some steps expect GOROOT to be set.
+    export GOROOT="$(go env GOROOT)"
+    # Go generate runs from this working dir upstream
    cd ./cmd/gokapi/
    go run ../../build/go-generate/updateVersionNumbers.go
-    # Tries to download "golang.org/x/exp/slices"
+    # Tries to download "golang.org/x/exp/slices", and fails
    # go run ../../build/go-generate/updateProtectedUrls.go
    go run ../../build/go-generate/buildWasm.go
-    # Must be specify go root to import wasm_exec.js
-    GOROOT="$(go env GOROOT)" go run "../../build/go-generate/copyStaticFiles.go"
+    go run ../../build/go-generate/copyStaticFiles.go
+    # Attempts to download program to minify content, and fails
+    # go run ../../build/go-generate/minifyStaticContent.go
+    go run ../../build/go-generate/updateApiRouting.go
    cd ../..
  '';

--- a/pkgs/by-name/go/gopls/package.nix
+++ b/pkgs/by-name/go/gopls/package.nix
@ -1,12 +1,15 @@
 {
  lib,
-  buildGoModule,
+  # gopls breaks if it is compiled with a lower version than the one it is running against.
+  # This will affect users especially when project they work on bump go minor version before
+  # the update went through nixpkgs staging. Further, gopls is a central ecosystem component.
+  buildGoLatestModule,
  fetchFromGitHub,
  nix-update-script,
  versionCheckHook,
 }:

-buildGoModule (finalAttrs: {
+buildGoLatestModule (finalAttrs: {
  pname = "gopls";
  version = "0.18.1";

--- a/pkgs/by-name/ie/ieda/package.nix
+++ b/pkgs/by-name/ie/ieda/package.nix
@ -35,11 +35,11 @@ let
  });
  rootSrc = stdenv.mkDerivation {
    pname = "iEDA-src";
-    version = "2025-04-14";
+    version = "2025-05-30";
    src = fetchgit {
      url = "https://gitee.com/oscc-project/iEDA";
-      rev = "51d198884cde2ecda643071a1a6cb4ec0e09d881";
-      sha256 = "sha256-kDVEAttSqa8l7qcRs7MQiBgPbAKBExEQvIE8tc7PLpM=";
+      rev = "3096147fcea491c381da2928be6fb5a12c2d97b7";
+      sha256 = "sha256-rPkcE+QFMlEuwwJ/QBgyLTXP5lWLQPj5SOlZysJ6WTI=";
    };

    patches = [
@ -59,6 +59,11 @@ let
      })
    ];

+    postPatch = ''
+      # Comment out the iCTS test cases that will fail due to some linking issues on aarch64-linux
+      sed -i '17,28s/^/# /' src/operation/iCTS/test/CMakeLists.txt
+    '';
+
    dontBuild = true;
    dontFixup = true;
    installPhase = ''
@ -71,7 +76,7 @@ let
 in
 stdenv.mkDerivation {
  pname = "iEDA";
-  version = "0-unstable-2025-04-14";
+  version = "0-unstable-2025-05-30";

  src = rootSrc;

--- a/pkgs/by-name/in/intune-portal/package.nix
+++ b/pkgs/by-name/in/intune-portal/package.nix
@ -6,10 +6,10 @@
  libuuid,
  xorg,
  curlMinimal,
-  openssl,
+  openssl_3,
  libsecret,
-  webkitgtk_4_0,
-  libsoup_2_4,
+  webkitgtk_4_1,
+  libsoup_3,
  gtk3,
  atk,
  pango,
@ -19,16 +19,22 @@
  systemd,
  msalsdk-dbusclient,
  pam,
+  p11-kit,
  dbus,
  nixosTests,
 }:
+let
+  curlMinimal_openssl_3 = curlMinimal.override {
+    openssl = openssl_3;
+  };
+in
 stdenv.mkDerivation rec {
  pname = "intune-portal";
-  version = "1.2405.17-jammy";
+  version = "1.2503.10-noble";

  src = fetchurl {
-    url = "https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/i/intune-portal/intune-portal_${version}_amd64.deb";
-    hash = "sha256-WpVPWzh8jN092MaY2rMXhLfpVXsflMl9hOY9nNGJlLk=";
+    url = "https://packages.microsoft.com/ubuntu/24.04/prod/pool/main/i/intune-portal/intune-portal_${version}_amd64.deb";
+    hash = "sha256-NlJ8m7V1yLErOntprHs3EagPtwSzYWd7NBH0jc72+i4=";
  };

  nativeBuildInputs = [ dpkg ];
@ -40,15 +46,16 @@ stdenv.mkDerivation rec {
          stdenv.cc.cc
          libuuid
          xorg.libX11
-          curlMinimal
-          openssl
+          curlMinimal_openssl_3
+          openssl_3
          libsecret
-          webkitgtk_4_0
-          libsoup_2_4
+          webkitgtk_4_1
+          libsoup_3
          gtk3
          atk
          glib
          pango
+          p11-kit
          sqlite
          zlib
          systemd
--- a/pkgs/by-name/je/jextract/copy_lib_clang.patch
+++ b/pkgs/by-name/je/jextract/copy_lib_clang.patch
@ -0,0 +1,13 @@
+diff --git a/build.gradle b/build.gradle
+index 9ce544a..0c77609 100644
+--- a/build.gradle
+++ b/build.gradle
+@@ -79,7 +79,7 @@ task copyLibClang(type: Sync) {
+             "libclang.so.${clang_version}" : "*clang*"
+ 
+     from("${libclang_dir}") {
+-        include(clang_path_include)
+        include("libclang.so*")
+         include("libLLVM.*")
+         exclude("clang.exe")
+         into("libs")
--- a/pkgs/by-name/je/jextract/package.nix
+++ b/pkgs/by-name/je/jextract/package.nix
@ -10,13 +10,13 @@

 stdenv.mkDerivation {
  pname = "jextract";
-  version = "unstable-2024-03-13";
+  version = "unstable-2025-05-08";

  src = fetchFromGitHub {
    owner = "openjdk";
    repo = "jextract";
-    rev = "b9ec8879cff052b463237fdd76382b3a5cd8ff2b";
-    hash = "sha256-+4AM8pzXPIO/CS3+Rd/jJf2xDvAo7K7FRyNE8rXvk5U=";
+    rev = "ab6b30fd189e33a52d366846202f2e9b9b280142";
+    hash = "sha256-cFXQo/DpjOuuW+HCP2G9HiOqdgVmmyPd3IXCB9X+w6M=";
  };

  nativeBuildInputs = [
@ -26,7 +26,11 @@ stdenv.mkDerivation {

  gradleFlags = [
    "-Pllvm_home=${lib.getLib llvmPackages.libclang}"
-    "-Pjdk22_home=${jdk23}"
+    "-Pjdk_home=${jdk23}"
+  ];
+
+  patches = [
+    ./copy_lib_clang.patch
  ];

  doCheck = true;
@ -53,7 +57,5 @@ stdenv.mkDerivation {
      jlesquembre
      sharzy
    ];
-    # Not yet updated for JDK 23
-    broken = true;
  };
 }
--- a/pkgs/by-name/jo/joplin-desktop/package.nix
+++ b/pkgs/by-name/jo/joplin-desktop/package.nix
@ -60,7 +60,7 @@ let

    extraInstallCommands = ''
      wrapProgram $out/bin/joplin-desktop \
-        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}"
+        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime}}"
      install -Dm644 ${appimageContents}/joplin.desktop $out/share/applications/joplin.desktop
      install -Dm644 ${appimageContents}/joplin.png $out/share/pixmaps/joplin.png
      substituteInPlace $out/share/applications/joplin.desktop \
--- a/pkgs/by-name/li/libresprite/package.nix
+++ b/pkgs/by-name/li/libresprite/package.nix
@ -18,6 +18,7 @@
  libX11,
  pixman,
  tinyxml-2,
+  xorg,
  zlib,
  SDL2,
  SDL2_image,
@ -28,14 +29,14 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "libresprite";
-  version = "1.1";
+  version = "1.2";

  src = fetchFromGitHub {
    owner = "LibreSprite";
    repo = "LibreSprite";
    rev = "v${finalAttrs.version}";
    fetchSubmodules = true;
-    hash = "sha256-piA/hLQqdfyVH4GPu5ElXZtowQL9AGaK7GhZOME4L0Q=";
+    hash = "sha256-jXjrA859hR46Cp5qi6Z1C+hLWCUR7yGlASOGlTveeW8=";
  };

  nativeBuildInputs = [
@ -45,23 +46,27 @@ stdenv.mkDerivation (finalAttrs: {
    gtest
  ];

-  buildInputs = [
-    curl
-    freetype
-    giflib
-    libjpeg
-    libpng
-    libwebp
-    libarchive
-    libX11
-    pixman
-    tinyxml-2
-    zlib
-    SDL2
-    SDL2_image
-    lua
-    # no v8 due to missing libplatform and libbase
-  ];
+  buildInputs =
+    [
+      curl
+      freetype
+      giflib
+      libjpeg
+      libpng
+      libwebp
+      libarchive
+      libX11
+      pixman
+      tinyxml-2
+      zlib
+      SDL2
+      SDL2_image
+      lua
+      # no v8 due to missing libplatform and libbase
+    ]
+    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+      xorg.libXi
+    ];

  cmakeFlags = [
    "-DWITH_DESKTOP_INTEGRATION=ON"
--- a/pkgs/by-name/li/livebook/package.nix
+++ b/pkgs/by-name/li/livebook/package.nix
@ -11,7 +11,7 @@
 }:
 beamPackages.mixRelease rec {
  pname = "livebook";
-  version = "0.14.7";
+  version = "0.16.1";

  inherit elixir;

@ -23,13 +23,13 @@ beamPackages.mixRelease rec {
    owner = "livebook-dev";
    repo = "livebook";
    tag = "v${version}";
-    hash = "sha256-8/u/1I3pSfxyF35ZnqClR7FXPL2rhBDdf4w/KUGjVVs=";
+    hash = "sha256-vZFmd9Y5KEnQqzvCmGKGUbY+yR7IEc+0n0sycPDMxa8=";
  };

  mixFodDeps = beamPackages.fetchMixDeps {
    pname = "mix-deps-${pname}";
    inherit src version;
-    hash = "sha256-FrkM82LO7GIFpKQfhlEUrAuKu33BzPBs6OrWW4C6pI0=";
+    hash = "sha256-0gmUCVLrNfcRCPhaXuOfrYW05TDbDN5Zt9IA8OBU8Gc=";
  };

  postInstall = ''
--- a/pkgs/by-name/ma/maid/Gemfile.lock
+++ b/pkgs/by-name/ma/maid/Gemfile.lock
@ -2,25 +2,25 @@ GEM
  remote: https://rubygems.org/
  specs:
    base64 (0.2.0)
-    concurrent-ruby (1.3.4)
-    csv (3.3.0)
+    concurrent-ruby (1.3.5)
+    csv (3.3.4)
    deprecated (3.0.1)
    dimensions (1.3.0)
    escape (0.0.4)
    et-orbi (1.2.11)
      tzinfo
    exifr (1.3.10)
-    ffi (1.17.0)
+    ffi (1.17.2)
    fugit (1.11.1)
      et-orbi (~> 1, >= 1.2.11)
      raabro (~> 1.4)
-    geocoder (1.8.3)
+    geocoder (1.8.5)
      base64 (>= 0.1.0)
      csv (>= 3.0.0)
    listen (3.8.0)
      rb-fsevent (~> 0.10, >= 0.10.3)
      rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.6.1)
+    logger (1.7.0)
    maid (0.10.0)
      deprecated (~> 3.0.0)
      dimensions (>= 1.0.0, < 2.0)
@ -33,10 +33,10 @@ GEM
      rufus-scheduler (~> 3.8.2)
      thor (~> 1.2.1)
      xdg (~> 2.2.3)
-    mime-types (3.6.0)
+    mime-types (3.7.0)
      logger
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.1001)
+      mime-types-data (~> 3.2025, >= 3.2025.0507)
+    mime-types-data (3.2025.0520)
    raabro (1.4.0)
    rake (13.2.1)
    rb-fsevent (0.11.2)
@ -58,4 +58,4 @@ DEPENDENCIES
  rake

 BUNDLED WITH
-   2.5.11
+   2.6.6
--- a/pkgs/by-name/ma/maid/gemset.nix
+++ b/pkgs/by-name/ma/maid/gemset.nix
@ -14,20 +14,20 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl";
+      sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1";
      type = "gem";
    };
-    version = "1.3.4";
+    version = "1.3.5";
  };
  csv = {
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0zfn40dvgjk1xv1z8l11hr9jfg3jncwsc9yhzsz4l4rivkpivg8b";
+      sha256 = "1kfqg0m6vqs6c67296f10cr07im5mffj90k2b5dsm51liidcsvp9";
      type = "gem";
    };
-    version = "3.3.0";
+    version = "3.3.4";
  };
  deprecated = {
    groups = [ "default" ];
@ -85,10 +85,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi";
+      sha256 = "19kdyjg3kv7x0ad4xsd4swy5izsbb1vl1rpb6qqcqisr5s23awi9";
      type = "gem";
    };
-    version = "1.17.0";
+    version = "1.17.2";
  };
  fugit = {
    dependencies = [
@ -113,10 +113,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1cvzz9i5s5dngrw6101bc6kn25c4f2jsb6pnq5yb842scjh6848n";
+      sha256 = "1gzn754d1b614svgrxfjcxjvf5ghrpcmsadndls9mzd4wmg4zx6a";
      type = "gem";
    };
-    version = "1.8.3";
+    version = "1.8.5";
  };
  listen = {
    dependencies = [
@ -137,10 +137,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s";
+      sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr";
      type = "gem";
    };
-    version = "1.6.1";
+    version = "1.7.0";
  };
  maid = {
    dependencies = [
@ -174,20 +174,20 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0r34mc3n7sxsbm9mzyzy8m3dvq7pwbryyc8m452axkj0g2axnwbg";
+      sha256 = "0mjyxl7c0xzyqdqa8r45hqg7jcw2prp3hkp39mdf223g4hfgdsyw";
      type = "gem";
    };
-    version = "3.6.0";
+    version = "3.7.0";
  };
  mime-types-data = {
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "06dbn0j13jwdrmlvrjd50mxqrjlkh3lvxp0afh4glyzbliqvqpsd";
+      sha256 = "042zxrr8xm9nijn7jp0qnrwns32sv5m814ifkbpil8a3kv47ixci";
      type = "gem";
    };
-    version = "3.2024.1001";
+    version = "3.2025.0520";
  };
  raabro = {
    groups = [ "default" ];
--- a/pkgs/by-name/ma/maid/package.nix
+++ b/pkgs/by-name/ma/maid/package.nix
@ -5,12 +5,12 @@
  lib,
 }:

-bundlerApp {
+bundlerApp rec {
  pname = "maid";
  gemdir = ./.;
  exes = [ "maid" ];

-  passthru.updateScript = bundlerUpdateScript "maid";
+  passthru.updateScript = bundlerUpdateScript pname;

  passthru.tests.run = callPackage ./test.nix { };

--- a/pkgs/by-name/ma/materialgram/package.nix
+++ b/pkgs/by-name/ma/materialgram/package.nix
@ -11,13 +11,13 @@ telegram-desktop.override {
  unwrapped = telegram-desktop.unwrapped.overrideAttrs (
    finalAttrs: previousAttrs: {
      pname = "materialgram-unwrapped";
-      version = "5.12.5.1";
+      version = "5.14.3.1";

      src = fetchFromGitHub {
        owner = "kukuruzka165";
        repo = "materialgram";
        rev = "refs/tags/v${finalAttrs.version}";
-        hash = "sha256-l6pVqmz8rfNhta2nCJISLl/nZqoSDBD3QrskmmhoQM4=";
+        hash = "sha256-wnhEnhNeuY7eRvmsDnpZ2CiKHXFvgIYpZp2ftjq54/Q=";
        fetchSubmodules = true;
      };

--- a/pkgs/by-name/ma/matrix-hookshot/package.json
+++ b/pkgs/by-name/ma/matrix-hookshot/package.json
@ -1,6 +1,6 @@
 {
  "name": "matrix-hookshot",
-  "version": "6.0.3",
+  "version": "7.0.0",
  "description": "A bridge between Matrix and multiple project management services, such as GitHub, GitLab and JIRA.",
  "main": "lib/app.js",
  "repository": "https://github.com/matrix-org/matrix-hookshot",
@ -32,10 +32,11 @@
    "start:matrixsender": "node --require source-map-support/register lib/App/MatrixSenderApp.js",
    "start:resetcrypto": "node --require source-map-support/register lib/App/ResetCryptoStore.js",
    "test": "NODE_OPTIONS=--no-experimental-strip-types mocha -r ts-node/register tests/init.ts 'tests/*.ts'  'tests/**/*.ts'",
-    "test:e2e": "NODE_OPTIONS=--no-experimental-strip-types tsc --p tsconfig.spec.json && cp ./lib/libRs.js ./lib/matrix-hookshot-rs.node ./spec-lib/src  && yarn node --experimental-vm-modules $(yarn bin jest)",
+    "test:e2e": "vitest",
    "test:cover": "NODE_OPTIONS=--no-experimental-strip-types nyc --reporter=lcov --reporter=text yarn test",
    "lint": "yarn run lint:js && yarn run lint:rs",
-    "lint:js": "eslint",
+    "lint:js": "yarn prettier -c src tests spec web scripts docs && eslint",
+    "lint:js:apply": "yarn prettier -w src tests spec web scripts docs && eslint --fix",
    "lint:rs": "cargo fmt --all -- --check && cargo clippy -- -Dwarnings",
    "lint:rs:apply": "cargo clippy --fix && cargo fmt --all",
    "generate-default-config": "ts-node src/config/Defaults.ts --config > config.sample.yml",
@ -51,7 +52,7 @@
    "@vector-im/compound-design-tokens": "^2.0.1",
    "@vector-im/compound-web": "^7.3.0",
    "ajv": "^8.11.0",
-    "axios": "^1.7.9",
+    "axios": "^1.8.2",
    "clsx": "^2.1.1",
    "cors": "^2.8.5",
    "date-fns": "^4.1.0",
@ -76,12 +77,14 @@
    "source-map-support": "^0.5.21",
    "string-argv": "^0.3.1",
    "tiny-typed-emitter": "^2.1.0",
+    "url-join": "^5.0.0",
    "vite-plugin-magical-svg": "^1.1.1",
    "winston": "^3.11.0",
    "xml2js": "^0.6.2",
    "yaml": "^2.3.4"
  },
  "devDependencies": {
+    "@babel/core": "^7.26.9",
    "@codemirror/lang-javascript": "^6.0.2",
    "@eslint/eslintrc": "^3.2.0",
    "@eslint/js": "^9.15.0",
@ -90,13 +93,13 @@
    "@octokit/webhooks-types": "^7.6.1",
    "@preact/preset-vite": "^2.9.1",
    "@rollup/plugin-alias": "^5.1.0",
+    "@testcontainers/redis": "^10.25.0",
    "@tsconfig/node22": "^22",
    "@types/ajv": "^1.0.0",
    "@types/busboy": "^1.5.4",
    "@types/chai": "^4.2.22",
    "@types/cors": "^2.8.12",
    "@types/express": "^4.17.14",
-    "@types/jest": "^29.5.11",
    "@types/jira-client": "^7.1.0",
    "@types/markdown-it": "^13.0.7",
    "@types/micromatch": "^4.0.1",
@ -105,25 +108,24 @@
    "@types/node": "^22",
    "@types/xml2js": "^0.4.11",
    "@uiw/react-codemirror": "^4.12.3",
-    "@babel/core": "^7.26.9",
-    "babel-jest": "^29.7.0",
    "busboy": "^1.6.0",
    "chai": "^4",
    "eslint": "^9.15.0",
    "eslint-plugin-chai-expect": "^3.1.0",
    "eslint-plugin-mocha": "^10.5.0",
    "eslint-plugin-react": "^7.37.2",
-    "homerunner-client": "^1.1.0",
-    "jest": "^29.7.0",
    "mocha": "^10.8.2",
    "nyc": "^17.1.0",
    "preact": "^10.26.2",
+    "prettier": "^3.5.3",
    "rimraf": "6.0.1",
    "sass": "^1.81.0",
+    "testcontainers": "^10.25.0",
    "ts-node": "10.9.2",
    "typescript": "^5.7.2",
    "typescript-eslint": "^8.16.0",
-    "vite": "^5.4.12"
+    "vite": "^5.4.19",
+    "vitest": "^3.1.3"
  },
  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }
--- a/pkgs/by-name/ma/matrix-hookshot/pin.json
+++ b/pkgs/by-name/ma/matrix-hookshot/pin.json
@ -1,6 +1,6 @@
 {
-  "version": "6.0.3",
-  "srcHash": "sha256-r7CMHaLkb+YMHjBmItal1+Fa9GW7qwIcgUIY9DdfTgM=",
-  "yarnHash": "1mga0d81xsydqrr8wbwysm4d74xjw13dicw66x3zbqn94lpcsw6g",
-  "cargoHash": "sha256-4Ix5eqv3BMoTzfadayJqXICW+zZzSp2e6XJQrWraW60="
+  "version": "7.0.0",
+  "srcHash": "sha256-MBET/oRvCToCnkUsbSK/6BzE2nrg33BzVuKAuu2BnkQ=",
+  "yarnHash": "1lmakjgpflx8zcvl4ycn529dgkyp8yic9xhpwajdyj6dc56blpbb",
+  "cargoHash": "sha256-1eBiLZHGNJxXNCVavkKt0xckAD2cilOW2wNCtqJ8O4g="
 }
--- a/pkgs/by-name/md/mdbook/package.nix
+++ b/pkgs/by-name/md/mdbook/package.nix
@ -7,7 +7,7 @@
  installShellFiles,
 }:
 let
-  version = "0.4.50";
+  version = "0.4.51";
 in
 rustPlatform.buildRustPackage rec {
  inherit version;
@ -17,11 +17,11 @@ rustPlatform.buildRustPackage rec {
    owner = "rust-lang";
    repo = "mdBook";
    tag = "v${version}";
-    hash = "sha256-ooXfYXqE12wTxrrHKF0IO8JNY7P4sPplrnhVJ6kEUyI=";
+    hash = "sha256-d211IEXtHiRhD+rXGUaDAbcDwKJZqr0fmkxTgN4RkC0=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-kyk7fwuR5A0GEGUw+W81IjwDNsa3I2DT3SFnT75IvLs=";
+  cargoHash = "sha256-3VI9WZiFiyfQRQk7gZBLXA/RRfCuEBze/MWI7OUGBmc=";

  nativeBuildInputs = [ installShellFiles ];

--- a/pkgs/by-name/nu/numworks-epsilon/package.nix
+++ b/pkgs/by-name/nu/numworks-epsilon/package.nix
@ -49,9 +49,8 @@ stdenv.mkDerivation rec {
  installPhase = ''
    runHook preInstall

-    mv ./output/release/simulator/linux/{epsilon.bin,epsilon}
    mkdir -p $out/bin
-    cp -r ./output/release/simulator/linux/* $out/bin/
+    cp ./output/release/simulator/linux/epsilon.bin $out/bin/epsilon

    # Build the logo
    assets="$src/ion/src/simulator/assets"
--- a/pkgs/by-name/nw/nwg-panel/package.nix
+++ b/pkgs/by-name/nw/nwg-panel/package.nix
@ -23,13 +23,13 @@

 python3Packages.buildPythonApplication rec {
  pname = "nwg-panel";
-  version = "0.10.2";
+  version = "0.10.4";

  src = fetchFromGitHub {
    owner = "nwg-piotr";
    repo = "nwg-panel";
    tag = "v${version}";
-    hash = "sha256-Wml9FXktLjTtYWTE/yoYDwFcPXeL1zhY3VgzrMW8DzE=";
+    hash = "sha256-yONNXCKKUH2P0Bhq2lRh3zNWZGvZG4LUi/ONUozTYmI=";
  };

  # No tests
--- a/pkgs/by-name/oh/oh-my-posh/package.nix
+++ b/pkgs/by-name/oh/oh-my-posh/package.nix
@ -2,29 +2,23 @@
  lib,
  buildGoModule,
  fetchFromGitHub,
-  installShellFiles,
-  gitUpdater,
+  nix-update-script,
 }:
-
 buildGoModule rec {
  pname = "oh-my-posh";
-  version = "24.11.4";
+  version = "25.23.3";

  src = fetchFromGitHub {
    owner = "jandedobbeleer";
    repo = "oh-my-posh";
    tag = "v${version}";
-    hash = "sha256-hb5XgwBg9llX/PDX8A8hL5fJbG03nTjrvEd252k2Il0=";
+    hash = "sha256-FStopBbBp5HVH5tXFPpComAuXItEwwtQf8VRGJaicPs=";
  };

-  vendorHash = "sha256-bOjIwBPxu/BfRaAcZTXf4xCGvVXnumb2++JZTx7ZG1s=";
+  vendorHash = "sha256-BucMDbubJ+gEb5tBBSOf+P0A+KkDnUSAJRALyL9uhXU=";

  sourceRoot = "source/src";

-  nativeBuildInputs = [
-    installShellFiles
-  ];
-
  ldflags = [
    "-s"
    "-w"
@ -40,20 +34,16 @@ buildGoModule rec {

  postPatch = ''
    # these tests requires internet access
-    rm image/image_test.go config/migrate_glyphs_test.go upgrade/notice_test.go
+    rm image/image_test.go config/migrate_glyphs_test.go upgrade/notice_test.go segments/upgrade_test.go
  '';

  postInstall = ''
    mv $out/bin/{src,oh-my-posh}
    mkdir -p $out/share/oh-my-posh
    cp -r $src/themes $out/share/oh-my-posh/
-    installShellCompletion --cmd oh-my-posh \
-      --bash <($out/bin/oh-my-posh completion bash) \
-      --fish <($out/bin/oh-my-posh completion fish) \
-      --zsh <($out/bin/oh-my-posh completion zsh)
  '';

-  passthru.updateScript = gitUpdater { rev-prefix = "v"; };
+  passthru.updateScript = nix-update-script { };

  meta = {
    description = "Prompt theme engine for any shell";
--- a/pkgs/by-name/oq/oqs-provider/package.nix
+++ b/pkgs/by-name/oq/oqs-provider/package.nix
@ -9,13 +9,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  name = "oqs-provider";
-  version = "0.8.0";
+  version = "0.9.0";

  src = fetchFromGitHub {
    owner = "open-quantum-safe";
    repo = "oqs-provider";
    rev = finalAttrs.version;
-    hash = "sha256-P3UEiWYchHVQ5s3JXHOzaDaN09K62pMYjnrW/gS5x/I=";
+    hash = "sha256-R9rau/Q+KSkr0hNxpvc3ub9eLQqS1kIONoOEw8zFUBk=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/os/osquery/info.json
+++ b/pkgs/by-name/os/osquery/info.json
@ -1,13 +1,13 @@
 {
    "openssl": {
-        "hash": "sha256-g8cyn+UshQZ3115dCwyiRTCbl+jsvP3B39xKufrDWzk=",
-        "url": "https://www.openssl.org/source/openssl-3.2.1.tar.gz"
+        "hash": "sha256-ACotazC1i/S+pGxDvdljZar42qbEKHgqpP7uBtoZffM=",
+        "url": "https://www.openssl.org/source/openssl-3.4.1.tar.gz"
    },
    "osquery": {
        "fetchSubmodules": true,
-        "hash": "sha256-Q5KiPqkyciuC5vlgBuY9ObRnDhM7Xhq6Oe5GbtatH/s=",
+        "hash": "sha256-zv6R6MR9uaizwkDWw0sT3XSzT1qmPDAkL9crbzBTKTk=",
        "owner": "osquery",
        "repo": "osquery",
-        "rev": "5.16.0"
+        "rev": "5.17.0"
    }
 }
--- a/pkgs/by-name/pi/pimsync/package.nix
+++ b/pkgs/by-name/pi/pimsync/package.nix
@ -4,31 +4,30 @@
  fetchFromSourcehut,
  pkg-config,
  sqlite,
-  scdoc,
  installShellFiles,
  makeWrapper,
+  versionCheckHook,
  nix-update-script,
 }:

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "pimsync";
-  version = "0.4.1";
+  version = "0.4.2";

  src = fetchFromSourcehut {
    owner = "~whynothugo";
    repo = "pimsync";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-EHDGiyDGNr6cPj2N2cTV0f7I9vmM/WIZTsPR1f+HFIE=";
+    hash = "sha256-6oV9E6Q6FmCh24xT9+lsQ47GVs70sSujsn54dX6CPgY=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-/6YjyKB/xOCTNZlKewddEaZ1ZN2PC5dQoP0A5If67MA=";
+  cargoHash = "sha256-vnBk0uojWDM9PS8v5Qda2UflmIFZ09Qp9l25qTTWGMc=";

  PIMSYNC_VERSION = finalAttrs.version;

  nativeBuildInputs = [
    pkg-config
-    scdoc
    makeWrapper
    installShellFiles
  ];
@ -37,13 +36,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
    sqlite
  ];

-  postBuild = ''
-    make man
+  postInstall = ''
+    installManPage pimsync.1 pimsync.conf.5 pimsync-migration.7
  '';

-  postInstall = ''
-    installManPage target/pimsync.1 target/pimsync.conf.5 target/pimsync-migration.7
-  '';
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "version";
+  doInstallCheck = true;

  passthru.updateScript = nix-update-script { };

--- a/pkgs/by-name/pr/protonplus/package.nix
+++ b/pkgs/by-name/pr/protonplus/package.nix
@ -20,13 +20,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "protonplus";
-  version = "0.4.30";
+  version = "0.4.31";

  src = fetchFromGitHub {
    owner = "Vysp3r";
    repo = "protonplus";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-bI21042EHpNigS2wB0WdM06BF2GHdoXsVpNoHe7ZuLk=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-5UwgRvApKjMML5lx/UF7YHsXts4nQlg3GheAykN1f3E=";
  };

  nativeBuildInputs = [
@ -53,13 +53,13 @@ stdenv.mkDerivation (finalAttrs: {
    updateScript = nix-update-script { };
  };

-  meta = with lib; {
+  meta = {
    mainProgram = "com.vysp3r.ProtonPlus";
    description = "Simple Wine and Proton-based compatibility tools manager";
    homepage = "https://github.com/Vysp3r/ProtonPlus";
    changelog = "https://github.com/Vysp3r/ProtonPlus/releases/tag/v${finalAttrs.version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ getchoo ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ getchoo ];
+    platforms = lib.platforms.linux;
  };
 })
--- a/pkgs/by-name/sc/scooter/package.nix
+++ b/pkgs/by-name/sc/scooter/package.nix
@ -6,23 +6,20 @@

 rustPlatform.buildRustPackage rec {
  pname = "scooter";
-  version = "0.5.0";
+  version = "0.5.2";

  src = fetchFromGitHub {
    owner = "thomasschafer";
    repo = "scooter";
    rev = "v${version}";
-    hash = "sha256-+l2XkG6xUOkfSPe20oXjUKdmBYB7GX0xZuqddC8w/lc=";
+    hash = "sha256-GlqGAzOkW6Jy7qGblfkMfCtzNwjOY/ZmGktqU4uUe90=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-+KvHeTa8x77cMbZNbSeMcr66lAqWSBmfkn1rY+PfqHs=";
+  cargoHash = "sha256-mh4FoFZ012yXbCr9Ts57crc+1JrcA2cdnZzqjKUspq8=";

-  checkFlags = [
-    # failed only for buildRustPackage
-    # might be related to https://ryantm.github.io/nixpkgs/languages-frameworks/rust/#tests-relying-on-the-structure-of-the-target-directory
-    "--skip=test_search_current_dir"
-  ];
+  # Many tests require filesystem writes which fail in Nix sandbox
+  doCheck = false;

  meta = {
    description = "Interactive find and replace in the terminal";
--- a/pkgs/by-name/se/serpl/package.nix
+++ b/pkgs/by-name/se/serpl/package.nix
@ -2,14 +2,15 @@
  lib,
  rustPlatform,
  fetchFromGitHub,
-  gitUpdater,
+  nix-update-script,
  makeWrapper,
  ast-grep,
  ripgrep,
+  versionCheckHook,
 }:
 let
  pname = "serpl";
-  version = "0.3.3";
+  version = "0.3.4";
 in
 rustPlatform.buildRustPackage {
  inherit pname version;
@ -17,7 +18,7 @@ rustPlatform.buildRustPackage {
    owner = "yassinebridi";
    repo = "serpl";
    rev = version;
-    hash = "sha256-koD5aFqL+XVxc5Iq3reTYIHiPm0z7hAQ4K59IfbY4Hg=";
+    hash = "sha256-lEvUS1RlZ4CvervzyfODsFqRJAiA6PyLNUVWhSoPMDY=";
  };

  buildFeatures = [ "ast_grep" ];
@ -25,7 +26,7 @@ rustPlatform.buildRustPackage {
  nativeBuildInputs = [ makeWrapper ];

  useFetchCargoVendor = true;
-  cargoHash = "sha256-YfSxjlpUyRwpSoKmHOZrULGIIWTQ14JJwbsNB807WYQ=";
+  cargoHash = "sha256-reeJsSNifPeDzqMKVpS1Pmyn9x1F+Vin/xy81d5rKVs=";

  postFixup = ''
    # Serpl needs ripgrep to function properly.
@ -38,7 +39,14 @@ rustPlatform.buildRustPackage {
      }"
  '';

-  passthru.updateScript = gitUpdater { };
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+  versionCheckProgram = "${placeholder "out"}/bin/serpl";
+  versionCheckProgramArg = "--version";
+
+  passthru.updateScript = nix-update-script { };

  meta = {
    description = "Simple terminal UI for search and replace, ala VS Code";
--- a/pkgs/by-name/sh/shogihome/package.nix
+++ b/pkgs/by-name/sh/shogihome/package.nix
@ -3,41 +3,35 @@
  stdenv,
  buildNpmPackage,
  fetchFromGitHub,
-  fetchpatch,
  makeWrapper,
-  electron_35,
+  electron_36,
  vulkan-loader,
  makeDesktopItem,
  copyDesktopItems,
  commandLineArgs ? [ ],
  nix-update-script,
+  _experimental-update-script-combinators,
+  writeShellApplication,
+  nix,
+  jq,
+  gnugrep,
 }:

 let
-  electron = electron_35;
+  electron = electron_36;
 in
 buildNpmPackage (finalAttrs: {
  pname = "shogihome";
-  version = "1.22.1";
+  version = "1.23.2";

  src = fetchFromGitHub {
    owner = "sunfish-shogi";
    repo = "shogihome";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-vVKdaFKOx4xm4BK+AjVr4cEDOHpOjOe58k2wUAhB9XA=";
+    hash = "sha256-tZw9iEhZ5ss+mv/WUFaj+xQ6GP4GAHq+PvBOv6F5tgM=";
  };

-  npmDepsHash = "sha256-OS5DR+24F98ICgQ6zL4VD231Rd5JB/gJKl+qNfnP3PE=";
-
-  patches = [
-    # Make it possible to load the electron-builder config without sideeffects.
-    # PR at https://github.com/sunfish-shogi/shogihome/pull/1184
-    # Should be removed next 1.22.X ShogiHome update or possibly 1.23.X.
-    (fetchpatch {
-      url = "https://github.com/sunfish-shogi/shogihome/commit/a075571a3bf4f536487e1212a2e7a13802dc7ec7.patch";
-      sha256 = "sha256-dJyaoWOC+fEufzpYenmfnblgd2C9Ymv4Cl8Y/hljY6c=";
-    })
-  ];
+  npmDepsHash = "sha256-dx66k82o+TWrrK9xBHPbnudDn0CG8mM7c1xeoSAM4Fs=";

  postPatch = ''
    substituteInPlace package.json \
@ -46,6 +40,10 @@ buildNpmPackage (finalAttrs: {

    substituteInPlace .electron-builder.config.mjs \
      --replace-fail 'AppImage' 'dir'
+
+    # Workaround for https://github.com/electron/electron/issues/31121
+    substituteInPlace src/background/window/path.ts \
+      --replace-fail 'process.resourcesPath' "'$out/share/lib/shogihome/resources'"
  '';

  env = {
@ -124,11 +122,30 @@ buildNpmPackage (finalAttrs: {
  ];

  passthru = {
-    updateScript = nix-update-script {
-      extraArgs = [
-        "--version-regex=^v([\\d\\.]+)$"
-      ];
-    };
+    updateScript = _experimental-update-script-combinators.sequence [
+      (nix-update-script {
+        extraArgs = [
+          "--version-regex=^v([\\d\\.]+)$"
+        ];
+      })
+      (lib.getExe (writeShellApplication {
+        name = "${finalAttrs.pname}-electron-updater";
+        runtimeInputs = [
+          nix
+          jq
+          gnugrep
+        ];
+        runtimeEnv = {
+          PNAME = finalAttrs.pname;
+          PKG_FILE = builtins.toString ./package.nix;
+        };
+        text = ''
+          new_src="$(nix-build --attr "pkgs.$PNAME.src" --no-out-link)"
+          new_electron_major="$(jq '.devDependencies.electron' "$new_src/package.json" | grep --perl-regexp --only-matching '\d+' | head -n 1)"
+          sed -i -E "s/electron_[0-9]+/electron_$new_electron_major/g" "$PKG_FILE"
+        '';
+      }))
+    ];
  };

  meta = {
--- a/pkgs/by-name/sl/sleek/package.nix
+++ b/pkgs/by-name/sl/sleek/package.nix
@ -6,17 +6,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "sleek";
-  version = "0.4.0";
+  version = "0.5.0";

  src = fetchFromGitHub {
    owner = "nrempel";
    repo = "sleek";
    rev = "v${version}";
-    hash = "sha256-U1ujR+6wW3SKUnjqs/+DrEhu0XRBB8hxGC2pxe3LVbw=";
+    hash = "sha256-4op0EqJWRGEQwXu5DjFBM1ia9nKiE5QTg+pbaeg4+ag=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-2P47kVNQPksKyWPtk1XEpVEjFfz7cEvWX0VvlT3nKOc=";
+  cargoHash = "sha256-0AB2Z++WnOQ06CkKIHBydgV4VlLGqhlKGAQ0blPOFPo=";

  meta = with lib; {
    description = "CLI tool for formatting SQL";
--- a/pkgs/by-name/sp/spectre-meltdown-checker/package.nix
+++ b/pkgs/by-name/sp/spectre-meltdown-checker/package.nix
@ -1,26 +1,29 @@
 {
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  makeBinaryWrapper,
-  coreutils,
  binutils-unwrapped,
+  coreutils,
+  fetchFromGitHub,
+  lib,
+  makeBinaryWrapper,
+  stdenv,
+  unstableGitUpdater,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "spectre-meltdown-checker";
-  version = "0.46";
+  version = "0.46-unstable-2024-08-04";

  src = fetchFromGitHub {
    owner = "speed47";
    repo = "spectre-meltdown-checker";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-M4ngdtp2esZ+CSqZAiAeOnKtaK8Ra+TmQfMsr5q5gkg=";
+    rev = "34c6095912d115551f69435a55d6e0445932fdf9";
+    hash = "sha256-m0f0+AFPrB2fPNd1SkSj6y9PElTdefOdI51Jgfi816w=";
  };

+  passthru.updateScript = unstableGitUpdater { };
+
  prePatch = ''
    substituteInPlace spectre-meltdown-checker.sh \
-      --replace /bin/echo ${coreutils}/bin/echo
+      --replace-fail /bin/echo ${coreutils}/bin/echo
  '';

  nativeBuildInputs = [ makeBinaryWrapper ];
--- a/pkgs/by-name/sq/sqruff/disable-templaters-test.diff
+++ b/pkgs/by-name/sq/sqruff/disable-templaters-test.diff
@ -0,0 +1,15 @@
+diff --git a/crates/lib/tests/templaters.rs b/crates/lib/tests/templaters.rs
+index f92604e1..84885f9f 100644
+--- a/crates/lib/tests/templaters.rs
+++ b/crates/lib/tests/templaters.rs
+@@ -32,6 +32,10 @@ impl Args {
+     }
+ }
+ 
+#[cfg(not(feature = "python"))]
+fn main() {}
+
+#[cfg(feature = "python")]
+ // FIXME: Simplify FluffConfig handling. It's quite chaotic right now.
+ fn main() {
+     let mut args = Args::default();
--- a/pkgs/by-name/sq/sqruff/disable-ui_with_dbt-test.diff
+++ b/pkgs/by-name/sq/sqruff/disable-ui_with_dbt-test.diff
@ -0,0 +1,15 @@
+diff --git a/crates/cli/tests/ui_with_dbt.rs b/crates/cli/tests/ui_with_dbt.rs
+index d71a26c1..4d4ffe4f 100644
+--- a/crates/cli/tests/ui_with_dbt.rs
+++ b/crates/cli/tests/ui_with_dbt.rs
+@@ -3,6 +3,10 @@ use std::path::PathBuf;
+ use assert_cmd::Command;
+ use expect_test::expect_file;
+ 
+#[cfg(not(feature = "python"))]
+fn main() {}
+
+#[cfg(feature = "python")]
+ fn main() {
+     let sample_dbt_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
+         .parent()
--- a/pkgs/by-name/sq/sqruff/disable-ui_with_jinja-test.diff
+++ b/pkgs/by-name/sq/sqruff/disable-ui_with_jinja-test.diff
@ -0,0 +1,15 @@
+diff --git a/crates/cli/tests/ui_with_jinja.rs b/crates/cli/tests/ui_with_jinja.rs
+index 7c39f8a1..e4c96d41 100644
+--- a/crates/cli/tests/ui_with_jinja.rs
+++ b/crates/cli/tests/ui_with_jinja.rs
+@@ -4,6 +4,10 @@ use std::path::PathBuf;
+ use assert_cmd::Command;
+ use expect_test::expect_file;
+ 
+#[cfg(not(feature = "python"))]
+fn main() {}
+
+#[cfg(feature = "python")]
+ fn main() {
+     let mut test_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+     test_dir.push("tests/jinja");
--- a/pkgs/by-name/sq/sqruff/disable-ui_with_python-test.diff
+++ b/pkgs/by-name/sq/sqruff/disable-ui_with_python-test.diff
@ -0,0 +1,15 @@
+diff --git a/crates/cli/tests/ui_with_python.rs b/crates/cli/tests/ui_with_python.rs
+index 826f399c..0fa5ae33 100644
+--- a/crates/cli/tests/ui_with_python.rs
+++ b/crates/cli/tests/ui_with_python.rs
+@@ -4,6 +4,10 @@ use std::path::PathBuf;
+ use assert_cmd::Command;
+ use expect_test::expect_file;
+ 
+#[cfg(not(feature = "python"))]
+fn main() {}
+
+#[cfg(feature = "python")]
+ fn main() {
+     let mut test_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+     test_dir.push("tests/python");
--- a/pkgs/by-name/sq/sqruff/package.nix
+++ b/pkgs/by-name/sq/sqruff/package.nix
@ -9,25 +9,42 @@
 }:
 rustPlatform.buildRustPackage rec {
  pname = "sqruff";
-  version = "0.20.2";
+  version = "0.25.28";

  src = fetchFromGitHub {
    owner = "quarylabs";
    repo = "sqruff";
    tag = "v${version}";
-    hash = "sha256-Vlre3D1ydDqFdysf5no2rW2V2U/BimhCeV1vWZ2JPSM=";
+    hash = "sha256-Xea6jXQos5gyF1FeGF7B5YaQszqfsKhGw1k8j0m7J6c=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-sFKq7CxQ7yoPqDQOR9Nr111RCiSA6bK50QvhHkaU5Go=";
+  cargoHash = "sha256-agB//UDTsEje9pgig07dUy8/Fr+zx7/MC3AdLjqoKJY=";

  buildInputs = [
    rust-jemalloc-sys
  ];

-  # Patch the tests to find the binary
+  # Disable the `python` feature which doesn't work on Nix yet
+  buildNoDefaultFeatures = true;
+  # The jinja and dbt template engines require the `python` feature which we disabled, so we disable these tests
+  patches = [
+    ./disable-templaters-test.diff
+    ./disable-ui_with_dbt-test.diff
+    ./disable-ui_with_jinja-test.diff
+    ./disable-ui_with_python-test.diff
+  ];
+
+  # Patch the tests to find the sqruff binary
  postPatch = ''
-    substituteInPlace crates/cli/tests/ui.rs \
+    substituteInPlace \
+      crates/cli/tests/config_not_found.rs \
+      crates/cli/tests/configure_rule.rs \
+      crates/cli/tests/fix_parse_errors.rs \
+      crates/cli/tests/fix_return_code.rs \
+      crates/cli/tests/ui_github.rs \
+      crates/cli/tests/ui_json.rs \
+      crates/cli/tests/ui.rs \
      --replace-fail \
      'sqruff_path.push(format!("../../target/{}/sqruff", profile));' \
      'sqruff_path.push(format!("../../target/${stdenv.hostPlatform.rust.cargoShortTarget}/{}/sqruff", profile));'
--- a/pkgs/by-name/td/tdlib/package.nix
+++ b/pkgs/by-name/td/tdlib/package.nix
@ -11,6 +11,8 @@
  common-updater-scripts,
  jq,
  buildPackages,
+
+  tde2eOnly ? false,
 }:

 let
@ -35,8 +37,8 @@ let
 in

 stdenv.mkDerivation {
-  pname = "tdlib";
-  version = "1.8.47";
+  pname = if tde2eOnly then "tde2e" else "tdlib";
+  version = "1.8.49";

  src = fetchFromGitHub {
    owner = "tdlib";
@ -45,8 +47,8 @@ stdenv.mkDerivation {
    # The tdlib authors do not set tags for minor versions, but
    # external programs depending on tdlib constrain the minor
    # version, hence we set a specific commit with a known version.
-    rev = "a03a90470d6fca9a5a3db747ba3f3e4a465b5fe7";
-    hash = "sha256-RS7N+MMie/gNtcvPT4yjE2ymhZCsByS96O9nhiJ/bNY=";
+    rev = "51743dfd01dff6179e2d8f7095729caa4e2222e9";
+    hash = "sha256-duD8a/fppkmaKrvkHnbSxRnCLS60aNVcgaYyCoHzKgE=";
  };

  buildInputs = [
@ -73,6 +75,10 @@ stdenv.mkDerivation {
    cmake --build native-build -j $NIX_BUILD_CORES
  '';

+  cmakeFlags = [
+    (lib.cmakeBool "TD_E2E_ONLY" tde2eOnly)
+  ];
+
  # https://github.com/tdlib/td/issues/1974
  postPatch =
    ''
--- a/pkgs/by-name/tr/tracee/0001-fix-do-not-build-libbpf.patch
+++ b/pkgs/by-name/tr/tracee/0001-fix-do-not-build-libbpf.patch
@ -0,0 +1,60 @@
+From 9a900efb997dee158ce25114633cd07f44ef617a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tim=20H=C3=A4ring?= <tim.haering@gmail.com>
+Date: Sat, 17 May 2025 18:19:45 +0200
+Subject: [PATCH] fix: do not build libbpf
+
+---
+ Makefile | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 0fce8de12..bb9937ed5 100644
+--- a/Makefile
+++ b/Makefile
+@@ -77,7 +77,7 @@ get_priv_reqs_recursive() { \
+ 	fi; \
+ 	processed_libs="$$processed_libs $$lib"; \
+ 	if [ "$$lib" = "libbpf" ]; then \
+-		priv_reqs=$$(PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(CMD_PKGCONFIG) --print-requires-private $$lib); \
+		priv_reqs=$$($(CMD_PKGCONFIG) --print-requires-private $$lib); \
+ 	else \
+ 		echo $$lib; \
+ 		priv_reqs=$$($(CMD_PKGCONFIG) --print-requires-private $$lib); \
+@@ -374,7 +374,7 @@ LIBBPF_DESTDIR = $(OUTPUT_DIR)/libbpf
+ LIBBPF_OBJDIR = $(LIBBPF_DESTDIR)/obj
+ LIBBPF_OBJ = $(LIBBPF_OBJDIR)/libbpf.a
+ 
+-$(LIBBPF_OBJ): .build_libbpf .build_libbpf_fix
+$(LIBBPF_OBJ):
+ 
+ .build_libbpf: \
+ 	$(LIBBPF_SRC) \
+@@ -413,7 +413,7 @@ LIBBPF_INCLUDE_UAPI = ./3rdparty/libbpf/include/uapi/linux
+ 	@$(CMD_TOUCH) $@
+ 
+ 
+-TRACEE_EBPF_CFLAGS = $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(CMD_PKGCONFIG) $(PKG_CONFIG_FLAG) --cflags $(LIB_BPF))
+TRACEE_EBPF_CFLAGS = $(shell $(CMD_PKGCONFIG) $(PKG_CONFIG_FLAG) --cflags $(LIB_BPF))
+ 
+ .ONESHELL:
+ .eval_goenv: $(LIBBPF_OBJ)
+@@ -430,7 +430,7 @@ endif
+ 		$(eval GO_ENV_EBPF += GOARCH=$(GO_ARCH))
+ 		$(eval CUSTOM_CGO_CFLAGS := "$(TRACEE_EBPF_CFLAGS)")
+ 		$(eval GO_ENV_EBPF += CGO_CFLAGS=$(CUSTOM_CGO_CFLAGS))
+-		$(eval CUSTOM_CGO_LDFLAGS := "$(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(CMD_PKGCONFIG) $(PKG_CONFIG_FLAG) --libs $(LIB_BPF))")
+		$(eval CUSTOM_CGO_LDFLAGS := "$(shell $(CMD_PKGCONFIG) $(PKG_CONFIG_FLAG) --libs $(LIB_BPF))")
+ 		$(eval GO_ENV_EBPF := $(GO_ENV_EBPF) CGO_LDFLAGS=$(CUSTOM_CGO_LDFLAGS))
+ 		export GO_ENV_EBPF=$(GO_ENV_EBPF)
+ 		echo 'GO_ENV_EBPF := $(GO_ENV_EBPF)' > $(GOENV_MK)
+@@ -486,7 +486,6 @@ TRACEE_SRC_DIRS = ./cmd/ ./pkg/ ./signatures/
+ TRACEE_SRC = $(shell find $(TRACEE_SRC_DIRS) -type f -name '*.go' ! -name '*_test.go')
+ GO_TAGS_EBPF = core,ebpf
+ CGO_EXT_LDFLAGS_EBPF =
+-PKG_CONFIG_PATH = $(LIBBPF_OBJDIR)
+ PKG_CONFIG_FLAG =
+ 
+ TRACEE_PROTOS = ./api/v1beta1/*.proto
+-- 
+2.49.0
+
--- a/pkgs/tools/security/tracee/integration-tests.nix
+++ b/pkgs/tools/security/tracee/integration-tests.nix
@ -18,6 +18,11 @@ tracee.overrideAttrs (oa: {
        --replace-fail 'syscallerAbsPath := filepath.Join("..", "..", "dist", "syscaller")' "syscallerAbsPath := filepath.Join(\"$out/bin/syscaller\")"
      substituteInPlace tests/integration/exec_test.go \
        --replace-fail "/usr/bin" "/run/current-system/sw/bin"
+      substituteInPlace tests/integration/dependencies_test.go \
+        --replace-fail "/bin" "/run/current-system/sw/bin" \
+        --replace-fail "/tmp/test" "/tmp/ls"
+      substituteInPlace tests/testutils/tracee.go \
+        --replace-fail "../../dist/tracee" "${lib.getExe tracee}"
    '';
  nativeBuildInputs = oa.nativeBuildInputs or [ ] ++ [ makeWrapper ];
  buildPhase = ''
--- a/pkgs/tools/security/tracee/default.nix
+++ b/pkgs/tools/security/tracee/default.nix
@ -3,12 +3,13 @@
  buildGoModule,
  fetchFromGitHub,

-  clang,
+  clang_14,
  pkg-config,

-  zlib,
  elfutils,
  libbpf,
+  zlib,
+  zstd,

  nixosTests,
  testers,
@ -18,23 +19,20 @@

 buildGoModule rec {
  pname = "tracee";
-  version = "0.20.0";
+  version = "0.23.1";

+  # src = /home/tim/repos/tracee;
  src = fetchFromGitHub {
    owner = "aquasecurity";
    repo = pname;
    # project has branches and tags of the same name
    tag = "v${version}";
-    hash = "sha256-OnOayDxisvDd802kDKGctaQc5LyoyFfdfvC+2JpRjHY=";
+    hash = "sha256-9uP0yoW+xRYv7wHuCfUMU8B2oTQjiSW5p/Ty76ni2wo=";
  };
-  vendorHash = "sha256-26sAKTJQ7Rf5KRlu7j5XiZVr6CkAC6fm60Pam7KH0uA=";
+  vendorHash = "sha256-2+4UN9WB6eGzedogy5dMvhHj1x5VeUUkDM0Z28wKQgM=";

  patches = [
-    ./use-our-libbpf.patch
-    # can not vendor dependencies with old pyroscope
-    # remove once https://github.com/aquasecurity/tracee/pull/3927
-    # makes it to a release
-    ./update-pyroscope.patch
+    ./0001-fix-do-not-build-libbpf.patch
  ];

  enableParallelBuilding = true;
@ -42,17 +40,18 @@ buildGoModule rec {
  hardeningDisable = [ "stackprotector" ];

  nativeBuildInputs = [
+    clang_14
    pkg-config
-    clang
  ];
  buildInputs = [
    elfutils
    libbpf
-    zlib
+    zlib.dev
+    zstd.dev
  ];

  makeFlags = [
-    "VERSION=v${version}"
+    "RELEASE_VERSION=v${version}"
    "GO_DEBUG_FLAG=-s -w"
    # don't actually need git but the Makefile checks for it
    "CMD_GIT=echo"
--- a/pkgs/by-name/v2/v2rayn/deps.json
+++ b/pkgs/by-name/v2/v2rayn/deps.json
@ -11,8 +11,8 @@
  },
  {
    "pname": "Avalonia",
-    "version": "11.2.6",
-    "hash": "sha256-f+fuElhlc2dCUt/GD/Noh07JqPIA8ZtpFxdmetdPVVI="
+    "version": "11.3.0",
+    "hash": "sha256-Hot4dWkrP5x+JzaP2/7E1QOOiXfPGhkvK1nzBacHvzg="
  },
  {
    "pname": "Avalonia.Angle.Windows.Natives",
@ -31,38 +31,38 @@
  },
  {
    "pname": "Avalonia.Controls.ColorPicker",
-    "version": "11.2.6",
-    "hash": "sha256-TeUwMcNIvXw/gMuApUODZ7nuymM6OF9cNUGSajlyfoQ="
+    "version": "11.3.0",
+    "hash": "sha256-ee3iLrn8OdWH6Mg01p93wYMMCPXS25VM/uZeQWEr+k0="
  },
  {
    "pname": "Avalonia.Controls.DataGrid",
-    "version": "11.2.6",
-    "hash": "sha256-69ZtybLdpGG28M6p1Cenz6PZEfdf1VKxA4wIrw5FJnI="
+    "version": "11.3.0",
+    "hash": "sha256-McFggedX7zb9b0FytFeuh+3nPdFqoKm2JMl2VZDs/BQ="
  },
  {
    "pname": "Avalonia.Desktop",
-    "version": "11.2.6",
-    "hash": "sha256-PANuvQlAhDWjnv7VUzxOjz6XRmt4l/YKhVLSIP7YL24="
+    "version": "11.3.0",
+    "hash": "sha256-XZXmsKrYCOEWzFUbnwNKvEz5OCD/1lAPi+wM4BiMB7I="
  },
  {
    "pname": "Avalonia.Diagnostics",
-    "version": "11.2.6",
-    "hash": "sha256-Lc9qLIywzD06I9sPXQRjLLLijDoFOVmuO5qNh301gYQ="
+    "version": "11.3.0",
+    "hash": "sha256-jO8Fs9kfNGsoZ87zQCxPdn0tyWHcEdgBRIpzkZ0ceM0="
  },
  {
    "pname": "Avalonia.FreeDesktop",
-    "version": "11.2.6",
-    "hash": "sha256-816li4Nj8+oNkfeMjOAtFSFS+DSo9e2S3K45xqyHJAQ="
+    "version": "11.3.0",
+    "hash": "sha256-nWIW3aDPI/00/k52BNU4n43sS3ymuw+e97EBSsjjtU4="
  },
  {
    "pname": "Avalonia.Native",
-    "version": "11.2.6",
-    "hash": "sha256-by589X1UIjeQNK0lJMLfNzF2dK+qTNT6CBJNLgG86Aw="
+    "version": "11.3.0",
+    "hash": "sha256-l6gcCeGd422mLQgVLp2sxh4/+vZxOPoMrxyfjGyhYLs="
  },
  {
    "pname": "Avalonia.ReactiveUI",
-    "version": "11.2.6",
-    "hash": "sha256-DsUxdEQMgpmzgRS5zkf3rqk32YL3xFN7KoQkn1Xl6WU="
+    "version": "11.3.0",
+    "hash": "sha256-yY/xpe4Te6DLa1HZCWZgIGpdKeZqvknRtpkpBTrZhmU="
  },
  {
    "pname": "Avalonia.Remote.Protocol",
@ -76,28 +76,28 @@
  },
  {
    "pname": "Avalonia.Remote.Protocol",
-    "version": "11.2.6",
-    "hash": "sha256-Q2uPnR6tPFWExohhMJKnJGTet8IVpQn/HIcRurUPAHQ="
+    "version": "11.3.0",
+    "hash": "sha256-7ytabxzTbPLR3vBCCb7Z6dYRZZVvqiDpvxweOYAqi7I="
  },
  {
    "pname": "Avalonia.Skia",
-    "version": "11.2.6",
-    "hash": "sha256-6CfDcJT707iSB9XUQRvSvr5YWMavhiYPnHwVudUl74c="
+    "version": "11.3.0",
+    "hash": "sha256-p+mWsyrYsC9PPhNjOxPZwarGuwmIjxaQ4Ml/2XiEuEc="
  },
  {
    "pname": "Avalonia.Themes.Simple",
-    "version": "11.2.6",
-    "hash": "sha256-kE31/1tchMJ6XmEbjLr5Idc7uKBAbuhsroUMg0LQauA="
+    "version": "11.3.0",
+    "hash": "sha256-F2DMHskmrJw/KqpYLHGEEuQMVP8T4fXgq5q3tfwFqG0="
  },
  {
    "pname": "Avalonia.Win32",
-    "version": "11.2.6",
-    "hash": "sha256-e+DNtKz4UDNqOP1vvVRqbD67n5IG9PxmGkMz7B6b7AY="
+    "version": "11.3.0",
+    "hash": "sha256-Ltf6EuL6aIG+YSqOqD/ecdqUDsuwhNuh+XilIn7pmlE="
  },
  {
    "pname": "Avalonia.X11",
-    "version": "11.2.6",
-    "hash": "sha256-atnfxY6vspMzvMFc9PzwWb/uPNkPx5tF3zDGKeqlGIw="
+    "version": "11.3.0",
+    "hash": "sha256-QOprHb0HjsggEMWOW7/U8pqlD8M4m97FeTMWlriYHaU="
  },
  {
    "pname": "CliWrap",
@ -196,13 +196,13 @@
  },
  {
    "pname": "Semi.Avalonia",
-    "version": "11.2.1.6",
-    "hash": "sha256-E7FKQe3oQlzaza/ofmSvtrLXWo+ht7QutZKGylGW8QE="
+    "version": "11.2.1.7",
+    "hash": "sha256-LFlgdRcqNR+ZV9Hkyuw7LhaFWKwCuXWRWYM+9sQRBDU="
  },
  {
    "pname": "Semi.Avalonia.DataGrid",
-    "version": "11.2.1.6",
-    "hash": "sha256-uXy8eqoENQXNpfskJgJsKW1HaThMKfMNpiJpzDc5oRo="
+    "version": "11.2.1.7",
+    "hash": "sha256-EWfzKeM5gMoJHx7L9+kAeGtaaY6HeG+NwAxv08rOv6E="
  },
  {
    "pname": "SkiaSharp",
@ -336,8 +336,8 @@
  },
  {
    "pname": "Tmds.DBus.Protocol",
-    "version": "0.20.0",
-    "hash": "sha256-CRW/tkgsuBiBJfRwou12ozRQsWhHDooeP88E5wWpWJw="
+    "version": "0.21.2",
+    "hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI="
  },
  {
    "pname": "WebDav.Client",
--- a/pkgs/by-name/v2/v2rayn/package.nix
+++ b/pkgs/by-name/v2/v2rayn/package.nix
@ -1,18 +1,18 @@
 {
-  fetchFromGitHub,
+  lib,
+  stdenv,
  buildDotnetModule,
+  fetchFromGitHub,
  dotnetCorePackages,
+  autoPatchelfHook,
+  copyDesktopItems,
+  makeDesktopItem,
  icu,
  zlib,
-  stdenv,
-  lib,
  fontconfig,
-  autoPatchelfHook,
  openssl,
  lttng-ust_2_12,
  krb5,
-  makeDesktopItem,
-  copyDesktopItems,
  bash,
  xorg,
  xdg-utils,
@ -21,13 +21,13 @@

 buildDotnetModule rec {
  pname = "v2rayn";
-  version = "7.11.1";
+  version = "7.12.5";

  src = fetchFromGitHub {
    owner = "2dust";
    repo = "v2rayN";
    tag = version;
-    hash = "sha256-oDjZwVBgTmBQQEl9A0eWZEFq1in82ercSLtoQeVS3k0=";
+    hash = "sha256-gXVriD9g4Coc0B0yN5AlfNre9C9l8V5wv4q3KgKRsF0=";
    fetchSubmodules = true;
  };

@ -36,12 +36,18 @@ buildDotnetModule rec {
  nugetDeps = ./deps.json;

  postPatch = ''
+    chmod +x v2rayN/ServiceLib/Sample/proxy_set_linux_sh
+    patchShebangs v2rayN/ServiceLib/Sample/proxy_set_linux_sh
    substituteInPlace v2rayN/ServiceLib/Global.cs \
      --replace-fail "/bin/bash" "${bash}/bin/bash"
+    substituteInPlace v2rayN/ServiceLib/Handler/CoreAdminHandler.cs \
+      --replace-fail "/bin/sh" "${bash}/bin/bash"
    substituteInPlace v2rayN/ServiceLib/Handler/AutoStartupHandler.cs \
      --replace-fail "Utils.GetExePath())" '"v2rayN")'
    substituteInPlace v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs \
      --replace-fail "nautilus" "${xdg-utils}/bin/xdg-open"
+    substituteInPlace v2rayN/ServiceLib/Handler/CoreHandler.cs \
+      --replace-fail 'Environment.GetEnvironmentVariable(Global.LocalAppData) == "1"' "false"
  '';

  dotnetBuildFlags = [ "-p:PublishReadyToRun=false" ];
--- a/pkgs/by-name/ve/venera/package.nix
+++ b/pkgs/by-name/ve/venera/package.nix
@ -1,7 +1,7 @@
 {
  lib,
+  flutter332,
  fetchFromGitHub,
-  flutter329,
  webkitgtk_4_1,
  copyDesktopItems,
  makeDesktopItem,
@ -12,15 +12,15 @@
  gitUpdater,
 }:

-flutter329.buildFlutterApplication rec {
+flutter332.buildFlutterApplication rec {
  pname = "venera";
-  version = "1.4.3";
+  version = "1.4.4";

  src = fetchFromGitHub {
    owner = "venera-app";
    repo = "venera";
    tag = "v${version}";
-    hash = "sha256-hhKfHJRZyNsQcGhbgBdBvy2KjKOxg4+0yi+ynX3qMw4=";
+    hash = "sha256-ZJ5TMoBamXHU/pU790/6HHJwNqVsXpZ1OttPR/JSydY=";
  };

  pubspecLock = lib.importJSON ./pubspec.lock.json;
@ -38,6 +38,7 @@ flutter329.buildFlutterApplication rec {
      scrollable_positioned_list = "sha256-6XmBlNxE7DEqY2LsEFtVrshn2Xt55XnmaiTq+tiPInA=";
      webdav_client = "sha256-euNF7HdDtZ68BqSEq9BvO10BK09MxX2wWGoElFS0yeE=";
      flutter_saf = "sha256-zmRZ82aJPYX/N/lOUcOoT8UAHEDoUk0FTFSqB4gKR+U=";
+      rhttp = "sha256-6AH7A+CJg60Vk0ph3cJwj29GkmJEezI/VuZvRqqmOYs=";
      flutter_inappwebview = flutter_inappwebview-hash;
      flutter_inappwebview_android = flutter_inappwebview-hash;
      flutter_inappwebview_ios = flutter_inappwebview-hash;
@ -45,7 +46,6 @@ flutter329.buildFlutterApplication rec {
      flutter_inappwebview_web = flutter_inappwebview-hash;
      flutter_inappwebview_windows = flutter_inappwebview-hash;
      flutter_inappwebview_platform_interface = flutter_inappwebview-hash;
-      rhttp = "sha256-odYLLj9Vd0+UQVXtYgGzMDKLD7SbTqrqHI1jAXVr5XU=";
    };

  nativeBuildInputs = [ copyDesktopItems ];
--- a/pkgs/by-name/ve/venera/pubspec.lock.json
+++ b/pkgs/by-name/ve/venera/pubspec.lock.json
@ -54,11 +54,11 @@
      "dependency": "transitive",
      "description": {
        "name": "async",
-        "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63",
+        "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.12.0"
+      "version": "2.13.0"
    },
    "battery_plus": {
      "dependency": "direct main",
@ -235,11 +235,11 @@
      "dependency": "transitive",
      "description": {
        "name": "fake_async",
-        "sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc",
+        "sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.3.2"
+      "version": "1.3.3"
    },
    "ffi": {
      "dependency": "transitive",
@ -536,11 +536,11 @@
      "dependency": "transitive",
      "description": {
        "name": "flutter_rust_bridge",
-        "sha256": "5a5c7a5deeef2cc2ffe6076a33b0429f4a20ceac22a397297aed2b1eb067e611",
+        "sha256": "b416ff56002789e636244fb4cc449f587656eff995e5a7169457eb0593fcaddb",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.9.0"
+      "version": "2.10.0"
    },
    "flutter_saf": {
      "dependency": "direct main",
@ -649,11 +649,11 @@
      "dependency": "direct main",
      "description": {
        "name": "intl",
-        "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf",
+        "sha256": "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.19.0"
+      "version": "0.20.2"
    },
    "io": {
      "dependency": "transitive",
@ -679,11 +679,11 @@
      "dependency": "transitive",
      "description": {
        "name": "leak_tracker",
-        "sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec",
+        "sha256": "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "10.0.8"
+      "version": "10.0.9"
    },
    "leak_tracker_flutter_testing": {
      "dependency": "transitive",
@ -951,12 +951,12 @@
      "dependency": "direct main",
      "description": {
        "path": "rhttp",
-        "ref": "e7dca15ca543b5df49f3ada06016e874b79bce36",
-        "resolved-ref": "e7dca15ca543b5df49f3ada06016e874b79bce36",
+        "ref": "1f0ff50336062c5f809c256726dc55cd30b9ce59",
+        "resolved-ref": "1f0ff50336062c5f809c256726dc55cd30b9ce59",
        "url": "https://github.com/wgh136/rhttp"
      },
      "source": "git",
-      "version": "0.11.0"
+      "version": "0.12.0"
    },
    "screen_retriever": {
      "dependency": "transitive",
@ -1289,11 +1289,11 @@
      "dependency": "transitive",
      "description": {
        "name": "vm_service",
-        "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14",
+        "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "14.3.1"
+      "version": "15.0.0"
    },
    "web": {
      "dependency": "transitive",
@ -1378,7 +1378,7 @@
    }
  },
  "sdks": {
-    "dart": ">=3.7.0 <4.0.0",
-    "flutter": ">=3.29.3"
+    "dart": ">=3.8.0 <4.0.0",
+    "flutter": ">=3.32.0"
  }
 }
--- a/pkgs/by-name/vo/volanta/package.nix
+++ b/pkgs/by-name/vo/volanta/package.nix
@ -6,10 +6,10 @@
 }:
 let
  pname = "volanta";
-  version = "1.11.3";
+  version = "1.12.0";
  src = fetchurl {
-    url = "https://cdn.volanta.app/software/volanta-app/${version}-622dc10d/volanta-${version}.AppImage";
-    hash = "sha256-vplJEE+D2Yzr4fD//CdLRAYAKQp6a1RR0jZ1N46Q8xU=";
+    url = "https://cdn.volanta.app/software/volanta-app/${version}-0e24f0ee/volanta-${version}.AppImage";
+    hash = "sha256-PwBnKR0oFMJtyPxpgDGlSDmcxY9wxhp2Un6mkRJIlfI=";
  };
  appImageContents = appimageTools.extract { inherit pname version src; };
 in
--- a/pkgs/by-name/wm/wmenu/package.nix
+++ b/pkgs/by-name/wm/wmenu/package.nix
@ -14,9 +14,9 @@
  scdoc,
 }:

-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
  pname = "wmenu";
-  version = "0.1.9-unstable-2025-03-01";
+  version = "0.2.0";

  strictDeps = true;

@ -24,8 +24,8 @@ stdenv.mkDerivation {
    domain = "codeberg.org";
    owner = "adnano";
    repo = "wmenu";
-    rev = "fc69aa6e2bccca461a0bd0c10b448b64ccda1d42";
-    hash = "sha256-ZssptllD6LPQUinKZime9A1dZJ3CkQvp+DUmk+iyaOA=";
+    tag = finalAttrs.version;
+    hash = "sha256-JkKA3MUfRLsZWgvDyiYdqb8u4nGSfboL6Ecy7poPW1k=";
  };

  nativeBuildInputs = [
@ -48,7 +48,10 @@ stdenv.mkDerivation {
    homepage = "https://codeberg.org/adnano/wmenu";
    license = licenses.mit;
    platforms = platforms.linux;
-    maintainers = with maintainers; [ eken ];
+    maintainers = with maintainers; [
+      eken
+      sweiglbosker
+    ];
    mainProgram = "wmenu";
  };
-}
+})
--- a/pkgs/by-name/wo/wol/macos-10_7-getline.patch
+++ b/pkgs/by-name/wo/wol/macos-10_7-getline.patch
@ -0,0 +1,64 @@
+From f78508f9803de42faf6e578d89ce08ea31a62b0d Mon Sep 17 00:00:00 2001
+From: Bryan Lai <bryanlais@gmail.com>
+Date: Thu, 29 May 2025 15:38:11 +0800
+Subject: [PATCH] fix: build for darwin (conflicting getline)
+
+Previously failing with:
+
+  In file included from getpass4.c:7:
+  ./getline.h:32:1: error: conflicting types for 'getline'
+     32 | getline PARAMS ((char **_lineptr, size_t *_n, FILE *_stream));
+        | ^
+  /nix/store/w41ks2baj649algkjnbh9746cprrnr1k-apple-sdk-11.3/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/stdio.h:355:9: note: previous declaration is here
+    355 | ssize_t getline(char ** __restrict __linep, size_t * __restrict __linecapp, FILE * __restrict __stream) __OSX_AVAILABLE_STARTING(__MAC_10_7, __IPHONE_4_3);
+        |         ^
+  In file included from getpass4.c:7:
+  ./getline.h:35:1: error: conflicting types for 'getdelim'
+     35 | getdelim PARAMS ((char **_lineptr, size_t *_n, int _delimiter, FILE *_stream));
+        | ^
+  /nix/store/w41ks2baj649algkjnbh9746cprrnr1k-apple-sdk-11.3/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/stdio.h:354:9: note: previous declaration is here
+    354 | ssize_t getdelim(char ** __restrict __linep, size_t * __restrict __linecapp, int __delimiter, FILE * __restrict __stream) __OSX_AVAILABLE_STARTING(__MAC_10_7, __IPHONE_4_3);
+        |         ^
+  4 warnings generated.
+  2 errors generated.
+---
+ configure.ac  | 2 +-
+ lib/getline.h | 7 +++++++
+ 2 files changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 99dc73d..fd0b0dc 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -193,7 +193,7 @@ gl_MD5 dnl for GNU md5
+ AM_FUNC_GETLINE dnl for GNU getline
+ AC_CHECK_FUNCS(usleep)
+ AC_CHECK_FUNCS(getopt_long) dnl for GNU getopt
+-AC_CHECK_FUNCS(getdelim)
+AC_CHECK_FUNCS([getline getdelim])
+ AC_CHECK_FUNC(inet_aton, [], [
+ 	dnl check libresolv for inet_aton() as seen on solaris
+ 	AC_CHECK_LIB(resolv, inet_aton,
+diff --git a/lib/getline.h b/lib/getline.h
+index 991184c..34a0247 100644
+--- a/lib/getline.h
+++ b/lib/getline.h
+@@ -28,11 +28,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+ # endif
+ 
+ # if __GLIBC__ < 2
+
+#include "config.h"
+#ifndef HAVE_GETLINE
+ int
+ getline PARAMS ((char **_lineptr, size_t *_n, FILE *_stream));
+#endif
+ 
+#ifndef HAVE_GETDELIM
+ int
+ getdelim PARAMS ((char **_lineptr, size_t *_n, int _delimiter, FILE *_stream));
+#endif
+
+ # endif
+ 
+ #endif /* not GETLINE_H_ */
--- a/pkgs/by-name/wo/wol/package.nix
+++ b/pkgs/by-name/wo/wol/package.nix
@ -15,7 +15,10 @@ stdenv.mkDerivation rec {
    sha256 = "08i6l5lr14mh4n3qbmx6kyx7vjqvzdnh3j9yfvgjppqik2dnq270";
  };

-  patches = [ ./gcc-14.patch ];
+  patches = [
+    ./gcc-14.patch
+    ./macos-10_7-getline.patch
+  ];

  nativeBuildInputs = [
    perl # for pod2man in order to get a manpage
@ -30,6 +33,6 @@ stdenv.mkDerivation rec {
    license = licenses.gpl2Plus;
    maintainers = with maintainers; [ makefu ];
    mainProgram = "wol";
-    platforms = platforms.linux;
+    platforms = platforms.unix;
  };
 }
--- a/pkgs/by-name/ya/yazi/package.nix
+++ b/pkgs/by-name/ya/yazi/package.nix
@ -69,14 +69,20 @@ let
        mkdir $out/plugins
        ${lib.optionalString (plugins != { }) ''
          ${lib.concatStringsSep "\n" (
-            lib.mapAttrsToList (name: value: "ln -s ${value} $out/plugins/${name}") plugins
+            lib.mapAttrsToList (
+              name: value:
+              "ln -s ${value} $out/plugins/${if lib.hasSuffix ".yazi" name then name else "${name}.yazi"}"
+            ) plugins
          )}
        ''}

        mkdir $out/flavors
        ${lib.optionalString (flavors != { }) ''
          ${lib.concatStringsSep "\n" (
-            lib.mapAttrsToList (name: value: "ln -s ${value} $out/flavors/${name}") flavors
+            lib.mapAttrsToList (
+              name: value:
+              "ln -s ${value} $out/flavors/${if lib.hasSuffix ".yazi" name then name else "${name}.yazi"}"
+            ) flavors
          )}
        ''}

--- a/pkgs/by-name/za/zapret/package.nix
+++ b/pkgs/by-name/za/zapret/package.nix
@ -16,13 +16,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "zapret";
-  version = "70.6";
+  version = "71";

  src = fetchFromGitHub {
    owner = "bol-van";
    repo = "zapret";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-VnC4UeR8Zxr8oKx9icZBTUNjVWpd16wLKyZ+zNShJQk=";
+    hash = "sha256-OeOnzqYyRAQNRtjtPHwzDL/csuTAUgIRJKsPVr3iBac=";
  };

  buildInputs = [
--- a/pkgs/development/compilers/dart/package-source-builders/rhttp/default.nix
+++ b/pkgs/development/compilers/dart/package-source-builders/rhttp/default.nix
@ -35,6 +35,7 @@ let
        _0_9_8 = "sha256-cwb1wYVXOE5YABlMxUDt+OMlDpIlipqeNI7ZFAGHCqo=";
        _0_10_0 = "sha256-2SpAj53XvZXKRpMzFXJGcx7E2TlMUD+ooHkFwg/9fe4=";
        _0_11_0 = "sha256-sngh5k9GoCZhnIFTpnAVHZjxTcOv+Ui6pJ2cFyriL84=";
+        _0_12_0 = "sha256-W2DcBy1n73nR2oZIQcFt6A+NElQWtfEtKB1YIweQUVo=";
      }
      .${"_" + (lib.replaceStrings [ "." ] [ "_" ] version)} or (throw ''
        Unsupported version of pub 'rhttp': '${version}'
--- a/pkgs/development/libraries/c-blosc/1.nix
+++ b/pkgs/development/libraries/c-blosc/1.nix
@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {

  nativeBuildInputs = [ cmake ];

-  buildInputs = [
+  propagatedBuildInputs = [
    lz4
    zlib
    zstd
@ -54,15 +54,19 @@ stdenv.mkDerivation (finalAttrs: {

  doCheck = !static;

-  passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  passthru.tests = {
+    pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+    cmake-config = testers.hasCmakeConfigModules {
+      moduleNames = [ "Blosc2" ];
+      package = finalAttrs.finalPackage;
+    };
+  };

  meta = with lib; {
    description = "Blocking, shuffling and loss-less compression library";
    homepage = "https://www.blosc.org";
    changelog = "https://github.com/Blosc/c-blosc/releases/tag/v${finalAttrs.version}";
-    pkgConfigModules = [
-      "blosc"
-    ];
+    pkgConfigModules = [ "blosc2" ];
    license = licenses.bsd3;
    platforms = platforms.all;
    maintainers = with maintainers; [ ris ];
--- a/pkgs/development/libraries/c-blosc/2.nix
+++ b/pkgs/development/libraries/c-blosc/2.nix
@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {

  nativeBuildInputs = [ cmake ];

-  buildInputs = [
+  propagatedBuildInputs = [
    lz4
    zlib-ng
    zstd
@ -56,15 +56,19 @@ stdenv.mkDerivation (finalAttrs: {
  # possibly https://github.com/Blosc/c-blosc2/issues/432
  enableParallelChecking = false;

-  passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  passthru.tests = {
+    pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+    cmake-config = testers.hasCmakeConfigModules {
+      moduleNames = [ "Blosc2" ];
+      package = finalAttrs.finalPackage;
+    };
+  };

  meta = with lib; {
    description = "Fast, compressed, persistent binary data store library for C";
    homepage = "https://www.blosc.org";
    changelog = "https://github.com/Blosc/c-blosc2/releases/tag/v${finalAttrs.version}";
-    pkgConfigModules = [
-      "blosc2"
-    ];
+    pkgConfigModules = [ "blosc2" ];
    license = licenses.bsd3;
    platforms = platforms.all;
    maintainers = with maintainers; [ ris ];
--- a/pkgs/development/libraries/cctag/cmake-no-apple-rpath.patch
+++ b/pkgs/development/libraries/cctag/cmake-no-apple-rpath.patch
@ -0,0 +1,26 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d0e35b6..fc19477 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -96,20 +96,6 @@ endif()
+ # set the path where we can find the findXXX.cmake
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")
+ 
+-if(APPLE)
+-
+-  # avoid the cmake policy warning about @rpath in MacOSX
+-  cmake_policy(SET CMP0042 NEW)
+-
+-  SET(CMAKE_MACOSX_RPATH TRUE) # initialize the MACOSX_RPATH property on all targets
+-  SET(CMAKE_SKIP_BUILD_RPATH  FALSE) # don't skip the full RPATH for the build tree
+-  # SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) # when building, don't use the install RPATH already
+-  SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) # when building, use the install RPATH already
+-                                           # probably not needed
+-  # SET(CMAKE_INSTALL_RPATH "") # the RPATH to be used when installing
+-  SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) # LC_RPATH for CUDA and OpenCV etc written into executable
+-endif(APPLE)
+-
+ # FIND BOOST
+ set(BOOST_REQUIRED_COMPONENTS "atomic;chrono;date_time;filesystem;program_options;serialization;system;thread;timer;math_c99")
+ if(WIN32)
+
--- a/pkgs/development/libraries/cctag/default.nix
+++ b/pkgs/development/libraries/cctag/default.nix
@ -4,7 +4,7 @@
  fetchFromGitHub,

  cmake,
-  boost179,
+  boost,
  eigen,
  opencv,
  tbb,
@ -14,19 +14,18 @@

 stdenv.mkDerivation rec {
  pname = "cctag";
-  version = "1.0.3";
+  version = "1.0.4";

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

  src = fetchFromGitHub {
    owner = "alicevision";
    repo = "CCTag";
    rev = "v${version}";
-    hash = "sha256-foB+e7BCuUucyhN8FsI6BIT3/fsNLTjY6QmjkMWZu6A=";
+    hash = "sha256-M35KGTTmwGwXefsFWB2UKAKveUQyZBW7V8ejgOAJpXk=";
  };

  cmakeFlags = [
@ -41,8 +40,15 @@ stdenv.mkDerivation rec {

  patches = [
    ./cmake-install-include-dir.patch
+    ./cmake-no-apple-rpath.patch
  ];

+  # darwin boost doesn't have math_c99 libraries
+  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace CMakeLists.txt --replace-warn ";math_c99" ""
+    substituteInPlace src/CMakeLists.txt --replace-warn "Boost::math_c99" ""
+  '';
+
  nativeBuildInputs = [
    cmake
  ];
@ -52,13 +58,12 @@ stdenv.mkDerivation rec {
  ];

  buildInputs = [
-    boost179
+    boost
    eigen
    opencv.cxxdev
  ];

-  # Tests are broken on Darwin (linking issue)
-  doCheck = !stdenv.hostPlatform.isDarwin;
+  doCheck = true;

  meta = with lib; {
    description = "Detection of CCTag markers made up of concentric circles";
--- a/pkgs/development/python-modules/corallium/default.nix
+++ b/pkgs/development/python-modules/corallium/default.nix
@ -11,14 +11,14 @@
 }:
 buildPythonPackage rec {
  pname = "corallium";
-  version = "0.3.3";
+  version = "2.1.1";
  format = "pyproject";

  src = fetchFromGitHub {
    owner = "KyleKing";
    repo = pname;
-    rev = version;
-    hash = "sha256-fZzm3o8EwegNG+sYn8lbPz60NMyA/OzGFUf/J/lbGbI=";
+    tag = version;
+    hash = "sha256-0P8qmX+1zigL4jaA4TTuqAzFkyhQUfdGmPLxkFnT0qE=";
  };

  build-system = [
--- a/pkgs/development/python-modules/datashader/default.nix
+++ b/pkgs/development/python-modules/datashader/default.nix
@ -1,7 +1,6 @@
 {
  lib,
  buildPythonPackage,
-  pythonOlder,
  fetchFromGitHub,
  hatchling,
  hatch-vcs,
@ -24,16 +23,14 @@

 buildPythonPackage rec {
  pname = "datashader";
-  version = "0.18.0";
+  version = "0.18.1";
  pyproject = true;

-  disabled = pythonOlder "3.9";
-
  src = fetchFromGitHub {
    owner = "holoviz";
    repo = "datashader";
    tag = "v${version}";
-    hash = "sha256-HduEO2XDH20tovtlpg5DbF96G5Lpbo+XVmQKnWvfyL8=";
+    hash = "sha256-nQsVuj4zK5bfF617K71n+El5/ZC7vNia7dhrIqv7t+M=";
  };

  build-system = [
@ -68,6 +65,7 @@ buildPythonPackage rec {
    description = "Data visualization toolchain based on aggregating into a grid";
    mainProgram = "datashader";
    homepage = "https://datashader.org";
+    changelog = "https://github.com/holoviz/datashader/blob/${src.tag}/CHANGELOG.rst";
    license = lib.licenses.bsd3;
    maintainers = with lib.maintainers; [ nickcao ];
  };
--- a/pkgs/development/python-modules/dramatiq-abort/default.nix
+++ b/pkgs/development/python-modules/dramatiq-abort/default.nix
@ -0,0 +1,52 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  gevent,
+  pytestCheckHook,
+  pytest-cov,
+  dramatiq,
+  redis,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "dramatiq-abort";
+  version = "1.2.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Flared";
+    repo = "dramatiq-abort";
+    tag = "v${version}";
+    hash = "sha256-i5vL9yjQQambG8m6RDByr7/j8+PhDdLsai3pDrH1A4Q=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    dramatiq
+  ];
+
+  optional-dependencies = {
+    all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies));
+    gevent = [ gevent ];
+    redis = [ redis ];
+  };
+
+  nativeCheckInputs = [
+    redis
+    pytestCheckHook
+    pytest-cov
+  ];
+
+  pythonImportsCheck = [ "dramatiq_abort" ];
+
+  meta = {
+    changelog = "https://github.com/Flared/dramatiq-abort/releases/tag/v${version}";
+    description = "Dramatiq extension to abort message";
+    homepage = "https://github.com/Flared/dramatiq-abort";
+    license = lib.licenses.lgpl3Plus;
+    maintainers = with lib.maintainers; [ tebriel ];
+  };
+}
--- a/pkgs/development/python-modules/edk2-pytool-library/default.nix
+++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix
@ -17,16 +17,16 @@

 buildPythonPackage rec {
  pname = "edk2-pytool-library";
-  version = "0.23.2";
+  version = "0.23.3";
  pyproject = true;

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

  src = fetchFromGitHub {
    owner = "tianocore";
    repo = "edk2-pytool-library";
    tag = "v${version}";
-    hash = "sha256-ThAYxOgYa7IQEbizdH2b2oTulJu9oX9V/7v4o8vxXQM=";
+    hash = "sha256-fWt9epsc77YCQiB5BeuCHUZ2Or8ddgMDSZPHC4f3yZ8=";
  };

  build-system = [
--- a/pkgs/development/python-modules/fitdecode/default.nix
+++ b/pkgs/development/python-modules/fitdecode/default.nix
@ -0,0 +1,36 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "fitdecode";
+  version = "0.10.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "polyvertex";
+    repo = "fitdecode";
+    tag = "v${version}";
+    hash = "sha256-pW1PgJGqFL2reOYYfpGnQ4WoYFKGMNY8iQJzyHYOly8=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "fitdecode" ];
+
+  meta = {
+    changelog = "https://github.com/polyvertex/fitdecode/blob/${src.tag}/HISTORY.rst";
+    description = "FIT file parsing and decoding library written in Python3";
+    license = lib.licenses.mit;
+    homepage = "https://github.com/polyvertex/fitdecode";
+    maintainers = with lib.maintainers; [ tebriel ];
+  };
+}
--- a/pkgs/development/python-modules/managesieve/default.nix
+++ b/pkgs/development/python-modules/managesieve/default.nix
@ -9,14 +9,14 @@

 buildPythonPackage rec {
  pname = "managesieve";
-  version = "0.8";
+  version = "0.8.1";
  pyproject = true;

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-2CCb6h69H58YT1byj/fkrfzGsMUbr0GHpJLcMpsSE/M=";
+    hash = "sha256-LVwe0Pn6YPIAuoIaxXMfvCbOfS4NAjozkrdMNZDq+uU=";
  };

  nativeBuildInputs = [ setuptools ];
--- a/pkgs/development/python-modules/pygount/default.nix
+++ b/pkgs/development/python-modules/pygount/default.nix
@ -12,29 +12,25 @@

 buildPythonPackage rec {
  pname = "pygount";
-  version = "2.0.0";
+  version = "3.1.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "roskakori";
    repo = "pygount";
    tag = "v${version}";
-    hash = "sha256-l2Rq+4u6NwUIwMYWY/qfne7DrG0guv6hwnqVq5wszAo=";
+    hash = "sha256-hoj27L1wXOjzU3jdWIP5MtlO6fzKOYXfW/Pf3AdYKc0=";
  };

  build-system = [
    hatchling
  ];

-  pythonRelaxDeps = [
-    "rich"
-  ];
-
  dependencies = [
-    pygments
    chardet
-    rich
    gitpython
+    pygments
+    rich
  ];

  nativeCheckInputs = [
@ -45,6 +41,7 @@ buildPythonPackage rec {
    # requires network access
    "test_can_find_files_from_mixed_cloned_git_remote_url_and_local"
    "test_can_extract_and_close_and_find_files_from_cloned_git_remote_url_with_revision"
+    "test_succeeds_on_not_git_extension"
  ];

  pythonImportsCheck = [ "pygount" ];
@ -53,7 +50,7 @@ buildPythonPackage rec {
    description = "Count lines of code for hundreds of languages using pygments";
    mainProgram = "pygount";
    homepage = "https://github.com/roskakori/pygount";
-    changelog = "https://github.com/roskakori/pygount/blob/${src.rev}/CHANGES.md";
+    changelog = "https://github.com/roskakori/pygount/blob/${src.tag}/docs/changes.md";
    license = with lib.licenses; [ bsd3 ];
    maintainers = with lib.maintainers; [ nickcao ];
  };
--- a/Show More
+++ b/Show More