Merge pull request #6997 from oxij/update-redshift

redshift: update 1.9.1 -> 1.10-git-20150222

pkgs/applications/misc/redshift/default.nix

@@ -1,13 +1,15 @@
-{ fetchurl, stdenv, libX11, libXrandr, libXxf86vm, libxcb, pkgconfig, python
+{ fetchFromGitHub, stdenv, libX11, libXrandr, libXxf86vm, libxcb, pkgconfig, python
 , randrproto, xcbutil, xf86vidmodeproto, autoconf, automake, gettext, glib
 , GConf, dbus, dbus_glib, makeWrapper, gtk, pygtk, pyxdg, geoclue }:
 
 stdenv.mkDerivation rec {
-  version = "1.9.1";
+  version = "1.10-git-20150222";
   name = "redshift-${version}";
-  src = fetchurl {
-    url = "https://github.com/jonls/redshift/archive/v${version}.tar.gz";
-    sha256 = "0rj7lyg4ikwpk1hr1k2bgk9gjqvvv51z8hydsgpx2k2lqdv6lqri";
+  src = fetchFromGitHub {
+    owner = "jonls";
+    repo  = "redshift";
+    rev   = "8b0a67a2538d7c79b74086caab07735fa97aa047";
+    sha256 = "0559ljri81iyig9j5i259nzb0z2ml37hhw5ppclcv6l25bzrkgip";
   };
 
   buildInputs = [
@@ -21,11 +23,13 @@ stdenv.mkDerivation rec {
   '';
 
   preInstall = ''
-    substituteInPlace src/redshift-gtk/redshift-gtk python --replace "/usr/bin/env python" "${python}/bin/${python.executable}"
+    substituteInPlace src/redshift-gtk/redshift-gtk python \
+      --replace "/usr/bin/env python" "${python}/bin/${python.executable}"
   '';
 
   postInstall = ''
-    wrapProgram "$out/bin/redshift-gtk" --prefix PYTHONPATH : $PYTHONPATH:${pygtk}/lib/${python.libPrefix}/site-packages/gtk-2.0:${pyxdg}/lib/${python.libPrefix}/site-packages/pyxdg:$out/lib/${python.libPrefix}/site-packages
+    wrapProgram "$out/bin/redshift-gtk" \
+      --prefix PYTHONPATH : $PYTHONPATH:${pygtk}/lib/${python.libPrefix}/site-packages/gtk-2.0:${pyxdg}/lib/${python.libPrefix}/site-packages/pyxdg:$out/lib/${python.libPrefix}/site-packages
   '';
 
   meta = with stdenv.lib; {
@@ -37,9 +41,9 @@ stdenv.mkDerivation rec {
       temperature transitions smoothly from night to daytime
       temperature to allow your eyes to slowly adapt.
       '';
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = licenses.gpl3Plus;
     homepage = http://jonls.dk/redshift;
     platforms = platforms.linux;
     maintainers = [ maintainers.mornfall ];
-  }; 
+  };
 }

pkgs/top-level/all-packages.nix

@@ -13186,8 +13186,6 @@ let
   };
 
   redshift = callPackage ../applications/misc/redshift {
-    inherit (xorg) libX11 libXrandr libxcb randrproto libXxf86vm
-      xf86vidmodeproto;
     inherit (gnome) GConf;
     inherit (pythonPackages) pyxdg;
     geoclue = geoclue2;