Merge remote-tracking branch 'gum/master'

2 files changed, 22 insertions, 0 deletions

diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index c4a7f498f..33e280f0e 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -10,5 +10,6 @@ in
     alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";};
     awesomecfg = callPackage ./awesomecfg {};
     tw-upload-plugin = callPackage ./tw-upload-plugin {};
+    mycube-flask = callPackage ./mycube-flask {};
   };
 }
diff --git a/makefu/5pkgs/mycube-flask/default.nix b/makefu/5pkgs/mycube-flask/default.nix
new file mode 100644
index 000000000..d01abbbd4
--- /dev/null
+++ b/makefu/5pkgs/mycube-flask/default.nix
@@ -0,0 +1,21 @@
+{ lib, pkgs, fetchFromGitHub, ... }:
+
+with pkgs.pythonPackages;buildPythonPackage rec {
+  name = "mycube-flask-${version}";
+  version = "0.2.3";
+  propagatedBuildInputs = [
+    flask
+    redis
+  ];
+  src = fetchFromGitHub {
+    owner = "makefu";
+    repo = "mycube-flask";
+    rev = "5f5260a";
+    sha256 = "1jx0h81nlmi1xry2vw46rvsanq0sdca6hlq31lhh7klqrg885hgh";
+  };
+  meta = {
+    homepage = https://github.com/makefu/mycube-flask;
+    description = "flask app for mycube";
+    license = lib.licenses.asl20;
+  };
+}