diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md index 0b02ac2f8337..3df6dcba2037 100644 --- a/doc/release-notes/rl-2611.section.md +++ b/doc/release-notes/rl-2611.section.md @@ -108,6 +108,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. - `vimacs` has been removed, as it has not been maintained in 10 years and was built for an old version of vim (6.0). diff --git a/pkgs/by-name/do/domoticz/package.nix b/pkgs/by-name/do/domoticz/package.nix index beeeafccb3a0..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, @@ -24,23 +23,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "domoticz"; - version = "2024.7"; + version = "2026.2-unstable-2026-07-09"; src = fetchFromGitHub { owner = "domoticz"; repo = "domoticz"; - tag = finalAttrs.version; - hash = "sha256-D8U1kK3m1zT83YvZ42hGSU9PzBfS1VGr2mxUYbM2vNQ="; + rev = "7e12d1e5d7bf3f7d083ef31d5dd611d678f89d48"; # pinned due to removed dependency (see nixpkgs pr #539060) + hash = "sha256-+6EIEsgGTaLEPzBa/R5EYAxnYB3+cj54LGDJwutTQGA="; + 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 @@ -87,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeInstallCheckInputs = [ - versionCheckHook + # versionCheckHook # readd once we can move to a tagged release again ]; doInstallCheck = true; @@ -98,15 +90,15 @@ 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; 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" - ]; }; })