From 2749226cd3d799334d7fd8f03a791c4d6f890301 Mon Sep 17 00:00:00 2001 From: lenny Date: Mon, 6 Jul 2026 19:00:00 +0200 Subject: [PATCH 1/4] domoticz: 2024.7 -> 2026.2 Changelog: https://github.com/domoticz/domoticz/blob/2026.2/History.txt --- pkgs/by-name/do/domoticz/package.nix | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/do/domoticz/package.nix b/pkgs/by-name/do/domoticz/package.nix index beeeafccb3a0..54656440834f 100644 --- a/pkgs/by-name/do/domoticz/package.nix +++ b/pkgs/by-name/do/domoticz/package.nix @@ -20,27 +20,21 @@ cereal, minizip, versionCheckHook, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "domoticz"; - version = "2024.7"; + version = "2026.2"; src = fetchFromGitHub { owner = "domoticz"; repo = "domoticz"; tag = finalAttrs.version; - hash = "sha256-D8U1kK3m1zT83YvZ42hGSU9PzBfS1VGr2mxUYbM2vNQ="; + hash = "sha256-WJDNnzjmQe9Ap5EqmXEgrglIbGcLRRFBJgAHDvzswzo="; + fetchSubmodules = true; }; - patches = [ - # Boost 1.87 compatibility, remove once upgraded to 2025.1 - (fetchpatch { - url = "https://github.com/domoticz/domoticz/commit/5d0db89bbd120ed5dc05b4ff8c136f14a42f0cd3.patch"; - hash = "sha256-FPe83yJKJEgnY3kABy9CTRe1CBh42dPG1ZWCUE5PO8E="; - }) - ]; - buildInputs = [ openssl python3 @@ -91,6 +85,8 @@ stdenv.mkDerivation (finalAttrs: { ]; doInstallCheck = true; + passthru.updateScript = nix-update-script { }; + meta = { description = "Home automation system"; longDescription = '' @@ -105,8 +101,5 @@ stdenv.mkDerivation (finalAttrs: { platforms = lib.platforms.all; broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/domoticz.x86_64-darwin mainProgram = "domoticz"; - knownVulnerabilities = [ - "CVE-2026-1001" - ]; }; }) From 8c330b58b16d4eef57310d6961ffbbb944d45f4b Mon Sep 17 00:00:00 2001 From: lenny Date: Sat, 11 Jul 2026 19:00:00 +0200 Subject: [PATCH 2/4] domoticz: add lenny to maintainers --- pkgs/by-name/do/domoticz/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/do/domoticz/package.nix b/pkgs/by-name/do/domoticz/package.nix index 54656440834f..41be930bfcea 100644 --- a/pkgs/by-name/do/domoticz/package.nix +++ b/pkgs/by-name/do/domoticz/package.nix @@ -94,7 +94,10 @@ stdenv.mkDerivation (finalAttrs: { various devices like: lights, switches, various sensors/meters like temperature, rain, wind, UV, electra, gas, water and much more ''; - maintainers = with lib.maintainers; [ edcragg ]; + maintainers = with lib.maintainers; [ + edcragg + lenny + ]; homepage = "https://www.domoticz.com/"; changelog = "https://github.com/domoticz/domoticz/blob/${finalAttrs.version}/History.txt"; license = lib.licenses.gpl3Plus; From 46b1cdbb83904c613d396dcadc16cd82da3fdccc Mon Sep 17 00:00:00 2001 From: lenny Date: Sat, 11 Jul 2026 19:00:00 +0200 Subject: [PATCH 3/4] domoticz: Add release note about breaking changes since 2024.7 --- doc/release-notes/rl-2611.section.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md index 70c235970e54..f1ddbef73936 100644 --- a/doc/release-notes/rl-2611.section.md +++ b/doc/release-notes/rl-2611.section.md @@ -74,6 +74,7 @@ - Starting with v14, `flameshot` will primarily utilise xdg-desktop-portal calls for screenshotting. This will directly affect users on X11 window managers due to the lack of a compatible portal with Screenshot feature. See [upstream changelog](https://github.com/flameshot-org/flameshot/releases/tag/v14.0.0) or [NixOS Flameshot](https://wiki.nixos.org/wiki/Flameshot) wiki page for workarounds. - `nim1` and respective aliases have been removed due to entering EOL; please migrate to `nim` or `nim-unwrapped` (nim 2). - `nim-2_0` & `nim-2_2` and respective aliases have been removed; please migrate to `nim` or `nim-unwrapped` (nim 2.2.10). +- `domoticz` has been updated from `2024.7` to `2026.x`, breaking third party applications and scripts using the old RType calls. Review the [release notes](https://github.com/domoticz/domoticz/blob/2026.2/History.txt#L398) for more information. ## Other Notable Changes {#sec-nixpkgs-release-26.11-notable-changes} From db491cd7129a237b070a65fe26e17865a7bb1ff3 Mon Sep 17 00:00:00 2001 From: lenny Date: Mon, 13 Jul 2026 19:00:00 +0200 Subject: [PATCH 4/4] domoticz: 2026.2 -> 2026.2-unstable-2026-07-09 An upstream dependency disappeared breaking the build. This was fixed upstream requiring us to update to an unstable commit. --- pkgs/by-name/do/domoticz/package.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/do/domoticz/package.nix b/pkgs/by-name/do/domoticz/package.nix index 41be930bfcea..5bbdf8dc17cd 100644 --- a/pkgs/by-name/do/domoticz/package.nix +++ b/pkgs/by-name/do/domoticz/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, makeWrapper, cmake, python3, @@ -20,18 +19,17 @@ cereal, minizip, versionCheckHook, - nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "domoticz"; - version = "2026.2"; + version = "2026.2-unstable-2026-07-09"; src = fetchFromGitHub { owner = "domoticz"; repo = "domoticz"; - tag = finalAttrs.version; - hash = "sha256-WJDNnzjmQe9Ap5EqmXEgrglIbGcLRRFBJgAHDvzswzo="; + rev = "7e12d1e5d7bf3f7d083ef31d5dd611d678f89d48"; # pinned due to removed dependency (see nixpkgs pr #539060) + hash = "sha256-+6EIEsgGTaLEPzBa/R5EYAxnYB3+cj54LGDJwutTQGA="; fetchSubmodules = true; }; @@ -81,12 +79,10 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeInstallCheckInputs = [ - versionCheckHook + # versionCheckHook # readd once we can move to a tagged release again ]; doInstallCheck = true; - passthru.updateScript = nix-update-script { }; - meta = { description = "Home automation system"; longDescription = ''