python3Packages.dio-chacon-wifi-api: 1.2.2 -> 1.3.0

https://github.com/cnico/dio-chacon-wifi-api/compare/v1.2.2...v1.3.0

nixos/tests/chhoto-url.nix

@@ -38,7 +38,7 @@
 
     resp = json.loads(machine.succeed("curl localhost:8000/api/getconfig"))
     assert resp["success"] is False
-    assert resp["reason"] == "No valid authentication."
+    assert resp["reason"] == "No valid authentication was found"
 
     resp = json.loads(machine.succeed("curl -H 'X-API-Key: api_key' localhost:8000/api/getconfig"))
     expected_version = "${config.nodes.machine.services.chhoto-url.package.version}"

pkgs/applications/editors/emacs/default.nix

@@ -13,24 +13,10 @@ lib.makeScope pkgs.newScope (
       inherit lib;
       inherit (pkgs)
         fetchFromGitHub
-        fetchgit
+        fetchzip
         ;
     };
 
-    emacs31 = callPackage (self.sources.emacs31) inheritedArgs;
-
-    emacs31-gtk3 = self.emacs31.override {
-      withGTK3 = true;
-    };
-
-    emacs31-nox = self.emacs31.override {
-      noGui = true;
-    };
-
-    emacs31-pgtk = self.emacs31.override {
-      withPgtk = true;
-    };
-
     emacs30 = callPackage (self.sources.emacs30) inheritedArgs;
 
     emacs30-gtk3 = self.emacs30.override {
@@ -45,6 +31,11 @@ lib.makeScope pkgs.newScope (
       withPgtk = true;
     };
 
-    emacs30-macport = callPackage (self.sources.emacs30-macport) inheritedArgs;
+    emacs30-macport = callPackage (self.sources.emacs30-macport) (
+      inheritedArgs
+      // {
+        srcRepo = true;
+      }
+    );
   }
 )

pkgs/applications/editors/emacs/make-emacs.nix

@@ -29,6 +29,7 @@
   gtk3-x11,
   harfbuzz,
   imagemagick,
+  jansson,
   libxaw,
   libxcursor,
   libxft,
@@ -65,7 +66,7 @@
   # Boolean flags
   withNativeCompilation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
   noGui ? false,
-  srcRepo ? true,
+  srcRepo ? false,
   withAcl ? false,
   withAlsaLib ? false,
   withAthena ? false,
@@ -79,6 +80,8 @@
   withGpm ? stdenv.hostPlatform.isLinux,
   # https://github.com/emacs-mirror/emacs/blob/emacs-27.2/etc/NEWS#L118-L120
   withImageMagick ? false,
+  # Emacs 30+ has native JSON support
+  withJansson ? lib.versionOlder version "30",
   withMailutils ? true,
   withMotif ? false,
   withNS ? stdenv.hostPlatform.isDarwin && !(variant == "macport" || noGui),
