From cbe6badab9a6d03fe9d87c4f21e636e606741dac Mon Sep 17 00:00:00 2001
From: Szczyp <qb@szczyp.com>
Date: Thu, 13 Aug 2015 16:56:49 +0200
Subject: [PATCH 01/22] rhc: init at 1.36.4

OpenShift client tools
Add szczyp as a maintainer
---
 lib/maintainers.nix                     |  1 +
 pkgs/development/tools/rhc/Gemfile      |  2 +
 pkgs/development/tools/rhc/Gemfile.lock | 35 +++++++++
 pkgs/development/tools/rhc/default.nix  | 17 +++++
 pkgs/development/tools/rhc/gemset.nix   | 95 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 +
 6 files changed, 152 insertions(+)
 create mode 100644 pkgs/development/tools/rhc/Gemfile
 create mode 100644 pkgs/development/tools/rhc/Gemfile.lock
 create mode 100644 pkgs/development/tools/rhc/default.nix
 create mode 100644 pkgs/development/tools/rhc/gemset.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 5c0846fdc96c..4f45db810e26 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -236,6 +236,7 @@
   sprock = "Roger Mason <rmason@mun.ca>";
   spwhitt = "Spencer Whitt <sw@swhitt.me>";
   stephenmw = "Stephen Weinberg <stephen@q5comm.com>";
+  szczyp = "Szczyp <qb@szczyp.com>";
   sztupi = "Attila Sztupak <attila.sztupak@gmail.com>";
   tailhook = "Paul Colomiets <paul@colomiets.name>";
   taktoa = "Remy Goldschmidt <taktoa@gmail.com>";
