From 0f5cb6b70294c52e643d0ca099b35308563a2674 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 16 Apr 2024 18:52:41 +0200 Subject: [PATCH] deconz: 2.23.00 -> 2.26.3 Upstream doesn't produce the *-dev package anymore, so remove it. (Apparently it's possible to get back the header files by building from source: https://github.com/dresden-elektronik/deconz-rest-plugin/blob/v2.26.3/BUILDING.md#build-with-cmake.) --- pkgs/servers/deconz/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/deconz/default.nix b/pkgs/servers/deconz/default.nix index 7f5d60b153f8..110048f9de28 100644 --- a/pkgs/servers/deconz/default.nix +++ b/pkgs/servers/deconz/default.nix @@ -16,16 +16,11 @@ stdenv.mkDerivation rec { pname = "deconz"; - version = "2.23.00"; + version = "2.26.3"; src = fetchurl { url = "https://deconz.dresden-elektronik.de/ubuntu/beta/deconz-${version}-qt5.deb"; - sha256 = "sha256-TMftm1fz8c8ndSyA3HUd7JWT0DINxvbdUSDrmVMwmws="; - }; - - devsrc = fetchurl { - url = "https://deconz.dresden-elektronik.de/ubuntu/beta/deconz-dev-${version}.deb"; - sha256 = "sha256-uW5iF3rvFlowFhMBVDTOHkJ2K4LBgAxxC79tXpMhy5U="; + sha256 = "sha256-BE/apFPutNdhlS1NWRHdVcVrt/16aFfZ6zRcjphIlZA="; }; nativeBuildInputs = [ dpkg autoPatchelfHook makeWrapper wrapQtAppsHook ]; @@ -36,7 +31,6 @@ stdenv.mkDerivation rec { runHook preUnpack dpkg -x $src ./deconz-src - dpkg -x $devsrc ./deconz-devsrc runHook postUnpack ''; @@ -46,7 +40,6 @@ stdenv.mkDerivation rec { mkdir -p "$out" cp -r deconz-src/* "$out" - cp -r deconz-devsrc/* "$out" # Flatten /usr and manually merge lib/ and usr/lib/, since mv refuses to. mv "$out/lib" "$out/orig_lib"