workrave: 1.10.31 -> 1.10.50

pkgs/applications/misc/workrave/default.nix

@@ -1,29 +1,84 @@
-{ lib, stdenv, fetchFromGitHub, wrapGAppsHook
+{ lib
-, autoconf, autoconf-archive, automake, gettext, intltool, libtool, pkg-config
+, stdenv
-, libICE, libSM, libXScrnSaver, libXtst, cheetah
+, fetchFromGitHub
-, gobject-introspection, glib, glibmm, gtkmm3, atk, pango, pangomm, cairo
+, wrapGAppsHook
-, cairomm , dbus, dbus-glib, gdome2, gstreamer, gst-plugins-base
+, autoconf
-, gst-plugins-good, libsigcxx }:
+, autoconf-archive
+, automake
+, gettext
+, intltool
+, libtool
+, pkg-config
+, libICE
+, libSM
+, libXScrnSaver
+, libXtst
+, gobject-introspection
+, glib
+, glibmm
+, gtkmm3
+, atk
+, pango
+, pangomm
+, cairo
+, cairomm
+, dbus
+, dbus-glib
+, gdome2
+, gstreamer
+, gst-plugins-base
+, gst-plugins-good
+, libsigcxx
+, boost
+, jinja2
+}:
 
 stdenv.mkDerivation rec {
   pname = "workrave";
-  version = "1.10.31";
+  version = "1.10.50";
 
   src = fetchFromGitHub {
-    sha256 = "0v2mx2idaxlsyv5w66b7pknlill9j9i2gqcs3vq54gak7ix9fj1p";
-    rev = with lib;
-      "v" + concatStringsSep "_" (splitVersion version);
     repo = "workrave";
     owner = "rcaelers";
+    rev = with lib;
+      "v" + concatStringsSep "_" (splitVersion version);
+    sha256 = "sha256-fSUfgk0PmiteVQis+0NmMMZXBe/377X2k9oS2yp2Qzo=";
   };
 
   nativeBuildInputs = [
-    autoconf autoconf-archive automake gettext intltool libtool pkg-config wrapGAppsHook
+    autoconf
+    autoconf-archive
+    automake
+    gettext
+    intltool
+    libtool
+    pkg-config
+    wrapGAppsHook
+    jinja2
   ];
+
   buildInputs = [
-    libICE libSM libXScrnSaver libXtst cheetah
+    libICE
-    gobject-introspection glib glibmm gtkmm3 atk pango pangomm cairo cairomm
+    libSM
-    dbus dbus-glib gdome2 gstreamer gst-plugins-base gst-plugins-good libsigcxx
+    libXScrnSaver
+    libXtst
+    gobject-introspection
+    glib
+    glibmm
+    gtkmm3
+    atk
+    pango
+    pangomm
+    cairo
+    cairomm
+    dbus
+    dbus-glib
+    gdome2
+    gstreamer
+    gst-plugins-base
+    gst-plugins-good
+    libsigcxx
+    boost
   ];
 
   preConfigure = "./autogen.sh";

pkgs/top-level/all-packages.nix

@@ -32608,7 +32608,7 @@ with pkgs;
   wordgrinder = callPackage ../applications/office/wordgrinder { };
 
   workrave = callPackage ../applications/misc/workrave {
-    inherit (python27Packages) cheetah;
+    inherit (python3Packages) jinja2;
     inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good;
   };