diff --git a/pkgs/development/tools/rhc/Gemfile b/pkgs/development/tools/rhc/Gemfile
new file mode 100644
index 000000000000..ad167c7422ff
--- /dev/null
+++ b/pkgs/development/tools/rhc/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'rhc'
diff --git a/pkgs/development/tools/rhc/Gemfile.lock b/pkgs/development/tools/rhc/Gemfile.lock
new file mode 100644
index 000000000000..83fa877550db
--- /dev/null
+++ b/pkgs/development/tools/rhc/Gemfile.lock
@@ -0,0 +1,35 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    archive-tar-minitar (0.5.2)
+    commander (4.2.1)
+      highline (~> 1.6.11)
+    highline (1.6.21)
+    httpclient (2.6.0.1)
+    net-scp (1.2.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.9.2)
+    net-ssh-gateway (1.2.0)
+      net-ssh (>= 2.6.5)
+    net-ssh-multi (1.2.1)
+      net-ssh (>= 2.6.5)
+      net-ssh-gateway (>= 1.2.0)
+    open4 (1.3.4)
+    rhc (1.36.4)
+      archive-tar-minitar
+      commander (>= 4.0, < 4.3.0)
+      highline (~> 1.6.11)
+      httpclient (>= 2.4.0)
+      net-scp (>= 1.1.2)
+      net-ssh (>= 2.0.11, < 2.9.3)
+      net-ssh-multi (>= 1.2.0)
+      open4
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rhc
+
+BUNDLED WITH
+   1.10.5
diff --git a/pkgs/development/tools/rhc/default.nix b/pkgs/development/tools/rhc/default.nix
new file mode 100644
index 000000000000..e9efdb9f423c
--- /dev/null
+++ b/pkgs/development/tools/rhc/default.nix
@@ -0,0 +1,17 @@
+{ lib, bundlerEnv, ruby }:
+
+bundlerEnv {
+  name = "rhc-1.36.4";
+
+  inherit ruby;
+  gemfile = ./Gemfile;
+  lockfile = ./Gemfile.lock;
+  gemset = ./gemset.nix;
+
+  meta = with lib; {
+    homepage = https://github.com/openshift/rhc;
+    description = "OpenShift client tools";
+    license = licenses.asl20;
+    maintaners = maintainers.szczyp;
+  };
+}
diff --git a/pkgs/development/tools/rhc/gemset.nix b/pkgs/development/tools/rhc/gemset.nix
new file mode 100644
index 000000000000..6b2733968901
--- /dev/null
+++ b/pkgs/development/tools/rhc/gemset.nix
@@ -0,0 +1,95 @@
+{
+  "archive-tar-minitar" = {
+    version = "0.5.2";
+    source = {
+      type = "gem";
+      sha256 = "1j666713r3cc3wb0042x0wcmq2v11vwwy5pcaayy5f0lnd26iqig";
+    };
+  };
+  "commander" = {
+    version = "4.2.1";
+    source = {
+      type = "gem";
+      sha256 = "1zwfhswnbhwv0zzj2b3s0qvpqijbbnmh7zvq6v0274rqbxyf1jwc";
+    };
+    dependencies = [
+      "highline"
+    ];
+  };
+  "highline" = {
+    version = "1.6.21";
+    source = {
+      type = "gem";
+      sha256 = "06bml1fjsnrhd956wqq5k3w8cyd09rv1vixdpa3zzkl6xs72jdn1";
+    };
+  };
+  "httpclient" = {
+    version = "2.6.0.1";
+    source = {
+      type = "gem";
+      sha256 = "0haz4s9xnzr73mkfpgabspj43bhfm9znmpmgdk74n6gih1xlrx1l";
+    };
+  };
+  "net-scp" = {
+    version = "1.2.1";
+    source = {
+      type = "gem";
+      sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j";
+    };
+    dependencies = [
+      "net-ssh"
+    ];
+  };
+  "net-ssh" = {
+    version = "2.9.2";
+    source = {
+      type = "gem";
+      sha256 = "1p0bj41zrmw5lhnxlm1pqb55zfz9y4p9fkrr9a79nrdmzrk1ph8r";
+    };
+  };
+  "net-ssh-gateway" = {
+    version = "1.2.0";
+    source = {
+      type = "gem";
+      sha256 = "1nqkj4wnj26r81rp3g4jqk7bkd2nqzjil3c9xqwchi0fsbwv2niy";
+    };
+    dependencies = [
+      "net-ssh"
+    ];
+  };
+  "net-ssh-multi" = {
+    version = "1.2.1";
+    source = {
+      type = "gem";
+      sha256 = "13kxz9b6kgr9mcds44zpavbndxyi6pvyzyda6bhk1kfmb5c10m71";
+    };
+    dependencies = [
+      "net-ssh"
+      "net-ssh-gateway"
+    ];
+  };
+  "open4" = {
+    version = "1.3.4";
+    source = {
+      type = "gem";
+      sha256 = "1cgls3f9dlrpil846q0w7h66vsc33jqn84nql4gcqkk221rh7px1";
+    };
+  };
+  "rhc" = {
+    version = "1.36.4";
+    source = {
+      type = "gem";
+      sha256 = "1dkg39x3y3sxq71md5c8akq4y7ynjwcdy8ysm6d1k9b2rj0s5wdb";
+    };
+    dependencies = [
+      "archive-tar-minitar"
+      "commander"
+      "highline"
+      "httpclient"
+      "net-scp"
+      "net-ssh"
+      "net-ssh-multi"
+      "open4"
+    ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3e34e61cebfc..13a2ad7e746e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5734,6 +5734,8 @@ let
 
   remake = callPackage ../development/tools/build-managers/remake { };
 
+  rhc = callPackage ../development/tools/rhc { };
+
   rman = callPackage ../development/tools/misc/rman { };
 
   rr = callPackage ../development/tools/analysis/rr { };

From 7d414a064658a7fb87db94ca3d4a34e868c850d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 13 Aug 2015 10:12:52 +0200
Subject: [PATCH 02/22] nixos: add services.printing.snmpConf option

And set the default value to "Address @LOCAL". This change is needed to
find printers at my workplace (with "lpinfo -v" or the
"system-config-printer" GUI). Ubuntu 14.04 also has this as default.

snmp.conf does not seem to be needed in restartTriggers, because it is
not the cups daemon itself that reads it, but some helper programs that
it spawns on demand.
---
 nixos/modules/services/printing/cupsd.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index e743aa8a3236..69c76cf97cfd 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -160,6 +160,17 @@ in
         '';
       };
 
+      snmpConf = mkOption {
+        type = types.lines;
+        default = ''
+          Address @LOCAL
+        '';
+        description = ''
+          The contents of <filename>/etc/cups/snmp.conf</filename>. See "man
+          cups-snmp.conf" for a complete description.
+        '';
+      };
+
       drivers = mkOption {
         type = types.listOf types.path;
         example = literalExample "[ pkgs.splix ]";
@@ -199,6 +210,7 @@ in
     environment.etc."cups/cups-files.conf".text = cfg.cupsFilesConf;
     environment.etc."cups/cupsd.conf".text = cfg.cupsdConf;
     environment.etc."cups/cups-browsed.conf".text = cfg.browsedConf;
+    environment.etc."cups/snmp.conf".text = cfg.snmpConf;
 
     services.dbus.packages = [ cups ];
 

From 4df408c8be9477dbd0af2d23dc7d2fecf8c647ed Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Thu, 13 Aug 2015 22:26:44 +0200
Subject: [PATCH 03/22] gnome-calendar: init at 3.16.2

---
 .../3.16/apps/gnome-calendar/default.nix      | 27 +++++++++++++++++++
 pkgs/desktops/gnome-3/3.16/default.nix        |  4 ++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/gnome-3/3.16/apps/gnome-calendar/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-calendar/default.nix
new file mode 100644
index 000000000000..043cd694bd46
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-calendar/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, intltool, evolution_data_server, sqlite, libxml2, libsoup
+, glib }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-calendar-${gnome3.version}.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-calendar/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0vqwps86whf8jgq7q4hdrbnmlaxppgrfa3j7n6ddpqzkb3gf2c5m";
+  };
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  buildInputs = [
+    pkgconfig gtk3 wrapGAppsHook intltool evolution_data_server
+    sqlite libxml2 libsoup glib
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Calendar;
+    description = "Simple and beautiful calendar application for GNOME";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 3f554dbac1cc..4f56077eff84 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -31,7 +31,7 @@ let
     gnome_terminal gnome-user-docs bijiben evolution file-roller gedit
     gnome-clocks gnome-music gnome-tweak-tool gnome-photos
     nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs
-    gnome-maps gnome-characters
+    gnome-maps gnome-characters gnome-calendar
   ];
 
   gamesPackages = with gnome3; [ swell-foop lightsoff iagno
@@ -269,6 +269,8 @@ let
     spice_gtk = pkgs.spice_gtk.override { enableGTK3 = true; };
   };
 
+  gnome-calendar = callPackage ./apps/gnome-calendar { };
+
   gnome-characters = callPackage ./apps/gnome-characters { };
 
   gnome-clocks = callPackage ./apps/gnome-clocks { };

From 0039622d64dde76cafe5a20e5ac9bb9c350ca582 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Thu, 13 Aug 2015 23:36:27 +0200
Subject: [PATCH 04/22] pyatspi: init at 2.16.0

---
 .../python-modules/pyatspi/default.nix        | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyatspi/default.nix

diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix
new file mode 100644
index 000000000000..3c39ca873e27
--- /dev/null
+++ b/pkgs/development/python-modules/pyatspi/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, python3, python3Packages, at_spi2_core }:
+
+stdenv.mkDerivation rec {
+  version = "2.16.0";
+  name = "pyatspi-${version}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/pyatspi/2.16/${name}.tar.xz";
+    sha256 = "185lwgv9bk1fc6vw2xypznzr7p8fhp84ggnrb706zwgalmy8aym6";
+  };
+
+  buildInputs = [
+    pkgconfig python3 python3Packages.pygobject3 at_spi2_core
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Python 3 bindings for at-spi";
+    homepage = http://www.linuxfoundation.org/en/AT-SPI_on_D-Bus;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ jgeerds ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ea73c4a881fe..51f5b1326312 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2742,6 +2742,8 @@ let
 
   pwnat = callPackage ../tools/networking/pwnat { };
 
+  pyatspi = callPackage ../development/python-modules/pyatspi { };
+
   pycangjie = callPackage ../development/python-modules/pycangjie { };
 
   pydb = callPackage ../development/tools/pydb { };

From 5d48d41e7c2411b49136c3232af9de6ccde97381 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Thu, 13 Aug 2015 23:51:30 +0200
Subject: [PATCH 05/22] gnome3.accerciser: init at 3.14.0

---
 .../gnome-3/3.16/apps/accerciser/default.nix  | 28 +++++++++++++++++++
 pkgs/desktops/gnome-3/3.16/default.nix        |  4 ++-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix
new file mode 100644
index 000000000000..294793d6af75
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, itstool, libxml2, python3, python3Packages, pyatspi, at_spi2_core
+, dbus, intltool, libwnck3, hicolor_icon_theme }:
+
+stdenv.mkDerivation rec {
+  name = "accerciser-3.14.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/accerciser/3.14/${name}.tar.xz";
+    sha256 = "0x05gpajpcs01g7m34g6fxz8122cf9kx3k0lchwl34jy8xfr39gm";
+  };
+
+  buildInputs = [
+    pkgconfig gtk3 wrapGAppsHook itstool libxml2 python3 pyatspi
+    python3Packages.pygobject3 python3Packages.ipythonLight
+    at_spi2_core dbus intltool libwnck3 hicolor_icon_theme
+  ];
+
+  wrapPrefixVariables = [ "PYTHONPATH" ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Accerciser;
+    description = "Interactive Python accessibility explorer";
+    maintainers = gnome3.maintainers;
+    license = licenses.bsd3;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 4f56077eff84..4ff52d33ae51 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -31,7 +31,7 @@ let
     gnome_terminal gnome-user-docs bijiben evolution file-roller gedit
     gnome-clocks gnome-music gnome-tweak-tool gnome-photos
     nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs
-    gnome-maps gnome-characters gnome-calendar
+    gnome-maps gnome-characters gnome-calendar accerciser
   ];
 
   gamesPackages = with gnome3; [ swell-foop lightsoff iagno
@@ -248,6 +248,8 @@ let
 
 #### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/)
 
+  accerciser = callPackage ./apps/accerciser { };
+
   bijiben = callPackage ./apps/bijiben {
     webkitgtk = webkitgtk24x;
   };

From 273fb91b49f929b1dc8fbd584f7944df080282df Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 13 Aug 2015 14:59:56 +0200
Subject: [PATCH 06/22] miniupnpd: 1.9.{20150430 -> 20150721}

Drop removed libnfnetlink dependency and simplify build.

Don't yet update miniupnpc because it breaks bitcoin 0.11.
---
 pkgs/tools/networking/miniupnpd/default.nix | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix
index 11262460e716..0d852573eab8 100644
--- a/pkgs/tools/networking/miniupnpd/default.nix
+++ b/pkgs/tools/networking/miniupnpd/default.nix
@@ -1,26 +1,23 @@
-{ stdenv, fetchurl, iptables, libnfnetlink }:
+{ stdenv, fetchurl, iptables, pkgconfig }:
 
 assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  name = "miniupnpd-1.9.20150430";
+  name = "miniupnpd-1.9.20150721";
 
   src = fetchurl {
     url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
-    sha256 = "0ajqs3lf2cgq5fm1v79fa23sbb623i89sqnx7d9cnqbqq5py1k71";
-    name = "miniupnpd-1.9.20150430.tar.gz";
+    sha256 = "0w2422wfcir333qd300swkdvmksdfdllspplnz8vbv13a1724h4k";
+    name = "${name}.tar.gz";
   };
 
-  buildInputs = [ iptables libnfnetlink ];
+  buildInputs = [ iptables ];
+  nativeBuildInputs= [ pkgconfig ];
 
-  NIX_CFLAGS_COMPILE = "-DIPTABLES_143";
-
-  NIX_CFLAGS_LINK = "-liptc -lnfnetlink";
+  NIX_CFLAGS_LINK = "-liptc";
 
   makefile = "Makefile.linux";
 
-  makeFlags = "LIBS=";
-
   buildFlags = "miniupnpd genuuid";
 
   installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)";

