domoticz: 2020.2 -> 2021.1

Fix package build.

+9 -21
+9 -21
pkgs/servers/domoticz/default.nix
··· 1 1 { lib, stdenv, 2 - fetchzip, 2 + fetchFromGitHub, 3 3 makeWrapper, 4 4 cmake, 5 5 python3, ··· 17 17 cereal 18 18 }: 19 19 20 - let 21 - version = "2020.2"; 22 - minizip = "f5282643091dc1b33546bb8d8b3c23d78fdba231"; 23 - 24 - domoticz-src = fetchzip { 25 - url = "https://github.com/domoticz/domoticz/archive/${version}.tar.gz"; 26 - sha256 = "1b4pkw9qp7f5r995vm4xdnpbwi9vxjyzbnk63bmy1xkvbhshm0g3"; 27 - }; 28 - 29 - minizip-src = fetchzip { 30 - url = "https://github.com/domoticz/minizip/archive/${minizip}.tar.gz"; 31 - sha256 = "1vddrzm4pwl14bms91fs3mbqqjhcxrmpx9a68b6nfbs20xmpnsny"; 32 - }; 33 - in 34 20 stdenv.mkDerivation rec { 35 21 pname = "domoticz"; 36 - inherit version; 22 + version = "2021.1"; 37 23 38 - src = domoticz-src; 39 - 40 - postUnpack = '' 41 - cp -r ${minizip-src}/* $sourceRoot/extern/minizip 42 - ''; 24 + src = fetchFromGitHub { 25 + owner = "domoticz"; 26 + repo = pname; 27 + rev = version; 28 + sha256 = "03s1fx2ilhiq47p99c6iln1fi0rhdcxxsrv1zaww7f7bc744vzbk"; 29 + fetchSubmodules = true; 30 + }; 43 31 44 32 buildInputs = [ 45 33 openssl