Merge branch 'master' of prism.r:stockholm into staging/jeschli

2 files changed, 54 insertions, 0 deletions

diff --git a/makefu/5pkgs/ampel/default.nix b/makefu/5pkgs/ampel/default.nix
new file mode 100644
index 00000000..86518b9b
--- /dev/null
+++ b/makefu/5pkgs/ampel/default.nix
@@ -0,0 +1,27 @@
+{ lib, pkgs, fetchFromGitHub, ... }:
+
+with pkgs.python3Packages;buildPythonPackage rec {
+  name = "ampel-${version}";
+  version = "0.2";
+
+  propagatedBuildInputs = [
+    docopt
+    paho-mqtt
+    requests
+    pytz
+    influxdb
+    httplib2
+    google_api_python_client
+  ];
+
+  src = pkgs.fetchgit {
+      url = "http://cgit.euer.krebsco.de/ampel";
+      rev = "d8a0250";
+      sha256 = "0n36lc17ca5db6pl6dswdqd5w9f881rfqck9yc4w33a5qpsxj85f";
+  };
+  meta = {
+    homepage = http://cgit.euer.krebsco.de/ampel;
+    description = "change colors of rgb cubes";
+    license = lib.licenses.asl20;
+  };
+}
diff --git a/makefu/5pkgs/pfsshell/default.nix b/makefu/5pkgs/pfsshell/default.nix
new file mode 100644
index 00000000..fc6b3706
--- /dev/null
+++ b/makefu/5pkgs/pfsshell/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, lib, pkgs, fetchurl,fetchFromGitHub, upx, wine }:
+stdenv.mkDerivation rec {
+  pname = "pfsshell";
+  version = "64f8c2";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "makefu";
+    repo = "pfsshell";
+    rev = version;
+    sha256 = "01lbqf8s91p8id58xa16fp555i03vfycqvhv7qzpnrjy6yvp9dm8";
+  };
+
+  buildInputs = [ ];
+
+  makeFlags = [ ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp pfsshell $out/bin
+  '';
+
+  meta = {
+    homepage = https://github.com/uyjulian/pfsshell ;
+    description = "browse and transfer files to/from PFS filesystems";
+  };
+}