From 0294f71f1fd84714f41144f3a2c2c9292ded1679 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 13 Aug 2015 22:42:33 +0200
Subject: [PATCH 07/22] fmit: 1.0.7 -> 1.0.8

Updated mainly to remove the now unnecessary version patching.

Your moment of zen:
https://github.com/gillesdegottex/fmit/blob/HEAD/src/CustomInstrumentTunerForm.cpp#L1047
---
 pkgs/applications/audio/fmit/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix
index f2328410be87..84ec955de3f3 100644
--- a/pkgs/applications/audio/fmit/default.nix
+++ b/pkgs/applications/audio/fmit/default.nix
@@ -7,12 +7,12 @@
 assert alsaSupport -> alsaLib != null;
 assert jackSupport -> libjack2 != null;
 
-let version = "1.0.7"; in
+let version = "1.0.8"; in
 stdenv.mkDerivation {
   name = "fmit-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "14dzrrxjskhqamhfqhzp6napvc1vyjxcc0v8id1iqzsfdn86xqm9";
+    sha256 = "04s7xcgmi5g58lirr48vf203n1jwdxf981x1p6ysbax24qwhs2kd";
     rev = "v${version}";
     repo = "fmit";
     owner = "gillesdegottex";
@@ -22,10 +22,6 @@ stdenv.mkDerivation {
     ++ stdenv.lib.optional alsaSupport [ alsaLib ]
     ++ stdenv.lib.optional jackSupport [ libjack2 ];
 
-  postPatch = ''
-    substituteInPlace fmit.pro --replace '$$FMITVERSIONGITPRO' '${version}'
-  '';
-
   configurePhase = ''
     mkdir build
     cd build

From eb910bce5b88129be3526aabd2c0ef91ec30561d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 14 Aug 2015 00:06:11 +0200
Subject: [PATCH 08/22] perl-packages: Gtk2 1.2495 -> 1.2496

Upstream changes:
- Avoid registering a GType for GConnectFlags if not needed
- MANIFEST: added missing gtk-demo files
---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 90fd8b8370a9..d107f33ae40d 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4775,10 +4775,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   Gtk2 = buildPerlPackage rec {
-    name = "Gtk2-1.2495";
+    name = "Gtk2-1.2496";
     src = fetchurl {
       url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz";
-      sha256 = "1mpxkcy8j7r95z4g4xx6ggbgzaxj4zl0szz54y1k120z95rcgg3a";
+      sha256 = "1avn77m5hrdyy4k5sqgf870nsmykf6zlcn1haj8arjjl9yaxwic6";
     };
     buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig Pango pkgs.gtk2 ];
     meta = {

From a913ad89c1b565c9e4ae5540a16e25140b600947 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 14 Aug 2015 01:27:53 +0200
Subject: [PATCH 09/22] eid-mw: 4.1.4 -> 4.1.5

---
 pkgs/tools/security/eid-mw/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix
index c039c41314db..c814e7094a9f 100644
--- a/pkgs/tools/security/eid-mw/default.nix
+++ b/pkgs/tools/security/eid-mw/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchFromGitHub, autoreconfHook, gtk2, nssTools, pcsclite
 , pkgconfig }:
 
-let version = "4.1.4"; in
+let version = "4.1.5"; in
 stdenv.mkDerivation {
   name = "eid-mw-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "0v0p0kdjscvf4bn14dyny399k1bfsz8v7n8v16lv0q0xs5nwqnky";
+    sha256 = "0m2awjfj2vs3aahy1ygrxi7mx12bhr1a621kiiszzai38crpgwbj";
     rev = "v${version}";
     repo = "eid-mw";
     owner = "Fedict";
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
     substituteInPlace $out/bin/eid-nssdb \
       --replace "modutil" "${nssTools}/bin/modutil"
 
-    # Only provides a useless "about-eid-mw.desktop" that segfaults:
+    # Only provides a useless "about-eid-mw.desktop" that segfaults anyway:
     rm -rf $out/share/applications $out/bin/about-eid-mw
   '';
 
@@ -55,6 +55,6 @@ stdenv.mkDerivation {
       and remove all ~/.pki and/or /etc/pki directories no longer needed.
     '';
     maintainers = with maintainers; [ nckx ];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
   };
 }

From 9a3a70ed2bf842c97aed107dd1635023b48c507a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 13 Aug 2015 18:51:15 +0200
Subject: [PATCH 10/22] rote: init at 0.2.8

---
 pkgs/development/libraries/rote/default.nix | 32 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/libraries/rote/default.nix

diff --git a/pkgs/development/libraries/rote/default.nix b/pkgs/development/libraries/rote/default.nix
new file mode 100644
index 000000000000..b87d4ed4ee4a
--- /dev/null
+++ b/pkgs/development/libraries/rote/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, ncurses }:
+
+let version = "0.2.8"; in
+stdenv.mkDerivation rec {
+  name = "rote-${version}";
+
+  src = fetchurl {
+    sha256 = "05v1lw99jv4cwxl7spyi7by61j2scpdsvx809x5cga7dm5dhlmky";
+    url = "mirror://sourceforge/rote/${name}.tar.gz";
+  };
+
+  buildInputs = [ ncurses ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Our Own Terminal Emulation Library";
+    longDescription = ''
+      ROTE is a simple C library for VT102 terminal emulation. It allows the
+      programmer to set up virtual 'screens' and send them data. The virtual
+      screens will emulate the behavior of a VT102 terminal, interpreting
+      escape sequences, control characters and such. The library supports
+      ncurses as well so that you may render the virtual screen to the real
+      screen when you need to.
+    '';
+    homepage = http://rote.sourceforge.net/;
+    license = licenses.lgpl21;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3fe44ad421a7..e9d675f5e8ef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8043,6 +8043,8 @@ let
 
   rocksdb = callPackage ../development/libraries/rocksdb { };
 
+  rote = callPackage ../development/libraries/rote { };
+
   rubberband = callPackage ../development/libraries/rubberband {
     inherit (vamp) vampSDK;
   };

From 26cac935b5e1af7dc9b81da931016d384cc34746 Mon Sep 17 00:00:00 2001
From: Mabry Cervin <mpcervin@uncg.edu>
Date: Thu, 13 Aug 2015 22:41:03 -0400
Subject: [PATCH 11/22] gohufont: init at 2.0

Removed unecessary deps
---
 pkgs/data/fonts/gohufont/default.nix | 29 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/data/fonts/gohufont/default.nix

diff --git a/pkgs/data/fonts/gohufont/default.nix b/pkgs/data/fonts/gohufont/default.nix
new file mode 100644
index 000000000000..450971524e61
--- /dev/null
+++ b/pkgs/data/fonts/gohufont/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, mkfontdir, mkfontscale }:
+
+stdenv.mkDerivation rec {
+  name = "gohufont-2.0";
+
+  src = fetchurl {
+    url = "http://font.gohu.org/gohufont-2.0.tar.gz";
+    sha256 = "0vi87fvj3m52piz2k6vqday03cah6zvz3dzrvjch3qjna1i1nb7s";
+  };
+
+  buildInputs = [ mkfontdir mkfontscale ];
+
+  installPhase = ''
+    fontDir="$out/share/fonts/misc"
+    mkdir -p "$fontDir"
+    mv *.pcf.gz "$fontDir"
+    cd "$fontDir"
+    mkfontdir
+    mkfontscale
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A monospace bitmap font well suited for programming and terminal use";
+    homepage = http://font.gohu.org/;
+    license = licenses.wtfpl;
+    maintainers = with maintainers; [ epitrochoid ];
+    platforms = with platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e9d675f5e8ef..23413feea812 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10493,6 +10493,8 @@ let
 
   geolite-legacy = callPackage ../data/misc/geolite-legacy { };
 
+  gohufont = callPackage ../data/fonts/gohufont { };
+
   gnome_user_docs = callPackage ../data/documentation/gnome-user-docs { };
 
   inherit (gnome3) gsettings_desktop_schemas;

From 90768003a48c92633731e930ced8852cddfe8ec3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 14 Aug 2015 11:03:31 +0200
Subject: [PATCH 12/22] openscenegraph: update download url

The current one returns HTTP error 404.
---
 pkgs/development/libraries/openscenegraph/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix
index 5fb73eae276a..476f7e14c607 100644
--- a/pkgs/development/libraries/openscenegraph/default.nix
+++ b/pkgs/development/libraries/openscenegraph/default.nix
@@ -17,7 +17,7 @@ let
     baseName="OpenSceneGraph";
     version="3.2.1";
     name="${baseName}-${version}";
-    url="http://www.openscenegraph.org/downloads/developer_releases/${name}.zip";
+    url="http://trac.openscenegraph.org/downloads/developer_releases/${name}.zip";
     hash="0v9y1gxb16y0mj994jd0mhcz32flhv2r6kc01xdqb4817lk75bnr";
   };
 in

From f11d41666626624adeaf9222ce5253a26c5b1f9a Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Fri, 14 Aug 2015 11:22:38 +0200
Subject: [PATCH 13/22] gnome-nettool: init at 3.8.1

---
 .../3.16/apps/gnome-nettool/default.nix       | 27 +++++++++++++++++++
 pkgs/desktops/gnome-3/3.16/default.nix        |  4 ++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/gnome-3/3.16/apps/gnome-nettool/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-nettool/default.nix
new file mode 100644
index 000000000000..2b262c263ac4
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-nettool/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, libgtop, intltool, itstool, libxml2, hicolor_icon_theme
+, nmap, inetutils }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-nettool-3.8.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-nettool/3.8/${name}.tar.xz";
+    sha256 = "1c9cvzvyqgfwa5zzyvp7118pkclji62fkbb33g4y9sp5kw6m397h";
+  };
+
+  buildInputs = [
+    pkgconfig gtk3 wrapGAppsHook libgtop intltool itstool libxml2
+    hicolor_icon_theme
+  ];
+
+  propagatedUserEnvPkgs = [ nmap inetutils ];
+
+  meta = with stdenv.lib; {
+    homepage = http://projects.gnome.org/gnome-network;
+    description = "A collection of networking tools";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 4ff52d33ae51..e9bfdee7b37a 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -31,7 +31,7 @@ let
     gnome_terminal gnome-user-docs bijiben evolution file-roller gedit
     gnome-clocks gnome-music gnome-tweak-tool gnome-photos
     nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs
-    gnome-maps gnome-characters gnome-calendar accerciser
+    gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool
   ];
 
   gamesPackages = with gnome3; [ swell-foop lightsoff iagno
@@ -285,6 +285,8 @@ let
 
   gnome-music = callPackage ./apps/gnome-music { };
 
+  gnome-nettool = callPackage ./apps/gnome-nettool { };
+
   gnome-photos = callPackage ./apps/gnome-photos {
     gegl = gegl_0_3;
   };

From 26db863cdaa24d16c354533fdf8ebc90df99fd51 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Fri, 14 Aug 2015 11:58:46 +0200
Subject: [PATCH 14/22] gnome3.devhelp: init at 3.16.1

---
 pkgs/desktops/gnome-3/3.16/default.nix        |  4 ++++
 .../gnome-3/3.16/devtools/devhelp/default.nix | 23 +++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/3.16/devtools/devhelp/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index e9bfdee7b37a..d7cf6ad9de8a 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -308,6 +308,10 @@ let
 
   anjuta = callPackage ./devtools/anjuta { };
 
+  devhelp = callPackage ./devtools/devhelp {
+    webkitgtk = webkitgtk24x;
+  };
+
   gdl = callPackage ./devtools/gdl { };
 
   gnome-devel-docs = callPackage ./devtools/gnome-devel-docs { };
diff --git a/pkgs/desktops/gnome-3/3.16/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/3.16/devtools/devhelp/default.nix
new file mode 100644
index 000000000000..bc3521013832
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/devtools/devhelp/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, webkitgtk, intltool, hicolor_icon_theme }:
+
+stdenv.mkDerivation rec {
+  name = "devhelp-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/devhelp/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0i8kyh86hzwxs8dm047ivghl2b92vigdxa3x4pk4ha0whpk38g37";
+  };
+
+  buildInputs = [
+    pkgconfig gtk3 wrapGAppsHook webkitgtk intltool hicolor_icon_theme
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://live.gnome.org/devhelp;
+    description = "API documentation browser for GNOME";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}

