From 9fbea3db5c4121525604cdd3709921f80749dab2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Wed, 3 Aug 2022 01:30:46 +0200 Subject: [PATCH] feat: update deconz - add x86_64-linux support - expose in flake --- flake.nix | 6 +++++- pkgs/deconz/default.nix | 30 +++++++++++++++++++++--------- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/flake.nix b/flake.nix index d80f689..09609da 100644 --- a/flake.nix +++ b/flake.nix @@ -186,9 +186,13 @@ shellcheck.enable = true; }; }; - in { + in rec { formatter = pkgs.nixfmt; + packages = { deconz = pkgs.qt5.callPackage ./pkgs/deconz { }; }; + + apps = { deconz = flake-utils.lib.mkApp { drv = packages.deconz; }; }; + devShells.default = pkgs.mkShell { inherit (pre-commit-check) shellHook; }; }); diff --git a/pkgs/deconz/default.nix b/pkgs/deconz/default.nix index 890ba45..1228814 100644 --- a/pkgs/deconz/default.nix +++ b/pkgs/deconz/default.nix @@ -1,16 +1,28 @@ -{ lib, fetchurl, mkDerivation, dpkg, autoPatchelfHook, qtserialport +{ lib, stdenv, fetchurl, mkDerivation, dpkg, autoPatchelfHook, qtserialport , qtwebsockets, libredirect, makeWrapper, gzip, gnutar }: -mkDerivation rec { - name = "deconz-${version}"; - version = "2.09.03"; +let + version = "2.17.01"; + srcs = { + x86_64-linux = fetchurl { + url = + "https://deconz.dresden-elektronik.de/ubuntu/beta/deconz-${version}-qt5.deb"; + sha256 = "sha256-c2G3oOnSXlivO9KXRBZIe2DEuq7vPVlNDKF6T/pZLps="; + }; - src = fetchurl { - url = - "https://deconz.dresden-elektronik.de/debian/stable/deconz_${version}-debian-stretch-stable_arm64.deb"; - sha256 = "6EXYoXOg+6dTR9/hRHmNafZuBeNnAAS4z8ia15s1+9U="; + aarch64-linux = fetchurl { + url = + "https://deconz.dresden-elektronik.de/debian/stable/deconz_${version}-debian-buster-stable_arm64.deb"; + sha256 = "sha256-zuy4e9bzcRqDeXP6mfzZLCDK/3we25LH6xktnO6HXps="; + }; }; +in mkDerivation rec { + pname = "deCONZ"; + inherit version; + + src = srcs.${stdenv.hostPlatform.system}; + nativeBuildInputs = [ dpkg autoPatchelfHook makeWrapper ]; buildInputs = [ qtserialport qtwebsockets ]; @@ -37,7 +49,7 @@ mkDerivation rec { homepage = "https://www.dresden-elektronik.de/funktechnik/products/software/pc-software/deconz/?L=1"; license = licenses.unfree; - platforms = with platforms; linux; + platforms = [ "x86_64-linux" "aarch64-linux" ]; maintainers = with maintainers; [ felschr ]; }; }