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

Merge pull request #33832 from matthiasbeyer/update-timewarrior

Browse Source 
timewarrior: 1.0.0 -> 1.1.0
This commit is contained in:
Jörg Thalheim 2018-01-13 16:59:09 +00:00 committed by GitHub
commit d96bfe2cf1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/misc/timewarrior/default.nix
View File

@ -2,19 +2,17 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "timewarrior-${version}"; name = "timewarrior-${version}";
version = "1.0.0"; version = "1.1.0";
enableParallelBuilding = true; enableParallelBuilding = true;
src = fetchurl { src = fetchurl {
url = "https://taskwarrior.org/download/timew-${version}.tar.gz"; url = "https://taskwarrior.org/download/timew-${version}.tar.gz";
sha256 = "1d8b9sjdbdld81n535iwip9igl16kcw452wa47fmndp8w487j0mc"; sha256 = "0jnwj8lflr6nlch2j2hkmgpdqq3zbdd2sfpi5iwiabljk25v9iq9";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
patches = [ ./install-all-themes.patch ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A command-line time tracker"; description = "A command-line time tracker";
homepage = https://tasktools.org/projects/timewarrior.html; homepage = https://tasktools.org/projects/timewarrior.html;

27
pkgs/applications/misc/timewarrior/install-all-themes.patch
View File

@ -1,27 +0,0 @@
From e4a14c61bff3a55de42718dc11b282c4d5342995 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 14 Mar 2017 07:51:02 -0500
Subject: [PATCH] doc/themes: install all themes, not just 'dark.theme'.
---
doc/themes/CMakeLists.txt | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/doc/themes/CMakeLists.txt b/doc/themes/CMakeLists.txt
index a954576..3a3b453 100644
--- a/doc/themes/CMakeLists.txt
+++ b/doc/themes/CMakeLists.txt
@@ -2,5 +2,8 @@ cmake_minimum_required (VERSION 2.8)
message ("-- Configuring theme documentation")
-install (FILES README DESTINATION ${TIMEW_DOCDIR}/doc/themes)
-install (FILES dark.theme DESTINATION ${TIMEW_DOCDIR}/doc/themes)
+install (FILES README DESTINATION ${TIMEW_DOCDIR}/doc/themes)
+install (FILES dark.theme DESTINATION ${TIMEW_DOCDIR}/doc/themes)
+install (FILES dark_blue.theme DESTINATION ${TIMEW_DOCDIR}/doc/themes)
+install (FILES dark_green.theme DESTINATION ${TIMEW_DOCDIR}/doc/themes)
+install (FILES dark_red.theme DESTINATION ${TIMEW_DOCDIR}/doc/themes)
--
2.12.0