From a4b8cbd3d0a33545a10204d8d90cb3c41d1561e1 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Fri, 14 Aug 2015 12:49:39 +0200
Subject: [PATCH 15/22] gnome3.yelp: Add gstreamer plugins and use gapps-hook

The gstreamer plugins are required by gnome-getting-started-docs
---
 pkgs/desktops/gnome-3/3.16/core/yelp/default.nix | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix
index 5ca053d81b93..7f4057072315 100644
--- a/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix
@@ -1,6 +1,7 @@
 { stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
 , file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf, sqlite
-, bash, makeWrapper, itstool, libxml2, libxslt, icu }:
+, bash, makeWrapper, itstool, libxml2, libxslt, icu, gst_all_1
+, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "yelp-${gnome3.version}.1";
@@ -18,13 +19,8 @@ stdenv.mkDerivation rec {
                   libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl
                   librsvg gdk_pixbuf gnome3.adwaita-icon-theme
                   hicolor_icon_theme gnome3.adwaita-icon-theme
-                  gnome3.gsettings_desktop_schemas ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/yelp" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${gnome3.yelp_xsl}/share/yelp-xsl:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/yelp:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
+                  gnome3.gsettings_desktop_schemas wrapGAppsHook
+                  gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ];
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Yelp;

From 1e364f993b159690fe0e705d0e7024bbcfd95101 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Fri, 14 Aug 2015 12:55:06 +0200
Subject: [PATCH 16/22] gnome-getting-started-docs: init at 3.16.2

