From 16cfb3226e81584843d1f7f65ee5639a7421a967 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Pluta?= Date: Thu, 11 Jul 2024 15:23:17 +0200 Subject: [PATCH] Revert "Force OpenHAB-4.2.0.M1 version" This reverts commit c1ca49f09f9848b6a67866711f5e3a6efd97afde. --- openhab-addons.nix | 2 +- openhab.nix | 6 +++--- openhab.sha256 | 2 +- version | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/openhab-addons.nix b/openhab-addons.nix index a0a62b4..a3ec4e5 100644 --- a/openhab-addons.nix +++ b/openhab-addons.nix @@ -4,6 +4,6 @@ let version = builtins.readFile ./version; sha256 = builtins.readFile ./openhab-addons.sha256; in fetchurl { - url = "https://github.com/openhab/openhab-distro/releases/download/4.2.0.M1/openhab-addons-4.2.1.M1.kar"; + url = "https://github.com/openhab/openhab-distro/releases/download/${version}/openhab-addons-${version}.kar"; inherit sha256; } diff --git a/openhab.nix b/openhab.nix index 1ab387d..090d44f 100644 --- a/openhab.nix +++ b/openhab.nix @@ -13,13 +13,13 @@ }: let - version = "4.2.0.M1"; - sha256 = "a7e390b21abb476c17ac2976a77fed8c15b5b8b493ad34de0a2deb81a96bdf07"; + version = builtins.readFile ./version; + sha256 = builtins.readFile ./openhab.sha256; in stdenv.mkDerivation rec { inherit version; pname = "openhab"; src = fetchurl { - url = "https://github.com/openhab/openhab-distro/releases/download/4.2.0.M1/openhab-4.2.0.M1.tar.gz"; + url = "https://github.com/openhab/openhab-distro/releases/download/${version}/openhab-${version}.tar.gz"; inherit sha256; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/openhab.sha256 b/openhab.sha256 index e4ac906..85ca417 100644 --- a/openhab.sha256 +++ b/openhab.sha256 @@ -1 +1 @@ -a7e390b21abb476c17ac2976a77fed8c15b5b8b493ad34de0a2deb81a96bdf07 +8d6b3de2ab5711303055cee67288fcf761609bf902e97cc5e58a20856b63ba20 \ No newline at end of file diff --git a/version b/version index 350b968..2582ddd 100644 --- a/version +++ b/version @@ -1 +1 @@ -4.2.0.M1 +4.1.1 \ No newline at end of file