summaryrefslogtreecommitdiffstats
path: root/makefu/5pkgs
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2021-01-28 18:07:02 +0100
committerlassulus <lassulus@lassul.us>2021-01-28 18:07:02 +0100
commit10a397b299698f94561115e8239ed0cd8877c0fe (patch)
tree5a58fe88ab8551763818a400f6ebbbd7c69c56ea /makefu/5pkgs
parent549f3fd553155412f04870a31849b29776a63d59 (diff)
parent0ea65cef9aa2f936f357c624fc53a393f79d8fcc (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/5pkgs')
-rw-r--r--makefu/5pkgs/kalauerbot/default.nix4
-rw-r--r--makefu/5pkgs/office-radio/default.nix23
2 files changed, 25 insertions, 2 deletions
diff --git a/makefu/5pkgs/kalauerbot/default.nix b/makefu/5pkgs/kalauerbot/default.nix
index ee90fdeec..b78b2fcd6 100644
--- a/makefu/5pkgs/kalauerbot/default.nix
+++ b/makefu/5pkgs/kalauerbot/default.nix
@@ -1,11 +1,11 @@
{ stdenv, python3, fetchgit }:
python3.pkgs.buildPythonPackage rec {
name = "kalauerbot";
-rev = "08d98aa";
+rev = "2a1e868";
src = fetchgit {
url = "http://cgit.euer.krebsco.de/kalauerbot";
inherit rev;
- sha256 = "017hh61smgq4zsxd10brgwmykwgwabgllxjs31xayvs1hnqmkv2v";
+ sha256 = "1vymz3dnpgcxwfgbnrpc0plcdmihxcq7xsvpap755c5jvzvb8a1k";
};
propagatedBuildInputs = with python3.pkgs;[
(callPackage ./python-matrixbot.nix {
diff --git a/makefu/5pkgs/office-radio/default.nix b/makefu/5pkgs/office-radio/default.nix
new file mode 100644
index 000000000..2eacb9e23
--- /dev/null
+++ b/makefu/5pkgs/office-radio/default.nix
@@ -0,0 +1,23 @@
+{ lib, pkgs, fetchFromGitHub, ... }:
+
+with pkgs.python3Packages;buildPythonPackage rec {
+ name = "office-radio-${version}";
+ version = "0.2.3.4";
+ propagatedBuildInputs = [
+ flask
+ psutil
+ mpd2
+ requests
+ ];
+ src = fetchFromGitHub {
+ owner = "makefu";
+ repo = "office-radio";
+ rev = "601c650";
+ sha256 = "06zf0sjm4zlnbjlmiajbz1klhz1maj1ww5vah2abcvk1vx0p0hn7";
+ };
+ meta = {
+ homepage = https://github.com/makefu/office-radio;
+ description = "manage virtual office radio";
+ license = lib.licenses.asl20;
+ };
+}