---
 .../gnome-getting-started-docs/default.nix    | 20 +++++++++++++++++++
 pkgs/desktops/gnome-3/3.16/default.nix        |  3 +++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/3.16/apps/gnome-getting-started-docs/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-getting-started-docs/default.nix
new file mode 100644
index 000000000000..7ab2ca89bc02
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-getting-started-docs/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-getting-started-docs-${gnome3.version}.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-getting-started-docs/${gnome3.version}/${name}.tar.xz";
+    sha256 = "07wz35r6p9nvlshwcyjvhjnzbaw3bzadlhwz51c8nky7m7pdgmyy";
+  };
+
+  buildInputs = [ intltool itstool libxml2 ];
+
+  meta = with stdenv.lib; {
+    homepage = https://live.gnome.org/DocumentationProject;
+    description = "Help a new user get started in GNOME";
+    maintainers = gnome3.maintainers;
+    license = licenses.cc-by-sa-30;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index d7cf6ad9de8a..8251526bbd51 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -32,6 +32,7 @@ let
     gnome-clocks gnome-music gnome-tweak-tool gnome-photos
     nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs
     gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool
+    gnome-getting-started-docs
   ];
 
   gamesPackages = with gnome3; [ swell-foop lightsoff iagno
@@ -279,6 +280,8 @@ let
 
   gnome-documents = callPackage ./apps/gnome-documents { };
 
+  gnome-getting-started-docs = callPackage ./apps/gnome-getting-started-docs { };
+
   gnome-logs = callPackage ./apps/gnome-logs { };
 
   gnome-maps = callPackage ./apps/gnome-maps { };

From 8d44a74cfe3f957a2efaef6d7aaf43b5595193d6 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 14 Aug 2015 09:13:05 -0400
Subject: [PATCH 17/22] Add seaborn python package

---
 pkgs/top-level/python-packages.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3485503eddc3..e19659b0df9c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12352,6 +12352,22 @@ let
     };
   };
 