@@ -253,6 +256,9 @@ stdenv.mkDerivation (finalAttrs: {
     gnutls
     (lib.getDev harfbuzz)
   ]
+  ++ lib.optionals withJansson [
+    jansson
+  ]
   ++ [
     libxml2
     ncurses

pkgs/applications/editors/emacs/sources.nix

@@ -1,7 +1,7 @@
 {
   lib,
   fetchFromGitHub,
-  fetchgit,
+  fetchzip,
 }:
 
 let
@@ -26,9 +26,9 @@ let
       src =
         {
           "mainline" = (
-            fetchgit {
-              url = "https://https.git.savannah.gnu.org/git/emacs.git";
-              inherit rev hash;
+            fetchzip {
+              url = "mirror://gnu/emacs/${rev}.tar.xz";
+              inherit hash;
             }
           );
           "macport" = (
@@ -74,7 +74,7 @@ let
         '';
         changelog =
           {
-            "mainline" = "https://cgit.git.savannah.gnu.org/cgit/emacs.git/plain/etc/NEWS?h=${rev}";
+            "mainline" = "https://www.gnu.org/savannah-checkouts/gnu/emacs/news/NEWS.${version}";
             "macport" = "https://github.com/jdtsmith/emacs-mac/blob/${rev}/NEWS-mac";
           }
           .${variant};
@@ -105,20 +105,12 @@ let
     };
 in
 {
-  emacs31 = import ./make-emacs.nix (mkArgs {
-    pname = "emacs";
-    version = "31.0.90";
-    variant = "mainline";
-    rev = "emacs-31.0.90";
-    hash = "sha256-Rzlnn+NKQ+jICXLNop27RnVInq79myn4hueJieDO2Ck=";
-  });
-
   emacs30 = import ./make-emacs.nix (mkArgs {
     pname = "emacs";
     version = "30.2";
     variant = "mainline";
     rev = "emacs-30.2";
-    hash = "sha256-3Lfb3HqdlXqSnwJfxe7npa4GGR9djldy8bKRpkQCdSA=";
+    hash = "sha256-W2eZ+cNQhi/fMeRkwOqSKU7Vzvp43WUOpiwaLLNEXtg=";
     patches = fetchpatch: [
       (fetchpatch {
         name = "fix-off-by-one-mistake-80851-CVE-2026-6861.patch";

pkgs/applications/networking/cluster/terraform-providers/providers.json

@@ -815,13 +815,13 @@
     "vendorHash": "sha256-UuLHaOEG6jmOAgfdNOtLyUimlAr3g6K8n3Ehu64sKqk="
   },
   "keycloak_keycloak": {
-    "hash": "sha256-3KlfUM3qQwzRlUkuq+91z1VjRxIL3qcdCHfkVnfYJKQ=",
+    "hash": "sha256-55/a3lJCJEOIDsnFckx5BsUClphPZ9BSBvWxQBq1D9Y=",
     "homepage": "https://registry.terraform.io/providers/keycloak/keycloak",
     "owner": "keycloak",
     "repo": "terraform-provider-keycloak",
-    "rev": "v5.8.0",
+    "rev": "v5.7.0",
     "spdx": "Apache-2.0",
-    "vendorHash": "sha256-JTcIyUKoeCRxAzUWJy9FkMCYy3+D70uyzuiSTW3nHlA="
+    "vendorHash": "sha256-JgQqOm+cAMLACp/rVz3ek1C4uuTAs8vqDcwRkpFssYc="
   },
   "kislerdm_neon": {
     "hash": "sha256-1o5EnAI9X8Q+dXxh1/jZwimy1MmPDF3X2aRc+HO7HpQ=",

pkgs/by-name/ch/chhoto-url/package.nix

@@ -8,23 +8,23 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "chhoto-url";
-  version = "7.2.1";
+  version = "7.1.5";
 
   src = fetchFromGitHub {
     owner = "SinTan1729";
     repo = "chhoto-url";
     tag = finalAttrs.version;
-    hash = "sha256-B6bMuy/EEveYtQtGBO5CNeEUlPK8eQ412k+SwlRPm2M=";
+    hash = "sha256-TREBriuK7k3ZBDkdQ5gGdptWCG/5UOdhoWcOj1Ppd/8=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/actix";
 
   postPatch = ''
-    substituteInPlace src/{main.rs,services/get.rs,services/utils.rs} \
+    substituteInPlace src/{main.rs,services.rs} \
       --replace-fail "./resources/" "${placeholder "out"}/share/chhoto-url/resources/"
   '';
 
-  cargoHash = "sha256-9EVGsOipx9ObygpM37iZYLnhYjSMHFhHTDvjHkLWLz8=";
+  cargoHash = "sha256-S+fWxhPRB+JZPjWQkww9VYtYfc9vnXCZgUZTu+ND1So=";
 
   postInstall = ''
     mkdir -p $out/share/chhoto-url

pkgs/by-name/ex/example-robot-data/package.nix

@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "example-robot-data";
-  version = "5.0.0";
+  version = "4.4.0";
 
   src = fetchFromGitHub {
     owner = "Gepetto";
     repo = "example-robot-data";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-oQk6mJ1lOTcWrTWLViVQWk+R6DdcnLSigxKuXgpLhs0=";
+    hash = "sha256-HnI1EaTSqk7mbihwFTgnMxgPZxMSYnAwaCLEXS3LUbE=";
   };
 
   outputs = [

pkgs/by-name/go/golden-cheetah/package.nix

@@ -26,13 +26,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "golden-cheetah";
-  version = "3.8-DEV2605";
+  version = "3.8-DEV2603";
 
   src = fetchFromGitHub {
     owner = "GoldenCheetah";
     repo = "GoldenCheetah";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-umy1EcLSoSDO5XFiGxfunniDr8RruyPvRTbypMbl7xU=";
+    hash = "sha256-FxQ18KJfR+fegQ5Qu4vI3vqckj4mB8s9VtSdRtIQISg=";
   };
 
   buildInputs =

pkgs/by-name/gu/guix/package.nix

@@ -161,7 +161,6 @@ stdenv.mkDerivation (finalAttrs: {
       Guix is based on the Nix package manager.
     '';
     homepage = "https://guix.gnu.org/";
-    donationPage = "https://guix.gnu.org/donate/";
     changelog = "https://codeberg.org/guix/guix/raw/tag/v${finalAttrs.version}/NEWS";
     license = lib.licenses.gpl3Plus;
     mainProgram = "guix";

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

@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hyfetch";
-  version = "2.1.0";
+  version = "2.0.5";
 
   src = fetchFromGitHub {
     owner = "hykilpikonna";
     repo = "hyfetch";
     tag = finalAttrs.version;
-    hash = "sha256-/aOVgl93n9IL5lDzY1REg88BXhlqtDDjrZnkD4rQ9aw=";
+    hash = "sha256-vrTmjg6CZczImueN3JxKg1vYXAaEDYHYG7UaZeupYPU=";
   };
 
-  cargoHash = "sha256-uTIzLY5H+zoCsC/YalA0ImnJ817KhU5sXHWkbvWEfVk=";
+  cargoHash = "sha256-SieVB0zwer9Ksio3l87gUZkVJMwb+Da/NjBi5f57tJc=";
 
   nativeBuildInputs = [
     installShellFiles
@@ -59,9 +59,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   versionCheckKeepEnvironment = [ "PATH" ];
   doInstallCheck = true;
 
-  passthru.updateScript = nix-update-script {
-    extraArgs = [ "--version-regex=^(\\d+\\.\\d+\\.\\d+)$" ];
-  };
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "Neofetch with LGBTQ+ pride flags";
@@ -83,7 +81,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       isabelroses
       nullcube
       defelo
-      Misaka13514
     ];
   };
 })

pkgs/by-name/jo/joplin-desktop/package.nix

@@ -224,7 +224,7 @@ stdenv.mkDerivation (finalAttrs: {
       icon = "joplin";
       comment = "Joplin for Desktop";
       categories = [ "Office" ];
-      startupWMClass = "joplin-app-desktop";
+      startupWMClass = "@joplin/app-desktop";
       mimeTypes = [ "x-scheme-handler/joplin" ];
     })
   ];

pkgs/by-name/la/lasuite-meet/frontend.nix

@@ -13,7 +13,7 @@ buildNpmPackage (finalAttrs: {
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) version src sourceRoot;
-    hash = "sha256-Dd0wqssmLBfHkOHI5aactLnCPG4JxPLhNC+eo//QRXM=";
+    hash = "sha256-LDH8aR+FSiIFYMDaQ3wNYAzv6VpHtH5X+DMHGBhPkm0=";
   };
   npmBuildScript = "build";
 

pkgs/by-name/la/lasuite-meet/mail.nix

@@ -11,18 +11,24 @@ buildNpmPackage (finalAttrs: {
 
   sourceRoot = "${finalAttrs.src.name}/src/mail";
 
+  # TODO: Remove package-lock.json patch when
+  # https://github.com/suitenumerique/meet/pull/1321 is merged.
   postPatch = ''
     substituteInPlace bin/html-to-plain-text bin/mjml-to-html \
       --replace-fail \
         '../backend/core/templates/mail' \
         '${placeholder "out"}'
+
+    cp ${./package-lock.json} package-lock.json
   '';
 
   npmDeps = fetchNpmDeps {
     pname = "${finalAttrs.pname}-npm-deps";
     inherit version src;
     inherit (finalAttrs) sourceRoot;
-    hash = "sha256-dvOmSQjtw7Qv3H+flOcXDaIxQzf9YBmsQo7jmSTA7tI=";
+    hash = "sha256-jjLzgGqCsMu6Smyfaam6coqOM9UW2zG88adSPVrWPEE=";
+
+    postPatch = "cp ${./package-lock.json} package-lock.json";
   };
   npmBuildScript = "build";
 

pkgs/by-name/la/lasuite-meet/package.nix

@@ -6,13 +6,13 @@
   python3,
 }:
 let
-  version = "1.17.0";
+  version = "1.15.0";
 
   src = fetchFromGitHub {
     owner = "suitenumerique";
     repo = "meet";
     tag = "v${version}";
-    hash = "sha256-hmkJwFYTBTbYsroegaRp/dcaNmeyPQ0Rbh/D1PGbh04=";
+    hash = "sha256-18DcrrEvqWR6caEVZYxQlSnKcxItEpNE+bMhtS4Aa0M=";
   };
 
   meta = {
@@ -85,7 +85,6 @@ python.pkgs.buildPythonApplication (finalAttrs: {
       markdown
       mozilla-django-oidc
       nested-multipart-parser
-      phonenumbers
       psycopg
       pydantic
       pyjwt

pkgs/by-name/pi/picocrypt-ng/package.nix

@@ -16,18 +16,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "picocrypt-ng";
-  version = "2.10";
+  version = "2.09";
 
   src = fetchFromGitHub {
     owner = "Picocrypt-NG";
     repo = "Picocrypt-NG";
     tag = finalAttrs.version;
-    hash = "sha256-Rp7BgtJnV3fPed/QlWSxH8nL7cCTgMDpRGcgX5VI2l0=";
+    hash = "sha256-s+93NoJ1O6/Af33pUobSA0kAhpw7W0IdA9H6CVxShQY=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/src";
 
-  vendorHash = "sha256-yAM1jzebUlNkVWiY8lPtlelfqpFQonNcAqNmmghCdPU=";
+  vendorHash = "sha256-2c8Q7+97jSGo8lwWOYBg76K04+TFXG1DdQzVMR8G7ik=";
 
   ldflags = [
     "-s"
@@ -50,9 +50,6 @@ buildGoModule (finalAttrs: {
     writableTmpDirAsHomeHook
   ];
 
-  # git ls-files doesn't work as source is not a git repo
-  checkFlags = [ "-skip=^TestOldVersionLiteralsAreAllowlisted$" ];
-
   env.CGO_ENABLED = 1;
 
   postInstall = ''
@@ -76,10 +73,7 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/Picocrypt-NG/Picocrypt-NG";
     changelog = "https://github.com/Picocrypt-NG/Picocrypt-NG/blob/${finalAttrs.version}/Changelog.md";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [
-      tbutter
-      ryand56
-    ];
+    maintainers = with lib.maintainers; [ tbutter ];
     mainProgram = "picocrypt-ng-gui";
   };
 })

pkgs/by-name/pr/prometheus-klipper-exporter/package.nix

@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "prometheus-klipper-exporter";
-  version = "0.15.0";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "scross01";
     repo = "prometheus-klipper-exporter";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-TcGD7WjExo1/rgwVUSPmKFJEQZhttSgBIY3gKyfcwtQ=";
+    sha256 = "sha256-2BJkSKchUkLbUJke+4nB49MFp8OPPcytYAhtxCEdXO4=";
   };
 
-  vendorHash = "sha256-VebaCzdPGl0hOHRXvwZb4aDzXlDZ57v/QVYzuagvvOM=";
+  vendorHash = "sha256-8Y5o6Vh1Kn9CBG91qr1TQzyBHA0d31Femj9j1uW+4uk=";
 
   doCheck = true;
 

pkgs/by-name/rt/rtkit/package.nix

@@ -9,7 +9,7 @@
   dbus,
   libcap,
   polkit,
-  systemdLibs,
+  systemd,
   fetchpatch,
   nix-update-script,
 }:
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     dbus
     libcap
     polkit
-    systemdLibs
+    systemd
   ];
 
   mesonFlags = [

pkgs/development/python-modules/actron-neo-api/default.nix

@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "actron-neo-api";
-  version = "0.5.11";
+  version = "0.5.12";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kclif9";
     repo = "actronneoapi";
     tag = "v${version}";
-    hash = "sha256-1cXYMYS8quBVtUbv+Wrcvm13I47VuSKTHwwlQKvGcRI=";
+    hash = "sha256-j7qjVkpZFkWLVQd+/ndnjPOi8/xo357ez6yte78ny5U=";
   };
 
   build-system = [

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

@@ -11,14 +11,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "aiostreammagic";
-  version = "2.13.1";
+  version = "2.13.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "noahhusby";
     repo = "aiostreammagic";
     tag = finalAttrs.version;
-    hash = "sha256-yxiK5zB6nYXMJGVrebjdCjDr1wpNPlagusCiyf4TeRA=";
+    hash = "sha256-9HDQdzPq2YyVZ0GHmtJcK5ppk3OPNevYtlPK26hJ0TI=";
   };
 
   build-system = [ poetry-core ];

pkgs/development/python-modules/dio-chacon-wifi-api/default.nix

@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "dio-chacon-wifi-api";
-  version = "1.2.2";
+  version = "1.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cnico";
     repo = "dio-chacon-wifi-api";
     tag = "v${version}";
-    hash = "sha256-YlomB3/EBX2tFifjcF38q+sr2z1bHwUjmqyNE2wTp90=";
+    hash = "sha256-c91xCrlNpCutZZYO6y0pOaqPCF4exbr7xVxfsf5LI0Q=";
   };
 
   build-system = [ poetry-core ];

pkgs/development/python-modules/homelink-integration-api/default.nix

@@ -13,14 +13,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "homelink-integration-api";
-  version = "0.0.1";
+  version = "0.0.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Gentex-Corporation";
     repo = "homelink-integration-api";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ELEqx41JSAmXBEowwJ1tYPZV40hMjswaHQonD+1IG5E=";
+    hash = "sha256-N46c7SgEUQUs2UlNVjcCLpNBpUNI4WPDydl3gB+jmag=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/idasen-ha/default.nix

@@ -1,4 +1,5 @@
 {
+  bleak-retry-connector,
   buildPythonPackage,
   fetchFromGitHub,
   idasen,
@@ -10,19 +11,22 @@
 
 buildPythonPackage rec {
   pname = "idasen-ha";
-  version = "2.6.5";
+  version = "2.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "abmantis";
     repo = "idasen-ha";
     tag = version;
-    hash = "sha256-Ksckc4aayv33Xd4tmfzCUq8e5kWPnxw7xAlPKOIlmow=";
+    hash = "sha256-1BciJ3Hox9Ky1HuNw+8jWGaMX3amAhGNTGAXqwWEDX8=";
   };
 
   build-system = [ setuptools ];
 
-  dependencies = [ idasen ];
+  dependencies = [
+    bleak-retry-connector
+    idasen
+  ];
 
   pythonImportsCheck = [ "idasen_ha" ];
 

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

@@ -7,22 +7,22 @@
   voluptuous,
   pytestCheckHook,
   pytest-asyncio,
-  poetry-core,
+  setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "idasen";
-  version = "0.12.0";
+  version = "0.13.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "newAM";
     repo = "idasen";
-    tag = "v${version}";
-    hash = "sha256-TQ+DBFpG+IeZ4/dN+YKMw3AM4Dl1rpqA1kRcb3Tb3jA=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ejKfXAVvHyWIkg06XqC2pKJjpPuOgHEciPzBb/TGiSU=";
   };
 
-  build-system = [ poetry-core ];
+  build-system = [ setuptools ];
 
   dependencies = [
     bleak
@@ -41,8 +41,8 @@ buildPythonPackage rec {
     description = "Python API and CLI for the ikea IDÅSEN desk";
     mainProgram = "idasen";
     homepage = "https://github.com/newAM/idasen";
-    changelog = "https://github.com/newAM/idasen/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/newAM/idasen/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ newam ];
   };
-}
+})

pkgs/development/python-modules/imgw-pib/default.nix

@@ -15,14 +15,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "imgw-pib";
-  version = "2.2.0";
+  version = "2.2.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bieniu";
     repo = "imgw-pib";
     tag = finalAttrs.version;
-    hash = "sha256-VAmRrcTTNro8J/+25YeHII7jpw2BI87FNeDIo5ATOjQ=";
+    hash = "sha256-LWyaTi4OIxK+Nyrwp9/Czl2hxCiRjoTeKhl0Yfw95pk=";
   };
 
   build-system = [ setuptools ];

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

@@ -17,7 +17,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pysmartthings";
-  version = "4.0.0";
+  version = "4.0.1";
   pyproject = true;
 
   disabled = pythonOlder "3.13";
@@ -26,7 +26,7 @@ buildPythonPackage (finalAttrs: {
     owner = "andrewsayre";
     repo = "pysmartthings";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ls+b37/m20CHVerl5wb6LIH0ttuN7H8Mr8cKNdk2+t0=";
+    hash = "sha256-yxGrtEMWMargZ9i0b4DqxSh/x3pbK1J8unL7goGnURY=";
   };
 
   build-system = [ hatchling ];

pkgs/development/python-modules/yoto-api/default.nix

@@ -9,14 +9,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "yoto-api";
-  version = "3.1.5";
+  version = "3.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cdnninja";
     repo = "yoto_api";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Pe1bxpheFBbUuTGL5ucQc5OZrk4HgLTtu1ORWUDm4+M=";
+    hash = "sha256-pzU+qResc+fqC1nhwbCYNNXKrD1aAjXZujjgL/5AGkc=";
   };
 
   build-system = [ setuptools ];

pkgs/servers/home-assistant/component-packages.nix

@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "2026.6.0";
+  version = "2026.6.1";
   components = {
     "3_day_blinds" =
       ps: with ps; [

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

@@ -17,12 +17,12 @@
   requests,
 }:
 let
-  version = "3.14.0-beta.10";
+  version = "3.14.0-beta.6";
   src = fetchFromGitHub {
     owner = "solentlabs";
     repo = "cable_modem_monitor";
     tag = "v${version}";
-    hash = "sha256-Tl5MQVaitq1I5CeajVrgwKvs6HT4WEKejPjz2IcfTqw=";
+    hash = "sha256-1Mkowy23ct8QGKe5m6XIyEE4SfAbRLlOmTzTsPHY+iw=";
     fetchLFS = true;
   };
 

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

@@ -12,13 +12,13 @@
 buildHomeAssistantComponent rec {
   owner = "JeffSteinbok";
   domain = "dreo";
-  version = "1.9.8";
+  version = "1.9.9";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "hass-dreo";
     tag = "v${version}";
-    hash = "sha256-F/r5r8lgYbJdIFtaHPDXtlpOQFKDsBClTA0954OrAzM=";
+    hash = "sha256-r8Nt5LLJRKYxbx6znS46QCdejKCpCG7ybGd8wbv0Wgk=";
   };
 
   dependencies = [ websockets ];

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

@@ -54,6 +54,8 @@ buildHomeAssistantComponent rec {
   disabledTests = [
     # custom_components.homematicip_local.support.InvalidConfig: C
     "test_async_validate_config_and_get_system_information"
+    # Failed: Lingering timer after test <TimerHandle when=3043632.864116499 Store._async_schedule_callback_delayed_write() created at /nix/store/5rh57mhaihd9wff1rqnskvs8nxh9sv3z-homeassistant-2026.6.0/lib/python3.14/site-packages/homeassistant/helpers/storage.py:516>
+    "test_reauth_flow_success"
   ];
 
   meta = {

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

@@ -8,13 +8,13 @@
 buildHomeAssistantComponent rec {
   owner = "wills106";
   domain = "solax_modbus";
-  version = "2026.06.1";
+  version = "2026.06.3";
 
   src = fetchFromGitHub {
     owner = "wills106";
     repo = "homeassistant-solax-modbus";
     tag = version;
-    hash = "sha256-R1z/BLFaKt80HSC5VqnmZSaI/onmIamYlYIxszeJptw=";
+    hash = "sha256-2lJ4lVrGG8jtNymA2lwkJS1DKd0w6TYs5PAnCynBOWM=";
   };
 
   dependencies = [ pymodbus ];

pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix

@@ -12,20 +12,20 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "custom-sidebar";
-  version = "14.0.0";
+  version = "15.0.0";
 
   src = fetchFromGitHub {
     owner = "elchininet";
     repo = "custom-sidebar";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2CQcY5/Cb3IPuI7cL28t7iZCH3kD21equBW5BL6w8TU=";
+    hash = "sha256-0bS760GfIO/LdQD6lNEKhiIW5lyCu35cTi0g3GaGQ5M=";
   };
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     inherit pnpm;
     fetcherVersion = 3;
-    hash = "sha256-gYNCjCeAt6LP4tZE4ufiQu7OG2ujWydm4etcGQxMxcU=";
+    hash = "sha256-zmWZhOx1Pl7O5T5vNdff/nZC1juwm66YOVIMjuNoBYg=";
   };
 
   nativeBuildInputs = [

pkgs/servers/home-assistant/custom-lovelace-modules/meshcore-card/package.nix

@@ -7,17 +7,17 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "meshcore-card";
-  version = "0.3.5";
+  version = "1.0.0";
   strictDeps = true;
 
   src = fetchFromGitHub {
     owner = "jpettitt";
     repo = "meshcore-card";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XfqtCGSDrfkNIqWuH8Y8DLacJf9x7iaZXDiKDWdqzhw=";
+    hash = "sha256-B2W3B8cd9OrTOxLEWUV8Aercektfwh7/Ik3/U/Lwz48=";
   };
 
-  npmDepsHash = "sha256-KgG6PGSGw9zCOPboZjo/gpAs2OwLg3LRl3rqenIvTG8=";
+  npmDepsHash = "sha256-/CtYdDFo8Sbq3FEm6ND8b/CNcfsUgoT23F6RVfYtYDg=";
 
   installPhase = ''
     runHook preInstall

pkgs/servers/home-assistant/default.nix

@@ -265,7 +265,7 @@ let
   extraBuildInputs = extraPackages python3Packages;
 
   # Don't forget to run update-component-packages.py after updating
-  hassVersion = "2026.6.0";
+  hassVersion = "2026.6.1";
 
 in
 python3Packages.buildPythonApplication rec {
@@ -286,13 +286,13 @@ python3Packages.buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     tag = version;
-    hash = "sha256-/7WBiQwr40EFOwL+J/3L4pBoQp7nNPPjcKHxU4tDNcU=";
+    hash = "sha256-gjXhWv64Uu3LHwxDR8HwsTFeAncgY94JeOqfKEnvgJ8=";
   };
 
   # Secondary source is pypi sdist for translations
   sdist = fetchPypi {
     inherit pname version;
-    hash = "sha256-Eu5oUGBKCrIZkyyLfmTJbHxOC7TD9QHjjNpjscgPK/I=";
+    hash = "sha256-gtnIsOrJWyLhjEc9dstvRiVd4LrqJ6W48qXNwaV8YlU=";
   };
 
   build-system = with python3Packages; [
@@ -317,6 +317,9 @@ python3Packages.buildPythonApplication rec {
     # No scaring our users about not running in a docker or a venv
     ./patches/pythonpath-is-a-venv.patch
 
+    # No scaring our users about our install method
+    ./patches/nixos-was-never-supported.patch
+
     # Patch path to ffmpeg binary
     (replaceVars ./patches/ffmpeg-path.patch {
       ffmpeg = "${lib.getExe ffmpeg-headless}";

pkgs/servers/home-assistant/patches/nixos-was-never-supported.patch

@@ -0,0 +1,13 @@
+diff --git a/homeassistant/components/homeassistant/__init__.py b/homeassistant/components/homeassistant/__init__.py
+index 54c6454167b..026fda54578 100644
+--- a/homeassistant/components/homeassistant/__init__.py
++++ b/homeassistant/components/homeassistant/__init__.py
+@@ -420,7 +420,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:  # noqa:
+ 
+         installation_type = info["installation_type"][15:]
+         if installation_type in {"Core", "Container"}:
+-            deprecated_method = installation_type == "Core"
++            deprecated_method = False
+             bit32 = _is_32_bit()
+             arch = info["arch"]
+             if bit32 and installation_type == "Container":

pkgs/servers/home-assistant/tests.nix

@@ -126,11 +126,23 @@ let
       # intent fixture mismatch on aarch64
       "test_error_no_device_on_floor"
     ];
+    homeassistant_connect_zbt2 = [
+      # [2026.6.1] AssertionError: assert <ConfigEntryState.LOADED: 'loaded'> is <ConfigEntryState.SETUP_RETRY: 'setup_retry'>
+      "test_usb_device_reactivity"
+    ];
+    homeassistant = [
+      # disabled via nixos-was-never-supported.patch
+      "test_deprecated_installation_issue_core"
+    ];
     opendisplay = [
       # [2026.6.0] Failed: Description not found for placeholder `reason` in component.opendisplay.exceptions.device_not_found.message
       # https://github.com/home-assistant/core/pull/172909
       "test_upload_image_device_not_in_range"
     ];
+    yardian = [
+      # [2026.6.1] failing snapshot
+      "test_all_entities"
+    ];
     zeroconf = [
       # multicast socket bind, not possible in the sandbox
       "test_subscribe_discovery"

pkgs/top-level/all-packages.nix

@@ -8924,11 +8924,6 @@ with pkgs;
   electrum-ltc = libsForQt5.callPackage ../applications/misc/electrum/ltc.nix { };
 
   inherit (recurseIntoAttrs (callPackage ../applications/editors/emacs { }))
-    emacs31
-    emacs31-gtk3
-    emacs31-nox
-    emacs31-pgtk
-
     emacs30
     emacs30-gtk3
     emacs30-nox