Revert "python3Packages.pygraphviz: unbreak on Darwin"

This reverts commit 5cefe928ee.
Merge master into staging-next
2026-07-22 00:20:58 +00:00 · 2026-07-21 18:58:08 -04:00 · 2026-07-21 18:28:46 +00:00 · 2026-07-21 12:33:24 +00:00 · 2026-07-21 06:52:24 +00:00 · 2026-07-21 00:31:59 +00:00
46 changed files with 101 additions and 122 deletions
--- a/nixos/modules/services/web-servers/caddy/default.nix
+++ b/nixos/modules/services/web-servers/caddy/default.nix
@@ -448,8 +448,8 @@ in
    '';

    # https://github.com/quic-go/quic-go/wiki/UDP-Buffer-Sizes
-    boot.kernel.sysctl."net.core.rmem_max" = mkDefault 7500000;
-    boot.kernel.sysctl."net.core.wmem_max" = mkDefault 7500000;
+    boot.kernel.sysctl."net.core.rmem_max" = mkDefault 2500000;
+    boot.kernel.sysctl."net.core.wmem_max" = mkDefault 2500000;

    systemd.packages = [ cfg.package ];
    systemd.services.caddy = {
--- a/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix
+++ b/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix
@@ -6,11 +6,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "fcitx5-pinyin-moegirl";
-  version = "20260713";
+  version = "20260712";

  src = fetchurl {
    url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict";
-    hash = "sha256-ZmpTcolKTjJBino+zkVK6hBv/+yllAiBiR6Jy4SBdVs=";
+    hash = "sha256-fCzh9pn+HWL60IvpPieaaZ+JjQZ1bbfYIyLEHDITK4U=";
  };

  dontUnpack = true;
--- a/pkgs/by-name/mu/murmure/package.nix
+++ b/pkgs/by-name/mu/murmure/package.nix
@@ -45,7 +45,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "murmure";
-  version = "1.10.1";
+  version = "1.10.0";

  __structuredAttrs = true;

@@ -53,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
    owner = "Kieirra";
    repo = "murmure";
    tag = finalAttrs.version;
-    hash = "sha256-YTfpIkGHD6GPEfuTV1AahC08y4hJ6GSWQ+9C/6bTsJU=";
+    hash = "sha256-zJ9OvpAfREyDWDISKYKCUyQSWdkQlVrSzX+wvwKk6Yk=";
  };

  # The libappindicator_sys crate loads these libraries at runtime
@@ -77,7 +77,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
  cargoRoot = "src-tauri";
  buildAndTestSubdir = finalAttrs.cargoRoot;

-  cargoHash = "sha256-6G/ZHGjjv1U5MNLo+LAwXoM/nN2aCPOaSTJer7dUv9w=";
+  cargoHash = "sha256-wV0drkKgn58Yxjy+Mv2QLTQXTDwWk6/uEfk76HaMuow=";

  env.OPENSSL_NO_VENDOR = true;

