From dad23cf28940599aeb8f5d57e174c0db862482ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Fri, 1 Feb 2019 12:27:51 +0100 Subject: [PATCH] catullus: add telegram-betacode container --- packages/telegram-betacode.nix | 37 ++++++++++++++++++++++++++++++ packages/telegram-reverse.nix | 12 ++++++++-- systems/catullus/configuration.nix | 16 +------------ systems/catullus/containers.nix | 28 ++++++++++++++++++++++ 4 files changed, 76 insertions(+), 17 deletions(-) create mode 100644 packages/telegram-betacode.nix create mode 100644 systems/catullus/containers.nix diff --git a/packages/telegram-betacode.nix b/packages/telegram-betacode.nix new file mode 100644 index 0000000..cb78598 --- /dev/null +++ b/packages/telegram-betacode.nix @@ -0,0 +1,37 @@ +{ fetchFromGitHub, buildPythonPackage, 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"; + }; + propagatedBuildInputs = [ pygtrie ]; + doCheck = false; + }; +in buildPythonPackage rec { + pname = "telegram-betacode"; + version = "0.1.0"; + + src = + let + repository = fetchFromGitHub { + owner = "kmein"; + repo = "telebots"; + rev = "ec4a0636c606e6e6f281df99ad06ae0582c1e292"; + sha256 = "129f5x0m4hj5i9y5bi5gjj1j5nih027kp5fv5wx9v4smbm0ph0hd"; + }; + in "${repository.out}/${pname}"; + + propagatedBuildInputs = [ python-telegram-bot betacode ]; +} diff --git a/packages/telegram-reverse.nix b/packages/telegram-reverse.nix index 594f97f..9cceabb 100644 --- a/packages/telegram-reverse.nix +++ b/packages/telegram-reverse.nix @@ -1,9 +1,17 @@ -{ buildPythonPackage, pillow, python-telegram-bot, pydub, ffmpeg }: +{ fetchFromGitHub, buildPythonPackage, pillow, python-telegram-bot, pydub, ffmpeg }: buildPythonPackage rec { pname = "telegram-reverse"; version = "0.2.0"; - src = "${builtins.fetchTarball https://github.com/kmein/telebots/archive/e83ec7d78f24214801d53cc3706918d282d9cadf.tar.gz}/${pname}"; + src = + let + repository = fetchFromGitHub { + owner = "kmein"; + repo = "telebots"; + rev = "ec4a0636c606e6e6f281df99ad06ae0582c1e292"; + sha256 = "129f5x0m4hj5i9y5bi5gjj1j5nih027kp5fv5wx9v4smbm0ph0hd"; + }; + in "${repository.out}/${pname}"; propagatedBuildInputs = [ pillow python-telegram-bot pydub ffmpeg ]; } diff --git a/systems/catullus/configuration.nix b/systems/catullus/configuration.nix index ac3c818..90e0221 100644 --- a/systems/catullus/configuration.nix +++ b/systems/catullus/configuration.nix @@ -4,10 +4,10 @@ let homeros = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDn13Y6CznabMvKJPIrr/dj1TX4boe8F98yc3FDElJeprQo2RXlDzjg/po9/lHTHaoC5yQUjlRg/AnI4vizYkn2sqJebAeSPahmpS+l0eFnjZgsqds2cCFqSPB6Qc5YEkGRhN4aq/ABz0jdFJLBYOYGxuuXowYxyNrqrItxDR7tF7upG+kVjYiDoP/qFm8C7zv6Zy8aoehNbzf8HlIJd0ITbMr/vUftNsQ8C84QmbZljReHmchPgE8GUfVLTlCORkhndbvNX3jXo+75y7JOIZZ6193FZHM4seg/VSDWYLJtpnhttD1w6qmiLrlimqbJB9ihoXq2eDmQ+4zo6hxQ6pFH6P0xQClJ0hxVWn6hEM3rkMwoMfbq4v54gKJsYxcGdnwjAX6d9DQv/QVjmVZffKWsGGoC7uz7bdmc0akVKi+GLSPOx8sJwXqvyvFStfqLaweVcuikUqQ72JLK7pZyliA7na6KuQ1PE3LTpfSr0lbBJ73xtS2rU1nF/Oe5zwA4LX5s/QeDVmS86D8acUrSCO62pBB3Yv8go0KR4mEvfxLiUWV6gR2uTeIPXvo4ouYFZqyABAGybjUATlGCXJaeHd/y/VWkpIB8ocqNESlRMCEe4TrYjw91AEmYBL6kWIeop3dyhovm3dTB3fQvC97kbL16wuXBrOcN4lEc+56ShhmvdQ== kieran.meinhardt@gmail.com"; scardanelli = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC19H0FhSNWcfBRPKzbTVSMJikIWZl0CoM8zCm+/3fdMgoaLRpeZWe/AfDK6b4qOjk/sez/J0JUFCGr+JbMwjsduoazsuQowu9L9DLP9Q5UkJje4BD7MHznaeu9/XfVng/MvyaEWArA/VUJeKQesHe76tR511/+n3+bdzlIh8Zw/3wfFxmg1OTNA99/vLkXrQzHDTuV/yj1pxykL4xFtN0OIssW1IKncJeKtkO/OHGT55ypz52Daj6bNKqvxiTuzeEhv5M+5ppyIPcRf1uj/7IaPKttCgZAntEqBTIR9MbyXFeAZVayzaFnLl2okeam5XreeZbj+Y1h2ZjxiIuWoab3MLndSekVfLtfa63gtcWIf8CIvZO2wJoH8v73y0U78JsfWVaTM09ZCfFlHHA/bWqZ6laAjW+mWLO/c77DcYkB3IBzaMVNfc6mfTcGFIC+biWeYpKgA0zC6rByUPbmbIoMueP9zqJwqUaM90Nwd6559inBB107/BK3Ktb3b+37mMCstetIPB9e4EFpGMjhmnL/G81jS53ACWLXJYzt7mKU/fEsiW93MtaB+Le46OEC18y/4G8F7p/nnH7i0kO74ukxbnc4PlpiM7iWT6ra2Cyy+nzEgdXCNXywIxr05TbCQDwX6/NY8k7Hokgdfyz+1Pq3sX0yCcWRPaoB26YF12KYFQ== kieran.meinhardt@gmail.com"; }; - telegram-reverse = pkgs.python3Packages.callPackage {}; in { imports = [ + ]; boot.loader.grub.enable = false; @@ -22,20 +22,6 @@ in { networks.Aether = { pskRaw = "e1b18af54036c5c9a747fe681c6a694636d60a5f8450f7dec0d76bc93e2ec85a"; }; }; - containers.telegram-bots = { - autoStart = true; - config = { - systemd.services.telegram-reverse = { - wantedBy = [ "multi-user.target" ]; - description = "Telegram bot for reversing things"; - environment.TELEGRAM_REVERSE_TOKEN = builtins.readFile ; - enable = true; - script = ''${telegram-reverse}/bin/telegram-reverse''; - serviceConfig.Restart = "always"; - }; - }; - }; - environment.variables.TERM = "linux"; documentation.enable = false; diff --git a/systems/catullus/containers.nix b/systems/catullus/containers.nix new file mode 100644 index 0000000..d623e0a --- /dev/null +++ b/systems/catullus/containers.nix @@ -0,0 +1,28 @@ +{ config, pkgs, ... }: +let + telegram-reverse = pkgs.python3Packages.callPackage {}; + telegram-betacode = pkgs.python3Packages.callPackage {}; +in { + containers.telegram-bots = { + autoStart = true; + config = { + systemd.services.telegram-reverse = { + wantedBy = [ "multi-user.target" ]; + description = "Telegram bot for reversing things"; + environment.TELEGRAM_REVERSE_TOKEN = builtins.readFile ; + enable = true; + script = ''${telegram-reverse}/bin/telegram-reverse''; + serviceConfig.Restart = "always"; + }; + + systemd.services.telegram-betacode = { + wantedBy = [ "multi-user.target" ]; + description = "Telegram bot for converting Ancient Greek betacode into unicode"; + environment.TELEGRAM_BETACODE_TOKEN = builtins.readFile ; + enable = true; + script = ''${telegram-betacode}/bin/telegram-betacode''; + serviceConfig.Restart = "always"; + }; + }; + }; +}