+  seaborn= buildPythonPackage rec {
+    name = "seaborn-0.6.0";
+    src = pkgs.fetchurl {
+      url = "http://pypi.python.org/packages/source/s/seaborn/${name}.tar.gz";
+      md5 = "bc518f1f45dadb9deb2bb57ca3af3cad";
+    };
+
+    propagatedBuildInputs = with self; [ pandas matplotlib ];
+
+    meta = {
+      description = "statisitical data visualization";
+      homepage = "http://stanford.edu/~mwaskom/software/seaborn/";
+      license     = "BSD";
+    };
+  };
+
   selenium = buildPythonPackage rec {
     name = "selenium-2.44.0";
     src = pkgs.fetchurl {

From 529596fd316fa6f31a9f39f537939c0bc971543f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 14 Aug 2015 09:49:41 -0400
Subject: [PATCH 18/22] Bump nix-exec for new nix

---
 pkgs/development/interpreters/nix-exec/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/nix-exec/default.nix b/pkgs/development/interpreters/nix-exec/default.nix
index 72641161c75c..523dbdbecbf3 100644
--- a/pkgs/development/interpreters/nix-exec/default.nix
+++ b/pkgs/development/interpreters/nix-exec/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, nix, git }: let
-  version = "4.1.0";
+  version = "4.1.1";
 in stdenv.mkDerivation {
   name = "nix-exec-${version}";
 
   src = fetchurl {
     url = "https://github.com/shlevy/nix-exec/releases/download/v${version}/nix-exec-${version}.tar.xz";
 
-    sha256 = "16hssxv6fwi5a6bz7dlvhjjr3ymiqrvq0xfd38gwhn9qhvynv2ak";
+    sha256 = "1igpxhvj29cgg7mid1ilaq3d1q9sk6nlw8q33ah8y78iy2ah1iv2";
   };
 
   buildInputs = [ pkgconfig nix git ];

From c4358e0278b8a8cde6014a6656aab20cccc231b9 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Fri, 14 Aug 2015 21:08:06 +0200
Subject: [PATCH 19/22] gjs: fix readline reference in .la file

---
 pkgs/desktops/gnome-3/3.16/core/gjs/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.16/core/gjs/default.nix
index b736e1cd812f..792e34c7b148 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gjs/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gjs/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, gnome3, gtk3, gobjectIntrospection
-, spidermonkey_24, pango, readline, glib }:
+, spidermonkey_24, pango, readline, glib, libxml2 }:
 
 let
   majorVersion = "1.43";
