From 73b428afc86b33245aedb9fe92b3e908c6678787 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien.cassou@gmail.com>
Date: Sun, 12 Oct 2014 15:46:24 +0200
Subject: [PATCH 1/2] gnome-pomodoro: use fetchgit to be more stable

---
 .../gnome-3/3.12/apps/pomodoro/default.nix        | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/apps/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.12/apps/pomodoro/default.nix
index 75c82607a02..f1c9609ebab 100644
--- a/pkgs/desktops/gnome-3/3.12/apps/pomodoro/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/apps/pomodoro/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, which, automake113x, intltool, pkgconfig, libtool, makeWrapper,
+{ stdenv, fetchgit, which, automake113x, intltool, pkgconfig, libtool, makeWrapper,
   dbus_glib, libcanberra, gst_all_1, upower, vala, gnome3_12, gtk3, gst_plugins_base,
   glib, gobjectIntrospection, hicolor_icon_theme
 }:
@@ -6,13 +6,10 @@
 stdenv.mkDerivation rec {
   name = "gnome-shell-pomodoro-0.10.2-11-gd5f5b69";
 
-  src = fetchurl {
-    url =
-      "https://codeload.github.com/codito/gnome-shell-pomodoro/" +
-      "legacy.tar.gz/gnome-3.12";
-    sha256 =
-      "6c86203f56f69a52675c2df21e580a785f8894a2a9cdf4322d44743603504d10";
-    name = "${name}.tar.gz"; 
+  src = fetchgit {
+      url = git://github.com/codito/gnome-shell-pomodoro.git;
+      rev = "refs/tags/0.10.2";
+      sha256 = "e58966abd859e35cbd7fd4b8816b521f4ec9ba5cd8e8c27d2067dd2ec4554b40";
   };
 
   configureScript = ''./autogen.sh'';
@@ -47,4 +44,4 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3;
     platforms = platforms.linux;
   };
-}
\ No newline at end of file
+}

From 9166e29645690739af91d4f22a1c74b14c9b382e Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien.cassou@gmail.com>
Date: Mon, 13 Oct 2014 11:02:56 +0200
Subject: [PATCH 2/2] Update gnome pomodoro using fetchFromGitHub

---
 pkgs/desktops/gnome-3/3.12/apps/pomodoro/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/apps/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.12/apps/pomodoro/default.nix
index f1c9609ebab..d09b17df697 100644
--- a/pkgs/desktops/gnome-3/3.12/apps/pomodoro/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/apps/pomodoro/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, which, automake113x, intltool, pkgconfig, libtool, makeWrapper,
+{ stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper,
   dbus_glib, libcanberra, gst_all_1, upower, vala, gnome3_12, gtk3, gst_plugins_base,
   glib, gobjectIntrospection, hicolor_icon_theme
 }:
@@ -6,10 +6,11 @@
 stdenv.mkDerivation rec {
   name = "gnome-shell-pomodoro-0.10.2-11-gd5f5b69";
 
-  src = fetchgit {
-      url = git://github.com/codito/gnome-shell-pomodoro.git;
-      rev = "refs/tags/0.10.2";
-      sha256 = "e58966abd859e35cbd7fd4b8816b521f4ec9ba5cd8e8c27d2067dd2ec4554b40";
+  src = fetchFromGitHub {
+      owner = "codito";
+      repo = "gnome-shell-pomodoro";
+      rev = "0.10.2";
+      sha256 = "1jd4xmcx0fbcn57d1qj7b4xkj0dv4i75s367nifabm47akqzyn4f";
   };
 
   configureScript = ''./autogen.sh'';