Merge master into staging-next

maintainers/maintainer-list.nix

@@ -7912,6 +7912,17 @@
     githubId = 11909469;
     name = "Fabian Geiselhart";
   };
+  f4z3r = {
+    email = "f4z3r-github@pm.me";
+    name = "Jakob Beckmann";
+    github = "f4z3r";
+    githubId = 32326425;
+    keys = [
+      {
+        fingerprint = "358A 6251 E2ED EDC1 9717  14A7 96A8 BA6E C871 2183";
+      }
+    ];
+  };
   fab = {
     email = "mail@fabian-affolter.ch";
     matrix = "@fabaff:matrix.org";

maintainers/scripts/luarocks-packages.csv

@@ -143,6 +143,7 @@ rtp.nvim,,,,,,mrcjkb
 rustaceanvim,,,,,,mrcjkb
 say,,,,,,
 serpent,,,,,,lockejan
+sofa,,,,,,f4z3r
 sqlite,,,,,,
 std._debug,,,,,,
 std.normalize,,,,,,

nixos/modules/services/networking/pdns-recursor.nix

@@ -287,7 +287,10 @@ in
 
     systemd.packages = [ pkgs.pdns-recursor ];
 
-    systemd.services.pdns-recursor.wantedBy = [ "multi-user.target" ];
+    systemd.services.pdns-recursor = {
+      restartTriggers = [ config.environment.etc."/pdns-recursor/recursor.yml".source ];
+      wantedBy = [ "multi-user.target" ];
+    };
 
     users.users.pdns-recursor = {
       isSystemUser = true;

pkgs/applications/editors/vim/plugins/generated.nix

@@ -3625,6 +3625,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  darcubox-nvim = buildVimPlugin {
+    pname = "darcubox-nvim";
+    version = "2025-06-03";
+    src = fetchFromGitHub {
+      owner = "Koalhack";
+      repo = "darcubox-nvim";
+      rev = "59754cb99fee640da1b64730a17476593af92fd3";
+      sha256 = "1xbpisq980hkdybjkd2pxdz8ghhk1a4y33ygpgi311rzx1ijapgs";
+    };
+    meta.homepage = "https://github.com/Koalhack/darcubox-nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   darkearth-nvim = buildVimPlugin {
     pname = "darkearth-nvim";
     version = "2025-04-27";

pkgs/applications/editors/vim/plugins/vim-plugin-names

@@ -277,6 +277,7 @@ https://github.com/amiorin/ctrlp-z/,,
 https://github.com/ctrlpvim/ctrlp.vim/,,
 https://github.com/scottmckendry/cyberdream.nvim/,,
 https://github.com/JachymPutta/dailies.nvim/,HEAD,
+https://github.com/Koalhack/darcubox-nvim/,HEAD,
 https://github.com/ptdewey/darkearth-nvim/,HEAD,
 https://github.com/dart-lang/dart-vim-plugin/,,
 https://github.com/rizzatti/dash.vim/,HEAD,

pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt-pipewire-1.4.patch

@@ -1,20 +0,0 @@
---- a/src/modules/video_capture/linux/pipewire_session.cc
-+++ b/src/modules/video_capture/linux/pipewire_session.cc
-@@ -87,7 +87,7 @@ PipeWireNode::PipeWireNode(PipeWireSession* session,
-       .param = OnNodeParam,
-   };
- 
--  pw_node_add_listener(proxy_, &node_listener_, &node_events, this);
-+  pw_node_add_listener(reinterpret_cast<pw_node*>(proxy_), &node_listener_, &node_events, this);
- }
- 
- // static
-@@ -119,7 +119,7 @@ void PipeWireNode::OnNodeInfo(void* data, const pw_node_info* info) {
-       uint32_t id = info->params[i].id;
-       if (id == SPA_PARAM_EnumFormat &&
-           info->params[i].flags & SPA_PARAM_INFO_READ) {
--        pw_node_enum_params(that->proxy_, 0, id, 0, UINT32_MAX, nullptr);
-+        pw_node_enum_params(reinterpret_cast<pw_node*>(that->proxy_), 0, id, 0, UINT32_MAX, nullptr);
-         break;
-       }
-     }

pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix

@@ -33,22 +33,16 @@
 
 stdenv.mkDerivation {
   pname = "tg_owt";
-  version = "0-unstable-2024-10-28";
+  version = "0-unstable-2025-06-02";
 
   src = fetchFromGitHub {
     owner = "desktop-app";
     repo = "tg_owt";
-    rev = "8198c4d8b91e22d68eb5c7327fd408e3b6abcc79";
-    hash = "sha256-3sLa3Px0VWgRYqnnLlwLnx+WWnneqZyhQPrRMBriXQA=";
+    rev = "62321fd7128ab2650b459d4195781af8185e46b5";
+    hash = "sha256-l6EdHJLd42TU+4pLakdU3a5PLVxrxjta0CSRy5hVBFU=";
     fetchSubmodules = true;
   };
 
-  patches = [
-    # Fix build with Pipewire 1.4
-    # Submitted upstream: https://webrtc-review.googlesource.com/c/src/+/380500
-    ./tg_owt-pipewire-1.4.patch
-  ];
-
   postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
     substituteInPlace src/modules/desktop_capture/linux/wayland/egl_dmabuf.cc \
       --replace-fail '"libEGL.so.1"' '"${lib.getLib libGL}/lib/libEGL.so.1"' \

pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix

@@ -10,6 +10,10 @@
   python3,
   tdlib,
   tg_owt ? callPackage ./tg_owt.nix { inherit stdenv; },
+  libavif,
+  libheif,
+  libjxl,
+  kimageformats,
   qtbase,
   qtimageformats,
   qtsvg,
@@ -47,14 +51,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "telegram-desktop-unwrapped";
-  version = "5.14.3";
+  version = "5.15.2";
 
   src = fetchFromGitHub {
     owner = "telegramdesktop";
     repo = "tdesktop";
     rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-nNYQpWbBK+E/LAbwTWpNUhs2+wb8iuMfqkxJKjaFmhg=";
+    hash = "sha256-T+gzNY3jPfCWjV9yFEGlz8kNGeAioyDUD2qazM/j05I=";
   };
 
   postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
@@ -98,6 +102,17 @@ stdenv.mkDerivation (finalAttrs: {
       boost
       ada
       (tdlib.override { tde2eOnly = true; })
+      # even though the last 3 dependencies are already in `kimageformats`,
+      # because of a logic error in the cmake files, in td 5.15.{1,2} it
+      # doesn't link when you don't add them explicitly
+      #
+      # this has been fixed
+      # (https://github.com/desktop-app/cmake_helpers/pull/413), remove next
+      # release
+      kimageformats
+      libavif
+      libheif
+      libjxl
     ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [
       protobuf
@@ -147,6 +162,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://desktop.telegram.org/";
     changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v${finalAttrs.version}";
     maintainers = with lib.maintainers; [ nickcao ];
-    mainProgram = if stdenv.hostPlatform.isLinux then "telegram-desktop" else "Telegram";
+    mainProgram = "Telegram";
   };
 })

pkgs/build-support/trivial-builders/default.nix

@@ -1037,6 +1037,7 @@ rec {
             "tag"
             "url"
             "outputHash"
+            "outputHashAlgo"
           ] src
         );
       in

pkgs/by-name/co/corrscope/package.nix

@@ -1,45 +1,40 @@
 {
   stdenv,
   lib,
-  python3Packages,
   fetchFromGitHub,
   ffmpeg,
-  libsForQt5,
+  python3Packages,
+  qt6Packages,
   testers,
   corrscope,
 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "corrscope";
-  version = "0.10.1";
+  version = "0.11.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "corrscope";
     repo = "corrscope";
     tag = version;
-    hash = "sha256-WSv65jEu/w6iNrL/f5PN147FBjmR0j30H1D39dd+KN8=";
+    hash = "sha256-76qa4jOSncK1eDly/uXJzpWWdsEz7Hg3DyFb7rmrQBc=";
   };
 
-  pythonRelaxDeps = [
-    "attrs"
-    "ruamel.yaml"
+  nativeBuildInputs = with qt6Packages; [
+    wrapQtAppsHook
   ];
 
-  nativeBuildInputs =
-    (with libsForQt5; [
-      wrapQtAppsHook
-    ])
-    ++ (with python3Packages; [
-      poetry-core
-    ]);
+  build-system = with python3Packages; [
+    hatchling
+  ];
 
   buildInputs =
     [
       ffmpeg
     ]
     ++ (
-      with libsForQt5;
+      with qt6Packages;
       [
         qtbase
       ]
@@ -48,20 +43,24 @@ python3Packages.buildPythonApplication rec {
       ]
     );
 
-  propagatedBuildInputs = with python3Packages; [
-    appdirs
-    appnope
-    atomicwrites
-    attrs
-    click
-    matplotlib
-    numpy
-    packaging
-    qtpy
-    pyqt5
-    ruamel-yaml
-    colorspacious
-  ];
+  dependencies = (
+    with python3Packages;
+    [
+      appdirs
+      atomicwrites
+      attrs
+      click
+      colorspacious
+      matplotlib
+      numpy
+      qtpy
+      pyqt6
+      ruamel-yaml
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      appnope
+    ]
+  );
 
   dontWrapQtApps = true;
 
@@ -80,7 +79,7 @@ python3Packages.buildPythonApplication rec {
     command = "env HOME=$TMPDIR ${lib.getExe corrscope} --version";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Render wave files into oscilloscope views, featuring advanced correlation-based triggering algorithm";
     longDescription = ''
       Corrscope renders oscilloscope views of WAV files recorded from chiptune (game music from
@@ -90,9 +89,10 @@ python3Packages.buildPythonApplication rec {
       Genesis/FM synthesis) which jump around on other oscilloscope programs.
     '';
     homepage = "https://github.com/corrscope/corrscope";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ OPNA2608 ];
-    platforms = platforms.all;
+    changelog = "https://github.com/corrscope/corrscope/releases/tag/${version}";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ OPNA2608 ];
+    platforms = lib.platforms.all;
     mainProgram = "corr";
   };
 }

pkgs/by-name/hy/hyprshell/package.nix

@@ -8,18 +8,18 @@
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
-  pname = "hyprswitch";
-  version = "3.3.2";
+  pname = "hyprshell";
+  version = "4.1.1";
 
   src = fetchFromGitHub {
     owner = "H3rmt";
     repo = "hyprswitch";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cmo544QvdacVTHPqmc6er4xnSSc63e6Z71BS0FxSklE=";
+    hash = "sha256-eSTeNVHkfUS6qlN1pWWpMVeT+jjacithCHOpOhRKanA=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-DEifup2oAcqZplx2JoN3hkP1VmxwYVFS8ZqfpR80baA=";
+  cargoHash = "sha256-NzyK46zmHWxFaTS9mzFC7kBUMys1sjmcWaZUcwLusEk=";
 
   nativeBuildInputs = [
     wrapGAppsHook4
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   meta = {
     description = "CLI/GUI that allows switching between windows in Hyprland";
-    mainProgram = "hyprswitch";
+    mainProgram = "hyprshell";
     homepage = "https://github.com/H3rmt/hyprswitch";
     license = lib.licenses.mit;
     platforms = lib.platforms.linux;

pkgs/by-name/is/isponsorblocktv/package.nix

@@ -59,6 +59,6 @@ python3Packages.buildPythonApplication rec {
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ lukegb ];
     mainProgram = "iSponsorBlockTV";
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }

pkgs/by-name/ji/jimtcl/package.nix

@@ -10,8 +10,8 @@
 
   sqlite,
   readline,
-  SDL,
-  SDL_gfx,
+  SDL2,
+  SDL2_gfx,
   openssl,
 
   SDLSupport ? true,
@@ -41,8 +41,8 @@ stdenv.mkDerivation (finalAttrs: {
       openssl
     ]
     ++ (lib.optionals SDLSupport [
-      SDL
-      SDL_gfx
+      SDL2
+      SDL2_gfx
     ]);
 
   configureFlags = [

pkgs/by-name/ki/killport/package.nix

@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Command-line tool to easily kill processes running on a specified port";
     homepage = "https://github.com/jkfran/killport";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ sno2wman ];
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "killport";
   };
 })

pkgs/by-name/li/libnick/package.nix

@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libnick";
-  version = "2025.5.3";
+  version = "2025.6.1";
 
   src = fetchFromGitHub {
     owner = "NickvisionApps";
     repo = "libnick";
     tag = finalAttrs.version;
-    hash = "sha256-JibExEI5MisKZ9kEIOMzDg8A8LEM8U+ckGFfnZu+ghQ=";
+    hash = "sha256-Ir2Jke1zK4pKldQJHaT0Ju0ubz7H6nx16hDNl6u48Ck=";
   };
 
   nativeBuildInputs =

pkgs/by-name/li/librashader/package.nix

@@ -1,18 +1,19 @@
 {
   fetchFromGitHub,
   lib,
+  nix-update-script,
   rustPlatform,
   stdenv,
 }:
 
-rustPlatform.buildRustPackage {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "librashader";
   version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "SnowflakePowered";
     repo = "librashader";
-    rev = "librashader-v0.6.2";
+    tag = "librashader-v${finalAttrs.version}";
     hash = "sha256-zkvCpQ5Cq3sDOspc12/gPmNi6hn/nBe1UfWrMGi/o0Q=";
   };
 
@@ -58,6 +59,13 @@ rustPlatform.buildRustPackage {
       runHook postInstall
     '';
 
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex"
+      "librashader-v(.*)"
+    ];
+  };
+
   meta = {
     description = "RetroArch Shaders for All";
     homepage = "https://github.com/SnowflakePowered/librashader";
@@ -68,4 +76,4 @@ rustPlatform.buildRustPackage {
     maintainers = with lib.maintainers; [ nadiaholmquist ];
     platforms = lib.platforms.all;
   };
-}
+})

