public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use newly-added taskwarrior as an update to existing taskwarrior attribute

Browse Source
This commit is contained in:
Michael Raskin 2012-10-11 10:50:53 +04:00
parent 3fa383f70d
commit 0bf1789b6a
3 changed files with 14 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkgs/applications/misc/taskwarrior/default.nix
View File

@ -1,29 +1,22 @@
{ stdenv, fetchurl, cmake, lua5 }: {stdenv, fetchurl, cmake}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "task-warrior-2.0.0"; name = "taskwarrior-2.1.2";
src = fetchurl {
url = http://www.taskwarrior.org/download/task-2.0.0.tar.gz;
sha256 = "1gbmcynj2n2c9dcykxn27ffk034mvm0zri5hqhfdx593dhv1x5vq";
};
NIX_LDFLAGS = "-ldl";
buildNativeInputs = [ cmake ];
buildInputs = [ lua5 ];
crossAttrs = {
preConfigure = ''
export NIX_CROSS_LDFLAGS="$NIX_CROSS_LDFLAGS -ldl"
'';
};
enableParallelBuilding = true; enableParallelBuilding = true;
src = fetchurl {
url = http://www.taskwarrior.org/download/task-2.1.2.tar.gz;
sha256 = "0diy72sgiyvfl6bdy7k3qwv3ijx2z1y477smkk6jsbbd9fsp2lfg";
};
buildInputs = [ cmake ];
meta = { meta = {
description = "Command-line todo list manager"; description = "GTD (getting things done) implementation";
homepage = http://taskwarrior.org/; homepage = http://taskwarrior.org;
license = "GPLv2+"; license = stdenv.lib.licenses.mit;
maintainers = [stdenv.lib.maintainers.marcweber];
platforms = stdenv.lib.platforms.linux;
}; };
} }

22
pkgs/tools/misc/task/default.nix
View File

@ -1,22 +0,0 @@
{stdenv, fetchurl, cmake}:
stdenv.mkDerivation {
name = "task-2.1.2";
enableParallelBuilding = true;
src = fetchurl {
url = http://www.taskwarrior.org/download/task-2.1.2.tar.gz;
sha256 = "0diy72sgiyvfl6bdy7k3qwv3ijx2z1y477smkk6jsbbd9fsp2lfg";
};
buildInputs = [ cmake ];
meta = {
description = "GTD (getting things done) implementation";
homepage = http://taskwarrior.org;
license = stdenv.lib.licenses.mit;
maintainers = [stdenv.lib.maintainers.marcweber];
platforms = stdenv.lib.platforms.linux;
};
}

2
pkgs/top-level/all-packages.nix
View File

@ -1525,8 +1525,6 @@ let
autoconf = autoconf213; autoconf = autoconf213;
}; };
task = callPackage ../tools/misc/task { };
tcpdump = callPackage ../tools/networking/tcpdump { }; tcpdump = callPackage ../tools/networking/tcpdump { };
/* /*