Merge staging-next into staging

maintainers/maintainer-list.nix

@@ -11404,6 +11404,12 @@
     githubId = 56727311;
     keys = [ { fingerprint = "B1B2 2BA0 FC39 D4B4 2240  5F55 D86C D68E 8DB2 E368"; } ];
   };
+  jamerrq = {
+    name = "Jamer José";
+    email = "jamerrq@gmail.com";
+    github = "jamerrq";
+    githubId = 35697365;
+  };
   james-atkins = {
     name = "James Atkins";
     github = "james-atkins";
@@ -15625,6 +15631,12 @@
     githubId = 1729331;
     name = "Dominique Martinet";
   };
+  martinimoe = {
+    email = "moe@martini.moe";
+    github = "martinimoe";
+    githubId = 7438779;
+    name = "Martini Moe";
+  };
   martinjlowm = {
     email = "martin@martinjlowm.dk";
     github = "martinjlowm";
@@ -21641,6 +21653,12 @@
       { fingerprint = "C0A7 A9BB 115B C857 4D75  EA99 BBB7 A680 1DF1 E03F"; }
     ];
   };
+  ritascarlet = {
+    email = "sashasafonov080@gmail.com";
+    github = "ritascarlet";
+    githubId = 137996547;
+    name = "Alex Safonov";
+  };
   ritiek = {
     name = "Ritiek Malhotra";
     email = "ritiekmalhotra123@gmail.com";
@@ -25018,6 +25036,12 @@
     matrix = "@tensor5:matrix.org";
     name = "Nicola Squartini";
   };
+  teohz = {
+    email = "gitstuff@teohz.com";
+    github = "teohz";
+    githubId = 77596774;
+    name = "Teohz";
+  };
   teozkr = {
     email = "teo@nullable.se";
     github = "nightkr";

pkgs/by-name/ar/arashi/package.nix

@@ -0,0 +1,33 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "arashi";
+  version = "25.08.3";
+
+  src = fetchFromGitHub {
+    owner = "0hStormy";
+    repo = "Arashi";
+    tag = finalAttrs.version;
+    hash = "sha256-wmYsAfgdwn6ZLF70avNmjoU5VZNBZdV7dPSe8ycNdHE=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/icons/Arashi
+    cp -r . $out/share/icons/Arashi/
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Arashi icon theme";
+    homepage = "https://github.com/0hStormy/Arashi";
+    license = lib.licenses.cc-by-sa-40;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ ritascarlet ];
+  };
+})

pkgs/by-name/bu/bumblebee-status/package.nix

@@ -85,6 +85,6 @@ python3.pkgs.buildPythonPackage {
     mainProgram = "bumblebee-status";
     license = licenses.mit;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ augustebaum ];
+    maintainers = with maintainers; [ jamerrq ];
   };
 }

pkgs/by-name/cc/cctv-viewer/package.nix

@@ -0,0 +1,64 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  qt5,
+  ffmpeg,
+  gtest,
+  libva,
+}:
+
+stdenv.mkDerivation {
+  pname = "cctv-viewer";
+  version = "0.1.9-unstable-2025-06-13";
+
+  src = fetchFromGitHub {
+    owner = "iEvgeny";
+    repo = "cctv-viewer";
+    rev = "8a8fff2612ae2123b8be156c954a29706383b480";
+    hash = "sha256-Euw9S+iONAEENkFwo169x/+pcyeTXLe8wb70KKjv3bE=";
+    fetchSubmodules = true;
+  };
+
+  cmakeFlags = [
+    "-DBUILD_TESTS=OFF"
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    qt5.wrapQtAppsHook
+    qt5.qttools
+    gtest
+  ];
+
+  buildInputs = [
+    qt5.qtbase
+    qt5.qtquickcontrols2
+    qt5.qtsvg
+    qt5.qtmultimedia
+    qt5.qtgraphicaleffects
+    ffmpeg
+    libva
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -D cctv-viewer --target-directory=$out/bin
+    install -Dm644 $src/cctv-viewer.desktop --target-directory=$out/share/applications
+    install -Dm644 $src/images/cctv-viewer.svg --target-directory=$out/share/icons/hicolor/scalable/apps
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Viewer and mounter for video streams";
+    homepage = "https://cctv-viewer.org";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ teohz ];
+    platforms = lib.platforms.linux;
+  };
+}

pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix

@@ -40,6 +40,9 @@ stdenv.mkDerivation rec {
     # so this removes 1) the popup about it when you first start the program, 2) the option in the settings
     # and makes the program always know that it is set up
     ./remove-urlscheme-settings.patch
+
+    # Upstream requested that sentry is only to be used with official builds, remove it so it doesn't complain about the lack of DSN
+    ./remove-sentry.patch
   ];
   postPatch = ''
     # oslib doesn't seem to do releases and hasn't had a change since 2021, so always use commit d6ee6549bb
@@ -71,11 +74,6 @@ stdenv.mkDerivation rec {
 
   gradleBuildTask = "application:jpackage";
 
-  env = {
-    # The source no longer contains this, so this has been extracted from the binary releases
-    SENTRY_DSN = "https://1aacf97280717f749dfc93a1713f9551@o4507814449774592.ingest.de.sentry.io/4507814504759376";
-  };
-
   installPhase = ''
     runHook preInstall
 

pkgs/by-name/ed/ed-odyssey-materials-helper/remove-sentry.patch

@@ -0,0 +1,53 @@
+diff --git a/application/src/main/java/nl/jixxed/eliteodysseymaterials/Main.java b/application/src/main/java/nl/jixxed/eliteodysseymaterials/Main.java
+index 04b101f0..2e589e12 100644
+--- a/application/src/main/java/nl/jixxed/eliteodysseymaterials/Main.java
++++ b/application/src/main/java/nl/jixxed/eliteodysseymaterials/Main.java
+@@ -51,48 +51,6 @@ public class Main {
+                 System.exit(0);
+             }
+             log.info("launching app with java version: " + getVersion());
+-            if (System.getProperty("sentry.dsn") == null || System.getProperty("sentry.dsn").isBlank() || System.getProperty("sentry.dsn").equals("null")) {
+-                log.error("Sentry DSN is not set. Please set the DSN.");
+-            }
+-            Sentry.init(options -> {
+-
+-                final String buildVersion = getBuildVersion();
+-                options.setDsn(System.getProperty("sentry.dsn"));
+-                options.setEnvironment(getEnvironment(buildVersion));
+-                options.setRelease("edomh-app@" + buildVersion);
+-                options.setEnabled(!buildVersion.equals("dev"));
+-                options.setBeforeSend((event, hint) -> {
+-                    if (!VersionService.isLatestVersion()) {
+-                        return null;  // Returning null prevents the event from being sent to Sentry
+-                    }
+-                    if (Duration.between(lastSentTime, Instant.now()).getSeconds() < 30) {
+-                        return null;  // Throttle if less than 30 seconds have passed
+-                    }
+-                    lastSentTime = Instant.now();
+-                    String supportFile = "";
+-                    try {
+-                        supportFile = SupportService.createSupportPackage();
+-                    } catch (Exception e) {
+-                        log.error("Failed to create support package", e);
+-                    }
+-                    if (!supportFile.isBlank()) {
+-                        Attachment attachment = new Attachment(supportFile);
+-                        hint.addAttachment(attachment);
+-                    }
+-                    OperatingSystem os = new OperatingSystem();
+-                    os.setName(System.getProperty("os.name"));
+-                    os.setVersion(System.getProperty("os.version"));
+-                    os.setBuild(System.getProperty("os.arch"));
+-                    event.getContexts().setOperatingSystem(os);
+-                    if (APPLICATION_STATE.getFileheader() != null) {
+-                        event.setTag("game.version", APPLICATION_STATE.getFileheader().getGameversion());
+-                        event.setTag("game.build", APPLICATION_STATE.getFileheader().getBuild());
+-                        event.setTag("game.language", APPLICATION_STATE.getFileheader().getLanguage());
+-                        event.setTag("game.odyssey", String.valueOf(APPLICATION_STATE.getFileheader().getOdyssey()));
+-                    }
+-                    return event;
+-                });
+-            });
+             FXApplication.launchFx(args);
+         }
+     }

