5 files changed, 152 insertions, 7 deletions
diff --git a/makefu/5pkgs/awesomecfg/full.cfg b/makefu/5pkgs/awesomecfg/full.cfg
index c1b58aa90..f42aea003 100644
--- a/makefu/5pkgs/awesomecfg/full.cfg
+++ b/makefu/5pkgs/awesomecfg/full.cfg
@@ -83,13 +83,11 @@ vicious.register(batwidget, vicious.widgets.bat, "$2%", 61, "BAT0")
 -- {{{ Variable definitions
 -- Themes define colours, icons, and wallpapers
 -- beautiful.init("/usr/share/awesome/themes/default/theme.lua")
--- ./qbx8r72yzaxpz41zq00902zwajl31b5h-awesome-3.5.6/share/awesome/lib/beautiful.lua
---
--- Find the default theme
 
---
--- beautiful.init("/nix/store/qbx8r72yzaxpz41zq00902zwajl31b5h-awesome-3.5.6/share/awesome/themes/default/theme.lua")
+-- @awesome@/share/awesome/lib/beautiful.lua
+-- beautiful.init("@awesome@/share/awesome/themes/default/theme.lua")
 
+-- Find the default theme
 function find_default_theme()
   -- find the default lua theme in the package path
   for path in package.path:gmatch('([^;]+);') do
@@ -115,7 +113,7 @@ browser = "firefox"
 -- If you do not like this or do not have such a key,
 -- I suggest you to remap Mod4 to another key using xmodmap or other tools.
 -- However, you can use another modifier like Mod1, but it may interact with others.
-modkey = "Mod4"
+modkey = "@modkey@"
 
 -- Table of layouts to cover with awful.layout.inc, order matters.
 local layouts =
diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index 8caab433e..6d227fa6d 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -9,8 +9,11 @@ in
     alsa-hdspconf = callPackage ./alsa-tools { alsaToolTarget="hdspconf";};
     alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";};
     awesomecfg = callPackage ./awesomecfg {};
-    nodemcu-uploader = callPackage ./nodemcu-uploader {};
     mycube-flask = callPackage ./mycube-flask {};
+    nodemcu-uploader = callPackage ./nodemcu-uploader {};
     tw-upload-plugin = callPackage ./tw-upload-plugin {};
+    inherit (callPackage ./devpi {}) devpi-web devpi-server;
+    skytraq-logger = callPackage ./skytraq-logger/ {};
+    taskserver = callPackage ./taskserver {};
   };
 }
diff --git a/makefu/5pkgs/devpi/default.nix b/makefu/5pkgs/devpi/default.nix
new file mode 100644
index 000000000..0df8ecd2c
--- /dev/null
+++ b/makefu/5pkgs/devpi/default.nix
@@ -0,0 +1,70 @@
+{ pkgs ? import <nixpkgs> {} }:
+with pkgs.stdenv.lib;
+let
+  execnet14 = pkgs.python3Packages.buildPythonPackage rec {
+    name = "execnet-1.4.1";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/e/execnet/${name}.tar.gz";
+      sha256 = "1rpk1vyclhg911p3hql0m0nrpq7q7mysxnaaw6vs29cpa6kx8vgn";
+    };
+
+    propagatedBuildInputs = with pkgs.python3Packages;
+      [ setuptools_scm apipkg ];
+    meta = {
+      description = "rapid multi-Python deployment";
+      license = licenses.gpl2;
+    };
+  };
+
+  devpi-web = pkgs.python3Packages.buildPythonPackage rec {
+    name = "devpi-web";
+    version = "3.0.0";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/d/devpi-web/devpi-web-${version}.tar.gz";
+      sha256 = "156abxyhj17a8cg38hpyr31qkjb61mb2kggsxij4p4xvy9jwkbwi";
+    };
+
+    propagatedBuildInputs = with pkgs.python3Packages;
+      [ devpi-server pyramid_chameleon beautifulsoup4 Whoosh defusedxml ];
+
+    meta = {
+      homepage = https://bitbucket.org/hpk42/devpi;
+      description = "a web view for devpi-server";
+      license = licenses.mit;
+      maintainers = with maintainers; [ makefu ];
+    };
+  };
+  devpi-server = pkgs.python3Packages.buildPythonPackage rec {
+    name = "devpi-server";
+    version = "3.0.2";
+
+    # original postFixup adds "import sys; sys.argv[0] = 'devpi-server'" to
+    # `.devpi-server-wrapped` which
+    # results in "not existing devpi-server: 'devpi-server'"
+    postFixup = "";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/d/devpi-server/devpi-server-${version}.tar.gz";
+      sha256 = "14r1024i3x2pb72khyzvi56sh9smpdswmrbc88xvjxnalmzfn99d";
+    };
+
+    propagatedBuildInputs = with pkgs.python3Packages;
+      [ devpi-common execnet14 itsdangerous pluggy waitress pyramid ];
+    buildInputs = with pkgs.python3Packages; [ pytest beautifulsoup4 webtest ];
+
+    meta = {
+      homepage = https://bitbucket.org/hpk42/devpi;
+      description = "Devpi Server";
+      license = licenses.mit;
+      maintainers = with maintainers; [ makefu ];
+    };
+  };
+
+in {
+  inherit devpi-server;
+  devpi-web =  pkgs.python3.buildEnv.override {
+      extraLibs = [ devpi-web devpi-server ];
+    };
+}
diff --git a/makefu/5pkgs/skytraq-logger/default.nix b/makefu/5pkgs/skytraq-logger/default.nix
new file mode 100644
index 000000000..1ad81594a
--- /dev/null
+++ b/makefu/5pkgs/skytraq-logger/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, lib, pkgs, fetchFromGitHub, ... }:
+stdenv.mkDerivation rec {
+  name = "skytraq-datalogger-${version}";
+  version = "4966a8";
+  src = fetchFromGitHub {
+    owner = "makefu";
+    repo = "skytraq-datalogger";
+    rev = version ;
+    sha256 = "1qaszrs7638kc9x4qq4m1yxqmk8jw7wajywvdk4wc2i007p89v3y";
+  };
+  buildFlags = "CC=gcc";
+  makeFlags = "PREFIX=bin/ DESTDIR=$(out)";
+
+  preInstall = ''
+    mkdir -p $out/bin
+  '';
+  #patchPhase = ''
+  #  sed -i -e 's#/usr/bin/gcc#gcc#' -e Makefile
+  #'';
+
+  buildInputs = with pkgs;[
+    curl
+    gnugrep
+  ];
+
+  meta = {
+    homepage = http://github.com/makefu/skytraq-datalogger;
+    description = "datalogger for skytraq";
+    license = lib.licenses.gpl2;
+  };
+}
diff --git a/makefu/5pkgs/taskserver/default.nix b/makefu/5pkgs/taskserver/default.nix
new file mode 100644
index 000000000..a1502b4d6
--- /dev/null
+++ b/makefu/5pkgs/taskserver/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchurl, cmake, libuuid, gnutls, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "taskserver-${version}";
+  version = "1.1.0";
+
+  enableParallelBuilding = true;
+
+  src = fetchurl {
+    url = "http://www.taskwarrior.org/download/taskd-${version}.tar.gz";
+    sha256 = "1d110q9vw8g5syzihxymik7hd27z1592wkpz55kya6lphzk8i13v";
+  };
+
+  patchPhase = ''
+    pkipath=$out/share/taskd/pki
+    mkdir -p $pkipath
+    cp -r pki/* $pkipath
+    echo "patching paths in pki/generate"
+    sed -i "s#^\.#$pkipath#" $pkipath/generate
+    for f in $pkipath/generate* ;do
+      i=$(basename $f)
+      echo patching $i
+      sed -i \
+          -e 's/which/type -p/g' \
+          -e 's#^\. ./vars#if test -e ./vars;then . ./vars; else echo "cannot find ./vars - copy the template from '$pkipath'/vars into the working directory";exit 1; fi#' $f
+
+      echo wrapping $i
+      makeWrapper  $pkipath/$i $out/bin/taskd-pki-$i \
+        --prefix PATH : ${gnutls}/bin/
+    done
+  '';
+
+  buildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ cmake libuuid gnutls ];
+
+  meta = {
+    description = "Server for synchronising Taskwarrior clients";
+    homepage = http://taskwarrior.org;
+    license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ matthiasbeyer makefu ];
+  };
+}