diff --git a/packages/telegram-betacode.nix b/packages/telegram-betacode.nix deleted file mode 100644 index 95e4ae7..0000000 --- a/packages/telegram-betacode.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ fetchFromGitHub, buildPythonApplication, buildPythonPackage, fetchPypi, python-telegram-bot }: -let - pygtrie = buildPythonPackage rec { - pname = "pygtrie"; - version = "2.3"; - src = fetchPypi { - inherit pname version; - sha256 = "00x7q4p9r75zdnw3a8vd0d0w0i5l28w408g5bsfl787yv6b1h9i8"; - }; - doCheck = false; - }; - betacode = buildPythonPackage rec { - pname = "betacode"; - version = "0.2"; - src = fetchPypi { - inherit pname version; - sha256 = "08fnjzjvnm9m6p4ddyr8qgfb9bs2nipv4ls50784v0xazgxx7siv"; - }; - preBuild = ''sed -i 's/[\d128-\d255]//g' ./README.rst''; - propagatedBuildInputs = [ pygtrie ]; - doCheck = false; - }; -in buildPythonApplication rec { - pname = "telegram-betacode"; - version = "0.1.0"; - - src = - let - repository = fetchFromGitHub { - owner = "kmein"; - repo = "telebots"; - rev = "f18d856253492d268d2738616ca5176b311c1f7e"; - sha256 = "1snbb2cgr0a9cfca4l1i8xp3k5zrl4jg5s5im6grnnzzm98qacrf"; - }; - in "${repository.out}/${pname}"; - - propagatedBuildInputs = [ python-telegram-bot betacode ]; -} diff --git a/packages/telegram-horoscope.nix b/packages/telegram-horoscope.nix deleted file mode 100644 index 6e695fc..0000000 --- a/packages/telegram-horoscope.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ fetchFromGitHub, buildPythonApplication, buildPythonPackage, fetchPypi, aiohttp, urllib3, pytz }: -let - telepot = - buildPythonPackage rec { - pname = "telepot"; - version = "12.7"; - src = fetchPypi { - inherit pname version; - sha256 = "1c587dmr71ppray0lzxgib1plnndmaiwal1kaiqx82rdwx4kw4ms"; - }; - propagatedBuildInputs = [ aiohttp urllib3 ]; - doCheck = false; - }; -in buildPythonApplication rec { - pname = "telegram-horoscope"; - version = "0.1.0"; - - src = - let - repository = fetchFromGitHub { - owner = "kmein"; - repo = "telebots"; - rev = "702a9ac51f15419ba878862d13d09facbce729e9"; - sha256 = "11h955fc8l43w30glidqi5j9licfvp7dhrzqzgqizr0767yfn7ln"; - }; - in "${repository.out}/${pname}"; - - propagatedBuildInputs = [ telepot pytz ]; -} diff --git a/packages/telegram-proverb.nix b/packages/telegram-proverb.nix deleted file mode 100644 index 5b79204..0000000 --- a/packages/telegram-proverb.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ fetchFromGitHub, buildPythonApplication, buildPythonPackage, fetchPypi, aiohttp, urllib3, pillow, beautifulsoup4 }: -let - telepot = - buildPythonPackage rec { - pname = "telepot"; - version = "12.7"; - src = fetchPypi { - inherit pname version; - sha256 = "1c587dmr71ppray0lzxgib1plnndmaiwal1kaiqx82rdwx4kw4ms"; - }; - propagatedBuildInputs = [ aiohttp urllib3 ]; - doCheck = false; - }; -in buildPythonApplication rec { - pname = "telegram-proverb"; - version = "0.1.0"; - - # src = ~/prog/git/proverb-pro; - src = fetchFromGitHub { - owner = "kmein"; - repo = "proverb-pro"; - rev = "356460f5c542e8f5735c3e3eb5a356a04faf48df"; - sha256 = "02psipiyvs126b67xkqd72sfjixanrvlg02w3pn2wpc0miy5v0v3"; - }; - - propagatedBuildInputs = [ telepot pillow beautifulsoup4 ]; -} diff --git a/packages/telegram-reverse.nix b/packages/telegram-reverse.nix deleted file mode 100644 index d9671e2..0000000 --- a/packages/telegram-reverse.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ fetchFromGitHub, buildPythonApplication, pillow, python-telegram-bot, pydub, ffmpeg }: -buildPythonApplication rec { - pname = "telegram-reverse"; - version = "0.2.0"; - - src = - let - repository = fetchFromGitHub { - owner = "kmein"; - repo = "telebots"; - rev = "cb248102338f2d3deac5b803d4d57ca16a047514"; - sha256 = "08xw3172zz88r9rjlb09r08h1z0nfqvi8kaqrc6lsv5ifzwyayg0"; - }; - in "${repository.out}/${pname}"; - - propagatedBuildInputs = [ pillow python-telegram-bot pydub ffmpeg ]; -} diff --git a/systems/catullus/containers.nix b/systems/catullus/containers.nix index f29791b..f7f42f3 100644 --- a/systems/catullus/containers.nix +++ b/systems/catullus/containers.nix @@ -1,13 +1,25 @@ { config, pkgs, lib, ... }: let - # telegram-horoscope = pkgs.python3Packages.callPackage {}; + telebots-package = pkgs.fetchFromGitHub { + owner = "kmein"; + repo = "telebots"; + rev = "aaf9d3efe1b97234ad2c941c622ce9ee3b28a6a6"; + sha256 = "0fvhgzy42khxv8j4v2flgphcr0fg6yrp9857c7zn1mic6cwwnyw5"; + }; + proverb-bot-package = pkgs.fetchFromGitHub { + owner = "kmein"; + repo = "proverb-pro"; + rev = "f4201c5419354377a26b7f7873368683efbea417"; + sha256 = "1ixffmxy3sxy2if7fd44ps451rds14hnz4d0x9nkh8lzshqk6v4y"; + }; in { nixpkgs.config.packageOverrides = pkgs: { autorenkalender = pkgs.callPackage {}; literature-quote = pkgs.callPackage {}; - telegram-proverb = pkgs.python3Packages.callPackage {}; - telegram-betacode = pkgs.python3Packages.callPackage {}; - telegram-reverse = pkgs.python3Packages.callPackage {}; + telegram-proverb = pkgs.python3Packages.callPackage proverb-bot-package {}; + telegram-reverse = pkgs.python3Packages.callPackage "${telebots-package}/telegram-reverse" {}; + telegram-odyssey = pkgs.python3Packages.callPackage "${telebots-package}/telegram-odyssey" {}; + telegram-betacode = pkgs.python3Packages.callPackage "${telebots-package}/telegram-betacode" {}; }; niveum.telegramBots.quotebot = { @@ -27,6 +39,15 @@ in { command = "${pkgs.autorenkalender}/bin/autorenkalender"; }; + systemd.services.telegram-odyssey = { + wantedBy = [ "multi-user.target" ]; + description = "Telegram bot reciting the Odyssey to you"; + environment.TELEGRAM_ODYSSEY_TOKEN = builtins.readFile ; + enable = true; + script = ''${pkgs.telegram-odyssey}/bin/telegram-odyssey''; + serviceConfig.Restart = "always"; + }; + systemd.services.telegram-reverse = { wantedBy = [ "multi-user.target" ]; description = "Telegram bot for reversing things";