@@ -12,10 +12,14 @@ stdenv.mkDerivation rec {
     sha256 = "0khwm8l6m6x71rwf3q92d6scbhmrpiw7kqmj34nn588fb7a4vdc2";
   };
 
-  buildInputs = [ gobjectIntrospection pkgconfig gtk3 glib pango readline ];
+  buildInputs = [ libxml2 gobjectIntrospection pkgconfig gtk3 glib pango readline ];
 
   propagatedBuildInputs = [ spidermonkey_24 ];
 
+  postInstall = ''
+    sed 's|-lreadline|-L${readline}/lib -lreadline|g' -i $out/lib/libgjs.la
+  '';
+
   meta = with stdenv.lib; {
     maintainers = gnome3.maintainers;
     platforms = platforms.linux;

From 167e54b25786efde22219583ea8468d63af62c16 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 14 Aug 2015 21:22:40 +0200
Subject: [PATCH 20/22] haskell-generic-builder: allow users to specify their
 own install phase

---
 pkgs/development/haskell-modules/generic-builder.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 83978e3bf215..4f142cd932db 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -38,7 +38,7 @@
 , patches ? [], patchPhase ? "", prePatch ? "", postPatch ? ""
 , preConfigure ? "", postConfigure ? ""
 , preBuild ? "", postBuild ? ""
-, preInstall ? "", postInstall ? ""
+, installPhase ? "", preInstall ? "", postInstall ? ""
 , checkPhase ? "", preCheck ? "", postCheck ? ""
 , preFixup ? "", postFixup ? ""
 , coreSetup ? false # Use only core packages to build Setup.hs.
@@ -305,6 +305,7 @@ stdenv.mkDerivation ({
 // optionalAttrs (preCheck != "")       { inherit preCheck; }
 // optionalAttrs (postCheck != "")      { inherit postCheck; }
 // optionalAttrs (preInstall != "")     { inherit preInstall; }
+// optionalAttrs (installPhase != "")   { inherit installPhase; }
 // optionalAttrs (postInstall != "")    { inherit postInstall; }
 // optionalAttrs (preFixup != "")       { inherit preFixup; }
 // optionalAttrs (postFixup != "")      { inherit postFixup; }

From 324c0f205a3f907add9e33fb04cb8c5a62424185 Mon Sep 17 00:00:00 2001
From: Eric Seidel <gridaphobe@gmail.com>
Date: Fri, 14 Aug 2015 12:27:27 -0700
Subject: [PATCH 21/22] emacs-packages: idris-mode 0.9.15 -> 0.9.18

---
 pkgs/top-level/emacs-packages.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 9f0978ffa1a4..0adddf3d5d03 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -827,14 +827,13 @@ let self = _self // overrides;
 
   idris-mode = melpaBuild rec {
     pname   = "idris-mode";
-    version = "0.9.15";
+    version = "0.9.18";
     src = fetchFromGitHub {
       owner  = "idris-hackers";
       repo   = "idris-mode";
       rev    = version;
-      sha256 = "00pkgk1zxan89i8alsa2dpa9ls7imqk5zb1kbjwzrlbr0gk4smdb";
+      sha256 = "11dw2ydlqhqx569wrp56w11rhgvm6mb6mzq2cwsv2vfyjvvawyxg";
     };
-    packageRequires = [ flycheck ];
     meta = { license = gpl3Plus; };
   };
 

From c541c236927b9ec20901cf0b7a58b622b41abe8b Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 14 Aug 2015 15:56:01 -0400
Subject: [PATCH 22/22] nix-exec: Bugfix bump

---
 pkgs/development/interpreters/nix-exec/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/nix-exec/default.nix b/pkgs/development/interpreters/nix-exec/default.nix
index 523dbdbecbf3..071680c4e9bf 100644
--- a/pkgs/development/interpreters/nix-exec/default.nix
+++ b/pkgs/development/interpreters/nix-exec/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, nix, git }: let
-  version = "4.1.1";
+  version = "4.1.2";
 in stdenv.mkDerivation {
   name = "nix-exec-${version}";
 
   src = fetchurl {
     url = "https://github.com/shlevy/nix-exec/releases/download/v${version}/nix-exec-${version}.tar.xz";
 
-    sha256 = "1igpxhvj29cgg7mid1ilaq3d1q9sk6nlw8q33ah8y78iy2ah1iv2";
+    sha256 = "03dphdkf33zi2wm92wghfvadghljh6q1a9zdj9rcbx2jh7fp3k8y";
   };
 
   buildInputs = [ pkgconfig nix git ];