pkgs/by-name/fr/freecad/package.nix

@@ -118,6 +118,12 @@ freecad-utils.makeCustomizable (
         url = "https://github.com/FreeCAD/FreeCAD/commit/3d2b7dc9c7ac898b30fe469b7cbd424ed1bca0a2.patch?full_index=1";
         hash = "sha256-XCQdv/+dYdJ/ptA2VKrD63qYILyaP276ISMkmWLtT30=";
       })
+      # Inform Coin to use EGL when on Wayland
+      # https://github.com/FreeCAD/FreeCAD/pull/21917
+      (fetchpatch {
+        url = "https://github.com/FreeCAD/FreeCAD/commit/60aa5ff3730d77037ffad0c77ba96b99ef0c7df3.patch?full_index=1";
+        hash = "sha256-K6PWQ1U+/fsjDuir7MiAKq71CAIHar3nKkO6TKYl32k=";
+      })
     ];
 
     cmakeFlags = [

pkgs/by-name/go/google-chrome/package.nix

@@ -170,11 +170,11 @@ let
 
   linux = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "139.0.7258.66";
+    version = "139.0.7258.127";
 
     src = fetchurl {
       url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-DY1hFlYKVSWRYuK1DGaqxr4x+kEmXnr/GsKBC39rCxk=";
+      hash = "sha256-84T/yRj7KBPybttKSRLN7sP1Ki8C8qfo3OKfZI/vAP8=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -275,11 +275,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "139.0.7258.67";
+    version = "139.0.7258.128";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/l4kjdkw5j5zarcsucmoo3n4idi_139.0.7258.67/GoogleChrome-139.0.7258.67.dmg";
-      hash = "sha256-IfJlHRpMZy1DFmOC6yZ5dphchdOSvUYf7s3+ngQ7pL4=";
+      url = "http://dl.google.com/release2/chrome/kg4v265dmolyd75txmmp4a5np4_139.0.7258.128/GoogleChrome-139.0.7258.128.dmg";
+      hash = "sha256-UzCkawKshzXoi2FK34QxwHXyHIsjDeu8BxL2+p7t9W8=";
     };
 
     dontPatch = true;

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

@@ -8,6 +8,7 @@
   libgeotiff,
   libtiff,
   laszip_2,
+  zlib,
   fixDarwinDylibNames,
 }:
 
@@ -57,6 +58,7 @@ stdenv.mkDerivation rec {
     libgeotiff
     libtiff
     laszip_2
+    zlib
   ];
 
   cmakeFlags = [

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

@@ -2,28 +2,41 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchurl,
   autoreconfHook,
   pkg-config,
   SDL2,
   alsa-lib,
   ffmpeg,
-  lua5_3,
+  lua5_4,
   qt5,
+  xorg,
   file,
   binutils,
   makeDesktopItem,
+
+  # Forces libTAS to run in X11.
+  # Enabled by default because libTAS does not support Wayland.
+  withForceX11 ? true,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libtas";
-  version = "1.4.5";
+  version = "1.4.6";
 
   src = fetchFromGitHub {
     owner = "clementgallet";
     repo = "libTAS";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-n4iaJG9k+/TFfGMDCYL83Z6paxpm/gY3thP9T84GeQU=";
+    hash = "sha256-/hyKJ8HGLN7hT+9If/lcp0C7GnhJMRpc7EKDgA1kQcI=";
   };
+  patches = [
+    # Fixes `undefined symbol: SDL_Log` errors
+    (fetchurl {
+      url = "https://github.com/clementgallet/libTAS/commit/779ff0fb0f3accfc62949680d85ecf96b28d18ef.patch";
+      hash = "sha256-xAaTWIXt8FkMu6GE5mBWtLypROFZ1aEqmBTtG+6rTWk=";
+    })
+  ];
 
   nativeBuildInputs = [
     autoreconfHook
@@ -34,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
     SDL2
     alsa-lib
     ffmpeg
-    lua5_3
+    lua5_4
     qt5.qtbase
   ];
 
@@ -58,6 +71,13 @@ stdenv.mkDerivation (finalAttrs: {
           ffmpeg
         ]
       } \
+      --suffix LD_LIBRARY_PATH : ${
+        lib.makeLibraryPath [
+          xorg.libXi
+          ffmpeg.lib
+        ]
+      } \
+      ${lib.optionalString withForceX11 "--set QT_QPA_PLATFORM xcb"} \
       --set-default LIBTAS_SO_PATH $out/lib/libtas.so
   '';
 

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

@@ -1,21 +1,21 @@
 {
   lib,
-  beamPackages,
+  beamMinimal28Packages,
   makeWrapper,
-  rebar3,
-  elixir,
-  erlang,
   fetchFromGitHub,
   nixosTests,
   nix-update-script,
 }:
+let
+  beamPackages = beamMinimal28Packages;
+in
 beamPackages.mixRelease rec {
   pname = "livebook";
   version = "0.16.4";
 
-  inherit elixir;
+  inherit (beamPackages) elixir;
 
-  buildInputs = [ erlang ];
+  buildInputs = [ beamPackages.erlang ];
 
   nativeBuildInputs = [ makeWrapper ];
 
@@ -36,11 +36,11 @@ beamPackages.mixRelease rec {
     wrapProgram $out/bin/livebook \
       --prefix PATH : ${
         lib.makeBinPath [
-          elixir
-          erlang
+          beamPackages.elixir
+          beamPackages.erlang
         ]
       } \
-      --set MIX_REBAR3 ${rebar3}/bin/rebar3
+      --set MIX_REBAR3 ${beamPackages.rebar3}/bin/rebar3
   '';
 
   passthru = {

pkgs/by-name/ng/nghttp3/package.nix

@@ -6,14 +6,14 @@
   curlHTTP3,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "nghttp3";
   version = "1.11.0";
 
   src = fetchFromGitHub {
     owner = "ngtcp2";
     repo = "nghttp3";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-8WQfXzzF3K0IJNectrE1amQ6Njq4pZslrcVun6Uhi6E=";
     fetchSubmodules = true;
   };
@@ -36,11 +36,12 @@ stdenv.mkDerivation rec {
     inherit curlHTTP3;
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/ngtcp2/nghttp3";
+    changelog = "https://github.com/ngtcp2/nghttp3/releases/tag/${finalAttrs.src.tag}";
     description = "Implementation of HTTP/3 mapping over QUIC and QPACK in C";
-    license = licenses.mit;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ izorkin ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ izorkin ];
   };
-}
+})

pkgs/by-name/ra/rabbitmqadmin-ng/package.nix

@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rabbitmqadmin-ng";
-  version = "2.7.2";
+  version = "2.8.1";
 
   src = fetchFromGitHub {
     owner = "rabbitmq";
     repo = "rabbitmqadmin-ng";
     tag = "v${version}";
-    hash = "sha256-umt5eu26qkYa8GfAUCcfM7oTj4t9sTKF3dMLJ9RHYjQ=";
+    hash = "sha256-WI6v2XYb4/DwP7i7UIf8TtQJ3GFHgYTuxUhGWagJMsA=";
   };
 