--- a/pkgs/by-name/mx/mxt-app/package.nix
+++ b/pkgs/by-name/mx/mxt-app/package.nix
@@ -7,14 +7,14 @@
 }:

 stdenv.mkDerivation (finalAttrs: {
-  version = "1.52";
+  version = "1.46";
  pname = "mxt-app";

  src = fetchFromGitHub {
    owner = "atmel-maxtouch";
    repo = "mxt-app";
    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-CW2iWkYuI0joTQJXt271XLO70Qq/Yg8eX9f56XnJht8=";
+    sha256 = "sha256-SeP48xdZ43dL28tg7mo8SmObUt3R+8oyETst6yKkhnU=";
  };

  nativeBuildInputs = [ autoreconfHook ];
--- a/pkgs/by-name/pr/prometheus-postfix-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-postfix-exporter/package.nix
@@ -10,16 +10,16 @@

 buildGoModule rec {
  pname = "postfix_exporter";
-  version = "0.20.4";
+  version = "0.20.0";

  src = fetchFromGitHub {
    owner = "Hsn723";
    repo = "postfix_exporter";
    tag = "v${version}";
-    sha256 = "sha256-LCjTw5nL8xP6ODwVJxj4Zg99CiFvqbzjb931fmhtk0M=";
+    sha256 = "sha256-tW86lnSLQdyZwvRiqTU1oExZ/zDIrZUraeoAOjs35yY=";
  };

-  vendorHash = "sha256-6lqUygsV1pPGKN9SOZIouPVSZWuSOlPhqFbm16HfzGk=";
+  vendorHash = "sha256-T8fTvrpBKm+wDqf+iBeBJh9H1HEebAf0lOnnuF0W5fI=";

  ldflags = [
    "-s"
--- a/pkgs/by-name/ri/rime-moegirl/package.nix
+++ b/pkgs/by-name/ri/rime-moegirl/package.nix
@@ -5,10 +5,10 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "rime-moegirl";
-  version = "20260713";
+  version = "20260712";
  src = fetchurl {
    url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict.yaml";
-    hash = "sha256-Fca5vWdmqaRnP6id4TqVGFsTxnynAoQTMgAWntF5eY0=";
+    hash = "sha256-d4I2xyyWh9vry7vMkE1E19G55w/uenqbTspymdy0dqw=";
  };

  dontUnpack = true;
--- a/pkgs/by-name/sp/spicedb-zed/package.nix
+++ b/pkgs/by-name/sp/spicedb-zed/package.nix
@@ -8,16 +8,16 @@

 buildGoModule (finalAttrs: {
  pname = "zed";
-  version = "1.2.0";
+  version = "1.1.1";

  src = fetchFromGitHub {
    owner = "authzed";
    repo = "zed";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-wwD/PCnhCFzhq/Oe9+qU+w/ZlloZbezjOtBKMQkxI9E=";
+    hash = "sha256-rlTcC2+faNZKvzouGC9nJBBCsDabxozTE/SFbf8YKQ8=";
  };

-  vendorHash = "sha256-swlwje4XCzhRojPOaW28MDEaZQIvXGUoH7qjyz5+tUo=";
+  vendorHash = "sha256-/nnPVy+pjcgkgJW8630IycmGF4Qq4I01htEDlsWvZbM=";

  ldflags = [ "-X 'github.com/jzelinskie/cobrautil/v2.Version=${finalAttrs.src.tag}'" ];

--- a/pkgs/by-name/th/thruster/package.nix
+++ b/pkgs/by-name/th/thruster/package.nix
@@ -7,16 +7,16 @@

 buildGo126Module (finalAttrs: {
  pname = "thruster";
-  version = "0.1.23";
+  version = "0.1.22";

  src = fetchFromGitHub {
    owner = "basecamp";
    repo = "thruster";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-R7JutM3tWkkkRsxxNgHIoz7VdYIfXNTmmvhSh8YHFuM=";
+    hash = "sha256-d+zdzzT+47y9WOFARlQ/wCrc9tnyS/4HsE0a6aQl/KA=";
  };

-  vendorHash = "sha256-V9KAr+/r5SGNSBamD3U7bvBiiXn5GTmopSxiNmFL6lQ=";
+  vendorHash = "sha256-veXgGs6+TauExVAaNnkIZwylQWZ4um3rrG8of/dYCv0=";

  subPackages = [ "cmd/thrust" ];

--- a/pkgs/by-name/ti/tiddit/package.nix
+++ b/pkgs/by-name/ti/tiddit/package.nix
@@ -8,14 +8,14 @@
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
  pname = "tiddit";
-  version = "3.9.7";
+  version = "3.9.5";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "SciLifeLab";
    repo = "TIDDIT";
    tag = "TIDDIT-${finalAttrs.version}";
-    hash = "sha256-B3vUxLEnOdX733iGOfMmueVaSEqMmlp6fN4M8oElNNQ=";
+    hash = "sha256-6uJZzetqRS0czX4qjjPgiSaPun7BkrPYllDdFWNK84k=";
  };

  build-system = with python3Packages; [
--- a/pkgs/by-name/un/unpoller/package.nix
+++ b/pkgs/by-name/un/unpoller/package.nix
@@ -7,16 +7,16 @@

 buildGoModule (finalAttrs: {
  pname = "unpoller";
-  version = "3.3.3";
+  version = "3.3.1";

  src = fetchFromGitHub {
    owner = "unpoller";
    repo = "unpoller";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-VWu2n5J7ZLC2PzHXFDum0HFAwq5MDczT0dzUxRBSN5A=";
+    hash = "sha256-MivEuI/XjRDlX+VjSAMLjRl0WlRVnhP18qVujbvwjeQ=";
  };

-  vendorHash = "sha256-QBvdR7pLKqeiZLIIxgTbAkyGLLR0nrK/NU9wSmyU5zU=";
+  vendorHash = "sha256-3DBUrKTvwRqaNuYtBlP5DlF1SNmU+ZNeH7ATVQjgLsA=";

  ldflags = [
    "-w"
--- a/pkgs/development/python-modules/gios/default.nix
+++ b/pkgs/development/python-modules/gios/default.nix
@@ -1,7 +1,7 @@
 {
  lib,
  aiohttp,
-  aiointercept,
+  aioresponses,
  buildPythonPackage,
  dacite,
  fetchFromGitHub,
@@ -16,7 +16,7 @@

 buildPythonPackage rec {
  pname = "gios";
-  version = "7.1.1";
+  version = "7.1.0";
  pyproject = true;

  disabled = pythonOlder "3.13";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
    owner = "bieniu";
    repo = "gios";
    tag = version;
-    hash = "sha256-VWLdvk+PF/0BaPNIIJcb+rsW1MyNoHcQuVx1Kvx20jk=";
+    hash = "sha256-m7baTU7oWcjqCgiZ7GcOYVM23jcvycQcAbPhO1jWahk=";
  };

  nativeBuildInputs = [
@@ -40,7 +40,7 @@ buildPythonPackage rec {
  ];

  nativeCheckInputs = [
-    aiointercept
+    aioresponses
    pytest-asyncio
    pytest-error-for-skips
    pytestCheckHook
--- a/pkgs/development/python-modules/guntamatic/default.nix
+++ b/pkgs/development/python-modules/guntamatic/default.nix
@@ -9,14 +9,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "guntamatic";
-  version = "1.9.2";
+  version = "1.9.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "JensTimmerman";
    repo = "guntamatic";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-cm3aFIRnWFKgkaEYDQCGSREZRmGhv0ltKMpkWHu+ugI=";
+    hash = "sha256-OQpbBdTxbKd2A9AWJOLmoKNmPx3ZXTWqLgwTndDWMuw=";
  };

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

 buildPythonPackage (finalAttrs: {
  pname = "kagglesdk";
-  version = "0.1.34";
+  version = "0.1.30";
  pyproject = true;
  __structuredAttrs = true;

@@ -21,7 +21,7 @@ buildPythonPackage (finalAttrs: {
    owner = "Kaggle";
    repo = "kagglesdk";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-Yd4QZpSdcOWpEqDGf+uFe4JGDknSjkjTYWn1j89oRLM=";
+    hash = "sha256-7YjbJ6uo6R3jpo25wlHftYAA+0t7oUXc432N/REeCzU=";
  };

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

 buildPythonPackage rec {
  pname = "mypyllant";
-  version = "0.9.17";
+  version = "0.9.16";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "signalkraft";
    repo = "myPyllant";
    tag = "v${version}";
-    hash = "sha256-C6/rCpY4Pn8j8dNo1mlz2GRzMBeMo9CZMitlmtuBRE0=";
+    hash = "sha256-Uzy7W+ZwdBDKKayl0z6FIj/NK9uA/IsWFFJCeO0o4vQ=";
  };

  build-system = [
--- a/pkgs/development/python-modules/opencamlib/01-build-verbose.patch
+++ b/pkgs/development/python-modules/opencamlib/01-build-verbose.patch
@@ -1,12 +0,0 @@
-diff --git i/pyproject.toml w/pyproject.toml
-index 20be73f..3773051 100644
--- i/pyproject.toml
-+++ w/pyproject.toml
-@@ -36,7 +36,7 @@ requires = ["scikit-build-core"]
- build-backend = "scikit_build_core.build"
-
- [tool.scikit-build]
-cmake.verbose = true
-+build.verbose = true
- logging.level = "DEBUG"
- wheel.packages = ["src/pythonlib/opencamlib"]
--- a/pkgs/development/python-modules/opencamlib/default.nix
+++ b/pkgs/development/python-modules/opencamlib/default.nix
@@ -23,11 +23,6 @@ buildPythonPackage rec {
    hash = "sha256-pUj71PdWo902dqF9O6SLnpvFooFU2OfLBv8hAVsH/iA=";
  };

-  patches = [
-    # Upstream status: https://github.com/aewallin/opencamlib/pull/180
-    ./01-build-verbose.patch
-  ];
-
  build-system = [
    scikit-build-core
  ];
--- a/pkgs/development/python-modules/pygraphviz/default.nix
+++ b/pkgs/development/python-modules/pygraphviz/default.nix
@@ -3,7 +3,6 @@
  buildPythonPackage,
  fetchFromGitHub,
  replaceVars,
-  stdenv,
  graphviz,
  coreutils,
  pkg-config,
@@ -12,10 +11,6 @@
  pytest,
 }:

-let
-  # TODO: remove once #540793 makes it to master
-  graphviz' = graphviz.override { withQuartz = stdenv.hostPlatform.isDarwin; };
-in
 buildPythonPackage (finalAttrs: {
  pname = "pygraphviz";
  version = "2.0";
@@ -32,7 +27,7 @@ buildPythonPackage (finalAttrs: {
    # pygraphviz depends on graphviz executables and wc being in PATH
    (replaceVars ./path.patch {
      path = lib.makeBinPath [
-        graphviz'
+        graphviz
        coreutils
      ];
    })
@@ -43,19 +38,19 @@ buildPythonPackage (finalAttrs: {
      --replace-fail ', "swig>4.1.0"' ""
  '';

-  env.GRAPHVIZ_PREFIX = graphviz';
+  env.GRAPHVIZ_PREFIX = graphviz;

  build-system = [
    setuptools
  ];

  nativeBuildInputs = [
-    graphviz' # for dot
+    graphviz # for dot
    pkg-config
    swig
  ];

-  buildInputs = [ graphviz' ];
+  buildInputs = [ graphviz ];

  nativeCheckInputs = [ pytest ];

--- a/pkgs/development/python-modules/pyoverkiz/default.nix
+++ b/pkgs/development/python-modules/pyoverkiz/default.nix
@@ -15,14 +15,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "pyoverkiz";
-  version = "2.1.0";
+  version = "2.0.5";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "iMicknl";
    repo = "python-overkiz-api";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-4qm/pjRVQDpRm8WOPpo/KZbbeEDgUg+etXbjTtFi8SU=";
+    hash = "sha256-LdOVhOWxejTXhgUwlbucYNDqhKJDov56IaEcvJvEBQ4=";
  };

  build-system = [ hatchling ];
--- a/pkgs/development/python-modules/python-roborock/default.nix
+++ b/pkgs/development/python-modules/python-roborock/default.nix
@@ -27,14 +27,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "python-roborock";
-  version = "5.31.1";
+  version = "5.25.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "Python-roborock";
    repo = "python-roborock";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-HjiOZd+fkCTlxMEiuHWxaFeHwf7vHAYESMLkJ9Cye1U=";
+    hash = "sha256-Uj7rr9vAdZBseeePQU1/3bILwsI0P2CDy1bGu6R90Cg=";
  };

  pythonRelaxDeps = [
--- a/pkgs/development/python-modules/sdkmanager/default.nix
+++ b/pkgs/development/python-modules/sdkmanager/default.nix
@@ -12,14 +12,14 @@

 buildPythonPackage rec {
  pname = "sdkmanager";
-  version = "0.7.1";
+  version = "0.7.0";
  pyproject = true;

  src = fetchFromGitLab {
    owner = "fdroid";
    repo = "sdkmanager";
    tag = version;
-    hash = "sha256-UDl+hRNWuv6kmLLtz+FoPcwPOYY23uOnRzLaDwq1abI=";
+    hash = "sha256-/MrRCR6TJ64DiL4D1290jik1L+jITi4dH9Tj3cjF+ms=";
  };

  pythonRelaxDeps = [ "urllib3" ];
--- a/pkgs/development/python-modules/zamg/default.nix
+++ b/pkgs/development/python-modules/zamg/default.nix
@@ -13,14 +13,14 @@

 buildPythonPackage rec {
  pname = "zamg";
-  version = "0.4.1";
+  version = "0.3.6";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "killer0071234";
    repo = "python-zamg";
    tag = "v${version}";
-    hash = "sha256-kWdSXaD7+c7UrlRP47DjKbmVTHqWUveDowIDFSK3Plk=";
+    hash = "sha256-j864+3c0GDDftdLqLDD0hizT54c0IgTjT77jOneXlq0=";
  };

  pythonRelaxDeps = [ "async-timeout" ];
--- a/pkgs/development/python-modules/zha/default.nix
+++ b/pkgs/development/python-modules/zha/default.nix
@@ -26,7 +26,7 @@

 buildPythonPackage (finalAttrs: {
  pname = "zha";
-  version = "2.0.1";
+  version = "2.0.0";
  pyproject = true;

  disabled = pythonOlder "3.12";
@@ -35,7 +35,7 @@ buildPythonPackage (finalAttrs: {
    owner = "zigpy";
    repo = "zha";
    tag = finalAttrs.version;
-    hash = "sha256-SKDz6ojUW4qq37jfin+tYhM16/K60eEXJZdI2xJTwXc=";
+    hash = "sha256-cLE30i+3dqmtasHZKgW16zThMwWbZ8wh/GFtrgWmpfE=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/zigpy/default.nix
+++ b/pkgs/development/python-modules/zigpy/default.nix
@@ -23,14 +23,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "zigpy";
-  version = "2.0.1";
+  version = "2.0.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "zigpy";
    repo = "zigpy";
    tag = finalAttrs.version;
-    hash = "sha256-40znZSNqls+Z3Ikg/RFq0652O3d4ydGs33OMR8nn+Ns=";
+    hash = "sha256-EQ77zEitOV3m+Jc/UrRpWFHrQm+4qA+jdBrHd4dCySg=";
  };

  postPatch = ''
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!

 {
-  version = "2026.7.3";
+  version = "2026.7.2";
  components = {
    "3_day_blinds" =
      ps: with ps; [
@@ -643,7 +643,8 @@
      ];
    "bitcoin" =
      ps: with ps; [
-      ]; # missing inputs: blockchain
+        blockchain
+      ];
    "bizkaibus" =
      ps: with ps; [
        bizkaibus
--- a/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix
@@ -7,13 +7,13 @@
 buildHomeAssistantComponent rec {
  owner = "jwillemsen";
  domain = "daikin_onecta";
-  version = "4.6.13";
+  version = "4.6.12";

  src = fetchFromGitHub {
    owner = "jwillemsen";
    repo = "daikin_onecta";
    tag = "v${version}";
-    hash = "sha256-8fQ3BevlZUlfMHhf9leZtIwCMegBbe4GeZEWfdsUQOo=";
+    hash = "sha256-IMYrgSB4Fyc+BEhY4+FGE9Dca7llAQgvkAiOssut04c=";
  };

  meta = {
--- a/pkgs/servers/home-assistant/custom-components/ecoflow_ble/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/ecoflow_ble/package.nix
@@ -18,13 +18,13 @@
 buildHomeAssistantComponent rec {
  owner = "rabits";
  domain = "ef_ble";
-  version = "1.0.2";
+  version = "1.0.1";

  src = fetchFromGitHub {
    owner = "rabits";
    repo = "ha-ef-ble";
    tag = "v${version}";
-    hash = "sha256-ZLJi+gQRAZFDqZT86ntxA2/mNiuLPRi4hr5mESxLSz0=";
+    hash = "sha256-LPu4Autma/1MOrfs6FG9cQZFL3kRofVPbScEEZjAi6w=";
  };

  dependencies = [
--- a/pkgs/servers/home-assistant/custom-components/elegoo_printer/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/elegoo_printer/package.nix
@@ -19,13 +19,13 @@
 buildHomeAssistantComponent rec {
  owner = "danielcherubini";
  domain = "elegoo_printer";
-  version = "2.11.0";
+  version = "2.10.2";

  src = fetchFromGitHub {
    owner = "danielcherubini";
    repo = "elegoo-homeassistant";
    tag = "v${version}";
-    hash = "sha256-UrmgWCY1U52LCt2O/HXOwbcIzTYX/TrnGxvW2S0iB7M=";
+    hash = "sha256-+bL43ACj/8dI7dNVNQ+3n2WvDaYhuh3tiwX98yXmTm4=";
  };

  dependencies = [
--- a/pkgs/servers/home-assistant/custom-components/frigidaire/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/frigidaire/package.nix
@@ -7,13 +7,13 @@
 buildHomeAssistantComponent rec {
  owner = "bm1549";
  domain = "frigidaire";
-  version = "0.1.33";
+  version = "0.1.31";

  src = fetchFromGitHub {
    inherit owner;
    repo = "home-assistant-frigidaire";
    tag = version;
-    hash = "sha256-P89EBB5JkdkSDoDvBaQgJiBMgu3cU9erkvtAPZS4KL8=";
+    hash = "sha256-wcJFtGd3FVSC/pyrhvxEy2j6KKmydnfZydVH4xN3wyU=";
  };

  dependencies = [ frigidaire ];
--- a/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix
@@ -8,13 +8,13 @@
 buildHomeAssistantComponent rec {
  owner = "cyberjunky";
  domain = "garmin_connect";
-  version = "3.0.14";
+  version = "3.0.13";

  src = fetchFromGitHub {
    owner = "cyberjunky";
    repo = "home-assistant-garmin_connect";
    tag = version;
-    hash = "sha256-ESTds9oQoQCpOhf5S6CFdZ/menA2+rY8OVRK/njibK8=";
+    hash = "sha256-qba1aexMT02dUob4ITS1ePLB41WBleZEdKsWuXCx6+o=";
  };

  dependencies = [
--- a/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix
@@ -10,13 +10,13 @@
 buildHomeAssistantComponent rec {
  owner = "mill1000";
  domain = "midea_ac";
-  version = "2026.7.1";
+  version = "2026.7.0";

  src = fetchFromGitHub {
    owner = "mill1000";
    repo = "midea-ac-py";
    tag = version;
-    hash = "sha256-CpQN0GvDBjZy6Y+K5YhnIsvDuyDuhUgULf4MfovvXAw=";
+    hash = "sha256-lZfhZRvKdeisjQAHjYxPsyS2YL486wLtuf4ERw57vZ4=";
  };

  dependencies = [ msmart-ng ];
--- a/pkgs/servers/home-assistant/custom-components/mypyllant/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/mypyllant/package.nix
@@ -19,13 +19,13 @@
 buildHomeAssistantComponent rec {
  owner = "signalkraft";
  domain = "mypyllant";
-  version = "0.9.18";
+  version = "0.9.17";

  src = fetchFromGitHub {
    owner = "signalkraft";
    repo = "mypyllant-component";
    tag = "v${version}";
-    hash = "sha256-7huCAslbm5CLzArYMzSGkKPHlQoX6Qc0WLuv7e6OYLQ=";
+    hash = "sha256-OUNWju1g3vBjrUd/ZzQCMS08PWUyQUMnUkqElss9KaQ=";
  };

  dependencies = [
--- a/pkgs/servers/home-assistant/custom-components/pirate-weather/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/pirate-weather/package.nix
@@ -12,13 +12,13 @@
 buildHomeAssistantComponent rec {
  owner = "Pirate-Weather";
  domain = "pirateweather";
-  version = "1.9.0";
+  version = "1.8.9";

  src = fetchFromGitHub {
    inherit owner;
    repo = "pirate-weather-ha";
    tag = "v${version}";
-    hash = "sha256-LIlKYrKoSElZkU9To8XZrposweAYRhu2x59h1p4av44=";
+    hash = "sha256-QcTRLQ/jFH3lacnFu/cIGyAf74HaoG35iGKf8FQIlVo=";
  };

  nativeCheckInputs = [
--- a/pkgs/servers/home-assistant/custom-components/powercalc/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/powercalc/package.nix
@@ -17,13 +17,13 @@
 buildHomeAssistantComponent rec {
  owner = "bramstroker";
  domain = "powercalc";
-  version = "1.23.0";
+  version = "1.22.0";

  src = fetchFromGitHub {
    inherit owner;
    repo = "homeassistant-powercalc";
    tag = "v${version}";
-    hash = "sha256-WmbmKYcGwuny6Z2WLNZOACNs1jjKKlL9Dwvvd0Q2ass=";
+    hash = "sha256-JToHHnteIH6uJEZSl22hBsUxkf7Cj0s1sPaAcKmaFao=";
  };

  dependencies = [ numpy ];
--- a/pkgs/servers/home-assistant/custom-components/prometheus_sensor/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/prometheus_sensor/package.nix
@@ -7,13 +7,13 @@
 buildHomeAssistantComponent rec {
  owner = "mweinelt";
  domain = "prometheus_sensor";
-  version = "1.3.1";
+  version = "1.3.0";

  src = fetchFromGitHub {
    owner = "mweinelt";
    repo = "ha-prometheus-sensor";
    tag = version;
-    hash = "sha256-o/bGSqD6b0o3f/b/al+eGg/LqwrWi1deB53NOTNkb8Q=";
+    hash = "sha256-uIC/yGqjigVURZYVMMLY33VqRbadSCqTtT0Qtaq71uc=";
  };

  meta = {
--- a/pkgs/servers/home-assistant/custom-components/scene_presets/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/scene_presets/package.nix
@@ -11,13 +11,13 @@
 buildHomeAssistantComponent rec {
  owner = "Hypfer";
  domain = "scene_presets";
-  version = "2.3.3";
+  version = "2.3.2";

  src = fetchFromGitHub {
    owner = "Hypfer";
    repo = "hass-scene_presets";
    tag = version;
-    hash = "sha256-ZK51JPvKSWAman3nVV6W4JcmZG4DWb6VRNeFjAQ4kgs=";
+    hash = "sha256-Vhowtosxgx7yDprm2ziBe3fSUqNxfP3ULmhP7ETsbzY=";
  };

  npmDeps = fetchNpmDeps {
--- a/pkgs/servers/home-assistant/custom-components/sensi/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/sensi/package.nix
@@ -7,13 +7,13 @@
 buildHomeAssistantComponent rec {
  owner = "iprak";
  domain = "sensi";
-  version = "2.1.5";
+  version = "2.1.4";

  src = fetchFromGitHub {
    inherit owner;
    repo = domain;
    tag = "v${version}";
-    hash = "sha256-MycKCDh/KYAgAiKFFYK9H6A7rYIGQNCdgT7vlGCntx8=";
+    hash = "sha256-FTyFxQd2upNUKhfSfd5rEr5BLpu6veYHrExHUazTamU=";
  };

  postPatch = ''
--- a/pkgs/servers/home-assistant/custom-components/tibber_local/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/tibber_local/package.nix
@@ -8,13 +8,13 @@
 buildHomeAssistantComponent rec {
  owner = "marq24";
  domain = "tibber_local";
-  version = "2026.7.0";
+  version = "2026.6.2";

  src = fetchFromGitHub {
    inherit owner;
    repo = "ha-tibber-pulse-local";
    tag = version;
-    hash = "sha256-CPOWh/BClQASyMwarR7a/QHtPkvjHN19oXl6j46wFmk=";
+    hash = "sha256-Mssjizh9DcA6fldwl6QmmgG8aOVwvF5d0akqrkArM5g=";
  };

  dependencies = [
--- a/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix
@@ -11,13 +11,13 @@
 buildHomeAssistantComponent rec {
  owner = "make-all";
  domain = "tuya_local";
-  version = "2026.7.2";
+  version = "2026.7.1";

  src = fetchFromGitHub {
    inherit owner;
    repo = "tuya-local";
    tag = version;
-    hash = "sha256-kmLcLoEfNJWzzAPhLcw6JdyWHrTv2RHen8aRiTjX8Gc=";
+    hash = "sha256-NljzFG1uEg0J1eSXdPeZqPnA3eBrurUvHaAdnUffjgY=";
  };

  dependencies = [
--- a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix
@@ -20,13 +20,13 @@
 buildHomeAssistantComponent rec {
  owner = "mampfes";
  domain = "waste_collection_schedule";
-  version = "2.31.1";
+  version = "2.30.0";

  src = fetchFromGitHub {
    inherit owner;
    repo = "hacs_waste_collection_schedule";
    tag = "v${version}";
-    hash = "sha256-/6vFumpESJbxOqwacSKyt8fTunrPvIUM8Tlt2WGkMQ8=";
+    hash = "sha256-9MQBKVm0IgVG0ePWe7Q1PskCa0p/6bNxj4IH73aLQnA=";
  };

  dependencies = [
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/package.nix
@@ -6,13 +6,13 @@

 buildNpmPackage rec {
  pname = "bubble-card";
-  version = "3.2.5";
+  version = "3.2.4";

  src = fetchFromGitHub {
    owner = "Clooos";
    repo = "Bubble-Card";
    rev = "v${version}";
-    hash = "sha256-+h3VR9F6Gh+ZBjodNAl5LLQxfw5ScZhtPQsAiJNTy9w=";
+    hash = "sha256-ofGIq6DLA2VQj5Gm/Dc+DZfwWZI3frAFzXO7MJDM610=";
  };

  npmDepsHash = "sha256-jyw8U99R7M3JJwu30ADefAitm4lWWVHEwq108gWZpfg=";
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/clock-weather-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/clock-weather-card/package.nix
@@ -9,18 +9,18 @@
 }:
 stdenvNoCC.mkDerivation rec {
  pname = "clock-weather-card";
-  version = "2.9.4";
+  version = "2.9.2";

  src = fetchFromGitHub {
    owner = "pkissling";
    repo = "clock-weather-card";
    tag = "v${version}";
-    hash = "sha256-lqJF4Hql2uZmVRldcfsHiykFVUiudjfr4xrnERwkI+s=";
+    hash = "sha256-8srE601xz8AcFv+5swIUUqUlHif/Qfm1TdfA5HfDAnU=";
  };

  offlineCache = fetchYarnDeps {
    yarnLock = src + "/yarn.lock";
-    hash = "sha256-nXgqGQfnTLYy24iqz6VnHTpys1RA9vYbpDzlCsj1OPg=";
+    hash = "sha256-hCniXzBsnTozR0PWEleTo7K9P/lqoKNF+L8EErjOdEg=";
  };

  nativeBuildInputs = [
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/custom-brand-icons/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/custom-brand-icons/package.nix
@@ -6,13 +6,13 @@

 buildNpmPackage (finalAttrs: {
  pname = "custom-brand-icons";
-  version = "2026.07.3";
+  version = "2026.07.1";

  src = fetchFromGitHub {
    owner = "elax46";
    repo = "custom-brand-icons";
    tag = finalAttrs.version;
-    hash = "sha256-CDqrvY+Gcys1PE7aASfMVqgbw7BNsimCsTh6AkfFdys=";
+    hash = "sha256-nWoZ6tArSGmZY9pn2G/2jXGEM7ip8LGQ5+1FnYFI5SI=";
  };

  npmDepsHash = "sha256-+Kn2WQ1MQMKTJ0He/k9NxUpoac9sB61zWRt2wha6c7g=";
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix
@@ -12,20 +12,20 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "custom-sidebar";
-  version = "16.1.0";
+  version = "16.0.0";

  src = fetchFromGitHub {
    owner = "elchininet";
    repo = "custom-sidebar";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-41q0GxwX8jQEX9TOjSqLw9VU4wA/7D7tM0CTgKBYNcg=";
+    hash = "sha256-ST7wgxl9bpsHvguYbZQYYWO1KkinSrNCrbugVBJGvJo=";
  };

  pnpmDeps = fetchPnpmDeps {
    inherit (finalAttrs) pname version src;
    inherit pnpm;
    fetcherVersion = 3;
-    hash = "sha256-cwyhL2fC4j7XDayS/kaVCTOTdQ0BqfUgC7kp+l1fk8M=";
+    hash = "sha256-SbjE9u2RZ8M6GHxk7NkvyihGDiO6v/1LHywvaP8OcQM=";
  };

  nativeBuildInputs = [
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/horizon-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/horizon-card/package.nix
@@ -7,13 +7,13 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "horizon-card";
-  version = "1.5.3";
+  version = "1.5.0";

  src = fetchFromGitHub {
    owner = "rejuvenate";
    repo = "lovelace-horizon-card";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-n8UNL5kSwLz1ncGranmbGyIC5mIKGIV2F3cEF0PSwnU=";
+    hash = "sha256-pUZoraOD4jLxun/I3OkIgcy45es3a0Sdh5GTEG2oNK4=";
  };

  patches = [
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -270,7 +270,7 @@ let
  extraBuildInputs = extraPackages python3Packages;

  # Don't forget to run update-component-packages.py after updating
-  hassVersion = "2026.7.3";
+  hassVersion = "2026.7.2";

 in
 python3Packages.buildPythonApplication rec {
@@ -291,13 +291,13 @@ python3Packages.buildPythonApplication rec {
    owner = "home-assistant";
    repo = "core";
    tag = version;
-    hash = "sha256-P3XpShQivIG39i4inhhFe5lOWKIJWuWOdiIUxpfaH8Y=";
+    hash = "sha256-5DEcg2DJwK2oItZD5BSK+B9rNGvbNOY/5YylOWe62Bs=";
  };

  # Secondary source is pypi sdist for translations
  sdist = fetchPypi {
    inherit pname version;
-    hash = "sha256-zC95f1/p71jag7ex0EGoa5gQobab17a+VDBc7h9YBFA=";
+    hash = "sha256-3ODw2n/BH6qxJwakED3wuJ0XW9iNxjaESxR7bBCAxHU=";
  };

  build-system = with python3Packages; [
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -8,7 +8,7 @@ buildPythonPackage (finalAttrs: {
  # the frontend version corresponding to a specific home-assistant version can be found here
  # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
  pname = "home-assistant-frontend";
-  version = "20260624.6";
+  version = "20260624.5";
  format = "wheel";

  src = fetchPypi {
@@ -17,7 +17,7 @@ buildPythonPackage (finalAttrs: {
    pname = "home_assistant_frontend";
    dist = "py3";
    python = "py3";
-    hash = "sha256-TURk0HXGh4WT6R9Hd3XyR/UPnQAKrz1AibFZuVxTHdY=";
+    hash = "sha256-7o0IaunCHh6jKlW8NxbMSwoNCfqcIKDqPV6Xgjz42Qg=";
  };

  # there is nothing to strip in this package
Author	SHA1	Message	Date
Michael Daniels	f81eb0b260	Revert "python3Packages.pygraphviz: unbreak on Darwin" This reverts commit `5cefe928ee`.	2026-07-21 18:58:08 -04:00
nixpkgs-ci[bot]	0cce77b482	Merge master into staging-next	2026-07-21 18:28:46 +00:00
nixpkgs-ci[bot]	d793e2af82	Merge master into staging-next	2026-07-21 12:33:24 +00:00
nixpkgs-ci[bot]	0567cbfd3c	Merge master into staging-next	2026-07-21 06:52:24 +00:00
nixpkgs-ci[bot]	34a0c1b8bc	Merge master into staging-next	2026-07-21 00:31:59 +00:00
nixpkgs-ci[bot]	7daffa6483	Merge master into staging-next	2026-07-20 18:38:44 +00:00