Merge remote-tracking branch 'prism/makefu'

3 files changed, 1 insertions, 60 deletions

diff --git a/makefu/5pkgs/awesomecfg/default.nix b/makefu/5pkgs/awesomecfg/default.nix
index c2276887e..b94b6fa54 100644
--- a/makefu/5pkgs/awesomecfg/default.nix
+++ b/makefu/5pkgs/awesomecfg/default.nix
@@ -1,6 +1,7 @@
 _:
 
 {
+  # TODO:  requires in path: amixer, xlock, xbacklight
   full = ./full.cfg;
   kiosk = ./kiosk.lua;
 }
diff --git a/makefu/5pkgs/dymo-cups-drivers/default.nix b/makefu/5pkgs/dymo-cups-drivers/default.nix
deleted file mode 100644
index d47bae6dd..000000000
--- a/makefu/5pkgs/dymo-cups-drivers/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ stdenv, lib, pkgs, fetchurl, cups, ... }:
-
-stdenv.mkDerivation rec {
-  name = "dymo-cups-drivers-${version}";
-  version = "1.4.0";
-  src = fetchurl {
-    url = "http://download.dymo.com/dymo/Software/Download%20Drivers/Linux/Download/${name}.tar.gz";
-    sha256 = "0wagsrz3q7yrkzb5ws0m5faq68rqnqfap9p98sgk5jl6x7krf1y6";
-  };
-  buildInputs = [ cups ];
-  makeFlags = [ "cupsfilterdir=$(out)/lib/cups/filter" "cupsmodeldir=$(out)/share/cups/model" ];
-
-  # acd_cli gets dumped in bin and gets overwritten by fixupPhase
-  meta = {
-    description = "Dymo printer drivers";
-  };
-}
diff --git a/makefu/5pkgs/taskserver/default.nix b/makefu/5pkgs/taskserver/default.nix
deleted file mode 100644
index a1502b4d6..000000000
--- a/makefu/5pkgs/taskserver/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ 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 ];
-  };
-}