pkgs/by-name/ml/mlt/package.nix

@@ -32,8 +32,6 @@
   python3,
   swig,
   qt ? null,
-  enableSDL1 ? stdenv.hostPlatform.isLinux,
-  SDL,
   enableSDL2 ? true,
   SDL2,
   gitUpdater,
@@ -104,10 +102,6 @@ stdenv.mkDerivation rec {
       (qt.qt5compat or null)
       libarchive
     ]
-    ++ lib.optionals enableSDL1 [
-      SDL
-      libX11
-    ]
     ++ lib.optionals enableSDL2 [
       SDL2
       libX11

pkgs/by-name/op/openpgp-card-tools/package.nix

@@ -13,18 +13,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "openpgp-card-tools";
-  version = "0.11.8";
+  version = "0.11.9";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "openpgp-card";
     repo = "openpgp-card-tools";
     rev = "v${version}";
-    hash = "sha256-pE7AAgps8LlsmM97q/XIi7If1UwNP/0uJH9wOeZ6neM=";
+    hash = "sha256-kT/egkOBOomUX+fwT3OeRSZOnGeuFRLKKAXtW8nN4rw=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-/OC/+eMRBF2MICVUtsJR0m62fWLP0lr10J/XkKGcPnA=";
+  cargoHash = "sha256-mZZ8veY3iqsgScfFAGYo496qxTew24R5NxYf3WjnHco=";
 
   nativeBuildInputs = [
     installShellFiles

pkgs/by-name/pr/pre-commit/package.nix

@@ -1,32 +1,36 @@
 {
   lib,
-  fetchFromGitHub,
+  stdenv,
   python3Packages,
-  libiconv,
-  cargo,
-  coursier,
-  dotnet-sdk,
-  gitMinimal,
-  go,
-  nodejs,
-  perl,
-  cabal-install,
+  fetchFromGitHub,
   julia,
   julia-bin,
+
+  # tests
+  cabal-install,
+  cargo,
+  gitMinimal,
+  go,
+  perl,
+  versionCheckHook,
+  writableTmpDirAsHomeHook,
+  coursier,
+  dotnet-sdk,
+  nodejs,
+
+  # passthru
+  callPackage,
   pre-commit,
 }:
 
-with python3Packages;
 let
   i686Linux = stdenv.buildPlatform.system == "i686-linux";
   julia' = if lib.meta.availableOn stdenv.hostPlatform julia then julia else julia-bin;
 in
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "pre-commit";
   version = "4.2.0";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.9";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pre-commit";
@@ -41,7 +45,11 @@ buildPythonApplication rec {
     ./pygrep-pythonpath.patch
   ];
 
-  propagatedBuildInputs = [
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
     cfgv
     identify
     nodeenv
@@ -52,19 +60,22 @@ buildPythonApplication rec {
 
   nativeCheckInputs =
     [
+      cabal-install
       cargo
       gitMinimal
       go
-      libiconv # For rust tests on Darwin
+      julia'
       perl
+      versionCheckHook
+      writableTmpDirAsHomeHook
+    ]
+    ++ (with python3Packages; [
       pytest-env
       pytest-forked
       pytest-xdist
       pytestCheckHook
       re-assert
-      cabal-install
-      julia'
-    ]
+    ])
     ++ lib.optionals (!i686Linux) [
       # coursier can be moved back to the main nativeCheckInputs list once we’re able to bootstrap a
       # JRE on i686-linux: <https://github.com/NixOS/nixpkgs/issues/314873>. When coursier gets
@@ -79,14 +90,15 @@ buildPythonApplication rec {
       # Node.js-related tests that are currently disabled on i686-linux.
       nodejs
     ];
+  versionCheckProgramArg = "--version";
 
   postPatch = ''
     substituteInPlace pre_commit/resources/hook-tmpl \
       --subst-var-by pre-commit $out
     substituteInPlace pre_commit/languages/python.py \
-      --subst-var-by virtualenv ${virtualenv}
+      --subst-var-by virtualenv ${python3Packages.virtualenv}
     substituteInPlace pre_commit/languages/node.py \
-      --subst-var-by nodeenv ${nodeenv}
+      --subst-var-by nodeenv ${python3Packages.nodeenv}
 
     patchShebangs pre_commit/resources/hook-tmpl
   '';
@@ -110,8 +122,6 @@ buildPythonApplication rec {
       export DOTNET_ROOT="${dotnet-sdk}/share/dotnet"
     ''
     + ''
-      export HOME=$(mktemp -d)
-
       git init -b master
 
       python -m venv --system-site-packages venv
@@ -213,11 +223,12 @@ buildPythonApplication rec {
     inherit gitMinimal pre-commit;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Framework for managing and maintaining multi-language pre-commit hooks";
     homepage = "https://pre-commit.com/";
-    license = licenses.mit;
-    maintainers = with maintainers; [ borisbabic ];
+    changelog = "https://github.com/pre-commit/pre-commit/blob/v${version}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ borisbabic ];
     mainProgram = "pre-commit";
   };
 }

pkgs/by-name/re/remind/package.nix

@@ -16,14 +16,14 @@
 
 tcl.mkTclDerivation rec {
   pname = "remind";
-  version = "05.03.07";
+  version = "05.04.00";
 
   src = fetchFromGitea {
     domain = "git.skoll.ca";
     owner = "Skollsoft-Public";
     repo = "Remind";
     rev = version;
-    hash = "sha256-gp6YGDh7gkCk4KFaPBfD72RJLbwGNz8iVAV764bfNe8=";
+    hash = "sha256-O+rAXUl5vEBEl/S3FvBzofbcydFul0mF5NhT2Fzf6n8=";
   };
 
   propagatedBuildInputs = lib.optionals withGui [

pkgs/by-name/si/signal-cli/package.nix

@@ -12,12 +12,12 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "signal-cli";
-  version = "0.13.15";
+  version = "0.13.16";
 
   # Building from source would be preferred, but is much more involved.
   src = fetchurl {
     url = "https://github.com/AsamK/signal-cli/releases/download/v${finalAttrs.version}/signal-cli-${finalAttrs.version}.tar.gz";
-    hash = "sha256-Qe+An/AFbyN0nhKQc4Ke6ApKdZldXyw4HzbAunfb87s=";
+    hash = "sha256-L2c2UyJCNITDEvtAfPjRzjskoA3v06oI8LNw9CW4mT8=";
   };
 
   buildInputs = lib.optionals stdenvNoCC.hostPlatform.isLinux [

pkgs/by-name/si/simdutf/package.nix

@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "simdutf";
-  version = "7.2.0";
+  version = "7.3.0";
 
   src = fetchFromGitHub {
     owner = "simdutf";
     repo = "simdutf";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ZfC0k1Z7nOeauHYTKjMt73qhoTn4c15dZWvICeuYhM8=";
+    hash = "sha256-P1Ryi0LdibqrHfBjq2lLBMQfB0WjLA69K3SwK/apFZM=";
   };
 
   # Fix build on darwin

pkgs/by-name/sn/snx-rs/package.nix

@@ -1,7 +1,7 @@
 {
   fetchFromGitHub,
   glib,
-  gtk3,
+  gtk4,
   iproute2,
   kdePackages,
   lib,
@@ -14,17 +14,19 @@
   pkg-config,
   rustPlatform,
   webkitgtk_4_1,
+  graphene,
   nix-update-script,
+  versionCheckHook,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "snx-rs";
-  version = "3.1.2";
+  version = "4.4.1";
 
   src = fetchFromGitHub {
     owner = "ancwrd1";
     repo = "snx-rs";
     tag = "v${version}";
-    hash = "sha256-bLuIXd2pqqiyEP+lDTJYVDZkRZ0HcDkKFZd/qlpuf98=";
+    hash = "sha256-Juv38ALXf1nMeokBH7Z+39oIscXW7S+OxdD/ZSNs49U=";
   };
 
   passthru.updateScript = nix-update-script { };
@@ -36,7 +38,7 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = [
     glib
-    gtk3
+    gtk4
     kdePackages.kstatusnotifieritem
     libappindicator
     libappindicator-gtk2
@@ -45,19 +47,24 @@ rustPlatform.buildRustPackage rec {
     libsoup_3
     openssl
     webkitgtk_4_1
+    graphene
   ];
 
-  postPatch = ''
-    substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
-      --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
-  '';
-
   checkFlags = [
     "--skip=platform::linux::net::tests::test_default_ip"
+    "--skip=platform::linux::tests::test_xfrm_check"
+  ];
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
   ];
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-E5OJVf9CkLn5mFtk4Yacs2OIvAuIw0idSs7QuTNvfgU=";
+  cargoHash = "sha256-NcoTdu/CQRu0RuZjlngP8lTPaomEiPTcfn2hAt+YjwA=";
+
+  doInstallCheck = true;
+  versionCheckProgram = "${placeholder "out"}/bin/snx-rs";
+  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Open source Linux client for Checkpoint VPN tunnels";

pkgs/by-name/tk/tkmm/package.nix

@@ -0,0 +1,93 @@
+{
+  lib,
+  buildDotnetModule,
+  fetchFromGitHub,
+  dotnetCorePackages,
+  makeDesktopItem,
+  copyDesktopItems,
+  libX11,
+  glew,
+  libGL,
+  libICE,
+  libSM,
+  libXcursor,
+  libXext,
+  libXi,
+  libXrandr,
+}:
+buildDotnetModule (finalAttrs: {
+  pname = "Tkmm";
+  version = "2.0.0-beta3";
+
+  src = fetchFromGitHub {
+    owner = "TKMM-Team";
+    repo = "Tkmm";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-XdnNKnusvWhNy/0rQCULft6ztsB/nhTeQiN4F9LmxJE=";
+    fetchSubmodules = true;
+  };
+
+  patches = [ ./patchTk.diff ];
+
+  selfContainedBuild = true;
+
+  dotnet-sdk = dotnetCorePackages.sdk_9_0;
+  dotnet-runtime = dotnetCorePackages.runtime_9_0;
+  projectFile = [
+    "src/Tkmm/Tkmm.csproj"
+    "src/Tkmm.CLI/Tkmm.CLI.csproj"
+  ];
+  nugetDeps = ./deps.json;
+  executables = [
+    "Tkmm"
+    "Tkmm.CLI"
+  ];
+
+  nativeBuildInputs = [ copyDesktopItems ];
+
+  runtimeDeps = [
+    # Avalonia UI
+    libX11
+    libGL
+    glew
+    libICE
+    libSM
+    libXcursor
+    libXext
+    libXi
+    libXrandr
+  ];
+
+  enableParallelBuilding = false;
+  dotnetFlags = [
+    ''-p:DefineConstants="READONLY_FS"''
+  ];
+
+  postInstall = ''
+    install -D distribution/appimage/tkmm.svg $out/share/icons/hicolor/scalable/apps/tkmm.svg
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "Tears of the Kingdom Mod Manager";
+      exec = "Tkmm";
+      icon = "tkmm";
+      desktopName = "TKMM";
+      categories = [
+        "Game"
+      ];
+      comment = "Tears of the Kingdom Mod Manager";
+    })
+  ];
+
+  meta = {
+    description = "Tears of the Kingdom Mod Manager, a mod merger and manager for TotK";
+    homepage = "https://tkmm.org/";
+    license = lib.licenses.mit;
+    mainProgram = "Tkmm";
+    maintainers = with lib.maintainers; [
+      rucadi
+    ];
+    platforms = lib.platforms.unix;
+  };
+})

pkgs/by-name/tk/tkmm/patchTk.diff

@@ -0,0 +1,52 @@
+diff --git a/lib/TkSharp/TkSharp.sln b/lib/TkSharp/TkSharp.sln
+index a396543..7e5cd89 100644
+--- a/lib/TkSharp/TkSharp.sln
++++ b/lib/TkSharp/TkSharp.sln
+@@ -2,8 +2,6 @@
+ Microsoft Visual Studio Solution File, Format Version 12.00
+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TkSharp.Merging", "TkSharp.Merging\TkSharp.Merging.csproj", "{DEFF5FDF-6ABF-4CF1-8825-E188C01D77EB}"
+ EndProject
+-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TkSharp.Debug", "TkSharp.Debug\TkSharp.Debug.csproj", "{E5F7133C-0485-4FE3-9FA1-0D7BAB5A5894}"
+-EndProject
+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TkSharp.Core", "TkSharp.Core\TkSharp.Core.csproj", "{3785C128-08C5-4D0C-BDD4-4B217FE8A4F2}"
+ EndProject
+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TkSharp.Data.Embedded", "TkSharp.Data.Embedded\TkSharp.Data.Embedded.csproj", "{D5BEA381-0C5C-4F95-8968-E287AF7A5E62}"
+@@ -14,8 +12,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions",
+ EndProject
+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TkSharp.Extensions.GameBanana", "Extensions\TkSharp.Extensions.GameBanana\TkSharp.Extensions.GameBanana.csproj", "{F5F2C443-90E7-4FD5-A9F5-60C94F8B6F24}"
+ EndProject
+-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TkSharp.DevTools", "Tools\TkSharp.DevTools\TkSharp.DevTools.csproj", "{B5BC7BF1-4B0F-4EA7-B2F8-C3FCCF4E871F}"
+-EndProject
+ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{FB5598AD-83AC-4235-9F06-35364AAFC83F}"
+ EndProject
+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TkSharp.Packaging", "TkSharp.Packaging\TkSharp.Packaging.csproj", "{ABF0ED1C-F240-4926-A772-0065E865177E}"
+@@ -32,10 +28,6 @@ Global
+ 		{DEFF5FDF-6ABF-4CF1-8825-E188C01D77EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ 		{DEFF5FDF-6ABF-4CF1-8825-E188C01D77EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ 		{DEFF5FDF-6ABF-4CF1-8825-E188C01D77EB}.Release|Any CPU.Build.0 = Release|Any CPU
+-		{E5F7133C-0485-4FE3-9FA1-0D7BAB5A5894}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+-		{E5F7133C-0485-4FE3-9FA1-0D7BAB5A5894}.Debug|Any CPU.Build.0 = Debug|Any CPU
+-		{E5F7133C-0485-4FE3-9FA1-0D7BAB5A5894}.Release|Any CPU.ActiveCfg = Release|Any CPU
+-		{E5F7133C-0485-4FE3-9FA1-0D7BAB5A5894}.Release|Any CPU.Build.0 = Release|Any CPU
+ 		{3785C128-08C5-4D0C-BDD4-4B217FE8A4F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ 		{3785C128-08C5-4D0C-BDD4-4B217FE8A4F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ 		{3785C128-08C5-4D0C-BDD4-4B217FE8A4F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+@@ -52,10 +44,6 @@ Global
+ 		{F5F2C443-90E7-4FD5-A9F5-60C94F8B6F24}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ 		{F5F2C443-90E7-4FD5-A9F5-60C94F8B6F24}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ 		{F5F2C443-90E7-4FD5-A9F5-60C94F8B6F24}.Release|Any CPU.Build.0 = Release|Any CPU
+-		{B5BC7BF1-4B0F-4EA7-B2F8-C3FCCF4E871F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+-		{B5BC7BF1-4B0F-4EA7-B2F8-C3FCCF4E871F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+-		{B5BC7BF1-4B0F-4EA7-B2F8-C3FCCF4E871F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+-		{B5BC7BF1-4B0F-4EA7-B2F8-C3FCCF4E871F}.Release|Any CPU.Build.0 = Release|Any CPU
+ 		{ABF0ED1C-F240-4926-A772-0065E865177E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ 		{ABF0ED1C-F240-4926-A772-0065E865177E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ 		{ABF0ED1C-F240-4926-A772-0065E865177E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+@@ -67,7 +55,6 @@ Global
+ 	EndGlobalSection
+ 	GlobalSection(NestedProjects) = preSolution
+ 		{F5F2C443-90E7-4FD5-A9F5-60C94F8B6F24} = {D8795FB6-F381-4A6F-A52C-52C9ABB4E56A}
+-		{B5BC7BF1-4B0F-4EA7-B2F8-C3FCCF4E871F} = {FB5598AD-83AC-4235-9F06-35364AAFC83F}
+ 		{1356EF7B-1A17-432E-B47D-C6EF71A3B9CE} = {D8795FB6-F381-4A6F-A52C-52C9ABB4E56A}
+ 	EndGlobalSection
+ EndGlobal

pkgs/by-name/we/werf/package.nix

@@ -10,17 +10,17 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "werf";
-  version = "2.36.3";
+  version = "2.37.1";
 
   src = fetchFromGitHub {
     owner = "werf";
     repo = "werf";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vTw2kUaCemRwZwzF6NGkqJ67A88AakbynQn55e4cnGw=";
+    hash = "sha256-FIahppFWQx1UCR7mo3oiFT1SDOoySmqc7Fc2E5XMglY=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-wo7hXzSUwT+gdtu82S88bPr2DUvBGAHIcRQ75j4mY2o=";
+  vendorHash = "sha256-u/sG/UZt76Sr3Ckiv8Nn2JnMrVsAIlSWWTvs+Yfn6eU=";
 
   subPackages = [ "cmd/werf" ];
 

pkgs/by-name/wo/woodpecker-plugin-git/package.nix

@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "woodpecker-plugin-git";
-  version = "2.6.4";
+  version = "2.6.5";
 
   src = fetchFromGitHub {
     owner = "woodpecker-ci";
     repo = "plugin-git";
     tag = version;
-    hash = "sha256-iCB2GQ8SpuW+uT8RyMNb6cq4bbWIeMO069yq4a+nIVI=";
+    hash = "sha256-9eTkdhlgY7hDqzbgBeoW6mITYsEJFcnRcilruD6wzU4=";
   };
 
   vendorHash = "sha256-Zn2TYNyKvtmtEAlKmWBhjyzHiM0dwDT3E/LOtSzjFK0=";

pkgs/by-name/ya/yamlfmt/package.nix

@@ -35,7 +35,7 @@ buildGoModule rec {
     homepage = "https://github.com/google/yamlfmt";
     changelog = "https://github.com/google/yamlfmt/releases/tag/v${version}";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ sno2wman ];
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "yamlfmt";
   };
 }

pkgs/by-name/ze/zed-editor/package.nix

@@ -99,7 +99,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zed-editor";
-  version = "0.188.3";
+  version = "0.189.5";
 
   outputs =
     [ "out" ]
@@ -111,7 +111,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "zed-industries";
     repo = "zed";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZyKFzb6/kVw/uLTmhnyrwmgyTHTwgu/WbOga409eZvg=";
+    hash = "sha256-d1d3WgUVamrYWVosljQiEPZGNNDldtM1YwZhxseX4+w=";
   };
 
   patches = [
@@ -138,7 +138,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-0Nwdw20YdezGvUCkFw6ZV55qsebIhtnIoPoHd4tgIyA=";
+  cargoHash = "sha256-YhdwCNTbBphWugguoWQqrGf2fRB5Jv40MElW6hbcxtk=";
 
   nativeBuildInputs =
     [

pkgs/development/lisp-modules/asdf/2.26.nix

@@ -33,7 +33,6 @@ stdenv.mkDerivation rec {
     mkdir -p "$out"/share/doc/asdf/
     cp -r ./* "$out"/lib/common-lisp/asdf/
     cp -r doc/* "$out"/share/doc/asdf/
-    ln -s  "$out"/lib/common-lisp/{asdf/uiop,uiop}
   '';
 
   meta = with lib; {

pkgs/development/lua-modules/generated-packages.nix

@@ -4706,6 +4706,50 @@ final: prev: {
     }
   ) { };
 
+  sofa = callPackage (
+    {
+      buildLuarocksPackage,
+      fetchFromGitHub,
+      fetchurl,
+      luaAtLeast,
+      luaOlder,
+      argparse,
+      compat53,
+      luatext,
+      lyaml,
+    }:
+    buildLuarocksPackage {
+      pname = "sofa";
+      version = "0.7.0-0";
+      knownRockspec =
+        (fetchurl {
+          url = "mirror://luarocks/sofa-0.7.0-0.rockspec";
+          sha256 = "0hkdm4h8yjh5zw9116cclff8q6br4yyhb7f7y7lv4ydrkxfl1lzq";
+        }).outPath;
+      src = fetchFromGitHub {
+        owner = "f4z3r";
+        repo = "sofa";
+        rev = "v0.7.0";
+        hash = "sha256-aoFmzhzWuBTbDnSWDGLbkhORlrtvVOtfIV7oq2xc0pQ=";
+      };
+
+      disabled = luaOlder "5.1" || luaAtLeast "5.5";
+      propagatedBuildInputs = [
+        argparse
+        compat53
+        luatext
+        lyaml
+      ];
+
+      meta = {
+        homepage = "https://github.com/f4z3r/sofa";
+        description = "A command execution engine powered by rofi.";
+        maintainers = with lib.maintainers; [ f4z3r ];
+        license.fullName = "MIT <http://opensource.org/licenses/MIT>";
+      };
+    }
+  ) { };
+
   sqlite = callPackage (
     {
       buildLuarocksPackage,

pkgs/development/lua-modules/overrides.nix

@@ -977,6 +977,18 @@ in
     '';
   });
 
+  sofa = prev.sofa.overrideAttrs (oa: {
+    nativeBuildInputs = oa.nativeBuildInputs ++ [
+      installShellFiles
+    ];
+    postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+      installShellCompletion --cmd sofa \
+        --bash <($out/bin/sofa --completion bash) \
+        --fish <($out/bin/sofa --completion fish) \
+        --zsh <($out/bin/sofa --completion zsh)
+    '';
+  });
+
   sqlite = prev.sqlite.overrideAttrs (drv: {
     doCheck = stdenv.hostPlatform.isLinux;
     nativeCheckInputs = [

pkgs/development/python-modules/fastapi-mcp/default.nix

@@ -64,6 +64,8 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  __darwinAllowLocalNetworking = true;
+
   meta = {
     description = "Expose your FastAPI endpoints as Model Context Protocol (MCP) tools, with Auth";
     homepage = "https://github.com/tadata-org/fastapi_mcp";

pkgs/development/python-modules/fastmcp/default.nix

@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
 
@@ -7,6 +8,7 @@
   hatchling,
 
   # dependencies
+  authlib,
   exceptiongroup,
   httpx,
   mcp,
@@ -14,24 +16,24 @@
   python-dotenv,
   rich,
   typer,
-  websockets,
 
   # tests
   dirty-equals,
   fastapi,
+  pytest-httpx,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "fastmcp";
-  version = "2.4.0";
+  version = "2.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jlowin";
     repo = "fastmcp";
     tag = "v${version}";
-    hash = "sha256-F4lgMm/84svLZo6SZ7AubsC73s4tffqjJcd9gvA7hGA=";
+    hash = "sha256-UQV/hIu96ukpJxUhOux0mos0o6j4kvsFp2NJHa47tbw=";
   };
 
   postPatch = ''
@@ -45,6 +47,7 @@ buildPythonPackage rec {
   ];
 
   dependencies = [
+    authlib
     exceptiongroup
     httpx
     mcp
@@ -52,7 +55,6 @@ buildPythonPackage rec {
     python-dotenv
     rich
     typer
-    websockets
   ];
 
   pythonImportsCheck = [ "fastmcp" ];
@@ -60,9 +62,28 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     dirty-equals
     fastapi
+    pytest-httpx
     pytestCheckHook
   ];
 
+  disabledTests = [
+    # AssertionError: assert 'INFO' == 'DEBUG'
+    "test_temporary_settings"
+  ];
+
+  disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [
+    # RuntimeError: Server failed to start after 10 attempts
+    "tests/auth/providers/test_bearer.py"
+    "tests/auth/test_oauth_client.py"
+    "tests/client/test_openapi.py"
+    "tests/client/test_sse.py"
+    "tests/client/test_streamable_http.py"
+    "tests/server/http/test_http_dependencies.py"
+    "tests/server/http/test_http_dependencies.py"
+  ];
+
+  __darwinAllowLocalNetworking = true;
+
   meta = {
     description = "The fast, Pythonic way to build MCP servers and clients";
     changelog = "https://github.com/jlowin/fastmcp/releases/tag/v${version}";

pkgs/development/python-modules/mcp/default.nix

@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
 
@@ -27,22 +28,24 @@
   websockets,
 
   # tests
+  inline-snapshot,
   pytest-asyncio,
   pytest-examples,
+  pytest-xdist,
   pytestCheckHook,
   requests,
 }:
 
 buildPythonPackage rec {
   pname = "mcp";
-  version = "1.9.1";
+  version = "1.9.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "modelcontextprotocol";
     repo = "python-sdk";
     tag = "v${version}";
-    hash = "sha256-8u02/tHR2F1CpjcHXHC8sZC+/JrWz1satqYa/zdSGDw=";
+    hash = "sha256-3r7NG2AnxxKgAAd3n+tjjPTz4WJRmc7isfh3p21hUa0=";
   };
 
   postPatch = ''
@@ -85,8 +88,10 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "mcp" ];
 
   nativeCheckInputs = [
+    inline-snapshot
     pytest-asyncio
     pytest-examples
+    pytest-xdist
     pytestCheckHook
     requests
   ] ++ lib.flatten (lib.attrValues optional-dependencies);
@@ -96,19 +101,27 @@ buildPythonPackage rec {
     "ignore::pydantic.warnings.PydanticDeprecatedSince211"
   ];
 
-  disabledTests = [
-    # attempts to run the package manager uv
-    "test_command_execution"
+  disabledTests =
+    [
+      # attempts to run the package manager uv
+      "test_command_execution"
 
-    # performance-dependent test
-    "test_messages_are_executed_concurrently"
+      # performance-dependent test
+      "test_messages_are_executed_concurrently"
 
-    # ExceptionGroup: unhandled errors in a TaskGroup (1 sub-exception)
-    "test_client_session_version_negotiation_failure"
+      # ExceptionGroup: unhandled errors in a TaskGroup (1 sub-exception)
+      "test_client_session_version_negotiation_failure"
 
-    # AttributeError: 'coroutine' object has no attribute 'client_metadata'
-    "TestOAuthClientProvider"
-  ];
+      # AttributeError: 'coroutine' object has no attribute 'client_metadata'
+      "TestOAuthClientProvider"
+
+      # inline_snapshot._exceptions.UsageError: snapshot value should not change. Use Is(...) for dynamic snapshot parts
+      "test_build_metadata"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      # Flaky: ExceptionGroup: unhandled errors in a TaskGroup (1 sub-exception)
+      "test_notification_validation_error"
+    ];
 
   __darwinAllowLocalNetworking = true;
 

pkgs/development/python-modules/oelint-data/default.nix

@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "oelint-data";
-  version = "1.0.15";
+  version = "1.0.16";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "priv-kweihmann";
     repo = "oelint-data";
     tag = version;
-    hash = "sha256-OZtBJWjAYuwXt1ehgt6bIZPeVByXCjOcctPJGLrsxiU=";
+    hash = "sha256-t6NGD1IHRHfB2kJT0LwSpCicaan3ptagNDE2JV+IkE4=";
   };
 
   build-system = [

pkgs/development/python-modules/sanic-ext/default.nix

@@ -0,0 +1,75 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # Build system
+  setuptools,
+
+  # Dependencies
+  pyyaml,
+
+  # Test dependencies
+  pytestCheckHook,
+
+  sanic-testing,
+  attrs,
+  coverage,
+  msgspec,
+  pydantic,
+  pytest,
+  pytest-cov,
+  pytest-asyncio,
+  tox,
+  jinja2,
+}:
+
+buildPythonPackage rec {
+  pname = "sanic-ext";
+  version = "24.12.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "sanic-org";
+    repo = "sanic-ext";
+    tag = "v${version}";
+    hash = "sha256-H1tqiPQ4SwlNGj7GtB2h7noZpU+gbGXIbmRK1TSSqVA=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    pyyaml
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+
+    sanic-testing
+    attrs
+    coverage
+    msgspec
+    pydantic
+    pytest
+    pytest-cov
+    pytest-asyncio
+    tox
+    jinja2
+  ];
+
+  disabledTests = [
+    "test_models[FooPydanticDataclass]" # KeyError: 'paths'
+    "test_pydantic_base_model[AlertResponsePydanticBaseModel-True]" # AssertionError: assert 'AlertPydanticBaseModel' in {'AlertResponsePydanticBaseModel': ... }
+    "test_pydantic_base_model[AlertResponsePydanticDataclass-True]" # AssertionError: assert 'AlertPydanticDataclass' in {'AlertResponsePydanticDataclass': ... }
+  ];
+
+  pythonImportsCheck = [ "sanic_ext" ];
+
+  meta = {
+    description = "Common, officially supported extension plugins for the Sanic web server framework";
+    homepage = "https://github.com/sanic-org/sanic-ext/";
+    changelog = "https://github.com/sanic-org/sanic-ext/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ p0lyw0lf ];
+  };
+}

pkgs/development/python-modules/sanic/default.nix

@@ -13,6 +13,7 @@
   pytest-asyncio,
   pytestCheckHook,
   pythonOlder,
+  sanic-ext,
   sanic-routing,
   sanic-testing,
   setuptools,
@@ -54,9 +55,7 @@ buildPythonPackage rec {
   ];
 
   optional-dependencies = {
-    ext = [
-      # TODO: sanic-ext
-    ];
+    ext = [ sanic-ext ];
     http3 = [ aioquic ];
   };
 

pkgs/top-level/aliases.nix

@@ -888,6 +888,7 @@ mapAliases {
   hyenae = throw "hyenae has been removed because it fails to build and was unmaintained for 15 years"; # Added 2025-04-04
   hyprgui = throw "hyprgui has been removed as the repository is deleted"; # Added 2024-12-27
   hyprlauncher = throw "hyprlauncher has been removed as the repository is deleted"; # Added 2024-12-27
+  hyprswitch = throw "hyprswitch has been renamed to hyprshell"; # Added 2025-06-01
   hyprwall = throw "hyprwall has been removed as the repository is deleted"; # Added 2024-12-27
 
   ### I ###

pkgs/top-level/python-packages.nix

@@ -15664,6 +15664,8 @@ self: super: with self; {
 
   sanic-auth = callPackage ../development/python-modules/sanic-auth { };
 
+  sanic-ext = callPackage ../development/python-modules/sanic-ext { };
+
   sanic-routing = callPackage ../development/python-modules/sanic-routing { };
 
   sanic-testing = callPackage ../development/python-modules/sanic-testing { };