From 056100ec277c5b1e737de306191558f3b9693198 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 29 Dec 2022 12:00:57 +0100 Subject: [PATCH 1/3] python3Packages.hassil: 0.1.3 -> 0.1.4 Changelog: https://github.com/home-assistant/hassil/releases/tag/v0.1.4 --- pkgs/development/python-modules/hassil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hassil/default.nix b/pkgs/development/python-modules/hassil/default.nix index bbbe26faccb9..9e5d3116e01f 100644 --- a/pkgs/development/python-modules/hassil/default.nix +++ b/pkgs/development/python-modules/hassil/default.nix @@ -13,7 +13,7 @@ let pname = "hassil"; - version = "0.1.3"; + version = "0.1.4"; in buildPythonPackage { inherit pname version; @@ -21,7 +21,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-KWkzHWMo50OIrZ2kwFhhqDSleFFkAD7/JugjvSyCkww="; + hash = "sha256-ygaPdfH2jBk2xvlgt7V8/VcZAtv6Lwsi8g+stK/DdT8="; }; postPatch = '' From 4d4b37d44f38715b7db3e2f60d95e37ef6a054d7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 1 Jan 2023 04:04:35 +0100 Subject: [PATCH 2/3] python3Packages.hassil: regenerate antlr files --- pkgs/development/python-modules/hassil/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/hassil/default.nix b/pkgs/development/python-modules/hassil/default.nix index 9e5d3116e01f..84800b51381a 100644 --- a/pkgs/development/python-modules/hassil/default.nix +++ b/pkgs/development/python-modules/hassil/default.nix @@ -2,6 +2,9 @@ , buildPythonPackage , fetchPypi +# build +, antlr4 + # propagates , antlr4-python3-runtime , dataclasses-json @@ -24,8 +27,14 @@ buildPythonPackage { hash = "sha256-ygaPdfH2jBk2xvlgt7V8/VcZAtv6Lwsi8g+stK/DdT8="; }; + nativeBuildInputs = [ + antlr4 + ]; + postPatch = '' sed -i 's/antlr4-python3-runtime==.*/antlr4-python3-runtime/' requirements.txt + rm hassil/grammar/*.{tokens,interp} + antlr -Dlanguage=Python3 -visitor -o hassil/grammar/ *.g4 ''; propagatedBuildInputs = [ From 00903be01097db9473da6cb23c27623291e2f961 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 1 Jan 2023 04:04:55 +0100 Subject: [PATCH 3/3] python3Packages.hassil: expose as top-level attribute --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20ca09c9a3e6..a6697c1a2a75 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7953,6 +7953,8 @@ with pkgs; haskell-language-server = callPackage ../development/tools/haskell/haskell-language-server/withWrapper.nix { }; + hassil = with python3Packages; toPythonApplication hassil; + hasmail = callPackage ../applications/networking/mailreaders/hasmail { }; haste-client = callPackage ../tools/misc/haste-client { };