diff --git a/package/default.nix b/package/default.nix index c34afb7..f5ce741 100644 --- a/package/default.nix +++ b/package/default.nix @@ -121,7 +121,7 @@ in { py3-cryptomus = pkgs.callPackage ./py3-cryptomus.nix {}; py3-modulegraph = pkgs.callPackage ./py3-modulegraph.nix {}; py3-swifter = pkgs.callPackage ./py3-swifter.nix {}; - py3-aiogram-newsletter = pkgs.callPackage ./py3-swifter.nix {}; + py3-aiogram-newsletter = pkgs.callPackage ./py3-aiogram-newsletter.nix {}; py3-openai-shap-e = pkgs.callPackage ./py3-openai-shap-e.nix {}; nvim-alias = pkgs.callPackage ./nvim-alias.nix {}; bolt-unpack = pkgs.callPackage ./bolt-unpack.nix {}; diff --git a/package/py3-aiogram-newsletter.nix b/package/py3-aiogram-newsletter.nix index fde8c1e..f4b52d2 100644 --- a/package/py3-aiogram-newsletter.nix +++ b/package/py3-aiogram-newsletter.nix @@ -1,12 +1,23 @@ { python3Packages, fetchFromGitHub }: python3Packages.buildPythonPackage rec { pname = "aiogram-newsletter"; - version = "0.0.10"; + version = "0.0.12"; + + pyproject = true; + build-system = [ python3Packages.setuptools ]; src = fetchFromGitHub { - inherit pname version; owner = "nessshon"; repo = "aiogram-newsletter"; rev = "bb8a42e4bcff66a9a606fc92ccc27b1d094b20fc"; sha256 = "sha256-atKhccp8Pr8anJUo+M9hnYkYrcgnB9SxrpmsiVusJZs="; }; + + postPatch = '' + substituteInPlace setup.py --replace-fail '"apscheduler==3.10"' '"apscheduler>=3.10"' + ''; + + propagatedBuildInputs = with python3Packages; [ + aiogram + apscheduler + ]; } diff --git a/package/support-bot/default.nix b/package/support-bot/default.nix index 9f235a3..adef685 100644 --- a/package/support-bot/default.nix +++ b/package/support-bot/default.nix @@ -5,7 +5,7 @@ }: let aiogram-newsletter = pkgs.python3Packages.buildPythonPackage { pname = "aiogram-newsletter"; - version = "0.0.10"; + version = "0.0.12"; pyproject = true; build-system = [ pkgs.python3Packages.setuptools ]; @@ -16,8 +16,15 @@ rev = "bb8a42e4bcff66a9a606fc92ccc27b1d094b20fc"; sha256 = "sha256-atKhccp8Pr8anJUo+M9hnYkYrcgnB9SxrpmsiVusJZs="; }; - - propagatedBuildInputs = [ ]; + + postPatch = '' + substituteInPlace setup.py --replace-fail '"apscheduler==3.10"' '"apscheduler>=3.10"' + ''; + + propagatedBuildInputs = with pkgs.python3Packages; [ + aiogram + apscheduler + ]; meta = { description = ""; @@ -45,12 +52,12 @@ in pkgs.python3Packages.buildPythonPackage { name="support-bot", version="1.0.0", install_requires=[ - "aiogram==3.7.0", + "aiogram>=3", "aiogram-newsletter>=0.0.10", - "cachetools==5.3.2", - "environs==10.3.0", - "pydantic==2.5.3", - "redis==5.0.1", + "cachetools>=5.3.2", + "environs>=10.3.0", + "pydantic>=2.5.3", + "redis>=5.0.1", "apscheduler", ], entry_points={ diff --git a/sus/hectic-lab.yaml b/sus/hectic-lab.yaml index ff2ac98..02979ed 100644 --- a/sus/hectic-lab.yaml +++ b/sus/hectic-lab.yaml @@ -19,6 +19,8 @@ matrix: password: ENC[AES256_GCM,data:2JUc8U87HVrJIDc9j2InZKgTRQBP,iv:0tuM7TFENbiVi7aM0nTgvRJrK0vGLewsmWJz2MUi62g=,tag:RL61PCXzQFLObBwXthpk5Q==,type:str] liquiz: password: ENC[AES256_GCM,data:6y3eFrfAZ88=,iv:yEIr1Oq4x3jnWcymHwrLDioKqapzaiOfNPvkgiNIOiw=,tag:CJ3gWTRpQtEEaMkYUOb8Mg==,type:str] + lvgkcfjl: + password: ENC[AES256_GCM,data:heZSXKj9MCQcY7wH,iv:PdIo3PhXTiGt8JiwafxQA7ysjJ3MJ0hrgCMO+sCs4Oo=,tag:iQYP6r44F3J+xEkam7Zjiw==,type:str] turn-secret: ENC[AES256_GCM,data:2RerKgYNFXEVM/YVmXt2l+t3BqduS+FlmjBWTA==,iv:6odb0HB9mntsceNaJtU2kwEVAiF0O88u47eDPLZVJbs=,tag:BJXAvK8abcnCLi96Kra5zA==,type:str] wg-bfs: private-key: ENC[AES256_GCM,data:/J02asiesrQcsO7Xbq66HQIQeSPmFEMkM2q/z+9Y42K8SYEQP0OYQz+8fXI=,iv:PdGhPWgGxhe0a7C6CaVM/ePKABT+y8HRFOAPzNwQk+c=,tag:9AI30JFh6uyaXXVjMBJ1zg==,type:str] @@ -81,7 +83,7 @@ sops: Yk43ZmlTc09aNFV1VjdjN2RWQlFWTDQKcYSvA2lHP8GS0lkYY19Tm8RXmFHQX5Ck qV2Fn22Fic4M5FVKDEMfaO6WmeXgki9a8dGeO9LlC+Phf16SOq7eLw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2026-05-22T20:46:03Z" - mac: ENC[AES256_GCM,data:IE3N17kJDlgoIp4kYSpWqLRC1wA61OEBB/vz3wCEmZuQpO4uPd+ymSjGtTHXSc+Ppie5mFv9t+mHbhqsDjw33yts7FDdMB8OFxSO4qBQu4itLHWA+lSylknn/a/aZg6YZO9ppYjD4NQVZhFVJUl+7oBuuHlaEofB9i7c1lIkXts=,iv:X3nLOMhpZaba/NBl2vAIX0TXQp0k99N7y+gVRXVNbiM=,tag:RHB3a4yYaSgsJ5atrREf9g==,type:str] + lastmodified: "2026-05-23T07:08:25Z" + mac: ENC[AES256_GCM,data:D7V2jX6AK89s/TRjrNXBHHyJHIbp+OQSzV2XfZ3qUOxJKfrNvNes8tARGO7fF1OMdbnZJVC7VBCMVOg0UtN6UlLepF9lL/jYzKPbPO6ohhhTdgv4OUkiTNVZ6MGQOY2win9NiHoAhn6zdNw8bZeXNPN5D7eY+Spy6zXLvjrl2EY=,iv:CoVVHHmFga/ecqP0KNp0Gy6rx08SuqImNuc6zc0JGpU=,tag:s4tJBGtBUjRyDCkPXqaQAQ==,type:str] unencrypted_suffix: _unencrypted version: 3.10.2