From 0021d4495ee90e96081950034b7bd70b54e66a03 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 7 Sep 2013 12:33:15 +0200
Subject: [PATCH 1/4] calibre: upgrade to 1.2.0

---
 pkgs/applications/misc/calibre/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index f75fee9983fb..c2a48ffb6e10 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-1.1.0";
+  name = "calibre-1.2.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/calibre/${name}.tar.xz";
-    sha256 = "1gb6h6jn2fj5b1xv5xkmsrdrid2k8zp496alnfi88x7dmahfb6f6";
+    sha256 = "0h6afn57pw3rb03ffbnss774gdx7ldirr43hbhzsc2k2h7lxnzyj";
   };
 
   inherit python;
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     tar xf ${qt48.src}
     qtdir=$(realpath $(ls | grep qt | grep 4.8 | grep src))
     sed -i setup/build_environment.py \
-        -e "s|^qt_private_inc = .*|qt_private_inc = ['$qtdir/include/%s\'%(m) for m in ('QtGui', 'QtCore')]|"
+        -e "s|^qt_private_inc = .*|qt_private_inc = ['$qtdir/include/%s'%(m) for m in ('QtGui', 'QtCore')]|"
   '';
 
   buildInputs =

From ef72e19b275b9c272bcea7ea0ec723a639a0533b Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Tue, 3 Sep 2013 22:02:07 +0100
Subject: [PATCH 2/4] ghc-mod: Wrap to call ghc-get-packages.sh first

---
 pkgs/development/libraries/haskell/ghc-mod/default.nix | 9 +++++++++
 pkgs/lib/maintainers.nix                               | 3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix
index b90944816d68..0f60a650d367 100644
--- a/pkgs/development/libraries/haskell/ghc-mod/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix
@@ -25,6 +25,14 @@ cabal.mkDerivation (self: {
     cd ..
     ensureDir "$out/share/emacs"
     mv $pname-$version emacs/site-lisp
+    mv $out/bin/ghc-mod $out/ghc-mod
+    cat - > $out/bin/ghc-mod <<EOF
+    #!/bin/sh
+    COMMAND=\$1
+    shift
+    eval exec $out/ghc-mod \$COMMAND \$( ${self.ghc.GHCGetPackages} ${self.ghc.ghcVersion} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@"
+    EOF
+    chmod +x $out/bin/ghc-mod
   '';
   meta = {
     homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";
@@ -34,6 +42,7 @@ cabal.mkDerivation (self: {
     maintainers = [
       self.stdenv.lib.maintainers.andres
       self.stdenv.lib.maintainers.bluescreen303
+      self.stdenv.lib.maintainers.ocharles
     ];
   };
 })
diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix
index 373d2a8da4d3..52487b72490c 100644
--- a/pkgs/lib/maintainers.nix
+++ b/pkgs/lib/maintainers.nix
@@ -7,8 +7,8 @@
   aforemny = "Alexander Foremny <alexanderforemny@googlemail.com>";
   all = "Nix Committers <nix-commits@lists.science.uu.nl>";
   amiddelk = "Arie Middelkoop <amiddelk@gmail.com>";
-  andres = "Andres Loeh <ksnixos@andres-loeh.de>";
   amorsillo = "Andrew Morsillo <andrew.morsillo@gmail.com>";
+  andres = "Andres Loeh <ksnixos@andres-loeh.de>";
   antono = "Antono Vasiljev <self@antono.info>";
   astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>";
   aszlig = "aszlig <aszlig@redmoonstudios.org>";
@@ -34,6 +34,7 @@
   marcweber = "Marc Weber <marco-oweber@gmx.de>";
   modulistic = "Pablo Costa <modulistic@gmail.com>";
   mornfall = "Petr Ročkai <me@mornfall.net>";
+  ocharles = "Oliver Charles <ollie@ocharles.org.uk>";
   offline = "Jaka Hudoklin <jakahudoklin@gmail.com>";
   orbitz = "Malcolm Matalka <mmatalka@gmail.com>";
   page = "Carles Pagès <page@cubata.homelinux.net>";

From 7cc15281b6ff5bfd8df6a574b48a2810324f58e5 Mon Sep 17 00:00:00 2001
From: Sergey Mironov <grrwlf@gmail.com>
Date: Sat, 7 Sep 2013 23:32:03 +0400
Subject: [PATCH 3/4] libusb1: bring 1.0.9 back as a separate file

---
 pkgs/development/libraries/libusb1/1_0_9.nix | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 pkgs/development/libraries/libusb1/1_0_9.nix

diff --git a/pkgs/development/libraries/libusb1/1_0_9.nix b/pkgs/development/libraries/libusb1/1_0_9.nix
new file mode 100644
index 000000000000..a2d628f96896
--- /dev/null
+++ b/pkgs/development/libraries/libusb1/1_0_9.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "libusb-1.0.9";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/libusb/${name}.tar.bz2";
+    sha256 = "16sz34ix6hw2wwl3kqx6rf26fg210iryr68wc439dc065pffw879";
+  };
+
+  buildInputs = [ pkgconfig ];
+
+  meta = {
+    homepage = http://www.libusb.org;
+    description = "User-space USB library";
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+  };
+}
+

From 3a1626e1a14e281753b1c18de03559a6167214ec Mon Sep 17 00:00:00 2001
From: Sergey Mironov <grrwlf@gmail.com>
Date: Sat, 7 Sep 2013 23:32:32 +0400
Subject: [PATCH 4/4] upower: revert libusb1 version to 1.0.9

That workarounds the coldplug problem

$ sudo ./libexec/upowerd -v
TI:18:38:27     Starting upowerd version 0.9.19
...
TI:18:38:27     registering subsystem : usb
TI:18:38:27     failed to coldplug /sys/devices/pci0000:00/0000:00:1c.4/0000:03:00.0/usb1
<upowerd EXITS>
---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 01d1d1fac16c..39bedd990d35 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6863,7 +6863,9 @@ let
 
   untie = callPackage ../os-specific/linux/untie { };
 
-  upower = callPackage ../os-specific/linux/upower { };
+  upower = callPackage ../os-specific/linux/upower {
+    libusb1 = callPackage ../development/libraries/libusb1/1_0_9.nix {};
+    };
 
   upstart = callPackage ../os-specific/linux/upstart { };