From 82ef7ce3d22d4ae3b8aa452dd4a87fb7d7c2ae74 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sat, 13 Jan 2018 17:35:48 +0100 Subject: [PATCH] timewarrior: 1.0.0 -> 1.1.0 --- .../applications/misc/timewarrior/default.nix | 6 ++--- .../misc/timewarrior/install-all-themes.patch | 27 ------------------- 2 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 pkgs/applications/misc/timewarrior/install-all-themes.patch diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix index f5201f8061f..f6dd7cb8c23 100644 --- a/pkgs/applications/misc/timewarrior/default.nix +++ b/pkgs/applications/misc/timewarrior/default.nix @@ -2,19 +2,17 @@ stdenv.mkDerivation rec { name = "timewarrior-${version}"; - version = "1.0.0"; + version = "1.1.0"; enableParallelBuilding = true; src = fetchurl { url = "https://taskwarrior.org/download/timew-${version}.tar.gz"; - sha256 = "1d8b9sjdbdld81n535iwip9igl16kcw452wa47fmndp8w487j0mc"; + sha256 = "0jnwj8lflr6nlch2j2hkmgpdqq3zbdd2sfpi5iwiabljk25v9iq9"; }; nativeBuildInputs = [ cmake ]; - patches = [ ./install-all-themes.patch ]; - meta = with stdenv.lib; { description = "A command-line time tracker"; homepage = https://tasktools.org/projects/timewarrior.html; diff --git a/pkgs/applications/misc/timewarrior/install-all-themes.patch b/pkgs/applications/misc/timewarrior/install-all-themes.patch deleted file mode 100644 index c6e8d3b0dbf..00000000000 --- a/pkgs/applications/misc/timewarrior/install-all-themes.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e4a14c61bff3a55de42718dc11b282c4d5342995 Mon Sep 17 00:00:00 2001 -From: Will Dietz -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 -