From 0b78e09ed4909354a7b6f87e3dc4a8ba9b2b5b00 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Thu, 23 Jan 2025 21:00:25 -0800 Subject: [PATCH] fix(grocy): pygrocy dep --- ci/packages.nix | 3 +++ packages/default.nix | 2 ++ packages/grocy/pygrocy.nix | 4 ++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ci/packages.nix b/ci/packages.nix index 26eb6510..eae91ad8 100644 --- a/ci/packages.nix +++ b/ci/packages.nix @@ -20,6 +20,9 @@ in { barcodebuddy-scanner barcodebuddy-scanner-python ]; + grocy.inputs = with packages.x86_64-linux; [ + pygrocy + ]; samba.inputs = with packages.x86_64-linux; [ legacyPackages.x86_64-linux.pkgs.samba samba-ldap diff --git a/packages/default.nix b/packages/default.nix index 96b8a4c7..ae85b6d8 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -57,6 +57,8 @@ systemd2mqtt ; + pygrocy = pkgs.python3Packages.callPackage ./grocy/pygrocy.nix { }; + nf-setup-node = let reisen = ../systems/reisen; inherit (inputs.self.lib.lib) userIs; diff --git a/packages/grocy/pygrocy.nix b/packages/grocy/pygrocy.nix index 2be92ffe..db8be2ff 100644 --- a/packages/grocy/pygrocy.nix +++ b/packages/grocy/pygrocy.nix @@ -4,7 +4,7 @@ fetchFromGitHub, backports-zoneinfo, deprecation, - pydantic, + pydantic_1 ? pydantic, pydantic ? null, requests, responses, pre-commit, @@ -40,7 +40,7 @@ in [ requests deprecation - pydantic + pydantic_1 ] ++ optional (pythonOlder "3.9") backports-zoneinfo;