-  cargoHash = "sha256-ehTvhm7U76Qz9zEfbh0/jWr/VyLkmULCnmLIGGw51Lk=";
+  cargoHash = "sha256-Q6cc5mzKMH3tZ0Qc0wqWIOy6tRSDmZLYSr5nzm7TloY=";
 
   buildInputs = [ openssl ];
   nativeBuildInputs = [ pkg-config ];

pkgs/by-name/ra/rainfrog/package.nix

@@ -7,7 +7,7 @@
   rainfrog,
 }:
 let
-  version = "0.3.4";
+  version = "0.3.5";
 in
 rustPlatform.buildRustPackage {
   inherit version;
@@ -17,10 +17,10 @@ rustPlatform.buildRustPackage {
     owner = "achristmascarl";
     repo = "rainfrog";
     tag = "v${version}";
-    hash = "sha256-uERAYdDM2yKowl8WH6FB1XEbjSO/S79Fdib2QQE95N4=";
+    hash = "sha256-XLub56L26HHRW1UoNOT/wY1j85dJyaFDmmESGgzUank=";
   };
 
-  cargoHash = "sha256-drL2rLuJExJI799Rvh0X/c6kTqJ+3wnqaDSRiz63Nuo=";
+  cargoHash = "sha256-ZDO6wDp3t+/uoQdQR9AROjyVOLZ6Jc/gvXjHQCWDtog=";
 
   passthru = {
     tests.version = testers.testVersion {

pkgs/by-name/sl/slipshow/package.nix

@@ -8,13 +8,13 @@
 
 ocamlPackages.buildDunePackage rec {
   pname = "slipshow";
-  version = "0.4.1";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "panglesd";
     repo = "slipshow";
     tag = "v${version}";
-    hash = "sha256-VUKh3O2FYsA8gUJQT0LxTV9psp/neYfYEmQS9cgeFW8=";
+    hash = "sha256-Q/ga5sQ3QfoRzlC7TD7HVKig+nxxk92hizDqYzJlW1Y=";
   };
 
   postPatch = ''

pkgs/by-name/so/sointu/package.nix

@@ -0,0 +1,59 @@
+{
+  buildGo123Module,
+  fetchFromGitHub,
+  lib,
+  pkg-config,
+  nix-update-script,
+  alsa-lib,
+  libGL,
+  libxkbcommon,
+  vulkan-headers,
+  wayland,
+  xorg,
+}:
+
+buildGo123Module {
+  pname = "sointu";
+  version = "0.4.1-unstable-2025-08-13";
+
+  src = fetchFromGitHub {
+    owner = "vsariola";
+    repo = "sointu";
+    rev = "74fea4138fd788eddeb726440c872937de56fd1c";
+    hash = "sha256-kHK35Bt/+ucPCsFE3p72J3jSHzhOK9QKtJPG+3grBvs=";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    alsa-lib
+    libGL
+    libxkbcommon
+    vulkan-headers
+    wayland
+    xorg.libX11
+    xorg.libXcursor
+    xorg.libXfixes
+  ];
+
+  proxyVendor = true;
+  vendorHash = "sha256-gLDLKqu6k7/nwv6xHUE6MIYrbQFfVFAuUiMbLptcE5k=";
+
+  subPackages = [
+    "cmd/sointu-track"
+    "cmd/sointu-compile"
+    "cmd/sointu-play"
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Fork of 4klang that can target 386, amd64 and WebAssembly";
+    mainProgram = "sointu-track";
+    homepage = "https://github.com/vsariola/sointu";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ martinimoe ];
+  };
+}

pkgs/by-name/sp/spotify/darwin.nix

@@ -11,18 +11,18 @@
 stdenv.mkDerivation {
   inherit pname;
 
-  version = "1.2.64.408";
+  version = "1.2.69.449";
 
   src =
     if stdenv.hostPlatform.isAarch64 then
       (fetchurl {
-        url = "https://web.archive.org/web/20250522123639/https://download.scdn.co/SpotifyARM64.dmg";
-        hash = "sha256-28T+AxhnM1K6W50JUu9RdFRKsBRDTQulKK2+kk2RTMQ=";
+        url = "https://web.archive.org/web/20250811170447/https://download.scdn.co/SpotifyARM64.dmg";
+        hash = "sha256-x9lpcQI1kZc4OIvQBhKXmI7t/2DIDbzufZhpNCKTxPA=";
       })
     else
       (fetchurl {
-        url = "https://web.archive.org/web/20250522130546/https://download.scdn.co/Spotify.dmg";
-        hash = "sha256-P8itkT2w7xQl0WfMLcNHgi1zcoYMqOdGmNDXdwhZBUs=";
+        url = "https://web.archive.org/web/20250811170211/https://download.scdn.co/Spotify.dmg";
+        hash = "sha256-z6pmQ3Wmwnd3YQNf1WPdPNCRxHX1PjqAEt50trGe0Bk=";
       });
 
   nativeBuildInputs = [ undmg ];

pkgs/by-name/va/vault-tasks/package.nix

@@ -8,7 +8,7 @@
   nix-update-script,
 }:
 let
-  version = "0.12.0";
+  version = "0.13.0";
 in
 rustPlatform.buildRustPackage {
   pname = "vault-tasks";
@@ -17,10 +17,10 @@ rustPlatform.buildRustPackage {
     owner = "louis-thevenet";
     repo = "vault-tasks";
     rev = "v${version}";
-    hash = "sha256-PMqGqvyxgkGRVahQ+ruDA0vFT0162DrZU92nT4SMTGw=";
+    hash = "sha256-XWeY2l82n51O4/LKPOJZOXf7PCRPOUshFg832iDvmuA=";
   };
 
-  cargoHash = "sha256-34c5i2kIoQuTkm1SF7bYX109noVGaGJ47b2FCxQUyB8=";
+  cargoHash = "sha256-znc2oKpovsXyrUhKvBVMorv7yWM39xNgaNDiq/5I6Dg=";
 
   nativeBuildInputs = [
     installShellFiles

pkgs/desktops/lomiri/applications/lomiri-camera-app/default.nix

@@ -28,13 +28,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-camera-app";
-  version = "4.1.0";
+  version = "4.1.1";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/apps/lomiri-camera-app";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rGWIcaU3iFZIse69DUVjCebWH18yVrqWHcGoXItGX3k=";
+    hash = "sha256-NRdZLBN+06/YCa+4L1elrmP2nQm/6DNg1EmRY73B+RQ=";
   };
 
   patches = [

pkgs/development/libraries/wayland/default.nix

@@ -36,15 +36,9 @@ stdenv.mkDerivation (finalAttrs: {
     ./darwin.patch
   ];
 
-  postPatch =
-    lib.optionalString withDocumentation ''
-      patchShebangs doc/doxygen/gen-doxygen.py
-    ''
-    + lib.optionalString stdenv.hostPlatform.isStatic ''
-      # delete line containing os-wrappers-test, disables
-      # the building of os-wrappers-test
-      sed -i '/os-wrappers-test/d' tests/meson.build
-    '';
+  postPatch = lib.optionalString withDocumentation ''
+    patchShebangs doc/doxygen/gen-doxygen.py
+  '';
 
   outputs = [
     "out"

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

@@ -0,0 +1,65 @@
+{
+  lib,
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  freezegun,
+  orjson,
+  pydevccu,
+  pytest-asyncio,
+  pytest-socket,
+  pytestCheckHook,
+  python-slugify,
+  setuptools,
+  voluptuous,
+}:
+
+buildPythonPackage rec {
+  pname = "aiohomematic";
+  version = "2025.8.6";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "SukramJ";
+    repo = "aiohomematic";
+    tag = version;
+    hash = "sha256-HmcBl+uFjEeyZdilqqTxQ8wrFbDr/8tsh/l0yoVfYJg=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools==80.9.0" "setuptools"
+  '';
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    aiohttp
+    orjson
+    python-slugify
+    voluptuous
+  ];
+
+  nativeCheckInputs = [
+    freezegun
+    pydevccu
+    pytest-asyncio
+    pytest-socket
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "aiohomematic" ];
+
+  disabledTests = [
+    # AssertionError: assert 548 == 555
+    "test_central_full"
+  ];
+
+  meta = {
+    description = "Module to interact with HomeMatic devices";
+    homepage = "https://github.com/SukramJ/aiohomematic";
+    changelog = "https://github.com/SukramJ/aiohomematic/blob/${src.tag}/changelog.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}

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

@@ -1,73 +0,0 @@
-{
-  lib,
-  aiohttp,
-  buildPythonPackage,
-  fetchFromGitHub,
-  freezegun,
-  orjson,
-  pydevccu,
-  pytest-aiohttp,
-  pytest-socket,
-  pytestCheckHook,
-  python-slugify,
-  pythonOlder,
-  setuptools,
-  voluptuous,
-}:
-
-buildPythonPackage rec {
-  pname = "hahomematic";
-  version = "2025.8.3";
-  pyproject = true;
-
-  disabled = pythonOlder "3.13";
-
-  src = fetchFromGitHub {
-    owner = "SukramJ";
-    repo = "hahomematic";
-    tag = version;
-    hash = "sha256-BztVWvDUDXTgC1uha7grD4hcWJqKcua4UVgy3KivWSI=";
-  };
-
-  __darwinAllowLocalNetworking = true;
-
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "setuptools==80.9.0" "setuptools" \
-  '';
-
-  build-system = [ setuptools ];
-
-  dependencies = [
-    aiohttp
-    orjson
-    python-slugify
-    voluptuous
-  ];
-
-  nativeCheckInputs = [
-    freezegun
-    pydevccu
-    pytest-aiohttp
-    pytest-socket
-    pytestCheckHook
-  ];
-
-  disabledTests = [
-    # AssertionError: assert 548 == 555
-    "test_central_full"
-  ];
-
-  pythonImportsCheck = [ "hahomematic" ];
-
-  meta = with lib; {
-    description = "Python module to interact with HomeMatic devices";
-    homepage = "https://github.com/SukramJ/hahomematic";
-    changelog = "https://github.com/SukramJ/hahomematic/blob/${src.tag}/changelog.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [
-      dotlambda
-      fab
-    ];
-  };
-}

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

@@ -36,13 +36,13 @@ assert !lapack.isILP64;
 
 buildPythonPackage rec {
   pname = "meep";
-  version = "1.30.1";
+  version = "1.31.0";
 
   src = fetchFromGitHub {
     owner = "NanoComp";
     repo = "meep";
     tag = "v${version}";
-    hash = "sha256-rXmOCkWm8SymhLiKNskSiS2bsHCmTlKMfLg5u3XniOk=";
+    hash = "sha256-x5OMdV/LJfklcK1KlYS0pdotsXP/SYzF7AOW5DlJvq0=";
   };
 
   format = "other";

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

@@ -1,4 +1,5 @@
 {
+  stdenv,
   lib,
   fetchFromGitHub,
   buildPythonPackage,
@@ -35,6 +36,12 @@ buildPythonPackage rec {
     typing-extensions
   ];
 
+  env =
+    { }
+    // lib.optionalAttrs stdenv.cc.isClang {
+      NIX_CFLAGS_COMPILE = "-Wno-error=unused-command-line-argument";
+    };
+
   nativeCheckInputs = [
     objgraph
     pytestCheckHook

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

@@ -1,10 +1,11 @@
 {
   lib,
   buildPythonPackage,
-  pythonAtLeast,
   fetchPypi,
-  setuptools,
+  legacy-cgi,
   pyasyncore,
+  pythonAtLeast,
+  setuptools,
   unittestCheckHook,
 }:
 
@@ -21,7 +22,9 @@ buildPythonPackage rec {
   build-system = [ setuptools ];
 
   # the built-in asyncore library was removed in python 3.12
-  dependencies = lib.optionals (pythonAtLeast "3.12") [ pyasyncore ];
+  dependencies =
+    lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ]
+    ++ lib.optionals (pythonAtLeast "3.12") [ pyasyncore ];
 
   pythonImportsCheck = [ "wsgitools" ];
 

pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix

@@ -2,20 +2,20 @@
   lib,
   buildHomeAssistantComponent,
   fetchFromGitHub,
-  hahomematic,
+  aiohomematic,
   home-assistant,
 }:
 
 buildHomeAssistantComponent rec {
   owner = "SukramJ";
   domain = "homematicip_local";
-  version = "1.85.1";
+  version = "1.85.2";
 
   src = fetchFromGitHub {
     owner = "SukramJ";
     repo = "custom_homematic";
     tag = version;
-    hash = "sha256-6dZKr65uGW67pExyhIYDu+3U7QmCVU9CaeUcBl2XPm4=";
+    hash = "sha256-uhSpWD7L1T345PjfAgywdscbHKVLKlzUVCG88HaKAac=";
   };
 
   postPatch = ''
@@ -26,7 +26,7 @@ buildHomeAssistantComponent rec {
   '';
 
   dependencies = [
-    hahomematic
+    aiohomematic
   ];
 
   meta = {

pkgs/servers/samba/4.x-no-persistent-install.patch

@@ -1,6 +1,8 @@
---- a/ctdb/wscript	2019-01-15 02:07:00.000000000 -0800
-+++ b/ctdb/wscript	2019-01-20 20:21:08.800187459 -0800
-@@ -814,7 +814,7 @@
+diff --git a/ctdb/wscript b/ctdb/wscript
+index e9cd89436a3..893b9a4c59e 100644
+--- a/ctdb/wscript
++++ b/ctdb/wscript
+@@ -862,7 +862,7 @@ def build(bld):
      for t in etc_subdirs:
          files = SUBDIR_MODE('%s/%s' % (configdir, t), trim_path=configdir)
          for fmode in files:
@@ -9,7 +11,7 @@
                                destname=fmode[0], chmod=fmode[1])
  
      # If this is a direct install and there are no event scripts
-@@ -852,24 +852,20 @@
+@@ -901,17 +901,13 @@ def build(bld):
      ]
  
      for t in etc_scripts:
@@ -17,16 +19,8 @@
 +        bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}', 'config/%s' % t,
                            destname=t, chmod=MODE_755)
  
-     bld.SAMBA_GENERATOR('ctdb-sudoers',
-                         source='config/ctdb.sudoers',
-                         target='ctdb.sudoers',
-                         rule='sed %s ${SRC} > ${TGT}' % (sed_cmdline))
--    bld.INSTALL_FILES('${SYSCONFDIR}/sudoers.d', 'ctdb.sudoers',
-+    bld.INSTALL_FILES('${EXEC_PREFIX}${SYSCONFDIR}/sudoers.d', 'ctdb.sudoers',
-                       destname='ctdb')
- 
 -    bld.INSTALL_FILES('${CTDB_ETCDIR}/events/notification',
-+    bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}/events/notification',
++    bld.INSTALL_FILES('${EXEC_PREFIX}$${CTDB_ETCDIR}/events/notification',
                        'config/notification.README',
                        destname='README')
  

pkgs/servers/samba/4.x.nix

@@ -26,11 +26,11 @@
   talloc,
   jansson,
   ldb,
+  lmdb,
   libtasn1,
   tdb,
   tevent,
   libxcrypt,
-  libxcrypt-legacy,
   cmocka,
   rpcsvc-proto,
   bash,
@@ -49,7 +49,6 @@
   avahi,
   enableDomainController ? false,
   gpgme,
-  lmdb,
   enableRegedit ? true,
   ncurses,
   enableCephFS ? false,
@@ -66,15 +65,6 @@
 }:
 
 let
-  # samba-tool requires libxcrypt-legacy algorithms
-  python = python3Packages.python.override {
-    self = python;
-    libxcrypt = libxcrypt-legacy;
-  };
-  wrapPython = python3Packages.wrapPython.override {
-    inherit python;
-  };
-
   inherit (lib) optional optionals;
 
   needsAnswers =
@@ -89,11 +79,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "samba";
-  version = "4.20.8";
+  version = "4.22.3";
 
   src = fetchurl {
     url = "https://download.samba.org/pub/samba/stable/samba-${finalAttrs.version}.tar.gz";
-    hash = "sha256-db4OjTH0UBPpsmD+fPMEo20tgSg5GRR3JXchXsFzqAc=";
+    hash = "sha256-j9cJJimjWW2TXNdWfZNJeflCcpGOw6/9DMgHk07PIro=";
   };
 
   outputs = [
@@ -104,7 +94,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = [
     ./4.x-no-persistent-install.patch
-    ./patch-source3__libads__kerberos_keytab.c.patch
     ./4.x-no-persistent-install-dynconfig.patch
     ./4.x-fix-makeflags-parsing.patch
     ./build-find-pre-built-heimdal-build-tools-in-case-of-.patch
@@ -123,6 +112,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     python3Packages.python
+    python3Packages.wrapPython
     wafHook
     pkg-config
     bison
@@ -148,8 +138,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     bash
-    wrapPython
-    python
+    python3Packages.python
     readline
     popt
     dbus
@@ -158,6 +147,7 @@ stdenv.mkDerivation (finalAttrs: {
     zlib
     gnutls
     libtasn1
+    lmdb
     tdb
     libxcrypt
   ]
@@ -182,7 +172,6 @@ stdenv.mkDerivation (finalAttrs: {
   ++ optional enableMDNS avahi
   ++ optionals enableDomainController [
     gpgme
-    lmdb
     python3Packages.dnspython
   ]
   ++ optional enableRegedit ncurses
@@ -230,7 +219,7 @@ stdenv.mkDerivation (finalAttrs: {
     "--disable-rpath"
     # otherwise third_party/waf/waflib/Tools/python.py would
     # get the wrong pythondir from build platform python
-    "--pythondir=${placeholder "out"}/${python.sitePackages}"
+    "--pythondir=${placeholder "out"}/${python3Packages.python.sitePackages}"
     (lib.enableFeature enablePrinting "cups")
   ]
   ++ optional (!enableDomainController) "--without-ad-dc"
@@ -245,7 +234,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ optional enableProfiling "--with-profiling-data"
   ++ optional (!enableAcl) "--without-acl-support"
   ++ optional (!enablePam) "--without-pam"
-  ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) ([
+  ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     "--bundled-libraries=!asn1_compile,!compile_et"
     "--cross-compile"
     (
@@ -254,7 +243,7 @@ stdenv.mkDerivation (finalAttrs: {
       else
         "--cross-answers=answers"
     )
-  ])
+  ]
   ++ optionals stdenv.buildPlatform.is32bit [
     # By default `waf configure` spawns as many as available CPUs. On
     # 32-bit systems with many CPUs (like `i686` chroot on `x86_64`
@@ -321,7 +310,7 @@ stdenv.mkDerivation (finalAttrs: {
     # Samba does its own shebang patching, but uses build Python
     find $out/bin -type f -executable | while read file; do
       isScript "$file" || continue
-      sed -i 's^${lib.getBin buildPackages.python3Packages.python}^${lib.getBin python}^' "$file"
+      sed -i 's^${lib.getBin buildPackages.python3Packages.python}^${lib.getBin python3Packages.python}^' "$file"
     done
   '';
 
@@ -349,17 +338,12 @@ stdenv.mkDerivation (finalAttrs: {
     broken = enableGlusterFS;
     maintainers = with maintainers; [ aneeshusa ];
     pkgConfigModules = [
-      "dcerpc_samr"
-      "dcerpc"
       "ndr_krb5pac"
       "ndr_nbt"
       "ndr_standard"
       "ndr"
       "netapi"
-      "samba-credentials"
-      "samba-hostconfig"
       "samba-util"
-      "samdb"
       "smbclient"
       "wbclient"
     ];

pkgs/servers/samba/build-find-pre-built-heimdal-build-tools-in-case-of-.patch

@@ -1,4 +1,4 @@
-From 48f7e6d66e2850088b8922024641173776222242 Mon Sep 17 00:00:00 2001
+From 475ec75a34002aafabc92659f693cf705c96aff4 Mon Sep 17 00:00:00 2001
 From: Nick Cao <nickcao@nichi.co>
 Date: Thu, 21 Nov 2024 15:30:00 -0500
 Subject: [PATCH] build: find pre-built heimdal build tools in case of embedded
@@ -35,18 +35,19 @@ Signed-off-by: Uri Simchoni <uri@samba.org>
 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
 [Bachp: rebased for version 4.15.0]
 [Mats: rebased for version 4.18.5]
+[hexa: rebased for version 4.22.3]
 ---
  wscript_configure_embedded_heimdal | 11 +++++++++++
  1 file changed, 11 insertions(+)
 
 diff --git a/wscript_configure_embedded_heimdal b/wscript_configure_embedded_heimdal
-index 45f47721de..6c5a4bcf01 100644
+index c1488e5506e..ede28ba7fc3 100644
 --- a/wscript_configure_embedded_heimdal
 +++ b/wscript_configure_embedded_heimdal
-@@ -13,3 +13,14 @@ conf.RECURSE('third_party/heimdal_build')
- # when this will be available also in
- # system libraries...
+@@ -15,3 +15,14 @@ conf.RECURSE('third_party/heimdal_build')
  conf.define('HAVE_CLIENT_GSS_C_CHANNEL_BOUND_FLAG', 1)
+ 
+ conf.define('HAVE_KRB5_INIT_CREDS_STEP', 1)
 +
 +def check_system_heimdal_binary(name):
 +    if conf.LIB_MAY_BE_BUNDLED(name):
@@ -59,5 +60,4 @@ index 45f47721de..6c5a4bcf01 100644
 +check_system_heimdal_binary("compile_et")
 +check_system_heimdal_binary("asn1_compile")
 -- 
-2.47.0
-
+2.50.1

pkgs/servers/samba/patch-source3__libads__kerberos_keytab.c.patch

@@ -1,20 +0,0 @@
---- old/source3/libads/kerberos_keytab.c	2017-12-23 14:23:53.247467000 +0100
-+++ new/source3/libads/kerberos_keytab.c	2017-12-23 18:57:07.135340000 +0100
-@@ -32,8 +32,6 @@
- 
- #ifdef HAVE_KRB5
- 
--#ifdef HAVE_ADS
--
- /* This MAX_NAME_LEN is a constant defined in krb5.h */
- #ifndef MAX_KEYTAB_NAME_LEN
- #define MAX_KEYTAB_NAME_LEN 1100
-@@ -85,6 +83,8 @@
- 	return ret;
- }
- 
-+#ifdef HAVE_ADS
-+
- /**********************************************************************
-  Adds a single service principal, i.e. 'host' to the system keytab
- ***********************************************************************/

pkgs/servers/varnish/default.nix

@@ -109,12 +109,12 @@ in
 {
   # EOL (LTS) TBA
   varnish60 = common {
-    version = "6.0.14";
-    hash = "sha256-tZlBf3ppntxxYSufEJ86ot6ujvnbfIyZOu9B3kDJ72k=";
+    version = "6.0.15";
+    hash = "sha256-VV0G10Glo+svBju+3G8gmRMF3w4nz8oj6X1v/28q5qw=";
   };
   # EOL 2026-03-15
   varnish77 = common {
-    version = "7.7.1";
-    hash = "sha256-TAbFyZaApCm3KTT5/VE5Y/fhuoVTszyn7BLIWlwrdRo=";
+    version = "7.7.2";
+    hash = "sha256-/ad1DhKBog6czMbGZkgdJDf6fA2BZZLIbk+3un/EZK0=";
   };
 }

pkgs/tools/admin/pgadmin/default.nix

@@ -13,30 +13,21 @@
   libtool,
   libpng,
   nasm,
-  cmake,
   pkg-config,
   stdenv,
-  srcOnly,
   server-mode ? true,
 }:
 
 let
   pname = "pgadmin";
-  version = "9.5";
-  yarnHash = "sha256-i3WCEpcZepB7K0A4QgjoLfkO7icew/8usJCo4DkWT6I=";
+  version = "9.6";
+  yarnHash = "sha256-G3iG11nPEtco7FJe1H4s85tMpHqmUgPbj68gADBqDfY=";
 
   src = fetchFromGitHub {
     owner = "pgadmin-org";
     repo = "pgadmin4";
     rev = "REL-${lib.versions.major version}_${lib.versions.minor version}";
-    hash = "sha256-5FwYkdhpg/2Cidi2qiFhhsQYbIwsp80K3MNxw5rp4ww=";
-  };
-
-  mozjpeg-bin = fetchFromGitHub {
-    owner = "imagemin";
-    repo = "mozjpeg-bin";
-    rev = "c0587fbc00b21ed8cad8bae499a0827baeaf7ffa";
-    hash = "sha256-D/pXQBlIIyk7KAgxJ1gKqxYxtlfBbLzUSmYZbH659cA=";
+    hash = "sha256-9WYyfioDb2eDf4oeMQ0kF/NUOuwki5gVZjlmels/+1g=";
   };
 
   # keep the scope, as it is used throughout the derivation and tests
@@ -58,16 +49,10 @@ in
 
 pythonPackages.buildPythonApplication rec {
   inherit pname version src;
+  missingHashes = ./missing-hashes.json;
 
   offlineCache = yarn-berry_4.fetchYarnBerryDeps {
-    # mozjpeg fails to build on darwin due to a hardocded path
-    # this has been fixed upstream on master but no new version
-    # has been released. We therefore point yarn to upstream
-    # see https://github.com/imagemin/mozjpeg-bin/issues/64
-    # and https://github.com/imagemin/mozjpeg-bin/issues/81
-    patches = [
-      ./mozjpeg.patch
-    ];
+    inherit missingHashes;
     src = src + "/web";
     hash = yarnHash;
   };
@@ -85,11 +70,6 @@ pythonPackages.buildPythonApplication rec {
   ];
 
   postPatch = ''
-    # the patch needs to be executed inside the /web subfolder
-    # therefore it is included here and not in `patches`
-    cd web
-    patch -u yarn.lock ${./mozjpeg.patch}
-    cd ..
     # patching Makefile, so it doesn't try to build sphinx documentation here
     # (will do so later)
     substituteInPlace Makefile \
@@ -111,9 +91,6 @@ pythonPackages.buildPythonApplication rec {
   '';
 
   dontYarnBerryInstallDeps = true;
-  env.YARN_ENABLE_SCRIPTS = "0";
-  dontUseCmakeConfigure = true;
-
   preBuild = ''
     # Adapted from pkg/pip/build.sh
     echo Creating required directories...
@@ -141,25 +118,6 @@ pythonPackages.buildPythonApplication rec {
     export LD=$CC # https://github.com/imagemin/optipng-bin/issues/108
     yarnBerryConfigHook
     )
-    # mozjpeg vendored source isn't included in the checkout for yarn. If we copy it before the
-    # yarnConfigHook it will just get overwritten. So we first run the configHook without build,
-    # then copy the vendored source and then build the dependencies
-    # This has the disadvantage of repeating some of the yarnConfigHooks logic here
-    mkdir -p node_modules/mozjpeg/vendor/source
-    cp ${mozjpeg-bin}/vendor/source/mozjpeg.tar.gz node_modules/mozjpeg/vendor/source/
-    (
-    # https://github.com/mozilla/mozjpeg/issues/438
-    substituteInPlace node_modules/mozjpeg/lib/install.js --replace-fail "cmake -DCMAKE" "cmake -DENABLE_STATIC=FALSE -DCMAKE"
-    substituteInPlace node_modules/mozjpeg/lib/install.js --replace-fail "cp cjpeg-static" "cp cjpeg"
-    export LD=$CC
-    export HOME=$(mktemp -d)
-    export YARN_ENABLE_SCRIPTS=1
-    YARN_IGNORE_PATH=1 ${yarn-berry_4.yarn-berry-offline}/bin/yarn config set enableTelemetry false
-    YARN_IGNORE_PATH=1 ${yarn-berry_4.yarn-berry-offline}/bin/yarn config set enableGlobalCache false
-    export npm_config_nodedir="${srcOnly nodejs}"
-    export npm_config_node_gyp="${nodejs}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js"
-    YARN_IGNORE_PATH=1 ${yarn-berry_4.yarn-berry-offline}/bin/yarn install --inline-builds
-    )
     yarn webpacker
     cp -r * ../pip-build/pgadmin4
     # save some disk space
@@ -188,21 +146,11 @@ pythonPackages.buildPythonApplication rec {
     yarn-berry_4
     yarn-berry_4.yarnBerryConfigHook
     nodejs
-
-    # for building mozjpeg2
-    cmake
-    autoconf
-    automake
-    libtool
-    nasm
-    pkg-config
   ];
 
   buildInputs = [
     zlib
     pythonPackages.wheel
-    # for mozjpeg2
-    libpng
   ];
 
   propagatedBuildInputs = with pythonPackages; [

pkgs/tools/admin/pgadmin/missing-hashes.json

@@ -0,0 +1,43 @@
+{
+  "@img/sharp-darwin-arm64@npm:0.34.3": "c5ed848f3cecaced50be6d1805cfb23586299f119a9917880c3f590b7ddd54b930e493c73480d13452503101168f92a0dc85ccc5b19b330470a5fe69e1fcf206",
+  "@img/sharp-darwin-x64@npm:0.34.3": "7e892ca052c8eb9002fb6e86e0a7893aff909e0f203f6ada7a67f4ca7e189631203189700a498ab3401280f5c042f5b08c3f7bc713192a97228864e9c4527743",
+  "@img/sharp-libvips-darwin-arm64@npm:1.2.0": "35d0d475da11fdfd7f5b5f7f1de4376ac04de6d6e0879833f71b2fa305b9d58c96ee464cf234060506ef9b1e2eabe5c09c302e818f8899b2ced1fcb7f85c01eb",
+  "@img/sharp-libvips-darwin-x64@npm:1.2.0": "e853f3b8a19d815af553b703e1d6d70abec525c61f3f19cc8a9d50d3749bc563b7f255307709b7c0836f76b110948489d3a9a3932d2fbc1775a083a56979bf56",
+  "@img/sharp-libvips-linux-arm64@npm:1.2.0": "ec53e3e62c9351e28ea0e4c26a1d8ab257ac003e8184b1757b79c2a240baecec2452e0dbca08c8227fd01c498801c428230261fdb86198e873e07347d741c3c7",
+  "@img/sharp-libvips-linux-arm@npm:1.2.0": "a2f9822cb2ac5b315f2a02c59ebdb235f6c45251207795f83f1a92db696a9deced882dc752bdddd1eab98da5d7d1d1e9968ae142313ff09960b7ae30b760ba07",
+  "@img/sharp-libvips-linux-ppc64@npm:1.2.0": "e90e1c46e6020f3a96562dd526549af2fabff46a1576f2e7af003be4b5efeb6fc8caa8e303e2eeb58129c938be31e0bf067736072479f2298152230cecd5fce4",
+  "@img/sharp-libvips-linux-s390x@npm:1.2.0": "2cf62c8b285effd3a3ec8854bc5fd78af162459294a6d9847af33d6bdeacfbad81cb0bec68b76889b148306a8a28492b4d44e6c96b778d0879349180191d758d",
+  "@img/sharp-libvips-linux-x64@npm:1.2.0": "ca342d07d1f0d22559f26bdcc0354f87a845ef19c69c22e37d9e23d71de15159f50d01183e8e7ea75e0ccfb6c7be9406741414a1f3534ec4aba10e51f0d7dffd",
+  "@img/sharp-libvips-linuxmusl-arm64@npm:1.2.0": "aa248f0c8602b0a17fdb5c1b00ce7dbb09f05b94a45ee7f226eaebfa459d4ee3fd407c62244902e15699927943c511a7fe045b575185ecc9b585987b64ae6cb1",
+  "@img/sharp-libvips-linuxmusl-x64@npm:1.2.0": "811071647c5129a1ead1e54b8f4672061bbbc1177d1d49127c755848e81f21bcbf5bf438c0e53118e731be5e000235904de3b5cf305053de015b56609a059371",
+  "@img/sharp-linux-arm64@npm:0.34.3": "3e8d53f54789b3d98dc14bf696917ff50f8c8c355aedc0dc90890ca764259bafec7390eabe262ce843eab8b74e0c128858128ce614e0b85dcba28d6b9ce3ea3f",
+  "@img/sharp-linux-arm@npm:0.34.3": "563c48ee129e5f3c6afed71ffba9c79a4369e7967e7b3a4a97d9b1e5aefa511873d3cd7a568ec42cd5968ea76f89ab93ee65c1363170af50559b620bfdb89d5b",
+  "@img/sharp-linux-ppc64@npm:0.34.3": "5973f8c522f33f826efff4052e253ec554882db54421a00f2636594e9ccc27e16dfb865f8de101678cb07b1a2d31b516ce4a88b65132ecc1101d07b6cc1bd571",
+  "@img/sharp-linux-s390x@npm:0.34.3": "284d2fcd9cc297b27ec135b0c63d5a6170cb17be378d92c75ec19b6034e7ed5801cab04ca17d445a80b073d67c4f9fe809334f5d4edf533c2d81d66d5d882ef3",
+  "@img/sharp-linux-x64@npm:0.34.3": "a370c04ca6d4145e6d6529d84b133d80e88d408e4483ba168e5993e5b4c0cbd2db57d4e53aca0bfa43320b571ff8bd70c22d8d7f5fadb5e5df1ded91393ae71d",
+  "@img/sharp-linuxmusl-arm64@npm:0.34.3": "c63d8afda1a7d4810bdc19473b6235313d923f8763a8dfc182465b63b8e4805769a9e92a8b2136f0235e07ae1b1ab63adfa904bb833d64f0495108dfc180a475",
+  "@img/sharp-linuxmusl-x64@npm:0.34.3": "9500e8f5d0ab96395a8d522920f25d4376d928ec58e88b3a5dbce5249c26efec046d20845bee8e9233fbff5287cfa979cfc079bc608342d257a6827be6cc0322",
+  "@img/sharp-wasm32@npm:0.34.3": "840dd97d3151b2189c3d0ee0746c139cbdd0441d5d5dfc87d2dd9970fc2c5448a3815c3110c64009998d165ca6dc7b5d58811b98b2c1e4ab0a1eb5ad97275f1e",
+  "@img/sharp-win32-arm64@npm:0.34.3": "adc7d18a8334ca1fea09c877dc9493e75a9018f73dc63038c8ccef7535a272c0aa3c2a9867a49a223703747149fb1fe57ef8580dd6098f0f33c602a876a48e1b",
+  "@img/sharp-win32-ia32@npm:0.34.3": "eef220adf1240429f72d9a9aadc22ccb741889785fa025396cfed41603364990b5f3841cee4d60525b22e65f36c7416297581300c873268fe2b7bb67087ada73",
+  "@img/sharp-win32-x64@npm:0.34.3": "5a5d2624bea7a31393b5a89738ad22a2b020a67f5e5b9eb40063510b514e8516b0fb4e320ff9eb1d32fa2ee3b4c3a0387333d051da28d93957116cbbd63b5fe0",
+  "@unrs/resolver-binding-android-arm-eabi@npm:1.11.0": "c1b6a9231008b88b21ae121b947704c933bed766f429ee30e464ce8602793ad8420dee1107e5a389d358b9fb9130c1c04a45c54fd23f76fffc148322f77aac21",
+  "@unrs/resolver-binding-android-arm64@npm:1.11.0": "30870e5ceee3dd1be8150d1c7d719bd459ebdc1c7134e0fdf1f0864f15d395d490966373895728dc05a56ea19acce6a210826acce7fb4ae2806805b04204498b",
+  "@unrs/resolver-binding-darwin-arm64@npm:1.11.0": "050dee0e5fdbcb4104dba8ecdff32a37abc349406fd3f20f7aa5b90eff446db7791a948c9d508d0f801c21d697d88082d974ebd7eb034257bacfd1b91c9e52fa",
+  "@unrs/resolver-binding-darwin-x64@npm:1.11.0": "c88bd64753d75539d66fb149f190edafb6415cf178619b27d778b98f6aeb1c538730842f522b7ce0b209ed07c73644d729c55883b3d854317c8395c1e36325e9",
+  "@unrs/resolver-binding-freebsd-x64@npm:1.11.0": "f0da5e7d2ddc0c6af523741dc0395340c7cd908510c342a0e8a20e2281fdc7e9b965339d1a337cf358883a3e41b393e26315950c9ab3594c342a758065e83f01",
+  "@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.11.0": "e3379d1e50209ea97066f7e275285fa9fdafe51e0b55786283cf72f6fde0d7b2bcbadf5443f8fe4d4852033ee9737ea4965b768660fb8fe5424f8df383eb1e63",
+  "@unrs/resolver-binding-linux-arm-musleabihf@npm:1.11.0": "af37c332162f948867da2ce5c0cf2482447d3458437116f90e9a7bdbfb69ff7ce64151c5aacd6b82ad0d0b49bbca13cca098bc448fe736e7b2451d3def580dcc",
+  "@unrs/resolver-binding-linux-arm64-gnu@npm:1.11.0": "9b0b1649b6493af4383e92453699f970acce726e69f666ba9f23ee7cd43393bce56ed18aa1d7d54550e17e46cd814eb2fd5a78fab64b2794b2647bc6f081f38a",
+  "@unrs/resolver-binding-linux-arm64-musl@npm:1.11.0": "defe8b45c1700d577cc5d7b672bbde3b22b5e8ceaa9778742c7b6735665e9e778cc4223a230a8d6c8175ece6bbe896dfb4c142be9f4c9dac35bd8c131ae0bb23",
+  "@unrs/resolver-binding-linux-ppc64-gnu@npm:1.11.0": "14ef4060c46d15b656e8b9d76da3d52251e9b2ac9e72036d6563cea82912cfb3c1ec054772641427e2422d8701275692c8820be8870feea710de212ecb286c43",
+  "@unrs/resolver-binding-linux-riscv64-gnu@npm:1.11.0": "b781e07bbdf954976f057242b5b450c85866b6cafbad316dfde45f7ef323b55ce85127cd1275e180efa091046347edb1486b7e551eb3f0f2ff462668998e426b",
+  "@unrs/resolver-binding-linux-riscv64-musl@npm:1.11.0": "be1be1eee6f46549473392ed8f0625127e1cad3aa5bc4979d9e1d9bbb99274b78451aab2318b3e2573be1096f845a3d4014de1888f6055b0135596bc8a475311",
+  "@unrs/resolver-binding-linux-s390x-gnu@npm:1.11.0": "1ec2f875f3548dc1646ab6a2a5d3143872b15797ac11842aff61f01c90c7239752fe2e634ce8da6f8908630a8132a0e0e0c3cff45719802fec464d53fcb1e64d",
+  "@unrs/resolver-binding-linux-x64-gnu@npm:1.11.0": "1257c1d3d37a1b47d0b50f68ebe6401f5f38f2a95635e475178a159c95c9a8c78fe6455bb93ff2dfc7885174e15b4df8d3fcba3f1dfa6a65662d9ec92eb7c34d",
+  "@unrs/resolver-binding-linux-x64-musl@npm:1.11.0": "af64c0803ac865d8726c45ed9208110d8720df441ed5da6b0a9667ecb963c7cd3e3ee5bccc7a97e73793e30dd7421e468560428e73469ad1513ed4c76441ee3d",
+  "@unrs/resolver-binding-wasm32-wasi@npm:1.11.0": "7172db7c1cd756c95ba7ba6f49526ac7be03960cd7928ec9fd5c757001d28fa2bf652a31671ac3b131bb37e627bd4b6f592023a9f5b6b820f33ad93cc6b88acf",
+  "@unrs/resolver-binding-win32-arm64-msvc@npm:1.11.0": "a0ffc06551498f263547a3371252f2ff8ce38da28f726ae8d6c4e1be8e968596e0b3fad8fadcc01856bde845733a8527d4b55727b9fbd1774da5728423a76181",
+  "@unrs/resolver-binding-win32-ia32-msvc@npm:1.11.0": "64478bb41d415cd2ac220b3518e286e24bbb18f50083545d1d8a40b565caaa24d72f43fb79c57f1ca919591870e27289ddf3c69cb5b763fd686c354fdd1e6e1b",
+  "@unrs/resolver-binding-win32-x64-msvc@npm:1.11.0": "9b44241725f19ba4aeb9377f7be3153b3e36971f9224b502921cffb72122ed9fa9f7b0a77e3bd6ec941c18f8b161782b4e8ea43eafc61e9d575d40c4c88c367b"
+}

pkgs/tools/admin/pgadmin/mozjpeg.patch

@@ -1,44 +0,0 @@
-diff --git a/yarn.lock b/yarn.lock
-index 8bfff31..0f12f87 100644
---- a/yarn.lock
-+++ b/yarn.lock
-@@ -7347,6 +7347,23 @@ __metadata:
-   languageName: node
-   linkType: hard
-
-+"execa@npm:^7.1.1":
-+  version: 7.1.1
-+  resolution: "execa@npm:7.1.1"
-+  dependencies:
-+    cross-spawn: "npm:^7.0.3"
-+    get-stream: "npm:^6.0.1"
-+    human-signals: "npm:^3.0.1"
-+    is-stream: "npm:^3.0.0"
-+    merge-stream: "npm:^2.0.0"
-+    npm-run-path: "npm:^5.1.0"
-+    onetime: "npm:^6.0.0"
-+    signal-exit: "npm:^3.0.7"
-+    strip-final-newline: "npm:^3.0.0"
-+  checksum: 0da5ee1c895b62142bc3d1567d1974711c28c2cfa6bae96e1923379bd597e476d762a13f282f92815d8ebfa33407949634fa32a0d6db8334a20e625fe11d4351
-+  languageName: node
-+  linkType: hard
-+
- "executable@npm:^4.1.0":
-   version: 4.1.1
-   resolution: "executable@npm:4.1.1"
-@@ -11120,13 +11137,14 @@ __metadata:
-
- "mozjpeg@npm:^8.0.0":
-   version: 8.0.0
--  resolution: "mozjpeg@npm:8.0.0"
-+  resolution: "mozjpeg@https://github.com/imagemin/mozjpeg-bin.git#commit=c0587fbc00b21ed8cad8bae499a0827baeaf7ffa"
-   dependencies:
-     bin-build: "npm:^3.0.0"
-     bin-wrapper: "npm:^4.0.0"
-+    execa: "npm:^7.1.1"
-   bin:
-     mozjpeg: cli.js
--  checksum: 10c0/e91294c15bb31dcaa5eb0780e772214052aa8cb1efc35f74a5c4fe85c9af9d3d6e2f3dc64d3379a86a63b5cbc86a2618c23e350c9131e55ac76726647537b7e8
-+  checksum: cba27c2efbc21a48434da1c6c8d6886988432430f958315fc59ef9b52bc2d6ee597e19f1cf6aae0fd611d5b2a113561fe2e85ec30a1ccd55c007340c638eb556
-   languageName: node
-   linkType: hard

pkgs/tools/admin/pgadmin/update.sh

@@ -41,11 +41,10 @@ pushd $TMPDIR
 wget -c $url
 tar -xzf "pgadmin4-$newest_version.tar.gz"
 cd "pgadmin4-$newest_version/web"
-patch -u yarn.lock ${scriptDir}/mozjpeg.patch
 
 printf "Will now generate the hash. This will download the packages to the nix store and also take some time\n"
-yarn-berry-fetcher missing-hashes yarn.lock
-if [[ -f missing-hashes.json ]]; then
+yarn-berry-fetcher missing-hashes yarn.lock > missing-hashes.json
+if [[ $(wc -l <missing-hashes.json) -ge 2 ]]; then
   YARN_HASH=$(yarn-berry-fetcher prefetch yarn.lock missing-hashes.json)
 else
   YARN_HASH=$(yarn-berry-fetcher prefetch yarn.lock)

pkgs/top-level/python-aliases.nix

@@ -323,6 +323,7 @@ mapAliases ({
   guzzle_sphinx_theme = guzzle-sphinx-theme; # added 2023-10-16
   ha-av = throw "ha-av was removed, because it is no longer maintained"; # added 2022-04-06
   HAP-python = hap-python; # added 2021-06-01
+  hahomematic = throw "hahomematic has been superseded by aiohomematic"; # added 2025-08-16
   hangups = throw "hangups was removed because Google Hangouts has been shut down"; # added 2023-02-13
   hbmqtt = throw "hbmqtt was removed because it is no longer maintained"; # added 2021-11-07
   hcs_utils = hcs-utils; # added 2024-01-06

pkgs/top-level/python-packages.nix

@@ -290,6 +290,8 @@ self: super: with self; {
 
   aiohomekit = callPackage ../development/python-modules/aiohomekit { };
 
+  aiohomematic = callPackage ../development/python-modules/aiohomematic { };
+
   aiohttp = callPackage ../development/python-modules/aiohttp { };
 
   aiohttp-apispec = callPackage ../development/python-modules/aiohttp-apispec { };
@@ -6413,8 +6415,6 @@ self: super: with self; {
 
   hacking = callPackage ../development/python-modules/hacking { };
 
-  hahomematic = callPackage ../development/python-modules/hahomematic { };
-
   hakuin = callPackage ../development/python-modules/hakuin { };
 
   halide =