diff options
author | makefu <makefu@nixos.dev> | 2016-05-02 16:08:30 +0200 |
---|---|---|
committer | makefu <makefu@nixos.dev> | 2016-05-02 16:08:30 +0200 |
commit | f67a4c5a6a35a271cc9ab466770a2037af35c9c2 (patch) | |
tree | 182d7f18d18a46e6759fd713e83db139ccf975ef /5pkgs | |
parent | 7344b9df191c74466b6b9f9e032b0e50d867e701 (diff) | |
parent | 5a052128e8e3eab391f00b29445335485062bbd7 (diff) |
Merge branch 'master' of gum:stockholm
Diffstat (limited to '5pkgs')
-rw-r--r-- | 5pkgs/default.nix | 3 | ||||
-rw-r--r-- | 5pkgs/mycube-flask/default.nix | 4 | ||||
-rw-r--r-- | 5pkgs/taskserver/default.nix | 43 |
3 files changed, 47 insertions, 3 deletions
diff --git a/5pkgs/default.nix b/5pkgs/default.nix index d09d4a6e8..9cd2629de 100644 --- a/5pkgs/default.nix +++ b/5pkgs/default.nix @@ -9,9 +9,10 @@ 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; + taskserver = callPackage ./taskserver {}; }; } diff --git a/5pkgs/mycube-flask/default.nix b/5pkgs/mycube-flask/default.nix index 5bf85a66a..1b1672f08 100644 --- a/5pkgs/mycube-flask/default.nix +++ b/5pkgs/mycube-flask/default.nix @@ -10,8 +10,8 @@ with pkgs.pythonPackages;buildPythonPackage rec { src = fetchFromGitHub { owner = "makefu"; repo = "mycube-flask"; - rev = "5f5260a"; - sha256 = "1jx0h81nlmi1xry2vw46rvsanq0sdca6hlq31lhh7klqrg885hgh"; + rev = "48dc6857"; + sha256 = "1ax1vz6m5982l1mmp9vmywn9nw9p9h4m3ss74zazyspxq1wjim0v"; }; meta = { homepage = https://github.com/makefu/mycube-flask; diff --git a/5pkgs/taskserver/default.nix b/5pkgs/taskserver/default.nix new file mode 100644 index 000000000..a1502b4d6 --- /dev/null +++ b/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 ]; + }; +} |