Merge commit 'dfd8f84aef129f1978e446b5d45ef05cd4421821'

1 files changed, 50 insertions, 26 deletions

diff --git a/nixpkgs/pkgs/desktops/gnome-3/misc/pomodoro/default.nix b/nixpkgs/pkgs/desktops/gnome-3/misc/pomodoro/default.nix
index 9829d5813e9f..fcbceab24eab 100644
--- a/nixpkgs/pkgs/desktops/gnome-3/misc/pomodoro/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/misc/pomodoro/default.nix
@@ -1,49 +1,73 @@
-{ stdenv, fetchFromGitHub, fetchpatch, autoconf-archive, appstream-glib, intltool, pkgconfig, libtool, wrapGAppsHook,
-  dbus-glib, libcanberra, gst_all_1, vala, gnome3, gtk3, libxml2, autoreconfHook,
-  glib, gobject-introspection, libpeas
+{ stdenv
+, fetchFromGitHub
+, autoconf-archive
+, appstream-glib
+, pkgconfig
+, wrapGAppsHook
+, libcanberra
+, gst_all_1
+, vala
+, gtk3
+, gom
+, sqlite
+, libxml2
+, autoreconfHook
+, glib
+, gobject-introspection
+, libpeas
+, gnome-shell
+, gsettings-desktop-schemas
+, adwaita-icon-theme
+, gettext
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.13.4";
-  name = "gnome-shell-pomodoro-${version}";
+  pname = "gnome-shell-pomodoro";
+  version = "0.15.1";
 
   src = fetchFromGitHub {
     owner = "codito";
     repo = "gnome-pomodoro";
-    rev = "${version}";
-    sha256 = "0fiql99nhj168wbfhvzrhfcm4c4569gikd2zaf10vzszdqjahrl1";
+    rev = version;
+    sha256 = "0nmgd122gsfka0p50mila88iwrzckq2r36a3h20lswn5qkn321i1";
   };
 
-  patches = [
-    # build with Vala ≥ 0.42
-    (fetchpatch {
-      url = https://github.com/codito/gnome-pomodoro/commit/36778823ca5bd94b2aa948e5d8718f84d99d9af0.patch;
-      sha256 = "0a9x0p5wny3an9xawam9nhpffw5m4kgwj5jvv0g6c2lwlfzrx2rh";
-    })
-  ];
-
   nativeBuildInputs = [
-    autoreconfHook vala autoconf-archive libtool intltool appstream-glib
-    wrapGAppsHook pkgconfig libxml2
+    appstream-glib
+    autoconf-archive
+    autoreconfHook
+    gettext
+    gobject-introspection
+    libxml2
+    pkgconfig
+    vala
+    wrapGAppsHook
   ];
 
   buildInputs = [
-    glib gobject-introspection libpeas
-    dbus-glib libcanberra gst_all_1.gstreamer
-    gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
-    gnome3.gsettings-desktop-schemas
-    gnome3.gnome-shell gtk3 gnome3.adwaita-icon-theme
+    adwaita-icon-theme
+    glib
+    gnome-shell
+    gom
+    gsettings-desktop-schemas
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
+    gst_all_1.gstreamer
+    gtk3
+    libcanberra
+    libpeas
+    sqlite
   ];
 
   meta = with stdenv.lib; {
-    homepage = http://gnomepomodoro.org/;
-    description = "A time management utility for GNOME based on the pomodoro technique";
+    homepage = https://gnomepomodoro.org/;
+    description = "Time management utility for GNOME based on the pomodoro technique";
     longDescription = ''
       This GNOME utility helps to manage time according to Pomodoro Technique.
       It intends to improve productivity and focus by taking short breaks.
     '';
-    maintainers = with maintainers; [ ];
-    license = licenses.gpl3;
+    maintainers = with maintainers; [ worldofpeace ];
+    license = licenses.gpl3Plus;
     platforms = platforms.linux;
   };
 }