From ebf5df03650968ebd36017b2f2b604aced1ddcde Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 23 Jul 2017 11:43:01 -0400
Subject: [PATCH 001/122] exfat-nofuse: 2017-01-03 -> 2017-06-19

---
 pkgs/os-specific/linux/exfat/default.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/exfat/default.nix b/pkgs/os-specific/linux/exfat/default.nix
index fa2939e947e..ee6249ce040 100644
--- a/pkgs/os-specific/linux/exfat/default.nix
+++ b/pkgs/os-specific/linux/exfat/default.nix
@@ -1,21 +1,18 @@
 { stdenv, lib, fetchFromGitHub, kernel }:
 
-# Upstream build for kernel > 4.10 is currently broken
-# Reference: https://github.com/dorimanx/exfat-nofuse/issues/103
-assert lib.versionOlder kernel.version "4.10";
 
 # Upstream build for kernel 4.1 is broken, 3.12 and below seems to be working
 assert lib.versionAtLeast kernel.version  "4.2" || lib.versionOlder kernel.version "4.0";
 
 stdenv.mkDerivation rec {
   name = "exfat-nofuse-${version}-${kernel.version}";
-  version = "2017-01-03";
+  version = "2017-06-19";
 
   src = fetchFromGitHub {
     owner = "dorimanx";
     repo = "exfat-nofuse";
-    rev = "8d291f5";
-    sha256 = "0lg1mykglayswli2aliw8chsbr4g629v9chki5975avh43jn47w9";
+    rev = "de4c760bc9a05ead83bc3ec6eec6cf1fb106f523";
+    sha256 = "0v979d8sbcb70lakm4jal2ck3gspkdgq9108k127f7ph08vf8djm";
   };
 
   hardeningDisable = [ "pic" ];

From 97cc4fdd9ecd3329aabf579fb4f884badd39a7a4 Mon Sep 17 00:00:00 2001
From: David Asabina <vid@bina.me>
Date: Mon, 24 Jul 2017 00:57:21 +0200
Subject: [PATCH 002/122] qesteidutil: 3.12.2.1206 -> 3.12.5.1233

---
 pkgs/tools/security/qesteidutil/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/qesteidutil/default.nix b/pkgs/tools/security/qesteidutil/default.nix
index e05dee4ef9a..e2b831f583c 100644
--- a/pkgs/tools/security/qesteidutil/default.nix
+++ b/pkgs/tools/security/qesteidutil/default.nix
@@ -3,12 +3,12 @@
 
 stdenv.mkDerivation rec {
 
-  version = "3.12.2.1206";
+  version = "3.12.5.1233";
   name = "qesteidutil-${version}";
   
   src = fetchurl {
-    url = "https://installer.id.ee/media/ubuntu/pool/main/q/qesteidutil/qesteidutil_3.12.2.1206.orig.tar.xz";
-    sha256 = "1v1i0jlycjjdg6wi4cpm1il5v1zn8dfj82mrfvsjy6j9rfzinkda";
+    url = "https://installer.id.ee/media/ubuntu/pool/main/q/qesteidutil/qesteidutil_${version}.orig.tar.xz";
+    sha256 = "b5f0361af1891cfab6f9113d6b2fab677cc4772fc18b62df7d6e997f13b97857";
   };
 
   unpackPhase = ''

From fcf7b6761bf07a62a05d91b0920febc928905ced Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Tue, 25 Jul 2017 13:25:40 +0200
Subject: [PATCH 003/122] firejail: 0.9.44.10 -> 0.9.48

---
 pkgs/os-specific/linux/firejail/default.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix
index 1bbe8dbb160..b20dcd34233 100644
--- a/pkgs/os-specific/linux/firejail/default.nix
+++ b/pkgs/os-specific/linux/firejail/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="firejail";
-    version="0.9.44.10";
+    version="0.9.48";
     name="${baseName}-${version}";
-    hash="19wln3h54wcscqgcmkm8sprdh7vrn5k91rr0hagv055y1i52c7mj";
-    url="https://netix.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.44.10.tar.xz";
-    sha256="19wln3h54wcscqgcmkm8sprdh7vrn5k91rr0hagv055y1i52c7mj";
+    hash="02a74nx8p2gbpd6ffnr52p02pxxllw3yy5fy4083a77r3wia8zb3";
+    url="https://vorboss.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.48.tar.xz";
+    sha256="02a74nx8p2gbpd6ffnr52p02pxxllw3yy5fy4083a77r3wia8zb3";
   };
   buildInputs = [
     which
@@ -21,6 +21,13 @@ stdenv.mkDerivation {
     name = "${s.name}.tar.bz2";
   };
 
+  prePatch = ''
+    # Allow whitelisting ~/.nix-profile
+    substituteInPlace etc/firejail.config --replace \
+      '# follow-symlink-as-user yes' \
+      'follow-symlink-as-user no'
+  '';
+
   preConfigure = ''
     sed -e 's@/bin/bash@${stdenv.shell}@g' -i $( grep -lr /bin/bash .)
     sed -e "s@/bin/cp@$(which cp)@g" -i $( grep -lr /bin/cp .)

From 1ec964b327e6d5ac97367ba2166d319f9e21c13e Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Tue, 25 Jul 2017 20:32:50 -0400
Subject: [PATCH 004/122] elpa-packages: 2017-07-25

---
 .../editors/emacs-modes/elpa-generated.nix    | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 7d8d01aafd6..da2eefd985a 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -175,10 +175,10 @@
       }) {};
     auctex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "auctex";
-        version = "11.90.2";
+        version = "11.91.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/auctex-11.90.2.tar";
-          sha256 = "1hid8srj64nwbxcjvdma1xy07bh0v8ndhhsi3nmx9vdi3167khz6";
+          url = "https://elpa.gnu.org/packages/auctex-11.91.0.tar";
+          sha256 = "1yh182mxgngjmwpkyv2n9km3vyq95bqfq8mnly3dbv78nwk7f2l3";
         };
         packageRequires = [];
         meta = {
@@ -930,10 +930,10 @@
     hydra = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
     elpaBuild {
         pname = "hydra";
-        version = "0.13.5";
+        version = "0.14.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/hydra-0.13.5.tar";
-          sha256 = "0vq1pjyq6ddbikbh0vzdigbs0zlldgwad0192s7v9npg8qlwi668";
+          url = "https://elpa.gnu.org/packages/hydra-0.14.0.tar";
+          sha256 = "1r2vl2cpzqzayfzc0bijigxc7c0mkgcv96g4p65gnw99jk8d78kb";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -1023,10 +1023,10 @@
     js2-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
     elpaBuild {
         pname = "js2-mode";
-        version = "20170116";
+        version = "20170721";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/js2-mode-20170116.tar";
-          sha256 = "1z4k7710yz1fbm2w8m17q81yyp8sxllld0zmgfnc336iqrc07hmk";
+          url = "https://elpa.gnu.org/packages/js2-mode-20170721.tar";
+          sha256 = "02w2hgk8qbmwkksqf1dmslpr3xn9zjp3srl3qh8730w8r8s8czni";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -1446,10 +1446,10 @@
       }) {};
     org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org";
-        version = "20170717";
+        version = "20170724";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-20170717.tar";
-          sha256 = "0jrkfclwlbfcdkf56awnmvyw5vb9qwbfyyf2z4ilwx29zps9mxnh";
+          url = "https://elpa.gnu.org/packages/org-20170724.tar";
+          sha256 = "1f1szds6642427hrzagxgkr05z66sf57n5l2acvmpgw4z358ms0n";
         };
         packageRequires = [];
         meta = {
@@ -1785,10 +1785,10 @@
       }) {};
     sokoban = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "sokoban";
-        version = "1.4.2";
+        version = "1.4.4";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/sokoban-1.4.2.tar";
-          sha256 = "0sciv7rl1p1ar1jris1py2slrd8kr4q6a4plmb0jq6lv9dlqyvc6";
+          url = "https://elpa.gnu.org/packages/sokoban-1.4.4.tar";
+          sha256 = "0lz0qxgs71yh23iayv50rb6qgqvgbz2bg2sgfxcps8wag643ns20";
         };
         packageRequires = [];
         meta = {
@@ -2198,10 +2198,10 @@
     yasnippet = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
     elpaBuild {
         pname = "yasnippet";
-        version = "0.11.0";
+        version = "0.12.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/yasnippet-0.11.0.tar";
-          sha256 = "1m0hchhianl69sb1iqa8av513qvz6krjg4b5ppwfx1sjlai9xj2y";
+          url = "https://elpa.gnu.org/packages/yasnippet-0.12.1.tar";
+          sha256 = "01q1hn3w8w63s7cvr9bq6l5n4nyirnk8qfba60ajp3j6ndi2964n";
         };
         packageRequires = [ cl-lib ];
         meta = {

From 187b67dd90ef052d840d3335c5c41ee811d81dc9 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Tue, 25 Jul 2017 20:33:14 -0400
Subject: [PATCH 005/122] org-packages: 2017-07-25

---
 .../editors/emacs-modes/org-generated.nix            | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix
index 29b793825c4..9d7af37e514 100644
--- a/pkgs/applications/editors/emacs-modes/org-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/org-generated.nix
@@ -1,10 +1,10 @@
 { callPackage }: {
     org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org";
-        version = "20170717";
+        version = "20170724";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-20170717.tar";
-          sha256 = "1cbk01awnyan1jap184v2bxsk97k0p2qn19z7gnid6wiblybgs89";
+          url = "http://orgmode.org/elpa/org-20170724.tar";
+          sha256 = "07rpr8zf12c62sfbk9c9lvvfphs3ws136d3vlnq6j7gypdzyb32m";
         };
         packageRequires = [];
         meta = {
@@ -14,10 +14,10 @@
       }) {};
     org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org-plus-contrib";
-        version = "20170717";
+        version = "20170724";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-plus-contrib-20170717.tar";
-          sha256 = "0710ba6gq04cg8d87b5wi7bz9gq9yqvqmkmgscawfm2ynfw2q8sa";
+          url = "http://orgmode.org/elpa/org-plus-contrib-20170724.tar";
+          sha256 = "12xgvdmpz6wnylcvfngh7lqvgs9wv1bdrm7l7fivakx8y3dyq7k7";
         };
         packageRequires = [];
         meta = {

From e533918024b58174c52b0899d355ae16572c1470 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Tue, 25 Jul 2017 20:35:07 -0400
Subject: [PATCH 006/122] melpa-stable-packages: 2017-07-25

---
 .../emacs-modes/melpa-stable-generated.nix    | 387 +++++++++++++-----
 1 file changed, 288 insertions(+), 99 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 8f1bf8ff38d..0796c41d749 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -20,6 +20,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    a = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "a";
+        version = "0.1.0alpha4";
+        src = fetchFromGitHub {
+          owner = "plexus";
+          repo = "a.el";
+          rev = "3af0122abac723f0d3dc21ee50eeb81afa26d361";
+          sha256 = "0grwpy4ssmn2m8aihfkxb7ifl7ql2hgicw16wzl0crpy5fndh1mp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a226f1d81cd1ae81b91c1102fbe40aac2eddcaa8/recipes/a";
+          sha256 = "1xqja47iw1c78kiv4854z47iblvvzrc1l35zjdhmhkh9hh10z886";
+          name = "a";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/a";
+          license = lib.licenses.free;
+        };
+      }) {};
     aa-edit-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, navi2ch }:
     melpaBuild {
         pname = "aa-edit-mode";
@@ -590,12 +611,12 @@
     ac-rtags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }:
     melpaBuild {
         pname = "ac-rtags";
-        version = "2.10";
+        version = "2.11";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "3b3ace901f53827daef81d4c13658ec4feb318b4";
-          sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk";
+          rev = "942ae6faa64ab6de73d093e628bc5b036f1a967c";
+          sha256 = "19ljfz95jwbgw35d3y0m0p3l4as5llwvc6q3v2jlv3xl3ihpd923";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
@@ -2809,12 +2830,12 @@
     binclock = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "binclock";
-        version = "1.10";
+        version = "1.11";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "binclock.el";
-          rev = "2e529ace67a04e6872a2328769782ef33b0e463a";
-          sha256 = "0ldyx90lrhfn7qypxsmaf2yhpamjiqzvsk0b0jlgg09ars1fvhns";
+          rev = "b964e437311e5406a31c0ec7038b3bf1fd02b876";
+          sha256 = "0ljxb70vx7x0yn8y1ilf4phk0hamprl43dh23fm3njqqgw60hzbk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/95dfa38d795172dca6a09cd02e21630747723949/recipes/binclock";
@@ -4132,12 +4153,12 @@
     cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
     melpaBuild {
         pname = "cider";
-        version = "0.14.0";
+        version = "0.15.0";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "f3c396ff8cf4baf331b0e19e18e33b795b66ee3e";
-          sha256 = "1np4bh7fxv6xkvdg1nyd596p2yjkrh5msw2wsfyidl0xb1jdnj9c";
+          rev = "e503f5628ef98bd768f08c698863e8e33a7af3b4";
+          sha256 = "1bb0l06af7k7zzsig8kmn71krbm9mwdj7dc0s17rbhnm84cdfc8b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -4606,12 +4627,12 @@
     cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cmake-mode";
-        version = "3.9.0pre6";
+        version = "3.9.0";
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "25b72e9097260d1faf254155a1199886c808a58f";
-          sha256 = "0rzy8fpagsqfln1x27mq89dh819jc8h2dlf7axmxq63g830c029q";
+          rev = "f15cfd891d1e01247ed285320ae32b6c3182ac8f";
+          sha256 = "0asp6kijrmf9bayg8jvhgkd1z2falzhyippkwgih9ygpa65qvqpq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -5305,12 +5326,12 @@
     company-rtags = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }:
     melpaBuild {
         pname = "company-rtags";
-        version = "2.10";
+        version = "2.11";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "3b3ace901f53827daef81d4c13658ec4feb318b4";
-          sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk";
+          rev = "942ae6faa64ab6de73d093e628bc5b036f1a967c";
+          sha256 = "19ljfz95jwbgw35d3y0m0p3l4as5llwvc6q3v2jlv3xl3ihpd923";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
@@ -5872,12 +5893,12 @@
     cricbuzz = callPackage ({ dash, enlive, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "cricbuzz";
-        version = "0.2.8";
+        version = "0.2.9";
         src = fetchFromGitHub {
           owner = "lepisma";
           repo = "cricbuzz.el";
-          rev = "5fe51347f5d6e7636ece5e904e4bdec0be21db45";
-          sha256 = "1x29garhp1x5h1mwbamwjnfw52w45b39aqxsvcdxmcf730w9pq63";
+          rev = "05087b0f6d5a941b5ec18acc8bcf20efd6d71568";
+          sha256 = "1zin191dcr6qli2cwgf6jjz2dvlxiaranglpc5365bkkvwb5f250";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cricbuzz";
@@ -5977,16 +5998,16 @@
     csound-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi, shut-up }:
     melpaBuild {
         pname = "csound-mode";
-        version = "0.1";
+        version = "0.1.1";
         src = fetchFromGitHub {
           owner = "hlolli";
           repo = "csound-mode";
-          rev = "b0e74f149a15118e8d85bf073b2ff5e0dd3cba7f";
-          sha256 = "0c73xjhqgp1f7bplm47cgpssm8kpj3vda9n0fqcyq5i38ncfqwva";
+          rev = "e3fbb1fecd730fd66893cadf41c2cb8c2d9c1685";
+          sha256 = "105hhn5f5ml32i3iwrm2d2ikx9lb96m3lsg9v9i72713mayvkqan";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/34dc8853f5978789212cb7983615202c498d4d25/recipes/csound-mode";
-          sha256 = "0k4p9w19yxhfccr9zgg51ppl9jf3m4pwwnqiq25yv6qsxmh9q24l";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/95ccfae76a2c0f627f6d218ca68072e79fcfd088/recipes/csound-mode";
+          sha256 = "15zmgsh1071cyd9a0d7cljq8k7d8l2gkjjpv8z22gnm0wfbb0yys";
           name = "csound-mode";
         };
         packageRequires = [ emacs multi shut-up ];
@@ -6166,12 +6187,12 @@
     cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cython-mode";
-        version = "0.26pre1";
+        version = "0.26";
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "85a2dfe76a2bc28d4c8c1a760ef04e614f61be73";
-          sha256 = "0gcdwzw952kddvxxgzsj93rqlvh2gs8bghz605zgm97baadvrizy";
+          rev = "62f04f6766386893f5da6bee23d4de1e92a4148d";
+          sha256 = "0rw22qa67ifrw7kd58wjs2bnrjzkpr75k1rbhdgba526mm4s0q0x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -7302,6 +7323,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "docker-compose-mode";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "meqif";
+          repo = "docker-compose-mode";
+          rev = "85cf81d2964c7b721a7f1317cf9efd5bf3a7f671";
+          sha256 = "1l0pcmjhvayfx1hn4125ilhr3lb4rzhrqrf91lnkh7m1rv3npcik";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9d74905aa52aa78bdc8e96aa3b791c3d2a70965f/recipes/docker-compose-mode";
+          sha256 = "094r2mqxmll5dqbjhhdfg60xs9m74qn22lz475692k48ma5a7gd0";
+          name = "docker-compose-mode";
+        };
+        packageRequires = [ dash emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/docker-compose-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     docker-tramp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "docker-tramp";
@@ -7808,12 +7850,12 @@
     easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "easy-hugo";
-        version = "1.0.0";
+        version = "1.3.1";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-easy-hugo";
-          rev = "226fa5c661391c7f8317a24c9f757396e1900371";
-          sha256 = "0g63ajpxr2a42nw5ri14icvwwdc9hs8al91plcjxjs7q7rbkhwp6";
+          rev = "468352a0a813c5ce8edba71c82f00e24b516d74c";
+          sha256 = "0sryibflylwy8pqp80xyxmdndk2idcgpgk9zxixwpim3mcwn78yl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@@ -8457,12 +8499,12 @@
     el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "el-patch";
-        version = "1.1.2";
+        version = "1.2";
         src = fetchFromGitHub {
           owner = "raxod502";
           repo = "el-patch";
-          rev = "ad6a64e9f24f6b58f0a08e11f76b5152da46c74c";
-          sha256 = "0n0zrjij9mcbv08x1m5hjbz6hcwy0c0j2d03swywnhl4c00pwfkp";
+          rev = "cc26f37e19ebc60ca75067115d3794cda88003c5";
+          sha256 = "0b8yy51dy5280y7yvq0ylm20m9bvzi7lzs3c9m1i2gb3ssx7267w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch";
@@ -10599,12 +10641,12 @@
     evil-matchit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-matchit";
-        version = "2.2.2";
+        version = "2.2.3";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "evil-matchit";
-          rev = "0b0e6d61a6462fc6fff7000b739ce5b31acd0d4c";
-          sha256 = "13qxsbvmi0dkzmf59j0xyjwwcspyhymm6swsagqy4b57ypis5hxh";
+          rev = "bed39041b1181ec26cf2601a8a7aa4afe2510f5b";
+          sha256 = "0b1gl5mhl8w63rhx4bbr69cklgz630038lxpjb4nl6h8yl41pcrp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit";
@@ -11522,12 +11564,12 @@
     find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "find-file-in-project";
-        version = "5.3.2";
+        version = "5.4.0";
         src = fetchFromGitHub {
           owner = "technomancy";
           repo = "find-file-in-project";
-          rev = "99801cd730d579ed3b05d084ad254b6a73b259aa";
-          sha256 = "0pqg6iib5ns6k5is0bv8riwficadi64dinzdjibk94h8i7cmp54h";
+          rev = "2d3e8d095e0c36f927142e80c4330977be698568";
+          sha256 = "1phj6a6ydc8hzv1f1881anyccg1jkd8dh6g229ln476i5y6wqs5j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@@ -11781,12 +11823,12 @@
     floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "floobits";
-        version = "1.9.0";
+        version = "1.9.1";
         src = fetchFromGitHub {
           owner = "Floobits";
           repo = "floobits-emacs";
-          rev = "fdac635ecc57ac7743f74678147aca2e956561de";
-          sha256 = "134b5ss249x06bgqvsxnlcfys7nl8aid42s7ln8pamxrc3prfcc1";
+          rev = "76c869f439c2d13028d1fe8cae486e0ef018e4b0";
+          sha256 = "0f0i5zzl8njrwspir1wnfyrv9q8syl2izhyn2j9j9w8wyf5w7l1b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/95c859e8440049579630b4c2bcc31e7eaa13b1f1/recipes/floobits";
@@ -12348,12 +12390,12 @@
     flycheck-rtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, rtags }:
     melpaBuild {
         pname = "flycheck-rtags";
-        version = "2.10";
+        version = "2.11";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "3b3ace901f53827daef81d4c13658ec4feb318b4";
-          sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk";
+          rev = "942ae6faa64ab6de73d093e628bc5b036f1a967c";
+          sha256 = "19ljfz95jwbgw35d3y0m0p3l4as5llwvc6q3v2jlv3xl3ihpd923";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
@@ -13782,12 +13824,12 @@
     ghc = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "ghc";
-        version = "5.7.0.0";
+        version = "5.8.0.0";
         src = fetchFromGitHub {
           owner = "DanielG";
           repo = "ghc-mod";
-          rev = "c3d0a681a19261817cf928685f7b96878fe51e91";
-          sha256 = "1d2hsfmshh29g5bvd701py9n421hmz49hk0zjx5m09s8znjkvgx3";
+          rev = "35690941aadbe44d9401102ab44a39753e0bb2b5";
+          sha256 = "0fcaxj2lhkhkm2h91d9fdqas2b99wblwl74l2y6ckpf05hrc4w1q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc";
@@ -16394,12 +16436,12 @@
     helm-dash = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-dash";
-        version = "1.2.0";
+        version = "1.3.0";
         src = fetchFromGitHub {
           owner = "areina";
           repo = "helm-dash";
-          rev = "a0f5d6539da873cd0c51d8ef714930c970a66aa0";
-          sha256 = "0s503q56acv70i5qahrdgk3nhvdpb3wa22a8jh1kvb7lykaw74ai";
+          rev = "9a230125a7a11f5fa90aa048b61abd95eb78ddfe";
+          sha256 = "0xs3nq86qmvkiazn5w564npdgbcfjlnpw2f48g2jd43yznblz7ly";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dash";
@@ -17339,12 +17381,12 @@
     helm-rtags = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, rtags }:
     melpaBuild {
         pname = "helm-rtags";
-        version = "2.10";
+        version = "2.11";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "3b3ace901f53827daef81d4c13658ec4feb318b4";
-          sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk";
+          rev = "942ae6faa64ab6de73d093e628bc5b036f1a967c";
+          sha256 = "19ljfz95jwbgw35d3y0m0p3l4as5llwvc6q3v2jlv3xl3ihpd923";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
@@ -18305,12 +18347,12 @@
     hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hydra";
-        version = "0.13.6";
+        version = "0.14.0";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "hydra";
-          rev = "91f8e7c13bcd9629ad1678588e58576ca6806b58";
-          sha256 = "1czdar4yv5c9996wvj887d0c1knlrpcjj0aq2dily2x074gdzh4j";
+          rev = "943636fe4a35298d9d234222bc4520dec9ef2305";
+          sha256 = "0ln4z2796ycy33g5jcxkqvm7638qxy4sipsab7d2864hh700cikg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra";
@@ -19522,12 +19564,12 @@
     ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-erlang-complete";
-        version = "0.2.4";
+        version = "0.3.0";
         src = fetchFromGitHub {
           owner = "s-kostyaev";
           repo = "ivy-erlang-complete";
-          rev = "117369f882f81fb9cc88459a4072a2789138c136";
-          sha256 = "0cy02idvhw459a3rlw2aj8hfmxmy7hx9x5d6g3x9nkv1lxkckn9f";
+          rev = "acd6322571cb0820868a6febdc5326782a29b729";
+          sha256 = "158cmxhky8nng43jj0d7w8126phx6zlr6r0kf9g2in5nkmbcbd33";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
@@ -19627,12 +19669,12 @@
     ivy-rtags = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, rtags }:
     melpaBuild {
         pname = "ivy-rtags";
-        version = "2.10";
+        version = "2.11";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "3b3ace901f53827daef81d4c13658ec4feb318b4";
-          sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk";
+          rev = "942ae6faa64ab6de73d093e628bc5b036f1a967c";
+          sha256 = "19ljfz95jwbgw35d3y0m0p3l4as5llwvc6q3v2jlv3xl3ihpd923";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
@@ -20045,12 +20087,12 @@
     js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "js2-mode";
-        version = "20170116";
+        version = "20170721";
         src = fetchFromGitHub {
           owner = "mooz";
           repo = "js2-mode";
-          rev = "03c679eb9914d58d7d9b7afc2036c482a9a01236";
-          sha256 = "1kgmljgh71f2sljdsr134jrj1i6kgj9bwyh4pl1lrz0v4ahwgd6g";
+          rev = "cb57d9b67390ae3ff70ab64169bbc4f1264244bc";
+          sha256 = "0z7ya533ap6lm5qwfsbhn1k4jh1k1p5xyk5r27wd40rfzvd2x2gy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
@@ -20738,12 +20780,12 @@
     ksp-cfg-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ksp-cfg-mode";
-        version = "0.4";
+        version = "0.5";
         src = fetchFromGitHub {
           owner = "lashtear";
           repo = "ksp-cfg-mode";
-          rev = "07a957512e66030e1b9f8ac0f259051386acb5b5";
-          sha256 = "1kbmlhfxbp704mky8v69lzqd20bbnqijfnv110yigsy3kxi7hdrr";
+          rev = "713a22ee28688e581ec3ad60228c853b516a14b6";
+          sha256 = "04r8mfsc349wdhx1brlf2l54v4dn58y69fqv3glhvml12962lwy3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d49db5938fa4e3ab1176a955a4788b15c63d9e69/recipes/ksp-cfg-mode";
@@ -21603,6 +21645,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    mac-pseudo-daemon = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mac-pseudo-daemon";
+        version = "2.1";
+        src = fetchFromGitHub {
+          owner = "DarwinAwardWinner";
+          repo = "osx-pseudo-daemon";
+          rev = "4d10e327cd8ee5bb7f006d68744be21c7097c1fc";
+          sha256 = "0rjdjddlkaps9cfyc23kcr3cdh08c12jfgkz7ca2j141mm89pyp2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e89752e595c7cec9488e755c30af18f5f6fc1698/recipes/mac-pseudo-daemon";
+          sha256 = "1kf677j6n7ykw8v5xsvbnnhm3hgjicl8fnf6yz9qw4whd0snrhn6";
+          name = "mac-pseudo-daemon";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/mac-pseudo-daemon";
+          license = lib.licenses.free;
+        };
+      }) {};
     macro-math = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "macro-math";
@@ -22481,12 +22544,12 @@
     meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "meghanada";
-        version = "0.8.2";
+        version = "0.8.3";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "b507fc0e6fa4b6f1b05c46ecf563ad0af69e263a";
-          sha256 = "0kiib5wchqhxm8rsxp3mfp3zdbgg57gbn8y70j5msa2sxdz26mm7";
+          rev = "af65a0c60bbdda051e0d8ab0b7213249eb6703c5";
+          sha256 = "08sxy81arypdj22bp6pdniwxxbhakay4ndvyvl7a6vjvn38ppzw8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -22520,6 +22583,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    memoize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "memoize";
+        version = "1.1";
+        src = fetchFromGitHub {
+          owner = "skeeto";
+          repo = "emacs-memoize";
+          rev = "636defefa9168f90bce6fc27431352ac7d01a890";
+          sha256 = "04qgnlg4x6va7x364dhj1wbjmz8p5iq2vk36mn9198k2vxmijwzk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6cc9be5bbcff04de5e6d3bb8c47d202fd350989b/recipes/memoize";
+          sha256 = "0mzz3hghnbkmxf9wgjqv3sbyxyqqzvvscazq9ybb0b41qrzm73s6";
+          name = "memoize";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/memoize";
+          license = lib.licenses.free;
+        };
+      }) {};
     mentor = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, seq, xml-rpc }:
     melpaBuild {
         pname = "mentor";
@@ -22544,7 +22628,7 @@
     merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "merlin";
-        version = "2.5.5";
+        version = "3.0.0";
         src = fetchFromGitHub {
           owner = "the-lambda-church";
           repo = "merlin";
@@ -23971,12 +24055,12 @@
     nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nix-mode";
-        version = "1.11.12";
+        version = "1.11.13";
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "04e071a5e4cdf7f5396a0e36874e0a023b7af232";
-          sha256 = "1hzp70sm4bwlbqnd7mmzan10wsgb03a1zfiqmwxnc61jgjxd5jva";
+          rev = "0ec723375bc6008a8a88024962b052c3fbbaf4b8";
+          sha256 = "1wg622s0qvgdzry4mb6a7jjpql7la58kwhzpif0akyd689xf9d9s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -24055,12 +24139,12 @@
     nodejs-repl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nodejs-repl";
-        version = "0.1.1";
+        version = "0.1.6";
         src = fetchFromGitHub {
           owner = "abicky";
           repo = "nodejs-repl.el";
-          rev = "d821ef49a8eae0e405fd2a000246f0475542a575";
-          sha256 = "1fwz6wpair617p9l2wdx923zpbbklfcdrygsryjx5gpnnm649mmy";
+          rev = "16770656a4072f8fbbd29d0cace4893a3d5541b1";
+          sha256 = "1hcvi4nhgfrjalq8nw20kjjpcf4xmjid70qpqdv8dsgfann5i3wl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14f22f97416111fcb02e299ff2b20c44fb75f049/recipes/nodejs-repl";
@@ -24769,8 +24853,8 @@
         src = fetchFromGitHub {
           owner = "OmniSharp";
           repo = "omnisharp-emacs";
-          rev = "ab4c6bb04cda35510fe751e546b5c0bb4dc3371d";
-          sha256 = "0zkd5hp5xk0wjlv6nqi38dnhrzk7jzcd8546wqfw0my10kb1ycs2";
+          rev = "ad147956b936fd528d26ca88158a8af96ff5827a";
+          sha256 = "04vkhdp3kxba1h5mjd9jblhapb5h2x709ldz4pc078qgyh5g1kpm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@@ -26147,6 +26231,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    osx-pseudo-daemon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "osx-pseudo-daemon";
+        version = "2.1";
+        src = fetchFromGitHub {
+          owner = "DarwinAwardWinner";
+          repo = "osx-pseudo-daemon";
+          rev = "4d10e327cd8ee5bb7f006d68744be21c7097c1fc";
+          sha256 = "0rjdjddlkaps9cfyc23kcr3cdh08c12jfgkz7ca2j141mm89pyp2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e89752e595c7cec9488e755c30af18f5f6fc1698/recipes/osx-pseudo-daemon";
+          sha256 = "013h2n27r4rvj8ych5cglj8qprkdxmmmsfi51fggqqvmv7qmr2hw";
+          name = "osx-pseudo-daemon";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/osx-pseudo-daemon";
+          license = lib.licenses.free;
+        };
+      }) {};
     osx-trash = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "osx-trash";
@@ -26570,12 +26675,12 @@
     pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
     melpaBuild {
         pname = "pandoc-mode";
-        version = "2.22";
+        version = "2.23";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "pandoc-mode";
-          rev = "b4e03ab345043fa7447dd59e59234dd33395e3cc";
-          sha256 = "08yxi878l1hibcsq0bb93g2rjwlc0xw415rgn1rzs3zib2hqj1qc";
+          rev = "58f893d54c0916ad832097a579288ef8ce405da5";
+          sha256 = "03nh5ivcwknnsw9khz196n6s3pa1392jk7pm2mr4yjjs24izyz1i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/pandoc-mode";
@@ -29878,6 +29983,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    rib-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rib-mode";
+        version = "1.0.2";
+        src = fetchFromGitHub {
+          owner = "blezek";
+          repo = "rib-mode";
+          rev = "4172e902fd66f235184c0eb6db7fd4a73dbd0866";
+          sha256 = "0s9dyqv4yh0zxngay951g98g07029h51m4r2fc7ib2arw6srfram";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c38c18f3eb75d559752fcd9956464fef890be728/recipes/rib-mode";
+          sha256 = "0qgbzrwbbgg4mzjb7yw85qs83b6hpldazip1cigywr46w7f81587";
+          name = "rib-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/rib-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     rich-minority = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rich-minority";
@@ -30112,12 +30238,12 @@
     rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rtags";
-        version = "2.10";
+        version = "2.11";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "3b3ace901f53827daef81d4c13658ec4feb318b4";
-          sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk";
+          rev = "942ae6faa64ab6de73d093e628bc5b036f1a967c";
+          sha256 = "19ljfz95jwbgw35d3y0m0p3l4as5llwvc6q3v2jlv3xl3ihpd923";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
@@ -30172,6 +30298,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ruby-electric = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ruby-electric";
+        version = "2.2.3";
+        src = fetchFromGitHub {
+          owner = "knu";
+          repo = "ruby-electric.el";
+          rev = "dfb4b448a63ae749c74edf6415ad569d52cab904";
+          sha256 = "0z3whvjmxbyk7lrxl3z2lj1skacwd050b5jvpnw6gcdm2hr8mfbs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5fd5fa797a813e02a6433ecbe2bca1270a383753/recipes/ruby-electric";
+          sha256 = "02xskivi917l8xyhrij084dmzwjq3knjcn65l2iwz34s767fbwl2";
+          name = "ruby-electric";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/ruby-electric";
+          license = lib.licenses.free;
+        };
+      }) {};
     ruby-end = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ruby-end";
@@ -30698,12 +30845,12 @@
     sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "sekka";
-        version = "1.6.6";
+        version = "1.7.1";
         src = fetchFromGitHub {
           owner = "kiyoka";
           repo = "sekka";
-          rev = "987c1cce65c8f30b12cdb5991e1b1ad9da766916";
-          sha256 = "03930cfqq97f7m6z9da2y9388iyymc56b1vdrl5a6mpggv3wifn7";
+          rev = "b9b2ba5aca378ad12cb9e0f0ac537d695bd39937";
+          sha256 = "1karh4pa190xmjbw1ai2f594i8nf9qa0lxybn3syif7r50ciym3c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka";
@@ -32039,6 +32186,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    solaire-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "solaire-mode";
+        version = "1.0.2";
+        src = fetchFromGitHub {
+          owner = "hlissner";
+          repo = "emacs-solaire-mode";
+          rev = "0f467e5f309e5a36280e06b40c0e6bbe90e06358";
+          sha256 = "1jka6213sw3rqan6s31s1ndyd0h2gwxvl0rcfm4jqc68mfyikzma";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/52c69070eef3003eb53e1436c538779c74670ce6/recipes/solaire-mode";
+          sha256 = "0pvgip12xl16rwz4wqmqjd8nhh3a299aknfsghazmxigamlmlsl5";
+          name = "solaire-mode";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/solaire-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     solarized-theme = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "solarized-theme";
@@ -32567,12 +32735,12 @@
     ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ssh-deploy";
-        version = "1.1";
+        version = "1.2";
         src = fetchFromGitHub {
           owner = "cjohansson";
           repo = "emacs-ssh-deploy";
-          rev = "3569e5ea6892d6d7f4ef36bf41462af011e1a114";
-          sha256 = "0l3h6w13xc81i6vavfsg617ly8m2y8yjzbwa6zwwkfqi301kgpij";
+          rev = "dbd8608551bc9e05280415b7b3937b1a151c7718";
+          sha256 = "1045snp3xdfa9nf34b1f0w4ql8kjl5m2jl7imxj5n46g579g9dhr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy";
@@ -36057,8 +36225,8 @@
         version = "0.9.1";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/wisp";
-          rev = "f94ec5fed665";
-          sha256 = "0k66dxxc8k2snzmw385a78xqfgbpjzsfg3jm0gk5wqyn185ab50n";
+          rev = "1ab8f296baeb";
+          sha256 = "02g34b7kp3lkv4sfgf1762vlmmsnxib37v8385lmv90ww24lwggg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -36113,6 +36281,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    with-simulated-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
+    melpaBuild {
+        pname = "with-simulated-input";
+        version = "2.0";
+        src = fetchFromGitHub {
+          owner = "DarwinAwardWinner";
+          repo = "with-simulated-input";
+          rev = "568bfb8e1d59a19cb309fd72a7ab0e9e51229e31";
+          sha256 = "1aa8ya5yzsijra7cf9rm80ffddv520kzm9rggw3nr3dj2sk03p8c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e4ddf16e19f5018106a423327ddc7e7499cf9248/recipes/with-simulated-input";
+          sha256 = "0113la76nbp18vaffsd7w7wcw5k2sqwgnjq1gslf4khdfqghrkwk";
+          name = "with-simulated-input";
+        };
+        packageRequires = [ emacs s seq ];
+        meta = {
+          homepage = "https://melpa.org/#/with-simulated-input";
+          license = lib.licenses.free;
+        };
+      }) {};
     wn-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "wn-mode";
@@ -36683,12 +36872,12 @@
     yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yasnippet";
-        version = "0.11.0";
+        version = "0.12.1";
         src = fetchFromGitHub {
           owner = "joaotavora";
           repo = "yasnippet";
-          rev = "e6b865127783f498b61fa99ad0f5413200ac09d0";
-          sha256 = "0djj2gi0s0jyxpqgfk2818xnj5ykwhzy5k9yi65klsw2nanhh8y9";
+          rev = "0463c75b636fe02273c2b8ca85f36b56a206c5c5";
+          sha256 = "1l8h681x5v78k6wkcmhb5kdw9mc13kcmq3aiqg0r9dn493ifj1v1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
@@ -36727,8 +36916,8 @@
         version = "1.78";
         src = fetchhg {
           url = "https://www.yatex.org/hgrepos/yatex/";
-          rev = "e9299b77df1f";
-          sha256 = "0nnpzcj23q964v4rfxzdll1r95zd6zzqvzcgxh7h603a41r3w1wm";
+          rev = "4f8551386af2";
+          sha256 = "0qvp54pzc6m52j5xkwp25nwdlik6v879halmfvcpn3z0grhrslbn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex";

From 6fcb5b708eae633a4ab1ffe6c42e18aacbbed558 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Tue, 25 Jul 2017 20:42:18 -0400
Subject: [PATCH 007/122] melpa-packages: 2017-07-25

Removals:
 - bbdb-android: removed from github
 - bbdb-china: removed from github
 - bbdb-handy: removed from github
 - chinese-remote-input: removed from github
 - easy-lentic: removed from github
 - sql-mssql: removed from github
---
 .../editors/emacs-modes/melpa-generated.nix   | 1901 ++++++++++-------
 1 file changed, 1081 insertions(+), 820 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 53035f2415e..192306a059a 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -82,6 +82,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    a = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "a";
+        version = "20170720.553";
+        src = fetchFromGitHub {
+          owner = "plexus";
+          repo = "a.el";
+          rev = "3af0122abac723f0d3dc21ee50eeb81afa26d361";
+          sha256 = "0grwpy4ssmn2m8aihfkxb7ifl7ql2hgicw16wzl0crpy5fndh1mp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a226f1d81cd1ae81b91c1102fbe40aac2eddcaa8/recipes/a";
+          sha256 = "1xqja47iw1c78kiv4854z47iblvvzrc1l35zjdhmhkh9hh10z886";
+          name = "a";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/a";
+          license = lib.licenses.free;
+        };
+      }) {};
     aa-edit-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, navi2ch }:
     melpaBuild {
         pname = "aa-edit-mode";
@@ -801,8 +822,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "65c8f03ff0112ce5c5e11aff6867ad0eb9019e63";
-          sha256 = "0xlacwjmvx5xd8m7yi8l8mqi0lqs2gr2hmjag2frvmxcn4cpb4gc";
+          rev = "afbf59630203624e0a5eecee52a3296295e6d620";
+          sha256 = "0bygl7ahwsz6xmw0fif7gqnpzbk8cx7hpg4gp96f8inicq849z26";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
@@ -923,12 +944,12 @@
     ace-jump-buffer = callPackage ({ avy, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ace-jump-buffer";
-        version = "20160229.1458";
+        version = "20170717.1148";
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "ace-jump-buffer";
-          rev = "9224e279a53fba06ed5561e22bf89ab94f74b9e7";
-          sha256 = "1y2rl4faj1nfjqbh393yp460cbv24simllak31ag1ischpcbqjy4";
+          rev = "9b1bb1a817c97cfa3853cc24474bd13e641f560d";
+          sha256 = "1qlm025jhxqsb5xcp1mcpm4djlah9xnsw3m26cfrk686b17x8l4l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31100b5b899e942de7796bcbf6365625d1b62574/recipes/ace-jump-buffer";
@@ -986,12 +1007,12 @@
     ace-jump-zap = callPackage ({ ace-jump-mode, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ace-jump-zap";
-        version = "20150330.1342";
+        version = "20170717.1149";
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "ace-jump-zap";
-          rev = "c60af83a857955b68c568c274a3c80cbe93f3150";
-          sha256 = "0z0rblr41r94l4b2gh9fcw50nk82ifxrr3ilxqzbb8wmvil54gh4";
+          rev = "52b5d4c6c73bd0fc833a0dcb4e803a5287d8cae8";
+          sha256 = "1iw90mk6hdrbskxgv67xj27qd26w5dlh4s6a6xqqsj8ld56nzbvr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3b435db3b79333a20aa27a72f33c431f0a019ba1/recipes/ace-jump-zap";
@@ -1178,8 +1199,8 @@
         src = fetchFromGitHub {
           owner = "nickmccurdy";
           repo = "add-hooks";
-          rev = "edd4cb032a509b576d88f4cc0521ebfe66a9e6c7";
-          sha256 = "1qg1ifkds84xv07ibz4sqp34ks60w4c7dvrq9dch4gvg040hal82";
+          rev = "5e18cc3887477aeec41a34f608d9aa55bfa92d0e";
+          sha256 = "05a0ayqjldl53s3zmfgmdqq8jf1qw1m2a2sj4qzn2bci0dgsakcp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/901f846aef46d512dc0a1770bab7f07c0ae330cd/recipes/add-hooks";
@@ -1428,8 +1449,8 @@
         src = fetchFromGitHub {
           owner = "AnthonyDiGirolamo";
           repo = "airline-themes";
-          rev = "40cb03bbb56f09cfbfae07ff9ff97f3aaf8324be";
-          sha256 = "0pngxrs1zz0vr0m7sbrl11a5gnxsgbqk1kp9566nj79h02y81sd7";
+          rev = "0c0f8efbeaefa49ef04c0c4405b1ef79ecc5433e";
+          sha256 = "08hkx5wf9qyh4d5s5z4v57d43qkzw6p8zsqijw92wy4kngv1gl78";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/addeb923176132a52807308fa5e71d41c9511802/recipes/airline-themes";
@@ -1634,12 +1655,12 @@
     all-the-icons-gnus = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "all-the-icons-gnus";
-        version = "20170711.241";
+        version = "20170718.2354";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "all-the-icons-gnus";
-          rev = "fe2080fe78c28b140be4ee2018cdf3c72b87fa31";
-          sha256 = "1lxq6fqrwxzd2cr8a7nvapaaf9pd1mfyqqk0rhg50fp3i16z5nkk";
+          rev = "8785d04f54b1692c04f4b665864f8f95425c20c6";
+          sha256 = "0zn9aq0ml39p2adjb9hpqk2iwb1dk5z5jdhabxszmhbs3zs53i52";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8ed74d39d165343c81c2a21aa47e3d3895d8119/recipes/all-the-icons-gnus";
@@ -2604,12 +2625,12 @@
     apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "apropospriate-theme";
-        version = "20170418.1352";
+        version = "20170721.1400";
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "apropospriate-theme";
-          rev = "98c548917bb696d541a58bfcf85f02572d8f7ebd";
-          sha256 = "0kr6p1kf0sb036w9pb20xlfs7ynw357fv0zifsb8g7q1va7m5vs7";
+          rev = "5727dd549d9cb95a6a18919f90428d7c5b860a99";
+          sha256 = "0a66s9lyi4anf4s6sxh66b4c4lsa9m3bqdqym4qhf53ywi55qal5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme";
@@ -2641,22 +2662,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    arch-packer = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    arch-packer = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "arch-packer";
-        version = "20170506.1005";
+        version = "20170723.430";
         src = fetchFromGitHub {
           owner = "brotzeitmacher";
           repo = "arch-packer";
-          rev = "e195c4f30da2a756f6e14715f436ff22826b5e82";
-          sha256 = "0xxgnavpcimkb9adlbpcv96pp829x41nv744c8yl8rl8lb4f9xdl";
+          rev = "743b3dc5f239c77e9c5c3049b5a9701da1ae12ee";
+          sha256 = "0h5ajz5mcj9g1y9f5fyqcjmqss99403v6lbqngh20mj8pi6w9rr5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/39f13017cde2d209a58dc45f0df25dc723398b72/recipes/arch-packer";
           sha256 = "06gmkc63ys6diiwbhdjyn17yhvs91nxdhqkydmm18553pzsmcy72";
           name = "arch-packer";
         };
-        packageRequires = [ async emacs s ];
+        packageRequires = [ async dash emacs s ];
         meta = {
           homepage = "https://melpa.org/#/arch-packer";
           license = lib.licenses.free;
@@ -4424,12 +4445,12 @@
     base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "base16-theme";
-        version = "20170713.1237";
+        version = "20170718.1307";
         src = fetchFromGitHub {
           owner = "belak";
           repo = "base16-emacs";
-          rev = "f701a8e191ae9c0bd6ab93926ce993bb18a9e98c";
-          sha256 = "026a5frqvd2j09zzbf83mw3hmcj1ps7nsia87k0yn13sk62rd5bk";
+          rev = "06d54b58f2ea5c49507164d97e8837406484a274";
+          sha256 = "0a4xhq5y4vclv91zq83vb8irsvf0xly09y3zxvddyliy4bn3f8hi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme";
@@ -4568,11 +4589,11 @@
       }) {};
     bbdb = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "bbdb";
-        version = "20170129.2224";
+        version = "20170725.300";
         src = fetchgit {
           url = "https://git.savannah.nongnu.org/git/bbdb.git";
-          rev = "8998b3416b36873f4e49454879f2eed20c31b384";
-          sha256 = "086ivc9j7vninb46kzparg7zjmdsv346gqig6ki73889wym1m7xn";
+          rev = "c951e15cd01d84193937ae5e347143321c3a2da9";
+          sha256 = "1m19f74zkyh0zyigv807rlznvf2l72kdg6gfizf8pan85qvk949l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/bbdb";
@@ -4606,48 +4627,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    bbdb-android = callPackage ({ bbdb-vcard, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "bbdb-android";
-        version = "20150705.2224";
-        src = fetchFromGitHub {
-          owner = "tumashu";
-          repo = "bbdb-android";
-          rev = "60641acf8b90e34b70f783b3d6e7789a4272f2b4";
-          sha256 = "0m80k87dahzdpfa4snbl4p9zm5d5anc8s91535mwzsnfbr98qmhm";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1296e9ffe3a49022a9480b398fbfa311121a1020/recipes/bbdb-android";
-          sha256 = "0v3njygqkcrwjkf7jrqmza6bwk2jp3956cx1qvf9ph7dfxsq7rn3";
-          name = "bbdb-android";
-        };
-        packageRequires = [ bbdb-vcard ];
-        meta = {
-          homepage = "https://melpa.org/#/bbdb-android";
-          license = lib.licenses.free;
-        };
-      }) {};
-    bbdb-china = callPackage ({ bbdb-vcard, chinese-pyim, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "bbdb-china";
-        version = "20150615.1856";
-        src = fetchFromGitHub {
-          owner = "tumashu";
-          repo = "bbdb-china";
-          rev = "a64725ca6dbb5ec1825f3a9112df9aa54bb14f6c";
-          sha256 = "07plwm5nh58qya03l8z0iaqh8bmyhywx7qiffkf803n8wwjb3kdn";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/bbdb-china";
-          sha256 = "1clrl3gk036w8q3p2f189jp6wv1y3xv037v77rg87dyz0yjs61py";
-          name = "bbdb-china";
-        };
-        packageRequires = [ bbdb-vcard chinese-pyim ];
-        meta = {
-          homepage = "https://melpa.org/#/bbdb-china";
-          license = lib.licenses.free;
-        };
-      }) {};
     bbdb-csv-import = callPackage ({ bbdb, dash, fetchFromGitLab, fetchurl, lib, melpaBuild, pcsv }:
     melpaBuild {
         pname = "bbdb-csv-import";
@@ -4690,27 +4669,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    bbdb-handy = callPackage ({ bbdb, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "bbdb-handy";
-        version = "20150707.1752";
-        src = fetchFromGitHub {
-          owner = "tumashu";
-          repo = "bbdb-handy";
-          rev = "67936204488b539fac9b4a7bfbf11546f3b13de2";
-          sha256 = "04yxky7qxh0s4y4addry85qd1074l97frhp0hw77xd1bc7n5zzg0";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/bbdb-handy";
-          sha256 = "16wjnsw4p7y21zmpa69vpwydsv5i479czk3y79cnn7s4ap69jmm8";
-          name = "bbdb-handy";
-        };
-        packageRequires = [ bbdb ];
-        meta = {
-          homepage = "https://melpa.org/#/bbdb-handy";
-          license = lib.licenses.free;
-        };
-      }) {};
     bbdb-vcard = callPackage ({ bbdb, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bbdb-vcard";
@@ -5132,12 +5090,12 @@
     binclock = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "binclock";
-        version = "20170418.812";
+        version = "20170725.121";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "binclock.el";
-          rev = "38ef6531fed16eb2fa69824fbdafac998cf201ac";
-          sha256 = "13s4j04b60l44xs381v4padhdyqs8625ssqph24qral6iizwry8d";
+          rev = "b964e437311e5406a31c0ec7038b3bf1fd02b876";
+          sha256 = "0ljxb70vx7x0yn8y1ilf4phk0hamprl43dh23fm3njqqgw60hzbk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/95dfa38d795172dca6a09cd02e21630747723949/recipes/binclock";
@@ -5153,12 +5111,12 @@
     bind-chord = callPackage ({ bind-key, fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }:
     melpaBuild {
         pname = "bind-chord";
-        version = "20160530.1042";
+        version = "20170717.1152";
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "use-package-chords";
-          rev = "e8551ce8a514d865831d3a889acece79103fc627";
-          sha256 = "0500pqsszg7h7923i0kyjirdyhj8aza3a2h5wbqzdpli2aqra5a5";
+          rev = "f47b2dc8d79f02e5fe39de1f63c78a6c09be2026";
+          sha256 = "0nwcs3akf1cy7dv36n5s5hsr67djfcn7w499vamn0yh16bs7r5ds";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92fbae4e0bcc1d5ad9f3f42d01f08ab4c3450f1f/recipes/bind-chord";
@@ -5654,7 +5612,7 @@
       }) {};
     bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "bookmark-plus";
-        version = "20170703.1431";
+        version = "20170719.2147";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/bookmark+.el";
           sha256 = "0iqvlwqilwpqlymj8iynw2miifl28h1g7z10q08rly2430fnmi37";
@@ -5884,12 +5842,12 @@
     browse-at-remote = callPackage ({ cl-lib ? null, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "browse-at-remote";
-        version = "20170624.309";
+        version = "20170720.1518";
         src = fetchFromGitHub {
           owner = "rmuslimov";
           repo = "browse-at-remote";
-          rev = "e8b7533f6c37c4660e4ba97cd4856383f4e4ce32";
-          sha256 = "0650c2401qidw5zprgvnkvqbar9vs9yyj58njiwc394xf5xwzsmb";
+          rev = "b5cff7971ca8bbb966e3acd9b7e5c4c007f94215";
+          sha256 = "16ms9703m15dfxg6ap4mdw7msf8z5rzsdhba51dwivfpjxg7n52c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/browse-at-remote";
@@ -6175,15 +6133,15 @@
     buffer-sets = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "buffer-sets";
-        version = "20170505.829";
+        version = "20170717.2040";
         src = fetchgit {
           url = "https://git.flintfam.org/swf-projects/buffer-sets.git";
-          rev = "dd47af82f6cd5c4bab304e41518d4dc06bd6e353";
-          sha256 = "1wsx7m9wmzc6yiiyvsjmlqzazcss4vaq8qcdm3r1gybli32llraw";
+          rev = "4a4ccb0d6916c3e9fba737bb7b48e8aac921954e";
+          sha256 = "1rg6iwswi82w8938pavwhvvr2z3ismb42asam2fkad47h2sgn0gz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/2e12638554a13ef49ab24da08fe20ed2a53dbd11/recipes/buffer-sets";
-          sha256 = "0r8mr53bd5cml5gsvq1hbl9894xsq0wwv4p1pp2q4zlcyxlwf4fl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/61d07bbe7201fc991c7ab7ee6299a89d63ddb5e5/recipes/buffer-sets";
+          sha256 = "1xj9fn2x4kbx8kp999wvz1j68znp7j81zl6rnbaipbx7hjpqrsin";
           name = "buffer-sets";
         };
         packageRequires = [ cl-lib ];
@@ -6424,12 +6382,12 @@
     busybee-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "busybee-theme";
-        version = "20130920.942";
+        version = "20170719.228";
         src = fetchFromGitHub {
           owner = "mswift42";
           repo = "busybee-theme";
-          rev = "70850d1781ff91c4ce125a31ed451d080f8da643";
-          sha256 = "11z987frzswnsym8g3l0s9wwdly1zn5inl2l558m6kcvfy7g59cx";
+          rev = "66b2315b030582d0ebee605cf455d386d8c30fcd";
+          sha256 = "1cvj5m45f5ky3w86khh6crvdqrdjxg2z6b34jlm32qpgmn0s5g45";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/36e2089b998d98575aa6dd3cc79fb7f6847f7aa3/recipes/busybee-theme";
@@ -6947,12 +6905,12 @@
     cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }:
     melpaBuild {
         pname = "cargo";
-        version = "20170621.1316";
+        version = "20170725.248";
         src = fetchFromGitHub {
           owner = "kwrooijen";
           repo = "cargo.el";
-          rev = "b0487f95a7de7a1d6f03cdd05220f633977d65a2";
-          sha256 = "0r9v7q7hkdw2q3iifyrb6n9jrssz2rcv2xcc7n1nmg1v40av3ijd";
+          rev = "7a843c9209cf48c53e1f3dfd533c156d6c701501";
+          sha256 = "0xj0bqn3mc8kpihpki1y2wx9ydqvza9kbpz2di8wa768zj1xh6qz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo";
@@ -7370,8 +7328,8 @@
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "28484409e8f64f976bf3d80f10081b18f7724cf5";
-          sha256 = "0zvxrbf30hy511jmlfvmqj5yiysfbs73x064w1px7ghavczdjvx5";
+          rev = "e14319ed4308647746027bd62131ef07692710b9";
+          sha256 = "1rpv8nl18wgijz3vh7anh1xvhqx8vbc8bajx0l2036v3k4mq3dc6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -7410,7 +7368,7 @@
         version = "20170201.347";
         src = fetchsvn {
           url = "https://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "12270";
+          rev = "12277";
           sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k";
         };
         recipeFile = fetchurl {
@@ -7739,22 +7697,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    chinese-fonts-setup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    chinese-fonts-setup = callPackage ({ cnfonts, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "chinese-fonts-setup";
-        version = "20170512.1";
+        version = "20170724.737";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "chinese-fonts-setup";
-          rev = "a88f45239ca73e95eb6bac923590f1d108b822ca";
-          sha256 = "1h0nwrnh0krn9p0x1cj67gjdlzr82xml76ycn6745f943sn6d5ah";
+          rev = "bb285b91da12ba9c5897a6aed9c893449000210d";
+          sha256 = "0dq745yjbwv1xb6i7m7372i4rb6brq9y4f70m01wcmacm6h85j14";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c536882e613e83a4a2baf86479bfb3efb86d916a/recipes/chinese-fonts-setup";
           sha256 = "141ri6a6mnxf7fn17gw48kxk8pvl3khdxkb4pw8brxwrr9rx0xd5";
           name = "chinese-fonts-setup";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cnfonts emacs ];
         meta = {
           homepage = "https://melpa.org/#/chinese-fonts-setup";
           license = lib.licenses.free;
@@ -7781,22 +7739,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }:
+    chinese-pyim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pyim }:
     melpaBuild {
         pname = "chinese-pyim";
-        version = "20170512.735";
+        version = "20170724.1618";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "chinese-pyim";
-          rev = "d57d0fd47565dc087724a68c6b3abd16a58625ae";
-          sha256 = "10ir2452rj6f48qfgwps6y1mn5afrsa04z0xl2f31j5463j4b4mx";
+          rev = "dd034c6fb9473aed7ee856a366f3cac031e82209";
+          sha256 = "1clqz4yg86mm673pabzi54angc7qr41pikrz0x2ya0qhz88g0y9s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim";
           sha256 = "0zdx5zhgj1ly89pl48vigjzd8g74fxnxcd9bxrqykcn7y5qvim8l";
           name = "chinese-pyim";
         };
-        packageRequires = [ async chinese-pyim-basedict cl-lib popup pos-tip ];
+        packageRequires = [ pyim ];
         meta = {
           homepage = "https://melpa.org/#/chinese-pyim";
           license = lib.licenses.free;
@@ -7805,12 +7763,12 @@
     chinese-pyim-basedict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "chinese-pyim-basedict";
-        version = "20160723.438";
+        version = "20170724.1523";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "chinese-pyim-basedict";
-          rev = "3bca2760d78fd1195dbd4c2d570db955023a5623";
-          sha256 = "07dd90bhmayacgvv5k6j079wk3zhlh83zw471rd37n2hmw8557mv";
+          rev = "6b6eea5375d2e0b4b6374fbf766ebb209ece86af";
+          sha256 = "0rx30m9ag3hbggm9jl0bpkn0svf5838nj6qsailcnxkyxq3cga2l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e2315ffe7d13928eddaf217a5f67a3e0dd5e62a1/recipes/chinese-pyim-basedict";
@@ -7826,12 +7784,12 @@
     chinese-pyim-greatdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "chinese-pyim-greatdict";
-        version = "20170513.1833";
+        version = "20170724.1525";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "chinese-pyim-greatdict";
-          rev = "8efd9321d21d5daabdb32cb3696bc7c7b83ce991";
-          sha256 = "05ap9d2kk9dyj85zm581nwizbdqx8fqa0yjswk4df0y6mgz4g0q9";
+          rev = "45fa4ff26f3444fb98c4dea460d84b740204d105";
+          sha256 = "1j89mcfsqyclmllfqmsx8a55ihrn2kzay8qh2lyfm8dzd6mi1za0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/03234f7a1abe7423c5a9bcb4c100957c8eece351/recipes/chinese-pyim-greatdict";
@@ -7844,45 +7802,24 @@
           license = lib.licenses.free;
         };
       }) {};
-    chinese-pyim-wbdict = callPackage ({ chinese-pyim, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    chinese-pyim-wbdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "chinese-pyim-wbdict";
-        version = "20170217.15";
+        version = "20170724.1527";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "chinese-pyim-wbdict";
-          rev = "59856a7199dde278c33f6f8d8e21df4944ba996a";
-          sha256 = "1aahff6r0liil7nx1pprmkmb5c39kwywblj3n6zs80ikwy4759xb";
+          rev = "114489ed97e825ae11a8d09da6e873820cf23106";
+          sha256 = "187wx418pj4h8p8baf4943v9dsb6mfbn0n19r8xiil1z2cmm4ygc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7c77ba5562e8bd8b8f532e7745edcdf3489584ac/recipes/chinese-pyim-wbdict";
           sha256 = "0y9hwn9rjplb69vi4s9bvf6fkvns2rlpkqm0qvv44mxq7g61lm5c";
           name = "chinese-pyim-wbdict";
         };
-        packageRequires = [ chinese-pyim ];
-        meta = {
-          homepage = "https://melpa.org/#/chinese-pyim-wbdict";
-          license = lib.licenses.free;
-        };
-      }) {};
-    chinese-remote-input = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "chinese-remote-input";
-        version = "20150110.2103";
-        src = fetchFromGitHub {
-          owner = "tumashu";
-          repo = "chinese-remote-input";
-          rev = "d05d0bd116421e6fd19f52e9e576431ee5de0858";
-          sha256 = "06k13wk659qw40aczq3i9gj0nyz6vb9z1nwsz7c1bgjbl2lh6hcv";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b639a9d3b258afe6637055e75a2939f2df18366a/recipes/chinese-remote-input";
-          sha256 = "0nnccm6w9i0qsgiif22hi1asr0xqdivk8fgg76mp26a2fv8d3dag";
-          name = "chinese-remote-input";
-        };
         packageRequires = [];
         meta = {
-          homepage = "https://melpa.org/#/chinese-remote-input";
+          homepage = "https://melpa.org/#/chinese-pyim-wbdict";
           license = lib.licenses.free;
         };
       }) {};
@@ -8034,12 +7971,12 @@
     cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
     melpaBuild {
         pname = "cider";
-        version = "20170717.303";
+        version = "20170724.2248";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "7daf4e968de21e7eb7bb2dc1b6ca30ae4e990532";
-          sha256 = "00y8d8gz0nfqr9dfd1nrkm32ckaln4cg6l6k3jbjzc0la673ljfr";
+          rev = "ea6aa352f7e5b97e00ac2057c2d7579a9e6f411f";
+          sha256 = "000zgcb66hgh1sxcn48q6dp2ln90nakpknikp441z8h9yhaazh8f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -8310,7 +8247,7 @@
         version = "20170120.137";
         src = fetchsvn {
           url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "308172";
+          rev = "309006";
           sha256 = "0qyhvjb3pf0qp7ag2wav4wxrxfgk1zga0dy4kzw8lm32ajzjjavk";
         };
         recipeFile = fetchurl {
@@ -8516,12 +8453,12 @@
     clj-refactor = callPackage ({ cider, clojure-mode, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, seq, yasnippet }:
     melpaBuild {
         pname = "clj-refactor";
-        version = "20170608.320";
+        version = "20170720.712";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clj-refactor.el";
-          rev = "769eb06ac82dff8aa0239b9ca47cf3240ff0857f";
-          sha256 = "17g6rq30dvvhr3lljzn5gg6v9bdxw31fw6b20sgcp7gx4xspc42w";
+          rev = "f5295df68955c23fffd60718039fd386d13c77f5";
+          sha256 = "14lp3jxxpjfm31rbrf2rb988fzh4xfacqdcwp15b87pixziln08x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor";
@@ -8952,8 +8889,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "2d5e494637f9dad13fd0206ac3420e7d26f8b778";
-          sha256 = "0wsljwpd0ld4c0qxfn1x1a7xvcq8ik5dmxcys94cb2cw8xxgzbz2";
+          rev = "d9a541eacbd0d3e833a93853f03e6be26b99dc37";
+          sha256 = "0fr4wml4ay4vi9wsn8jv566nakq1q68ylm3yacy7031fndq3ipvr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -8969,12 +8906,12 @@
     cmake-project = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cmake-project";
-        version = "20150720.1359";
+        version = "20170725.912";
         src = fetchFromGitHub {
           owner = "alamaison";
           repo = "emacs-cmake-project";
-          rev = "5212063b6276f8b9af8b48b4052e5ec97721c08b";
-          sha256 = "0fyzi8xac80wnhnwwm1j6yxpvpg1n4diq2lcl3qkj8klvk5gpxr6";
+          rev = "ae763397663fbd35de0541a5d9f2de18a5de3305";
+          sha256 = "0ynxcbf0jbn6b4dxswhk9qhijmhp05q6v925nglq67j0xjm8bicw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0857c4db1027981ea73bc32bcaa15e5df53edea3/recipes/cmake-project";
@@ -10500,8 +10437,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "65c8f03ff0112ce5c5e11aff6867ad0eb9019e63";
-          sha256 = "0xlacwjmvx5xd8m7yi8l8mqi0lqs2gr2hmjag2frvmxcn4cpb4gc";
+          rev = "afbf59630203624e0a5eecee52a3296295e6d620";
+          sha256 = "0bygl7ahwsz6xmw0fif7gqnpzbk8cx7hpg4gp96f8inicq849z26";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
@@ -10668,8 +10605,8 @@
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "35e8a31e32d0de890547612db8373d7333db8d8a";
-          sha256 = "023bkmviaqb85kwwlpmzfc5gycf4i7w8a43zhbmvasfjjb962yzd";
+          rev = "5c3e07b46e4c25bbd0a2068a5091c8f27b344da6";
+          sha256 = "04nb5cjlghkk47a0girnlxlcrclylhg1zx41q5lcvnzb1is06skh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd";
@@ -10685,12 +10622,12 @@
     composable = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "composable";
-        version = "20170426.459";
+        version = "20170723.2347";
         src = fetchFromGitHub {
           owner = "paldepind";
           repo = "composable.el";
-          rev = "09020605ee7f4e52ff2fa2f6d68d826db1ee7565";
-          sha256 = "0vhvgn0ybdnh8c71sbjxh6bb05w5ivm3rmkj4f255zqfkjyddl7q";
+          rev = "ac981974f89607393cc61314aaa19672d45b0650";
+          sha256 = "0xg46r6ibga27cdycbysm80n2ayi8vmxcff1b6bqjjrsc0wbdnac";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1fc0f076198e4be46a33a26eea9f2d273dda12b8/recipes/composable";
@@ -10769,12 +10706,12 @@
     config-general-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "config-general-mode";
-        version = "20170715.733";
+        version = "20170719.446";
         src = fetchFromGitHub {
           owner = "tlinden";
           repo = "config-general-mode";
-          rev = "dd018f96f631a3fc6230ce5011d6357cf9720ef1";
-          sha256 = "15xvp40b3sbwjf492j0abaknwc5f0cz0f7hydy7mdqdlha20qahs";
+          rev = "8927fd1c359275dc4236c5f48fea0e3ce8349bed";
+          sha256 = "04f6608ndhan6xmipzylzwzx2asx0bsqx8a9rnxfab3bza756c99";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c06831528e4bbc44aae1cc5cd6bec60150ae087/recipes/config-general-mode";
@@ -11041,12 +10978,12 @@
     counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "counsel";
-        version = "20170710.1111";
+        version = "20170725.946";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "dc146d9f1435b79fbfbfa702f0172b9de05f631d";
-          sha256 = "09cfs0rhhb72b12pic2w9chbc000pqnafrl2x0g8v5r065pzp64n";
+          rev = "112c5ba0df7deea11b3e91b5db3990d693eb5b72";
+          sha256 = "0fcskn4v0rx5i04qr40wa8jggsswxxp8g8hk0s4sr447mxbiksbv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -11461,12 +11398,12 @@
     cricbuzz = callPackage ({ dash, enlive, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "cricbuzz";
-        version = "20161130.2036";
+        version = "20170724.2330";
         src = fetchFromGitHub {
           owner = "lepisma";
           repo = "cricbuzz.el";
-          rev = "5fe51347f5d6e7636ece5e904e4bdec0be21db45";
-          sha256 = "1x29garhp1x5h1mwbamwjnfw52w45b39aqxsvcdxmcf730w9pq63";
+          rev = "049e9d3c0c67350e008e62bd15b263add8f3a403";
+          sha256 = "1vvaysvmpvdm4l20arzwgy0xhqy7lnav6wglq1x9ax7c7c0a3cdr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cricbuzz";
@@ -11649,16 +11586,16 @@
     csound-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi, shut-up }:
     melpaBuild {
         pname = "csound-mode";
-        version = "20170715.650";
+        version = "20170725.855";
         src = fetchFromGitHub {
           owner = "hlolli";
           repo = "csound-mode";
-          rev = "9c96406bbda815a4c8068d9c4a2a0dd5bd8f3325";
-          sha256 = "14k2qbdn4l47kal647b8fy1lrcnivydnk651m02y3d6w41vgp7pq";
+          rev = "14524d63a174c36a052c79025942f6a116a5f197";
+          sha256 = "1h5sfwl2mjy8w2hnb73w2am1p2glwzf5n53q3d0ri8in83nxjn59";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/34dc8853f5978789212cb7983615202c498d4d25/recipes/csound-mode";
-          sha256 = "0k4p9w19yxhfccr9zgg51ppl9jf3m4pwwnqiq25yv6qsxmh9q24l";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/95ccfae76a2c0f627f6d218ca68072e79fcfd088/recipes/csound-mode";
+          sha256 = "15zmgsh1071cyd9a0d7cljq8k7d8l2gkjjpv8z22gnm0wfbb0yys";
           name = "csound-mode";
         };
         packageRequires = [ emacs multi shut-up ];
@@ -11979,12 +11916,12 @@
     cyberpunk-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cyberpunk-theme";
-        version = "20170712.2110";
+        version = "20170724.924";
         src = fetchFromGitHub {
           owner = "n3mo";
           repo = "cyberpunk-theme.el";
-          rev = "c5ad3a1815ba25b91aced8232b6f6268a10379d7";
-          sha256 = "1l8m5mk7qdvw9cc6ypqahrrzxfzdx7n5yp1j82dgli9gy0sq027v";
+          rev = "88eff8a42d6ed8ba7782ae003ec9597aed4fd019";
+          sha256 = "0pzdm5nbhykssc633injz6jw422ksy632fhz0szd03a6kfx49iby";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c632d1e501d48dab54432ab111ce589aa229125/recipes/cyberpunk-theme";
@@ -12124,12 +12061,12 @@
     cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cython-mode";
-        version = "20140705.1229";
+        version = "20170723.1342";
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "a2db27bb85d0daa4cc4b4b7d65c0e6a7cda5ec2a";
-          sha256 = "101gdyvhkb5lzsa69slaq0l81sjmrr34sb5sxbjxrbx5pk5wh9gz";
+          rev = "fb5e92001fe31a49227378e90a77bc5f4e2a83ff";
+          sha256 = "0ym87yhmidxn25ba9si6hl76svgzm9mb8ar2qbbb9h7xcqscx6p0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -12229,12 +12166,12 @@
     dakrone-light-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dakrone-light-theme";
-        version = "20170501.654";
+        version = "20170724.1403";
         src = fetchFromGitHub {
           owner = "dakrone";
           repo = "dakrone-light-theme";
-          rev = "4b3f3ba8e2ffc35e537507894620245c96ff8965";
-          sha256 = "1191iyjc5pw6jy9kqmjgr1s4n88ndjdsys7hwzc8c18glv411r69";
+          rev = "5f1d506a8047cf8790ab50baf08b539645af6299";
+          sha256 = "1kadp8h97zz26d3br0y9bakwi90c7rwgjya9z46m0mx9jjlpx5yw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f3a88022a5f68d2fe01e08c2e99cfe380e3697b7/recipes/dakrone-light-theme";
@@ -13529,8 +13466,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "bca0522bf225bb7e82b783aad936ff8703812fdf";
-          sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci";
+          rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1";
+          sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs";
@@ -13543,22 +13480,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    dired-collapse = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    dired-collapse = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-collapse";
-        version = "20170717.208";
+        version = "20170719.346";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "bca0522bf225bb7e82b783aad936ff8703812fdf";
-          sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci";
+          rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1";
+          sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6aab23df1451682ff18d9ad02c35cb7ec612bc38/recipes/dired-collapse";
           sha256 = "1k8h5cl8r68rnr1a3jnbc0ydflzm5mad7v7f1q60wks5hv61dsd1";
           name = "dired-collapse";
         };
-        packageRequires = [ dash ];
+        packageRequires = [ dash f ];
         meta = {
           homepage = "https://melpa.org/#/dired-collapse";
           license = lib.licenses.free;
@@ -13711,12 +13648,12 @@
     dired-filter = callPackage ({ cl-lib ? null, dash, dired-hacks-utils, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-filter";
-        version = "20161009.530";
+        version = "20170718.1145";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "bca0522bf225bb7e82b783aad936ff8703812fdf";
-          sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci";
+          rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1";
+          sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter";
@@ -13736,8 +13673,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "bca0522bf225bb7e82b783aad936ff8703812fdf";
-          sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci";
+          rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1";
+          sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils";
@@ -13841,8 +13778,8 @@
         src = fetchFromGitHub {
           owner = "thomp";
           repo = "dired-launch";
-          rev = "9dea31574dcf006d5247b488a1942faaac434362";
-          sha256 = "03dim1ca332882i08r19k4vjzw3hwwg132n2mrxhniyzgkk7g891";
+          rev = "75745f2e40d060cae909f9e6f6ca2e5f725180b8";
+          sha256 = "1amsqbbjzjw07s40v8c63iw59qf5r1x7rqq2iq1jiybwsrp9s7v0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31c9a4945d65aa6afc371c447a572284d38d4d71/recipes/dired-launch";
@@ -13862,8 +13799,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "bca0522bf225bb7e82b783aad936ff8703812fdf";
-          sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci";
+          rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1";
+          sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow";
@@ -13883,8 +13820,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "bca0522bf225bb7e82b783aad936ff8703812fdf";
-          sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci";
+          rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1";
+          sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open";
@@ -13944,8 +13881,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "bca0522bf225bb7e82b783aad936ff8703812fdf";
-          sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci";
+          rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1";
+          sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow";
@@ -13965,8 +13902,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "bca0522bf225bb7e82b783aad936ff8703812fdf";
-          sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci";
+          rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1";
+          sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger";
@@ -14065,8 +14002,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "bca0522bf225bb7e82b783aad936ff8703812fdf";
-          sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci";
+          rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1";
+          sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree";
@@ -14145,12 +14082,12 @@
     direnv = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
     melpaBuild {
         pname = "direnv";
-        version = "20170622.1128";
+        version = "20170717.1049";
         src = fetchFromGitHub {
           owner = "wbolster";
           repo = "emacs-direnv";
-          rev = "3c632dd1fdf0ad1edb6d9b0a4a09cdbb420c27aa";
-          sha256 = "0jajqf7ad0x6ca7i051svrc37mr3ww8pvd1832i0k7nf3i8cv867";
+          rev = "d181475192138b256e124a42660ac60ae62d11d0";
+          sha256 = "09pcssxas9aqdnn2n9y61f016fip9qgxsr16nzljh66dk0lnbgrw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv";
@@ -14835,12 +14772,12 @@
     docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }:
     melpaBuild {
         pname = "docker";
-        version = "20170601.1345";
+        version = "20170718.303";
         src = fetchFromGitHub {
           owner = "Silex";
           repo = "docker.el";
-          rev = "d3bdb09af10c7aa466b25e0c65a3d21fdf44514e";
-          sha256 = "097nrhnc668yclvisq5hc3j8jgpk7w7k7clrlp5a1r1gd5472sj7";
+          rev = "8070936871e0fbb20fb04c28630288ebe314b8b9";
+          sha256 = "0gk4ykvsv8wgfiym0z635a3n3jaw4wnvfmf78ppfinrzybg85r76";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker";
@@ -14882,6 +14819,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "docker-compose-mode";
+        version = "20170722.941";
+        src = fetchFromGitHub {
+          owner = "meqif";
+          repo = "docker-compose-mode";
+          rev = "c21c79aa0aac7175eb90913b2eaa1201c181bd01";
+          sha256 = "03w99zlhafypsw3rjf0skp5m963sq7ygd63ibknqaw3xghb0vxyz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9d74905aa52aa78bdc8e96aa3b791c3d2a70965f/recipes/docker-compose-mode";
+          sha256 = "094r2mqxmll5dqbjhhdfg60xs9m74qn22lz475692k48ma5a7gd0";
+          name = "docker-compose-mode";
+        };
+        packageRequires = [ dash emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/docker-compose-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     docker-tramp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "docker-tramp";
@@ -15011,12 +14969,12 @@
     doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "doom-themes";
-        version = "20170717.426";
+        version = "20170718.1137";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-doom-themes";
-          rev = "a00ee6cc48179dfeb8836726d9faa9b4f119783a";
-          sha256 = "0f1szgr7xz2bg222x8b9h6kmi6diipc2r4j4yafjpsgkniv6c93c";
+          rev = "557ff5d129b8b79e48287e68c934d309070c0542";
+          sha256 = "1swwb3mkysn3rj9mbmbnyg0whx13k060cyi0phly5zssk4sj1n5i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes";
@@ -15446,7 +15404,7 @@
         version = "20130120.1257";
         src = fetchsvn {
           url = "https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1802135";
+          rev = "1802990";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
@@ -15547,12 +15505,12 @@
     dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
     melpaBuild {
         pname = "dumb-jump";
-        version = "20170627.1309";
+        version = "20170721.49";
         src = fetchFromGitHub {
           owner = "jacktasia";
           repo = "dumb-jump";
-          rev = "0328d922da4b1bbbb8f41848585c920608f6e9d3";
-          sha256 = "1l3s42y90d2canslkjvfs4n5zlpdxp0h4b1yrip9825gh2k4fan7";
+          rev = "e1a6647fecdaf77f737c3d16e0b8e6cb3cab1cb2";
+          sha256 = "0bxfayqrp05fsic0nfk47iarfqgdlnqaahvbr9bx56js9s0fgm5p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump";
@@ -15607,6 +15565,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    dut-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dut-mode";
+        version = "20170721.2214";
+        src = fetchFromGitHub {
+          owner = "dut-lang";
+          repo = "dut-mode";
+          rev = "affd16ad1e78799bb4ec99f80006271447d075f9";
+          sha256 = "16yp7s3m7bm4chmkzlbqix4cfv6x7mgcdcl7j55h782dm252zfcg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ecf49ceab8b25591fab2ed6574cba0e6634d1539/recipes/dut-mode";
+          sha256 = "0hlr5qvqcqdh2k1nyq621z6vq2yiflj4jy0pgg6lbiy3j6819mai";
+          name = "dut-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/dut-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     dyalog-mode = callPackage ({ cl-lib ? null, emacs, fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dyalog-mode";
@@ -15924,12 +15903,12 @@
     easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "easy-hugo";
-        version = "20170708.307";
+        version = "20170724.1123";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-easy-hugo";
-          rev = "226fa5c661391c7f8317a24c9f757396e1900371";
-          sha256 = "0g63ajpxr2a42nw5ri14icvwwdc9hs8al91plcjxjs7q7rbkhwp6";
+          rev = "ca215061068b2dec3dd98f0da3a1294fa2f77430";
+          sha256 = "06mihlh2zzgfkbss9gbhyd5f8wkmb4lxsxnxfndym63pgzsy2j0s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@@ -15984,27 +15963,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    easy-lentic = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lentic, lib, melpaBuild }:
-    melpaBuild {
-        pname = "easy-lentic";
-        version = "20170309.2143";
-        src = fetchFromGitHub {
-          owner = "tumashu";
-          repo = "easy-lentic";
-          rev = "d2b600cc3bd3166c3e4543435070b511ae9bf148";
-          sha256 = "1p99yf1nlial254dyy9i30lfx2v4jwpahvi9pfjm5sv64212vp33";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7e098e70214e85e1c583a4976f895941c13de75f/recipes/easy-lentic";
-          sha256 = "1j141lncgcgfpa42m505xndiy6lh848xymfvb3cz4d6h73421khg";
-          name = "easy-lentic";
-        };
-        packageRequires = [ cl-lib lentic ];
-        meta = {
-          homepage = "https://melpa.org/#/easy-lentic";
-          license = lib.licenses.free;
-        };
-      }) {};
     easy-repeat = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "easy-repeat";
@@ -16510,12 +16468,12 @@
     edit-server = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "edit-server";
-        version = "20141231.1358";
+        version = "20170725.859";
         src = fetchFromGitHub {
           owner = "stsquad";
           repo = "emacs_chrome";
-          rev = "f7cf37c3f605812d429fd90699d6d33f6ac9db8d";
-          sha256 = "1i4fvw7703pr505mzspkc7sphh3mbg4pvbpfcr847lrg66pdw419";
+          rev = "462c57be72b3a8652f705bde0d3b7cd2f79644fa";
+          sha256 = "0s4s90sbk82yp08my8jdmn4kn5cx8xc9cf02asrq4b4jvljynwvj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d98d69008b5ca8b92fa7a6045b9d1af86f269386/recipes/edit-server";
@@ -16657,12 +16615,12 @@
     edts = callPackage ({ auto-complete, auto-highlight-symbol, dash, erlang, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
     melpaBuild {
         pname = "edts";
-        version = "20170421.55";
+        version = "20170725.338";
         src = fetchFromGitHub {
           owner = "tjarvstrand";
           repo = "edts";
-          rev = "3f90f4484ac03f06286b15b0c33ff0e5aeed2bb5";
-          sha256 = "0wpr7h7vl1pi05sxyivk1a22qhcm74iacnra9h1d2jcf6as1h5x4";
+          rev = "5b94473b7fe00edc50a001ff4eb55f54753d8742";
+          sha256 = "00yqmfic02f6082mndndnfcas16by3lav8w3z0hh618a8prmzhdm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/782db7fba2713bfa17d9305ae15b0a9e1985445b/recipes/edts";
@@ -16810,12 +16768,12 @@
     ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, skewer-mode, websocket }:
     melpaBuild {
         pname = "ein";
-        version = "20170714.1753";
+        version = "20170714.1910";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "emacs-ipython-notebook";
-          rev = "08d2792d690cefb9ef2e00a14d3bbb1da55252a9";
-          sha256 = "0fw56v0xx4axw24wzy8rk69zy0nhajk4y3fqi1305acfgn6hnnvg";
+          rev = "cda6143270cf44d2c9e59904b2c7bbd225d226ee";
+          sha256 = "13h93cs69cz9rq56jncjiq3p0fkd3khniral828ky5vkvhihf2wv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
@@ -16860,12 +16818,12 @@
     eink-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eink-theme";
-        version = "20161207.410";
+        version = "20170717.807";
         src = fetchFromGitHub {
           owner = "maio";
           repo = "eink-emacs";
-          rev = "40e7a7d31ee160175aa89583609d3f953fb066c6";
-          sha256 = "0701c7x8wwr99d5l50k8n2a6zx7dh067d702v032g5axh7lqsn2j";
+          rev = "4c990bb3428f725735fa1f733ef4c5ad61f632b0";
+          sha256 = "0jxs36qdsx58ni5185qyi1c7gchyla3dpv4v9drj1n072ls82ld4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a1349c3f93ab60983f77c28f97048fa258b612a6/recipes/eink-theme";
@@ -17015,12 +16973,12 @@
     el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "el-patch";
-        version = "20170706.936";
+        version = "20170723.19";
         src = fetchFromGitHub {
           owner = "raxod502";
           repo = "el-patch";
-          rev = "979ea29884f54c5ac4a6a5b2873547c0964e3dd3";
-          sha256 = "021ld1cs7swmrlbvnakwwx6xlyg95g8cnc6d1vk03a81p7s897il";
+          rev = "cc26f37e19ebc60ca75067115d3794cda88003c5";
+          sha256 = "0b8yy51dy5280y7yvq0ylm20m9bvzi7lzs3c9m1i2gb3ssx7267w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch";
@@ -17393,8 +17351,8 @@
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "79077efc34aad25bb43cf46a28a69a308196c972";
-          sha256 = "1xsy7qr9k9ad5ig9vvf9bbxc5ik5xi1kpmq87q9iq3g321idcwnl";
+          rev = "14b0430f27e1afbf144c26a63eddd79906e4b4ff";
+          sha256 = "1yynda71g93f8ix9ckxanmx5pla2rv5c13byslwzw7i3vi5wn1k9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@@ -17463,8 +17421,8 @@
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "79077efc34aad25bb43cf46a28a69a308196c972";
-          sha256 = "1xsy7qr9k9ad5ig9vvf9bbxc5ik5xi1kpmq87q9iq3g321idcwnl";
+          rev = "14b0430f27e1afbf144c26a63eddd79906e4b4ff";
+          sha256 = "1yynda71g93f8ix9ckxanmx5pla2rv5c13byslwzw7i3vi5wn1k9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
@@ -17900,12 +17858,12 @@
     elpa-mirror = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elpa-mirror";
-        version = "20160917.10";
+        version = "20170722.422";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "elpa-mirror";
-          rev = "dcadffd331ac70c59e1960d34b7f998302c616d6";
-          sha256 = "08dz6zy9fqj7qd1g1igvr28q2znrd5pwxxqjlrkzs994ypfj1vzq";
+          rev = "5c793f6df944b7f1a68893438696c12240f0b930";
+          sha256 = "0p5q44p6jl306qns4xf7f03pq091zczvjnh9bjax6z6sx54yadsd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d64ce7042c45f29fb394be25ce415912182bac8b/recipes/elpa-mirror";
@@ -18947,12 +18905,12 @@
     enlive = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "enlive";
-        version = "20150824.549";
+        version = "20170725.717";
         src = fetchFromGitHub {
           owner = "zweifisch";
           repo = "enlive";
-          rev = "0f6646adda3974e7fe9a42339a4ec3daa532eda5";
-          sha256 = "0vd7zy06nqb1ayjlnf2wl0bfv1cqv2qcb3cgy3zr9k9c4whcd8jh";
+          rev = "604a8ca272b6889f114e2b5a13adb5b1dc4bae86";
+          sha256 = "1iwfb5hxhnp4rl3rh5yayik0xl2lg82klxkvqf29536pk8ip710m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/388fa2580e687d9608b11cdc069841831b414b29/recipes/enlive";
@@ -19010,12 +18968,12 @@
     ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
     melpaBuild {
         pname = "ensime";
-        version = "20170710.347";
+        version = "20170724.630";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "ensime-emacs";
-          rev = "aaaa9e34f5ea023621bc8123064d3183b35339a7";
-          sha256 = "11nxhzy4qc4y1gfi0m5c78jv2ib5gpsqdr1p84q0yqkzdc9wvcmd";
+          rev = "c8e936ed3793fab0dcbfad797ff97aa5c91562e2";
+          sha256 = "0mj0k5wh6sndlnj8pcfhl0gwgas6433iyjrifpf0v5p7m5cizy5x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
@@ -19123,12 +19081,12 @@
     epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "epkg";
-        version = "20170702.59";
+        version = "20170723.1240";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "epkg";
-          rev = "d9c43561d8d50066c1774e3cf3df12e168c9fc92";
-          sha256 = "145zn11l9i0lmjr83zvn8snviqqn6kw24dm5ihlllgxycclsvcrm";
+          rev = "11e8cc60a4dcfa973fabb4085b35e5951def84ca";
+          sha256 = "1izgmlv52qgc8y29zx12q25bm1y3yzzz0sdy128bj2blc6j60wbd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg";
@@ -19605,12 +19563,12 @@
     ergoemacs-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "ergoemacs-mode";
-        version = "20170509.1202";
+        version = "20170723.1921";
         src = fetchFromGitHub {
           owner = "ergoemacs";
           repo = "ergoemacs-mode";
-          rev = "3e6fea941af18415b520f2fabc45349c4a148a8f";
-          sha256 = "1b0whc2llfff6wggiran0df7wrh06mygca0cqpps6ljfniqcxl5y";
+          rev = "7b0600620fc64cdb92bb9a69144c68eaa088db5b";
+          sha256 = "05ihafhhjlq7b4zs58jaqssgqdha5kqv65hvk7946ba7l845fi83";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/02920517987c7fc698de9952cbb09dfd41517c40/recipes/ergoemacs-mode";
@@ -19651,8 +19609,8 @@
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "de5cfabdad61d45a112d95e24ac44e3f51a4bd18";
-          sha256 = "14mi9qj2q0h21jy9zj4gqjz2205013d5s5l02asq6iid747jhx3j";
+          rev = "72d994d7a6251e6ec72cf864b11309e01c50ba1f";
+          sha256 = "05bs7r01bm2zfldg3j4915rnm7px2hcr04p3yzsy8sz36hqcjm81";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -19814,12 +19772,12 @@
     es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, spark }:
     melpaBuild {
         pname = "es-mode";
-        version = "20170705.2002";
+        version = "20170724.1307";
         src = fetchFromGitHub {
           owner = "dakrone";
           repo = "es-mode";
-          rev = "61a8bf7d6cc6881e5555922eb36eecc6733a2b87";
-          sha256 = "0anc7bdar2q5c41ilah3p04p4z3mxkqlv91nkky72i58sgrw6za6";
+          rev = "28f06589e07a22b7a1a1b19f79472c0bafb5fc32";
+          sha256 = "0413706dxmql9sl2rwi7y9pqdka73lnpqwn5cvl2y4r279hdppv3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9912193f73c4beae03b295822bf41cb2298756e2/recipes/es-mode";
@@ -20234,12 +20192,12 @@
     ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "ess";
-        version = "20170710.118";
+        version = "20170725.59";
         src = fetchFromGitHub {
           owner = "emacs-ess";
           repo = "ESS";
-          rev = "064174931f0cbf91ad24fda883909a06eee10f6e";
-          sha256 = "0f6ikmgcakaa74p271nfkg55gbq2wxdjq978h8kp7x7vaczfjz0n";
+          rev = "a313565f97badfefb289672af45df6311060eef3";
+          sha256 = "15zy6hjfpwkacxc11ws76w7ynwl4m2qqlh84xq3nifg2zpl4cns6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess";
@@ -20360,12 +20318,12 @@
     esup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "esup";
-        version = "20170508.1536";
+        version = "20170724.2348";
         src = fetchFromGitHub {
           owner = "jschaf";
           repo = "esup";
-          rev = "efaf44d0739391aed48c77b5cd3013b50027ed36";
-          sha256 = "1ddff6scpnljl9h957zx7nahxd6si0gcznkg5da09sa7vpds0732";
+          rev = "86500014ccf9736a731038222d5d2727e428bb6c";
+          sha256 = "03kblqlh9q2i3zmlj97wi0m93df3c799njlb6gpjl7ml6qfj4qf7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9d2948a42da5d4864404d2d11a924a4f235fc3b/recipes/esup";
@@ -20381,12 +20339,12 @@
     esxml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "esxml";
-        version = "20160703.1417";
+        version = "20170723.1503";
         src = fetchFromGitHub {
           owner = "tali713";
           repo = "esxml";
-          rev = "fd0f0185cd579b00c3d76d2c383cd33fe642bb93";
-          sha256 = "0azwfxzxghxhzwal4al0lngm0w3q035jyvm3wj2aaml2dibsi3pb";
+          rev = "c4646d3a5a274e21efe125ae9f87b9934014e6ad";
+          sha256 = "05r2jhcrzrjna5dnq95gnagjn11bx0ysgbcnn4rffwms09avbwvf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/esxml";
@@ -20528,8 +20486,8 @@
         src = fetchFromGitHub {
           owner = "kaz-yos";
           repo = "eval-in-repl";
-          rev = "d96a134abe65c736bfaf0a78d1f899ea7cf0fee5";
-          sha256 = "00ilv46ybpw5arfqi3pk7gjabkac76siqpgj3ca47s6vlmz41anv";
+          rev = "b21c5f0da65973d542952ab86e001b777c5f3447";
+          sha256 = "15zd9vqjh89lhy9h6kbhrm5m5394zfzma3xdcfp1dmk8v7384py8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0bee5fb7a7874dd20babd1de7f216c5bda3e0115/recipes/eval-in-repl";
@@ -20605,6 +20563,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    eve-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, polymode }:
+    melpaBuild {
+        pname = "eve-mode";
+        version = "20170724.1408";
+        src = fetchFromGitHub {
+          owner = "witheve";
+          repo = "emacs-eve-mode";
+          rev = "16de9c42393f687446dd9ffd36fcc7428437bf7f";
+          sha256 = "0xpga18zw78v7wqxmfsv00s2r5rwil0khqjjkm867gk20954j7zh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e0f197adfe64ef88d90d24dfd6532bf52a5bce0d/recipes/eve-mode";
+          sha256 = "1ch50bm452g8k1xnqcbpmpwkmg8amzv7bq0hphk3y0kiqkwd1gdh";
+          name = "eve-mode";
+        };
+        packageRequires = [ emacs markdown-mode polymode ];
+        meta = {
+          homepage = "https://melpa.org/#/eve-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "evil";
@@ -20612,8 +20591,8 @@
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil";
-          rev = "dc936936666595afdbdbb4cc44c1f82e74c6802c";
-          sha256 = "0l0sjrfpp5xk5c74gryh1sf9hpv8qkykdwg59vzsmn0w9ii217p5";
+          rev = "a0b6afcf3993f2edcce39052403220a10e74f362";
+          sha256 = "0qswzjxm91s34x32xa61ypwr2fc7cgjaj1wnlgqznxyzjqvdh709";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil";
@@ -20692,12 +20671,12 @@
     evil-cleverparens = callPackage ({ dash, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit, smartparens }:
     melpaBuild {
         pname = "evil-cleverparens";
-        version = "20160611.904";
+        version = "20170717.2113";
         src = fetchFromGitHub {
           owner = "luxbock";
           repo = "evil-cleverparens";
-          rev = "82c920ba04accfd31fa292e11c454d5112b4fd51";
-          sha256 = "0ajy5kp2asrg070vzyzgyqs9jnzglm7lvx8fqvgdhpmhzzfckhbi";
+          rev = "8c45879d49bfa6d4e414b6c1df700a4a51cbb869";
+          sha256 = "0lhnybpnk4n2yhlcnj9zxn0vi5hpjfaqfhvyfy7ckzz74g8v7iyw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e3b3637d6527b16ea0d606fd87b01004be446b09/recipes/evil-cleverparens";
@@ -20818,12 +20797,12 @@
     evil-ediff = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-ediff";
-        version = "20170623.707";
+        version = "20170724.1223";
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil-ediff";
-          rev = "862310e244d406751cdc7eae8e8c0d88414a48c7";
-          sha256 = "0088xgvzsy3rmdkw6r90vnxgsxr9mmqkwaw18m9bm4fivday75b0";
+          rev = "67b0e69f65c196eff5b39dacb7a9ec05bb919c74";
+          sha256 = "0f8g07fyzyc8pdwizyj62v0dy65ap885asph83529y0j8wnni8ps";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/50315ec837d2951bf5b2bb75809a35dd7ffc8fe8/recipes/evil-ediff";
@@ -20965,12 +20944,12 @@
     evil-goggles = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-goggles";
-        version = "20170710.724";
+        version = "20170724.211";
         src = fetchFromGitHub {
           owner = "edkolev";
           repo = "evil-goggles";
-          rev = "902270eea80594577d9af26298998406f79e59a0";
-          sha256 = "11v1zpi3jnsxdwhxv441rvbkyb6v1sg4zyk74aw14l5cf38f0d55";
+          rev = "879114abeaad8515937cb2a762d0438b6b7bb026";
+          sha256 = "0zia2z0nvsxmplg1d6dy45dj5pkvak2wqn7dw10yb9bj0shfhjmv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/811b1261705b4c525e165fa9ee23ae191727a623/recipes/evil-goggles";
@@ -21175,12 +21154,12 @@
     evil-matchit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-matchit";
-        version = "20170713.647";
+        version = "20170719.702";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "evil-matchit";
-          rev = "2fc961d94b27e528df1fc4b88d297dd9af8ed6d6";
-          sha256 = "16fk050q8ibdp4n5fflcz2scsbky7dg1kf97c28f1gszixp6yng0";
+          rev = "bed39041b1181ec26cf2601a8a7aa4afe2510f5b";
+          sha256 = "0b1gl5mhl8w63rhx4bbr69cklgz630038lxpjb4nl6h8yl41pcrp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit";
@@ -21343,12 +21322,12 @@
     evil-org = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "evil-org";
-        version = "20170622.1310";
+        version = "20170724.752";
         src = fetchFromGitHub {
           owner = "Somelauw";
           repo = "evil-org-mode";
-          rev = "975109dc665f53cef221b3c668612664340b7940";
-          sha256 = "0fr0wxd53a0lv2akvayi844fncn8klj88hmld73x2d1igig38p4q";
+          rev = "fc21477b2ac12b570c8428808f334d467a617e86";
+          sha256 = "0fqk11mq4l7q7c5dv8049pmsggh3cmy4fhhq7c6h36dij02fkf01";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1768558ed0a0249421437b66fe45018dd768e637/recipes/evil-org";
@@ -22840,12 +22819,12 @@
     find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "find-file-in-project";
-        version = "20170531.2054";
+        version = "20170725.133";
         src = fetchFromGitHub {
           owner = "technomancy";
           repo = "find-file-in-project";
-          rev = "a6e59891973f3e40ca2e414ca66799cc686d8626";
-          sha256 = "16wxw5bxb3nmw6glx2iqcfr75fsya1a9kxd6khv46zy5z85n1bng";
+          rev = "2d3e8d095e0c36f927142e80c4330977be698568";
+          sha256 = "1phj6a6ydc8hzv1f1881anyccg1jkd8dh6g229ln476i5y6wqs5j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@@ -23470,12 +23449,12 @@
     floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "floobits";
-        version = "20170416.1718";
+        version = "20170725.127";
         src = fetchFromGitHub {
           owner = "Floobits";
           repo = "floobits-emacs";
-          rev = "fdac635ecc57ac7743f74678147aca2e956561de";
-          sha256 = "134b5ss249x06bgqvsxnlcfys7nl8aid42s7ln8pamxrc3prfcc1";
+          rev = "76c869f439c2d13028d1fe8cae486e0ef018e4b0";
+          sha256 = "0f0i5zzl8njrwspir1wnfyrv9q8syl2izhyn2j9j9w8wyf5w7l1b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/95c859e8440049579630b4c2bcc31e7eaa13b1f1/recipes/floobits";
@@ -23596,12 +23575,12 @@
     flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
     melpaBuild {
         pname = "flycheck";
-        version = "20170715.1345";
+        version = "20170723.839";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck";
-          rev = "b78d5a6f48c2ebd4298cf33c3364c63d86ae32cc";
-          sha256 = "14mp95k9365869fikzsvxha74121kbcrwp0pavv17calf29ycxck";
+          rev = "35c0ce171dc7127d85a745d922b233544c41040b";
+          sha256 = "0084lk692l6lxz82k242v2gwp6bdv5yjv5xvn3ra43x2d7mx4zz1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -23932,12 +23911,12 @@
     flycheck-cython = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-cython";
-        version = "20160327.1228";
+        version = "20170724.258";
         src = fetchFromGitHub {
           owner = "lbolla";
           repo = "emacs-flycheck-cython";
-          rev = "45097658a16eeabf2bd5e0464355f8f37a1aeffc";
-          sha256 = "0994346iyp7143476i3y6pc5m1n6z7g1r6n1rldivsj0qr4gjh01";
+          rev = "ecc4454d35ab5317ab66a04406f36f0c1dbc0b76";
+          sha256 = "1v17skw0wn7a7nkc1vrs0bbzihnjw0dwvyyd0lydsihzxl5z2r5g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d963eb1b8f8f863b37a96803b00d395e9d85e94/recipes/flycheck-cython";
@@ -24713,8 +24692,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "65c8f03ff0112ce5c5e11aff6867ad0eb9019e63";
-          sha256 = "0xlacwjmvx5xd8m7yi8l8mqi0lqs2gr2hmjag2frvmxcn4cpb4gc";
+          rev = "afbf59630203624e0a5eecee52a3296295e6d620";
+          sha256 = "0bygl7ahwsz6xmw0fif7gqnpzbk8cx7hpg4gp96f8inicq849z26";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
@@ -24923,8 +24902,8 @@
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "35e8a31e32d0de890547612db8373d7333db8d8a";
-          sha256 = "023bkmviaqb85kwwlpmzfc5gycf4i7w8a43zhbmvasfjjb962yzd";
+          rev = "5c3e07b46e4c25bbd0a2068a5091c8f27b344da6";
+          sha256 = "04nb5cjlghkk47a0girnlxlcrclylhg1zx41q5lcvnzb1is06skh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd";
@@ -24940,12 +24919,12 @@
     flymake-coffee = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
     melpaBuild {
         pname = "flymake-coffee";
-        version = "20140809.324";
+        version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "flymake-coffee";
-          rev = "325ab379592fdf9017d7c19625c7a978f6f3af3b";
-          sha256 = "10i0rbvk6vyifgbgskdyspmw9q64x99fzi8i1h8bgv58xhfx6pm7";
+          rev = "dee295acf30820ed15fe0de17137d50bc27fc80c";
+          sha256 = "0706jbi3jcmffxmcpvh8w3007q8sh48kgrcjip5c9hhfqpagayld";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-coffee";
@@ -24982,12 +24961,12 @@
     flymake-css = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
     melpaBuild {
         pname = "flymake-css";
-        version = "20121104.1104";
+        version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "flymake-css";
-          rev = "4649fc209836498d709bb627e8aa6e50189a06ec";
-          sha256 = "00cnz3snhs44aknq6wmf19hq9bzb5pj0hvfzz93l6n7ngd8vvpzy";
+          rev = "de090163ba289910ceeb61b13368ce42d0f2dfd8";
+          sha256 = "18rqzah8p7mqwkddaav1d4r146amvn8jppazvsvc5vs01syj83m9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-css";
@@ -25129,12 +25108,12 @@
     flymake-haml = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
     melpaBuild {
         pname = "flymake-haml";
-        version = "20130324.351";
+        version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "flymake-haml";
-          rev = "3117d94ecad908710502e8def42dbae5748e9c1d";
-          sha256 = "08rcsg76qdq2l6z8q339yw770kv1q657ywqvq6a20pxxz2158a8l";
+          rev = "22a81e8484734552d461e7ae7305664dc244447e";
+          sha256 = "0pgp2gl3wdwrzcik5b5csn4qp8iv6pc51brx8p7jrwn7bz4lkb82";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-haml";
@@ -25150,12 +25129,12 @@
     flymake-haskell-multi = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
     melpaBuild {
         pname = "flymake-haskell-multi";
-        version = "20130620.422";
+        version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "flymake-haskell-multi";
-          rev = "6183620ffee429b33c886fffd6106b876245ea47";
-          sha256 = "0hwcgas83wwhk0szwgw7abf70400knb8dfabknwv0qrcsk4gqffd";
+          rev = "b564a94312259885b1380272eb867bf52a164020";
+          sha256 = "1h21hy5fjwa5qxl31rq3jjp3wwkipdwaliq0ci184rw48kw51xjh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e879eca5eb11b2ae77ee2cb8d8150d85e9e93ebd/recipes/flymake-haskell-multi";
@@ -25171,12 +25150,12 @@
     flymake-hlint = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
     melpaBuild {
         pname = "flymake-hlint";
-        version = "20130309.145";
+        version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "flymake-hlint";
-          rev = "fae0c16f938129fb933e4c4625287816e8e160f0";
-          sha256 = "003fdrgxlyhs595ndcdzhmdkcpsf9bpw53hrlrrrh07qlnqxwrvp";
+          rev = "f910736b26784efc9a2fa29503f45c1f1dd0aa38";
+          sha256 = "157f2l6hllwl12h8f502rq2kl33s202k9bcyfy2cmnn6vhky1b8s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17820f32d46e845cc44b237d0bfd5c2d898721de/recipes/flymake-hlint";
@@ -25213,12 +25192,12 @@
     flymake-jslint = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
     melpaBuild {
         pname = "flymake-jslint";
-        version = "20130613.202";
+        version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "flymake-jslint";
-          rev = "68ca28a88cffdd317f50c712b09abd2ccda8d7bc";
-          sha256 = "0y01albwwcnhj4pnpvcry0zw7z2g9py9q2p3sw5zhgw3g0v5p9ls";
+          rev = "8edb82be605542b0ef62d38d818adcdde335eecb";
+          sha256 = "0i6bqpbibsbqhpqfy9zl0awiqkmddi3q8xlrslcjd429f0g5f1ad";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-jslint";
@@ -25234,12 +25213,12 @@
     flymake-json = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
     melpaBuild {
         pname = "flymake-json";
-        version = "20130423.2357";
+        version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "flymake-json";
-          rev = "36084b67830bdc6c226115ea8287ea88d14b05dd";
-          sha256 = "1qn15pr7c07fmki484z5xpqyn8546qb5dr9gcp5n1172wnh2a534";
+          rev = "d43e62fab69c4c39f54f1057c9801a3e645de619";
+          sha256 = "1zlhxl7x754p4bxipklvz0gjqlwg9c8fiyv7rxdkfaxdzpf9a6zm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/acb0a4d29159aa6d74f754911f63152dac3425bd/recipes/flymake-json";
@@ -25318,12 +25297,12 @@
     flymake-php = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
     melpaBuild {
         pname = "flymake-php";
-        version = "20121104.1102";
+        version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "flymake-php";
-          rev = "93abe12d62b13f1d035a0df01e53e4bacdac2c66";
-          sha256 = "09mibjdji5mf3qvngspv1zmik1zd9jwp4mb4c1w4256202359sf4";
+          rev = "c045d01e002ba5e09b05f40e25bf5068d02126bc";
+          sha256 = "03fk8kzlwbs9k91ra91r7djxlpv5mhbha33dnyz50sqwa52cg8ck";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-php";
@@ -25381,12 +25360,12 @@
     flymake-python-pyflakes = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
     melpaBuild {
         pname = "flymake-python-pyflakes";
-        version = "20131127.6";
+        version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "flymake-python-pyflakes";
-          rev = "f09ec573d7580a69f8bd49778c26da9ab6d5ec5a";
-          sha256 = "1aijapvpw4skfhfmz09v5kpaxay6b0bp77bbjkrvgyizsqdd39vp";
+          rev = "1d65c26bf65a5dcbd29fcd967e2feb90e1e7a33d";
+          sha256 = "0hsvw6rxg3k1ymrav0bf5q3siqr9v2jp4c4h1f98szrj2lp200fm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/49091c0eca4158b80269b6ff5f7f3fc8e981420b/recipes/flymake-python-pyflakes";
@@ -25402,12 +25381,12 @@
     flymake-ruby = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
     melpaBuild {
         pname = "flymake-ruby";
-        version = "20121104.1059";
+        version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "flymake-ruby";
-          rev = "8dc4ca44ec2acfaab25f5501fca1bd687fae94f2";
-          sha256 = "13yk9cncp3zw6d7zkgdpgprpw6wrirk2gxgjvkr15dwcyx1g3109";
+          rev = "6c320c6fb686c5223bf975cc35178ad6b195e073";
+          sha256 = "0hzyxhg6y1rknvgj2ycivwrlrw7fznw9jrin5n9z627mzpjpfcnk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-ruby";
@@ -25444,12 +25423,12 @@
     flymake-sass = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
     melpaBuild {
         pname = "flymake-sass";
-        version = "20140308.325";
+        version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "flymake-sass";
-          rev = "748f13caa399c27c41ba797da9e214b814f5a30f";
-          sha256 = "0rwjiplpqw3rrh76llnx2fn78f6avxsg0la5br46q1rgw4n8r1w1";
+          rev = "2de28148e92deb93bff3d55fe14e7c67ac476056";
+          sha256 = "05v83l05knqv2inharmhjvzmjskjlany7dnwp5dz44bvy0jhnm39";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-sass";
@@ -25465,12 +25444,12 @@
     flymake-shell = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
     melpaBuild {
         pname = "flymake-shell";
-        version = "20121104.1100";
+        version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "flymake-shell";
-          rev = "ec097bd77db5523a04ceb15a128e01689d36fb90";
-          sha256 = "0c2lz1p91yhprmlbmp0756d96yiy0w92zf0c9vlp0i9abvd0cvkc";
+          rev = "a16cf453056b9849cc7c912bb127fb0b08fc6dab";
+          sha256 = "1ki0zk5ijfkf4blavl62b55jnjzxw2b7blaxg51arpvvbflqmmlh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-shell";
@@ -26072,12 +26051,12 @@
     foreman-mode = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "foreman-mode";
-        version = "20160520.737";
+        version = "20170725.722";
         src = fetchFromGitHub {
           owner = "zweifisch";
           repo = "foreman-mode";
-          rev = "bc6e2aca5a66847b13200b85172f7d7a36807d32";
-          sha256 = "0pp68kqg2impar6rhlpifixx0lqgkcrj6ncjn5jlids6vfhq23nd";
+          rev = "22b3bb13134b617870ed1e888af739f4818be929";
+          sha256 = "01qanhif24czcmhpdfkcjs019ss4r79f7y2wfbzmj6w4z7g3rikk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/edeeb2b52ac70f8bdad38d3af62a7e434853c504/recipes/foreman-mode";
@@ -26516,12 +26495,12 @@
     fstar-mode = callPackage ({ company, company-quickhelp, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, quick-peek, yasnippet }:
     melpaBuild {
         pname = "fstar-mode";
-        version = "20170531.1958";
+        version = "20170725.829";
         src = fetchFromGitHub {
           owner = "FStarLang";
           repo = "fstar-mode.el";
-          rev = "c9a9d722848dfc3f37ac9e0e91603340e5f5df1e";
-          sha256 = "0faf8796vvfi2g4kmh7xsnc08m3iyldgcivslq0xy86ndh682f06";
+          rev = "9e2ddf0c32edb8c7726daf636876f01e1fd2f757";
+          sha256 = "170ffm6mybp0cs3962cpq281fg67vxcfx22nl9q9vrlk7rwlrqz0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c58ace42342c3d3ff5a56d86a16206f2ecb45f77/recipes/fstar-mode";
@@ -26548,8 +26527,8 @@
         version = "20170709.139";
         src = fetchgit {
           url = "git://factorcode.org/git/factor.git";
-          rev = "9adddfc5e5666febc2f98b230e4a7d2b4c02ce0b";
-          sha256 = "1ya7ghnclgcwha2cgi37z627q257xxd8c3igfl12k22ix4l5wr37";
+          rev = "154de53470720c57da4f57a64f4adb6bf669b59c";
+          sha256 = "1wrc48xd2brqr97zphn11sikhlbalhi1fh59azi85ri47y1yvvij";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
@@ -26674,8 +26653,8 @@
         src = fetchFromGitHub {
           owner = "HIPERFIT";
           repo = "futhark";
-          rev = "dbc4ae1b8c977435d5369b18e1b624a62f8e8b13";
-          sha256 = "0h7244567anfrfm2wpkvy0g6bnczisv03rz2ipr35pqm3gf7hyh8";
+          rev = "4e1a7ed0e47da1c33dc5a20ba22cb604ebdef0c7";
+          sha256 = "1wyk6fh58s675j3rr74lk358q3nlx9rlkq0bs8qkix11y93asp7j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@@ -27193,8 +27172,8 @@
         src = fetchFromGitHub {
           owner = "DanielG";
           repo = "ghc-mod";
-          rev = "d867cd0fee3fdb4e93440d96506c522de743aec6";
-          sha256 = "0k615c7fvabs2y28kf0w3j8y3chqsbcdizv5z9jyf3519svb5sxn";
+          rev = "3d9a3398691cb4cf476896994ab0e5640c69742f";
+          sha256 = "0w53xj2hlr1nc4sahxgajjl23zsqjjcvsfpafhkhszgprbjdjh31";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc";
@@ -27315,12 +27294,12 @@
     ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ghub";
-        version = "20170702.512";
+        version = "20170725.1200";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "ghub";
-          rev = "16c3300bb5d82b141aefa94c47ad9f97a58b0011";
-          sha256 = "1w1cqz32rx4i4hcjkz2znlchp5h4xg74znm9819k4anlf635lshd";
+          rev = "8f81a2aa0b2aaca55e92f7a78944f9d80296f405";
+          sha256 = "03rd2f5zs95ld56jzq70y6jb0r21q2qhkndi2jrbic1fknfviiqh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9375cbae3ffe5bf4ba5606358860050f3005d9b7/recipes/ghub";
@@ -27529,8 +27508,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "33201f76c27d21e91c2137aa5f19db18b2adb2e5";
-          sha256 = "0749yvycd66ddg1wzzyzv8d2z6rxhlrizn83q0gm1zbz296s7rkb";
+          rev = "4f0046012cc4783e7ec31e757e07d338c931a6e3";
+          sha256 = "0lziv48xw065p6iwagraff2477dm3qldjbf6xfd2iqqwm7kfhd48";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -28110,6 +28089,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    gitpatch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gitpatch";
+        version = "20170721.2110";
+        src = fetchFromGitHub {
+          owner = "tumashu";
+          repo = "gitpatch";
+          rev = "577d5adf65c8133caa325c10e89e1e2fc323c907";
+          sha256 = "1jj12pjwza6cq8a3kr8nqnmm3vxs0wam8h983irry4xr4ifywsn4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e1746d87f65dc4b0d8f47c7d6ba4c7e0dfa35953/recipes/gitpatch";
+          sha256 = "0qaswkk06z24v40nkjkv7f6gfv0dlsjd6wchkn0ppqw95883vhv1";
+          name = "gitpatch";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/gitpatch";
+          license = lib.licenses.free;
+        };
+      }) {};
     gitter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "gitter";
@@ -28425,6 +28425,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    gnus-select-account = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gnus-select-account";
+        version = "20170721.2211";
+        src = fetchFromGitHub {
+          owner = "tumashu";
+          repo = "gnus-select-account";
+          rev = "ddc8c135eeaf90f5b6692a033af2badae36e68ce";
+          sha256 = "0csq8cqv028g3mrvk88l0nlj3dk5fh67c10hdjwvxbf7winv0391";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e1746d87f65dc4b0d8f47c7d6ba4c7e0dfa35953/recipes/gnus-select-account";
+          sha256 = "1yini6kif7vp5msmhnnpfkab5m5px8y4wgvc0f0k79kdd17gvpsx";
+          name = "gnus-select-account";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/gnus-select-account";
+          license = lib.licenses.free;
+        };
+      }) {};
     gnus-spotlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "gnus-spotlight";
         version = "20130901.735";
@@ -28678,12 +28699,12 @@
     go-guru = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "go-guru";
-        version = "20170501.1058";
+        version = "20170718.1046";
         src = fetchFromGitHub {
           owner = "dominikh";
           repo = "go-mode.el";
-          rev = "bfe7a14e9bf957d050e3c429156e697bb3670f21";
-          sha256 = "1w4bwwvpfiw84cr6fxbgl2j8shd9i1lzsfbvvq16cm4dd0q23snn";
+          rev = "2d1d33aee33a5cc088a8f51057464b7cd738cbdd";
+          sha256 = "0ck7yj843y7bwc2y772zaan1g9m2zdjmq9pjpsva1z4x3p3c821g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-guru";
@@ -28720,12 +28741,12 @@
     go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "go-mode";
-        version = "20170308.1512";
+        version = "20170725.402";
         src = fetchFromGitHub {
           owner = "dominikh";
           repo = "go-mode.el";
-          rev = "bfe7a14e9bf957d050e3c429156e697bb3670f21";
-          sha256 = "1w4bwwvpfiw84cr6fxbgl2j8shd9i1lzsfbvvq16cm4dd0q23snn";
+          rev = "2d1d33aee33a5cc088a8f51057464b7cd738cbdd";
+          sha256 = "0ck7yj843y7bwc2y772zaan1g9m2zdjmq9pjpsva1z4x3p3c821g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-mode";
@@ -28808,8 +28829,8 @@
         src = fetchFromGitHub {
           owner = "dominikh";
           repo = "go-mode.el";
-          rev = "bfe7a14e9bf957d050e3c429156e697bb3670f21";
-          sha256 = "1w4bwwvpfiw84cr6fxbgl2j8shd9i1lzsfbvvq16cm4dd0q23snn";
+          rev = "2d1d33aee33a5cc088a8f51057464b7cd738cbdd";
+          sha256 = "0ck7yj843y7bwc2y772zaan1g9m2zdjmq9pjpsva1z4x3p3c821g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d806abe90da9a8951fdb0c31e2167bde13183c5c/recipes/go-rename";
@@ -29352,8 +29373,8 @@
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "0b533caa1ca0c4412748bde65753fa8c55ba4511";
-          sha256 = "14lkhny4s6kmybx7w9hi11bnyvg7imyxnirdk28rb19krj2n7b36";
+          rev = "8ab1a62d9c0873b8a25404c52928be2358b78963";
+          sha256 = "0y86g43g2bngca7f3vznw4swwc778mcm0kfiqn3b18ibppvzrph7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -29478,8 +29499,8 @@
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "1ddbda527268b33f506b50254234fec9bfdcbc9c";
-          sha256 = "0qm73a87cydffyqkvjv34k7yss010czl861dhf3cnabvsz0bsp7v";
+          rev = "85fb30df520f55e32aeb92af4e1d7c801300c99e";
+          sha256 = "1iz17qv561x6w67r222ya0ig1dplb17ygvy8r3hyh20ijjdq733n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode";
@@ -29838,12 +29859,12 @@
     groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "groovy-mode";
-        version = "20170712.224";
+        version = "20170724.535";
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "1ddbda527268b33f506b50254234fec9bfdcbc9c";
-          sha256 = "0qm73a87cydffyqkvjv34k7yss010czl861dhf3cnabvsz0bsp7v";
+          rev = "85fb30df520f55e32aeb92af4e1d7c801300c99e";
+          sha256 = "1iz17qv561x6w67r222ya0ig1dplb17ygvy8r3hyh20ijjdq733n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode";
@@ -29859,12 +29880,12 @@
     gruber-darker-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gruber-darker-theme";
-        version = "20170716.647";
+        version = "20170719.2229";
         src = fetchFromGitHub {
           owner = "rexim";
           repo = "gruber-darker-theme";
-          rev = "3e5d5d67f8b004db288d6c2e1a0b02c3844ab5c5";
-          sha256 = "1az7fndm19wy8s3p6wxa0ps55amwmmpbschayzy3g3g26a4swcxi";
+          rev = "8e6bb26ce0abe20e6129ae8c8ad5c41e0832334e";
+          sha256 = "1dxlpyc4w6ys08ir2bivv9lhjpwfjlh3wczmr0r03pc1fqx0w2ap";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/87ade74553c04cb9dcfe16d03f263cc6f1fed046/recipes/gruber-darker-theme";
@@ -29901,12 +29922,12 @@
     gruvbox-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gruvbox-theme";
-        version = "20170712.1607";
+        version = "20170718.741";
         src = fetchFromGitHub {
           owner = "Greduan";
           repo = "emacs-theme-gruvbox";
-          rev = "a3aafd33d9b027e6c0d5ef81ebb04a2bb8545cf2";
-          sha256 = "1d9330yd2lch7yqlfvpv7gxyy00p4w9h6f0imn7bgj3y7wab20dw";
+          rev = "21c1673622ba160bcf8cfdb0f066567b388b2960";
+          sha256 = "1bh04nvaxphvfq7fgd53zd5k00gg35hldbida1ikw42pwkch3zk8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme";
@@ -30069,12 +30090,12 @@
     gulp-task-runner = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gulp-task-runner";
-        version = "20161103.1523";
+        version = "20170718.1341";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "gulp-task-runner";
-          rev = "f13da9e619c1838571df0a0462c273ed6e76defc";
-          sha256 = "1xai81v7c58hy9rh63kxybzmlyfkv0m7qfdp7zia60ml5xhib31r";
+          rev = "877990e956b1d71e2d9c7c3e5a129ad199b9debb";
+          sha256 = "13qy4x4ap43qm5w2vrsy6w01z2s2kymfr9qvlj2yri4xk3r4vrps";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/34a2bede5ea70cf9df623c32e789d78205f9ebb0/recipes/gulp-task-runner";
@@ -30821,12 +30842,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20170714.3";
+        version = "20170724.2137";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "07f8f705f54506da537b1f615ee2e95e9033defb";
-          sha256 = "0g7fn2aqwh0ynsridrmf8gs5bl09s7pwpwawgmbwdb7rzyvrl97c";
+          rev = "9e803b5a4a431b386966ea1b2a303003d7869375";
+          sha256 = "0x797xy6p1b74zkqcdrf10kwp1ypjvkypayd070qh1sfjnrng4mf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -31430,12 +31451,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20170717.520";
+        version = "20170725.419";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "07f8f705f54506da537b1f615ee2e95e9033defb";
-          sha256 = "0g7fn2aqwh0ynsridrmf8gs5bl09s7pwpwawgmbwdb7rzyvrl97c";
+          rev = "9e803b5a4a431b386966ea1b2a303003d7869375";
+          sha256 = "0x797xy6p1b74zkqcdrf10kwp1ypjvkypayd070qh1sfjnrng4mf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -31602,8 +31623,8 @@
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-helm-directory";
-          rev = "2c6d45404506ba744888dcdb65e9f63878f2da16";
-          sha256 = "1a5j4zzn249jdm4kcri64x1dxazhhk7g5dmgnhflrnbrc2kdwm8h";
+          rev = "29f05c87046f9a04329f817e9d7489a290a2592a";
+          sha256 = "0dp9s5yicjn91mmrzb15hidf05c8lffpgk2sq23d9x6b9ddnlcl1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d0c066d6f285ab6d572dab4549781101547cb704/recipes/helm-directory";
@@ -32186,12 +32207,12 @@
     helm-google = callPackage ({ fetchFromGitHub, fetchurl, google, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-google";
-        version = "20170509.244";
+        version = "20170722.710";
         src = fetchFromGitHub {
           owner = "steckerhalter";
           repo = "helm-google";
-          rev = "b24de3240b2a46fdf6124e91aa4f684b2370454b";
-          sha256 = "1w48ag2pd462hf238hkdl0i6csvchcsdf3021lnkdy41vwxj1rdg";
+          rev = "4530a375a46880d53e5d7e906028f71c040de946";
+          sha256 = "1xj3q6hyjcqbr3dglcba4impsdgb707zi9w7prpn1m735xhsis01";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/88ed6db7b53d1ac75c40d12c21de1dec6d717fbe/recipes/helm-google";
@@ -32815,12 +32836,12 @@
     helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
     melpaBuild {
         pname = "helm-org-rifle";
-        version = "20170518.312";
+        version = "20170711.2354";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "helm-org-rifle";
-          rev = "61adb8ec3af0b7b87b2f9245510dc8b014d026ed";
-          sha256 = "05zqp6yifc87i22q0p37jl90cfyh5v1bq9ifhpkdy1rs3sgcmnif";
+          rev = "87e00cc5a47b6dae8040ad27d2883f4028cbcfc1";
+          sha256 = "0n7nwpc9wy5p81hbp2b8wzfr040k0xn4ksm9a1fjdl9fg8hvh0pc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle";
@@ -33319,12 +33340,12 @@
     helm-rtags = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, rtags }:
     melpaBuild {
         pname = "helm-rtags";
-        version = "20170522.2154";
+        version = "20170723.2050";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "65c8f03ff0112ce5c5e11aff6867ad0eb9019e63";
-          sha256 = "0xlacwjmvx5xd8m7yi8l8mqi0lqs2gr2hmjag2frvmxcn4cpb4gc";
+          rev = "afbf59630203624e0a5eecee52a3296295e6d620";
+          sha256 = "0bygl7ahwsz6xmw0fif7gqnpzbk8cx7hpg4gp96f8inicq849z26";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
@@ -33760,12 +33781,12 @@
     helm-xref = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-xref";
-        version = "20170425.1440";
+        version = "20170725.546";
         src = fetchFromGitHub {
           owner = "brotzeitmacher";
           repo = "helm-xref";
-          rev = "cd458044be2cec95f31f0ac318b0f80f4b92785b";
-          sha256 = "0lx2xrkwrbzkbs26gwksdqpywcsfsi3d4g2mw1h8aabd12hnr4my";
+          rev = "3197a66a605afa42957781cc7f97f6c614ecf02a";
+          sha256 = "0nr4yg44qqr5ga8h1hc143953iyyswp2l9bfb5b5wwwzz42iz5cx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f39f3d09a8f00d0358653631a8643b6dd71a9bd1/recipes/helm-xref";
@@ -33880,12 +33901,12 @@
     helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "helpful";
-        version = "20170625.1441";
+        version = "20170722.522";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "helpful";
-          rev = "da7d479c89090155996bf568bd89fa8a8859eac7";
-          sha256 = "1vpfb6n1k7j8wmzsn3j2a8g2hf6lxc8jp77xgzi3kd0wwdyjmqg2";
+          rev = "d167ee6fd4fbaadc46aa50a96529dc234a4c37c2";
+          sha256 = "04r090757jcaljr0bfvxjm45wf201cn04cr467ryh9k92gravlfj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful";
@@ -34702,12 +34723,12 @@
     hippie-expand-slime = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hippie-expand-slime";
-        version = "20170317.0";
+        version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "hippie-expand-slime";
-          rev = "ed6c91a0600550788dc78a3ab32040ac28f7c8d4";
-          sha256 = "0nqrz1wmg84xk08mi5w8h9mrymr23v8i39s2kdqsrmn6qpw37fpl";
+          rev = "39bbae94896a62854d31754debdfae71d35fec62";
+          sha256 = "1l2j5k4jk8jpm1vdf0z5zwa287859afsgd3gda778sdsiy38l6r7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/hippie-expand-slime";
@@ -34744,12 +34765,12 @@
     historian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "historian";
-        version = "20170715.2142";
+        version = "20170722.1714";
         src = fetchFromGitHub {
           owner = "PythonNut";
           repo = "historian.el";
-          rev = "d42321d2af89c6f9f932b70944dd315a6bb42bfa";
-          sha256 = "04lpnm56kkbs388z61sil0zmb1zxzkh1svzbhghcw3836fgm24kd";
+          rev = "78ec5632e4f4fd005014bd762c4a5ccdeabbd33d";
+          sha256 = "1ag9hpxrzg5add4nj2j08ymxrggnzdzqb8k1vcpkd8rg72138k3w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f16dacf64c52767c0c8aef653ac5d1a7a3bd0883/recipes/historian";
@@ -35660,12 +35681,12 @@
     hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hydra";
-        version = "20170325.815";
+        version = "20170722.818";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "hydra";
-          rev = "38ce88a9c3be11b0431080078095159b2211ca7a";
-          sha256 = "0hja61lxhnkl0mpq3fj46pmd9pp85ncdzvgzc1dy82a48sib92dj";
+          rev = "943636fe4a35298d9d234222bc4520dec9ef2305";
+          sha256 = "0ln4z2796ycy33g5jcxkqvm7638qxy4sipsab7d2864hh700cikg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra";
@@ -35763,12 +35784,12 @@
     ibuffer-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "ibuffer-projectile";
-        version = "20170410.1452";
+        version = "20170721.1823";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "ibuffer-projectile";
-          rev = "a004cd0121ab15a00311631289fc6a8c7a86a897";
-          sha256 = "013yx94q2ffhiqbx9dara7kq76yfmigj4y00zc48rdinclnzb6az";
+          rev = "d99fb0d918f13664856178402efe64b4b237648b";
+          sha256 = "1rlicnrjs8nmha90i9d4z4ps5dskry08rj5sa3ax2igxwbq1z4w5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/363a6a888945f2c8b02f5715539439ba744d737d/recipes/ibuffer-projectile";
@@ -36053,12 +36074,12 @@
     ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ido-completing-read-plus";
-        version = "20170708.1116";
+        version = "20170719.119";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "ido-ubiquitous";
-          rev = "7b7136532ee4af0380f667f19700b53853bbbd7a";
-          sha256 = "0zswh103bynq9fxpspb3ibn9vriw1m4qnp9i44b8a27k3rvbmmjn";
+          rev = "999dd0cc2d88dc82bc4511c6c2b09caf838825b9";
+          sha256 = "0s8r7hm6mz5g4w4qdjichz20nbim2a5rg1njpl11v27pdg2x13p3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-completing-read+";
@@ -36095,12 +36116,12 @@
     ido-exit-target = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ido-exit-target";
-        version = "20150904.737";
+        version = "20170717.1151";
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "ido-exit-target";
-          rev = "322520c665284ce6547eb9dcd3aa888a02a51489";
-          sha256 = "1s93q47cadanynvm1y4y08s68yq0l8q8vfasdk7w39vrjsxxsj3x";
+          rev = "e56fc6928649c87ccf39d56d84ab53ebaced1f73";
+          sha256 = "1a1bcvmihf22kr8rpv6kyp4b7x79hla5qdys48d6kl06m53gyckp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b815e7492eb0bd39c5d1be5a95784f9fe5612b62/recipes/ido-exit-target";
@@ -36368,12 +36389,12 @@
     ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
     melpaBuild {
         pname = "ido-ubiquitous";
-        version = "20170705.1656";
+        version = "20170718.1033";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "ido-ubiquitous";
-          rev = "7b7136532ee4af0380f667f19700b53853bbbd7a";
-          sha256 = "0zswh103bynq9fxpspb3ibn9vriw1m4qnp9i44b8a27k3rvbmmjn";
+          rev = "999dd0cc2d88dc82bc4511c6c2b09caf838825b9";
+          sha256 = "0s8r7hm6mz5g4w4qdjichz20nbim2a5rg1njpl11v27pdg2x13p3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-ubiquitous";
@@ -36452,12 +36473,12 @@
     idris-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, prop-menu }:
     melpaBuild {
         pname = "idris-mode";
-        version = "20170703.2038";
+        version = "20170722.1339";
         src = fetchFromGitHub {
           owner = "idris-hackers";
           repo = "idris-mode";
-          rev = "7de2809515cfb413a7be5fab71d6814d2699e1e3";
-          sha256 = "0v6as33dpqmggmprpimv5rrm7vpfakka5hszz5f5p2k5v212yvk8";
+          rev = "5c01039112a8c52a0275560575f1f542f3966cf5";
+          sha256 = "0r3fbp2c8qhmsnpd63r9fjz1vxjsa054x69d9716pbp1jk3qsjsv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17a86efca3bdebef7c92ba6ece2de214d283c627/recipes/idris-mode";
@@ -36991,12 +37012,12 @@
     indent-tools = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild, s, yafolding }:
     melpaBuild {
         pname = "indent-tools";
-        version = "20170608.647";
+        version = "20170725.735";
         src = fetchFromGitLab {
           owner = "emacs-stuff";
           repo = "indent-tools";
-          rev = "8d2072eef1fdc87e35f7495adfbfa0beb9faf6b7";
-          sha256 = "1hrsmv25q9rpmj8paf3gggw7sp28z1m4gwlx50s64k5mxqa99iy8";
+          rev = "45aa1321674fc111b6cf4398e90c53c27f8274af";
+          sha256 = "1v1x43af69q6crky4l65j649rb35qdxw2gw1ivz6ihsdcwa4dywz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/indent-tools";
@@ -37030,22 +37051,30 @@
           license = lib.licenses.free;
         };
       }) {};
-    indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
+    indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, memoize, seq, sourcemap, websocket }:
     melpaBuild {
         pname = "indium";
-        version = "20170626.312";
+        version = "20170725.1119";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "Indium";
-          rev = "4747a94cf823deb5623368f71f2012f8c5fdc156";
-          sha256 = "11hsyqiy5lcvk721xrv1ihzp9ghdgk46n3qlaviy9alapl0v55d5";
+          rev = "a0feb67bfd035dc0d2f2b6eff12a1af050cb8b1b";
+          sha256 = "1h230lrq3pdmb26930n8ma2h1gqrz0zxzxy38h65khqqkcv37ldv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium";
           sha256 = "024ljx7v8xahmr8jm41fiy8i5jbg48ybqp5n67k4jwg819cz8wvl";
           name = "indium";
         };
-        packageRequires = [ company emacs js2-mode seq websocket ];
+        packageRequires = [
+          company
+          emacs
+          js2-mode
+          memoize
+          seq
+          sourcemap
+          websocket
+        ];
         meta = {
           homepage = "https://melpa.org/#/indium";
           license = lib.licenses.free;
@@ -37075,12 +37104,12 @@
     inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inf-clojure";
-        version = "20170710.708";
+        version = "20170720.2256";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "inf-clojure";
-          rev = "f7ec13ab2fbc36e99df196eb863a75baf3b92fd6";
-          sha256 = "01j4prrs78sq4w7cv15rdilxrqmjam2s1hrwijf6718c0s7dbpd0";
+          rev = "15963caac5791c2e9145cc99e4db8576807eb0ec";
+          sha256 = "088r68rj4ih3mlh4pv986zd4cgs0f32ar27550fxky6kr8197k46";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure";
@@ -37308,8 +37337,8 @@
         src = fetchFromGitHub {
           owner = "emacs-jp";
           repo = "init-loader";
-          rev = "287da99eadfa3dd85492506db43d68324069b593";
-          sha256 = "03a655qzcwizv9hvfcp47466axsrq0h049fdd79xk6zmans5s6fj";
+          rev = "5d3cea1004c11ff96b33020e337b03b925c67c42";
+          sha256 = "17bg4s8yz7yz28m04fp2ff6ld0y01yl99wkn2k5rkg4j441xg3n2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e46e6ec79ff4c76fc85e13321e6dabd5797c5f45/recipes/init-loader";
@@ -37597,12 +37626,12 @@
     intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "intero";
-        version = "20170711.1415";
+        version = "20170721.1851";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "intero";
-          rev = "d03b3cb0cbc8d059a223366c4f7a2be85672c22f";
-          sha256 = "0zga7p2hazcwxjyzgrvq77d3j6q9mz7wz7mkqk0hzf00sdb1gpg9";
+          rev = "aec455424105ddcf8e311acaf880078f7a6d92b3";
+          sha256 = "1a5shx3i7lhplcglrldzhway0w0rhq0h4wb9h835nzmjl2p6lprd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -37825,6 +37854,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    iqa = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "iqa";
+        version = "20170722.834";
+        src = fetchFromGitHub {
+          owner = "a13";
+          repo = "iqa.el";
+          rev = "08e3f70d0a3ed95a0c5675ae88e7966474ecc45a";
+          sha256 = "1n7ghcixk16n6x8p7128mqjfcsalxfyp3asydnijw7qp358l7f9r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a9bd2e952d98f7ac2dc823581b07b65e951e9e45/recipes/iqa";
+          sha256 = "02yrkizk4ssip44s6r62finsrf45hxj9cpil1xrvh8g4jbsmfsw4";
+          name = "iqa";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/iqa";
+          license = lib.licenses.free;
+        };
+      }) {};
     ir-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ir-black-theme";
@@ -37889,12 +37939,12 @@
     irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "irony";
-        version = "20170627.1045";
+        version = "20170725.1249";
         src = fetchFromGitHub {
           owner = "Sarcasm";
           repo = "irony-mode";
-          rev = "bf21cf4c442a930e6007b3ff5bd8af094318991f";
-          sha256 = "02fm2nwhglpb42qa5z2mrfkwqvwc3xvfdi0marlxbg3ramhn4s4i";
+          rev = "d47bc8d94748dbd87fed9bf92cea85e115a39031";
+          sha256 = "1hmrpz8fv8prw5jwipfy56m4fw2sbx14nm251wjva5503bim3lw5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony";
@@ -37951,10 +38001,10 @@
       }) {};
     isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "isearch-plus";
-        version = "20170614.928";
+        version = "20170723.1826";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/isearch+.el";
-          sha256 = "19jk4c39bqbqbfwmhkiwqfij556nv82syy99g07s7gz1bqkrm7pl";
+          sha256 = "0d7xsr71iadqzg81mv17dqyd0bdzkmljxlrpdlpycjyaf3z59aqr";
           name = "isearch+.el";
         };
         recipeFile = fetchurl {
@@ -38179,12 +38229,12 @@
     ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy";
-        version = "20170716.1104";
+        version = "20170725.948";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "dc146d9f1435b79fbfbfa702f0172b9de05f631d";
-          sha256 = "09cfs0rhhb72b12pic2w9chbc000pqnafrl2x0g8v5r065pzp64n";
+          rev = "112c5ba0df7deea11b3e91b5db3990d693eb5b72";
+          sha256 = "0fcskn4v0rx5i04qr40wa8jggsswxxp8g8hk0s4sr447mxbiksbv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -38288,8 +38338,8 @@
         src = fetchFromGitHub {
           owner = "PythonNut";
           repo = "historian.el";
-          rev = "d42321d2af89c6f9f932b70944dd315a6bb42bfa";
-          sha256 = "04lpnm56kkbs388z61sil0zmb1zxzkh1svzbhghcw3836fgm24kd";
+          rev = "78ec5632e4f4fd005014bd762c4a5ccdeabbd33d";
+          sha256 = "1ag9hpxrzg5add4nj2j08ymxrggnzdzqb8k1vcpkd8rg72138k3w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fb79cbc9af6cd443b9de97817d24bcc9050d5940/recipes/ivy-historian";
@@ -38309,8 +38359,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "dc146d9f1435b79fbfbfa702f0172b9de05f631d";
-          sha256 = "09cfs0rhhb72b12pic2w9chbc000pqnafrl2x0g8v5r065pzp64n";
+          rev = "112c5ba0df7deea11b3e91b5db3990d693eb5b72";
+          sha256 = "0fcskn4v0rx5i04qr40wa8jggsswxxp8g8hk0s4sr447mxbiksbv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -38393,8 +38443,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "65c8f03ff0112ce5c5e11aff6867ad0eb9019e63";
-          sha256 = "0xlacwjmvx5xd8m7yi8l8mqi0lqs2gr2hmjag2frvmxcn4cpb4gc";
+          rev = "afbf59630203624e0a5eecee52a3296295e6d620";
+          sha256 = "0bygl7ahwsz6xmw0fif7gqnpzbk8cx7hpg4gp96f8inicq849z26";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
@@ -39080,12 +39130,12 @@
     jenkins = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "jenkins";
-        version = "20170713.702";
+        version = "20170721.236";
         src = fetchFromGitHub {
           owner = "rmuslimov";
           repo = "jenkins.el";
-          rev = "b30d4ef658963b913ca02726f99755c10736fd9d";
-          sha256 = "15yl1j3lrag19vy5k5qymmf6ij0myaiwl5k7z1ij0b70y2qmfx7k";
+          rev = "1ec967973db685c9d84133ec6a5e06489ce06b62";
+          sha256 = "1ai5adv46van2g029x9idj394ycczfacyhyv291sasf8mv9i7j4b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2ed2da33db5eaea1a37f86057da174a45cd37ea5/recipes/jenkins";
@@ -39477,12 +39527,12 @@
     js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "js2-mode";
-        version = "20170716.1313";
+        version = "20170721.602";
         src = fetchFromGitHub {
           owner = "mooz";
           repo = "js2-mode";
-          rev = "b176925c4d8a21e0ed375e13cf6aa04cdf3b4a0e";
-          sha256 = "0ffr8wjqqs7p54hi8wgnd61dm4cs7112j56d8q9ycfmnw0fswyxk";
+          rev = "cb57d9b67390ae3ff70ab64169bbc4f1264244bc";
+          sha256 = "0z7ya533ap6lm5qwfsbhn1k4jh1k1p5xyk5r27wd40rfzvd2x2gy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
@@ -39582,12 +39632,12 @@
     json-mode = callPackage ({ fetchFromGitHub, fetchurl, json-reformat, json-snatcher, lib, melpaBuild }:
     melpaBuild {
         pname = "json-mode";
-        version = "20170619.1701";
+        version = "20170719.2205";
         src = fetchFromGitHub {
           owner = "joshwnj";
           repo = "json-mode";
-          rev = "39ba450ba5dcc72e317e679a0b61d8aa94383966";
-          sha256 = "19qklwzad6qj27jbsms88bbnva4pvl64c89arpf66yjby3hnqbg3";
+          rev = "32d5a9b3319e6797c4d52e7d61a65e5638102ef4";
+          sha256 = "04n68ppxdga5r7mbahiqjkykf3i5simpx91aa8x9h197y5wwi4ww";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/03d0ff6c8d724cf39446fa27f52aa5cc1a3cefb6/recipes/json-mode";
@@ -40082,12 +40132,12 @@
     kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kaolin-theme";
-        version = "20170710.1014";
+        version = "20170725.514";
         src = fetchFromGitHub {
           owner = "0rdy";
           repo = "kaolin-theme";
-          rev = "f2df1b80dfef88d38c5fbf1b9fad96e2091126c3";
-          sha256 = "0anfz9npizaghhvpcvplxsymvv9q3sl7bpiis281p8c7yhrl93h5";
+          rev = "96619e8c330dcb5a0b45bde1fb2a6697729d3541";
+          sha256 = "1i8jk2l703ikmkqb1lf6mvrldb05kfp6gnak26lpc9s7pb4m8mhn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme";
@@ -40590,8 +40640,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "e4a8a4b17cb1ae073afc5df54d9fed9333f1cc72";
-          sha256 = "09z298s699jk76i6yrflplhvdc77flb2qfkzbb55ngmx0ajcf2h6";
+          rev = "c07f97179a02e1bddace948633e4b5b94ccc6ad4";
+          sha256 = "0ad3hkggdvd800cf0hwxa8v5j6c3dvkssy7lrs4yarwzpgaljyjv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -40670,12 +40720,12 @@
     kodi-remote = callPackage ({ elnode, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, melpaBuild, request }:
     melpaBuild {
         pname = "kodi-remote";
-        version = "20170716.1331";
+        version = "20170719.1038";
         src = fetchFromGitHub {
           owner = "spiderbit";
           repo = "kodi-remote.el";
-          rev = "700ea18fdc471ce351d7e2a443572746e8b93496";
-          sha256 = "09qznjadbmspm8n56rk3giyxcf79sxfxpimgn3vkdv09la1mdbb2";
+          rev = "9a8472df0c89af867495541f1265cceccabb1eba";
+          sha256 = "0cw1lnclawc19ianjq0yhf1cnmcfcfv81158zjg9mnv4mgl6hzjl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote";
@@ -40838,12 +40888,12 @@
     ksp-cfg-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ksp-cfg-mode";
-        version = "20160521.1333";
+        version = "20170724.1127";
         src = fetchFromGitHub {
           owner = "lashtear";
           repo = "ksp-cfg-mode";
-          rev = "07a957512e66030e1b9f8ac0f259051386acb5b5";
-          sha256 = "1kbmlhfxbp704mky8v69lzqd20bbnqijfnv110yigsy3kxi7hdrr";
+          rev = "713a22ee28688e581ec3ad60228c853b516a14b6";
+          sha256 = "04r8mfsc349wdhx1brlf2l54v4dn58y69fqv3glhvml12962lwy3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d49db5938fa4e3ab1176a955a4788b15c63d9e69/recipes/ksp-cfg-mode";
@@ -41546,6 +41596,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    letterbox-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "letterbox-mode";
+        version = "20170701.1825";
+        src = fetchFromGitHub {
+          owner = "pacha64";
+          repo = "letterbox-mode";
+          rev = "88c67a51d67216d569a28e8423200883fde096dd";
+          sha256 = "1xzzfr525pn2mj7x6xnvccxhls79bfpi5mqhl9ivisnlgj1bvdjw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1512e20962ea354e4311c0a2696a22576a099ba9/recipes/letterbox-mode";
+          sha256 = "117dj5xzf6givwjyqsciz6axhlcj7xbx0zj91ximm81kb5fswgda";
+          name = "letterbox-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/letterbox-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "leuven-theme";
@@ -41931,12 +42002,12 @@
     lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "lispy";
-        version = "20170707.949";
+        version = "20170723.712";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "7cf7bda344f015750e89719209a49f5991bfdffa";
-          sha256 = "1h4129la499b3x3bz72s5c6bc8i7nvyh2kzxg7ff1h8xnwf1rcp1";
+          rev = "76db06252dbc45b70e55886e00f4efda6a100a8f";
+          sha256 = "1b6869ncq5lixndfyjffk3x4fjk5namxr21k3066q3lph4l26my5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -41952,12 +42023,12 @@
     lispyscript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "lispyscript-mode";
-        version = "20130828.719";
+        version = "20170720.1217";
         src = fetchFromGitHub {
           owner = "krisajenkins";
           repo = "lispyscript-mode";
-          rev = "d0e67ee734919d7ff14c72712e909149cb9604bd";
-          sha256 = "0n0mk01h9c3f24gzpws5xf6syrdwkq4kzs9mgwl74x9l0x904rgf";
+          rev = "def632e3335b0c481fbcf5a17f18b0a8c58dd12f";
+          sha256 = "042nndsrv7kyq20v3lahrpr0x89xyayvhx59i0hx6pvkc9wgk5b6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bf912fa20edc9cff12645381b303e37f2de14976/recipes/lispyscript-mode";
@@ -42374,8 +42445,8 @@
         version = "20150910.644";
         src = fetchgit {
           url = "http://llvm.org/git/llvm";
-          rev = "325ccf1c3d92533f8bc5c48d741d3aa23a6b2542";
-          sha256 = "05cz8jwkidwkzggifccl51daw6vbcy1fgnlwm27ppy933y306xyy";
+          rev = "5b3e8fe6d9709fb676290385ab3861d291574dd4";
+          sha256 = "0jxxm2191in165bpqxm35shhfvcy8zjqakmvyrql0z4yb0ib2shm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode";
@@ -43038,6 +43109,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    mac-pseudo-daemon = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mac-pseudo-daemon";
+        version = "20170722.837";
+        src = fetchFromGitHub {
+          owner = "DarwinAwardWinner";
+          repo = "osx-pseudo-daemon";
+          rev = "4d10e327cd8ee5bb7f006d68744be21c7097c1fc";
+          sha256 = "0rjdjddlkaps9cfyc23kcr3cdh08c12jfgkz7ca2j141mm89pyp2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e89752e595c7cec9488e755c30af18f5f6fc1698/recipes/mac-pseudo-daemon";
+          sha256 = "1kf677j6n7ykw8v5xsvbnnhm3hgjicl8fnf6yz9qw4whd0snrhn6";
+          name = "mac-pseudo-daemon";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/mac-pseudo-daemon";
+          license = lib.licenses.free;
+        };
+      }) {};
     macro-math = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "macro-math";
@@ -43186,12 +43278,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20170711.1307";
+        version = "20170725.1153";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "33201f76c27d21e91c2137aa5f19db18b2adb2e5";
-          sha256 = "0749yvycd66ddg1wzzyzv8d2z6rxhlrizn83q0gm1zbz296s7rkb";
+          rev = "4f0046012cc4783e7ec31e757e07d338c931a6e3";
+          sha256 = "0lziv48xw065p6iwagraff2477dm3qldjbf6xfd2iqqwm7kfhd48";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -43337,6 +43429,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    magit-imerge = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
+    melpaBuild {
+        pname = "magit-imerge";
+        version = "20170724.2157";
+        src = fetchFromGitHub {
+          owner = "magit";
+          repo = "magit-imerge";
+          rev = "b19e5b53553a4d057d944f9a17a2d44f71f20d62";
+          sha256 = "0i8nv28axp4nhh87lh7liimry398mgp038dm0v24b3ly1i4vf0gn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e78a5c27eedfc9b1d79e37e8d333c5d253f31a3c/recipes/magit-imerge";
+          sha256 = "0rycmbsi2s7rjqfpcv794vhkybav7d8ikzdaxai36szxpg9pzhj4";
+          name = "magit-imerge";
+        };
+        packageRequires = [ emacs magit ];
+        meta = {
+          homepage = "https://melpa.org/#/magit-imerge";
+          license = lib.licenses.free;
+        };
+      }) {};
     magit-lfs = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "magit-lfs";
@@ -43386,8 +43499,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "33201f76c27d21e91c2137aa5f19db18b2adb2e5";
-          sha256 = "0749yvycd66ddg1wzzyzv8d2z6rxhlrizn83q0gm1zbz296s7rkb";
+          rev = "4f0046012cc4783e7ec31e757e07d338c931a6e3";
+          sha256 = "0lziv48xw065p6iwagraff2477dm3qldjbf6xfd2iqqwm7kfhd48";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -43466,12 +43579,12 @@
     magit-tbdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "magit-tbdiff";
-        version = "20170627.2023";
+        version = "20170724.2156";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit-tbdiff";
-          rev = "c9522a98bcdafc2d8ef3f3beb9ebe05daa42e577";
-          sha256 = "1nv5a8wfrsh41rvgzi1clwjdr9nc0g5rpgcjs1rvgncn7pjd5pi9";
+          rev = "549b27375b2f834eb86eeae0a8ad5475425cafed";
+          sha256 = "1jhl9afkz4lcwdbp7698pl630259n677jfigaywin2nvv0klb1s7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad97eea866c8732e3adc17551d37a6d1ae511e6c/recipes/magit-tbdiff";
@@ -43673,22 +43786,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    makefile-executor = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, s }:
+    makefile-executor = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "makefile-executor";
-        version = "20170626.533";
+        version = "20170721.13";
         src = fetchFromGitHub {
           owner = "thiderman";
           repo = "makefile-executor.el";
-          rev = "5502f07a13b7d6860715faf70966721a11506b22";
-          sha256 = "1727i7nmm1i0cc8i2c1912irhb9vvk82xb0ac3ypjzi0s22k2fnf";
+          rev = "105f76bce212bfe511eda191366fef9ee45fd1ab";
+          sha256 = "0p6vk0f3qpcpa7fa4q3r6w5a9d0v67gv4khf5jy9g2nc9bz9ai57";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08f8b4d680e4907dbd8ea46a75d98aa0e93c2bb9/recipes/makefile-executor";
           sha256 = "0889rq2a7ks2ynyq91xsa2kpzgd72kzbjxx0b34w8faknpj3b6hi";
           name = "makefile-executor";
         };
-        packageRequires = [ dash emacs f projectile s ];
+        packageRequires = [ dash emacs f s ];
         meta = {
           homepage = "https://melpa.org/#/makefile-executor";
           license = lib.licenses.free;
@@ -43739,12 +43852,12 @@
     malinka = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, rtags, s }:
     melpaBuild {
         pname = "malinka";
-        version = "20170628.151";
+        version = "20170723.1635";
         src = fetchFromGitHub {
           owner = "LefterisJP";
           repo = "malinka";
-          rev = "b8ec090cb57a78265650586f71f00c4c9e054e27";
-          sha256 = "0wii0ylgdci69r1zjcrk7bh68dl25ry63cfwgdii9x217lmbn9qw";
+          rev = "8072d159dae04f0f1a87b117ff03f9f1eb33f6cb";
+          sha256 = "0s5dcm11nw88j1n4asqpm92z0csjv3jvh06f4qqghfvcym8qv44h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/malinka";
@@ -44062,12 +44175,12 @@
     markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "markdown-mode";
-        version = "20170712.1703";
+        version = "20170724.2018";
         src = fetchFromGitHub {
           owner = "jrblevin";
           repo = "markdown-mode";
-          rev = "ea5549233b3ce1536dae3a4793df79971a3781da";
-          sha256 = "1gm76j4w0fv7194dkhky5pxrrwysi4n0n0v0dnl6wp079irc7kcj";
+          rev = "d29cea8534e80acf174ddb6fca7cfe071d84edd0";
+          sha256 = "0lg1cfk0rk6rx5zighr6xjsqga3mn290kll44hzrmaq4zzbfzfa9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode";
@@ -44633,12 +44746,12 @@
     meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "meghanada";
-        version = "20170628.2045";
+        version = "20170723.1724";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "b507fc0e6fa4b6f1b05c46ecf563ad0af69e263a";
-          sha256 = "0kiib5wchqhxm8rsxp3mfp3zdbgg57gbn8y70j5msa2sxdz26mm7";
+          rev = "af65a0c60bbdda051e0d8ab0b7213249eb6703c5";
+          sha256 = "08sxy81arypdj22bp6pdniwxxbhakay4ndvyvl7a6vjvn38ppzw8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -44738,12 +44851,12 @@
     memoize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "memoize";
-        version = "20130421.1234";
+        version = "20170720.1802";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "emacs-memoize";
-          rev = "b55eab0cb6ab05d941e07b8c01f1655c0cf1dd75";
-          sha256 = "0fjwlrdm270qcrqffvarw5yhijk656q4lam79ybhaznzj0dq3xpw";
+          rev = "636defefa9168f90bce6fc27431352ac7d01a890";
+          sha256 = "04qgnlg4x6va7x364dhj1wbjmz8p5iq2vk36mn9198k2vxmijwzk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6cc9be5bbcff04de5e6d3bb8c47d202fd350989b/recipes/memoize";
@@ -44800,10 +44913,10 @@
       }) {};
     menu-bar-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "menu-bar-plus";
-        version = "20170618.1417";
+        version = "20170720.710";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/menu-bar+.el";
-          sha256 = "1ah2yjagpkvwahki81ixviq9pgwnjna8z893xad31rj0qmwr8bzw";
+          sha256 = "0yq995jyfw3a1dj49a4wnavfb29amw575dajps6nbv0g1q0rnwkf";
           name = "menu-bar+.el";
         };
         recipeFile = fetchurl {
@@ -44990,8 +45103,8 @@
         src = fetchFromGitHub {
           owner = "kazu-yamamoto";
           repo = "Mew";
-          rev = "7ea2baefff668263bf011c72879c2aa88125f2de";
-          sha256 = "1i7i600hj76ggn1jwlj8r60kf157pxj88a4wwp1lasz91wp6msdv";
+          rev = "36b36a154dab22e112cc19675cfd73478f2a5956";
+          sha256 = "01wqa5pf6zjxgsgzqw0pnp278vfd7livfgyqvc24xfqr519k2ifq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/362dfc4d0fdb3e5cb39564160de62c3440ce182e/recipes/mew";
@@ -45346,8 +45459,8 @@
         src = fetchFromGitHub {
           owner = "arthurnn";
           repo = "minitest-emacs";
-          rev = "e5c82aac7542c5648881bb612fa20fe2b99ffb15";
-          sha256 = "09iqbmmvi28sn5c6iaq6r6q4a4003cy6bb4zihajq0di55zls3aa";
+          rev = "1aadb7865c1dc69c201cecee275751ecec33a182";
+          sha256 = "1l18zqpdzbnqj2qawq8hj7z7pl8hr8z9d8ihy8jaiqma915hmhj1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/41b2e55c0fe48267dc4f55924c782c6f934d8ca4/recipes/minitest";
@@ -45480,6 +45593,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    mixed-pitch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mixed-pitch";
+        version = "20170723.955";
+        src = fetchFromGitHub {
+          owner = "jabranham";
+          repo = "mixed-pitch";
+          rev = "6a4fbb9c48fc345d4d40228e8b686f6f2e585f8a";
+          sha256 = "14hpcx75rb41fya8i8qk6cg388wgkhhxnj64ywar3pycngm8jwl9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/20e85b11dc864500d44b25e36c5e7c4c67c1ebe2/recipes/mixed-pitch";
+          sha256 = "1910x5mssxmzzdmllmbqd3ihx0x8s50qf5dx86wal7aja9rris1z";
+          name = "mixed-pitch";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/mixed-pitch";
+          license = lib.licenses.free;
+        };
+      }) {};
     mkdown = callPackage ({ fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
     melpaBuild {
         pname = "mkdown";
@@ -45944,8 +46078,8 @@
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "monky";
-          rev = "190079ea4d22a4e875a3b2892e58737344cb2b26";
-          sha256 = "01d7mbpkkb36lk6g9gkxlj3b58c23nqfmh7m5qq7xz90kd42316g";
+          rev = "62fc907cb541aef1c253d6bcd60447156e6f064c";
+          sha256 = "1qxykx8ccm4k95ncnzy8pspqgmz29pvqha5dg8al4zq20bms98s5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9b33d35e3004f3cc8a5c17aa1ee07dd21d2d46dc/recipes/monky";
@@ -46003,12 +46137,12 @@
     monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "monokai-theme";
-        version = "20170705.1152";
+        version = "20170724.740";
         src = fetchFromGitHub {
           owner = "oneKelvinSmith";
           repo = "monokai-emacs";
-          rev = "71bcced6da1033822ea52e4ac9f312f9d6b5e062";
-          sha256 = "1kwngvpih9q7wkdv6ayisi2c22xi9jh9jffd4qzc652p26yhmzq6";
+          rev = "b9be135bb01328ee7c1349c3eb81aecd045ea015";
+          sha256 = "01mzz1bdli0x4kgf089iy62d15y2gjxk51hybrlb9naddwl9zz89";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme";
@@ -46503,12 +46637,12 @@
     mtg-deck-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mtg-deck-mode";
-        version = "20170506.1701";
+        version = "20170722.823";
         src = fetchFromGitHub {
           owner = "mattiasb";
           repo = "mtg-deck-mode";
-          rev = "55d493b2e4ad0d931659d1785bcdacc6f16bed07";
-          sha256 = "1fp9q094glk4m2l6hf51ryj1qi4g3q7134hf6qjf707xv2vjcihm";
+          rev = "a598b60c0f9a6a718ec712d6df5591d3cd7f23f3";
+          sha256 = "1pf6d2idq8sljkp7haxxqknvja4cj44i88difzs5wvkmdd2pvlh0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/425fa66cffe7bfda71de4ff2b49e951456bdeae1/recipes/mtg-deck-mode";
@@ -46857,12 +46991,12 @@
     mustang-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mustang-theme";
-        version = "20141017.1623";
+        version = "20170719.246";
         src = fetchFromGitHub {
           owner = "mswift42";
           repo = "mustang-theme";
-          rev = "79c3381dd50601775402fe2fddd16fffa9218837";
-          sha256 = "19qd34dcfspv621p4y07zhq2pr8pwss3lcssm9sfhr6w2vmvgcr4";
+          rev = "dda6d04803f1c9b196b620ef564e7768fee15de2";
+          sha256 = "0pg3iay0iinf361v4ay8kizdxs5rm23ir556cwwgz3m3gbs0mgsh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2ed3691edd1cba6abc0c30d2aab732e2ba51bf00/recipes/mustang-theme";
@@ -47983,12 +48117,12 @@
     nimbus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nimbus-theme";
-        version = "20170412.758";
+        version = "20170725.415";
         src = fetchFromGitHub {
           owner = "m-cat";
           repo = "nimbus-theme";
-          rev = "ce999b8d152b9b15d75f66fe22b84827167c8311";
-          sha256 = "08bfp2xm8ylkmb4rby15f6xx51qppd2g01i3mg2wwb8kvlwz6s4w";
+          rev = "524e0a632b0932f269839c34c08bfd894719a75b";
+          sha256 = "1m4lh6hwzv4hmnh3zlic39df2bwqy5mpfgi8himyg4v3k0bdfskc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0e6b456b76e2379c64a86ad844362c58146dc6/recipes/nimbus-theme";
@@ -48050,8 +48184,8 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "4ec6eb1fdf513d93090d5898762d1186eb6feb0d";
-          sha256 = "01vfj61rgfk0cyh1c4ai0ys0wjnjaqz6hdbg3b1dcfk4b09ydyjx";
+          rev = "c94f3d5575d7af5403274d1e9e2f3c9d72989751";
+          sha256 = "1akfzzm4f07wj6l7za916xv5rnh71pk3vl8dphgradjfqb37bv18";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -48211,6 +48345,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    noaa = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
+    melpaBuild {
+        pname = "noaa";
+        version = "20170719.1136";
+        src = fetchFromGitHub {
+          owner = "thomp";
+          repo = "noaa";
+          rev = "1198eed7cf2960a5b91f8750a08c906c716b53ff";
+          sha256 = "1dvck23akkn6jffc86ddf951ksvq1w2nygji6qk5vkidcx5f4rnd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1272203f85375e50d951451bd5fd3baffd57bbfa/recipes/noaa";
+          sha256 = "11hzpmgapmf6dc5imvj5jvzcy7hfddyz74lqmrq8128i72q1sj0v";
+          name = "noaa";
+        };
+        packageRequires = [ cl-lib emacs request ];
+        meta = {
+          homepage = "https://melpa.org/#/noaa";
+          license = lib.licenses.free;
+        };
+      }) {};
     noccur = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "noccur";
@@ -48298,12 +48453,12 @@
     nodejs-repl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nodejs-repl";
-        version = "20170607.1303";
+        version = "20170722.443";
         src = fetchFromGitHub {
           owner = "abicky";
           repo = "nodejs-repl.el";
-          rev = "f72a537700b08e14db28e6bcc1d6244bbeaefca4";
-          sha256 = "1wha680gklq974wl2si3q024qhcdkqgicr6x3qrb9fhfkfr1nbjx";
+          rev = "4a4104dbf2cd314e90f35d200f28bd93c34708d0";
+          sha256 = "1hcvi4nhgfrjalq8nw20kjjpcf4xmjid70qpqdv8dsgfann5i3wl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14f22f97416111fcb02e299ff2b20c44fb75f049/recipes/nodejs-repl";
@@ -48879,12 +49034,12 @@
     ob-browser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ob-browser";
-        version = "20150101.710";
+        version = "20170720.1218";
         src = fetchFromGitHub {
           owner = "krisajenkins";
           repo = "ob-browser";
-          rev = "9271453d28d0912093ab5f91807745ada69ada0c";
-          sha256 = "1nzli8wk3nd05j2z2fw511857qbawirhg8mfw21wqclkz8zqn813";
+          rev = "a347d9df1c87b7eb660be8723982c7ad2563631a";
+          sha256 = "0q2amf2kh2gkn65132q9nvn87pws5mmnr3wm1ajk23c01kcjf29c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c51529213c15d42a7a7b76771f07dd73c036a51f/recipes/ob-browser";
@@ -48900,12 +49055,12 @@
     ob-coffee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ob-coffee";
-        version = "20160415.2036";
+        version = "20170725.724";
         src = fetchFromGitHub {
           owner = "zweifisch";
           repo = "ob-coffee";
-          rev = "dbfa5827df91ed1cdc5b0f3247da6b93fa632507";
-          sha256 = "01l8zvnfpc1vihnpqj75xlvjkk2hkvxpb1872jdzv2k1na2ajfxm";
+          rev = "7f0b330273e8af7777de87a75fe52a89798e4548";
+          sha256 = "1w3fw3ka46d7vcsdq03l0wlviwsk52asfjiy9zfk4qabhpqwj9mz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23d7f1d021b07053acb57e2668ece0eaed0f817/recipes/ob-coffee";
@@ -48921,12 +49076,12 @@
     ob-coffeescript = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ob-coffeescript";
-        version = "20170713.2356";
+        version = "20170719.121";
         src = fetchFromGitHub {
           owner = "brantou";
           repo = "ob-coffeescript";
-          rev = "6baabf3104e32ed151b0b9555db903a93a44db54";
-          sha256 = "08mmwy69h7dihi120c9agv8v5c6y6ghc94gmpb0rfxdjim1lrkmq";
+          rev = "219c83f6c44e3612a7718c996365df1de747127d";
+          sha256 = "14va23m0wab1jf6jc5m61y2c0kcmc8dha463vyci1mvs3p1psjr8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ba1a808c77653bac1948d6c44bd1db09301ffeff/recipes/ob-coffeescript";
@@ -48942,12 +49097,12 @@
     ob-cypher = callPackage ({ cypher-mode, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ob-cypher";
-        version = "20150224.1837";
+        version = "20170725.720";
         src = fetchFromGitHub {
           owner = "zweifisch";
           repo = "ob-cypher";
-          rev = "b3511df05f175c1947996802e9e199432ea9ced8";
-          sha256 = "1xbczyqfqdig5w6jvx2kg57mk16sbiz5ysv445v83wqk0sz6nc9n";
+          rev = "114bdf6db20ee0ade060bb5df379ddee48ff4f26";
+          sha256 = "142d91jvf7nr7q2sj61njy5hv6ljhsq2qkvkdbkfqj07rgpwfgn3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc05c833f64e7974cf5a2ad60a053a04267251cb/recipes/ob-cypher";
@@ -49005,12 +49160,12 @@
     ob-elixir = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ob-elixir";
-        version = "20151021.447";
+        version = "20170725.719";
         src = fetchFromGitHub {
           owner = "zweifisch";
           repo = "ob-elixir";
-          rev = "d0e8007efa0b99ab7a6e4cb7160a87d6cb60d210";
-          sha256 = "0qknm1h2ijnzs1km51hqwpnv5083m9ngi3nbxd90r7d6vva5fhhk";
+          rev = "8990a8178b2f7bd93504a9ab136622aab6e82e32";
+          sha256 = "19awvfbjsnd5la14ad8cfd20pdwwlf3d2wxmz7kz6x6rf48x38za";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/287e4758f6f1df0152d68577abd91478c4a3f4ab/recipes/ob-elixir";
@@ -49110,12 +49265,12 @@
     ob-kotlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ob-kotlin";
-        version = "20170624.2050";
+        version = "20170725.718";
         src = fetchFromGitHub {
           owner = "zweifisch";
           repo = "ob-kotlin";
-          rev = "ebbd3fcd52a80c0579e896ad3cbb1484d0a55d00";
-          sha256 = "037msvgvw42nl2wi335q4pfi8bqh3d1a5a6rdvzvpm1vh2fwywab";
+          rev = "3b2f57e9944cfc36f2714dc550db42159904929a";
+          sha256 = "1fgfl4j0jgz56a1w8h2mvnzisz123c1xz7ga380bg1hmy44dbv5j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7aa74d349eb55aafddfc4327b6160ae2da80d689/recipes/ob-kotlin";
@@ -49131,12 +49286,12 @@
     ob-lfe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ob-lfe";
-        version = "20150701.655";
+        version = "20170725.720";
         src = fetchFromGitHub {
           owner = "zweifisch";
           repo = "ob-lfe";
-          rev = "d50a5d76e389501504e060a7005f20b96c895594";
-          sha256 = "1mk7qcf4svf4yk4mimcyhbw5imq3zps2vh2zzq9gwjcn17jnplhn";
+          rev = "f7780f58e650b4d29dfd834c662b1d354b620a8e";
+          sha256 = "1ricvb2wxsmsd4jr0301pk30mswx41msy07fjgwhsq8dimxzmngp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d595d3b93e6b25ece1cdffc9d1502e8a868eb538/recipes/ob-lfe";
@@ -49173,12 +49328,12 @@
     ob-mongo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ob-mongo";
-        version = "20161130.152";
+        version = "20170720.1219";
         src = fetchFromGitHub {
           owner = "krisajenkins";
           repo = "ob-mongo";
-          rev = "d64a507c2f9e2a1f8062acae50199541fc23be65";
-          sha256 = "0xlddh28z9afqj8j9brcncrbwsyqzmv432zayn9ajjj1vk1avsxg";
+          rev = "371bf19c7c10eab2f86424f8db8ab685997eb5aa";
+          sha256 = "02k4gvh1nqhn0h36h77vvms7xwwak8rdddibbidsrwwspbr4qr1s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e020ea3ef89a3787d498c2f698c82c5073c9ee32/recipes/ob-mongo";
@@ -49446,12 +49601,12 @@
     ob-translate = callPackage ({ fetchFromGitHub, fetchurl, google-translate, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ob-translate";
-        version = "20160411.124";
+        version = "20170720.1219";
         src = fetchFromGitHub {
           owner = "krisajenkins";
           repo = "ob-translate";
-          rev = "bba3bd1e2dbb5c672543129460c2713f78b26120";
-          sha256 = "086z3smcfn5g599967vmxj3akppyqk9d64acm8zzj76zj29xfk1k";
+          rev = "9d9054a51bafd5a29a8135964069b4fa3a80b169";
+          sha256 = "143dq3wp3h1zzk8ihj8yjw9ydqnf48q7y8yxxa0ly7f2v1li84bc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4d89e4006afc51bd44e23f87a1d1ef1140489ab3/recipes/ob-translate";
@@ -49572,12 +49727,12 @@
     obsidian-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "obsidian-theme";
-        version = "20140420.943";
+        version = "20170719.248";
         src = fetchFromGitHub {
           owner = "mswift42";
           repo = "obsidian-theme";
-          rev = "0f92ce87245529d5c75d6e5f7862ebbc54bdbc92";
-          sha256 = "00v21iw9wwxap8jhg9035cp47fm5v2djmldq6nprv860m01xlwh1";
+          rev = "f45efb2ebe9942466c1db6abbe2d0e6847b785ea";
+          sha256 = "1d36mdq8b1q1x84a2nb93bwnzlpdldiafh7q7qfjjm9dsgbij73b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e90227252eb69d3eac81f5a6bd5e3a582d33f335/recipes/obsidian-theme";
@@ -49702,8 +49857,8 @@
         src = fetchFromGitHub {
           owner = "OCamlPro";
           repo = "ocp-indent";
-          rev = "d3f250b6029a7afec0d7ddd8770d9c4a7e5b9c7c";
-          sha256 = "1h8w7vcaykhgf4vmrkp1c7y566bzi7av4cfvkp4l01817chrhyaz";
+          rev = "cae4e8c9d0ff0c29e5fc32c8ac0cea539f8f6a13";
+          sha256 = "1wni1xrv6kr001spdz66lza4xajx1w0v3mfbf28x17l4is2108rn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1af061328b15360ed25a232cc6b8fbce4a7b098/recipes/ocp-indent";
@@ -49992,12 +50147,12 @@
     omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }:
     melpaBuild {
         pname = "omnisharp";
-        version = "20170716.926";
+        version = "20170721.946";
         src = fetchFromGitHub {
           owner = "OmniSharp";
           repo = "omnisharp-emacs";
-          rev = "ab4c6bb04cda35510fe751e546b5c0bb4dc3371d";
-          sha256 = "0zkd5hp5xk0wjlv6nqi38dnhrzk7jzcd8546wqfw0my10kb1ycs2";
+          rev = "ad147956b936fd528d26ca88158a8af96ff5827a";
+          sha256 = "04vkhdp3kxba1h5mjd9jblhapb5h2x709ldz4pc078qgyh5g1kpm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@@ -50187,6 +50342,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    opencc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "opencc";
+        version = "20170722.116";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "emacs-opencc";
+          rev = "8c539f72669ba9a99d8b5198db5ea930897ad1b9";
+          sha256 = "140s88z0rsiylm8g1mzgc50ai38x79j004advin6lil5zcggxq3i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/71bc5476b3670a9f5c3d3682c2e7852fc6c5fe60/recipes/opencc";
+          sha256 = "1dd62x0h3imil4g3psndxykp45jf83fm4afxcvvyayj45z099f4r";
+          name = "opencc";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/opencc";
+          license = lib.licenses.free;
+        };
+      }) {};
     opencl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "opencl-mode";
@@ -50356,12 +50532,12 @@
     org-alert = callPackage ({ alert, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "org-alert";
-        version = "20170701.1855";
+        version = "20170724.2116";
         src = fetchFromGitHub {
           owner = "groksteve";
           repo = "org-alert";
-          rev = "169acc082643b6b793aab17ab7e0de3694e74698";
-          sha256 = "0khk1jyy4vxsfalf27f53d1g9w41qq6i6c9xm670pj6xrf38hxj9";
+          rev = "3b7417ac12f2710e88f8dff538670621064ef8bc";
+          sha256 = "1hyl4b2r7wzdfr2m7x8pgpylia3z15fihn679xdiyc32rzy7k5vk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2976b7f9271bc46679a5774ff5f388b81a9f0cf8/recipes/org-alert";
@@ -50608,12 +50784,12 @@
     org-cliplink = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-cliplink";
-        version = "20160819.900";
+        version = "20170724.413";
         src = fetchFromGitHub {
           owner = "rexim";
           repo = "org-cliplink";
-          rev = "6c134fdda7bb56cc960af87d06a81a6885f6ab0e";
-          sha256 = "1x339lg1q1aq57jycfxwdmipl05wjb0d1b5psqbn37xvmkm3imgg";
+          rev = "16c2cad9c3bafb71fea70f70c1e584307a6dee01";
+          sha256 = "1k3vcr4fr290pg00gvb9q9wpvq1fk6pzgw95x12fdrig5lp48hih";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ddb13c59441fdf4eb1ba3816e147279dea7d429/recipes/org-cliplink";
@@ -51261,8 +51437,8 @@
         version = "20140107.519";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "4214211675bfa5c4dbe1dd5147eeeb9789aeb023";
-          sha256 = "19v9nnlr3h9ci30az6s9fq8jkg7mnhalrifaybph6465yfd0p9iv";
+          rev = "ed6849d18dd7831f3f7917970d2c24e771f75476";
+          sha256 = "0f3c0jj6479b3sxmsa9nd5h5gnl81xnrdhymh2rs7rjgcj58fbws";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -51281,8 +51457,8 @@
         version = "20170105.1723";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "4214211675bfa5c4dbe1dd5147eeeb9789aeb023";
-          sha256 = "19v9nnlr3h9ci30az6s9fq8jkg7mnhalrifaybph6465yfd0p9iv";
+          rev = "ed6849d18dd7831f3f7917970d2c24e771f75476";
+          sha256 = "0f3c0jj6479b3sxmsa9nd5h5gnl81xnrdhymh2rs7rjgcj58fbws";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -51689,12 +51865,12 @@
     org-recent-headings = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-recent-headings";
-        version = "20170703.1625";
+        version = "20170722.1507";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "org-recent-headings";
-          rev = "b3d6e3514b57aba7be4de676d1aa92c19e08cd42";
-          sha256 = "0367kkyxnkbgk3w0qvbl9xqxn5mbwpsj7qxf4s0c4jhdw2sk3k20";
+          rev = "56e52d65a03df0458bf79ceea5252f5efe432e3e";
+          sha256 = "10ymgycm7imigbisqnccd0rzvj9ihzmql4ipqj81iqwrssssqwyb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/668b79c179cbdb77c4049e7c620433255f63d808/recipes/org-recent-headings";
@@ -51731,12 +51907,12 @@
     org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, pdf-tools, s }:
     melpaBuild {
         pname = "org-ref";
-        version = "20170714.808";
+        version = "20170724.1235";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "208a7beb0f8d4f7830d1d801776acd99c723e87d";
-          sha256 = "0vf75sk3ik9vfqbr30yn9fn8ab7rc60y5vaiipvx9p6mgh6vhcad";
+          rev = "5a59df1f9474103faed807fbc3448919cf7aa779";
+          sha256 = "15i8kqv5a18i19pcw1kcq4ricmgm1q1qlkfzaawwilfd45ipl6d6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -51893,8 +52069,8 @@
         src = fetchFromGitHub {
           owner = "arbox";
           repo = "org-sync";
-          rev = "1e9045e38cd6f12dc0d60e2f7bd2d414a49a5722";
-          sha256 = "14zn0b8qs740ls1069kg2lwm0b9yc4qv525fg8km0hgi0yp8qw7z";
+          rev = "7f02167ef805cd76def274be4d3bd0c6e41d9af8";
+          sha256 = "18v56lrscpzxq5prigd1pjkx990xf57pzf1d2yj6r1grqfz235yy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/923ddbaf1a158caac5e666a396a8dc66969d204a/recipes/org-sync";
@@ -52229,8 +52405,8 @@
         src = fetchFromGitHub {
           owner = "punchagan";
           repo = "org2blog";
-          rev = "e266ff4296661de520b73e6e18f201fb6378ba05";
-          sha256 = "030fwgwn2xsi6nnnn4k32479hhmbr4n819yarr3n367b29al2461";
+          rev = "026629da7517dad6ffd9e005299874cf2163958e";
+          sha256 = "0dlrlm83i61zk6mvmfspcpakfjv5d7kfazk05f694ijfmqvmvfiw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org2blog";
@@ -52309,12 +52485,12 @@
     organic-green-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "organic-green-theme";
-        version = "20170125.606";
+        version = "20170720.1111";
         src = fetchFromGitHub {
           owner = "kostafey";
           repo = "organic-green-theme";
-          rev = "5f8ce452d16f1acbd18a6963f2c042851968dd8d";
-          sha256 = "0irkcjb6vxb7kf9fr4s4ap6lighhh7h6mwfamcwcacgwfvs4zs7y";
+          rev = "eea6b77b7ee26310fd6741b9affc3f2c43be2820";
+          sha256 = "1zaxvc1j6lfdg8wi80pfjywr6nfr7qc27j4ahzz59giba3bb7azp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9383ef5f0372724b34f4bb9173ef8ccbb773e19e/recipes/organic-green-theme";
@@ -52687,16 +52863,16 @@
     osx-pseudo-daemon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "osx-pseudo-daemon";
-        version = "20131026.1730";
+        version = "20170721.2307";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "osx-pseudo-daemon";
-          rev = "0b9f330a66b4e8d2ff9bcd57e09b8d304dfb5841";
-          sha256 = "1j601gzizxjsvkw6bvih4a49iq05yfkw0ni77xbc5klc7x7s80hk";
+          rev = "4d10e327cd8ee5bb7f006d68744be21c7097c1fc";
+          sha256 = "0rjdjddlkaps9cfyc23kcr3cdh08c12jfgkz7ca2j141mm89pyp2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/25a3562788b541e8682500911d7da89d209ab84f/recipes/osx-pseudo-daemon";
-          sha256 = "150fxj2phj5axnh5i8ws5fv2qzzmpyisch452wgxb604p56j7vy8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e89752e595c7cec9488e755c30af18f5f6fc1698/recipes/osx-pseudo-daemon";
+          sha256 = "013h2n27r4rvj8ych5cglj8qprkdxmmmsfi51fggqqvmv7qmr2hw";
           name = "osx-pseudo-daemon";
         };
         packageRequires = [];
@@ -52813,12 +52989,12 @@
     outshine = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, outorg }:
     melpaBuild {
         pname = "outshine";
-        version = "20170414.1217";
+        version = "20170721.521";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "outshine";
-          rev = "399ccd20cd65c758bbbd5563bd804d2bccfd0279";
-          sha256 = "03jd3gyqrmrnykcv7p6fv53f32li7gkvd61zbhp483n8a8n3yy5j";
+          rev = "0fdd0cd619d20e71b3157f225bb117a7e21dc9b3";
+          sha256 = "1hhvbfpbixh5s2s4h06f44p4h0kqnmbm9mlqfas3msq5m6m77h2r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/outshine";
@@ -52918,12 +53094,12 @@
     ox-bibtex-chinese = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ox-bibtex-chinese";
-        version = "20160510.506";
+        version = "20170722.2009";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "ox-bibtex-chinese";
-          rev = "7771304977f921ff0596b17520289c984116f1a1";
-          sha256 = "1d463d7mdlr65yrq7x16nk9124fw1iphf5g238mlh4abbl6kz241";
+          rev = "2ad2364399229144110db7ef6365ad0461d6a38c";
+          sha256 = "06lp56na1fv87296hhaxgb6gfnzln39p4v245gfxhk0k27589vxj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a679ebaedcb496f915b9338f9d5c003e1389594d/recipes/ox-bibtex-chinese";
@@ -52943,8 +53119,8 @@
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "scimax";
-          rev = "7ae7bc8bc84ffe0351e23a8a5dc72a18874bee61";
-          sha256 = "0pzpy02rffgydgbdq6khk4y2hxwx744nvi84i95h98hb1ld1ydk2";
+          rev = "7e3b7a8adf92e5166d98c35e54dccb88831e85dd";
+          sha256 = "1lsbgpdbry37wgy9p9zbd60cwfrvs9a2fr8b3mzv9i5w9f1wdjy8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip";
@@ -53753,6 +53929,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    pamparam = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, lispy, melpaBuild, worf }:
+    melpaBuild {
+        pname = "pamparam";
+        version = "20170721.1905";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "pamparam";
+          rev = "0740cf4a5b5da561d5dbab96a6a34e2db28d24ed";
+          sha256 = "1h52zig64g2wdsvx1g590bl62zfg8l4bikfi6y25zx1gic9cifnk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/067b5e3594641447478db8c1ffcb36d63018b1b2/recipes/pamparam";
+          sha256 = "0xwz1il9ldkfprin3rva407m4wm7c48blwfn4mgaxmqafy4p0g9f";
+          name = "pamparam";
+        };
+        packageRequires = [ emacs hydra lispy worf ];
+        meta = {
+          homepage = "https://melpa.org/#/pamparam";
+          license = lib.licenses.free;
+        };
+      }) {};
     pandoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pandoc";
@@ -53777,12 +53974,12 @@
     pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
     melpaBuild {
         pname = "pandoc-mode";
-        version = "20170503.606";
+        version = "20170720.127";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "pandoc-mode";
-          rev = "72aa0c2abad0ecca689adcf93dd4e9109c9fc737";
-          sha256 = "0hrnd46anfq8vzanax7qzq5fl9kdw26aprally9kjqbr5xdjik2h";
+          rev = "58f893d54c0916ad832097a579288ef8ce405da5";
+          sha256 = "03nh5ivcwknnsw9khz196n6s3pa1392jk7pm2mr4yjjs24izyz1i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/pandoc-mode";
@@ -54111,12 +54308,12 @@
     pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store }:
     melpaBuild {
         pname = "pass";
-        version = "20170717.145";
+        version = "20170725.34";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "pass";
-          rev = "888bd9593f9239f28adab6d93fcdeec69bdf63ed";
-          sha256 = "0z1j3cfsh8cksv6l5fbzp6f72d5874kmg7i6agmab9ixjvgg0izc";
+          rev = "42bfe9f471f19c9d801f15ffde658ea3f4655ac8";
+          sha256 = "12hajddf6bkg5fsi1w31rj1wrg0yr8idp7c1jn00824h0la2maf0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass";
@@ -54697,12 +54894,12 @@
     pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }:
     melpaBuild {
         pname = "pdf-tools";
-        version = "20170417.150";
+        version = "20170721.718";
         src = fetchFromGitHub {
           owner = "politza";
           repo = "pdf-tools";
-          rev = "f314597b2e391f6564e4f9e5cc3af0b4b53f19e9";
-          sha256 = "15m7x61m63zxz2jdz52brm9qjzmx1gy24rq8ilmc4drmb0vfmrr2";
+          rev = "804d9929ce354c60d91ab756735ffff8a6f30688";
+          sha256 = "1qfv9zmqw3s3j94kprr4g73cq0b9cqw0bihbm1pbw6pybivdry09";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools";
@@ -55494,12 +55691,12 @@
     php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "php-mode";
-        version = "20170621.2242";
+        version = "20170722.1205";
         src = fetchFromGitHub {
           owner = "ejmr";
           repo = "php-mode";
-          rev = "3a9076b6f6146326c1314c580acddce9cbb5a290";
-          sha256 = "11ily856xk6i00hqfvfxwjch77sigb5lym10dj0zj689gp8jd0wc";
+          rev = "1728f36aaa7b44993495476a06e9c8be0140c51c";
+          sha256 = "1pk3lxg2fa7skz17qygjhvwbvcl34bs2as728i3nid6ghw71fk5s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode";
@@ -55662,12 +55859,12 @@
     picpocket = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "picpocket";
-        version = "20170305.259";
+        version = "20170723.509";
         src = fetchFromGitHub {
           owner = "johanclaesson";
           repo = "picpocket";
-          rev = "3404de0e6ed1b46f3b873472e34ea9342445f43e";
-          sha256 = "044p26x76i5x0921f8b8zl51k0wfkygdwdiwyhqmmnxzb54qj74l";
+          rev = "ab40afe0e13dff43518233f16e889b44a8a3819b";
+          sha256 = "0snq5wdmdzpbxslixi1vzyi0sccqy9k7m3hwxn540352rsz8zxcz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e88dc89311d4bfe82dc15f22b84c4b76abb3fd69/recipes/picpocket";
@@ -55872,12 +56069,12 @@
     pivotal-tracker = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pivotal-tracker";
-        version = "20161028.618";
+        version = "20170720.816";
         src = fetchFromGitHub {
           owner = "jxa";
           repo = "pivotal-tracker";
-          rev = "87b4e3cce343519b54a8ff4fef5d7b7745e27c3c";
-          sha256 = "08rj1nimxrz5g1gj231f9d6p8al1svvwv1782h8hyxi87fzmw9sw";
+          rev = "0311d117037c74512149a4a78b269c2e46d7dfba";
+          sha256 = "0g3xzh8jr9lbg6h2hk81cdyxkxx3l79qhxrp4g34rc0dml79rzf9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pivotal-tracker";
@@ -57515,12 +57712,12 @@
     projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "projectile";
-        version = "20170416.148";
+        version = "20170725.1304";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "projectile";
-          rev = "56e262dd3b5998d0dc6a590d06bc11058839c588";
-          sha256 = "0sq0w5fi4zrxccabnh78vjb7drw05ay2lpw7wvnrfv97xkywzr4z";
+          rev = "63dc5bcf0803ef81bc13ca499e60c61b8fea2fd6";
+          sha256 = "0lxs3k93jw9whbymbg3swk9c6gbix93vw7mqx9n84qdvijm3zrr4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile";
@@ -57725,12 +57922,12 @@
     projector = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "projector";
-        version = "20170410.905";
+        version = "20170717.1151";
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "projector.el";
-          rev = "bd9e5b5c4727c0facd9d45a4b6a46ffddaf6a131";
-          sha256 = "1fx5wg5lnb59z0y25bmysf6a2wld333iihrb9jhcab4hicdqsh9s";
+          rev = "ec63167ee21d537f410c0971f82e2ffdfd6fa008";
+          sha256 = "155wnks7i73c3kvgysnfy0379d1fp78qv2b8lhsaxwx7jh356dbm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/420ffea4549f59677a16c1ee89c77b866487e302/recipes/projector";
@@ -57939,8 +58136,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "c78dbd7c895b8c80cd2f2401d73acf890edf82c6";
-          sha256 = "136l13mq0yki95lra6bvzzq602vhp48nnvw741gf7x34rd4k5kwg";
+          rev = "bb8664419b7d0dd4a94cc1242a2d77bf5e8f567b";
+          sha256 = "1cca2vkpqysnswqawx4rgf7zsmnwvg13irs3jf6ipcld8wsnb17q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -58197,12 +58394,12 @@
     puppet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "puppet-mode";
-        version = "20170614.2215";
+        version = "20170719.752";
         src = fetchFromGitHub {
           owner = "voxpupuli";
           repo = "puppet-mode";
-          rev = "3ffc2de8416b4ea389d5800a4a05d0885d9a8608";
-          sha256 = "0dlss3brh4654avq361yma4xbxsv6q5s8qlhp7v470ix88wx4v8r";
+          rev = "2fdd31ff1ae1ab23eeb08d5af936b1bb9b3e51b6";
+          sha256 = "017f899qg3pdm18mb3i7v3x2j4gpqcinscxds8jwjq2ll5d5qf2j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1de94f0ab39ab18dfd0b050e337f502d894fb3ad/recipes/puppet-mode";
@@ -58703,8 +58900,8 @@
         src = fetchFromGitHub {
           owner = "PyCQA";
           repo = "pylint";
-          rev = "9f7797ae15bd5e4e5c4ad320afcc15eeb4cdae82";
-          sha256 = "0p3zmaq0vk5z4ia2i54rjdw4a1d4s9ljb28l48xbb82jmjlgniw7";
+          rev = "d41e49a18817997106ed9f1df20651e1f438222b";
+          sha256 = "0ygj6zzz4dzfwch7hgvmkm83y6rr5jhy789d7qnkdsjyfshkx5dp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -58846,12 +59043,12 @@
     python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "python-mode";
-        version = "20170716.1133";
+        version = "20170723.1213";
         src = fetchFromGitLab {
           owner = "python-mode-devs";
           repo = "python-mode";
-          rev = "4846252fb81c309eb5f7a6aa2dcc04804412c684";
-          sha256 = "0zcy7afvyzqmgsn88v5m73bkglnfavhqb4b7fviz355i3waiyfx5";
+          rev = "3ad3e8e0f98d90c634ff81f50776e70e75a98034";
+          sha256 = "0al6jvjrxcqrqkmx1akaqb2ill0crjawc2k7b43aysch3fx7caf2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode";
@@ -59077,12 +59274,12 @@
     quelpa = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build }:
     melpaBuild {
         pname = "quelpa";
-        version = "20170620.2318";
+        version = "20170717.2225";
         src = fetchFromGitHub {
           owner = "quelpa";
           repo = "quelpa";
-          rev = "dbb57da3eba3b5a04ab9b5184634ec139d68ddcd";
-          sha256 = "1jszkgf9rkkjscfaijbz84kpbpw46p15zvlvfmvil30gs5vp2pk4";
+          rev = "eb93cf1ca9d1298a92c680a736dedbd1c3cbbb5a";
+          sha256 = "13wr46qwmi4dnx3i2py0sjhichl5kjai64jcywymp1mc52f6nyl0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7dc3ba4f3efbf66142bf946d9cd31ff0c7a0b60e/recipes/quelpa";
@@ -59560,12 +59757,12 @@
     ranger = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ranger";
-        version = "20170522.2331";
+        version = "20170703.2135";
         src = fetchFromGitHub {
           owner = "ralesi";
           repo = "ranger.el";
-          rev = "e371cdc2d6065099fe7c68583597b1d0abea792b";
-          sha256 = "1c0jlykxkl46qimr60crac4j7nvzr0jixjiv4m6zzk93pn12y3g1";
+          rev = "905bd8e17c48fc270e66b846e8ada81462623e81";
+          sha256 = "1h299kk8w162f9k588a4c4ikl3276y47si81p7jbda2fhf9s5lck";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0207e754f424823fb48e9c065c3ed9112a0c445b/recipes/ranger";
@@ -60318,12 +60515,12 @@
     redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "redprl";
-        version = "20170712.903";
+        version = "20170719.754";
         src = fetchFromGitHub {
           owner = "RedPRL";
           repo = "sml-redprl";
-          rev = "a2f8c5612a055882db5c01b8160c0ae1bd44f1e1";
-          sha256 = "0glnribgqg6hg3ghb5saf26hwydmsg51aq45wj8mdf5dfncimqq8";
+          rev = "bb149c75cb00cedbabc12dd497dce0ab5a7f5072";
+          sha256 = "1m18hnb1hnm6rr5bi2laq9i8djkm73sxp83mawbybydq5j0446bm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl";
@@ -60635,8 +60832,8 @@
         src = fetchFromGitHub {
           owner = "anler";
           repo = "remember-last-theme";
-          rev = "57e8e2a475ea89316dbb5c4d2ea047f56a2cbcdf";
-          sha256 = "0sb110rb6pnjnvyqn0kji19bhbn8mk4x32yps00aq2g2v9pc1jzr";
+          rev = "0973f1aa6b96355fa376fffe8b45733b6e963c51";
+          sha256 = "11kcqpw1wrhghbw2dx3pqndmq9a1rbqir3k71ggaj1x2y2arzvm7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/26edcdddaf8dc8c9a18d6b007e0d49d04fe4ccca/recipes/remember-last-theme";
@@ -61047,12 +61244,12 @@
     reverse-im = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "reverse-im";
-        version = "20170623.640";
+        version = "20170721.940";
         src = fetchFromGitHub {
           owner = "a13";
           repo = "reverse-im.el";
-          rev = "da6a4d2fdc1019e7fcd050db6c5344fdad1e2286";
-          sha256 = "1vsfxy4scknn5142mn4v1hkj2qbphmwdj175prd1aj1gk8cbzw9v";
+          rev = "63fb1edee017177c44f8b663a707201b3dd78345";
+          sha256 = "1ha4ldfcnw57rg15mbxspymgs6b2b50f6s0fcb6d7k9xai5idmnp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f282ebbed8ad01b63b0e708ab273db51bf65fdbb/recipes/reverse-im";
@@ -61210,6 +61407,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    rib-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rib-mode";
+        version = "20170722.356";
+        src = fetchFromGitHub {
+          owner = "blezek";
+          repo = "rib-mode";
+          rev = "4172e902fd66f235184c0eb6db7fd4a73dbd0866";
+          sha256 = "0s9dyqv4yh0zxngay951g98g07029h51m4r2fc7ib2arw6srfram";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c38c18f3eb75d559752fcd9956464fef890be728/recipes/rib-mode";
+          sha256 = "0qgbzrwbbgg4mzjb7yw85qs83b6hpldazip1cigywr46w7f81587";
+          name = "rib-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/rib-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     rich-minority = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rich-minority";
@@ -61574,8 +61792,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "65c8f03ff0112ce5c5e11aff6867ad0eb9019e63";
-          sha256 = "0xlacwjmvx5xd8m7yi8l8mqi0lqs2gr2hmjag2frvmxcn4cpb4gc";
+          rev = "afbf59630203624e0a5eecee52a3296295e6d620";
+          sha256 = "0bygl7ahwsz6xmw0fif7gqnpzbk8cx7hpg4gp96f8inicq849z26";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
@@ -61636,7 +61854,7 @@
         version = "20161115.2259";
         src = fetchsvn {
           url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "59350";
+          rev = "59417";
           sha256 = "18fkx4a8jarznczv3h36663dqprwh6pyf76s3f210cqqy8c5y5yi";
         };
         recipeFile = fetchurl {
@@ -61711,18 +61929,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    ruby-electric = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }:
+    ruby-electric = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ruby-electric";
-        version = "20150424.752";
-        src = fetchsvn {
-          url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "59350";
-          sha256 = "18fkx4a8jarznczv3h36663dqprwh6pyf76s3f210cqqy8c5y5yi";
+        version = "20150713.752";
+        src = fetchFromGitHub {
+          owner = "knu";
+          repo = "ruby-electric.el";
+          rev = "35d04e90ef243c7090edf9aaad0142a5a77f0ebd";
+          sha256 = "0ksbm6cbqz7dx6qyq8nlpbx41b153jaww4fwnfwbx9rz993wjjkg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/ruby-electric";
-          sha256 = "0abi1hqjscz2wj4n5habjb6rksxkhwv0cvpw68irkj4fas92qhk8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5fd5fa797a813e02a6433ecbe2bca1270a383753/recipes/ruby-electric";
+          sha256 = "02xskivi917l8xyhrij084dmzwjq3knjcn65l2iwz34s767fbwl2";
           name = "ruby-electric";
         };
         packageRequires = [];
@@ -61902,12 +62121,12 @@
     rufo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rufo";
-        version = "20170712.824";
+        version = "20170718.716";
         src = fetchFromGitHub {
           owner = "danielma";
           repo = "rufo.el";
-          rev = "e827b44c8093715a204ed0e4a64ade34441f9355";
-          sha256 = "14qf3napgx8vycr0igrr8534yymgaqh2cb09iz7gbf65cmk86pq8";
+          rev = "85a6d80fb05fef396a8029b8f944c92a53faf8fe";
+          sha256 = "11klircrdc9z9jfksd6rjgwbb775mziss67mw74673b8iva8n1y7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/123b89e06a44ef45150ca7243afc41302dfb6c6e/recipes/rufo";
@@ -61986,12 +62205,12 @@
     rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rust-mode";
-        version = "20170712.1214";
+        version = "20170719.1308";
         src = fetchFromGitHub {
           owner = "rust-lang";
           repo = "rust-mode";
-          rev = "60a1f36f4111e825d20d9c3aed561981c470806a";
-          sha256 = "0p09j3y90i0ninyr3alxra17r09ps4sj9klww638l9csk2cgw80f";
+          rev = "0985f5fde747f64b3fcff2661226aa4dad286e04";
+          sha256 = "10mvrdv8cbdsynn4kxv06xm4r6syarmi858pdj6r2bysbp4w6cs8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode";
@@ -62364,12 +62583,12 @@
     sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sbt-mode";
-        version = "20170708.1211";
+        version = "20170725.1332";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "emacs-sbt-mode";
-          rev = "cee28b5e6121e6c85bb647b709c7a8c9e3883700";
-          sha256 = "1f5xkcr9kj5nwqh77hfxbs2i9zzsikbksa56lg9vw67pc78rs7vi";
+          rev = "3e8a75a5d48724ecd6c4171107e1b581100dfce1";
+          sha256 = "14ng4xxld7c3x92bmcww74x724h4c466jd70wrl7hpjhg1z8xhn2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode";
@@ -63030,12 +63249,12 @@
     sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "sekka";
-        version = "20170618.500";
+        version = "20170722.434";
         src = fetchFromGitHub {
           owner = "kiyoka";
           repo = "sekka";
-          rev = "282bb04ed524ceff2a7a13cee118ec6df55b2323";
-          sha256 = "1g15lrx3ik6539vc5f8v3x0va6k02zz5l13jnqlzs1fl4inxk35v";
+          rev = "b9b2ba5aca378ad12cb9e0f0ac537d695bd39937";
+          sha256 = "1karh4pa190xmjbw1ai2f594i8nf9qa0lxybn3syif7r50ciym3c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka";
@@ -64473,12 +64692,12 @@
     skewer-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, simple-httpd }:
     melpaBuild {
         pname = "skewer-mode";
-        version = "20170709.939";
+        version = "20170722.1745";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "skewer-mode";
-          rev = "51f3bbeafea6701de78190a395f6376a9974f1e5";
-          sha256 = "0k8yc75d7hly4qiqxvg027cwmcck63nmbyr75qyjq8kc0vk0x5mr";
+          rev = "cf8115d4e1ab5c2f990fb6d02a6c75d7d6b82a9e";
+          sha256 = "1m0xbjbvfmy986isgxjm3kj4rzi6vsy4b1hlrbh4kpbjfj3p9sz0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/10fba4f7935c78c4fc5eee7dbb161173dea884ba/recipes/skewer-mode";
@@ -64557,12 +64776,12 @@
     slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
     melpaBuild {
         pname = "slack";
-        version = "20170712.2328";
+        version = "20170725.133";
         src = fetchFromGitHub {
           owner = "yuya373";
           repo = "emacs-slack";
-          rev = "f89362f31d8c1ee752bfd9d3cc8a6b5766c94bd6";
-          sha256 = "0b2j0vvsm6psljdkyybjh5ki6drhvq98xwakifk0li220rsi3lkp";
+          rev = "2c756be071b8a8e69022daf606b849f53f211805";
+          sha256 = "003i3snyjh47ckjny15g9isc5k0zhng2dvwmjxazfm4q3ka7p6ir";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack";
@@ -64683,12 +64902,12 @@
     slime-docker = callPackage ({ cl-lib ? null, docker-tramp, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }:
     melpaBuild {
         pname = "slime-docker";
-        version = "20160817.2344";
+        version = "20170718.1157";
         src = fetchFromGitHub {
           owner = "daewok";
           repo = "slime-docker";
-          rev = "f90fc274c2f764a5962a3cbcf0ea00622ee5bfe6";
-          sha256 = "0wknygb8gnr49xc5wyyalgs97zk0qj33wwcw1kcxah4nmvzgqg7f";
+          rev = "dc41f7c33de497bc622f037f33ea2a1ecfa1069f";
+          sha256 = "169vy9wjkf0vzqgdbm30rssl82xl2n73hipnaidncbw9sd8cpx1y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/15ec3f7208287161571c8fc3b29369ceabb44e5f/recipes/slime-docker";
@@ -65331,12 +65550,12 @@
     smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smartparens";
-        version = "20170716.1328";
+        version = "20170723.1205";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "smartparens";
-          rev = "d4445621b88f36a391fc8bfabbed4db08dc88f33";
-          sha256 = "0rsnc5b49n3s6k9a1vr1by1iq1ns9ba2l04k3siqr0hjr8jjwa7b";
+          rev = "25508600c0f715c9cba68b1902b537386b27b97c";
+          sha256 = "1r61pnf74x6faglyixfchzhpx8gp7k8aa1yq00vxpplj4flwyvpz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -65855,12 +66074,12 @@
     solaire-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "solaire-mode";
-        version = "20170610.442";
+        version = "20170718.1048";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-solaire-mode";
-          rev = "d2744f8d2d8e1af5d5784021bcb8772e163be800";
-          sha256 = "0zsm00lggvmps0krlhyb5vvs0m0kikzmamj9mq5hw3k372jv4djm";
+          rev = "4058f17c7ccd4eb192598ce493d2e2d2361ee2e0";
+          sha256 = "0vk5d3l2s0dxdv6yjdnwbhs0cdq71kd3l949a8w0qaypad8hg11i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/52c69070eef3003eb53e1436c538779c74670ce6/recipes/solaire-mode";
@@ -66261,12 +66480,12 @@
     spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, spaceline }:
     melpaBuild {
         pname = "spaceline-all-the-icons";
-        version = "20170711.102";
+        version = "20170719.131";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "spaceline-all-the-icons.el";
-          rev = "88661813baefece9899588cb34c633eda606f2ac";
-          sha256 = "1qb26ya4f3qd3rh9cpdb02qyqqz6yhgv05b095i9fvwlcbvr4v51";
+          rev = "84ee6d37b8e6d50763ca2977133684143fc61cf3";
+          sha256 = "1w66rfp1kmhqhnqjz2j41i245fw6840q09bfhsaci6kbhvhd5fnm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons";
@@ -66286,8 +66505,8 @@
         src = fetchFromGitHub {
           owner = "nashamri";
           repo = "spacemacs-theme";
-          rev = "11d6958364271e11c920015c24d509f9bdcce6c9";
-          sha256 = "1z6l85459fbfyn266qdz09c57ns8d1650ksicl3li442ffh5s75i";
+          rev = "b26162e8974c532b3241a43c8f194a340636e9ea";
+          sha256 = "0wxn7diy0pw0iwf3pxvr1yg2h7svrkyna0pgpkyipz3z1chd6h49";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme";
@@ -66366,12 +66585,12 @@
     sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sparql-mode";
-        version = "20170619.255";
+        version = "20170718.329";
         src = fetchFromGitHub {
           owner = "ljos";
           repo = "sparql-mode";
-          rev = "c06eac2abae29ae55794e61ebd06890909edda7c";
-          sha256 = "08w88wv3yd1l87zzwlrfj586hh3l2k1xq80f1mzskr7vkzi2ailx";
+          rev = "b2216118167d9294ff43326b3b57fa72b20e1f76";
+          sha256 = "055lq7hc9i44w21j37a0p1bm4vd40vbp4yyliaw8v6a7vg9jwhs0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode";
@@ -67033,12 +67252,12 @@
     ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ssh-deploy";
-        version = "20170711.725";
+        version = "20170725.429";
         src = fetchFromGitHub {
           owner = "cjohansson";
           repo = "emacs-ssh-deploy";
-          rev = "ec4661059109f25df41db1800cac7ffc168fdbbc";
-          sha256 = "1nqf8nwwb188mlyn8xy8v9qzq3xin2pz6synldf0yr8gac8b7bll";
+          rev = "dbd8608551bc9e05280415b7b3937b1a151c7718";
+          sha256 = "1045snp3xdfa9nf34b1f0w4ql8kjl5m2jl7imxj5n46g579g9dhr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy";
@@ -68220,8 +68439,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "dc146d9f1435b79fbfbfa702f0172b9de05f631d";
-          sha256 = "09cfs0rhhb72b12pic2w9chbc000pqnafrl2x0g8v5r065pzp64n";
+          rev = "112c5ba0df7deea11b3e91b5db3990d693eb5b72";
+          sha256 = "0fcskn4v0rx5i04qr40wa8jggsswxxp8g8hk0s4sr447mxbiksbv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -68279,12 +68498,12 @@
     switch-window = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "switch-window";
-        version = "20170701.246";
+        version = "20170718.1932";
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "switch-window";
-          rev = "f4e3fde4d4717b75716f287577e84b7ee4f33d8d";
-          sha256 = "15ks1x62rn0q8lgy4x749mizvanzl9lkzgrsasrdx0v4ydmj3n7c";
+          rev = "67113287ba61ce1951363a49f54148743dcea51e";
+          sha256 = "06s1zdy2mlw63w3rnyja9jkvq4m5b46mvi8qjwxcpgqjdihj6f6m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7d2204e3b53ade1e400e143ac219f3c7ab63a1e9/recipes/switch-window";
@@ -68968,12 +69187,12 @@
     tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tao-theme";
-        version = "20170624.1300";
+        version = "20170718.2306";
         src = fetchFromGitHub {
           owner = "11111000000";
           repo = "tao-theme-emacs";
-          rev = "bf6d718955d56b7cf824f7a60803c94a676ccb95";
-          sha256 = "0hkni0dm4s7sgx7zzk88kls8qzmz47b5g1gskp3kxg88b1nbghcw";
+          rev = "321dad4278776b63f8dcd1e67ad387531c472ed4";
+          sha256 = "0w78ssd5qj5a1l3yhi2r2dhmls5jfw2p3ic1iinsqwimkwmvh8aa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme";
@@ -69952,8 +70171,8 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "0dd823580c78a79ae9696eb9b3650e400fff140f";
-          sha256 = "1j6pq0gxlfbcfkh9pmfgqpfvdmsd1q4jx384jib12y4g0maxnf2b";
+          rev = "5c302e02c40be558a21f3a82b53e527f7bec2ff2";
+          sha256 = "0vm97r6ldd138mjdgz8g92grswfq6a20qyh1pn9sg2liygprabb2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -70010,12 +70229,12 @@
     tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
     melpaBuild {
         pname = "tide";
-        version = "20170712.638";
+        version = "20170720.2101";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "tide";
-          rev = "329d4541b1aa5f90689e84c925562d3bda708755";
-          sha256 = "10rn2lxwir488x1d43bqvsg7la818si0w1qqsf59q79hllzjclg7";
+          rev = "1a1a378060a989589cb6129fa22cfbf3eeb5eab8";
+          sha256 = "0c0hvqpg5fgcxlqadz9dsaca9chmnlf19q366rwk0a6vlcwjgb3a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -70726,12 +70945,12 @@
     tql-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tql-mode";
-        version = "20170402.1846";
+        version = "20170723.1954";
         src = fetchFromGitHub {
           owner = "tiros-dev";
           repo = "tql-mode";
-          rev = "2c4827652b4b9b640f3c55e27e1b1856ec9e2018";
-          sha256 = "08vsg5y2bg9gxzfcm630vv95d9kwzxqhzz5dzbbi3g71nlgcclk2";
+          rev = "488add79eb3fc8ec02aedaa997fe1ed9e5c3e638";
+          sha256 = "09vkqr5n66w1q5f7m1vgiv0555v23wg6j46ri52lnnslsxpxhlyv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6a7c3dec5d970a4e819c0166a4b9846d74484b08/recipes/tql-mode";
@@ -70879,12 +71098,12 @@
     transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "transmission";
-        version = "20170715.2304";
+        version = "20170723.1417";
         src = fetchFromGitHub {
           owner = "holomorph";
           repo = "transmission";
-          rev = "2c033fb7a2614a21920d1cb06665f590b97694da";
-          sha256 = "1ark2lcms43kk24352k1jbmgv5bcymmbfqhpbzrribagm5n9qr2h";
+          rev = "509eb326bf6c2e329fb083e116dab6b407be33b5";
+          sha256 = "1fzdk63qmkyah58hl4c9b1vksv8qijkmz326hzszldgm2zr9xnih";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission";
@@ -70984,12 +71203,12 @@
     treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }:
     melpaBuild {
         pname = "treemacs";
-        version = "20170705.1153";
+        version = "20170724.445";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "bbff57809095f4fb8578ca9ee28a3bac81f203b0";
-          sha256 = "12hqgxj9jfxq5wbnxpb941g4m47dyhah6kvs91x637jc8mlsdvbq";
+          rev = "e550867a72359e4a6656b6055c5c3ea26a285499";
+          sha256 = "138hsm4qs1srz2fp26v16rr233qc580wl7ix7wphkr1k1mwmw313";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs";
@@ -71009,8 +71228,8 @@
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "bbff57809095f4fb8578ca9ee28a3bac81f203b0";
-          sha256 = "12hqgxj9jfxq5wbnxpb941g4m47dyhah6kvs91x637jc8mlsdvbq";
+          rev = "e550867a72359e4a6656b6055c5c3ea26a285499";
+          sha256 = "138hsm4qs1srz2fp26v16rr233qc580wl7ix7wphkr1k1mwmw313";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil";
@@ -71023,6 +71242,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    treepy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "treepy";
+        version = "20170721.913";
+        src = fetchFromGitHub {
+          owner = "volrath";
+          repo = "treepy.el";
+          rev = "b2191139d67d024e4666b6039e39a23b15b1aba2";
+          sha256 = "170xgvwgnnqkr259d0wv6l4kcp62mb1y1wq6rnk8gp39djsqw01q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/63c94a703841f8c11948200d86d98145bc62162c/recipes/treepy";
+          sha256 = "0jfah4vywi1b6c86h7vh8fspmklhs790qzkl51i9p7yckfggwp72";
+          name = "treepy";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/treepy";
+          license = lib.licenses.free;
+        };
+      }) {};
     trident-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, skewer-mode, slime }:
     melpaBuild {
         pname = "trident-mode";
@@ -71799,8 +72039,8 @@
         src = fetchFromGitHub {
           owner = "marcowahl";
           repo = "underline-with-char";
-          rev = "f0d7fad3f5472909f52c7928192f137d2f52c255";
-          sha256 = "1qpqsspvvrfmzy93gj9h5zcj1gzf2fmw2kpl457cllvrks7yb8ry";
+          rev = "b792d4f822bceb0ab0ee63ddcaeddc2085ed3188";
+          sha256 = "0s2p2kjw00p3j9z6hj0d89z3bbwcs12z0h0hg5bjxcb1580dqxhq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e24888ccf61ac05eba5c30a47d35653f2badf019/recipes/underline-with-char";
@@ -71878,12 +72118,12 @@
     unfill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "unfill";
-        version = "20160816.2300";
+        version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "unfill";
-          rev = "88186dce0de69e8f4aeaf2bfdc77d62210f19cd8";
-          sha256 = "0wyradin5igp25nsd3n22i2ppxhmy49ac1iq1w2715v8pfmiydnc";
+          rev = "d1056ec5ce7bb18abe8933c1e4d5932fb98fb78e";
+          sha256 = "0qbcm7qf33xlbj7wx3164q8m6b8qzgv6w13pk8568nrmb1f8qna8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2ade389a20419b3e29a613409ac73a16b7c5bddb/recipes/unfill";
@@ -72328,12 +72568,12 @@
     use-package-chords = callPackage ({ bind-chord, bind-key, fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild, use-package }:
     melpaBuild {
         pname = "use-package-chords";
-        version = "20170208.1035";
+        version = "20170717.1152";
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "use-package-chords";
-          rev = "e8551ce8a514d865831d3a889acece79103fc627";
-          sha256 = "0500pqsszg7h7923i0kyjirdyhj8aza3a2h5wbqzdpli2aqra5a5";
+          rev = "f47b2dc8d79f02e5fe39de1f63c78a6c09be2026";
+          sha256 = "0nwcs3akf1cy7dv36n5s5hsr67djfcn7w499vamn0yh16bs7r5ds";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92fbae4e0bcc1d5ad9f3f42d01f08ab4c3450f1f/recipes/use-package-chords";
@@ -74382,8 +74622,8 @@
         src = fetchFromGitHub {
           owner = "foretagsplatsen";
           repo = "emacs-js";
-          rev = "2b3ba6dcc3e99cea75d4bf2b4e6cf0898d9a2615";
-          sha256 = "0yga1vf54lf35my64ixw5ssq6jr6ph914afqv5r2gri007bi2zvw";
+          rev = "ec98973a39d32d7c5d908d61383def5c50fa867d";
+          sha256 = "1pf3sa1xfszaakfcjfllhqc624vmxxgy1g5mksbb36d7jjzx0jcb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs";
@@ -74647,12 +74887,12 @@
     window-purpose = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, imenu-list, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "window-purpose";
-        version = "20161017.433";
+        version = "20170722.655";
         src = fetchFromGitHub {
           owner = "bmag";
           repo = "emacs-purpose";
-          rev = "67ecaa2b52c113f92913c3beb9fb7f302bd50318";
-          sha256 = "0jvihc94iwrb2zxr1qg9yc5fypd1a028d2wfhvg68ipmngcf4q2g";
+          rev = "00ddafcf4802e7430ca709769b888656a6eb421b";
+          sha256 = "1c3jf1cxfvja1v323wkxkd67n9nwzb57c79x4m010h2700xim8vs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5813120ab674f6db7d0a486433d8faa6cfec1727/recipes/window-purpose";
@@ -74755,8 +74995,8 @@
         version = "20160419.1232";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/wisp";
-          rev = "f94ec5fed665";
-          sha256 = "0k66dxxc8k2snzmw385a78xqfgbpjzsfg3jm0gk5wqyn185ab50n";
+          rev = "1ab8f296baeb";
+          sha256 = "02g34b7kp3lkv4sfgf1762vlmmsnxib37v8385lmv90ww24lwggg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -74772,12 +75012,12 @@
     wispjs-mode = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "wispjs-mode";
-        version = "20140103.1432";
+        version = "20170720.1219";
         src = fetchFromGitHub {
           owner = "krisajenkins";
           repo = "wispjs-mode";
-          rev = "be094c3c3223c07b26b5d8bb8fa7aa6866369b3f";
-          sha256 = "188h1sy4mxzrkwi3zgiw108c5f71rkj5agdkf9yy9v8c1bkawm4x";
+          rev = "60f9f5fd9d1556e2d008939f67eb1b1d0f325fa8";
+          sha256 = "1hhd8ixb2wr06vrd1kw0cd5jh08zm86h2clbvzv9wmqpawwxfm5f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a628330ee8deeab2bd5c2d4b61b33f119c4549d8/recipes/wispjs-mode";
@@ -74832,6 +75072,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    with-simulated-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
+    melpaBuild {
+        pname = "with-simulated-input";
+        version = "20170723.941";
+        src = fetchFromGitHub {
+          owner = "DarwinAwardWinner";
+          repo = "with-simulated-input";
+          rev = "f0dbf2fdd99c6afe7ab2af83c94a4028e4af9c1c";
+          sha256 = "03y3j0q2iy9mgm0yn4mnxkdwwda8jsy6rsm0qdzha8gq4cdcqrjj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e4ddf16e19f5018106a423327ddc7e7499cf9248/recipes/with-simulated-input";
+          sha256 = "0113la76nbp18vaffsd7w7wcw5k2sqwgnjq1gslf4khdfqghrkwk";
+          name = "with-simulated-input";
+        };
+        packageRequires = [ emacs s seq ];
+        meta = {
+          homepage = "https://melpa.org/#/with-simulated-input";
+          license = lib.licenses.free;
+        };
+      }) {};
     wn-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "wn-mode";
@@ -74982,12 +75243,12 @@
     worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "worf";
-        version = "20170427.8";
+        version = "20170724.1132";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "worf";
-          rev = "8b0de0d0896aa82a31d13972baf15de56ca5516e";
-          sha256 = "14jk3sinxrb2685y5dslrik10cwjwjc76pgwj3w47h4s6ykarwn8";
+          rev = "e66659923bd53be40a0f0ee1d7fe8a14d22f6973";
+          sha256 = "155sz3hl2ly9m4i8nr2bxham5vzpa2bi9cvgna35gbkp1d34mm41";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf";
@@ -75339,12 +75600,12 @@
     xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-elisp-mode";
-        version = "20170713.629";
+        version = "20170725.420";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-elisp-mode";
-          rev = "e28f16121619f1a929803ef1274d2853d1b43656";
-          sha256 = "1l7yf3k5gdz7flm8qqzkcdpj3cx9q1kklbl2znkxiyb6rvgh7qf2";
+          rev = "4557ee44475b50061219653f0178efd9d832a79f";
+          sha256 = "06fx2mnyd7qs867m1hjzzj47wj06hhqz74bwif6rzhy5v4j7wdcr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode";
@@ -75381,12 +75642,12 @@
     xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-fly-keys";
-        version = "20170713.626";
+        version = "20170725.1253";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-fly-keys";
-          rev = "23dae1d6d14d238227e1ee0afeef6ef1561b0c31";
-          sha256 = "1mlqhmk9qpa34p30f8m0ylfajzyvq49qvl3hklgrzqgc9xx4yhxd";
+          rev = "7f884f13d01a5914e0201d58eef7275a6f884cae";
+          sha256 = "1sgh3mk7f1p92jmzcga67bcc4s6ciipc7ga1biav0r3nqfk087jy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys";
@@ -76036,8 +76297,8 @@
         src = fetchFromGitHub {
           owner = "drdv";
           repo = "yahtzee";
-          rev = "1b6d6cc5651a02547415cd571658efcafd9d36fa";
-          sha256 = "0xzw5inzpd2djqx8q276vhiw5j19irkaygnmjn5m5kh2xpzb6aah";
+          rev = "d0671b315a8411ec299af63742813783e3eff04d";
+          sha256 = "1a9rc2k4rah80hmwwmk8ca8k0s2812qsigci072lvc8x49smylld";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee";
@@ -76219,12 +76480,12 @@
     yara-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yara-mode";
-        version = "20170713.2206";
+        version = "20170719.2351";
         src = fetchFromGitHub {
           owner = "binjo";
           repo = "yara-mode";
-          rev = "e3eb352a2e295a8a0955bc3e853f1edfd93cbf81";
-          sha256 = "1dn2ssshwj94nmhd2pnvqdwj0za3iri9ky4kd4w50kj9jz18d1wz";
+          rev = "af5c05b34a29fc1bd73a6d21c82cc76320b33e5c";
+          sha256 = "1v8z3cwwla42d3r317091g5i7bj1hlbr9sd1p9s9b7y134gpd1xp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef22d2dad1bae62721710bbff4b7228204d7c425/recipes/yara-mode";
@@ -76324,12 +76585,12 @@
     yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yasnippet";
-        version = "20170716.1223";
+        version = "20170723.1530";
         src = fetchFromGitHub {
           owner = "joaotavora";
           repo = "yasnippet";
-          rev = "2a3a0cd2b18c21fc5f391273045f466c41da743c";
-          sha256 = "09s7ad3wl4rrmdyi0cxmn6vnpkcf97x0g0csy8a8lijsjnrvk4r9";
+          rev = "0463c75b636fe02273c2b8ca85f36b56a206c5c5";
+          sha256 = "1l8h681x5v78k6wkcmhb5kdw9mc13kcmq3aiqg0r9dn493ifj1v1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
@@ -76365,11 +76626,11 @@
       }) {};
     yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "yatex";
-        version = "20170611.1642";
+        version = "20170723.1909";
         src = fetchhg {
           url = "https://www.yatex.org/hgrepos/yatex/";
-          rev = "e9299b77df1f";
-          sha256 = "0nnpzcj23q964v4rfxzdll1r95zd6zzqvzcgxh7h603a41r3w1wm";
+          rev = "4f8551386af2";
+          sha256 = "0qvp54pzc6m52j5xkwp25nwdlik6v879halmfvcpn3z0grhrslbn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex";
@@ -76427,12 +76688,12 @@
     ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }:
     melpaBuild {
         pname = "ycmd";
-        version = "20170710.103";
+        version = "20170723.1458";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "35e8a31e32d0de890547612db8373d7333db8d8a";
-          sha256 = "023bkmviaqb85kwwlpmzfc5gycf4i7w8a43zhbmvasfjjb962yzd";
+          rev = "5c3e07b46e4c25bbd0a2068a5091c8f27b344da6";
+          sha256 = "04nb5cjlghkk47a0girnlxlcrclylhg1zx41q5lcvnzb1is06skh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd";
@@ -76687,12 +76948,12 @@
     zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "zerodark-theme";
-        version = "20170709.1248";
+        version = "20170721.214";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "zerodark-theme";
-          rev = "379df55b3ea6f217e0187fb8cb6df70d02236cec";
-          sha256 = "0nj7qvr0z3gq31db8r3jsdljj93r0cijssbwxgqscvm945jpxc6x";
+          rev = "b187aee9351f0ec94d87156223e5b434b58aa2a8";
+          sha256 = "1fidrmf2ljhzm9prk8a6y35djgzyj9bsla7pwacjknkqza3pjpbi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme";
@@ -77062,12 +77323,12 @@
     zoutline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zoutline";
-        version = "20160915.503";
+        version = "20170722.651";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "zoutline";
-          rev = "714c10a25112b3da62696585bea289c3f8e74158";
-          sha256 = "1z45p9i89lhqak993kq7rdji84rxrdcsnz1yz9xa2l758mnq5gp1";
+          rev = "e86e739b53a1c8a0a2cf6de43dffabb15d465507";
+          sha256 = "0ycri5d61pbwhwpwh9qx9m22mb4ab7bgniwgdbi9s8rzqs4q1p91";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a26341f491145938aee9b531cd861200bfa2f6d/recipes/zoutline";
@@ -77080,21 +77341,21 @@
           license = lib.licenses.free;
         };
       }) {};
-    zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser }:
+    zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser, request }:
     melpaBuild {
         pname = "zpresent";
-        version = "20170710.2029";
+        version = "20170724.2249";
         src = fetchhg {
           url = "https://bitbucket.com/zck/zpresent.el";
-          rev = "96131375ac74";
-          sha256 = "1p19yy0xyf962rc0j3k4jxl9vyjjyd1ar61wmp6mf6jplj7sxyfl";
+          rev = "620afddbc133";
+          sha256 = "1cjnig9x8xsdjyxdp3wmc8dhp050xzqvi8ca0hrd1fgwzgvg0wvv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent";
           sha256 = "0316qyspmdbg94aw620133ilh8kfpr3db1p2cifgccgcacjv3v5j";
           name = "zpresent";
         };
-        packageRequires = [ dash emacs org-parser ];
+        packageRequires = [ dash emacs org-parser request ];
         meta = {
           homepage = "https://melpa.org/#/zpresent";
           license = lib.licenses.free;

From d79072ac2e63f5e5df089d2bfb873752ddf7a1ae Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Wed, 26 Jul 2017 18:21:27 +0200
Subject: [PATCH 008/122] bspwm: 0.9.2 -> 0.9.3

---
 .../window-managers/bspwm/default.nix         | 31 +++++++++----------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix
index 8798d2b3832..dc9d2f35965 100644
--- a/pkgs/applications/window-managers/bspwm/default.nix
+++ b/pkgs/applications/window-managers/bspwm/default.nix
@@ -1,30 +1,27 @@
-{ stdenv, fetchurl, libxcb, libXinerama, sxhkd, xcbutil, xcbutilkeysyms, xcbutilwm }:
+{ stdenv, fetchFromGitHub, libxcb, libXinerama
+, sxhkd, xcbutil, xcbutilkeysyms, xcbutilwm
+}:
 
 stdenv.mkDerivation rec {
   name = "bspwm-${version}";
-  version = "0.9.2";
+  version = "0.9.3";
 
-
-  src = fetchurl {
-    url = "https://github.com/baskerville/bspwm/archive/${version}.tar.gz";
-    sha256 = "1w6wxwgyb14w664xafp3b2ps6zzf9yw7cfhbh9229x2hil9rss1k";
+  src = fetchFromGitHub {
+    owner  = "baskerville";
+    repo   = "bspwm";
+    rev    = version;
+    sha256 = "144g0vg0jsy0lja2jv1qbdps8k05nk70pc7vslj3im61a21vnbis";
   };
 
   buildInputs = [ libxcb libXinerama xcbutil xcbutilkeysyms xcbutilwm ];
 
-  buildPhase = ''
-    make PREFIX=$out
-  '';
+  PREFIX = "$out";
 
-  installPhase = ''
-    make PREFIX=$out install
-  '';
-
-  meta = {
+  meta = with stdenv.lib; {
     description = "A tiling window manager based on binary space partitioning";
     homepage = http://github.com/baskerville/bspwm;
-    maintainers = [ stdenv.lib.maintainers.meisternu stdenv.lib.maintainers.epitrochoid ];
-    license = stdenv.lib.licenses.bsd2;
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = with maintainers; [ meisternu epitrochoid ];
+    license = licenses.bsd2;
+    platforms = platforms.linux;
   };
 }

From 2989324d60c04c82dd00153e0c9db6a7e8461c17 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Wed, 26 Jul 2017 17:13:57 +0100
Subject: [PATCH 009/122] aws-auth: init at unstable-2017-07-24

---
 pkgs/tools/admin/aws-auth/default.nix | 31 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/admin/aws-auth/default.nix

diff --git a/pkgs/tools/admin/aws-auth/default.nix b/pkgs/tools/admin/aws-auth/default.nix
new file mode 100644
index 00000000000..6d03a95d96a
--- /dev/null
+++ b/pkgs/tools/admin/aws-auth/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, makeWrapper, jq, awscli }:
+
+stdenv.mkDerivation rec {
+  version = "unstable-2017-07-24";
+  name = "aws-auth-${version}";
+
+  src = fetchFromGitHub {
+    owner = "alphagov";
+    repo = "aws-auth";
+    rev = "5a4c9673f9f00ebaa4bb538827e1c2f277c475e1";
+    sha256 = "095j9zqxra8hi2iyz0y4azs9yigy5f6alqkfmv180pm75nbc031g";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  phases = [ "installPhase" ];
+
+  # copy script and set $PATH
+  installPhase = ''
+    mkdir -p $out/bin
+    cp $src/aws-auth.sh $out/bin/aws-auth
+    wrapProgram $out/bin/aws-auth --prefix PATH : ${awscli}/bin:${jq}/bin
+  '';
+
+  meta = {
+    homepage = https://github.com/alphagov/aws-auth;
+    description = "AWS authentication wrapper to handle MFA and IAM roles";
+    license = stdenv.lib.licenses.mit;
+    maintainers = with stdenv.lib.maintainers; [ ris ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e673ecde6dd..7c26ba7c826 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -511,6 +511,8 @@ with pkgs;
 
   awless = callPackage ../tools/virtualization/awless { };
 
+  aws-auth = callPackage ../tools/admin/aws-auth { };
+
   ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { };
 
   ec2_ami_tools = callPackage ../tools/virtualization/ec2-ami-tools { };

From 27800258e117249b40352acd1cc31af5c8374f61 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 26 Jul 2017 18:45:01 +0200
Subject: [PATCH 010/122] aws-auth: clean up

---
 pkgs/tools/admin/aws-auth/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/admin/aws-auth/default.nix b/pkgs/tools/admin/aws-auth/default.nix
index 6d03a95d96a..9f36a6403a1 100644
--- a/pkgs/tools/admin/aws-auth/default.nix
+++ b/pkgs/tools/admin/aws-auth/default.nix
@@ -11,15 +11,15 @@ stdenv.mkDerivation rec {
     sha256 = "095j9zqxra8hi2iyz0y4azs9yigy5f6alqkfmv180pm75nbc031g";
   };
 
-  buildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ];
 
-  phases = [ "installPhase" ];
+  dontBuild = true;
 
   # copy script and set $PATH
   installPhase = ''
-    mkdir -p $out/bin
-    cp $src/aws-auth.sh $out/bin/aws-auth
-    wrapProgram $out/bin/aws-auth --prefix PATH : ${awscli}/bin:${jq}/bin
+    install -D $src/aws-auth.sh $out/bin/aws-auth
+    wrapProgram $out/bin/aws-auth \
+      --prefix PATH : ${stdenv.lib.makeBinPath [ awscli jq ]}
   '';
 
   meta = {

From 40a568b395cd5ded4063abb753a5f4a0b7d018a4 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 26 Jul 2017 18:53:34 +0200
Subject: [PATCH 011/122] android-studio-preview: 3.0.0.6 -> 3.0.0.7

---
 pkgs/applications/editors/android-studio/packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/packages.nix b/pkgs/applications/editors/android-studio/packages.nix
index 860f1e53297..1dab1d47206 100644
--- a/pkgs/applications/editors/android-studio/packages.nix
+++ b/pkgs/applications/editors/android-studio/packages.nix
@@ -27,12 +27,12 @@ in rec {
 
   preview = mkStudio rec {
     pname = "android-studio-preview";
-    version = "3.0.0.6";
-    build = "171.4182969";
+    version = "3.0.0.7"; # This is actually "Android Studio 3.0 Canary 8"
+    build = "171.4195411";
 
     src = fetchurl {
       url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip";
-      sha256 = "0s26k5qr0qg6az77yw2mvnhavwi4aza4ifvd45ljank8aqr6sp5i";
+      sha256 = "1yzhr845shjq2cd5hcanppxmnj34ky9ry755y4ywf5f1w5ha5xzj";
     };
 
     meta = stable.meta // {

From 44a18ddd317e47d7330b56077fef8be3f4a66c80 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 26 Jul 2017 20:32:29 +0300
Subject: [PATCH 012/122] python.pkgs: move my several packages to separate
 files

---
 .../python-modules/hmmlearn/default.nix       | 23 +++++++
 .../python-modules/pychromecast/default.nix   | 21 ++++++
 .../python-modules/sphfile/default.nix        | 23 +++++++
 pkgs/top-level/python-packages.nix            | 66 ++-----------------
 4 files changed, 72 insertions(+), 61 deletions(-)
 create mode 100644 pkgs/development/python-modules/hmmlearn/default.nix
 create mode 100644 pkgs/development/python-modules/pychromecast/default.nix
 create mode 100644 pkgs/development/python-modules/sphfile/default.nix

diff --git a/pkgs/development/python-modules/hmmlearn/default.nix b/pkgs/development/python-modules/hmmlearn/default.nix
new file mode 100644
index 00000000000..eeb04245215
--- /dev/null
+++ b/pkgs/development/python-modules/hmmlearn/default.nix
@@ -0,0 +1,23 @@
+{ lib, fetchurl, buildPythonPackage, numpy }:
+
+buildPythonPackage rec {
+  name = "hmmlearn-${version}";
+  version = "0.2.0";
+
+  src = fetchurl {
+    url = "mirror://pypi/h/hmmlearn/${name}.tar.gz";
+    sha256 = "0qc3fkdyrgfg31y1a8jzs83dxkjw78pqkdm44lll1iib63w4cik9";
+  };
+
+  propagatedBuildInputs = [ numpy ];
+
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Hidden Markov Models in Python with scikit-learn like API";
+    homepage    = "https://github.com/hmmlearn/hmmlearn";
+    license     = licenses.bsd3;
+    maintainers = with maintainers; [ abbradar ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix
new file mode 100644
index 00000000000..440a1aa7785
--- /dev/null
+++ b/pkgs/development/python-modules/pychromecast/default.nix
@@ -0,0 +1,21 @@
+{ lib, fetchurl, buildPythonPackage, requests, six, zeroconf, protobuf }:
+
+buildPythonPackage rec {
+  name    = "PyChromecast-${version}";
+  version = "0.8.1";
+
+  src = fetchurl {
+    url    = "mirror://pypi/p/pychromecast/${name}.tar.gz";
+    sha256 = "05rlr2hjng0xg2a9k9vwmrlvd7vy9sjhxxfl96kx25xynlkq6yq6";
+  };
+
+  propagatedBuildInputs = [ requests six zeroconf protobuf ];
+
+  meta = with lib; {
+    description = "Library for Python 2 and 3 to communicate with the Google Chromecast";
+    homepage    = "https://github.com/balloob/pychromecast";
+    license     = licenses.mit;
+    maintainers = with maintainers; [ abbradar ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/development/python-modules/sphfile/default.nix b/pkgs/development/python-modules/sphfile/default.nix
new file mode 100644
index 00000000000..8c2351c981e
--- /dev/null
+++ b/pkgs/development/python-modules/sphfile/default.nix
@@ -0,0 +1,23 @@
+{ lib, fetchurl, buildPythonPackage, numpy }:
+
+buildPythonPackage rec {
+  name = "sphfile-${version}";
+  version = "1.0.0";
+
+  src = fetchurl {
+    url = "mirror://pypi/s/sphfile/${name}.tar.gz";
+    sha256 = "1ly9746xrzbiax9cxr5sxlg0wvf6fdxcrgwsqqxckk3wnqfypfrd";
+  };
+
+  propagatedBuildInputs = [ numpy ];
+
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Numpy-based NIST SPH audio-file reader";
+    homepage    = "https://github.com/mcfletch/sphfile";
+    license     = licenses.mit;
+    maintainers = with maintainers; [ abbradar ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b57a508433d..5a817b75292 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -194,24 +194,8 @@ in {
 
   pycryptodome = callPackage ../development/python-modules/pycryptodome { };
 
-  PyChromecast = buildPythonPackage rec {
-    name    = "PyChromecast-${version}";
-    version = "0.8.1";
-
-    src = pkgs.fetchurl {
-      url    = "mirror://pypi/p/pychromecast/${name}.tar.gz";
-      sha256 = "05rlr2hjng0xg2a9k9vwmrlvd7vy9sjhxxfl96kx25xynlkq6yq6";
-    };
-
-    propagatedBuildInputs = with self; [ requests six zeroconf protobuf3_2 ];
-
-    meta = {
-      description = "Library for Python 2 and 3 to communicate with the Google Chromecast";
-      homepage    = "https://github.com/balloob/pychromecast";
-      license     = licenses.mit;
-      maintainers = with maintainers; [ abbradar ];
-      platforms   = platforms.linux;
-    };
+  PyChromecast = callPackage ../development/python-modules/pychromecast {
+    protobuf = self.protobuf3_2;
   };
 
   pyexiv2 = if (!isPy3k) then callPackage ../development/python-modules/pyexiv2 {} else throw "pyexiv2 not supported for interpreter ${python.executable}";
@@ -11363,49 +11347,7 @@ in {
     propagatedBuildInputs = with self; [ requests webob ];
   };
 
-  hmmlearn = buildPythonPackage rec {
-    name = "hmmlearn-${version}";
-    version = "0.2.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/h/hmmlearn/${name}.tar.gz";
-      sha256 = "0qc3fkdyrgfg31y1a8jzs83dxkjw78pqkdm44lll1iib63w4cik9";
-    };
-
-    propagatedBuildInputs = with self; [ numpy ];
-
-    doCheck = false;
-
-    meta = {
-      description = "Hidden Markov Models in Python with scikit-learn like API";
-      homepage    = "https://github.com/hmmlearn/hmmlearn";
-      license     = licenses.bsd3;
-      maintainers = with maintainers; [ abbradar ];
-      platforms   = platforms.unix;
-    };
-  };
-
-   sphfile = buildPythonPackage rec {
-    name = "sphfile-${version}";
-    version = "1.0.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/sphfile/${name}.tar.gz";
-      sha256 = "1ly9746xrzbiax9cxr5sxlg0wvf6fdxcrgwsqqxckk3wnqfypfrd";
-    };
-
-    propagatedBuildInputs = with self; [ numpy ];
-
-    doCheck = false;
-
-    meta = {
-      description = "Numpy-based NIST SPH audio-file reader";
-      homepage    = "https://github.com/mcfletch/sphfile";
-      license     = licenses.mit;
-      maintainers = with maintainers; [ abbradar ];
-      platforms   = platforms.unix;
-    };
-  }; 
+  hmmlearn = callPackage ../development/python-modules/hmmlearn { };
 
   hcs_utils = buildPythonPackage rec {
     name = "hcs_utils-1.5";
@@ -21967,6 +21909,8 @@ in {
     };
   };
 
+  sphfile = callPackage ../development/python-modules/sphfile { };
+
   sqlite3dbm = buildPythonPackage rec {
     name = "sqlite3dbm-0.1.4";
     disabled = isPy3k;

From d680c2352c7d7b12ef7f5b9404df494c068dd1f4 Mon Sep 17 00:00:00 2001
From: William Casarin <jb55@jb55.com>
Date: Wed, 26 Jul 2017 10:41:39 -0700
Subject: [PATCH 013/122] jailbreak-cabal: specifically use ghc802 override in
 ghc821 config

Otherwise this will infinite loop when:

  pkgs.haskellPackages = pkgs.haskell.packages.ghc821
---
 pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index 8e18435c0c4..b29a1820d49 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -40,7 +40,7 @@ self: super: {
   cabal-install = super.cabal-install.override { Cabal = null; };
 
   # jailbreak-cabal doesn't seem to work right with the native Cabal version.
-  jailbreak-cabal = pkgs.haskellPackages.jailbreak-cabal;
+  jailbreak-cabal = pkgs.haskell.packages.ghc802.jailbreak-cabal;
 
   # https://github.com/bmillwood/applicative-quoters/issues/6
   applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch {

From 77e9a04a2bc2a898b7236ec8c3a8ac9679c9d8ae Mon Sep 17 00:00:00 2001
From: William Casarin <jb55@jb55.com>
Date: Wed, 26 Jul 2017 10:44:12 -0700
Subject: [PATCH 014/122] maintainers: update my(jb55) email

---
 lib/maintainers.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index e10136bf070..a80b7c41a00 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -248,7 +248,7 @@
   jammerful = "jammerful <jammerful@gmail.com>";
   jansol = "Jan Solanti <jan.solanti@paivola.fi>";
   javaguirre = "Javier Aguirre <contacto@javaguirre.net>";
-  jb55 = "William Casarin <bill@casarin.me>";
+  jb55 = "William Casarin <jb55@jb55.com>";
   jbedo = "Justin Bedő <cu@cua0.org>";
   jcumming = "Jack Cummings <jack@mudshark.org>";
   jdagilliland = "Jason Gilliland <jdagilliland@gmail.com>";

From c3d5cfdc3ca709a9c5081b1a11bca533bc4788af Mon Sep 17 00:00:00 2001
From: Martin Wohlert <martin@b-root-force.de>
Date: Mon, 22 May 2017 20:07:04 +0200
Subject: [PATCH 015/122] swap: extend randomEncryption to plainOpen and
 ability to select cipher

---
 nixos/modules/config/swap.nix         | 42 ++++++++++++++++++++-------
 nixos/modules/system/boot/stage-1.nix |  2 +-
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/config/swap.nix b/nixos/modules/config/swap.nix
index 5d47b09ded9..769029e1b04 100644
--- a/nixos/modules/config/swap.nix
+++ b/nixos/modules/config/swap.nix
@@ -45,7 +45,7 @@ let
         '';
       };
 
-      randomEncryption = mkOption {
+      randomEncryption.enable = mkOption {
         default = false;
         type = types.bool;
         description = ''
@@ -61,6 +61,26 @@ let
         '';
       };
 
+      randomEncryption.cipher = mkOption {
+        default = "aes-xts-plain64";
+        example = "serpent-xts-plain64";
+        type = types.str;
+        description = ''
+          Use specified cipher for randomEncryption.
+
+          Hint: Run "cryptsetup benchmark" to see which one is fastest on your machine.
+        '';
+      };
+
+      randomEncryption.source = mkOption {
+        default = "/dev/urandom";
+        example = "/dev/random";
+        type = types.str;
+        description = ''
+          Define the source of randomness to obtain a random key for encryption.
+        '';
+      };
+
       deviceName = mkOption {
         type = types.str;
         internal = true;
@@ -77,7 +97,7 @@ let
       device = mkIf options.label.isDefined
         "/dev/disk/by-label/${config.label}";
       deviceName = lib.replaceChars ["\\"] [""] (escapeSystemdPath config.device);
-      realDevice = if config.randomEncryption then "/dev/mapper/${deviceName}" else config.device;
+      realDevice = if config.randomEncryption.enable then "/dev/mapper/${deviceName}" else config.device;
     };
 
   };
@@ -125,14 +145,14 @@ in
 
         createSwapDevice = sw:
           assert sw.device != "";
-          assert !(sw.randomEncryption && lib.hasPrefix "/dev/disk/by-uuid"  sw.device);
-          assert !(sw.randomEncryption && lib.hasPrefix "/dev/disk/by-label" sw.device);
+          assert !(sw.randomEncryption.enable && lib.hasPrefix "/dev/disk/by-uuid"  sw.device);
+          assert !(sw.randomEncryption.enable && lib.hasPrefix "/dev/disk/by-label" sw.device);
           let realDevice' = escapeSystemdPath sw.realDevice;
           in nameValuePair "mkswap-${sw.deviceName}"
           { description = "Initialisation of swap device ${sw.device}";
             wantedBy = [ "${realDevice'}.swap" ];
             before = [ "${realDevice'}.swap" ];
-            path = [ pkgs.utillinux ] ++ optional sw.randomEncryption pkgs.cryptsetup;
+            path = [ pkgs.utillinux ] ++ optional sw.randomEncryption.enable pkgs.cryptsetup;
 
             script =
               ''
@@ -145,11 +165,11 @@ in
                       truncate --size "${toString sw.size}M" "${sw.device}"
                     fi
                     chmod 0600 ${sw.device}
-                    ${optionalString (!sw.randomEncryption) "mkswap ${sw.realDevice}"}
+                    ${optionalString (!sw.randomEncryption.enable) "mkswap ${sw.realDevice}"}
                   fi
                 ''}
-                ${optionalString sw.randomEncryption ''
-                  cryptsetup open ${sw.device} ${sw.deviceName} --type plain --key-file /dev/urandom
+                ${optionalString sw.randomEncryption.enable ''
+                  cryptsetup plainOpen -c ${sw.randomEncryption.cipher} -d ${sw.randomEncryption.source} ${sw.device} ${sw.deviceName}
                   mkswap ${sw.realDevice}
                 ''}
               '';
@@ -157,12 +177,12 @@ in
             unitConfig.RequiresMountsFor = [ "${dirOf sw.device}" ];
             unitConfig.DefaultDependencies = false; # needed to prevent a cycle
             serviceConfig.Type = "oneshot";
-            serviceConfig.RemainAfterExit = sw.randomEncryption;
-            serviceConfig.ExecStop = optionalString sw.randomEncryption "${pkgs.cryptsetup}/bin/cryptsetup luksClose ${sw.deviceName}";
+            serviceConfig.RemainAfterExit = sw.randomEncryption.enable;
+            serviceConfig.ExecStop = optionalString sw.randomEncryption.enable "${pkgs.cryptsetup}/bin/cryptsetup luksClose ${sw.deviceName}";
             restartIfChanged = false;
           };
 
-      in listToAttrs (map createSwapDevice (filter (sw: sw.size != null || sw.randomEncryption) config.swapDevices));
+      in listToAttrs (map createSwapDevice (filter (sw: sw.size != null || sw.randomEncryption.enable) config.swapDevices));
 
   };
 
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 02870878c0f..d6e3e3a87d0 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -207,7 +207,7 @@ let
       preLVMCommands preDeviceCommands postDeviceCommands postMountCommands preFailCommands kernelModules;
 
     resumeDevices = map (sd: if sd ? device then sd.device else "/dev/disk/by-label/${sd.label}")
-                    (filter (sd: hasPrefix "/dev/" sd.device && !sd.randomEncryption
+                    (filter (sd: hasPrefix "/dev/" sd.device && !sd.randomEncryption.enable
                              # Don't include zram devices
                              && !(hasPrefix "/dev/zram" sd.device)
                             ) config.swapDevices);

From 9be26f81caf167f32c6af5cb876f48d7fad7d2c3 Mon Sep 17 00:00:00 2001
From: Martin Wohlert <martin@b-root-force.de>
Date: Sun, 28 May 2017 14:46:18 +0200
Subject: [PATCH 016/122] change swap.randomEncryption config option to
 "coercedTo" for backwards compatibility

---
 nixos/modules/config/swap.nix | 77 +++++++++++++++++++++++++----------
 1 file changed, 55 insertions(+), 22 deletions(-)

diff --git a/nixos/modules/config/swap.nix b/nixos/modules/config/swap.nix
index 769029e1b04..fed3fa3bc7c 100644
--- a/nixos/modules/config/swap.nix
+++ b/nixos/modules/config/swap.nix
@@ -5,6 +5,52 @@ with lib;
 
 let
 
+  randomEncryptionCoerce = enable: { inherit enable; };
+
+  randomEncryptionOpts = { ... }: {
+
+    options = {
+
+      enable = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Encrypt swap device with a random key. This way you won't have a persistent swap device.
+
+          WARNING: Don't try to hibernate when you have at least one swap partition with
+          this option enabled! We have no way to set the partition into which hibernation image
+          is saved, so if your image ends up on an encrypted one you would lose it!
+
+          WARNING #2: Do not use /dev/disk/by-uuid/… or /dev/disk/by-label/… as your swap device
+          when using randomEncryption as the UUIDs and labels will get erased on every boot when
+          the partition is encrypted. Best to use /dev/disk/by-partuuid/…
+        '';
+      };
+
+      cipher = mkOption {
+        default = "aes-xts-plain64";
+        example = "serpent-xts-plain64";
+        type = types.str;
+        description = ''
+          Use specified cipher for randomEncryption.
+
+          Hint: Run "cryptsetup benchmark" to see which one is fastest on your machine.
+        '';
+      };
+
+      source = mkOption {
+        default = "/dev/urandom";
+        example = "/dev/random";
+        type = types.str;
+        description = ''
+          Define the source of randomness to obtain a random key for encryption.
+        '';
+      };
+
+    };
+
+  };
+
   swapCfg = {config, options, ...}: {
 
     options = {
@@ -45,12 +91,19 @@ let
         '';
       };
 
-      randomEncryption.enable = mkOption {
+      randomEncryption = mkOption {
         default = false;
-        type = types.bool;
+        example = {
+          enable = true;
+          cipher = "serpent-xts-plain64";
+          source = "/dev/random";
+        };
+        type = types.coercedTo types.bool randomEncryptionCoerce (types.submodule randomEncryptionOpts);
         description = ''
           Encrypt swap device with a random key. This way you won't have a persistent swap device.
 
+          HINT: run "cryptsetup benchmark" to test cipher performance on your machine.
+
           WARNING: Don't try to hibernate when you have at least one swap partition with
           this option enabled! We have no way to set the partition into which hibernation image
           is saved, so if your image ends up on an encrypted one you would lose it!
@@ -61,26 +114,6 @@ let
         '';
       };
 
-      randomEncryption.cipher = mkOption {
-        default = "aes-xts-plain64";
-        example = "serpent-xts-plain64";
-        type = types.str;
-        description = ''
-          Use specified cipher for randomEncryption.
-
-          Hint: Run "cryptsetup benchmark" to see which one is fastest on your machine.
-        '';
-      };
-
-      randomEncryption.source = mkOption {
-        default = "/dev/urandom";
-        example = "/dev/random";
-        type = types.str;
-        description = ''
-          Define the source of randomness to obtain a random key for encryption.
-        '';
-      };
-
       deviceName = mkOption {
         type = types.str;
         internal = true;

From 0a4c43065c5fe4bd599399c02321bb6dd39421af Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Tue, 25 Jul 2017 11:24:49 +0200
Subject: [PATCH 017/122] docker: do not import configuration and manifest from
 the base image

Fix #27632.
---
 pkgs/build-support/docker/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 0d02897da74..0c85941b6a1 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -435,6 +435,9 @@ rec {
         if [[ -n "$fromImage" ]]; then
           echo "Unpacking base image..."
           tar -C image -xpf "$fromImage"
+          # Do not import the base image configuration and manifest
+          rm -f image/*.json
+          rm -f image/manifest.json
 
           if [[ -z "$fromImageName" ]]; then
             fromImageName=$(jshon -k < image/repositories|head -n1)

From a7c8f5e419ba07711c132bf81baaab0e74862cce Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 26 Jul 2017 20:01:28 +0200
Subject: [PATCH 018/122] debian: 8.8 -> 8.9

---
 pkgs/build-support/vm/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index d5cfc419fc7..8ec82214964 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1954,22 +1954,22 @@ rec {
     };
 
     debian8i386 = {
-      name = "debian-8.8-jessie-i386";
-      fullName = "Debian 8.8 Jessie (i386)";
+      name = "debian-8.9-jessie-i386";
+      fullName = "Debian 8.9 Jessie (i386)";
       packagesList = fetchurl {
         url = mirror://debian/dists/jessie/main/binary-i386/Packages.xz;
-        sha256 = "79dbf81e9698913c577333f47f5a56be78529fba265ec492880e8c369c478b58";
+        sha256 = "3c78bdf3b693f2f37737c52d6a7718b3a545956f2a853da79f04a2d15541e811";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;
     };
 
     debian8x86_64 = {
-      name = "debian-8.8-jessie-amd64";
-      fullName = "Debian 8.8 Jessie (amd64)";
+      name = "debian-8.9-jessie-amd64";
+      fullName = "Debian 8.9 Jessie (amd64)";
       packagesList = fetchurl {
         url = mirror://debian/dists/jessie/main/binary-amd64/Packages.xz;
-        sha256 = "845fc80c9934d8c0f78ada6455c81c331a3359ef15c4c036b47e742fb1bb99c6";
+        sha256 = "0605589ae7a63c690f37bd2567dc12e02a2eb279d9dc200a7310072ad3593e53";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;

From 8b3e9a1358d2343159689912e4a060840d47a340 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 26 Jul 2017 14:19:01 -0400
Subject: [PATCH 019/122] gradle: 4.0.1 -> 4.0.2

---
 pkgs/development/tools/build-managers/gradle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 24897232fbc..49fd080df45 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -52,12 +52,12 @@ rec {
   };
 
   gradle_latest = gradleGen rec {
-    name = "gradle-4.0.1";
+    name = "gradle-4.0.2";
     nativeVersion = "0.14";
 
     src = fetchurl {
       url = "http://services.gradle.org/distributions/${name}-bin.zip";
-      sha256 = "1m2gnh1vs3f5acdqcxmc8d0pi65bzm3v1nliz29rhdfi01if85yp";
+      sha256 = "08ns3p1w258cbfk6yg3yy2mmy7wwma5riq04yjjgc4dx889l5b3r";
     };
   };
 

From 94f0a6793b2d5d4296ff9207bfc10efdb38bc5da Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Wed, 26 Jul 2017 19:22:19 +0000
Subject: [PATCH 020/122] disnix: 0.7.1 -> 0.7.2

---
 pkgs/tools/package-management/disnix/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix
index 534f8767a05..f260241fe6b 100644
--- a/pkgs/tools/package-management/disnix/default.nix
+++ b/pkgs/tools/package-management/disnix/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconv }:
 
 stdenv.mkDerivation {
-  name = "disnix-0.7.1";
+  name = "disnix-0.7.2";
   
   src = fetchurl {
-    url = https://github.com/svanderburg/disnix/releases/download/disnix-0.7.1/disnix-0.7.1.tar.gz;
-    sha256 = "0wxik73bk3hh4xjjj8jcgrwv1722m7cqgpiiwjsgxs346jvhrv2s";
+    url = https://github.com/svanderburg/disnix/releases/download/disnix-0.7.2/disnix-0.7.2.tar.gz;
+    sha256 = "1cgf7hgqrwsqgyc77sis0hr7cwgk3vx8cd4msgq11qbwywi3b6id";
   };
   
   buildInputs = [ pkgconfig glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconv dysnomia ];

From 8a431e13b5873295f7a6714fe63623f52daea743 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Wed, 26 Jul 2017 21:49:35 +0200
Subject: [PATCH 021/122] docker: Remove ./ pattern when packing an image

Elements in images tar.gz generated by docker don't start by './'.
---
 pkgs/build-support/docker/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 0c85941b6a1..e2997028024 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -505,7 +505,7 @@ rec {
         chmod -R a-w image
 
         echo "Cooking the image..."
-        tar -C image --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0 -c . | pigz -nT > $out
+        tar -C image --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0 --xform s:'./':: -c . | pigz -nT > $out
 
         echo "Finished."
       '';

From 9ee7e8b67ecdab5bf1cd41a73053f2e57c35c184 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Wed, 26 Jul 2017 21:53:35 +0200
Subject: [PATCH 022/122] docker: generate the image configuration and manifest

This is required to push images to the Docker registry v2.
---
 pkgs/build-support/docker/default.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index e2997028024..b6e342cf9b5 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -6,6 +6,7 @@
   findutils,
   go,
   jshon,
+  jq,
   lib,
   pkgs,
   pigz,
@@ -408,7 +409,7 @@ rec {
                   contents runAsRoot diskSize extraCommands;
         };
       result = runCommand "docker-image-${baseName}.tar.gz" {
-        buildInputs = [ jshon pigz coreutils findutils ];
+        buildInputs = [ jshon pigz coreutils findutils jq ];
         # Image name and tag must be lowercase
         imageName = lib.toLower name;
         imageTag = lib.toLower tag;
@@ -496,6 +497,17 @@ rec {
         # Use the temp folder we've been working on to create a new image.
         mv temp image/$layerID
 
+        # Create image configuration file (used by registry v2) by using
+        # the configuration of the last layer
+        SHA_ARRAY=$(find ./ -name layer.tar | xargs sha256sum | cut -d" " -f1 | xargs -I{} echo -n '"sha256:{}" ' | sed 's/" "/","/g' | awk '{ print "["$1"]" }')
+        jq ". + {\"rootfs\": {\"diff_ids\": $SHA_ARRAY, \"type\": \"layers\"}}" image/$layerID/json > config.json
+        CONFIG_SHA=$(sha256sum config.json | cut -d ' ' -f1)
+        mv config.json image/$CONFIG_SHA.json
+
+        # Create image manifest
+        LAYER_PATHS=$(find image/ -name layer.tar -printf '"%P" ' | sed 's/" "/","/g')
+        jq -n "[{\"Config\":\"$CONFIG_SHA.json\",\"RepoTags\":[\"$imageName:$imageTag\"],\"Layers\":[$LAYER_PATHS]}]" > image/manifest.json
+
         # Store the json under the name image/repositories.
         jshon -n object \
           -n object -s "$layerID" -i "$imageTag" \

From 02ceec53435090fef253f5ae1bf54eab0c2c07d7 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 26 Jul 2017 21:58:59 +0200
Subject: [PATCH 023/122] geogebra: 5-0-369-0 -> 5-0-377-0

---
 pkgs/applications/science/math/geogebra/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix
index b6fdd6f58b9..ec3d265fb80 100644
--- a/pkgs/applications/science/math/geogebra/default.nix
+++ b/pkgs/applications/science/math/geogebra/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "geogebra-${version}";
-  version = "5-0-369-0";
+  version = "5-0-377-0";
 
   preferLocalBuild = true;
 
   src = fetchurl {
     url = "http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2";
-    sha256 = "0b5015z1ff3ksnkmyn2hbfwvhqp1572pdn8llpws32k7w1lb0jnk";
+    sha256 = "0rvsjpf7pyz8z5yrqmc5ixzq7mnf1pyp00i914qd6wn5bx0apkxv";
   };
 
   srcIcon = fetchurl {

From 7cd9779488cf1d374142cf030f742cae4e13ba18 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 26 Jul 2017 23:24:49 +0200
Subject: [PATCH 024/122] upx: fix clang build

---
 pkgs/tools/compression/upx/default.nix | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix
index 8c9f7433058..213d98a1ec1 100644
--- a/pkgs/tools/compression/upx/default.nix
+++ b/pkgs/tools/compression/upx/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, fetchFromGitHub, ucl, zlib, perl}:
+{ stdenv, fetchurl, fetchFromGitHub, ucl, zlib, perl }:
 
 stdenv.mkDerivation rec {
   name = "upx-${version}";
@@ -8,21 +8,25 @@ stdenv.mkDerivation rec {
     sha256 = "08anybdliqsbsl6x835iwzljahnm9i7v26icdjkcv33xmk6p5vw1";
   };
 
+  CXXFLAGS = "-Wno-unused-command-line-argument";
+
   buildInputs = [ ucl zlib perl ];
 
-  preConfigure = "
+  preConfigure = ''
     export UPX_UCLDIR=${ucl}
-    cd src
-  ";
+  '';
 
-  makeFlags = [ "CHECK_WHITESPACE=true" ];
+  makeFlags = [ "-C" "src" "CHECK_WHITESPACE=true" ];
 
-  installPhase = "mkdir -p $out/bin ; cp upx.out $out/bin/upx";
+  installPhase = ''
+    mkdir -p $out/bin
+    cp src/upx.out $out/bin/upx
+  '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://upx.github.io/;
     description = "The Ultimate Packer for eXecutables";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.unix;
+    license = licenses.gpl2Plus;
+    platforms = platforms.unix;
   };
 }

From bfb7134db30cac27006970eed9b228d0f0d05605 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Wed, 26 Jul 2017 23:41:07 +0200
Subject: [PATCH 025/122] sakura: 3.3.4 -> 3.4.0

---
 pkgs/applications/misc/sakura/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/sakura/default.nix b/pkgs/applications/misc/sakura/default.nix
index 66e40befe7c..17798bb01e2 100644
--- a/pkgs/applications/misc/sakura/default.nix
+++ b/pkgs/applications/misc/sakura/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "sakura-${version}";
-  version = "3.3.4";
+  version = "3.4.0";
 
   src = fetchurl {
     url = "http://launchpad.net/sakura/trunk/${version}/+download/${name}.tar.bz2";
-    sha256 = "1fnkrkzf2ysav1ljgi4y4w8kvbwiwgmg1462xhizlla8jqa749r7";
+    sha256 = "1vj07xnkalb8q6ippf4bmv5cf4266p1j9m80sxb6hncx0h8paj04";
   };
 
   nativeBuildInputs = [ cmake perl pkgconfig ];

From d82fa7f915cfaa5300763208ac7b4d39afa6f347 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Wed, 26 Jul 2017 15:36:49 -0700
Subject: [PATCH 026/122] wineUnstable: 2.12 -> 2.13

---
 pkgs/misc/emulators/wine/sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index e92c77462ca..ac27f0f1505 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -32,15 +32,15 @@ in rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the SHA256 for staging as well.
-    version = "2.12";
+    version = "2.13";
     url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz";
-    sha256 = "19qk880fk7xxzx9jcl6sjzilhzssn0csqlqr9vnfd1qlhjpi2v29";
+    sha256 = "1y3yb01lg90pi8a9qjmymg7kikwkmvpkjxi6bbk1q1lvs7fs7g3g";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
     inherit (unstable) version;
-    sha256 = "00qqpw5fmpwg4589q2dwlv3jrcyj0yzv4mk63w5ydhvmy5gq48wy";
+    sha256 = "1ivjx5pf0xqqmdc1k5skg9saxgqzh3x01vjgypls7czmnpp3aylb";
     owner = "wine-compholio";
     repo = "wine-staging";
     rev = "v${version}";

From 72f85b9e072b946c95828c5e7e207ddc8d29d81a Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 26 Jul 2017 19:05:26 -0400
Subject: [PATCH 027/122] nixos/tahoe: fixup create-introducer, syntax
 regression from 90acbe5

---
 nixos/modules/services/network-filesystems/tahoe.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/network-filesystems/tahoe.nix b/nixos/modules/services/network-filesystems/tahoe.nix
index f70fbcc4975..26c64f5f72f 100644
--- a/nixos/modules/services/network-filesystems/tahoe.nix
+++ b/nixos/modules/services/network-filesystems/tahoe.nix
@@ -243,7 +243,7 @@ in
             preStart = ''
               if [ ! -d ${lib.escapeShellArg nodedir} ]; then
                 mkdir -p /var/db/tahoe-lafs
-                tahoe create-introducer "${lib.escapeShellArg nodedir}
+                tahoe create-introducer "${lib.escapeShellArg nodedir}"
               fi
 
               # Tahoe has created a predefined tahoe.cfg which we must now

From d4ef5ac0e962bd6604dda38617c4b98c77a62949 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 26 Jul 2017 19:13:21 -0400
Subject: [PATCH 028/122] nixos/tahoe: fixup create-introducer, syntax
 regression from 90acbe5, improperly patched in 72f85b9e072

---
 nixos/modules/services/network-filesystems/tahoe.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/network-filesystems/tahoe.nix b/nixos/modules/services/network-filesystems/tahoe.nix
index 26c64f5f72f..80b34c48f1d 100644
--- a/nixos/modules/services/network-filesystems/tahoe.nix
+++ b/nixos/modules/services/network-filesystems/tahoe.nix
@@ -243,7 +243,7 @@ in
             preStart = ''
               if [ ! -d ${lib.escapeShellArg nodedir} ]; then
                 mkdir -p /var/db/tahoe-lafs
-                tahoe create-introducer "${lib.escapeShellArg nodedir}"
+                tahoe create-introducer ${lib.escapeShellArg nodedir}
               fi
 
               # Tahoe has created a predefined tahoe.cfg which we must now

From 354c979ea85d89e8269e71b5ab4d5d73d8b8bc3c Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 27 Jul 2017 13:03:26 +0800
Subject: [PATCH 029/122] mcelog: 148 -> 153

---
 pkgs/os-specific/linux/mcelog/default.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix
index 64b937390f1..a7f5ffaae4a 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "mcelog-${version}";
-  version = "148";
+  version = "153";
 
   src = fetchFromGitHub {
-    sha256 = "04mzscvr38r2q9da9wmv3cxb99vrkxks1mzgvwsxk753xan3p42c";
-    rev = "v${version}";
-    repo = "mcelog";
-    owner = "andikleen";
+    owner  = "andikleen";
+    repo   = "mcelog";
+    rev    = "v${version}";
+    sha256 = "1wz55dzqdiam511d6p1958al6vzlhrhs73s7gly0mzm6kpji0gxa";
   };
 
   postPatch = ''
@@ -28,6 +28,12 @@ stdenv.mkDerivation rec {
 
   installFlags = [ "DESTDIR=$(out)" "prefix=" "DOCDIR=/share/doc" ];
 
+  postInstall = ''
+    mkdir -p $out/lib/systemd/system
+    substitute mcelog.service $out/lib/systemd/system/mcelog.service \
+      --replace /usr/sbin $out/bin
+  '';
+
   meta = with stdenv.lib; {
     description = "Log x86 machine checks: memory, IO, and CPU hardware errors";
     longDescription = ''

From f5c0607f8d566a5aa2cf74346348bcdb492637e4 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 27 Jul 2017 13:03:36 +0800
Subject: [PATCH 030/122] mcelog: use .service file from upstream

---
 nixos/modules/hardware/mcelog.nix | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/hardware/mcelog.nix b/nixos/modules/hardware/mcelog.nix
index e4ac7d39053..13ad238870c 100644
--- a/nixos/modules/hardware/mcelog.nix
+++ b/nixos/modules/hardware/mcelog.nix
@@ -3,7 +3,7 @@
 with lib;
 
 {
-  meta.maintainers = [ maintainers.grahamc ];
+  meta.maintainers = with maintainers; [ grahamc ];
   options = {
 
     hardware.mcelog = {
@@ -19,19 +19,17 @@ with lib;
   };
 
   config = mkIf config.hardware.mcelog.enable {
-    systemd.services.mcelog = {
-      description = "Machine Check Exception Logging Daemon";
-      wantedBy = [ "multi-user.target" ];
+    systemd = {
+      packages = [ pkgs.mcelog ];
 
-      serviceConfig = {
-        ExecStart = "${pkgs.mcelog}/bin/mcelog --daemon --foreground";
-        SuccessExitStatus = [ 0 15 ];
-
-        ProtectHome = true;
-        PrivateNetwork = true;
-        PrivateTmp = true;
+      services.mcelog = {
+        wantedBy = [ "multi-user.target" ];
+        serviceConfig = {
+          ProtectHome = true;
+          PrivateNetwork = true;
+          PrivateTmp = true;
+        };
       };
     };
   };
-
 }

From b602082e079c391cde7ab5ac1075e2630ce90863 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Thu, 27 Jul 2017 03:12:27 +0900
Subject: [PATCH 031/122] oraclejdk: 8u141 -> 8u144

---
 pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix | 6 +++---
 pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
index bc556bdfcad..7dc0d7158f1 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
@@ -1,9 +1,9 @@
 import ./jdk-linux-base.nix {
   productVersion = "8";
-  patchVersion = "141";
+  patchVersion = "144";
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
-  sha256_i686 = "0jq8zq7hgjqbza1wmc1s8r4iz1r1s631snacn29wdsb5i2yg4qk5";
-  sha256_x86_64 = "0kxs765dra47cw39xmifmxrib49j1lfya5cc3kldfv7azcc54784";
+  sha256_i686 = "1i5pginc65xl5vxzwid21ykakmfkqn59v3g01vpr94v28w30jk32";
+  sha256_x86_64 = "1r5axvr8dg2qmr4zjanj73sk9x50m7p0w3vddz8c6ckgav7438z8";
   sha256_armv7l = "0ja97nqn4x0ji16c7r6i9nnnj3745br7qlbj97jg1s8m2wk7f9jd";
   jceName = "jce_policy-8.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
index bc556bdfcad..7dc0d7158f1 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
@@ -1,9 +1,9 @@
 import ./jdk-linux-base.nix {
   productVersion = "8";
-  patchVersion = "141";
+  patchVersion = "144";
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
-  sha256_i686 = "0jq8zq7hgjqbza1wmc1s8r4iz1r1s631snacn29wdsb5i2yg4qk5";
-  sha256_x86_64 = "0kxs765dra47cw39xmifmxrib49j1lfya5cc3kldfv7azcc54784";
+  sha256_i686 = "1i5pginc65xl5vxzwid21ykakmfkqn59v3g01vpr94v28w30jk32";
+  sha256_x86_64 = "1r5axvr8dg2qmr4zjanj73sk9x50m7p0w3vddz8c6ckgav7438z8";
   sha256_armv7l = "0ja97nqn4x0ji16c7r6i9nnnj3745br7qlbj97jg1s8m2wk7f9jd";
   jceName = "jce_policy-8.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;

From be63b1994d75e826eb2ba2b9e319f1f25be8b725 Mon Sep 17 00:00:00 2001
From: michael bishop <cleverca22@gmail.com>
Date: Mon, 24 Jul 2017 22:22:19 -0300
Subject: [PATCH 032/122] enable split-output builds for all haskellPackages

---
 .../haskell-modules/configuration-common.nix  |  2 +-
 .../haskell-modules/generic-builder.nix       | 19 +++++++++++++++++--
 pkgs/development/haskell-modules/lib.nix      |  2 ++
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 3a3928f5618..85a2d0f665e 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -728,7 +728,7 @@ self: super: {
       };
     in overrideCabal super.servant (old: {
       postInstall = old.postInstall or "" + ''
-        ln -s ${docs} $out/share/doc/servant
+        ln -s ${docs} $doc/share/doc/servant
       '';
     });
 
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 8675d40fd23..36e391183fa 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, ghc, pkgconfig, glibcLocales, coreutils, gnugrep, gnused
-, jailbreak-cabal, hscolour, cpphs, nodejs, lib
+, jailbreak-cabal, hscolour, cpphs, nodejs, lib, removeReferencesTo
 }: let isCross = (ghc.cross or null) != null; in
 
 { pname
@@ -53,6 +53,8 @@
 , coreSetup ? false # Use only core packages to build Setup.hs.
 , useCpphs ? false
 , hardeningDisable ? lib.optional (ghc.isHaLVM or false) "all"
+, enableSeparateDataOutput ? false
+, enableSeparateDocOutput ? doHaddock
 } @ args:
 
 assert editedCabalFile != null -> revision != null;
@@ -108,6 +110,8 @@ let
 
   defaultConfigureFlags = [
     "--verbose" "--prefix=$out" "--libdir=\\$prefix/lib/\\$compiler" "--libsubdir=\\$pkgid"
+    (optionalString enableSeparateDataOutput "--datadir=$data/share/${ghc.name}")
+    (optionalString enableSeparateDocOutput "--docdir=$doc/share/doc")
     "--with-gcc=$CC" # Clang won't work without that extra information.
     "--package-db=$packageConfDir"
     (optionalString (enableSharedExecutables && stdenv.isLinux) "--ghc-option=-optl=-Wl,-rpath=$out/lib/${ghc.name}/${pname}-${version}")
@@ -144,7 +148,7 @@ let
   allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++
                         optionals doCheck testPkgconfigDepends ++ optionals withBenchmarkDepends benchmarkPkgconfigDepends;
 
-  nativeBuildInputs = buildTools ++ libraryToolDepends ++ executableToolDepends;
+  nativeBuildInputs = buildTools ++ libraryToolDepends ++ executableToolDepends ++ [ removeReferencesTo ];
   propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends;
   otherBuildInputs = setupHaskellDepends ++ extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++
                      optionals (allPkgconfigDepends != []) ([pkgconfig] ++ allPkgconfigDepends) ++
@@ -173,6 +177,9 @@ assert allPkgconfigDepends != [] -> pkgconfig != null;
 stdenv.mkDerivation ({
   name = "${pname}-${version}";
 
+  outputs = if (args ? outputs) then args.outputs else ([ "out" ] ++ (optional enableSeparateDataOutput "data") ++ (optional enableSeparateDocOutput "doc"));
+  setOutputFlags = false;
+
   pos = builtins.unsafeGetAttrPos "pname" args;
 
   prePhases = ["setupCompilerEnvironmentPhase"];
@@ -323,6 +330,14 @@ stdenv.mkDerivation ({
       done
     ''}
 
+    ${optionalString enableSeparateDocOutput ''
+    for x in $doc/share/doc/html/src/*.html; do
+      remove-references-to -t $out $x
+    done
+    mkdir -p $doc
+    ''}
+    ${optionalString enableSeparateDataOutput "mkdir -p $data"}
+
     runHook postInstall
   '';
 
diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 30d82d3efc9..81cf298e0e6 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -111,4 +111,6 @@ rec {
   overrideSrc = drv: { src, version ? drv.version }:
     overrideCabal drv (_: { inherit src version; editedCabalFile = null; });
 
+  hasNoDataOutput = drv: overrideCabal drv (drv: { hasDataDir = false; });
+  hasNoDocOutput = drv: overrideCabal drv (drv: { hasDocDir = false; });
 }

From 2b0ce7aeab721bbb6207481bef630b512c94dcad Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Jul 2017 16:28:06 +0200
Subject: [PATCH 033/122] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.3.1-25-ge9e9669 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/8b34a74f811faf4550d5cebc7bf49a8fda3ae7b5.
---
 .../haskell-modules/hackage-packages.nix      | 1245 ++++++++++++++++-
 1 file changed, 1195 insertions(+), 50 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 05b5678c074..3902e436a78 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -657,6 +657,7 @@ self: {
        sha256 = "08iblifpyi569zh55ha5bi0nfibz0zlqiibwaimx2k1nd6n6yv5a";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        description = "Library for incremental computing";
        license = stdenv.lib.licenses.bsd3;
@@ -685,6 +686,7 @@ self: {
        pname = "AesonBson";
        version = "0.2.2";
        sha256 = "1p7636bjczcwwi2c0cdzvpj95vx2fr27qnmh8pcs8hqgmisagq8s";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson attoparsec base bson unordered-containers vector
        ];
@@ -728,6 +730,7 @@ self: {
        editedCabalFile = "1zxznr7n6yyyrr38nsa53nd1vhcssnhd5jha30dzwwkyq0mv3c2d";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base binary boxes bytestring containers data-hash deepseq
          directory EdisonCore edit-distance equivalence filepath
@@ -852,6 +855,7 @@ self: {
        sha256 = "1baqvfrg5qsrfzlg6para87vf11srk0dmi062fpzfv1x452wx6ja";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          async base containers enummapset-th filepath LambdaHack random
          template-haskell text zlib
@@ -1667,6 +1671,7 @@ self: {
        sha256 = "0jlcdd0slq7d5wr44h3h6lnfcp310h36cabd4r7l32xhcxns9k6h";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bimaps binary bytes bytestring cereal cereal-vector
          containers csv deepseq file-embed hashable lens primitive
@@ -1770,6 +1775,7 @@ self: {
        sha256 = "09mpf3qwr38x0ljz4ziyhdcwl5j37i353wc2dkpc6hjki9p08rgl";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers directory HaXml polyparse pretty wx wxcore
        ];
@@ -1841,6 +1847,7 @@ self: {
        sha256 = "18lxj5ka4jfaz1ig6x6qkdzlil99i3bcy4cqpbsccvyvhbax323c";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal MissingH ];
        libraryHaskellDepends = [
          base containers MissingH network-uri parsec
@@ -1895,6 +1902,7 @@ self: {
        sha256 = "1a1g8ipppwrb42fvli27qi4i78vgdk3wwxsjhqy0p6pwpa0hvcaq";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers directory filepath pandoc pandoc-citeproc
          pandoc-types parseargs
@@ -2204,6 +2212,7 @@ self: {
        sha256 = "041bm02xar8g6ppz6g0fdgs4ywavlcn4pqkncydx0lw5wp9ygwwn";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base haskell98 ];
        description = "A simple Brainfuck interpretter";
        license = stdenv.lib.licenses.bsd3;
@@ -2338,6 +2347,7 @@ self: {
        pname = "CTRex";
        version = "0.6";
        sha256 = "0cjinznkvdrswbqrsha49b6hch7sjv2qq9xllx780klf01kdahi6";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers hashable mtl unordered-containers
        ];
@@ -2675,6 +2685,7 @@ self: {
        pname = "Chart-diagrams";
        version = "1.8.2";
        sha256 = "0hczp9dj9qs3g72hcgikym1bq3ki90graxfx068h5hds0kn1s66a";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base blaze-markup bytestring Chart colour containers
          data-default-class diagrams-core diagrams-lib diagrams-postscript
@@ -2748,6 +2759,7 @@ self: {
        sha256 = "1pw6sssdmxpsjclkhsaf1b06vlimi4w11rxy65ccyj8c9zgs2g23";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base containers directory ];
        homepage = "http://cheatsheet.codeslower.com";
        description = "A Haskell cheat sheet in PDF and literate formats";
@@ -2933,6 +2945,7 @@ self: {
        sha256 = "0dx5pysxyk5c0fa33khjr86zgm43jz7nwhgl0w8jngyai8b1rbra";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array attoparsec base bytestring cereal containers deepseq
          directory filepath hopenssl hslogger HTTP HUnit mtl network
@@ -3383,6 +3396,7 @@ self: {
        sha256 = "0rmgl0a4k6ys2lc6d607g28c2p443a46dla903rz5aha7m9y1mba";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base HUnit pretty QuickCheck random
        ];
@@ -3626,6 +3640,7 @@ self: {
        pname = "DRBG";
        version = "0.5.5";
        sha256 = "1z9vqc1nw0mf2sqgddcipmlkz6mckq9wnrzqqdy3rj3c90135pr1";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring cereal cipher-aes128 crypto-api
          cryptohash-cryptoapi entropy mtl parallel prettyclass tagged
@@ -3701,6 +3716,7 @@ self: {
        sha256 = "084yscqbwypkb32avjm2b92a7s4qpvps3pjfgpy14sligww3hifb";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers haskell98 network process unix
        ];
@@ -3963,6 +3979,7 @@ self: {
        sha256 = "09wzab0343m55xq4dxfv0f9lwpd5v97mymd6408s6p82xa2vqlzw";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base binary bytestring containers GLUT HTTP MaybeT mtl network
          peakachu random time utility-ht zlib
@@ -4017,6 +4034,7 @@ self: {
        pname = "Dflow";
        version = "0.0.1";
        sha256 = "00gzs5fdybfrvqidw4qzk6i69qzq4jaljzhb49ah2hsv3gqjr1iq";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers QuickCheck stm time ];
        testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-quickcheck2
@@ -4148,6 +4166,7 @@ self: {
        sha256 = "0pnlk09jsallyparwdfcy7jmqjjiprp2pqlg9agp6xbw5xmnkzwb";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base Cabal chunks containers directory filepath hinstaller
          old-locale parsec pretty process template-haskell time xhtml
@@ -4321,6 +4340,7 @@ self: {
        sha256 = "1w0wfmrjifidl2qz998ig07afd4p6yp890lwl8as57bay490nakl";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [
          base filepath old-time process random
@@ -4339,6 +4359,7 @@ self: {
        sha256 = "0jk7qmlgjw69w38hm91bnyp8gyi1mjmrq4vyv7jv3y69rk0fi6wl";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base old-time process random ];
        homepage = "http://repetae.net/computer/haskell/DrIFT/";
        description = "Program to derive type class instances";
@@ -4680,6 +4701,7 @@ self: {
        sha256 = "1l6p00h0717blwvia0gvqpsakq8jy44fxc6brr4qxs5g4yjcjnmh";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson aeson-pretty base binary blaze-html blaze-markup bytestring
          cheapskate cmdargs containers directory filepath highlighting-kate
@@ -4926,6 +4948,7 @@ self: {
        sha256 = "0kh1zjqr9cmx7xyfk2y3iwr3x3zvh3pb4ghfjz3xr2wwg2rmymxp";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base haskell98 SDL SDL-mixer ];
        homepage = "http://www.kryozahiro.org/eternal10/";
        description = "A 2-D shooting game";
@@ -5201,6 +5224,7 @@ self: {
        pname = "FenwickTree";
        version = "0.1.2.1";
        sha256 = "0g7hhkim16wsjf8l79hqkiv1lain6jm8wpiml1iycra3n9i2s5ww";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base QuickCheck template-haskell ];
        testHaskellDepends = [ base QuickCheck template-haskell ];
        homepage = "https://github.com/mgajda/FenwickTree";
@@ -5353,6 +5377,7 @@ self: {
        sha256 = "00sv8dd323lwyw6597xyza12h8m1pdp63b2jlqfsjgnxn2rb60lm";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
@@ -5455,6 +5480,7 @@ self: {
        sha256 = "1w25h3n3cnsl9dvr5s94jzf5qxyx0dl0v8dmqv2rkwwm7s2hdbl9";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base cgi containers directory haskell98 old-time parsec xhtml
        ];
@@ -5526,6 +5552,7 @@ self: {
        pname = "ForSyDe";
        version = "3.1.1";
        sha256 = "0ggwskyxpdrjny0rz61zdp20r5vzig8ggmqxf0qa8gljvvfp6bhp";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base containers directory filepath mtl old-time
          parameterized-data pretty process random regex-posix
@@ -5722,6 +5749,7 @@ self: {
        sha256 = "10sivjxppn138805iwka54cfby59nc39ja30nx2w3762fybz71af";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base freetype2 OpenGL ];
        description = "Loadable texture fonts for OpenGL";
        license = stdenv.lib.licenses.bsd3;
@@ -5736,6 +5764,7 @@ self: {
        sha256 = "1bal6v1ps8ha5hkz12i20vwypvbcb6s9ykr8yylh4w4ddnsdgh3r";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base base-compat GLUT OpenGL random ];
        executableHaskellDepends = [ base GLUT OpenGL random ];
        homepage = "http://joyful.com/fungen";
@@ -5797,6 +5826,7 @@ self: {
        pname = "GHood";
        version = "0.0.6";
        sha256 = "0n9vp4y5d1fx45x6s5a84ylyvnjyaq44x9r46zyh0dkyrms3jsqi";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base process ];
        homepage = "http://www.cs.kent.ac.uk/people/staff/cr3/toolbox/haskell/GHood";
        description = "A graphical viewer for Hood";
@@ -5822,6 +5852,7 @@ self: {
        pname = "GLFW-OGL";
        version = "0.0";
        sha256 = "118hpgdp8rb0jlvlibxcaia4jjjdrn8xpzyvj109piw63g44n910";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base mtl OGL ];
        librarySystemDepends = [ libX11 libXrandr ];
        homepage = "http://haskell.org/haskellwiki/GLFW-OGL";
@@ -6010,6 +6041,7 @@ self: {
        pname = "GPipe";
        version = "2.2.1";
        sha256 = "1g5712apfv1jzi12shpzfp16274gfbjgf7r49fp1dawxnj8j734g";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base Boolean containers exception-transformers gl hashtables linear
          transformers
@@ -6109,6 +6141,7 @@ self: {
        pname = "Gamgine";
        version = "0.5.1";
        sha256 = "07srdid5354y2za3hc76j2rjb84y77vjaz8gdhlp7qnbmfsnqipd";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring composition cpphs data-lens directory
          filepath GLFW-b ListZipper mtl OpenGLRaw parsec pretty-show
@@ -6157,6 +6190,7 @@ self: {
        sha256 = "14shcs5wfkf4q473hsdgh7ky1fsrb59nf0g2ff4viyw1diyakw7x";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base directory random wx wxcore
        ];
@@ -6179,6 +6213,7 @@ self: {
        sha256 = "0gmig362ayxxqgj4m6g1r1i6q5zfg6j8bmvsd7i9kmqn12nl3l0p";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary bytestring cabal-macosx containers deepseq directory
          errors filepath hslogger json mtl old-locale ordered parsec process
@@ -6333,6 +6368,7 @@ self: {
        pname = "GeocoderOpenCage";
        version = "0.1.0.1";
        sha256 = "1c5sww3lvwkijsxg37zj77rxx021wlwjwsadiknvci9xlzccnw5b";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ aeson base bytestring HTTP text ];
        homepage = "https://github.com/juergenhah/Haskell-Geocoder-OpenCage.git";
        description = "Geocoder and Reverse Geocoding Service Wrapper";
@@ -6397,6 +6433,7 @@ self: {
        sha256 = "030p4ihh3zdjy0f687ffpnsf1zjb7mhwih47718fj2pawi4hkksi";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base directory filepath process temporary text
        ];
@@ -7035,6 +7072,7 @@ self: {
        sha256 = "0dzfnvdc1nm4f7q759xnq1lavi90axc7b6jd39sl898jbjg8wrrl";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers mtl QuickCheck random ];
        executableHaskellDepends = [
          base containers mtl QuickCheck random
@@ -7247,6 +7285,7 @@ self: {
        sha256 = "03v03adcqyf0ppbhx8jxmp1f4pzmqs5s43as21add2yl13rkwzm7";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base blaze-html blaze-markup MissingH mtl process random
          shakespeare template-haskell text uuid
@@ -7865,6 +7904,7 @@ self: {
        pname = "HList";
        version = "0.4.2.0";
        sha256 = "15bpglqj33n4y68mg8l2g0rllrcisg2f94wsl3n7rpy43md596fd";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base base-orphans ghc-prim mtl profunctors tagged
          template-haskell
@@ -7931,6 +7971,7 @@ self: {
        pname = "HMap";
        version = "1.2.7";
        sha256 = "0xq5qr1v74z9bppcgl4g06cpnmyrqmc41kvcyx58272pw70vlv40";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base data-default hashable mtl unordered-containers
        ];
@@ -7968,6 +8009,7 @@ self: {
        sha256 = "04325gwmlrx4iy9609vzaw2dhs4kg3ydr4r6af6rllrf500f6w9j";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers directory glib gtk haskell98 mtl process
          regex-posix unix
@@ -8111,6 +8153,7 @@ self: {
        sha256 = "0dzzq4ksny537b151g6c1jgj2ns143klhdjfbq84srs026pvpvzi";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base data-accessor data-accessor-template GLFW OpenGL
        ];
@@ -8247,6 +8290,7 @@ self: {
        sha256 = "0bg0b8260cd2l8q7ccijwqg1yz49mkifv1r0a5q1hrbsagvac4nf";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ array base directory haskell98 ];
        homepage = "http://boegel.kejo.be/ELIS/Haskell/HRay/";
        description = "Haskell raytracer";
@@ -8369,6 +8413,7 @@ self: {
        pname = "HSmarty";
        version = "0.2.0.3";
        sha256 = "07m7xpwv565cf78qyqkd6babpl2b7jnq88psv55jclzdqlsvv0rq";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson attoparsec attoparsec-expr base HTTP mtl scientific text
          unordered-containers vector
@@ -8542,6 +8587,7 @@ self: {
        sha256 = "0c0igscng6gqhabmvvgappsbzbhkpybcx7vr8yd72pqh988ml4zv";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base cmdargs containers deepseq hylolib mtl strict
        ];
@@ -8560,6 +8606,7 @@ self: {
        sha256 = "0h3pr4lyx14zndwbas5ba8sg3s84sq19qhh6pcqpy4v2ajfyyfqc";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base mtl random SDL SDL-image SDL-ttf
        ];
@@ -8683,6 +8730,7 @@ self: {
        pname = "HXQ";
        version = "0.20.1";
        sha256 = "1ba3b7a91h1qc5g9g9cw591mvsp711myijpzxr4c1wg6yapqbhxp";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base haskeline HTTP mtl regex-base regex-compat
          template-haskell
@@ -8701,6 +8749,7 @@ self: {
        sha256 = "1mvxzcq42h823gq025w86z03jigk271fj20r7yfjydj7yvn24kjv";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base HUnit mtl QuickCheck ];
        homepage = "http://www.di.uminho.pt/~jas/Research/HaLeX/HaLeX.html";
        description = "HaLeX enables modelling, manipulation and visualization of regular languages";
@@ -8750,6 +8799,7 @@ self: {
        editedCabalFile = "1hwajkfskbnh3cn7jgiqp83vpfinnfn4pfzwkl6cwqi63iwy944p";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base cabal-helper containers directory filepath ghc ghc-exactprint
          ghc-mod ghc-syb-utils hslogger monad-control mtl
@@ -8785,6 +8835,7 @@ self: {
        sha256 = "16ld7lrdf6vjmxam4kfc6zyy2g4baw7mr9ha39nrxjq0p8d4hn3v";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base cabal-helper containers directory filepath ghc ghc-exactprint
          ghc-mod ghc-syb-utils hslogger monad-control mtl
@@ -9003,6 +9054,7 @@ self: {
        sha256 = "1yzfrvivvxwlaiqwbjx27rxwq9mmnnpb512vwklzw7nyzg9xmqha";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers HTTP hxt hxt-http mtl network network-uri parsec
          transformers
@@ -9106,6 +9158,7 @@ self: {
        pname = "HasGP";
        version = "0.1";
        sha256 = "1sw5l74p2md4whq0c1xifcnwbb525i84n1razjxs7cpf8gicgggx";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base haskell98 hmatrix hmatrix-special mtl parsec random
        ];
@@ -9125,6 +9178,7 @@ self: {
        sha256 = "0jh506p0clwyb5wwrhlgbc5xp7w6smz5vky3lc8vhnwvwk324qcj";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base list-tries monad-loops mtl numbers parsec
        ];
@@ -9161,6 +9215,7 @@ self: {
        pname = "HaskRel";
        version = "0.1.0.2";
        sha256 = "19q7x459g9s6g7kd9bmhh8lj2khbbmaafmcmm3ggrf4ijxmh5kp7";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers directory ghc-prim HList tagged
        ];
@@ -9230,6 +9285,7 @@ self: {
        pname = "HaskellNet-SSL";
        version = "0.3.3.0";
        sha256 = "1x6miw5ph4qndsy345yym209r5lxsjsmmgyap6x1xjwxjcmlcz8p";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring connection data-default HaskellNet network tls
        ];
@@ -9250,6 +9306,7 @@ self: {
        sha256 = "0dy9irl085jw7wz6y50566rwsj05ymp8g2xp2444vg12ryd5dra1";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring cereal cml containers directory hopenssl hslogger
          HTTP HUnit mtl network parsec pretty QuickCheck random
@@ -9408,6 +9465,7 @@ self: {
        sha256 = "0z0sa658fngv68611k76ncf5j59v517xchhw2y84blj97fl6jkn9";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base editline mtl parsec pretty process QuickCheck regex-posix
        ];
@@ -9427,6 +9485,7 @@ self: {
        pname = "HerbiePlugin";
        version = "0.2.0.0";
        sha256 = "1vrlx1b85fvdcbcjn2mfhkznvvqag3pxhvkqsk80pyqiwf8xfgw7";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base deepseq directory ghc mtl process split sqlite-simple
          template-haskell text
@@ -9600,6 +9659,7 @@ self: {
        sha256 = "1nsiqcwx9xiz3774c0kv036v8pz53jzl9pfxyhm6ci8ag83za245";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring cereal containers directory filepath FPretty
          libgraph mtl process RBTree regex-posix template-haskell
@@ -9782,6 +9842,7 @@ self: {
        sha256 = "0yjkghshbdbajib35hy3qr8x608i9qi2pgffpi59118krcw6k8mn";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base directory filepath ghc haskell-src-exts old-locale random syb
          time
@@ -9863,6 +9924,7 @@ self: {
        pname = "HsJudy";
        version = "0.2";
        sha256 = "1ypdsjy7gn6b3ynn17fcpirgwq3017jahm3pj5fh4qr6zr1cljkh";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring containers ];
        librarySystemDepends = [ Judy ];
        homepage = "http://www.pugscode.org/";
@@ -9932,6 +9994,7 @@ self: {
        pname = "HsParrot";
        version = "0.0.2.20150805";
        sha256 = "0d1xkfl5zbr2q60igl9092lr6zgh1jq10c0b7yd6i0jxs66d767a";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring HsSyck pretty pugs-DrIFT
        ];
@@ -9970,6 +10033,7 @@ self: {
        pname = "HsSyck";
        version = "0.53";
        sha256 = "17r4jwnkjinmzpw9m2crjwccdyv9wmpljnv1ldgljkr9p9mb5ywf";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring hashtables syb utf8-string
        ];
@@ -10000,6 +10064,7 @@ self: {
        sha256 = "09v2gcazqlmw7j7sqzzzmsz1jr3mrnfy3p30w9hnp2g430w10r2a";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring cmdargs data-accessor data-accessor-template
          data-accessor-transformers directory filepath Glob
@@ -10094,6 +10159,7 @@ self: {
        sha256 = "10n45j8ri1svxhplpfj88riqk4qigzl02cqxkk3mrsahhgn6bkmp";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base binary directory HFitUI MissingH shakespeare yaml
        ];
@@ -10144,6 +10210,7 @@ self: {
        sha256 = "04il63xafq20jn3m4hahn93xxfrp6whrjvsz974zczxqm41ygb10";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers directory haskell98 HaXml polyparse pretty process
          wx wxcore
@@ -10160,6 +10227,7 @@ self: {
        pname = "IOR";
        version = "0.1";
        sha256 = "0iinsva0pwparpg4lkgx8mw8l49rnl1h3zzblp89nkqk5i7qhq8a";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base mtl ];
        description = "Region based resource management for the IO monad";
        license = stdenv.lib.licenses.bsd3;
@@ -10601,6 +10669,7 @@ self: {
        sha256 = "17l6kdpdc7lrpd9j4d2b6vklkpclshcjy6hzpi442b7pj96sn589";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers directory filepath mtl parsec pretty syb WebBits
          WebBits-Html
@@ -10673,6 +10742,7 @@ self: {
        pname = "JuicyPixels-extra";
        version = "0.1.1";
        sha256 = "1zdrh95b51566m2dh79vv92vivv2i4pknlimhd78mqc0fxz2ayyk";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base JuicyPixels ];
        testHaskellDepends = [ base hspec JuicyPixels ];
        benchmarkHaskellDepends = [ base criterion JuicyPixels ];
@@ -10690,6 +10760,7 @@ self: {
        sha256 = "0lai831n9iak96l854fynpa1bf41rq8mg45397zjg0p25w0i1dka";
        revision = "1";
        editedCabalFile = "0f42a7jirsk3ciyd081wcb2pkss34yzfwhaiaclgf17yiav4zzv0";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base JuicyPixels ];
        testHaskellDepends = [ base hspec JuicyPixels ];
        benchmarkHaskellDepends = [ base criterion JuicyPixels ];
@@ -10883,6 +10954,7 @@ self: {
        sha256 = "0z5ps5apr436dbm5wkfnpqksnqi3jsqmp2zkmy37crzzinlilzvn";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers curry-frontend directory filepath network old-time
          process random syb unix
@@ -10908,6 +10980,7 @@ self: {
        sha256 = "1hvdqil8lfybcp2j04ig03270q5fy29cbmg8jmv38dpcgjsx6mk1";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers filepath haskell98 KiCS mtl readline syb
        ];
@@ -10928,6 +11001,7 @@ self: {
        sha256 = "0l278x2gavm0ndbm4k0197cwyvamz37vzy7nz35lb7n5sc5b2gsr";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base filepath KiCS ];
        executableHaskellDepends = [ base KiCS ];
        homepage = "http://curry-language.org";
@@ -11115,6 +11189,7 @@ self: {
        sha256 = "12bvsl4bshks02dqk09nzjz8jd8mspf408h88bmswsxyhq6r03gc";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          assert-failure async base base-compat binary bytestring containers
          deepseq directory enummapset-th filepath ghc-prim hashable hsini
@@ -11151,6 +11226,7 @@ self: {
        sha256 = "1hdl25dzv19gjr8dzpq1r267v3jj2c2yiskbg0kzdcrh4cj7jcwk";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers GLFW GLFW-task monad-task mtl OpenGL transformers
          vector
@@ -11406,6 +11482,7 @@ self: {
        pname = "LinearSplit";
        version = "0.2.1";
        sha256 = "05rdlxsl5zpnczahaw2fdycqyryd3y7bccizjbn5sap23spwd7di";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base cmdargs haskell98 QuickCheck
        ];
@@ -11871,6 +11948,7 @@ self: {
        sha256 = "0vly79iqz8ax5wzwgbr3ygdqsi7bq5vki43kmz9zgz8vjqi7hisz";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring containers directory ghc ghc-paths hashable
          haskell-src html mtl network network-uri pretty random syb
@@ -11956,6 +12034,7 @@ self: {
        sha256 = "041kqz5j8xaa2ciyrfnwz6p9gcx4il5s6f34kzv9kp0s07hmn1q2";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base containers directory filepath HUnit mtl old-locale
          pretty random regex-posix time
@@ -12133,6 +12212,7 @@ self: {
        sha256 = "0s3xp18y4kcjd1qq87vbhijbbpi9d1p08dgxw7521xlr3gmxkqxw";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base containers haskell-src-exts mtl pretty
        ];
@@ -12340,6 +12420,7 @@ self: {
        sha256 = "1p8xhxxjhwr93as98pvp1z25ypgj7arka8bw75r0q46948h7nxf7";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base parsec template-haskell ];
        executableHaskellDepends = [ base haskell98 process ];
        homepage = "http://monadgarden.cs.missouri.edu/MonadLab";
@@ -12407,6 +12488,7 @@ self: {
        sha256 = "0jq59nnnydllqpvg3h2d1ylz3g58hwi0m08lmw2bv0ajzgn5mc8x";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ array base directory GLUT OpenGL ];
        homepage = "http://www.geocities.jp/takascience/haskell/monadius_en.html";
        description = "2-D arcade scroller";
@@ -12424,6 +12506,7 @@ self: {
        sha256 = "0myghw0w122n1czpaaqmpiyv0nragjkwnja8kb4agrwhcjfk3icb";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base containers directory free free-game mtl
        ];
@@ -12994,6 +13077,7 @@ self: {
        sha256 = "0wz80cv7m7m4q6y6rd07y422b97hyhnb9yl6bj68pi1nxmjzcjhm";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base binary bytestring containers filepath gloss network
          networked-game random
@@ -13083,6 +13167,7 @@ self: {
        pname = "Nomyx-Core";
        version = "0.7.6";
        sha256 = "16s60gap32kjs62zxjddppxyg9jhamzgm4d41mfg3vviadlacdrq";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          acid-state aeson base blaze-html blaze-markup bytestring data-lens
          data-lens-fd data-lens-template DebugTraceHelpers deepseq directory
@@ -13106,6 +13191,7 @@ self: {
        pname = "Nomyx-Language";
        version = "0.7.6";
        sha256 = "0na9nm6qnayip2lx3nd3if4c1iyp7zs89jp2dgb7zkmbiwvax3l9";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base Boolean containers data-lens data-lens-fd data-lens-template
          DebugTraceHelpers ghc mtl old-locale random safe time
@@ -13125,6 +13211,7 @@ self: {
        pname = "Nomyx-Rules";
        version = "0.1.0";
        sha256 = "16kzpdvn57sdmpqkwswgixm6pnyi01vj44yvzczn9sy4azwd10q5";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers ghc hint-server hslogger mtl old-locale safe stm
          time time-recurrence
@@ -13146,6 +13233,7 @@ self: {
        pname = "Nomyx-Web";
        version = "0.7.6";
        sha256 = "193v967bzhs0linqvh93w7viwdrlmsbdpnr8asigqhp5905zdjb7";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base blaze-html blaze-markup bytestring data-lens data-lens-fd fb
          filepath happstack-authenticate happstack-server hscolour mtl
@@ -13440,6 +13528,7 @@ self: {
        sha256 = "061j03ld96zkx1pfg7caxkyknj91b3maijx52610zmc9kfcjg5jd";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          async base brick bytestring conduit conduit-extra containers
          control-monad-loop data-default itemfield listsafe microlens mtl
@@ -13911,6 +14000,7 @@ self: {
        sha256 = "0pfd5y8plxicdchkbij0nqj6zwxw3fcy5cz1ji5bky9g3bmz9mhm";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers mtl network network-uri xml
        ];
@@ -13995,6 +14085,7 @@ self: {
        sha256 = "1g39mxrfii8vm40cbb7vdfrx2rx9gm4s1xhp3zjkiyi7f979cbk0";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          Agda base containers directory filepath mtl pandoc pandoc-types
          QuickCheck text time xhtml
@@ -14258,6 +14349,7 @@ self: {
        sha256 = "17avnaz6da80v5kgz0b3v0zq3y9p2d3mxxv5a09ggcmilbz4xwlg";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers directory mtl random regex-compat
        ];
@@ -14313,6 +14405,7 @@ self: {
        sha256 = "1kly1jfki4n9fhgkh2m9j9xj8182s92i7rsq81vcm6i3hd4fac94";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base directory filepath haskell98 old-locale old-time parsec
          process random
@@ -14530,6 +14623,7 @@ self: {
        sha256 = "0w7x4zgz00wzchqdhajpf1ir3h0jxw1vgh030g384k1qbbjv4la2";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base binary bytestring containers control-timeout directory
          filepath FindBin hashable hashtables haskeline HsParrot HsSyck
@@ -14826,6 +14920,7 @@ self: {
        sha256 = "1d9zllxl8vyjmb9m9kdgrv9v9hwnspyiqhjnb5ds5kmby6r4r1h2";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson attoparsec base bytestring haskell-src-meta parsec scientific
          snap snap-core template-haskell text vector websockets
@@ -15170,6 +15265,7 @@ self: {
        sha256 = "1zyxkvjxkadwakg03xnjii1hx0gs45ap9rfkpi4kxipzxppq1klk";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers extensible-exceptions GLUT mtl OpenGL random sdl2
          sdl2-image sdl2-mixer time
@@ -15258,6 +15354,7 @@ self: {
        sha256 = "1df010121jdjbagc3gg906kydmwwpa7np1c0mx7w2v64mr7i2q1r";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base HTTP json network utf8-string XMPP
        ];
@@ -15278,6 +15375,7 @@ self: {
        sha256 = "1wk4bylydfdqdmzjybkpbmvp4znp9i26mvkl2541gp5vwv7blms6";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base bytestring cereal containers convertible directory
          filepath ghc GLUT monad-loops OpenGL OpenGLRaw time Yampa
@@ -15468,6 +15566,7 @@ self: {
        pname = "Rlang-QQ";
        version = "0.3.1.0";
        sha256 = "0rl3cmr7vfc8vk7132y40ib0l53v9yndw71bmp25zj24nkmha7hj";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base binary bytestring Cabal containers data-binary-ieee754
          directory filepath haskell-src-meta HList lens mtl process repa SHA
@@ -15583,6 +15682,7 @@ self: {
        sha256 = "1sa3zx3vrs1gbinxx33zwq0x2bsf3i964bff7419p7vzidn36k46";
        revision = "1";
        editedCabalFile = "0gj76j31i8rnlnvkf6hr8ljc6qmqqqcndy0bgrcppji78zg3ygi3";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ SDL ];
        description = "Binding to libSDL";
@@ -15595,6 +15695,7 @@ self: {
        pname = "SDL-gfx";
        version = "0.6.0.2";
        sha256 = "1i8dfyi0cdhm2mad7fk2dd8qdc3lpbjw52s67vyxi4r1b8rka05b";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base SDL ];
        librarySystemDepends = [ SDL_gfx ];
        description = "Binding to libSDL_gfx";
@@ -15609,6 +15710,7 @@ self: {
        sha256 = "1ybdwlqi5nqzpsbh2md5mxhwmjn910iqysf6nykwjxlmvhcjk281";
        revision = "1";
        editedCabalFile = "0syx3032z15mnvi2apqsml065xk1i5i9jixwv022a9mimlk710vy";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base SDL ];
        librarySystemDepends = [ SDL_image ];
        description = "Binding to libSDL_image";
@@ -15623,6 +15725,7 @@ self: {
        sha256 = "1fhray79d80dk2aj9mx3ks05mm48sd832g8zgxli226jx471fs8r";
        revision = "1";
        editedCabalFile = "193wigk1c7i4lxkwkj4kd2fzymwg586ky9h7fpsa1cqmz12sc5wz";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base SDL ];
        librarySystemDepends = [ SDL_mixer ];
        description = "Binding to libSDL_mixer";
@@ -15635,6 +15738,7 @@ self: {
        pname = "SDL-mpeg";
        version = "0.0.1";
        sha256 = "0hx4977iynchnyd4b9ycbiw5qq07wk1a7dkisqx0a3x0ca4qirwj";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base SDL ];
        librarySystemDepends = [ smpeg ];
        description = "Binding to the SMPEG library";
@@ -15647,6 +15751,7 @@ self: {
        pname = "SDL-ttf";
        version = "0.6.2.2";
        sha256 = "16blaa55jiyrailhv9cjrr7wrp8m6pssj0jfz2p6631g4vqy888n";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base SDL ];
        librarySystemDepends = [ SDL_ttf ];
        description = "Binding to libSDL_ttf";
@@ -15839,8 +15944,8 @@ self: {
     ({ mkDerivation, base, containers, ghc, ghc-paths }:
      mkDerivation {
        pname = "SSTG";
-       version = "0.1.0.4";
-       sha256 = "0z61bv1mxmm1gq4b61gp3519fv0v7hb1cqcl4x8zp7cz5hgr8sr4";
+       version = "0.1.0.7";
+       sha256 = "05hdjym88bmii19gbz2k6jfr0bxmll514ysazavdhcrgdjgf0r0f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ghc ghc-paths ];
@@ -15849,6 +15954,7 @@ self: {
        homepage = "https://github.com/AntonXue/SSTG#readme";
        description = "STG Symbolic Execution";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "STL" = callPackage
@@ -15906,6 +16012,7 @@ self: {
        pname = "SVGFonts";
        version = "1.6.0.1";
        sha256 = "1w6hh8anpb0psilzbp4k80rbavdmkmb5rn34x9m2s72rz0jfy9zp";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base blaze-markup blaze-svg bytestring cereal
          cereal-vector containers data-default-class diagrams-core
@@ -16458,6 +16565,7 @@ self: {
        sha256 = "1hal35bp7jw2dwmnd68p27hn19mgpdf28lpf8nh0qja59gxk4lff";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base containers data-lens-light mtl
        ];
@@ -16575,6 +16683,7 @@ self: {
        sha256 = "12dpvm8lzp8gllyrf7yzpljpdr0jdk42zhi7zrnzvjzryv6w268j";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base base-unicode-symbols binary derive directory mtl process
          random zlib
@@ -16595,6 +16704,7 @@ self: {
        sha256 = "02j5ni8565ba7rvr6gw9z65qdfl7rd17586gqlkx2iz2v2bwkasf";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base base-unicode-symbols binary GLUT OpenGL process random
          SoccerFun
@@ -16682,6 +16792,7 @@ self: {
        editedCabalFile = "1gv48zss4rw4z2n9grga090j1223ylzwi5pirqb0d1mdj9w617dm";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers enummapset-th filepath LambdaHack template-haskell
          text
@@ -17039,6 +17150,7 @@ self: {
        sha256 = "0h73yj74pl0k3p7vamqhw1jz36pvh8kfpw58gkmskdmkh7j6wb30";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base directory haskell-src mtl pretty process Strafunski-ATermLib
          Strafunski-StrategyLib template-haskell
@@ -17106,6 +17218,7 @@ self: {
        pname = "StrictBench";
        version = "0.1.1";
        sha256 = "1l4l77rjhl5g9089kjyarsrvbvm43bk370ld50qp17dqhvisl73m";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base benchpress parallel ];
        homepage = "http://bonsaicode.wordpress.com/2009/06/07/strictbench-0-1/";
        description = "Benchmarking code through strict evaluation";
@@ -17196,6 +17309,7 @@ self: {
        pname = "Sysmon";
        version = "0.1.2";
        sha256 = "1zyp333vicjarcmip2q52nzfv948yl2q6qr3k3glp4v4m8f75ap3";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base ConfigFile filepath fingertree Glob MissingH mtl old-locale
          pretty statistics template-haskell time vector
@@ -17643,6 +17757,7 @@ self: {
        sha256 = "1ylf4kzyf947szgib0ivkvygbinmy97nvy77d0crryzxdmccrzbj";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers old-locale old-time random SDL SDL-gfx SDL-image
          SDL-ttf
@@ -17901,6 +18016,7 @@ self: {
        sha256 = "0crymgw91xx0hblbmz488x39i2qzf9c15kv5x950ljmpyrhy5jhv";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers filepath random reactive-banana reactive-banana-sdl
          SDL SDL-ttf transformers
@@ -18261,6 +18377,7 @@ self: {
        sha256 = "1fig9zxxisd51v5vzcsapsp4qygikhwhpjzyagw7a3x6kv5qpipm";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base containers matrix ];
        description = "A solver for the WordBrain game";
        license = stdenv.lib.licenses.mit;
@@ -18313,6 +18430,7 @@ self: {
        sha256 = "0974k5adxxa0jpi99wqq13lnav2rdb7qr40snvycsazk5mx1fd35";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base FindBin HDBC HDBC-sqlite3 mtl random split time
        ];
@@ -18423,6 +18541,7 @@ self: {
        pname = "WXDiffCtrl";
        version = "0.0.1";
        sha256 = "0vv8s483g3dkxyk833cjczj0a5zxiy9xh56kij6n0jjyzxb9bz0k";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers wx wxcore ];
        homepage = "http://wewantarock.wordpress.com";
        description = "WXDiffCtrl";
@@ -18520,6 +18639,7 @@ self: {
        pname = "WebBits-multiplate";
        version = "0.0.0.1";
        sha256 = "1j3difi3f1w6bgbnsvqw9cv88aikin22myli0lx29pqn7xhqsbv3";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base multiplate multiplate-simplified transformers WebBits
        ];
@@ -18817,6 +18937,7 @@ self: {
        pname = "Wired";
        version = "0.3";
        sha256 = "14zxf849r4k3mk5i5rakfjp2f216sz84ww4hfggq9cnr9w8j406j";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base chalmers-lava2000 containers mtl QuickCheck
        ];
@@ -19083,6 +19204,7 @@ self: {
        pname = "XMMS";
        version = "0.1.1";
        sha256 = "08l53b0wp6v9wjfn53xfa1vlh64bnqidajc4lzlk8p31km1c09qx";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers ];
        librarySystemDepends = [ xmmsclient xmmsclient-glib ];
        homepage = "http://kawais.org.ua/XMMS/";
@@ -19099,6 +19221,7 @@ self: {
        pname = "XMPP";
        version = "0.1.2";
        sha256 = "03gypa9kln2v3zqyxszn4k2x364g8wj0hppsy10ywmandghsvn7b";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base haskell98 hsdns mtl network parsec random utf8-string
        ];
@@ -19198,6 +19321,7 @@ self: {
        sha256 = "1r2n1vbzq755p68fzb5f6fm1yjfq2c5jgx52ri9p5rlrwmfk3hw5";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base data-accessor-transformers fclabels monads-fd random SDL
          SDL-image SDL-mixer SDL-ttf transformers
@@ -19239,6 +19363,7 @@ self: {
        sha256 = "0qa7m9y3dclr2r2vpd2cmpc58nib158hnr49hrdjvk00ncd4lyvk";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base blaze-builder blaze-html bytestring case-insensitive
          clientsession conduit containers data-default directory filepath
@@ -19323,6 +19448,7 @@ self: {
        sha256 = "028a7lrfyikvky52s19kffssnry1grnip3sm7z55bs5fazma1im1";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base bytestring containers HCodecs Yampa
        ];
@@ -19404,6 +19530,7 @@ self: {
        pname = "ZFS";
        version = "0.0.2";
        sha256 = "1mwpcgkw1cci2grhb8vl081wykkgsmfbanwapp10mrzzp0df1yzr";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base CC-delcont containers mtl network unix
        ];
@@ -19421,6 +19548,7 @@ self: {
        sha256 = "1s005k892z9651mr2jj0jdwpm8aa0y72vi405xi4h6czg52i4rb3";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ array base gtk mtl random ];
        description = "A Z-machine interpreter";
        license = stdenv.lib.licenses.bsd3;
@@ -19492,6 +19620,7 @@ self: {
        sha256 = "0jfnf0rq3rfic196zjwbaiamyis98zrr8d4zn2myjlgqlzhljzs0";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base biofasta biopsl cmdargs containers directory process
        ];
@@ -19847,6 +19976,7 @@ self: {
        sha256 = "10mnsl5bclqf1k9yjadxy4zsj6pm4qbsx2hkrrhkjxfvhcba3wcb";
        revision = "3";
        editedCabalFile = "04w0gy775lxjgvvg1mbyrz0xzbdrc0dzbygy4vi52j0y9lygb4vm";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          accelerate array base binary bytestring containers cryptohash cuda
          directory fclabels filepath hashable hashtables language-c-quote
@@ -20865,6 +20995,7 @@ self: {
        sha256 = "03za0c24a22fy28mcm173r0cca6fk60jikp0pp817mrq6gpv62hc";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          activehs-base array base blaze-html bytestring cmdargs containers
          data-pprint deepseq dia-base dia-functions directory filepath
@@ -20910,6 +21041,7 @@ self: {
        pname = "actor";
        version = "0.1.1";
        sha256 = "1ic74yrfy6hk7217vh2ff6yacvf3dc5m1hjkcpfvxzdk5xhdv2b5";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base haskell98 stm time ];
        homepage = "http://sulzmann.blogspot.com/2008/10/actors-with-multi-headed-receive.html";
        description = "Actors with multi-headed receive clauses";
@@ -20990,6 +21122,7 @@ self: {
        sha256 = "17ikb90zwz3vvs9yg3z83pzs442vy5nx0h44i64akn10aykw8hic";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base case-insensitive containers directory filepath http-conduit
          MissingH mtl network network-uri old-locale parsec
@@ -21800,6 +21933,7 @@ self: {
        sha256 = "1idw9bb1miw61vvyacrlnx98rl4p0wx750gnhc4blx4a07i5vs9h";
        revision = "1";
        editedCabalFile = "1rl9hm85r607iwigzg5y1rki8vl7943ws4j1zsz0hq8g3mcb5alf";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers ghc-prim mtl QuickCheck
          regex-base regex-compat regex-pcre scientific syb template-haskell
@@ -22002,6 +22136,7 @@ self: {
        pname = "afis";
        version = "0.1.2";
        sha256 = "0ppq3rbwszz3wczg0zgk8hjqplv2ck11bbq5xr8306s5n02ybcf9";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base byteable bytestring crypto-random cryptohash packer
        ];
@@ -22059,6 +22194,7 @@ self: {
        sha256 = "070xszykrazkisp1lsh2q1ri1i64lhd8psz8g4blv37zm899fpga";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          Agda base cmdargs containers directory filepath HJavaScript mtl
          pandoc snap-core snap-server transformers utf8-string xhtml
@@ -22204,6 +22340,7 @@ self: {
        pname = "air-spec";
        version = "2013.7.1";
        sha256 = "0s4y2805nmfydzxgr5lnhmyzkb6rh9mx2kpvzqqgyh4jvccdnwfx";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base hspec text ];
        homepage = "https://github.com/nfjinjing/air-spec";
        description = "air spec helper";
@@ -22488,6 +22625,7 @@ self: {
        sha256 = "1x2rc0gyyg7idc07hi64fvkv5h5a652kmcrczfxqyzbiyx2fjphs";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base binary bytestring containers cpphs directory fgl
          filepath haskeline HsSyck mtl old-time pretty process random
@@ -22541,6 +22679,7 @@ self: {
        sha256 = "0kybz7q9gd0f35qmgnrg625z8kis308svingkjscn9ridwxz6g09";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base optparse-applicative random text
        ];
@@ -22650,6 +22789,7 @@ self: {
        sha256 = "1wi0x4750c525zaqk8hzin4n1k38219nmgynv85rdsxik5qm141y";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers exceptions haskeline hxt megaparsec mtl path
          QuickCheck random text tf-random transformers
@@ -22907,6 +23047,7 @@ self: {
        sha256 = "1xickrpjx2dn2pa5zcbjsfm5j6mqn54hpyzi7c6sv5i20hs2gamp";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base containers directory editline fgl filepath HUnit
          incremental-sat-solver mtl network parsec pretty QuickCheck random
@@ -23043,6 +23184,7 @@ self: {
        sha256 = "1dmc336irhw6wdny6f2za9n3gnd83i3pcfr7qfkm8fzq6kzkkjy3";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base event-list midi non-negative
        ];
@@ -24992,6 +25134,7 @@ self: {
        pname = "amby";
        version = "0.3.2";
        sha256 = "0sck0jjr1iwiy6lxd0lhv4cww004pcm7i9b9d8wikfvp2g170yzs";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring cassava Chart Chart-cairo Chart-diagrams colour
          containers data-default data-default-class datasets either
@@ -25019,6 +25162,7 @@ self: {
        sha256 = "0i37ycyhks335gfby81mnjflk40ir66aprf4752sqnqs68wk6bpm";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring containers csv directory filepath graphviz hashable
          HStringTemplate lens MissingH mtl old-locale old-time pandoc
@@ -25161,6 +25305,7 @@ self: {
        pname = "analyze";
        version = "0.1.0.0";
        sha256 = "0ia4dcqzq168qy5qh65dsp7bb94bxmxnpi2l9vzp7492wrhij9mg";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base binary bytestring cassava exceptions foldl free hashable
          lucid text unordered-containers vector
@@ -25259,6 +25404,7 @@ self: {
        sha256 = "0xza3xfzzbix9xf0vwwk4qz02h4iil3hglqspgdymhjbxfl68714";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          atomo base blaze-html bytestring containers directory filepath
          hashable haskeline highlighter mtl parsec pretty pretty-show
@@ -25818,6 +25964,7 @@ self: {
        sha256 = "08a747p0dyjvgn5pjfvrb1hnh7vk2km8hbbyvjmnsxl89r5m992l";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base bytestring containers deepseq directory filepath glib
          gtk HTTP mtl network process transformers tremulous-query
@@ -25875,6 +26022,7 @@ self: {
        pname = "api-opentheory-unicode";
        version = "1.2";
        sha256 = "1mzbkrbdwcxr83bprk3gjrrg6sarl0vwv729xs8x5d1rfdiqlm88";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring opentheory-unicode ];
        testHaskellDepends = [
          base bytestring directory opentheory-unicode
@@ -27577,6 +27725,7 @@ self: {
        editedCabalFile = "18qjn7asld26nlri6md4z3kmyvarvvg5wi7rwsg4ngrxw4gbqhqm";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring cereal mtl text ];
        homepage = "https://github.com/vincenthz/hs-asn1/tree/master/data";
        description = "ASN1 data reader and writer in RAW, BER and DER forms";
@@ -27636,6 +27785,7 @@ self: {
        sha256 = "05kdx00bkpp3f4x1i9j8kfbdnhsivx1njcfpcxxgw93jm5ng3lj7";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          asn1-encoding asn1-types base bytestring pem
        ];
@@ -27707,6 +27857,7 @@ self: {
        pname = "assertions";
        version = "0.1.0.4";
        sha256 = "1b2p6b6brk0b1hq264i20bpdhdaq4xdzcqp7gzvfy1s5q3zwjzj8";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ ansi-terminal base containers ];
        testHaskellDepends = [ base interpolate process ];
        description = "A simple testing framework";
@@ -27779,6 +27930,7 @@ self: {
        sha256 = "1zb265z6m1py2jxhxzrq2kb3arw2riagajhh3vs0m54rkrak6szs";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers directory MonadRandom mtl OpenGL random SDL
          SDL-image SDL-mixer SDL-ttf unix
@@ -27817,6 +27969,7 @@ self: {
        sha256 = "0lv4wbblv4r0vwfynswsxzyrl6qp45byjdmg4cs760qq3jj749zl";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          astview-utils base bytestring containers directory filepath glade
          glib Glob gtk gtksourceview2 hint mtl process syb
@@ -28129,6 +28282,7 @@ self: {
        pname = "atlassian-connect-core";
        version = "0.8.0.0";
        sha256 = "1gja0q9bxr86wd4cwi6w4iv5bimb37jk7gy5bzc727fp2k75ja42";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson atlassian-connect-descriptor base base64-bytestring
          bytestring case-insensitive cipher-aes configurator containers
@@ -28409,6 +28563,7 @@ self: {
        sha256 = "0hby64jd9zi518rnfk46ilipnp3x0ynkgqk2n0brf1873y88mwx8";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring containers directory filepath hashable hint
          mtl parsec pretty regex-pcre template-haskell text time vector
@@ -28766,6 +28921,7 @@ self: {
        sha256 = "1wmfnvl39amyfzkvpd3gysshyf10fjjb91zibalkqbq9pbsnfzjk";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base Cabal directory epic haskell98
        ];
@@ -28807,6 +28963,7 @@ self: {
        pname = "audiovisual";
        version = "0.0";
        sha256 = "0qjcsvv52l53iqyh7hkhwdsifqb943wjp1vn63qhqsrdaajazp3h";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base boundingboxes colors deepseq directory filepath free freetype2
          hashable JuicyPixels JuicyPixels-util lens linear mtl objective
@@ -28827,6 +28984,7 @@ self: {
        sha256 = "08z6l97hi6clv3b34mz9zjc5rns02jx1zx9iqdsmjl2p7hcn7rs5";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring directory unix ];
        libraryPkgconfigDepends = [ augeas ];
        executableHaskellDepends = [ HUnit ];
@@ -29161,6 +29319,7 @@ self: {
        sha256 = "13z9c4j7f8smc441qawl7brljmgsgmfmp4dzq7914f7ycg24ck6g";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory mtl process unix ];
        homepage = "https://github.com/dagit/autoproc";
        description = "EDSL for Procmail scripts";
@@ -30210,6 +30369,7 @@ self: {
        sha256 = "12cyn149dgd9wvnc7smqsfy15mzgyfg8l17y6qz0k4dyapp8fvhf";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base containers random wx wxcore
        ];
@@ -30331,6 +30491,7 @@ self: {
        sha256 = "1xb05l5b94hdq65x24z1m4fhvsr977y912qa1c7wi8khc9xvbhqw";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring cmdargs containers deepseq direct-sqlite
          directory disk-free-space extra filepath hashable HTTP http-client
@@ -30386,6 +30547,7 @@ self: {
        pname = "bamboo";
        version = "2010.2.25";
        sha256 = "0v96ync9vkq7xyc5jmm7k7vfxpy4m1l2370m99wa8qlrpcffhrmi";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers data-default directory filepath gravatar
          hack hack-contrib haskell98 mps mtl network old-locale old-time
@@ -30408,6 +30570,7 @@ self: {
        sha256 = "1xp2k33jxbkf0maj3p3grv93c9vnjg6fzy6l8gg5dhil18834vdd";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          bamboo bamboo-theme-blueprint base bytestring data-default hack
          hack-contrib hack-handler-hyena haskell98 mps process
@@ -30426,6 +30589,7 @@ self: {
        pname = "bamboo-plugin-highlight";
        version = "2009.7.5";
        sha256 = "0f8hpampawv0csqsb504hg97r7mimkcs9irm9i2m2b13w5fciaqc";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          bamboo base bytestring hack hack-contrib highlighting-kate hxt mps
          xhtml
@@ -30445,6 +30609,7 @@ self: {
        pname = "bamboo-plugin-photo";
        version = "2009.7.5";
        sha256 = "19ik80hcshmw8gpsb9gwngnwvriri10xx2v6xvrz0q25cxgwdjah";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring data-default directory filepath hack hack-contrib
          haskell98 hxt mps utf8-string xhtml
@@ -30464,6 +30629,7 @@ self: {
        pname = "bamboo-theme-blueprint";
        version = "2010.2.25.1";
        sha256 = "1wchvz2nm4klg11wjk3yb5yvqpa26c9lg6xc65k0dwxhy0cyd2zx";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          bamboo base bytestring containers data-default gravatar hack
          hack-contrib hcheat mps network rss utf8-string xhtml
@@ -30485,6 +30651,7 @@ self: {
        pname = "bamboo-theme-mini-html5";
        version = "2009.11.27";
        sha256 = "02zh9jqq46gg3hrsfjfq2skajr4jni3cisak4nd3shl6aqapw9d6";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          bamboo base base64-string bytestring cgi containers data-default
          directory filepath gravatar hack hack-contrib haskell98 hcheat moe
@@ -30629,6 +30796,7 @@ self: {
        sha256 = "0igz39bxlw4p0fna1wf6g791pk7r1m7hfyib5rgmsdahzkkp7v2h";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring containers directory filepath ghc ghc-prim html
          plugins snap-core snap-server text transformers unix-compat
@@ -30663,6 +30831,7 @@ self: {
        editedCabalFile = "167akvi72l47gcqbq5609m24469pq0xmv0kjbmivnrxs796gh890";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base blaze-svg bytestring template-haskell text
          unordered-containers
@@ -30878,6 +31047,7 @@ self: {
        pname = "base32string";
        version = "0.9.1";
        sha256 = "0cpa6bvam4zd2l2hb3sdngj0dx482c9rkz4jj87n6pxsmq9id4wy";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ aeson base binary bytestring text ];
        testHaskellDepends = [ base binary bytestring hspec text ];
        homepage = "http://www.leonmergen.com/opensource.html";
@@ -30930,6 +31100,7 @@ self: {
        pname = "base58string";
        version = "0.10.0";
        sha256 = "1260x4bkrizvnmylm237gpi92wazh31md9nf982sac3fsxyn0wiv";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ aeson base binary bytestring text ];
        testHaskellDepends = [ base binary bytestring hspec text ];
        homepage = "http://www.leonmergen.com/opensource.html";
@@ -31101,6 +31272,7 @@ self: {
        sha256 = "1vb74crz57i4qmjl8k3gxr2abz9rmpw7yl5sm1pggnlfy9wcm15l";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers mtl parsec pretty unix
        ];
@@ -31321,6 +31493,7 @@ self: {
        sha256 = "1mwc7l1n2gnw8yx5zphxlkgi6bkcw56qwifpy34wpa55x2lf6n82";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ aeson base network text url ];
        executableHaskellDepends = [ aeson base network text url ];
        description = "Update CSS in the browser without reloading the page";
@@ -31477,6 +31650,7 @@ self: {
        sha256 = "1sq6z2a9bddqh0kys10g495bfj7pcyibsvhfxfl279z53va7d6ch";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring containers convertible Crypto directory filepath
          happstack-server happstack-util hdaemonize HDBC HDBC-postgresql
@@ -31836,6 +32010,7 @@ self: {
        sha256 = "0bclazwhg3ra7zv19xfx5rw2z3p8h8scw5r4m281524qzrkm9j6m";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring cgi containers directory hint mtl parsec pretty
          template-haskell unix utf8-string xhtml
@@ -32763,6 +32938,7 @@ self: {
        pname = "bindings-K8055";
        version = "0.1.2";
        sha256 = "0daga3vh9x9gih25qgcsl0hafi4hw8h5x64ba6wbmywa9z3hrr20";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ K8055D ];
        homepage = "https://github.com/jputcu/bindings-K8055";
@@ -33355,6 +33531,7 @@ self: {
        pname = "bindings-sc3";
        version = "0.4.1";
        sha256 = "07vp6hzjjrbh3j152mq8f1i6xh9m2r20a555y03p9fzdfrb5kixd";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [ scsynth ];
        homepage = "https://github.com/kaoskorobase/bindings-sc3/";
@@ -33531,6 +33708,7 @@ self: {
        sha256 = "1vby3nbqbwza65jg5d0bmzh22i5s20cjbqdgaq9zasza7ywgkj22";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base binary bytestring containers directory mtl parallel
          parsec QuickCheck tagsoup
@@ -33643,6 +33821,7 @@ self: {
        pname = "bioinformatics-toolkit";
        version = "0.3.1";
        sha256 = "0hymk1lk26mla5al22bbj582vg96bwky6vwyqfy9b97q64w50lzl";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring bytestring-lexing
          case-insensitive clustering conduit-combinators containers
@@ -33751,6 +33930,7 @@ self: {
        sha256 = "0w380dcpk8gp5cx24nh6xlnibd6pw93wmxcajl26p4kd5cxbgfqz";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers data-default hack hack-handler-happstack
          haskell98 MissingH mtl parsec process rallod
@@ -33840,6 +34020,7 @@ self: {
        pname = "bitcoin-api";
        version = "0.12.1";
        sha256 = "0c1ydggik4k3vj93bqk53privyblkwhd32jizw25qk5j34axwy69";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base base58string binary bitcoin-block bitcoin-script
          bitcoin-tx bitcoin-types bytestring hexstring lens lens-aeson text
@@ -33863,6 +34044,7 @@ self: {
        pname = "bitcoin-api-extra";
        version = "0.9.1";
        sha256 = "1z6pppjgq6sy4q78k176pnr6y3lq369brqf0pg90v0qggl0cc8y4";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary bitcoin-api bitcoin-block bitcoin-tx bytestring conduit
          lens stm stm-chans stm-conduit text transformers
@@ -33884,6 +34066,7 @@ self: {
        pname = "bitcoin-block";
        version = "0.13.1";
        sha256 = "0nkx86fwv65x9vz6ni6qgz61afnvcifw2g92bnwdli8hww7prxfp";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary bitcoin-tx bitcoin-types bytestring cryptohash
          hexstring largeword lens
@@ -33994,6 +34177,7 @@ self: {
        pname = "bitcoin-script";
        version = "0.11.1";
        sha256 = "0k3v35p6qpgh88gc5rqpcmh202xrn2rind9641dinwqqx631v31r";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base base16-bytestring binary bytestring text
        ];
@@ -34011,6 +34195,7 @@ self: {
        pname = "bitcoin-tx";
        version = "0.13.1";
        sha256 = "006c55l6q6cknxw0k0kzr8vkv8azapfb4mkax6ac6rih6mjq5f1v";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary bitcoin-script bitcoin-types bytestring cryptohash
          hexstring lens
@@ -34031,6 +34216,7 @@ self: {
        pname = "bitcoin-types";
        version = "0.9.2";
        sha256 = "02y4svhcsml37p78g4cm97kyigcakgf4hds4bxnp0r4ba1498bxp";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base base58string binary bytestring hexstring text
        ];
@@ -34205,6 +34391,7 @@ self: {
        pname = "bitset";
        version = "1.4.8";
        sha256 = "0h912i3wb6v8sx0c4mlp0j65l3yhpdsk3my8zhif2jls2sxns988";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base deepseq ghc-prim integer-gmp ];
        librarySystemDepends = [ gmp ];
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
@@ -34428,6 +34615,7 @@ self: {
        sha256 = "1zb076m4673jmvzazwjjmlw3nrnw0j22hiim6r90014sqcpb6xhp";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base haskell98 unix ];
        homepage = "http://github.com/nfjinjing/bla";
        description = "a stupid cron";
@@ -34544,6 +34732,7 @@ self: {
        sha256 = "1cs81ykw1y2q1kwkdni5w9jxa8bc31b118diaqzf870bqm7mq3ia";
        revision = "11";
        editedCabalFile = "1n5sf249kcrk276hdj68g7v6fmhfg6wfwaaibqx2am86iz8dvr06";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base base-compat base64-bytestring bytestring colour
          containers data-default-class http-types kansas-comet mime-types
@@ -34988,6 +35177,7 @@ self: {
        sha256 = "0c4m9ia92djr8lhp6n1zwwxskr344322m8g24ka4skbrp1vy3qnd";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring cereal containers d-bus data-default-class
          microlens microlens-ghc mtl random text transformers uuid
@@ -35132,6 +35322,7 @@ self: {
        sha256 = "0bdhcjiz2b4zavmixvrl5la91s9z5pra05xk52118cjk4dcfdzfg";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base directory feed filepath higherorder highlighting-kate mtl
          old-locale pandoc regex-compat time utf8-string xhtml xml
@@ -35296,6 +35487,7 @@ self: {
        sha256 = "0cryvs5ia52dkc232cl2crhf0qq7ncir5c3zvrgsbzcc2hnmyrww";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base GLFW OpenGL ];
        description = "OpenGL Logic Game";
        license = "GPL";
@@ -35331,6 +35523,7 @@ self: {
        sha256 = "12f594sl2c2hrxr95bpv911x0bdfpmaflp29mhw2yln2vh64nhj5";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base cereal containers random ];
        executableHaskellDepends = [
          base Cabal cereal containers data-default-class network pandoc
@@ -35369,6 +35562,7 @@ self: {
        sha256 = "13xfnx08xgbfppr4cqmrqj82w192ll4m1x4kmv5jdpk02yb4zqa2";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base ConfigFile containers directory filepath glade gtk mtl process
          random regex-compat unix utf8-string X11 X11-xft xmonad
@@ -35595,6 +35789,7 @@ self: {
        pname = "bond-haskell";
        version = "0.1.5.0";
        sha256 = "01l6n6gx2qdwan1dx8vswvm13scp0dxbdvnv5j4w34iyj6qg0qnv";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson array base binary bond-haskell-compiler bytestring containers
          deepseq extra hashable mtl scientific text unordered-containers
@@ -35814,6 +36009,7 @@ self: {
        sha256 = "0am2b5f6a47khka31mxynl9j2fisa6zyfk3ca8yna02hdkw3rlf6";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers descrilo directory filepath simtreelo
        ];
@@ -36252,6 +36448,7 @@ self: {
        sha256 = "1pkjiwxm8lkrjnyya14f6kmmyv9w5lx7328wdyf1w1871daw208p";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson base binary blaze-html bytestring configurator cryptohash
          directory hashtables http-types mtl random Spock Spock-core text
@@ -36557,6 +36754,7 @@ self: {
        pname = "btree-concurrent";
        version = "0.1.5";
        sha256 = "1xgw3ki3vypyxxiyzfjajjx1vzavyn1v9445cgbqwrr0n0wpkqm6";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base base64-bytestring bytestring cereal containers directory
          filepath hashable mtl random snappy stm time
@@ -36983,6 +37181,7 @@ self: {
        sha256 = "051z39s1xb86ab1a3v4yz8vv8k2kygpixzd878nb1p2pp6xjq74j";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryPkgconfigDepends = [ system-glib ];
        executableHaskellDepends = [
          base bytestring cairo containers dbus directory filepath gio glib
@@ -37032,6 +37231,7 @@ self: {
        sha256 = "0dgjjfd4lna6kvqbckx378ssxc5mm9xyvdkwd3r197199rmxq733";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [
          base bytestring gl-capture GLUT OpenGLRaw OpenGLRaw21 repa
@@ -37096,6 +37296,7 @@ self: {
        pname = "byteable";
        version = "0.1.1";
        sha256 = "1qizg0kxxjqnd3cbrjhhidk5pbbciz0pb3z5kzikjjxnnnhk8fr4";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring ];
        homepage = "http://github.com/vincenthz/hs-byteable";
        description = "Type class for sequence of bytes";
@@ -37110,6 +37311,7 @@ self: {
        sha256 = "1pf01mna3isx3i7m50yz3pw5ygz5sg8i8pshjb3yw8q41w2ba5xf";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring ];
        homepage = "http://github.com/vincenthz/hs-bytedump";
        description = "Flexible byte dump helpers for human readers";
@@ -37373,6 +37575,7 @@ self: {
        pname = "bytestring-progress";
        version = "1.0.7";
        sha256 = "0c1pz39jp9p8ppajnj3f2phph12nvhhjj7iz8sm580gzdl5rbc4p";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring terminal-progress-bar time
        ];
@@ -37604,6 +37807,7 @@ self: {
        pname = "bzlib-conduit";
        version = "0.2.1.4";
        sha256 = "07gxnbr65pl70lssgcxbajc0id9x4p3p8mc0hfi9lgf8rh270w1d";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bindings-DSL bytestring conduit conduit-extra data-default mtl
          resourcet
@@ -37746,6 +37950,7 @@ self: {
        sha256 = "1fsj0wx8nv19yavky6s47djyh9nxcj9bz968x5w10fpl5ks4xc4m";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base bytestring containers directory dlist filepath
          language-c pretty process
@@ -37770,6 +37975,7 @@ self: {
        sha256 = "17hgj8s08lh7mjddbsahdgssk80wpkhc4qspfc34k7zyr9w185zl";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base bytestring containers directory dlist filepath
          language-c pretty process
@@ -38018,6 +38224,7 @@ self: {
        sha256 = "1372bpn8s7d7nm01ggp3m98ldrynidbchk3p14yrjysvxwr3l6q8";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring Cabal containers directory filepath HTTP mtl
          network pretty process setenv tar template-haskell transformers
@@ -38459,6 +38666,7 @@ self: {
        pname = "cabal-scripts";
        version = "0.1.1";
        sha256 = "1ajgx29hvcsdd6lwc78dyhsjm5ikx2zn0kdbwnzn1kggz2l08ls4";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        doHaddock = false;
        description = "Shell scripts for support of Cabal maintenance";
@@ -38634,6 +38842,7 @@ self: {
        sha256 = "0sk10z9lj291rpidlaydp7nvgl7adbp7gyf2nvqqhrshxnlqpc8z";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          archlinux base bytestring Cabal cmdargs containers directory
          filepath mtl pretty process
@@ -39065,6 +39274,7 @@ self: {
        pname = "cairo";
        version = "0.13.3.1";
        sha256 = "0nk77lixlf6j3a2870mbakcznigrf43m6ac1xn35d1v3dmy1kjm3";
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          array base bytestring mtl text utf8-string
@@ -39083,6 +39293,7 @@ self: {
        sha256 = "1191j2587f1sy4d6z57df21xn00qdpv27clib7cyaqdy5jnv3zw2";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base cairo glib gtk ];
        description = "A template for building new GUI applications using GTK and Cairo";
        license = stdenv.lib.licenses.bsd3;
@@ -39124,6 +39335,7 @@ self: {
        sha256 = "1f8vpm9a6rv7bgi9a8zarxa0jlph1p6hj1cdqzk5g81mr4dc4vkv";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base bytestring containers deepseq directory filepath
          haskell-src-meta mime-types monadloc mtl parsec process syb
@@ -39182,6 +39394,7 @@ self: {
        sha256 = "1fj6v1dw1gyy6dx4ssiziahxf8j8vr4l35n3rm04g797wypswmw0";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base cal3d cal3d-opengl OpenGL SDL ];
        homepage = "http://haskell.org/haskellwiki/Cal3d_animation";
        description = "Examples for the Cal3d animation library";
@@ -39307,6 +39520,7 @@ self: {
        sha256 = "0q84q1821ilb0nh228jdpc6acxbbfngihir4mdklr8hywanz3s1g";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bindings-portaudio boundingboxes colors containers
          control-bool deepseq directory filepath free freetype2 GLFW-b
@@ -39385,16 +39599,17 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
-  "camfort_0_902" = callPackage
+  "camfort_0_904" = callPackage
     ({ mkDerivation, alex, array, base, binary, bytestring, containers
      , directory, fgl, filepath, fortran-src, GenericPretty, ghc-prim
-     , happy, hmatrix, hspec, lattices, matrix, mtl, partial-order
-     , QuickCheck, sbv, syb, syz, text, transformers, uniplate, vector
+     , happy, hmatrix, hspec, lattices, matrix, mtl
+     , optparse-applicative, partial-order, QuickCheck, sbv, syb, syz
+     , text, transformers, uniplate, vector
      }:
      mkDerivation {
        pname = "camfort";
-       version = "0.902";
-       sha256 = "0pakm4zdygzxpfnvxmn88pc1y1dx33xw71lkg0hbxj1k4dn4651q";
+       version = "0.904";
+       sha256 = "0j1m9vc4fs7151s2bm1nl480c87mqfann6xv7bzcx6p76iqxvii8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -39403,17 +39618,13 @@ self: {
          partial-order sbv syb syz text transformers uniplate vector
        ];
        libraryToolDepends = [ alex happy ];
-       executableHaskellDepends = [
-         array base binary bytestring containers directory fgl filepath
-         fortran-src GenericPretty ghc-prim hmatrix lattices matrix mtl
-         partial-order QuickCheck sbv syb syz text transformers uniplate
-         vector
-       ];
+       executableHaskellDepends = [ base optparse-applicative ];
        testHaskellDepends = [
          array base binary bytestring containers directory filepath
          fortran-src hmatrix hspec lattices mtl partial-order QuickCheck sbv
          text uniplate
        ];
+       homepage = "https://camfort.github.io";
        description = "CamFort - Cambridge Fortran infrastructure";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -39427,6 +39638,7 @@ self: {
        sha256 = "0r6wzn9kxwinfa383lbxsjlrpv4v2m72qzpsyc9gcigvd5h7zhzz";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base bytestring Imlib terminfo ];
        homepage = "not yet available";
        description = "write image files onto 256(or 24bit) color terminals";
@@ -39596,6 +39808,7 @@ self: {
        sha256 = "0rmq22fiaadpszckbj5k5gi4sr1jipinyrx9hwc21k5d185vsakd";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base cmdargs ConfigFile containers directory dlist filepath
          language-c mtl pretty process yices
@@ -39615,6 +39828,7 @@ self: {
        sha256 = "1492x5hy5ljf0h40c045jd3w26f7jwqplgncka3dnw4mx9kq4g15";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ array base containers haskell98 ];
        description = "Interprets and debug the cap language";
        license = stdenv.lib.licenses.bsd3;
@@ -39742,6 +39956,7 @@ self: {
        sha256 = "0k0zqi6c6cqhkxhdgn5n5cpq4pjlvv1m5wzxrsiw9aj23dk9bgxa";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base cairo directory filepath gtk gtk2hs-buildtools hcwiid
          highlighting-kate mtl pandoc pango process text time
@@ -40077,6 +40292,7 @@ self: {
        pname = "cash";
        version = "0.1.0.1";
        sha256 = "0pwn33dpv5bgs74i8x6q47hsbl0jg68xwhjjiwyjdyl6sb3rfih7";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base deepseq haskell98 HaXml network parallel pretty
        ];
@@ -40524,6 +40740,7 @@ self: {
        sha256 = "1vjhg9dxg23q0dqr07gbrg92h3m9r38d7jb3c4sxnw6gaj76f5gw";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base gtk haskell98 mtl parsec ];
        homepage = "http://code.atnnn.com/projects/casui";
        description = "Equation Manipulator";
@@ -41377,6 +41594,7 @@ self: {
        pname = "chalmers-lava2000";
        version = "1.6.1";
        sha256 = "12cwp804z1grsn4pyygd2mffr5lm02g1rxibjill5wyd24k1brgb";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base process random ];
        homepage = "http://projects.haskell.org/chalmers-lava2000/Doc/tutorial.pdf";
        description = "Hardware description EDSL";
@@ -41579,6 +41797,7 @@ self: {
        sha256 = "1q2jb2hycxqa9ka9q7yyl5ckvcc1mdiklwivms1mm4qylwaqmgy0";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring cereal cereal-text containers deepseq
          directory filepath fullstop hashable mbox MonadRandom parsec
@@ -41895,6 +42114,7 @@ self: {
        sha256 = "0i94impyhsrj4kg7mdr1xawmgalsfr3nsazl4v9ykhn3jam4kczb";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base digits either-unwrap generic-trie haskeline parsec
        ];
@@ -42116,6 +42336,7 @@ self: {
        pname = "chu2";
        version = "2012.11.20";
        sha256 = "01q34kzhisb8ani3k5dfjaixa7j1vqg0nh8mbmnya52hr7p4sdiz";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring data-default hack2 hack2-handler-snap-server
          utf8-string
@@ -42520,6 +42741,7 @@ self: {
        pname = "citation-resolve";
        version = "0.4.3";
        sha256 = "1x561l7shkz1nh43xh2nj83pb183rah1swi0ql9n0wr9ykq1mh1l";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring citeproc-hs containers curl data-default
          directory download-curl either lens mtl process safe text
@@ -42543,6 +42765,7 @@ self: {
        pname = "citeproc-hs";
        version = "0.3.10";
        sha256 = "1fb51v8hv8ik3a8grba2br6cfbj1b3y72lgjh4i75xh09i7xna0r";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers directory filepath hexpat hs-bibutils
          HTTP json mtl network network-uri old-locale pandoc-types parsec
@@ -42623,6 +42846,7 @@ self: {
        pname = "cjk";
        version = "0.1.0.1";
        sha256 = "1r0rw33vqkhck0mfqz19plw9a71f56gdcjldrxl23178fps349vl";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base bytestring containers text text-icu
        ];
@@ -42666,6 +42890,7 @@ self: {
        sha256 = "1llr7mnlh8msn9plgnnj73w3jqlcwn8v9k2m58520l9q2zfvf68b";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson array base bytestring cmdargs containers data-stringmap
          directory executable-path file-embed filepath HTTP json-builder
@@ -42700,6 +42925,7 @@ self: {
        sha256 = "1jv1bl9fzbahhk0g64n611h9hipkr4zcasj2dw5w5v2nqlwrwdjj";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base clafer containers data-stringmap directory
          executable-path filepath haskeline HaXml json-builder mtl
@@ -42729,6 +42955,7 @@ self: {
        pname = "claferwiki";
        version = "0.4.5";
        sha256 = "0rjppdxxzaf3898jklq4c0b7zjnkg6zcqr5nxbrabmvm2l53a4p0";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base clafer containers directory gitit MissingH mtl network
          network-uri process SHA split time transformers transformers-compat
@@ -42929,6 +43156,7 @@ self: {
        pname = "clash-prelude-quickcheck";
        version = "0.1.2.1";
        sha256 = "1fn5wlg2lmxl6rs2ygnf0m88bgcjf62jpprbp425pqbq6lvhw70w";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base clash-prelude QuickCheck ];
        description = "QuickCheck instances for various types in the CλaSH Prelude";
        license = "unknown";
@@ -42943,6 +43171,7 @@ self: {
        pname = "clash-systemverilog";
        version = "0.7.2";
        sha256 = "056m8ynwq3y11zkkx9nkkmvamnm2m3337vk8lkx90pk96nvdiaiy";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base clash-lib clash-prelude fgl hashable lens mtl text
          unordered-containers wl-pprint-text
@@ -42961,6 +43190,7 @@ self: {
        pname = "clash-verilog";
        version = "0.7.2";
        sha256 = "09bfrhhiml6m0qssvr18p38ypyxj1zp7vxgci974gd6k597ihi2k";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base clash-lib clash-prelude fgl hashable lens mtl text
          unordered-containers wl-pprint-text
@@ -42979,6 +43209,7 @@ self: {
        pname = "clash-vhdl";
        version = "0.7.2";
        sha256 = "1c63m2gcifak0v38rsmv4j521br84jaspdb193a66957qisvfsvs";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base clash-lib clash-prelude fgl hashable lens mtl text
          unordered-containers wl-pprint-text
@@ -43148,6 +43379,7 @@ self: {
        pname = "clckwrks";
        version = "0.24.0.3";
        sha256 = "1c0y9aw48qq7zyg8958lk5kzmfaa8ndgw88ps92sx5aj4z0ggsmf";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          acid-state aeson aeson-qq attoparsec base blaze-html bytestring
          cereal containers directory filepath happstack-authenticate
@@ -43182,6 +43414,7 @@ self: {
        pname = "clckwrks";
        version = "0.24.0.4";
        sha256 = "0xpv3qb7w1bzszbnmzriai9dv9qfajnv1pv9y3jdaih4gj73c9ny";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          acid-state aeson aeson-qq attoparsec base blaze-html bytestring
          cereal containers directory filepath happstack-authenticate
@@ -43254,6 +43487,7 @@ self: {
        pname = "clckwrks-plugin-bugs";
        version = "0.7.5";
        sha256 = "0la4ivk8sbh8wq1g2nhxx522ir2idffz5818bghjf8qffmqa47fv";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          acid-state attoparsec base cereal clckwrks clckwrks-plugin-page
          containers directory filepath happstack-authenticate happstack-hsp
@@ -43279,6 +43513,7 @@ self: {
        pname = "clckwrks-plugin-ircbot";
        version = "0.6.17.3";
        sha256 = "1fk6jyjvkqs11khj8mriqbj56kz19ayhha3kq79cnhjm8c7184cb";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          acid-state attoparsec base blaze-html bytestring clckwrks
          containers directory filepath happstack-hsp happstack-server hsp
@@ -43304,6 +43539,7 @@ self: {
        pname = "clckwrks-plugin-mailinglist";
        version = "0.3.0.2";
        sha256 = "1zhcqkzas3pcnviwka0v174spq8wn457kvmxk6nafcxkwf27p52m";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          acid-state attoparsec base bytestring clckwrks containers directory
          filepath happstack-authenticate happstack-hsp happstack-server hsp
@@ -43327,6 +43563,7 @@ self: {
        pname = "clckwrks-plugin-media";
        version = "0.6.16.3";
        sha256 = "1kslj1yvw6kn68grcr7drhrybb1b5d1id5plcaa4570yz8vp7xr6";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          acid-state attoparsec base blaze-html cereal clckwrks containers
          directory filepath gd happstack-server hsp ixset magic mtl reform
@@ -43351,6 +43588,7 @@ self: {
        pname = "clckwrks-plugin-media";
        version = "0.6.16.4";
        sha256 = "19fv38gqslg01ymj3nb838pnhir92gfkyl6kccik39brgcfd915b";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          acid-state attoparsec base blaze-html cereal clckwrks containers
          directory filepath gd happstack-server hsp ixset magic mtl reform
@@ -43424,6 +43662,7 @@ self: {
        pname = "clckwrks-theme-bootstrap";
        version = "0.4.2.1";
        sha256 = "1mkqi3qx6k86d2xr4cyxg0ym5c71ip4ijgg6mg20gf3jkjjzvha4";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base clckwrks happstack-authenticate hsp hsx-jmacro hsx2hs jmacro
          mtl text web-plugins
@@ -43442,6 +43681,7 @@ self: {
        pname = "clckwrks-theme-clckwrks";
        version = "0.5.2.1";
        sha256 = "14pksv77afppp43dfba5f4brnycqhca2kylvb1bpjdb61lni9sk7";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base clckwrks containers happstack-authenticate hsp hsx2hs mtl text
          web-plugins
@@ -43458,6 +43698,7 @@ self: {
        pname = "clckwrks-theme-geo-bootstrap";
        version = "0.1.1";
        sha256 = "1qxik7hdz300n5lfb5xzh2md44b4xwwlr0c92y9x2na2xz41da7k";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base clckwrks hsp text ];
        homepage = "http://divshot.github.com/geo-bootstrap/";
        description = "geo bootstrap based template for clckwrks";
@@ -43488,6 +43729,7 @@ self: {
        sha256 = "1c6gn0rkb3c92hgc1blkbf21s62j1r7vqs2p8mmr6my5g52lvif1";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base cmdargs containers directory HSH IfElse
        ];
@@ -43715,6 +43957,7 @@ self: {
        sha256 = "1nsvhb7lbkclhqpbvs3ccwclpr4g8p6zmsyn072bc0d0icf4hql5";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base data-default functor-infix old-locale parsec strptime time
        ];
@@ -43906,26 +44149,26 @@ self: {
      }) {};
 
   "cloud-seeder" = callPackage
-    ({ mkDerivation, amazonka, amazonka-cloudformation, amazonka-core
-     , base, bytestring, deepseq, exceptions, fast-logger, hspec, lens
-     , monad-control, monad-logger, monad-time, mtl
-     , optparse-applicative, text, transformers, transformers-base
+    ({ mkDerivation, aeson, amazonka, amazonka-cloudformation
+     , amazonka-core, base, bytestring, containers, deepseq, exceptions
+     , fast-logger, hspec, lens, monad-control, monad-logger, monad-mock
+     , mtl, optparse-applicative, text, transformers, transformers-base
+     , unordered-containers, uuid, yaml
      }:
      mkDerivation {
        pname = "cloud-seeder";
-       version = "0.0.0.0";
-       sha256 = "1nh0qmj1fdxkqa2db8xpv7anrlqyl7dcphjd25qgq86gjcdn27bb";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.1.0.0";
+       sha256 = "1jyxbk37xzx7dgxkgrmpn7nv7v494l26f4c5r1j665cd1d8x0m4f";
        libraryHaskellDepends = [
-         amazonka amazonka-cloudformation amazonka-core base deepseq
-         exceptions lens monad-control monad-logger monad-time mtl
+         aeson amazonka amazonka-cloudformation amazonka-core base
+         containers deepseq exceptions lens monad-control monad-logger mtl
          optparse-applicative text transformers transformers-base
+         unordered-containers uuid yaml
        ];
-       executableHaskellDepends = [ base ];
        testHaskellDepends = [
-         amazonka-cloudformation base bytestring deepseq fast-logger hspec
-         lens monad-logger mtl text transformers
+         amazonka-cloudformation base bytestring containers deepseq
+         fast-logger hspec lens monad-logger monad-mock mtl
+         optparse-applicative text transformers yaml
        ];
        homepage = "https://github.com/cjdev/cloud-seeder#readme";
        description = "A tool for interacting with AWS CloudFormation";
@@ -44186,6 +44429,7 @@ self: {
        sha256 = "0in6fqzr1aki2dhbkv3vlmw17vla5m39g6msaplk4vix5yjw7vkq";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bio bytestring containers QuickCheck regex-compat simpleargs
        ];
@@ -44221,6 +44465,7 @@ self: {
        pname = "cmaes";
        version = "0.2.2.1";
        sha256 = "0r0z5rik19sd985hgdy7f00sfpqwlgzbsmkqsiywddi8nqg6qq7m";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base mtl process safe strict syb ];
        testHaskellDepends = [
          base doctest doctest-prop mtl process random syb vector
@@ -44377,6 +44622,7 @@ self: {
        sha256 = "1k0g2vh7sqkblzjsfvyhfiy1fcwkw0i10kgl4n2r68w7v52mmzd0";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring cmdargs directory filepath http-types process text
          transformers wai wai-handler-launch
@@ -44538,6 +44784,7 @@ self: {
        pname = "cndict";
        version = "0.8.2";
        sha256 = "0pc6rph99mxy5cbrxrysxq5q01vn2k2ax3c00pv9sw7inn4inh0p";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base bytestring text ];
        homepage = "https://github.com/Lemmih/cndict";
        description = "Chinese/Mandarin <-> English dictionary, Chinese lexer";
@@ -44821,6 +45068,7 @@ self: {
        sha256 = "0076dvka5c0m3smppp58lklnf26ry9kibzyiy4yx1ygw5rn7m7pc";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson base binary bytestring containers directory filepath glib
          gtk3 lens monad-control monad-logger mtl persistent
@@ -45098,6 +45346,7 @@ self: {
        sha256 = "0vyzjv5r9jww4n35yp9qmq5bb8h7k6gmr7iw6igm08cnlwx9pirr";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base colour containers data-default directory friday
          friday-devil split v4l2 vector vector-space yaml
@@ -45172,6 +45421,7 @@ self: {
        pname = "colour";
        version = "2.3.3";
        sha256 = "1qmn1778xzg07jg9nx4k1spdz2llivpblf6wwrps1qpqjhsac5cd";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        homepage = "http://www.haskell.org/haskellwiki/Colour";
        description = "A model for human colour/color perception";
@@ -46352,6 +46602,7 @@ self: {
        sha256 = "0q2l2yqxk210ycw1alcps9x7l2f60g9sb0wan7d1d2fkbfhq3z41";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base binary bytestring concraft containers double-conversion
          lazy-io moan network sgd split tagset-positional text
@@ -46374,6 +46625,7 @@ self: {
        sha256 = "0yhq3vdg7l0ibhv0pxj70jm5lrfjk3k0xd1p6ap6im4rh3xxvgw3";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base binary bytestring concraft containers lazy-io mtl
          network process sgd split tagset-positional text transformers
@@ -46449,6 +46701,7 @@ self: {
        sha256 = "1w4bg284fcnd15yg7097d8sh0rzxr76zlrr1bfj2dksw8ddy3jda";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base cmdargs containers hxt hxt-charproperties hxt-curl hxt-relaxng
          hxt-tagsoup
@@ -47224,6 +47477,7 @@ self: {
        pname = "config-manager";
        version = "0.3.0.1";
        sha256 = "1qrj0x2s0vsxnqkkmchwqvsmziqchrffaxkda9hx0s0ahyw5w0lb";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base filepath parsec text time unordered-containers
        ];
@@ -47379,6 +47633,7 @@ self: {
        pname = "configurator";
        version = "0.3.0.0";
        sha256 = "1d1iq1knwiq6ia5g64rw5hqm6dakz912qj13r89737rfcxmrkfbf";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base bytestring directory hashable text unix-compat
          unordered-containers
@@ -47420,6 +47675,7 @@ self: {
        pname = "configurator-ng";
        version = "0.0.0.1";
        sha256 = "0aq1iyvd3b2d26myp0scwi9vp97grfcrp2802s4xpg84vpapldis";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base bytestring critbit data-ordlist directory dlist
          fail hashable scientific text unix-compat unordered-containers
@@ -47486,6 +47742,7 @@ self: {
        sha256 = "02a33940rnwq5bzqx50fjy76q0z6nimsg2fk3q17ai4kvi0rw0p3";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring containers filepath html HTTP mtl network
          old-time parsec pretty random stm unix
@@ -48737,6 +48994,7 @@ self: {
        sha256 = "10pfz4bw1wh55c2cizd8jiwh8bkaqw9p773976vl52f0jrhns1qg";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring containers directory filepath
          filestore http-types monads-tf pandoc template-haskell text time
@@ -49026,6 +49284,7 @@ self: {
        sha256 = "1yv3lj86fkaf9mfxb97ic5v8hm4xx0vv3q4qj0c9n0ki21ymsa5z";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson base bytestring directory filepath old-locale
          optparse-applicative process stm text time unix
@@ -49136,6 +49395,7 @@ self: {
        pname = "cprng-aes";
        version = "0.6.1";
        sha256 = "1wr15kbmk1g3l8a75n0iwbzqg24ixv78slwzwb2q6rlcvq0jlnb4";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base byteable bytestring cipher-aes crypto-random
        ];
@@ -49175,6 +49435,7 @@ self: {
        sha256 = "079v1k1m61n3hrmz6lkdg400r3nn9fq8bwmy477vjjnyjvm1j38f";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base containers parallel ];
        description = "Symbolic cryptographic protocol analyzer";
        license = stdenv.lib.licenses.bsd3;
@@ -49188,6 +49449,7 @@ self: {
        sha256 = "0x19mlanmkg96h6h1i04w2i631z84y4rbk22ki4zhgsajysgw9sn";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/vincenthz/hs-cpu";
        description = "Cpu information and properties helpers";
@@ -49465,6 +49727,7 @@ self: {
        sha256 = "107chyp8br2ryjqdf7100109k0wg3jawzva76wf4r6fndjr3gin1";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base cmdargs directory process shelly text transformers unix
        ];
@@ -49912,6 +50175,7 @@ self: {
        sha256 = "0xps7jm8g1bg7a2y4b6mj5nhg3b595k5ysprf4711lwyfpy478jk";
        revision = "1";
        editedCabalFile = "0hgy2rbrb0dg1sjdvqk2zivdq075fih4zlf51ffdmqzgcdj3i9b1";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson ansi-wl-pprint base binary bytestring cassava code-page
          containers deepseq directory filepath Glob hastache js-flot
@@ -49942,6 +50206,7 @@ self: {
        sha256 = "0hbhm6fcbvh38m8hazlzjh3z09adjrzcv5jq63792bvnm24bpx6r";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson ansi-wl-pprint base base-compat binary bytestring cassava
          code-page containers deepseq directory exceptions filepath Glob
@@ -49999,6 +50264,7 @@ self: {
        sha256 = "010x56czgipw3p1cfkx07mlcy4yj6advq3zzgrxpmjhrxzsa89xn";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson base blaze-html blaze-markup bytestring containers filepath
        ];
@@ -50238,6 +50504,7 @@ self: {
        pname = "crypto-api-tests";
        version = "0.3";
        sha256 = "0w3j43jdrlj28jryp18hc6q84nkl2yf4vs1hhgrsk7gb9kfyqjpl";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring cereal crypto-api directory filepath HUnit
          QuickCheck test-framework test-framework-hunit
@@ -50295,6 +50562,7 @@ self: {
        pname = "crypto-cipher-types";
        version = "0.0.9";
        sha256 = "03qa1i1kj07pfrxsi7fiaqnnd0vi94jd4jfswbmnm4gp1nvzcwr0";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base byteable bytestring securemem ];
        homepage = "http://github.com/vincenthz/hs-crypto-cipher";
        description = "Generic cryptography cipher types";
@@ -50652,6 +50920,7 @@ self: {
        pname = "cryptohash-cryptoapi";
        version = "0.1.4";
        sha256 = "13h5f9pmcd0swa4asl7wzpf5lskpgjdqrmy1mqdc78gsxdj8cyki";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring cereal crypto-api cryptonite memory tagged
        ];
@@ -50761,6 +51030,7 @@ self: {
        editedCabalFile = "1waln79xzki1l2r1xziy2dd007q8yfsbihhp9qsxxpcpl6qmzvib";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array async base base-compat bytestring containers deepseq
          directory filepath gitrev GraphSCC heredoc monad-control monadLib
@@ -50795,6 +51065,7 @@ self: {
        sha256 = "1w8w4srdvnd8dwjbip45bdqsgpg5xmw2nrw1asnk857bgdhjh2ci";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array async base base-compat bytestring containers deepseq
          directory filepath gitrev GraphSCC heredoc monad-control monadLib
@@ -51047,6 +51318,7 @@ self: {
        pname = "csound-expression-typed";
        version = "0.2.0.2";
        sha256 = "1fb3wayix991awxnns6y1a9kmb6kvnay7p4rx62nvj89qa513d82";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base Boolean colour containers csound-expression-dynamic
          data-default deepseq directory filepath ghc-prim hashable
@@ -51499,6 +51771,7 @@ self: {
        pname = "cue-sheet";
        version = "0.1.0";
        sha256 = "1w85vl2nkw3qy7sjpl3hafvsz79vbasgkr6w0s89p1dk7sdkckfb";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers data-default-class exceptions megaparsec
          mtl QuickCheck text
@@ -51521,6 +51794,7 @@ self: {
        pname = "cue-sheet";
        version = "0.1.1";
        sha256 = "1h0v7jzxavjs2c50p1z3bfvbn1r29z31qcr17mjmd7a9yskp4yhd";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers data-default-class exceptions megaparsec
          mtl QuickCheck text
@@ -51663,6 +51937,7 @@ self: {
        sha256 = "1igys4i7wwj1ildkf4is66gq22zsjg158kv3ald5xiilwkmvfc4h";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ filepath ];
        executableHaskellDepends = [
          base containers curry-base mtl old-time pretty syb
@@ -51734,6 +52009,7 @@ self: {
        pname = "curves";
        version = "1.1.0.2";
        sha256 = "074gc55yf09949yqgal830plz2408zk86mdfx4n864xxdksklfda";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers filepath HaXml JuicyPixels QuickCheck
        ];
@@ -51908,6 +52184,7 @@ self: {
        pname = "daemonize-doublefork";
        version = "0.1.1";
        sha256 = "1g446qxff8ajv44341y0f9v39j8idmnn23lwi08gq3ps4qrz0py2";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory unix ];
        homepage = "https://github.com/scvalex/daemonize-doublefork";
        description = "Start background daemons by double-forking";
@@ -51925,6 +52202,7 @@ self: {
        sha256 = "0zf9831vl1hz606nsp0yhjg46wxzvwkd3hn9shjw5akk26sddi8p";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring cereal data-default directory filepath ghc-prim
          network pipes transformers unix
@@ -52182,6 +52460,7 @@ self: {
        sha256 = "1lc1v30zmlcrp6i22d3arghqhy9pjncddr34df6zd8s0r9wsi61d";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base bytestring containers directory html HUnit mtl old-time
          parsec process QuickCheck regex-compat unix
@@ -52242,6 +52521,7 @@ self: {
        sha256 = "0rp6flaizbaxzr28fr82vaacl4wajh6zdqnwcbgyhwz5dj7rdanq";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers directory HaXml mtl process
        ];
@@ -52257,6 +52537,7 @@ self: {
        pname = "darcs-scripts";
        version = "0.1.1";
        sha256 = "06gs18s89nc5qyicfpkj0hz999l5pf4glhlanm2yhyd6lxbfgkba";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        doHaddock = false;
        description = "Shell scripts for support of darcs workflow";
@@ -52322,6 +52603,7 @@ self: {
        sha256 = "1gl0wplzlhb6ynacq7bv38ijhazpwr642zc0a2dixbpibchgxksf";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring cgi concurrentoutput containers Crypto directory
          filepath HTTP mime-string mtl nano-md5 network old-locale old-time
@@ -54489,6 +54771,7 @@ self: {
        sha256 = "1zhvl6h32y9hd1drv0ipm13si0cqf83i9kxnyivp4j1l5h4b55dx";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring configurator containers directory fgl filepath HDBC
          HUnit mtl random split template-haskell text time yaml-light
@@ -54783,6 +55066,7 @@ self: {
        pname = "ddc-code";
        version = "0.4.3.2";
        sha256 = "19ah5j1l84g06szyaf0qni89cqdnpygrlczppzx3qjl280q1qpzd";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base filepath ];
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler base libraries";
@@ -55304,6 +55588,7 @@ self: {
        sha256 = "0b7328529m3xl8bj7sncv5rr13ld2aghgqkf55j4n15jagv6g72d";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ time unix ];
        executableHaskellDepends = [
          base bytestring containers directory filepath haskell-src-exts
@@ -55770,6 +56055,7 @@ self: {
        pname = "delimiter-separated";
        version = "0.1.0.0";
        sha256 = "17ff9ipsnqicjkwsfg7zfb5gm0k9scsb44dl82gmf8i0f0nnd0h6";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base uhc-util uulib ];
        homepage = "https://github.com/atzedijkstra/delimiter-separated";
        description = "Library for dealing with tab and/or comma (or other) separated files";
@@ -55811,6 +56097,7 @@ self: {
        sha256 = "0ya0hgvpa9w41gswngg84yxhvll3fyr6b3h56p80yc5bldw700wg";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary bytestring containers monad-atom nlp-scores text
        ];
@@ -55973,6 +56260,7 @@ self: {
        sha256 = "0qgqlnj7wkmjba5f2rql51g9jhak0ksx3xdmr25j3p6qwb43k5ih";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bio bytestring cmdargs directory process regex-compat
        ];
@@ -57035,6 +57323,7 @@ self: {
        pname = "diagrams-rasterific";
        version = "1.4";
        sha256 = "190mc32fjjf3770fjp1bmbh3zc8l5bhqhqy30vv48l0pypfjrsns";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers data-default-class diagrams-core
          diagrams-lib file-embed filepath FontyFruity hashable JuicyPixels
@@ -57162,6 +57451,7 @@ self: {
        pname = "dialog";
        version = "0.3.0.0";
        sha256 = "1lhsd48zb6d00jr7zdmpnhx8gkb3da8kr1qr09qpqais71mxhzz4";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring filepath glib gtk3 open-browser text transformers
          webkitgtk3
@@ -57756,6 +58046,7 @@ self: {
        sha256 = "1ii93jmrqs8rlx27rhykq4gqybm92908hg7kzin9ln7fg5ldvmlk";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base FontyFruity JuicyPixels Rasterific vector
        ];
@@ -59447,6 +59738,7 @@ self: {
        pname = "dnsrbl";
        version = "0.0.3";
        sha256 = "07xq52aqqmzq1f68m8spr7fyax0cqnpv9mh5m4x3klxm0iznv9xm";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers hsdns HUnit network ];
        homepage = "http://www.pigscanfly.ca/~holden/dnsrbl/";
        description = "Asynchronous DNS RBL lookup";
@@ -59495,6 +59787,7 @@ self: {
        sha256 = "0009gpm6hgjr78bsp0cd4skvhbms83j4j9axf6zns7pnfqvc6inf";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base base64-bytestring binary bytestring containers directory feed
          filepath haskell98 heist hexpat json MonadCatchIO-transformers
@@ -59583,6 +59876,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "docker-build-cacher" = callPackage
+    ({ mkDerivation, base, containers, foldl, language-dockerfile
+     , system-filepath, text, turtle
+     }:
+     mkDerivation {
+       pname = "docker-build-cacher";
+       version = "1.1";
+       sha256 = "0rc6i4s8iw1qbz9nicbcqjv2b0pr0vzkld8srs4ns41nq4brcdbn";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base containers foldl language-dockerfile system-filepath text
+         turtle
+       ];
+       description = "Builds a services with docker and caches all of its intermediate stages";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dockercook" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base
      , base16-bytestring, bytestring, conduit, conduit-combinators
@@ -59638,6 +59949,7 @@ self: {
        pname = "docopt";
        version = "0.7.0.5";
        sha256 = "1vh5kn13z0c6k2ir6nyr453flyn0cfmz7h61903vysw9lh40hy8m";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers parsec template-haskell th-lift
        ];
@@ -59659,6 +59971,7 @@ self: {
        pname = "doctemplates";
        version = "0.1.0.2";
        sha256 = "0swal6rjya1293mwvl63jch5fx9ghpsil7qs4v7rpansa0izalmp";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base blaze-html blaze-markup bytestring containers parsec
          scientific text unordered-containers vector
@@ -60170,6 +60483,7 @@ self: {
        sha256 = "0capas1h8d8y8j5sd0zbzayf18jknh1w6q8jcwrx3dqgfd316dqp";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base directory elerea GLFW mersenne-random OpenGL
        ];
@@ -60427,6 +60741,7 @@ self: {
        pname = "dpkg";
        version = "0.0.3";
        sha256 = "1bqrj1vqqjnv3qcs1s7lbwyzry95fzxrhi6340zqv0ibvyqnaz5k";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bindings-DSL bytestring monad-loops
        ];
@@ -60705,6 +61020,7 @@ self: {
        sha256 = "0wry1dwcf3dwd780aic3v6jlrdjplrsciw1rr582a78c7anasjr0";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring cmdargs ConfigFile dsmc gloss gloss-raster hslogger
          mtl repa strict transformers vector
@@ -60968,6 +61284,7 @@ self: {
        pname = "dump-core";
        version = "0.1.3";
        sha256 = "1innidrmxaqs093pb8g9q7hfmm3kv3przhi34py4sjl256gdwgq0";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring containers directory filepath ghc monadLib
          text
@@ -61115,6 +61432,7 @@ self: {
        pname = "dwarf";
        version = "0.23";
        sha256 = "0h6bzh628cz0qnbk4aiz5859r9va99q307scbwzvs1wn3nm6dszl";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base binary bytestring containers ];
        description = "Parser for DWARF debug format";
        license = stdenv.lib.licenses.bsd3;
@@ -61252,6 +61570,7 @@ self: {
        pname = "dynamic-graph";
        version = "0.1.0.9";
        sha256 = "0paa9y5h0pp4b44kq5yn8m43nir4wg9hgfmns2d76r8qjry617qp";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base cairo colour either GLFW-b GLUtil OpenGL pango pipes
          transformers
@@ -61283,6 +61602,7 @@ self: {
        pname = "dynamic-loader";
        version = "0.0.1";
        sha256 = "1ci7fcpgwf3v8rakypxi0l3l3aazwnf004ggpdr6vqqj5iav3a15";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base directory ghc-prim hashable hashtables time transformers
        ];
@@ -61743,6 +62063,7 @@ self: {
        pname = "eccrypto";
        version = "0.0.1";
        sha256 = "1jcwlwbcd77536ii0wxalbdslzbvv224b07g3801pgjvr38xljpx";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring cereal crypto-api SHA vector
        ];
@@ -61885,6 +62206,7 @@ self: {
        pname = "ede";
        version = "0.2.8.7";
        sha256 = "02jy6v9w7vpzs3fikfvgd09p0dvfq9isxcag281naazgn1my8swb";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson ansi-wl-pprint base bifunctors bytestring comonad directory
          double-conversion filepath free lens mtl parsers scientific
@@ -61935,6 +62257,7 @@ self: {
        sha256 = "0jkcva53vm8lm76z947xms8a2zkh9sn9951cwry8k7r132dmcn32";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base binary bytestring cairo containers directory filepath
          ghc-events-parallel gtk mtl text zip-archive
@@ -61955,6 +62278,7 @@ self: {
        sha256 = "0zvwkk7sdgi4h1gld4h4c0lznkp5nd9p3cxpfj2yq393x27jamc0";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          ALUT base cmdtheline containers gloss OpenAL random wraparound
        ];
@@ -62077,6 +62401,7 @@ self: {
        sha256 = "0raj0s8v72kz63hqpqhf58sx0a8mcwi4ania40spjirdrsdx3i9g";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring conduit conduit-extra directory process resourcet
          temporary transformers unix
@@ -62231,6 +62556,7 @@ self: {
        sha256 = "1fdlpk51y9ddwj5nky0k7shxm1z2nv0l3xfbfgmjcq44xc5wpzsn";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base containers directory ghc ghc-paths haskeline mtl
          parallel parsec process random regex-tdfa text transformers
@@ -62423,6 +62749,7 @@ self: {
        pname = "ekg";
        version = "0.4.0.13";
        sha256 = "13xlggjcfmp8hr8sz74r0xms36rrfa86znazy2m6304dgscdbca4";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring ekg-core ekg-json filepath network snap-core
          snap-server text time transformers unordered-containers
@@ -62676,6 +63003,7 @@ self: {
        pname = "ekg-wai";
        version = "0.1.0.1";
        sha256 = "14vl5k7jq7p7fiwj9rbw3ng7j8cagydpw7zvf8qxbwxdz9xr655q";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring ekg-core ekg-json filepath http-types network
          text time transformers unordered-containers wai wai-app-static warp
@@ -62769,6 +63097,7 @@ self: {
        pname = "elf";
        version = "0.28";
        sha256 = "0mzikwgd3dnzjgj1xa69lgrs38pnvwffvblckrqnwf0h7fd149wy";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base binary bytestring ];
        homepage = "https://github.com/wangbj/elf";
        description = "Parser for ELF object format";
@@ -62992,6 +63321,7 @@ self: {
        sha256 = "0w0jn7qvxsfcqdr0r147qs6s2711m1xwp28ddzd60n9yn0gdpfi9";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson aeson-pretty base base-unicode-symbols bytestring containers
          directory file-embed filepath process text time
@@ -63064,6 +63394,7 @@ self: {
        sha256 = "0j8md3cqg7wrcx85s5hj8g812zvrr3y4833n0wc3dvfa3wlblpga";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base blaze-html blaze-markup bytestring cmdargs containers
          directory elm-compiler filepath fsnotify HTTP mtl process snap-core
@@ -64041,6 +64372,7 @@ self: {
        sha256 = "0ap8jr11sk8v2sdi03pahjhaxx3mc4ba7qbh3m8nsg0g5wr4962m";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base Cabal directory mtl process ];
        executableHaskellDepends = [
          array base Cabal directory mtl process
@@ -64071,6 +64403,7 @@ self: {
        pname = "eprocess";
        version = "1.7.2";
        sha256 = "190qgsqj41dbkphjrgljif7q0zjm9ddp8wawc9wx8qklb897jrvj";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base exceptions mtl ];
        description = "Basic Erlang-like process support for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -64295,6 +64628,7 @@ self: {
        pname = "eros";
        version = "0.6.0.0";
        sha256 = "0nr0c2qq30ji50pyjrklrb6a73i6qkqws7ywbfpa4pcd176xwlrw";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ aeson base bytestring containers text ];
        description = "A text censorship library";
        license = stdenv.lib.licenses.bsd3;
@@ -64311,6 +64645,7 @@ self: {
        sha256 = "15pi4khibvfpxni4v3kz6f92s8s34kmkx4q7kwq1rxk5gb6p8rcb";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson aeson-pretty base bytestring containers eros text
        ];
@@ -64329,6 +64664,7 @@ self: {
        sha256 = "1c7bwszjvbb3qnbvpjm0vin2x2z6dylplhs10hbhszkq2ypjjxyk";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson base blaze-html bytestring eros http-types markdown text wai
          warp
@@ -64521,6 +64857,7 @@ self: {
        sha256 = "1h58g9lfhmww433z24vmi6wkaii5ik0hrmjprvypgw4bgibls0g9";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring containers data-default lens mtl process
          temporary transformers unordered-containers
@@ -64546,6 +64883,7 @@ self: {
        sha256 = "173k73dvbv528q6072b8k7xy9q6558rlmz7llkiym4g1j2xi37cf";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          array attoparsec base bytestring containers data-default lens mtl
@@ -64727,6 +65065,7 @@ self: {
        sha256 = "100pqygnwclmpzjhzpz3j34y8v75d8ldxg76f9jys90gb41kggpi";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bio bytestring containers random
        ];
@@ -64745,6 +65084,7 @@ self: {
        pname = "etc";
        version = "0.0.0.2";
        sha256 = "1cbxanxm7qpbsj3q5f6q4sn2krvfi3bm5yxi2qcxrqpjrhq31j8i";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring containers directory exceptions hashable
          protolude text unordered-containers vector
@@ -64767,6 +65107,7 @@ self: {
        pname = "etc";
        version = "0.2.0.0";
        sha256 = "16l5ap8ag2l3ks6pjwr49wk4njgap44kbxsqb69yr9lr81wrj9fv";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring containers directory exceptions hashable
          protolude text unordered-containers vector
@@ -65123,6 +65464,7 @@ self: {
        pname = "eurofxref";
        version = "0.2.1";
        sha256 = "0zjf3rky2ww2nq4ryyz0069cv3ps1h29nwrgr2sk127bsik868x9";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring conduit containers failure hexpat http-conduit
          http-types monad-control mtl time
@@ -65894,6 +66236,7 @@ self: {
        editedCabalFile = "0mnc09lgfhpnwp0llvbr24xbszgr56k9nnjcww67khag74md7yg3";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base base-orphans bifunctors containers deepseq deepseq-generics
          directory either hashable haskell-src-exts hood lens mmorph mtl
@@ -66357,6 +66700,7 @@ self: {
        pname = "extcore";
        version = "1.0.2";
        sha256 = "1dpn4dbbn5d3zqrhxkg8nvb97vp9pf61gwa46yf218nvwgqvx437";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring containers directory filepath mtl parsec
          pretty syb
@@ -66838,6 +67182,7 @@ self: {
        pname = "fair-predicates";
        version = "0.1.1";
        sha256 = "1z0c83gfmvwhzsj2iz422mxcyxc8jnic25i1vz6yp4xzv41ibmj6";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        homepage = "http://sebfisch.github.com/fair-predicates";
        description = "Fair Predicates";
@@ -66864,6 +67209,7 @@ self: {
        pname = "faker";
        version = "0.0.0.2";
        sha256 = "1wl0jx3adibf7z8k3jadnr90jvkmf3zhkq34qpsifcl18zip8skq";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base gimlh random split ];
        homepage = "https://github.com/gazay/faker";
        description = "Pure Haskell library for generating fake data";
@@ -66880,6 +67226,7 @@ self: {
        sha256 = "035rjjjvwbjw4z6nlmiyxia5y91yiiw7902f9q6n5jimi5xk2hgk";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base gloss gloss-raster JuicyPixels-repa QuickCheck random repa
          repa-algorithms vector
@@ -66900,6 +67247,7 @@ self: {
        sha256 = "18h5d33hd4cs6dc508mzl7c46pxwrk2q0daabvg8m4fiwk5wzlr0";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers haskell98 SDL SDL-mixer SDL-ttf
        ];
@@ -67044,6 +67392,7 @@ self: {
        sha256 = "1pqz3r2dg0i462fd4fm3fz4p0m05878gic8xr1hxzk2f2ljsc7fq";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array async base bytestring containers cpphs deepseq directory
          filepath mtl text utf8-string
@@ -67256,10 +67605,11 @@ self: {
        pname = "fay";
        version = "0.23.1.16";
        sha256 = "0r4ac76mn7dykva0dz6ar2zfcij2kiz8kjfcywpgdg40g75zhvn4";
-       revision = "7";
-       editedCabalFile = "07iqrpg2hga3n8m08aq2zizvq27v8hyqzvx5sfz497whjxr9h358";
+       revision = "8";
+       editedCabalFile = "1ybc4vv0d3vya4a1xgr2sbq1zx1bzm82acxivs458i9pj56wp87j";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base base-compat bytestring containers data-default
          data-lens-light directory filepath ghc-paths haskell-src-exts
@@ -67280,6 +67630,7 @@ self: {
        pname = "fay-base";
        version = "0.20.0.1";
        sha256 = "17mfblr40jhn93vz6vn0n0xsk4lwf5d5cavfy5zy8sg4inp6dkjr";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base fay ];
        homepage = "https://github.com/faylang/fay/";
        description = "The base package for Fay";
@@ -67309,6 +67660,7 @@ self: {
        pname = "fay-dom";
        version = "0.5.0.1";
        sha256 = "1zm6w6nccswaksr283alhnsss6xw4k7s61yp8ff4lg5127ff9wp0";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base ];
        homepage = "https://github.com/faylang/fay-dom";
        description = "DOM FFI wrapper library for Fay";
@@ -67321,6 +67673,7 @@ self: {
        pname = "fay-geoposition";
        version = "0.1.0.1";
        sha256 = "1qmkwfqgvj6a8fan1l3i18ggpl00vrfd2mhqj13g0gh9yhvgxv1q";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base fay-text ];
        homepage = "https://github.com/victoredwardocallaghan/fay-geoposition";
        description = "W3C compliant implementation of GeoPosition API";
@@ -67333,6 +67686,7 @@ self: {
        pname = "fay-hsx";
        version = "0.2.0";
        sha256 = "1mzjna8yc7jczgggpcgh9i6akiy72d60jczvmzxngh778z3g5zmi";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base fay-jquery ];
        homepage = "http://www.happstack.com/";
        description = "Clientside HTML generation for fay";
@@ -67346,6 +67700,7 @@ self: {
        pname = "fay-jquery";
        version = "0.6.1.0";
        sha256 = "04vg018zynb5ckj7ca9a9a3lbs8kjx8a5k0l3k73yp2y27w7xx8g";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base fay-text ];
        homepage = "https://github.com/faylang/fay-jquery";
        description = "jQuery bindings for Fay";
@@ -67358,6 +67713,7 @@ self: {
        pname = "fay-ref";
        version = "0.1.0.0";
        sha256 = "1dcifraih13zqwmm4xn57wfg63rdkiac81avyymid308r6p1x9cn";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base ];
        homepage = "https://github.com/A1kmm/fay-ref";
        description = "Like IORef but for Fay";
@@ -67370,6 +67726,7 @@ self: {
        pname = "fay-simplejson";
        version = "0.1.3.0";
        sha256 = "0cw06vl39p7mflf8wfl8ql1h8bryv2d1kvvf4swqgda05jk13mxq";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base ];
        homepage = "https://github.com/Lupino/fay-simplejson";
        description = "SimpleJSON library for Fay";
@@ -67383,6 +67740,7 @@ self: {
        pname = "fay-text";
        version = "0.3.2.2";
        sha256 = "1q1v8jzkccy9arq6jkz4ynpzm1691d1dv9wzyi4i5m6n0gl7aans";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay fay-base text ];
        homepage = "https://github.com/faylang/fay-text";
        description = "Fay Text type represented as JavaScript strings";
@@ -67395,6 +67753,7 @@ self: {
        pname = "fay-uri";
        version = "0.2.0.0";
        sha256 = "1vv4jgkz9cx8inbn6g6sn3a0nf1ak81qlj5li21sk2isj0yws1nr";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base ];
        homepage = "https://github.com/faylang/fay-uri";
        description = "Persistent FFI bindings for using jsUri in Fay";
@@ -67459,6 +67818,7 @@ self: {
        sha256 = "0dvjhgv3w13ygi4rfdvmc2m6f99v8d9dmjqp98vxrygcqskhgy4x";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring case-insensitive http-client http-media
          http-types mime-types servant servant-client string-conversions
@@ -67703,6 +68063,7 @@ self: {
        sha256 = "0hkrsinspg70bbm3hwqdrvivws6zya1hyk0a3awpaz82j4xnlbfc";
        revision = "2";
        editedCabalFile = "0ggpqv0i2k38dl8dqwn159n7ys0xr8shrsr3l838883rs8rrnf1j";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base old-locale old-time time time-locale-compat utf8-string xml
        ];
@@ -67725,6 +68086,7 @@ self: {
        sha256 = "0gql641jmbldx6vhk37i2v41j2nq22lrihm48f97wirrxw7yjn61";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base directory feed old-locale old-time time xml
        ];
@@ -67988,6 +68350,7 @@ self: {
        sha256 = "0sq4g0sdayk1lqzdhggwshl22gny5cjbv70cmr1p27q0wfwfbfff";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base cairo gtk harp HaXml mtl template-haskell unix
        ];
@@ -68062,6 +68425,7 @@ self: {
        pname = "fficxx";
        version = "0.3.1";
        sha256 = "0y40li2465r1mf9lgswk9hcwbp528iblxwb9icv94p6nyq28z24k";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring Cabal containers data-default directory either
          errors filepath hashable haskell-src-exts lens mtl process pureMD5
@@ -68606,6 +68970,7 @@ self: {
        pname = "filestore";
        version = "0.6.3.1";
        sha256 = "1pnqb816syl8j03wfk1p96vqlb64xkl45cxlkmqsriwi4ar0svw1";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers Diff directory filepath old-locale
          parsec process split time utf8-string xml
@@ -69014,6 +69379,7 @@ self: {
        sha256 = "01fy2s94aq7mnnp24g5i8sxvlpb6arnmv8n2fr153lwmg3n2w1qb";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers cpphs directory filepath haskell-src-exts process
          split text uniplate
@@ -69408,6 +69774,7 @@ self: {
        pname = "flac";
        version = "0.1.2";
        sha256 = "0adc88h5dmazf9m2xah0qkcav3pm0l3jiy8wbg9fxjv1qpgv74jn";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers data-default-class directory exceptions
          filepath mtl text transformers vector wave
@@ -69431,6 +69798,7 @@ self: {
        pname = "flac-picture";
        version = "0.1.1";
        sha256 = "1kn1zvv5izinyidmxij7zqml94a8q52bbm2icg7704sj906gh71w";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring flac JuicyPixels ];
        testHaskellDepends = [
          base bytestring data-default-class directory flac hspec JuicyPixels
@@ -70123,6 +70491,7 @@ self: {
        sha256 = "1bjkkd90mw1nbm5pyjh52dwhqa6xx3i3hhl2ys3qpk08mrw5r09l";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base directory filepath mtl process Unixutils
        ];
@@ -70756,6 +71125,7 @@ self: {
        sha256 = "0z8a5a9w7mg69c1x6h8825bhkll63gz6j85lbc0w59w1ag2x8865";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          ansi-terminal base bytestring containers directory file-embed HTTP
          indents interpolatedstring-perl6 jmacro MissingH mtl network pandoc
@@ -70862,6 +71232,7 @@ self: {
        sha256 = "1bqfw3h06mbznivg37840qnzjygflzp90wkyssnb1kjxi4bj1vbv";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          ansi-terminal base bytestring cereal containers directory
          file-embed ghc-prim GraphSCC hslogger HTTP indents
@@ -71213,6 +71584,7 @@ self: {
        sha256 = "0gbws8q7k2bv4i4v7km5nfjv8j42kmfjw4vhn1n6dr8xysrmbn3h";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base HUnit parsec parsec3-numbers QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
@@ -71291,6 +71663,7 @@ self: {
        sha256 = "1xgnp4cls8i61hyl4kcf3afri77jlcahwjvww498xl5d5frdiv90";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ array base GLUT OpenGL random ];
        homepage = "http://haskell.org/haskellwiki/Frag";
        description = "A 3-D First Person Shooter Game";
@@ -71579,6 +71952,7 @@ self: {
        sha256 = "1qxdfbzr52dw0qww03l86vpgmylznifqzvjarmgpkfr129szl7ba";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring cgi csv dataenc directory filepath free-theorems
          process time xhtml
@@ -71633,6 +72007,7 @@ self: {
        sha256 = "1ybmffs05hgzn81szcd8nrz4f94qc64d9y2d2hkyq57djb87503j";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base binary bytestring containers directory EdisonCore
          filepath FTGL haskell98 mtl OpenGL pngload random SDL
@@ -72013,6 +72388,7 @@ self: {
        pname = "frpnow";
        version = "0.18";
        sha256 = "1ixhcif2db8v6k8m4bgrpiivl0ygb83padnj18w4jyy5br6s1bqz";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers mtl transformers ];
        homepage = "https://github.com/atzeus/FRPNow";
        description = "Principled practical FRP";
@@ -72026,6 +72402,7 @@ self: {
        pname = "frpnow-gloss";
        version = "0.12";
        sha256 = "1xywqcif16r3x4qckz3n6k5mp2pya4vj35h0jrh4rd1sspnhi99i";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers frpnow gloss mtl transformers
        ];
@@ -72042,6 +72419,7 @@ self: {
        pname = "frpnow-gtk";
        version = "0.11";
        sha256 = "0yq9pgjlmzg5pzcky7z7n2ks82x92dp5pjacr6h3w8mdrhhhk80c";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers frpnow glib gtk mtl transformers
        ];
@@ -72153,6 +72531,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fsnotify_0_2_1_1" = callPackage
+    ({ mkDerivation, async, base, containers, directory, filepath
+     , hinotify, tasty, tasty-hunit, temporary, text, time, unix-compat
+     }:
+     mkDerivation {
+       pname = "fsnotify";
+       version = "0.2.1.1";
+       sha256 = "146wsblhfwnbclzffxk6m43bqap3sgw332gs67030z6h5ab7anhp";
+       libraryHaskellDepends = [
+         async base containers directory filepath hinotify text time
+         unix-compat
+       ];
+       testHaskellDepends = [
+         async base directory filepath tasty tasty-hunit temporary
+         unix-compat
+       ];
+       homepage = "https://github.com/haskell-fswatch/hfsnotify";
+       description = "Cross platform library for file change notification";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fsnotify-conduit" = callPackage
     ({ mkDerivation, async, base, conduit, directory, filepath
      , fsnotify, hspec, resourcet, temporary, transformers
@@ -72360,6 +72760,7 @@ self: {
        sha256 = "1jrpb6dzq47xy6xvsisc7g1y53dc97s4l826f9sscxpdsrx3yp8r";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers free-theorems mtl pretty Shellac Shellac-readline
        ];
@@ -72522,6 +72923,7 @@ self: {
        pname = "funcmp";
        version = "1.8";
        sha256 = "09kmfgl15d71fr5h66j2b0ngw69y8dp41d55lz35nrjxq3l3gz1k";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base filepath process ];
        homepage = "http://savannah.nongnu.org/projects/funcmp/";
        description = "Functional MetaPost";
@@ -73219,6 +73621,7 @@ self: {
        pname = "gconf";
        version = "0.13.1.0";
        sha256 = "1b8xl9jayr7x77af7cq4av82lf1r0j49pmbp1mz3gkadxw3adksp";
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base glib text ];
        libraryPkgconfigDepends = [ GConf ];
@@ -73359,6 +73762,7 @@ self: {
        sha256 = "1951jw8la59c7qvjpx8x898l7hnwc51c4264mmw0h402ik233bp2";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          air base bytestring data-default geek hack2
          hack2-handler-snap-server pandoc text
@@ -73482,6 +73886,7 @@ self: {
        sha256 = "0sfl3729v03s5ykd8ijv4yrf8lzja5hyaphsfgk96gcx3zvd1a0q";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ attoparsec base text ];
        executableHaskellDepends = [ attoparsec base text ];
        homepage = "https://github.com/womfoo/gender";
@@ -73959,6 +74364,7 @@ self: {
        pname = "genericserialize";
        version = "0.1";
        sha256 = "0zpb5rq2zvfsb0wlp9q4cckjkz6sdrngpir49d0sr06pivh8s6cl";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        description = "Serialization library using Data.Generics";
        license = stdenv.lib.licenses.bsd3;
@@ -74062,6 +74468,7 @@ self: {
        sha256 = "1ydxg10s6bk02i3mikb8aqjai099874gby26q50lwf9xp04csbfk";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base blaze-html blaze-markup bytestring directory filepath GenI
          geniserver HTTP http-streams io-streams json text
@@ -74085,6 +74492,7 @@ self: {
        sha256 = "0brnh6f8zdpn37fjdmnpbdvb75vmaf6iq7i9vpv4a8g7asc425wd";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base binary containers GenI haskell98 HaXml HUnit mtl parsec
          QuickCheck utf8-string
@@ -74439,6 +74847,7 @@ self: {
        pname = "geo-uk";
        version = "0.1.0.2";
        sha256 = "1b97kzx4i0jjrmh6iyhxcs1ms4vbiyyywmhccx1a6q6ia82dgcpy";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base binary bytestring bzlib template-haskell th-lift
        ];
@@ -74500,6 +74909,7 @@ self: {
        pname = "geodetics";
        version = "0.0.4";
        sha256 = "1zml9hpbj7shzsjv6hsyzv3p9yzm6cbvxp2cd79nd1fcsdss0zi3";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base dimensional ];
        testHaskellDepends = [
          array base dimensional HUnit QuickCheck test-framework
@@ -74684,6 +75094,7 @@ self: {
        sha256 = "02ds6pm7lv5ijkjh1xikglibnnapk72rz78l5kv5ikzxahhgslbg";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring cgi containers directory exceptions filepath
          haskeline httpd-shed json mtl network network-uri old-locale
@@ -74714,6 +75125,7 @@ self: {
        sha256 = "0k5in0r3lwjr5yn4ayw5ssdvinh7zwzsx6pfjdj246ngx1r7ydxj";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base containers parsec ];
        homepage = "http://a319-101.ipm.edu.mo/~wke/ggts/impl/";
        description = "A type checker and runtime system of rCOS/g (impl. of ggts-FCS).";
@@ -74833,6 +75245,7 @@ self: {
        sha256 = "1yx22p9572zg2nvmlilbmraqjmws2x47hmin2l9xd0dnck5qhy35";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base blaze-html bytestring containers mtl parsec process
        ];
@@ -75062,6 +75475,7 @@ self: {
        pname = "ghc-heap-view";
        version = "0.5.9";
        sha256 = "1brjvyqd4bzzc1vhljbf5qv9lyf55myyvnz1zx9nngfwsh7a6cf6";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary bytestring containers ghc template-haskell transformers
        ];
@@ -75154,6 +75568,7 @@ self: {
        editedCabalFile = "1qyijh62wny3vxs72caqfphj10ld11zcf929gdaqs3ip5ixjb61a";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [
          base Cabal containers filepath process template-haskell
          transformers
@@ -75195,6 +75610,7 @@ self: {
        editedCabalFile = "11rccscsxv4x7xcdxaz83vjisyiadsiq48mn2v1hs8fylqx6dkdf";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [
          base Cabal containers directory filepath process template-haskell
          transformers
@@ -75689,6 +76105,7 @@ self: {
        pname = "ghc-vis";
        version = "0.8";
        sha256 = "03c73ip8k92fjrafaaj3mykql222y2fjiwx13lwvm5jk2p00is78";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base cairo containers deepseq fgl ghc-heap-view graphviz gtk3 mtl
          svgcairo text transformers xdot
@@ -75874,6 +76291,7 @@ self: {
        pname = "ghcjs-codemirror";
        version = "0.0.0.1";
        sha256 = "04x5h0i4fgyc2c5ihrnk0w3l1f3avvcl115zlnich93nillgbnfw";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/ghcjs/CodeMirror";
        description = "Installs CodeMirror JavaScript files";
@@ -75905,6 +76323,7 @@ self: {
        sha256 = "16f69w53a3vcfnb805nyn257465gvyv2981gsggvpkzvyqklsp74";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base ghcjs-dom jsaddle jsaddle-warp mtl
        ];
@@ -76870,6 +77289,7 @@ self: {
        sha256 = "0g1jq12dw868x0s6l28kk0m9713zhwwfbw0n2n2dvbidrlvnpwi8";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring data-default filepath http-types mtl parsec
          safe scientific text time transformers unordered-containers
@@ -76902,6 +77322,7 @@ self: {
        sha256 = "049ys725scrrkxc2q4wx085hbzdnjpm1jd9wqraqg5fa23vpfy34";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring data-default filepath http-types mtl parsec
          safe scientific text time transformers unordered-containers
@@ -76934,6 +77355,7 @@ self: {
        sha256 = "061mwhxgxqqvlqznldjgqvs2z739q452shd6h72lahj5nm3v5m41";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array async base binary bytestring containers directory hashable
          hashtables mtl network old-locale old-time parsec pretty process
@@ -76953,6 +77375,7 @@ self: {
        pname = "gio";
        version = "0.13.3.1";
        sha256 = "09yq753qld2p5h7apg5wyzyh8z47xqkkyx8zvjwk21w044iz8qxc";
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          array base bytestring containers glib mtl
@@ -77043,6 +77466,7 @@ self: {
        pname = "git";
        version = "0.2.0";
        sha256 = "1a4frn53qs31s6rqldw91zmc0i0gr33zm10y9ailqasbsgyxqwyp";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base byteable bytestring containers cryptonite hourglass memory mtl
          patience random system-fileio system-filepath unix-compat
@@ -77162,6 +77586,7 @@ self: {
        sha256 = "1q4fbvpdjca5k530dcm6yspsgzy60dx7nimar2fkm8s086qsf662";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base directory filepath optparse-applicative parsec pretty process
        ];
@@ -77416,6 +77841,7 @@ self: {
        editedCabalFile = "00pqgbjdzzqf10201yv934llaq2xflad9djix21f05nk7qq62g0r";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers directory filepath formatting optparse-applicative
          process split text transformers unix
@@ -77769,6 +78195,7 @@ self: {
        sha256 = "1x2kh1lsqiib7g4yp7g0yijsghl27k1axjx3zmhl7fwhkxc4w48m";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base base64-bytestring blaze-html bytestring ConfigFile
          containers directory feed filepath filestore ghc ghc-paths
@@ -78140,6 +78567,7 @@ self: {
        pname = "glade";
        version = "0.13.1";
        sha256 = "0idyx4d2jw1209j4wk7ay5jrs2r6bn3qj4qgh70q6p08a8hcgfbb";
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base glib gtk ];
        libraryPkgconfigDepends = [ libglade ];
@@ -78458,6 +78886,7 @@ self: {
        sha256 = "1xgx02cxvpc8sv99wl44lpzbv9cc87nnihbpalmddb71mwrmj4ji";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base ppm split ];
        description = "A simple ray tracer in an early stage of development";
        license = stdenv.lib.licenses.bsd3;
@@ -79151,6 +79580,7 @@ self: {
        sha256 = "1xz8prw9xjk0rsyrkp9bsmxykzrbhpv9qhhkdapy75mdbmgwjm7s";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base containers data-accessor data-accessor-transformers
          deepseq filepath process temporary time transformers utility-ht
@@ -79183,6 +79613,7 @@ self: {
        sha256 = "0z1mhi2y4qm1lj6vfsmxf2gs5shfwdac3p9gqj89hx28mpc3rmzk";
        revision = "1";
        editedCabalFile = "0dq1406z7mh4hca15abizrzlc4v80qkc3r9jz9q21qi99hgvvqjs";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory filepath process ];
        description = "GHCi bindings to lambdabot";
        license = stdenv.lib.licenses.bsd3;
@@ -79294,6 +79725,7 @@ self: {
        pname = "goatee";
        version = "0.3.1.2";
        sha256 = "1lz14w17yn92icdiz8i4435m4qli158infxq02ry6pap94kk78d9";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers mtl parsec template-haskell
        ];
@@ -79314,6 +79746,7 @@ self: {
        sha256 = "0pgpdk1y140pcdsyry185k0bpdhyr87bqrzk24yv65kgvqs442zm";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base cairo containers directory filepath glib goatee gtk mtl parsec
        ];
@@ -82290,6 +82723,7 @@ self: {
        sha256 = "0kfg995ng54sf4lndz9grl5vxyxms0xxmcgq1xhcgmhis8bwr1cd";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          attoparsec base bytestring directory errors http-types lucid
          mime-types network optparse-applicative text wai warp
@@ -82911,6 +83345,7 @@ self: {
        sha256 = "0rwycs3vnzy9awm081h836136s2wjyk9qyhsx9j6z7y3lgsb2cr0";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base base-unicode-symbols GLUT graph-rewriting graph-rewriting-gl
          graph-rewriting-layout OpenGL parsec
@@ -82950,6 +83385,7 @@ self: {
        sha256 = "0sz87nsn7ff0k63j54rdxp5v9xl926d47fkfa0jjnmdjg1xz2pn4";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base base-unicode-symbols GLUT graph-rewriting graph-rewriting-gl
          graph-rewriting-layout graph-rewriting-strategies IndentParser
@@ -82988,6 +83424,7 @@ self: {
        sha256 = "1ahwm3dlvy9aaara644m4y0s89xgjcgm2hpkc92z2wmdfydc05g6";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base base-unicode-symbols GLUT graph-rewriting graph-rewriting-gl
          graph-rewriting-layout OpenGL parsec
@@ -83026,6 +83463,7 @@ self: {
        sha256 = "0wygasyj35sa05vvcmkk8ipdla3zms85pvq48jq1rl2gnk79f2jy";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base base-unicode-symbols containers directory filepath GLUT
          graph-rewriting graph-rewriting-gl graph-rewriting-layout OpenGL
@@ -83048,6 +83486,7 @@ self: {
        sha256 = "07fjl05w1lidmwh7iz9km3590ggxncq43rmrhzssn49as7basah8";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base base-unicode-symbols GLUT graph-rewriting graph-rewriting-gl
          graph-rewriting-layout IndentParser OpenGL parsec
@@ -83249,6 +83688,7 @@ self: {
        pname = "graphql";
        version = "0.3";
        sha256 = "18hb8bwcwx98vrr9nzr8965i4c1y6dh10ilijksbldf10yaiq53z";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ attoparsec base text ];
        testHaskellDepends = [ attoparsec base tasty tasty-hunit text ];
        homepage = "https://github.com/jdnavarro/graphql-haskell";
@@ -83523,6 +83963,7 @@ self: {
        pname = "greencard-lib";
        version = "3.0.1";
        sha256 = "1a8h36kclb5db7kfy1pb4h2pwy6a6wwnjpm21xzvc9fjx9vj44kd";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base containers greencard pretty ];
        homepage = "http://www.haskell.org/greencard/";
        description = "A foreign function interface pre-processor library for Haskell";
@@ -84025,6 +84466,7 @@ self: {
        sha256 = "02xspk67jy5bhdmbhgk924sqn565aprkvm0sfv1sgmc836qg625f";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ruff ];
        executableHaskellDepends = [
          base bytestring containers directory filepath FTGL gtk gtkglext mtl
@@ -84165,6 +84607,7 @@ self: {
        pname = "gstreamer";
        version = "0.12.8";
        sha256 = "1bb9rzgs3dkwwril97073aygrz46gxq039k9vn5d7my8hgcpwhzz";
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          array base bytestring directory glib mtl
@@ -84186,6 +84629,7 @@ self: {
        sha256 = "1mkccxgnvgjxkbsdl6bcn61yv0zi20i8h9z11hqcfd3ibfnsw7bh";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers extensible-exceptions haskeline HTTP json mtl unix
          url utf8-string
@@ -84218,6 +84662,7 @@ self: {
        pname = "gtk";
        version = "0.14.6";
        sha256 = "09w3f2n2n9n44yf2li3ldlb3cxhbc0rml15j9xqamw5q1h90cybh";
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          array base bytestring cairo containers gio glib mtl pango text
@@ -84280,6 +84725,7 @@ self: {
        pname = "gtk-mac-integration";
        version = "0.3.4.0";
        sha256 = "0irf8smnpsym2lkw6gslk31zibn7alp7g32cmq4062mgnlwlawn4";
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ array base containers glib gtk mtl ];
        libraryPkgconfigDepends = [ gtk-mac-integration-gtk2 ];
@@ -84297,6 +84743,7 @@ self: {
        pname = "gtk-serialized-event";
        version = "0.12.0";
        sha256 = "0gh8kwd9758ws941xbxhrm3144pmnqln0md5r6vjbq7s1x54bsrf";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base containers glib gtk haskell98 mtl
        ];
@@ -84366,6 +84813,7 @@ self: {
        sha256 = "0jzvxlssqmd2dpnm35qpaq5xv5jk7hhy87594m74xv0ihygvbr65";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base Cabal containers directory filepath hashtables pretty
          process random
@@ -84519,6 +84967,7 @@ self: {
        sha256 = "0n223zgfjfv0p70wd7rh881fv8z00c9jmz7wm3vfa1jy3b2x7h7l";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          array base bytestring cairo containers gio glib mtl pango text
@@ -84540,6 +84989,7 @@ self: {
        pname = "gtk3-mac-integration";
        version = "0.3.4.0";
        sha256 = "0cdx0qzmwz3bbg374c9nvwqsxgvc5c2h8i6m0x6d0sm714d8l0ac";
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ array base containers glib gtk3 mtl ];
        libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ];
@@ -84557,6 +85007,7 @@ self: {
        pname = "gtkglext";
        version = "0.13.1.1";
        sha256 = "15v40f21xlg5r2zidh77cfiq6ink1dxljbl59mf5sqyq5pjbdw3h";
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base glib gtk pango ];
        libraryPkgconfigDepends = [ gtkglext ];
@@ -84574,6 +85025,7 @@ self: {
        pname = "gtkimageview";
        version = "0.12.0";
        sha256 = "0sdfb7gmgqh4dkc0a39abx84x7j7zs5z1l62nfzz22wsx1h641j3";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base containers glib gtk haskell98 mtl
        ];
@@ -84595,6 +85047,7 @@ self: {
        sha256 = "0z7mwgmjpbmj2949bfrragyjr6s38vv9sz8zpy63ss9h7b5xn4xw";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base gconf glade gtk MissingH process regex-posix unix
        ];
@@ -84612,6 +85065,7 @@ self: {
        pname = "gtksourceview2";
        version = "0.13.3.1";
        sha256 = "0lzyqlbd0w825ag9iisiicrsb86gx7axxcr4sh4jhnxagz0fpid1";
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          array base containers glib gtk mtl text
@@ -84630,6 +85084,7 @@ self: {
        pname = "gtksourceview3";
        version = "0.13.3.1";
        sha256 = "0yrv71r772h8h7x73xb5k868lg7lmh50r0vzxrl2clrxlpyi4zls";
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          array base containers glib gtk3 mtl text
@@ -84687,6 +85142,7 @@ self: {
        sha256 = "0g86vgy0fhvmqvg1v1hxn6vrdcbq0n69fa0ysxvw7126ijrm5l29";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base cairo containers filepath gtk ];
        homepage = "http://code.mathr.co.uk/gulcii";
        description = "graphical untyped lambda calculus interactive interpreter";
@@ -84938,6 +85394,7 @@ self: {
        pname = "hF2";
        version = "0.2";
        sha256 = "1y0731fsay2dp9m4b94w15m054vqsnnafz4k8jjqjvvrmwyfgicz";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base cereal vector ];
        description = "F(2^e) math for cryptography";
        license = stdenv.lib.licenses.bsd3;
@@ -85203,6 +85660,7 @@ self: {
        pname = "hTalos";
        version = "0.2";
        sha256 = "05l9nlrwpb9gwgj8z48paxx46lkasa82naiq7armi98salk1a9ip";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/mgajda/hTalos";
@@ -85231,6 +85689,7 @@ self: {
        sha256 = "0r9a461k1rr0j9zgjfq1z37i6blv9rqf8pzb984h1nmlfqpnidnc";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ array base hmatrix ];
        executableSystemDepends = [ blas liblapack ];
        homepage = "http://dslsrv4.cs.missouri.edu/~qqbm9";
@@ -85351,6 +85810,7 @@ self: {
        pname = "hack";
        version = "2012.2.6";
        sha256 = "0wrfa9fa6skl985fi2a6iv4m8kchg87w9x3k37nf3l8vaz95jmdr";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring data-default ];
        homepage = "http://github.com/nfjinjing/hack/tree/master";
        description = "a Haskell Webserver Interface";
@@ -85366,6 +85826,7 @@ self: {
        pname = "hack-contrib";
        version = "2010.9.28";
        sha256 = "1r0g8fcwz6r4vrsadjyb5awjmfbqsskmc1c8xkfwv0knak1qq2p1";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-wl-pprint base bytestring cgi containers data-default
          directory filepath hack haskell98 mps network old-locale old-time
@@ -85403,6 +85864,7 @@ self: {
        pname = "hack-frontend-happstack";
        version = "2009.6.24.1";
        sha256 = "1x4kaj4nk5lrgsm6pfxr6f8rvjyxhy0agqv9f810xh6s1r9pihw1";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers hack happstack-server network
          utf8-string
@@ -85465,6 +85927,7 @@ self: {
        pname = "hack-handler-evhttp";
        version = "2009.8.4";
        sha256 = "1a09ls9jgakdx8ya6zd5z3ss2snb4pp0db1573hzmrhr37i2gklz";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring bytestring-class containers data-default hack
          hack-contrib network
@@ -85498,6 +85961,7 @@ self: {
        pname = "hack-handler-happstack";
        version = "2009.12.20";
        sha256 = "10b3cp1gap59ialfl33dwhzw50nwrqg49zvv0v813q7rqk3nkhg4";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring cgi containers data-default hack happstack-server
          mtl network
@@ -85516,6 +85980,7 @@ self: {
        pname = "hack-handler-hyena";
        version = "2010.3.15";
        sha256 = "1p0zyki1iapz2xncq0l5bbas44pk5kb29kbb3bdxb4anb0m5jb2q";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers data-default hack hyena network
        ];
@@ -85531,6 +85996,7 @@ self: {
        pname = "hack-handler-kibro";
        version = "2009.5.27";
        sha256 = "0py30rp7r4hrazrfq3avpqcp1w8405pyfw1yxz7msb58yjppa792";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base cgi data-default hack kibro network
        ];
@@ -85656,6 +86122,7 @@ self: {
        pname = "hack2-contrib-extra";
        version = "2014.12.20";
        sha256 = "1mxgvlr593cw523mknr5bcwf55544q04cz0nlpzgm5bg3336b5wl";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          air air-extra base bytestring cgi containers data-default directory
          filepath hack2 hack2-contrib network old-locale old-time time
@@ -85673,6 +86140,7 @@ self: {
        pname = "hack2-handler-happstack-server";
        version = "2011.6.20";
        sha256 = "115nrzf0626pc716n01qjhxs44c1awdd4q1c8kbax025cwac7kpx";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring cgi containers data-default enumerator hack2
          happstack-server mtl network
@@ -85693,6 +86161,7 @@ self: {
        pname = "hack2-handler-mongrel2-http";
        version = "2011.10.31";
        sha256 = "1pymar803n696yx3dwqpfwqlkg93ncff162p26mrs7iqn14v851w";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson air attoparsec base blaze-builder blaze-textual bytestring
          containers data-default directory enumerator hack2 mtl network safe
@@ -85732,6 +86201,7 @@ self: {
        pname = "hack2-handler-warp";
        version = "2012.5.25";
        sha256 = "1p0lkhf95xkllfpcb9yibpa1rkam90bccmzj2aa60shd7v9qx9r5";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          air base data-default hack2 hack2-interface-wai warp
        ];
@@ -85976,6 +86446,7 @@ self: {
        sha256 = "1xsy2clsg53rhxgkb9vlan7dw7xqphm8gr1ajl8kq5ymfahnyd1i";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          acid-state aeson array async attoparsec base base16-bytestring
          base64-bytestring binary blaze-builder bytestring Cabal cereal
@@ -86145,6 +86616,7 @@ self: {
        editedCabalFile = "1slyp8ncpiv204yxb2p7z0kwz4xhqv8czfrx4p78cbbhrlkmgnpm";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base ];
        homepage = "https://github.com/fgaz/hackertyper";
        description = "\"Hack\" like a programmer in movies and games!";
@@ -86283,6 +86755,7 @@ self: {
        pname = "haddock-api";
        version = "2.15.0.2";
        sha256 = "1gdmwid3qg86ql0828bp8g121psvmz11s0xivrzhiv8knxbqj8l7";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring Cabal containers deepseq directory filepath
          ghc ghc-paths haddock-library xhtml
@@ -86302,6 +86775,7 @@ self: {
        pname = "haddock-api";
        version = "2.16.1";
        sha256 = "1spd5axg1pdjv4dkdb5gcwjsc8gg37qi4mr2k2db6ayywdkis1p2";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring Cabal containers deepseq directory filepath
          ghc ghc-paths haddock-library xhtml
@@ -86321,6 +86795,7 @@ self: {
        pname = "haddock-api";
        version = "2.18.1";
        sha256 = "1q0nf86h6b466yd3bhng8sklm0kqc8bak4k6d4dcc57j3wf2gak8";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring Cabal containers deepseq directory filepath
          ghc ghc-boot ghc-paths haddock-library transformers xhtml
@@ -86341,6 +86816,7 @@ self: {
        sha256 = "1a56nihkxybldk55g69v2aw6r4ipa9x86i0jr19fd23zxvancs8h";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base Cabal containers directory filepath ghc ghc-paths pretty
        ];
@@ -86625,6 +87101,7 @@ self: {
        sha256 = "1nh76kk3bfnx802kc6afj6iw1xkj5s4sz07zwmhq32fvqbkmw889";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring directory filepath http-client lens lens-aeson
          netrc network-uri optparse-applicative parsec process text wreq
@@ -86884,6 +87361,7 @@ self: {
        sha256 = "1zy2328lj7k6j0h7nrcd998sk1hbcl67yzaiysaxyif5c60l05ab";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary blaze-html blaze-markup bytestring containers
          cryptohash data-default deepseq directory filepath fsnotify
@@ -86927,6 +87405,7 @@ self: {
        sha256 = "0jjy1j79vzkdpi2ksql5bzwv2bw3bk6h0jgi73ngj8lkrm6q80b3";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary blaze-html blaze-markup bytestring containers
          cryptohash data-default deepseq directory filepath fsnotify
@@ -87007,6 +87486,7 @@ self: {
        sha256 = "0w23laiw6a5hxfq5hjq8vn3k7fx5l4yb9p8qcbm62zlycza1ci14";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base hakyll pandoc ];
        executableHaskellDepends = [ base directory filepath hakyll ];
        homepage = "http://jaspervdj.be/hakyll";
@@ -87630,6 +88110,7 @@ self: {
        sha256 = "0x0ix66wcpv172rxk9daifirnrcbblkjlvlg762z4i7qhipjfi2n";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring containers scientific
        ];
@@ -87723,6 +88204,7 @@ self: {
        sha256 = "0k86z27qiaz967hsdnb3sac5ybmnyzd4d2gxzvdngw8rcvcq3biy";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base mtl random utility-ht ];
        description = "Hangman implementation in Haskell written in two hours";
        license = stdenv.lib.licenses.mit;
@@ -87739,6 +88221,7 @@ self: {
        sha256 = "072f9zsfrs8g6nw83g6qzczzybngrhyrm1m2y7ha37vf0y9gdpn0";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson base bytestring directory formatting http-types lens
          lens-aeson process scotty text transformers unix-time wai-extra
@@ -87853,6 +88336,7 @@ self: {
        sha256 = "0yb0www1nab0nybg0nxs64cni9j2n8sw1l5c8byfnivagqz428w7";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base filepath mtl path process time transformers
        ];
@@ -87876,6 +88360,7 @@ self: {
        pname = "happindicator";
        version = "0.0.4";
        sha256 = "1d0ycpxmlz2ab8dzys7i6ihc3rbs43d0l5l2mxvshqbpj3j73643";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring containers glib gtk mtl
        ];
@@ -88024,6 +88509,7 @@ self: {
        pname = "happstack-authenticate";
        version = "2.3.4.7";
        sha256 = "01xn6j7pqc0czdflxwkmnj8hm6z0wwjqpjmal4qbcbzy16m86bbc";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          acid-state aeson authenticate base base64-bytestring boomerang
          bytestring containers data-default email-validate filepath
@@ -88053,6 +88539,7 @@ self: {
        pname = "happstack-authenticate";
        version = "2.3.4.8";
        sha256 = "006prds4bgqmj54j0syyf1y1yyqwfcj2a6mdxpcjj6qj3g3976l1";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          acid-state aeson authenticate base base64-bytestring boomerang
          bytestring containers data-default email-validate filepath
@@ -88217,6 +88704,7 @@ self: {
        pname = "happstack-fay-ajax";
        version = "0.2.0";
        sha256 = "0zdkvvmywnfvqg5jdvf29qczzxmprvspxj0r1vj46fd6vld53j4j";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base fay-jquery ];
        homepage = "http://www.happstack.com/";
        description = "Support for using Fay with Happstack";
@@ -88234,6 +88722,7 @@ self: {
        pname = "happstack-foundation";
        version = "0.5.9";
        sha256 = "0xn176m65wjvbfqcjhwvvm7imq01iiixap4jay1wn6qzk0qn5w5n";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          acid-state base happstack-hsp happstack-server hsp lifted-base
          monad-control mtl reform reform-happstack reform-hsp safecopy text
@@ -88645,6 +89134,7 @@ self: {
        pname = "happstack-yui";
        version = "7373.5.3";
        sha256 = "178r3jqxmrdp0glp9p4baw8x7zk0w8j4m5l173rjnz9yxn53nyni";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base boomerang bytestring containers directory happstack-jmacro
          happstack-server hsp interpolatedstring-perl6 jmacro mtl pretty
@@ -88867,6 +89357,7 @@ self: {
        sha256 = "1pf5vpyxrqsvrg1w5spzvwjkr7gdy2mp0sdxphcrwwj9n56klgj5";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base BNFC containers derive directory hastache hslogger mtl
          process QuickCheck text
@@ -89556,6 +90047,7 @@ self: {
        sha256 = "1hw4ylwwsmp59ifw8s4w1394gv7p2xc6nvqajfmil0p8r8s6r1pf";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base freenect hcwiid IfElse MissingH mtl SDL SDL-image SDL-mixer
          SDL-ttf transformers vector Yampa
@@ -90324,6 +90816,7 @@ self: {
        pname = "haskell-names";
        version = "0.8.0";
        sha256 = "127fjggbgxhpxdh5sdj4pdfgx9xadaw93n0ii07grz0jgbvj0fwn";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring containers data-lens-light filepath
          haskell-src-exts mtl transformers traverse-with-class uniplate
@@ -91900,6 +92393,7 @@ self: {
        pname = "haskelzinc";
        version = "0.3.0.9";
        sha256 = "1vg5jxzn69y2pbpsw2qc6ida0p0v4dhgp68psn4rmpxxbjl7n10s";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers filepath parsec3 pretty process
        ];
@@ -91947,6 +92441,7 @@ self: {
        pname = "haskhol-core";
        version = "1.1.0";
        sha256 = "0vlzybbplqggvgnj61yl0g2rak2qbsp7hly9srgr6wd6qm9l1nxx";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          acid-state base containers deepseq filepath ghc-prim hashable mtl
          parsec pretty safecopy shelly template-haskell text text-show
@@ -92939,6 +93434,7 @@ self: {
        configureFlags = [ "-fportable" ];
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary bytestring containers data-binary-ieee754 directory
          filepath ghc ghc-paths ghc-prim monads-tf network network-uri
@@ -93058,6 +93554,7 @@ self: {
        editedCabalFile = "1wspd2shxpp3x4p4ghgf82vqchlkxk6qhvsgn07ypzm2kfz3a9dh";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base directory old-locale old-time process random
        ];
@@ -93217,6 +93714,7 @@ self: {
        sha256 = "10qg24qkh17l9zqn47g64cg6hp48x7bjbcwigj35zpqcq71s9dxc";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base base64-string bytestring clock containers gconf glade gtk
          hoauth HTTP json mtl network old-locale parsec regex-base
@@ -93484,6 +93982,7 @@ self: {
        sha256 = "01wx4dls0ccl0q09hvydjhj0lfpqfd32z76rjgc89p5889czkm5j";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base cairo filepath glade gtk haskell98 process svgcairo time unix
        ];
@@ -93505,6 +94004,7 @@ self: {
        sha256 = "1x8nwh3ba9qvrbcxd2fdb3lv9b94w6lkvdg4vrqm7vbns9yyk162";
        revision = "2";
        editedCabalFile = "19nclaq6y157gn8k4sl79rm30ws5gcykiq4zjmcnm7d5c1rm4dhn";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base binary boxes containers directory filepath gamma HUnit
          mtl mwc-random parsec pretty QuickCheck random split statistics
@@ -93643,6 +94143,7 @@ self: {
        sha256 = "0vx3097g9q0bxyv1bwa4mc6aw152zkj3mawk5nrn5mh0zr60c3zh";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring chunked-data cond containers data-default-class
          directory dyre errors fast-logger filepath glib gtk3 lifted-async
@@ -93672,6 +94173,7 @@ self: {
        sha256 = "024mclr0hrvxdbsw9d051v9dfls2n3amyxlqfzakf11vrkgqqfam";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring chunked-data containers
          directory filepath glib gtk3 hbro microlens monad-control
@@ -93732,6 +94234,7 @@ self: {
        pname = "hcg-minus";
        version = "0.15";
        sha256 = "04g0f4sr7904w3ynyl0gnbyi2sl0z7ziv5q15mfb6c7h0zl25d5r";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base colour ];
        homepage = "http://rd.slavepianos.org/t/hcg-minus";
        description = "haskell cg (minus)";
@@ -93746,6 +94249,7 @@ self: {
        pname = "hcg-minus-cairo";
        version = "0.15";
        sha256 = "002gh8adqzhcjfnqkbcnpzz8qiqbj9zkbk6jj11dnnxjigc4l2q9";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base cairo colour filepath hcg-minus utf8-string
        ];
@@ -93760,6 +94264,7 @@ self: {
        pname = "hcheat";
        version = "2010.1.16";
        sha256 = "1fwgnp15kha9qb7iagd8n5ahjjhg194wbva5i436mb57fn86pya2";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base mps ];
        homepage = "http://github.com/nfjinjing/hcheat/";
        description = "A collection of code cheatsheet";
@@ -93889,6 +94394,7 @@ self: {
        sha256 = "1h1g05a8wnk2q65mm4mwywxhygr7fs0150q8ml33ik59mcc5v7fr";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base directory HaskellForMaths QuickCheck text
        ];
@@ -94156,6 +94662,7 @@ self: {
        pname = "hdf";
        version = "0.15";
        sha256 = "11nf9wlymdhydf0bhh9gdl0cdn0i4mbvx3hfdcmnxfvag5jmfbkk";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base directory fgl fgl-visualize filepath hosc hsc3 murmur-hash
          process split transformers
@@ -94368,6 +94875,7 @@ self: {
        sha256 = "1hc1pmbj9452k4a71iiazxg6id7caf783m08lqnf3flf77cdjxpa";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson aeson-pretty base bytestring directory filepath haskeline
          time
@@ -94466,6 +94974,7 @@ self: {
        pname = "hecc";
        version = "0.4.1.1";
        sha256 = "1p7h9mlap8i0w2inhq944r0dgr27rzwk44igylil7gv0dgf4hsyx";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base cereal crypto-api hF2 ];
        description = "Elliptic Curve Cryptography for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -94790,6 +95299,7 @@ self: {
        editedCabalFile = "11a3k59ig549dm3pg5wh2brrdiss1ln0yw3j0j4mgcvqi7kzzmd3";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base containers mtl pretty QuickCheck
        ];
@@ -94868,6 +95378,7 @@ self: {
        sha256 = "0vwk8h5fwl63pjcydwndqgpikfjdm37w7gjmmgac95gl66fc5h5j";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers directory filepath lvmlib mtl network parsec
          process Top transformers wl-pprint
@@ -95527,6 +96038,7 @@ self: {
        sha256 = "0sj0grykzb7xq7iz0nj27c4fzhcr9f0yshfcq81xq2wdmg09j8yx";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ array base hscurses old-time random ];
        executableSystemDepends = [ ncurses ];
        homepage = "http://web.comlab.ox.ac.uk/oucl/work/ian.lynagh/Hetris/";
@@ -95559,6 +96071,7 @@ self: {
        sha256 = "1ys7xqdrnvwn6z2vgmh49zhfxj73pdmscblqcjk6qrwmpb2xha2s";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring cairo filepath haskell98
        ];
@@ -95577,6 +96090,7 @@ self: {
        sha256 = "0jsynxd33r7d5s5vn204z4wdgm4cq6qyjs7afa77p94ni5m2p3kb";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring cairo dph-seq filepath haskell98
        ];
@@ -95602,6 +96116,7 @@ self: {
        pname = "hexdump";
        version = "0.1";
        sha256 = "012hknn9qhwr3hn3dbyd9s7vvaz4i3bvimmxkb1jyfckw3wjcnhc";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        description = "A library for forming hexdumps";
        license = stdenv.lib.licenses.publicDomain;
@@ -95776,6 +96291,7 @@ self: {
        pname = "hexstring";
        version = "0.11.1";
        sha256 = "0509h2fhrpcsjf7gffychf700xca4a5l937jfgdzywpm4bzdpn20";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base base16-bytestring binary bytestring text
        ];
@@ -95879,6 +96395,7 @@ self: {
        sha256 = "1jsq33cdpdd52yriky989vd8wlafi9dq1bxzild7sjw1mql69d71";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base eprocess mtl ];
        executableHaskellDepends = [ wx wxcore ];
        homepage = "http://github.com/elbrujohalcon/hfiar";
@@ -96199,6 +96716,7 @@ self: {
        pname = "hgeos";
        version = "0.1.8.0";
        sha256 = "14fqqabxnfky6x17508xr92dvd3jk6b53zqmy8h7f1dd4r7pm4z7";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ geos_c ];
        testHaskellDepends = [ base MissingH ];
@@ -96318,6 +96836,7 @@ self: {
        sha256 = "0amdfdp1xmh506lgfbb4war2spfb4gqls864q18psmvshcwlpsmv";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers directory filepath mtl parsec wl-pprint
        ];
@@ -96453,6 +96972,7 @@ self: {
        sha256 = "1skzr5ipxz61zrndwifkngw70zdf2yh5f8qpbmfzaq0bscrzdxg5";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring containers haskell98 HUnit mtl parsec random
          readline time
@@ -96644,6 +97164,7 @@ self: {
        sha256 = "0zhraby44j5zjrvjmqj22sa15qsl5jxhfs07gkggc8zfahvg822d";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base directory filepath mustache parsec process text unix
        ];
@@ -96663,6 +97184,7 @@ self: {
        sha256 = "1bwvhrzvrf004lypf0zrx6q6k6fn5qwvlk45vppmnv65v9vq519p";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base ghc ];
        homepage = "http://www.cs.mu.oz.au/~bjpop/code.html";
        description = "Memory usage statistics";
@@ -96979,6 +97501,7 @@ self: {
        sha256 = "1wjcgkgqcvr1q0b7dckhg12ai6zgmvvnv2b3zgfkyqy1h9qhj7wk";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers exceptions haskell-src-exts monad-loops
          mtl text transformers utf8-string yaml
@@ -97069,6 +97592,7 @@ self: {
        pname = "hinduce-examples";
        version = "0.0.0.2";
        sha256 = "17jnrc8iji5byqbd08llwk0mw9yi1dq3biaszqp9jyinf50hcb4w";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers convertible csv hinduce-associations-apriori
          hinduce-classifier hinduce-classifier-decisiontree hinduce-missingh
@@ -97207,6 +97731,7 @@ self: {
        pname = "hint-server";
        version = "1.4.3";
        sha256 = "1pgz8m5aad8wx9ahnaxawry25rksfn2rnmm6l55ha5pj7zb7zjzy";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base eprocess exceptions hint monad-loops mtl
        ];
@@ -97250,6 +97775,7 @@ self: {
        sha256 = "01v5szci7kbp3w2jsdcnzv9j3lbcl5bvn9ipcvp3v2xvfjik110h";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base haskell98 random ];
        homepage = "http://www.cs.mu.oz.au/~bjpop/code.html";
        description = "Space Invaders";
@@ -97612,6 +98138,7 @@ self: {
        sha256 = "0wg44vgd5jzi0r0vg8k5zrvlr7rcrb4nrp862c6y991941qv71nv";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base byteable bytestring containers cryptohash hourglass
          mtl parsec patience random system-fileio system-filepath
@@ -97681,6 +98208,7 @@ self: {
        sha256 = "0gk4misxbkc2x8hh7ynrj1ma91fs0h6q702w6r0kjq136fh48zhi";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring containers directory mtl parsec regex-compat
        ];
@@ -97900,6 +98428,7 @@ self: {
        sha256 = "14yqc02kfp2c9i22inma29cprqz9k8yx6c7m90kwimv4psv8766a";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring haskell98 parallel
        ];
@@ -97952,6 +98481,7 @@ self: {
        sha256 = "0b9gaj68ykx1ak2v4kjif67kkwv1s8rf9nvcijs4garz98781sdd";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-terminal base base-compat bytestring cmdargs containers csv
          data-default directory file-embed filepath hashable haskeline here
@@ -97998,6 +98528,7 @@ self: {
        sha256 = "0kl0sc11181bgpz65b5xg9l1hxdaai27icx13x15kwlc01jf9rcc";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson base bytestring containers Decimal docopt either hledger
          hledger-lib microlens microlens-platform safe servant-server
@@ -98087,6 +98618,7 @@ self: {
        sha256 = "19hdz6lj0kxy59vzkyqlwk20l8k08w618nz02xcfflwd9r7ka0ha";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base Cabal Decimal hledger-lib mtl text time
        ];
@@ -98127,6 +98659,7 @@ self: {
        pname = "hledger-lib";
        version = "1.3";
        sha256 = "052ynivzbyabp2yn7y2wfy9dvjly989rpbcla9kx8kvmqij5qdhm";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-terminal array base base-compat blaze-markup bytestring
          cmdargs containers csv data-default Decimal deepseq directory
@@ -98161,6 +98694,7 @@ self: {
        editedCabalFile = "0dc5nqc9g4s0h1si6pcymbhfw32hlxafzavpp8y1jg7c9brc7ln0";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          ansi-terminal async base base-compat brick cmdargs containers
          data-default directory filepath fsnotify hledger hledger-lib HUnit
@@ -98207,6 +98741,7 @@ self: {
        sha256 = "01y8djakr4r0jm5wyi6fbp911y3i82r1xmfi4gm9sgf27fi6a3i4";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base base-compat blaze-html blaze-markup bytestring clientsession
          cmdargs conduit-extra data-default directory filepath hjsmin
@@ -98322,6 +98857,7 @@ self: {
        sha256 = "1d1z14gfls87jgq0bm67aq81xmczhlbzjym60qplpx1ajpvrk4id";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-terminal base cmdargs containers cpphs directory extra
          filepath haskell-src-exts hscolour process refact transformers
@@ -98345,6 +98881,7 @@ self: {
        sha256 = "1bd5nizx1dbzhrfcr9mgpjvg4b6f6z73jvslkbialp7g9pkr6a95";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-terminal base bytestring cmdargs containers cpphs directory
          extra filepath haskell-src-exts hscolour process refact text
@@ -98394,6 +98931,7 @@ self: {
        pname = "hls";
        version = "0.15";
        sha256 = "0h32fyvnqkxx8c9vfpdjvnqaxkvr8b15myjavxmnm6kwh7v2796l";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers hcg-minus hps ];
        homepage = "http://rd.slavepianos.org/t/hls";
        description = "Haskell Lindenmayer Systems";
@@ -98424,6 +98962,7 @@ self: {
        pname = "hly";
        version = "0.15";
        sha256 = "192szfq39g3fdcdsxj4bsi13bfha8gjbqbixav3iywmdsgxp1hj8";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory filepath hmt process ];
        homepage = "http://rd.slavepianos.org/t/hly";
        description = "Haskell LilyPond";
@@ -98736,6 +99275,7 @@ self: {
        sha256 = "1dnmvzy7vkx2rfbkkqapfpql8h0gm9sq0333r90hy5nsyl9hhbq8";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base bytestring bytestring-lexing delimited-text gnuplot
          hmatrix hmeap hosc hsc3 parsec
@@ -98872,6 +99412,7 @@ self: {
        pname = "hmpfr";
        version = "0.4.2.1";
        sha256 = "048amh4w9vjrihahhb3rw0gbk3yp7qvjf6vcp9c5pq2kc3n7vcnc";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base integer-gmp ];
        librarySystemDepends = [ mpfr ];
        homepage = "https://github.com/michalkonecny/hmpfr";
@@ -98889,6 +99430,7 @@ self: {
        pname = "hmt";
        version = "0.15";
        sha256 = "051kgsh9nl5f1nw8a24x7ds18g6ppzbhk3d9lf74nvvnccnzg3a9";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring colour containers data-ordlist directory
          filepath lazy-csv logict multiset-comb parsec permutation primes
@@ -98907,6 +99449,7 @@ self: {
        pname = "hmt-diagrams";
        version = "0.15";
        sha256 = "1g64b31bz31x0kiivazn20s22y2w7dz9f2gw5cnfkcnjd20k7glm";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base cairo colour filepath hcg-minus hcg-minus-cairo hmt
          html-minimalist process xml
@@ -98947,6 +99490,7 @@ self: {
        sha256 = "15fpn895r2sa6n8pahv2frcp6qkxbpmam7hd03y4i65jhkf9vskh";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers either errors filepath repa transformers vector
        ];
@@ -99158,6 +99702,7 @@ self: {
        sha256 = "1m2sxbw5il818g50b0650cm5vrb7njclk09m0na6i3amx3q10xjc";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers filepath glib gtk-largeTreeStore gtk3
          gtksourceview3 mtl pango system-filepath text transformers vector
@@ -99352,6 +99897,7 @@ self: {
        sha256 = "10zq4qch5bs0aawvs0zg3yyz41lykg1jrna5jqxlrvbq0wfz2s5g";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base hogre ];
        executableSystemDepends = [ OgreMain ];
        homepage = "http://github.com/anttisalonen/hogre-examples";
@@ -99448,6 +99994,7 @@ self: {
        sha256 = "05181blw3y9j2715rdm49y6mfcpgyihb6yjswhp231kr6x40zxmh";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson ansi-terminal base bytestring directory filepath hastache
          http-conduit lens lens-aeson process random split syb text time
@@ -99662,6 +100209,7 @@ self: {
        sha256 = "1rhxmiqwmzmnaqw7qj77k9y8svyy0gknpn8di7q5r9w1bdl807q5";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base cmdargs configurator containers directory filepath hoodle-core
          mtl
@@ -99705,6 +100253,7 @@ self: {
        pname = "hoodle-core";
        version = "0.16.0";
        sha256 = "1v1y99x5rbkn85f91pdw19jfccwhcyfklg1qli0d7lq2c6aak4ka";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson aeson-pretty array attoparsec base base64-bytestring binary
          bytestring cairo cereal configurator containers coroutine-object
@@ -99847,6 +100396,7 @@ self: {
        sha256 = "024knipmwl75gq56phjwpa61gzac8alw46k6lcgfg7v9dglz2dqx";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base binary bytestring cmdargs conduit conduit-extra
          connection containers deepseq directory extra filepath
@@ -100170,6 +100720,7 @@ self: {
        pname = "hoppy-std";
        version = "0.3.0";
        sha256 = "0rgvqkslhj6d9craiwb5g75217jh7s34980rpcbjbjba8pscpxjb";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base filepath haskell-src hoppy-generator
        ];
@@ -100191,6 +100742,7 @@ self: {
        sha256 = "16a1ygxv4isw5wiq5dhjn4xdlr67zy1ngn61mwilgwkvwj0cjxc3";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson ansi-terminal attoparsec base bytestring conduit
          conduit-extra containers deepseq directory filepath http-conduit
@@ -100222,6 +100774,7 @@ self: {
        sha256 = "0h9cq1qzai1kbzc77bjlm0dbkrasfj0d21ydrh86kv9jd6gr7gb7";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base bifunctors bytestring filepath mtl pretty readline void
        ];
@@ -100295,6 +100848,7 @@ self: {
        pname = "hosc";
        version = "0.15";
        sha256 = "1yp25n159p69r32y3x7iwc55l5q9qaamj2vyl1473x8ras5afdcf";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary blaze-builder bytestring data-binary-ieee754 network
          time transformers
@@ -100317,6 +100871,7 @@ self: {
        pname = "hosc-json";
        version = "0.15";
        sha256 = "0sask4nr5njf9grzigldflrbp7460z55fsam1pc3wcnsa575hxhi";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson attoparsec base bifunctors bytestring hosc json text
          unordered-containers utf8-string vector
@@ -100337,6 +100892,7 @@ self: {
        sha256 = "0zk59ig52vqym4n47yl9jgv21gszcwwbc0qc9ff0080allp6ddml";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring cgi haskeline hosc hosc-json hsc3 json text
          transformers utf8-string websockets www-minus
@@ -100554,6 +101110,7 @@ self: {
        sha256 = "143j3ylvzyq1s2l357vzqrwdcgg6rqhnmv0awb3nvm66c9smaarv";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base bytestring cairo containers directory filepath glade
          glib gtk gtkglext hp2any-core hp2any-graph OpenGL time
@@ -100572,6 +101129,7 @@ self: {
        sha256 = "11v0w5406d9lql5jaj2kwrvdgai9y76kbdlwpjnn2wjn36b8hdwa";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base containers filepath ];
        description = "A tool for converting GHC heap-profiles to HTML";
        license = stdenv.lib.licenses.bsd3;
@@ -100708,6 +101266,7 @@ self: {
        sha256 = "0sl2qh3l5vbijln2al7vmvxm4zhn3qsz8axvprs6jxjfbndmk78j";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring Cabal cabal-macosx containers directory eprocess
          filepath FindBin haskell-src-exts hint hint-server monad-loops mtl
@@ -100885,6 +101444,7 @@ self: {
        pname = "hpdft";
        version = "0.1.0.4";
        sha256 = "1rxr2qfs6cvk0hyvvq7w0jsq8vjf8b84ay5jzfhqyk8qk73ppfji";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base binary bytestring containers directory file-embed
          parsec text utf8-string zlib
@@ -100966,6 +101526,7 @@ self: {
        sha256 = "01xkpsb8fjlifdz6fckwfawj1s5c4rs4slizcdr1hpij6mcdcg6y";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base directory filepath process ];
        description = "Application for managing playlist files on a music player";
        license = "GPL";
@@ -101136,6 +101697,7 @@ self: {
        sha256 = "0kmmrjg93rr6cjmg5n821p00qr4m3q46nnyfhql2s2nf20p7kprh";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base hcg-minus ];
        executableHaskellDepends = [
          base directory filepath hcg-minus random
@@ -101153,6 +101715,7 @@ self: {
        sha256 = "1xyk0q6qiqcqd849km86jns4bcfmyrvikg0zw44929wlmlbf0hg7";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base cairo gtk hps ];
        executableHaskellDepends = [ base cairo gtk hps random ];
        homepage = "http://slavepianos.org/rd/?t=hps-cairo";
@@ -101194,6 +101757,7 @@ self: {
        pname = "hpygments";
        version = "0.2.0";
        sha256 = "0f1cvkslvijlx8qlsc1vkv240ir30w4wq6h4pndzsqdj2y95ricj";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring process process-extras
        ];
@@ -101622,6 +102186,7 @@ self: {
        pname = "hs-fltk";
        version = "0.2.5";
        sha256 = "0nbxfy219mz0k27d16r3ir7hk0j450gxba9wrvrz1j17mr3gvqzx";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ fltk fltk_images ];
        homepage = "http://www.cs.helsinki.fi/u/ekarttun/hs-fltk/";
@@ -101636,6 +102201,7 @@ self: {
        pname = "hs-gchart";
        version = "0.4.1";
        sha256 = "0nmykgdzkqidxv51bhlcn4zax4zfw26s4l65z3a3405si2s5x459";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base mtl ];
        homepage = "http://github.com/deepakjois/hs-gchart";
        description = "Haskell wrapper for the Google Chart API";
@@ -101737,6 +102303,7 @@ self: {
        sha256 = "0ypr4jpc12f771g3gsahbj0yjzd0ns8mmwjl90knwg267d712i13";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base cmdargs colour containers diagrams-core diagrams-lib
          diagrams-svg mtl parsec parsec-numbers random
@@ -101821,6 +102388,7 @@ self: {
        sha256 = "064sk0g8mzkqm80hfxg03qn6g1awydlw15ylikk3rs4wf7fclw30";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base MonadPrompt mtl random ];
        executableHaskellDepends = [
          array base directory glib gtk MonadPrompt mtl random
@@ -101987,6 +102555,7 @@ self: {
        sha256 = "077mc8dn2f6x3s29pm80qi7mj6s2crdhky0vygzfqd8v23gmhqcg";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base HTTP json mtl network pretty ];
        homepage = "https://github.com/deepakjois/hs-twitterarchiver";
        description = "Commandline Twitter feed archiver";
@@ -102063,6 +102632,7 @@ self: {
        sha256 = "1lx0px0gicwry5i4rwgzz6jasjhp24f620w2iby9xpbvn6h3zflm";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base containers directory filepath haskell-src mtl
        ];
@@ -102124,6 +102694,7 @@ self: {
        pname = "hsSqlite3";
        version = "0.1";
        sha256 = "0wmsswccwcz2zd3zap0wsapzbya72cxdyzhlcch4akvwqcl9hz6a";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bindings-sqlite3 bytestring mtl utf8-string
        ];
@@ -102176,6 +102747,7 @@ self: {
        sha256 = "0qar7y4190dfv63jmzx8saxqxzh73spc2q3i6pqywdbv7zb6zvrl";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base Hclip HTTP process unix ];
        description = "(ab)Use Google Translate as a speech synthesiser";
        license = stdenv.lib.licenses.gpl3;
@@ -102305,6 +102877,7 @@ self: {
        sha256 = "061ns6ig52pcjwi9cgdcasya4cgm3zlb5s2mzq9p01vw4iy702gn";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers directory filepath process
        ];
@@ -102322,6 +102895,7 @@ self: {
        pname = "hsc3";
        version = "0.15.1";
        sha256 = "1ad5q4rq82v7l556rinaiikglr1kjswi5raw0dxqwsfjbp8imbha";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary bytestring containers data-default data-ordlist
          directory filepath hashable hosc network process random safe split
@@ -102339,6 +102913,7 @@ self: {
        pname = "hsc3-auditor";
        version = "0.15";
        sha256 = "02p4y06p08mizdrbvl52364szksrwnx28s992prw8b2ilav11563";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base filepath hmt hosc hsc3 hsc3-sf-hsndfile
        ];
@@ -102353,6 +102928,7 @@ self: {
        pname = "hsc3-cairo";
        version = "0.14";
        sha256 = "1f62mfjssky7igbp1nx2zf1azbih76m65xydnf5akp8pim7nzmis";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base cairo gtk hosc hsc3 split ];
        homepage = "http://rd.slavepianos.org/?t=hsc3-cairo";
        description = "haskell supercollider cairo drawing";
@@ -102368,6 +102944,7 @@ self: {
        pname = "hsc3-data";
        version = "0.15";
        sha256 = "0321rnajfiwldwwpns78im842hypykc1js7flnasld7al6m7487d";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bifunctors Glob hcg-minus hmt hsc3-lang hsc3-plot
          hsc3-sf-hsndfile safe split SVGPath xml
@@ -102384,6 +102961,7 @@ self: {
        pname = "hsc3-db";
        version = "0.15";
        sha256 = "0sj3hq0d8dl4m6fn75lvyr78sg283p6y13lg8yi2yrgz74kn4zbl";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base hsc3 safe ];
        homepage = "http://rd.slavepianos.org/t/hsc3-db";
        description = "Haskell SuperCollider Unit Generator Database";
@@ -102396,6 +102974,7 @@ self: {
        pname = "hsc3-dot";
        version = "0.15";
        sha256 = "1ck2g15zw23smry1xvn9ida8ln57vnvkxvr3khhp5didwisgm90m";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory filepath hsc3 process ];
        homepage = "http://rd.slavepianos.org/t/hsc3-dot";
        description = "haskell supercollider graph drawing";
@@ -102412,6 +102991,7 @@ self: {
        sha256 = "0b3q6w1r12wv1fl05armkrprlkx2s7n08mimkxxndsd9kl6zl8lw";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers directory filepath hashable hosc hsc3 hsc3-db
          hsc3-dot mtl unix
@@ -102435,6 +103015,7 @@ self: {
        sha256 = "1d59gl0shwkwi9581j7x7yy1j63acns9ccpwin4y5lwk0k5x6s38";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base binary bytestring cairo containers data-default
          directory filepath hls hmt hosc hps hsc3 hsc3-cairo hsc3-lang
@@ -102463,6 +103044,7 @@ self: {
        pname = "hsc3-lang";
        version = "0.15";
        sha256 = "09qn9kb8h40cwhnjf4pl70i2vi7cn4pa4wkdwjbn07hrdpvxgihf";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bifunctors bytestring containers data-default
          data-ordlist dlist hashable hmatrix-special hosc hsc3 MonadRandom
@@ -102484,6 +103066,7 @@ self: {
        sha256 = "1k45ipivvlfymvh6rzxsv1kfvd11spsn3skmsswg2vd76bcgh20x";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers directory filepath hashable hosc hsc3 hsc3-dot
          husk-scheme mtl safe unix
@@ -102502,6 +103085,7 @@ self: {
        pname = "hsc3-plot";
        version = "0.15";
        sha256 = "1v5n4k54qp8ifwka2bhrq9w1kfzd3ldzhqyhvkcgl0z46xcf7lk3";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base directory filepath hosc hsc3 hsc3-lang process split
          statistics vector
@@ -102539,6 +103123,7 @@ self: {
        pname = "hsc3-rec";
        version = "0.14.1";
        sha256 = "0m814vr41i0mm0c001vbih9i93048niljv3z8czaz32wysa8xpfl";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base hsc3 ];
        homepage = "http://rd.slavepianos.org/?t=hsc3-rec";
        description = "Haskell SuperCollider Record Variants";
@@ -102554,6 +103139,7 @@ self: {
        pname = "hsc3-rw";
        version = "0.15";
        sha256 = "1jcnw0a1nf4wwf5bz61bkpwd3jfgccfxmcqq06vy43pc98223z8p";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base directory haskell-src-exts parsec polyparse split syb
          transformers
@@ -102601,6 +103187,7 @@ self: {
        pname = "hsc3-sf";
        version = "0.15";
        sha256 = "1dg3gqhvi2rshfqnw7i89bd4bvqjvbk4f9g17x18swyrvgkz9wr7";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring hosc ];
        homepage = "http://rd.slavepianos.org/t/hsc3-sf";
        description = "Haskell SuperCollider SoundFile";
@@ -102615,6 +103202,7 @@ self: {
        pname = "hsc3-sf-hsndfile";
        version = "0.15";
        sha256 = "11ksss2g8a7lqpjqvdwj4j9y3kdc8algc9mhlyjmj38mgg4raa2i";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base hsc3-sf hsndfile hsndfile-vector vector
        ];
@@ -102629,6 +103217,7 @@ self: {
        pname = "hsc3-unsafe";
        version = "0.14";
        sha256 = "0kywqx7x10hqzhq8by0f62aznrnq4y3013cxkccx1r0naajpz3yj";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base hsc3 ];
        homepage = "http://rd.slavepianos.org/?t=hsc3-unsafe";
        description = "Unsafe Haskell SuperCollider";
@@ -102646,6 +103235,7 @@ self: {
        sha256 = "1pvg2z6n2r7jhwgwx9rv4q94jdj2ql3kgjh4smjq4xafnzzlyrix";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base directory filepath hashable hosc hsc3 hsc3-sf
        ];
@@ -102758,6 +103348,7 @@ self: {
        sha256 = "1j3rpzjygh3igvnd1n2xn63bq68rs047cjxr2qi6xyfnivgf6vz4";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers ];
        executableHaskellDepends = [ base containers ];
        homepage = "http://code.haskell.org/~malcolm/hscolour/";
@@ -102832,6 +103423,7 @@ self: {
        sha256 = "0msf80475l3ncpnb1lcpnyscl1svmqg074ylb942rx7dbvck71bj";
        revision = "1";
        editedCabalFile = "0a65hmlhd668r8y7qcjsdy4fgs46j8rr9jbjryjddkma6r02jpqq";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base exceptions mtl old-locale old-time unix
        ];
@@ -102904,6 +103496,7 @@ self: {
        pname = "hsdif";
        version = "0.14";
        sha256 = "1wxms6z8mpyf4l1qqxi6gvscls3mwlj5aq6g3ldashzrmb7pcimm";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring hosc ];
        homepage = "http://rd.slavepianos.org/?t=hsdif";
        description = "Haskell SDIF";
@@ -102919,6 +103512,7 @@ self: {
        sha256 = "0hqwpcf2bcrj36wg02mxd2zdg07dqh4b5mv9yn295xp64snrdw84";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base cairo containers HUnit parsec ];
        homepage = "http://neugierig.org/software/darcs/hsdip/";
        description = "hsdip - a Diplomacy parser/renderer";
@@ -103008,6 +103602,7 @@ self: {
        pname = "hsemail-ns";
        version = "1.3.2";
        sha256 = "03d0pnsba7yj5x7zrg8b80kxsnqn5g40vd2i717s1dnn3bd3vz4s";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base mtl old-time parsec ];
        homepage = "http://patch-tag.com/r/hsemail-ns/home";
        description = "Internet Message Parsers";
@@ -103026,6 +103621,7 @@ self: {
        sha256 = "1kjj9p8x6369g9ah9h86xlyvcm4jkahvlz2pvj1m73javbgyyf03";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring Cabal directory file-embed filepath http-streams
          io-streams mtl process safe split unix
@@ -103160,6 +103756,7 @@ self: {
        pname = "hsgsom";
        version = "0.2.0";
        sha256 = "1043lavrimaxmscayg4knx7ly0yc0gsb729pg72g897hc455r2dn";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers random stm time ];
        description = "An implementation of the GSOM clustering algorithm";
        license = stdenv.lib.licenses.bsd3;
@@ -103283,6 +103880,7 @@ self: {
        sha256 = "070sbjcb7vdl0dxx5jv1q1aiihb5q5malrdmxb6dcs0gc01qp13p";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory filepath ];
        executableHaskellDepends = [ base directory filepath ];
        description = "Install Haskell software";
@@ -103297,6 +103895,7 @@ self: {
        sha256 = "04f86mk2304q9kz37hr18b9jcz66wk04z747xzpxbnnwig390406";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory filepath ];
        executableHaskellDepends = [ base directory filepath ];
        description = "Install Haskell software";
@@ -103339,6 +103938,7 @@ self: {
        pname = "hslibsvm";
        version = "2.89.0.1";
        sha256 = "00smw10j2ipw10133qc38famar5r6rkswj7bhvb9hdj2rrdyx6sf";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers ];
        librarySystemDepends = [ svm ];
        description = "A FFI binding to libsvm";
@@ -103522,6 +104122,7 @@ self: {
        pname = "hsmagick";
        version = "0.5";
        sha256 = "1bfzbwddss0m0z4jf7i0b06pmxy9rvknpqnzhf0v5jggv5nr442p";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring directory filepath pretty process
        ];
@@ -103619,6 +104220,7 @@ self: {
        sha256 = "1hh4lyrd2ki79q6pfz62icp3igzyljwa5bz8ba9vk4kxxawrnbhw";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base parsec readline ];
        executableHaskellDepends = [ base parsec readline ];
        testHaskellDepends = [
@@ -103686,6 +104288,7 @@ self: {
        sha256 = "0pw5l6z1yjjvcxgw71i00gfnjdqcvg09bsacazq9ahvnwsn4aayd";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base mtl network old-time random ];
        executableHaskellDepends = [ unix ];
        homepage = "http://www.cs.helsinki.fi/u/ekarttun/util/";
@@ -104777,6 +105380,7 @@ self: {
        sha256 = "09lnd6am51z98j4kwwidj4jw0bcrx8904r526w50y38afngysqx6";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers hsqml MonadRandom text
        ];
@@ -104796,6 +105400,7 @@ self: {
        sha256 = "166r06yhnmg063d48dh7973wg85nfmvp1c5gmy79ilycc8xgvmhm";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers deepseq directory hsqml OddWord text
        ];
@@ -104815,6 +105420,7 @@ self: {
        sha256 = "0gjlsqlspchav6lvc4ld15192x70j8cyzw903dgla7g9sj8fg813";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers hsqml sqlite-simple text transformers
        ];
@@ -104832,6 +105438,7 @@ self: {
        sha256 = "0y82caz4fb4cz4qfmdg7h5zr959yw2q162zz980jz179188a8pr2";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base hsqml OpenGL OpenGLRaw text ];
        homepage = "http://www.gekkou.co.uk/software/hsqml/";
        description = "HsQML sample programs";
@@ -104849,6 +105456,7 @@ self: {
        sha256 = "1qisi1r8lljgkwc9v5p3nqq6b78vdn9wyydsp31dxqnbd1lyg5ax";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers deepseq directory hsqml OddWord tagged
        ];
@@ -105072,6 +105680,7 @@ self: {
        sha256 = "1d87s6f6qgq7sbqzdgidnn3gxz9panhdk2mfhd7263hb9mrq1k3c";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base containers hsqml network random safecopy socks
          tagged text
@@ -105167,6 +105776,7 @@ self: {
        sha256 = "0wfi468d08irw0s7dn6rmfsi1hrvh0in2fr655fmmwk6ngmnix51";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base cairo containers directory filepath glade gtk hashable
          mtl parallel QuickCheck random unordered-containers vector xml
@@ -105211,6 +105821,7 @@ self: {
        sha256 = "1sq498shkr9xvzrg7spwvsfrnp0d414vcb6iv6pcy7h1jsplrgaz";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring gi-gtk HandsomeSoup haskell-gi-base http-client
          http-client-tls hxt text
@@ -105412,6 +106023,7 @@ self: {
        sha256 = "19s01g8inwmzbvbs1ph4rg2kaqipj7jc9lkg2y9y28gpdrgw48qb";
        revision = "1";
        editedCabalFile = "0z0jzhmrm77b3rl1h89wfgbwjg374n1mda73z7qrrdfc7ky99dmy";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring text ];
        librarySystemDepends = [ taglib ];
        testHaskellDepends = [ base directory filepath hspec ];
@@ -105428,6 +106040,7 @@ self: {
        pname = "htaglib";
        version = "1.1.1";
        sha256 = "0a4rzw1343zixkmdy84bg7j35qxbnpx7pjr23857cil906wi33r3";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring text transformers ];
        librarySystemDepends = [ taglib ];
        testHaskellDepends = [ base directory filepath hspec ];
@@ -105639,6 +106252,7 @@ self: {
        pname = "html-minimalist";
        version = "0.15";
        sha256 = "06qhjb8c1x9wab77g493bbqqm068alkc4vn7c6dj810gdgxwgw5j";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base xml ];
        homepage = "http://rd.slavepianos.org/t/html-minimalist";
        description = "Minimalist haskell html library";
@@ -105814,6 +106428,7 @@ self: {
        pname = "hts";
        version = "0.15";
        sha256 = "0l09skjsds4p9kdwrwrxg8hdd1ja7m2zmggf23dfimzm1jsij6y2";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base hmt xml ];
        homepage = "http://rd.slavepianos.org/t/hts";
        description = "Haskell Music Typesetting";
@@ -106847,6 +107462,7 @@ self: {
        pname = "https-everywhere-rules-raw";
        version = "4.0";
        sha256 = "0zm3znn42nzh9dlpjjn38nsz8rsb0gzl5rv6ngii1vfq534sddy6";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base directory filepath functor-infix text
        ];
@@ -106929,6 +107545,7 @@ self: {
        pname = "hubigraph";
        version = "0.3.2";
        sha256 = "19mxblqy3bchhrk725x4kmpa9hidjzj0d0sqhx34smqw7v36x814";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers haxr mtl ];
        homepage = "http://ooxo.org/hubigraph/";
        description = "A haskell wrap for Ubigraph";
@@ -107102,6 +107719,7 @@ self: {
        sha256 = "1wb9bn83lrn6cpp0gkpc7v40m9wlx8i8zqijm4dmd23zzmrlrxhr";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base blaze-builder bytestring case-insensitive ConfigFile
          containers directory filepath HaXml http-types hxt MissingH mtl
@@ -107170,6 +107788,7 @@ self: {
        sha256 = "0wzy2gjxpqr0j2cfnl88ixccm8dv3z9cql1zpzr4ph6g37dc9w60";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base cairo gtk haskell98 HUnit ];
        executableHaskellDepends = [ base cairo gtk haskell98 HUnit ];
        homepage = "http://patch-tag.com/r/kwallmar/hunit_gui/home";
@@ -107383,6 +108002,7 @@ self: {
        sha256 = "0bb4iph3pp26rm9sdsjsshbig3misd1yr4waqblj8vr9fmrpx084";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring containers directory haskeline knob mtl
          parsec process time transformers utf8-string
@@ -108098,6 +108718,7 @@ self: {
        sha256 = "05bahk2fl2cp0dgx4v91dghzhsh1bclaj8z24j4s0p25xbi63zvr";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-wl-pprint array attoparsec base bytestring conduit containers
          hw-balancedparens hw-bits hw-conduit hw-parser hw-prim
@@ -108321,6 +108942,7 @@ self: {
        sha256 = "1fk4cgk4ncf5v7k8hankwb49ablfcxj1rcw64ka6pz3jrz4sablq";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring cairo cmdargs configurator containers Diff
          directory double-conversion dyre fclabels filepath gtk
@@ -108644,6 +109266,7 @@ self: {
        sha256 = "1k81whay05mp9jb39gmb64l2xqxa90yrb7svbphj1cnsz0b76qwk";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson base blaze-html bytestring cmdargs directory filepath
          highlighting-kate mtl pandoc regex-pcre-builtin text
@@ -108663,6 +109286,7 @@ self: {
        sha256 = "05v69csnz7g9ikymnrmzjqhdwlrfsb44pbv8mzddgk6my9ddlb9w";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers haskell98 mtl parsec
        ];
@@ -108763,6 +109387,7 @@ self: {
        sha256 = "03hz4z964zg1b5nzywymrd1m3ss081rq6nnbqwcgbwabx6wd209b";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base hydrogen-cli-args hydrogen-data hydrogen-multimap
          hydrogen-parsing hydrogen-prelude hydrogen-syntax
@@ -108941,6 +109566,7 @@ self: {
        sha256 = "0ryzhbmwrg173lmzyl8a77qnqp11maxcn72y1x0hn8mabj8js3hn";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base hylogen vector-space ];
        executableHaskellDepends = [
          aeson base bytestring filepath fsnotify hint http-types hylogen
@@ -108987,6 +109613,7 @@ self: {
        sha256 = "0xynx72xpb84g19gnsgq00gwj3ycfgk5qgd9j949b6k3fqr3n71w";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base hylolib mtl ];
        homepage = "http://www.glyc.dc.uba.ar/intohylo/hylotab.php";
        description = "Tableau based theorem prover for hybrid logics";
@@ -109173,6 +109800,7 @@ self: {
        pname = "hyphenation";
        version = "0.6";
        sha256 = "1xqj4na1gm40ssirc4k70r27bzxhg2dkiipp48a5hqwgq5k3crrg";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers unordered-containers zlib
        ];
@@ -109193,6 +109821,7 @@ self: {
        pname = "hyphenation";
        version = "0.7";
        sha256 = "0l1yvfdkkgba91pzncy399hv65pdipb9p78v2j9g0sdkmb1anq9s";
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base bytestring containers unordered-containers zlib
@@ -109511,6 +110140,7 @@ self: {
        editedCabalFile = "0bb6cg0yiadcwa7pdg5gan3lir3pxdakwimi0cp64hi76scy0xng";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          async attoparsec base binary bytestring Cabal-ide-backend
          containers data-accessor data-accessor-mtl directory filemanip
@@ -109658,6 +110288,7 @@ self: {
        sha256 = "0qzj2063sh7phbqyxqxf96avz1zcwd1ry06jdqxwkg55q3yb8y9n";
        revision = "1";
        editedCabalFile = "0jlm9cmw0ycbyifab7bzkmykj8w7vn2wyc6pfadfjrhb76zyvcxr";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring JuicyPixels ];
        testHaskellDepends = [
          base bytestring hspec JuicyPixels QuickCheck
@@ -109706,6 +110337,7 @@ self: {
        sha256 = "11595aj56sjwk28grh6ldsbk5c6kgrirsc2xglfixw82vj7viw8h";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers data-accessor MissingH polyparse text
          utf8-string
@@ -109783,6 +110415,7 @@ self: {
        configureFlags = [ "-fcurses" "-fffi" "-fgmp" ];
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson annotated-wl-pprint ansi-terminal ansi-wl-pprint array async
          base base64-bytestring binary blaze-html blaze-markup bytestring
@@ -109952,6 +110585,7 @@ self: {
        pname = "ige-mac-integration";
        version = "0.1.0.1";
        sha256 = "1949c5v3157xlwcmddawc79iagxlgy4l08skpkldi45amyy3jqn6";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base containers glib gtk haskell98 mtl
        ];
@@ -110032,6 +110666,7 @@ self: {
        sha256 = "09vzwbxc8hnm7cwhs1nfpd6abwmlld495h304iwv1j653zrhjygp";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring cereal cmdargs containers
          directory filepath ghc ghc-parser ghc-paths haskeline
@@ -110521,6 +111156,7 @@ self: {
        sha256 = "0x31wjd6maqixr3rbangaph0s5skp18fmb8xgm1a6jsky8k367vz";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bibtex bytestring ConfigFile containers curl directory
          download-curl filepath glib gnomevfs gtk mtl parsec process split
@@ -110899,6 +111535,7 @@ self: {
        sha256 = "05f25yza05ib0xnkpfimhrb3nqyp5km85r1j9n6yh9k0cwdagndi";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers filepath IndentParser mtl parsec presburger pretty
        ];
@@ -112192,6 +112829,7 @@ self: {
        pname = "interlude";
        version = "0.1.2";
        sha256 = "1yiv24n0mfjzbpm9p6djllhwck3brjz9adzyp6k4fpk430304k7s";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        homepage = "http://malde.org/~ketil/";
        description = "Replaces some Prelude functions for enhanced error reporting";
@@ -112242,6 +112880,7 @@ self: {
        sha256 = "1gn6vvrnhck9f9hzs8igdg20gvrvjnba00bj191paw02kpzbgx7z";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base explicit-exception HPDF parsec process transformers utility-ht
        ];
@@ -112264,6 +112903,7 @@ self: {
        editedCabalFile = "1fgqd3qkws9yb3vj8ay695ym5cgifi082wryh68dp0qqh7agwkhl";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base bytestring containers directory filepath ghc ghc-boot-th
          ghc-paths ghci haskeline process syb time transformers unix
@@ -112286,6 +112926,7 @@ self: {
        sha256 = "11awkl6rgy33yl4qcnf7ns464c87xjk9hqcf10z8shjjbaadbz43";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [
          base haskell-src-exts regex-posix syb
@@ -112346,6 +112987,7 @@ self: {
        pname = "interpolatedstring-perl6";
        version = "1.0.0";
        sha256 = "1lx125wzadvbicsaml9wrhxxplc4gd0i4wk3f1apb0kl5nnv5q35";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring haskell-src-meta template-haskell text
        ];
@@ -112360,6 +113002,7 @@ self: {
        pname = "interpolatedstring-qq";
        version = "0.2";
        sha256 = "1bqn9gqc43r158hyk35x8avsiqyd43vlpw2jkhpdfmr2wx29jprq";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base haskell-src-meta-mwotton template-haskell
        ];
@@ -112375,6 +113018,7 @@ self: {
        pname = "interpolatedstring-qq-mwotton";
        version = "0.1.1";
        sha256 = "1cwhy4jwbl50nglfw0wfmdr3rrg33dqskw0wq06prx14x22yshbk";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base haskell-src-meta-mwotton template-haskell
        ];
@@ -112491,6 +113135,7 @@ self: {
        sha256 = "05nz32z4gyjprh22dddwk3jb45nl2bm558d1sh09g4n2rvx0m4i7";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base binary bytestring containers crypto-api
          crypto-pubkey-types cryptohash directory filepath hscurses mtl
@@ -112858,7 +113503,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "io-streams_1_4_0_0" = callPackage
+  "io-streams_1_4_1_0" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder
      , deepseq, directory, filepath, HUnit, mtl, network, primitive
      , process, QuickCheck, test-framework, test-framework-hunit
@@ -112867,8 +113512,8 @@ self: {
      }:
      mkDerivation {
        pname = "io-streams";
-       version = "1.4.0.0";
-       sha256 = "03lk73smhqvw6lxp4j0kxlkd87vaxaz2avpy7k533fxv1jk3sfbd";
+       version = "1.4.1.0";
+       sha256 = "0d6m7hq6l3zabqm2kga9qs1742vh5rnhfsa76svpkyn32z8n1i1w";
        configureFlags = [ "-fnointeractivetests" ];
        libraryHaskellDepends = [
          attoparsec base bytestring bytestring-builder network primitive
@@ -113246,6 +113891,7 @@ self: {
        sha256 = "0r426gbvr5k019v49gmw32fv0xnq5viizin4gb7wxcnm6ql84k5c";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring cereal containers directory filepath mtl
          process SHA temporary text transformers unordered-containers uuid
@@ -113554,6 +114200,7 @@ self: {
        sha256 = "0xrmya03n4xpnn3c79r94x8dz8yn963v8js8rwyjcslr11gyx80q";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-terminal base bytestring Cabal containers extra foldl
          http-conduit lifted-base monad-control multistate process split
@@ -113871,6 +114518,7 @@ self: {
        sha256 = "049gj5c6z68yf7cmnp1kbjdg71n4rdwyb59hivdjajsdp9xay7hn";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base brick data-default microlens text vty
        ];
@@ -113933,6 +114581,7 @@ self: {
        pname = "iterable";
        version = "3.0";
        sha256 = "194718jpjwkv3ynlpgjlpvf0iqnj7dkd3zmci363gsa425i3vlbc";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base mtl tagged template-haskell vector
        ];
@@ -114075,6 +114724,7 @@ self: {
        sha256 = "0r9ykfkxpwsrhsvv691r361pf79a7y511hxy2mvd6ysz1441mych";
        revision = "1";
        editedCabalFile = "0d96j24n4v61q7ynrwaag96as2sl6q67kmypmb4wk42cw400g41j";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary containers directory haskell98 mtl parsec
        ];
@@ -114132,6 +114782,7 @@ self: {
        sha256 = "0dg5408il1s9z1v69k8vw80ypmkbanvqfsw8a5gi8l3b9xinjzg0";
        revision = "3";
        editedCabalFile = "09r09jbbj6a3qm07gj64pbszs72kpvab0320flg6rq9ng2pswv49";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base base-compat bytestring containers directory filepath ivory
          ivory-artifact ivory-opts language-c-quote mainland-pretty monadLib
@@ -114196,6 +114847,7 @@ self: {
        editedCabalFile = "0ffshn32fv3qwf7gq0ms0ay21b21xvy0gb97ymg89plan18n2gx8";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base base-compat ivory ivory-backend-c ivory-opts ivory-stdlib
          monadLib pretty QuickCheck template-haskell
@@ -114212,6 +114864,7 @@ self: {
        pname = "ivory-hw";
        version = "0.1.0.5";
        sha256 = "0h21r9ij3n49b0m3dcjx22vyxc68v4jifl6yv1wpyn1hgrzxlyck";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base filepath ivory ivory-artifact ];
        homepage = "http://ivorylang.org";
        description = "Ivory hardware model (STM32F4)";
@@ -114270,6 +114923,7 @@ self: {
        pname = "ivory-serialize";
        version = "0.1.0.5";
        sha256 = "16hsvfrcrvqwcj75d1xdpb9njh0j66wy7vf4yv7q6vk7papvrwsf";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base base-compat filepath ivory ivory-artifact monadLib
        ];
@@ -114284,6 +114938,7 @@ self: {
        pname = "ivory-stdlib";
        version = "0.1.0.5";
        sha256 = "1sdbwy5sqa87zidfp7xmxwvfw3xx26kc8m68hgmhsxvs8j6xavmg";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base filepath ivory ivory-artifact ];
        homepage = "http://ivorylang.org";
        description = "Ivory standard library";
@@ -114632,6 +115287,7 @@ self: {
        sha256 = "0xlk07vcizp9rms5d28klidcf535ncffcx75rwixhvlii2qmyjn7";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [
          base bytestring directory filepath process regex-tdfa temporary
@@ -114672,6 +115328,7 @@ self: {
        sha256 = "1p4j42nzsbd2dsag2gfnngvbdn5vx9cp8lmli6x05sdywabyckc7";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ array base pretty ];
        executableToolDepends = [ alex happy ];
        homepage = "http://github.com/andreasabel/java-adt";
@@ -115097,6 +115754,7 @@ self: {
        pname = "join";
        version = "0.4";
        sha256 = "0bx9cvdhhw7z30qgxwpl0j23z18sx7xyin2y7bwxvg5ga737j8qx";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base haskell98 multisetrewrite stm ];
        homepage = "http://sulzmann.blogspot.com/2008/12/parallel-join-patterns-with-guards-and.html";
        description = "Parallel Join Patterns with Guards and Propagation";
@@ -115268,6 +115926,7 @@ self: {
        pname = "js-flot";
        version = "0.8.3";
        sha256 = "0yjyzqh3qzhy5h3nql1fckw0gcfb0f4wj9pm85nafpfqp2kg58hv";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base HTTP ];
        homepage = "https://github.com/ndmitchell/js-flot#readme";
@@ -115294,6 +115953,7 @@ self: {
        pname = "js-jquery";
        version = "3.1.1";
        sha256 = "011adwcf0rx57ld6c75m9rw90zd2qj0d4pf7rmdnf7fp5gbnfbyp";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base HTTP ];
        doCheck = false;
@@ -115308,6 +115968,7 @@ self: {
        pname = "js-jquery";
        version = "3.2.1";
        sha256 = "03qymiwnk24sigqjnl42i77rsx6vrgg5wjday0f2j0d6s213sl30";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base HTTP ];
        doCheck = false;
@@ -116396,6 +117057,7 @@ self: {
        sha256 = "060zq739i3xhr7w448p460r7x3jyyzf7pn61abp7f9g8vjn6vqw7";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base base64-bytestring bytestring data-default-class docopt entropy
          fast-logger http-types interpolatedstring-perl6 mtl mysql
@@ -116906,6 +117568,7 @@ self: {
        sha256 = "1q9rffh6589a5am8mvfzxzwws34vg08rdjxggfabhmg9y9jla6hz";
        revision = "11";
        editedCabalFile = "0l56snbdxbcwrmh7gna4237873d366dfbwp59a4wq1s51clhmb4z";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base containers data-default-class scotty stm text time
          transformers unordered-containers
@@ -116927,6 +117590,7 @@ self: {
        sha256 = "0pbciwh79y1pzqlpd2f8pm5w8bjq5bs47slqw71q09f7jlgs0i7d";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring cmdargs containers data-default data-reify
          directory dotgen filepath netlist netlist-to-vhdl process random
@@ -116949,6 +117613,7 @@ self: {
        sha256 = "076hd8c59hivdirpf4y5vgdlvhq74lfd5zm6np34y8hblq6jyl0m";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-terminal base bytestring data-default directory filepath
          kansas-lava network sized-types
@@ -116969,6 +117634,7 @@ self: {
        pname = "kansas-lava-papilio";
        version = "0.3.1";
        sha256 = "0n8ffiygl72cbqza0whmkhsqyg6d7flfdz1jvr22g68x3005r00y";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-terminal base bytestring data-default directory filepath
          kansas-lava kansas-lava-cores netlist network sized-types
@@ -116984,6 +117650,7 @@ self: {
        pname = "kansas-lava-shake";
        version = "0.2.0";
        sha256 = "197nyj21r2z9a648ljmqkhzdbhy3syzw1rw4xfggn1rhk94px0rl";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base hastache kansas-lava shake text ];
        description = "Shake rules for building Kansas Lava projects";
        license = stdenv.lib.licenses.bsd3;
@@ -117318,6 +117985,7 @@ self: {
        sha256 = "1skz1yllkwbpx4wd8w8q4zmqd3f62baaj5pja6dpqr2xviiv0j6g";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base ];
        homepage = "http://tcana.info/rpoku";
        description = "Rpoku spoken word programming language";
@@ -117729,6 +118397,7 @@ self: {
        sha256 = "0kaka302qgax29583kvzhyl6fffzmywh3fk398xhzvixmza9k7sl";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          allocated-processor base bytestring cmdargs containers
          cv-combinators directory filepath gio glib gtk gtk-helpers hgettext
@@ -117934,6 +118603,7 @@ self: {
        sha256 = "04lyrd78fkybh07y9xnbnk3ai1nsig55wr1i0p1c63v9sgzpria5";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson aeson-pretty ansi-wl-pprint api-tools asn1-encoding
          asn1-types base base64-bytestring byteable bytestring cipher-aes
@@ -118093,6 +118763,7 @@ self: {
        sha256 = "1d8abd4l8mcgcfqmm06zmd7yxvfls1kqkphx64bi6mmqzy8lcx3k";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring cmdargs hostname old-time parsec twine
        ];
@@ -118937,6 +119608,7 @@ self: {
        sha256 = "195xm7ncqfpj51vipmv7di1yqba9iy6c38a0rqrkji0w13aprp14";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base lambdabot-core lambdabot-haskell-plugins lambdabot-irc-plugins
          lambdabot-misc-plugins lambdabot-novelty-plugins
@@ -119137,6 +119809,7 @@ self: {
        sha256 = "18m7z0lmi26ib1n1wrql96wb5i229k8fk3iw4vavs9j59b4pz1br";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base cmdargs containers dyre glade gtk mtl network webkit
        ];
@@ -119233,6 +119906,7 @@ self: {
        sha256 = "1rylz8cxlf4llnakihphs7250bmvqqbz35aywjmh2vnghyc8dq28";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson ansi-wl-pprint base containers directory exceptions filepath
          lambdacube-ir megaparsec mtl pretty-show semigroups text vector
@@ -119314,6 +119988,7 @@ self: {
        sha256 = "14l40ncbkblphmyn4prqiy2w70agcw830bpyawfdilf93bs340b9";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base elerea GLFW-b lambdacube-engine mtl
        ];
@@ -119373,6 +120048,7 @@ self: {
        sha256 = "0zl9d524a81vg3h7f9cbfi34b0hw452bd30xmgvg9ayfwxa842d1";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring bytestring-trie elerea GLFW-b lambdacube-core
          lambdacube-edsl lambdacube-gl mtl OpenGLRaw stb-image time vect
@@ -119475,6 +120151,7 @@ self: {
        pname = "lame";
        version = "0.1.1";
        sha256 = "0j35zpfhppb09m6h23awxgsawisvgsnrw7d99f5z3xq2bjihjq5k";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring data-default-class directory exceptions filepath
          text transformers wave
@@ -119611,6 +120288,7 @@ self: {
        pname = "language-c-comments";
        version = "0.3";
        sha256 = "1rmciff72zpcq7pvbbxlsg2339dbk00k18vxp35sz8haql0jnrf2";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base language-c ];
        libraryToolDepends = [ alex ];
        homepage = "http://github.com/ghulette/language-c-comments";
@@ -119948,6 +120626,7 @@ self: {
        pname = "language-guess";
        version = "0.1.2";
        sha256 = "0gdnkc1hb0mcn494vk9r7fw19hvaba807brwh6fna0sxyh2nx3p0";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring cereal containers ];
        description = "Guess at which language a text is written in using trigrams";
        license = stdenv.lib.licenses.bsd3;
@@ -120298,6 +120977,7 @@ self: {
        sha256 = "1vjmb41hh47gmqv3g7f28rkb3lj8hqpdc7pvs6qa9f6pmqi98m4v";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring
          case-insensitive containers cryptonite directory either exceptions
@@ -120342,6 +121022,7 @@ self: {
        sha256 = "0hk1fx574hkmm275rm4jv66vr9gixllaw2vqklhpx54rgjwpcclv";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring
          case-insensitive containers cryptonite directory either exceptions
@@ -120881,6 +121562,7 @@ self: {
        sha256 = "1k39264jwysaiyq9f40n332y2xckhwsbh8fpsz4l14qwlvj68vzx";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base cmdargs composition data-lens Gamgine GLFW-b ListZipper mtl
          OpenGLRaw pretty-show
@@ -121215,6 +121897,7 @@ self: {
        sha256 = "1czk4d2xa2g7djdz669h1q6ciflzwxm4n05m9jv3d3z7r6fcch6z";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base blaze-html directory filepath pandoc split
        ];
@@ -121386,6 +122069,7 @@ self: {
        sha256 = "106pr7rlma67dqqyfhknh9fb6r37lsj00qjx1dq3xx7yxp368nvr";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base containers ];
        homepage = "http://github.com/phaazon/leetify";
        description = "Leetify text";
@@ -121506,6 +122190,7 @@ self: {
        editedCabalFile = "0iqg1qlfh6knmlq29ydzp2qs75aa6a2rpl5l5fzp1b1lcsh8njdm";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base base-compat binary binary-shared blaze-html bytestring
          Cabal conduit containers cpphs deepseq directory executable-path
@@ -121545,6 +122230,7 @@ self: {
        sha256 = "0haj6pi593x0chkvkvvv6d523fmg8vd0hjzkj8sjf8h8ys0sg9k2";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base bin-package-db binary binary-shared bytestring
          Cabal conduit conduit-extra containers deepseq directory
@@ -122223,6 +122909,7 @@ self: {
        sha256 = "1x50k6lx9p36qxl0qn9zfyqlkgsq3wdzvcv7l6sn920hg5scvcr3";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          ansi-wl-pprint base binary bytestring bytestring-trie Cabal
          containers core derive digest directory extensible-exceptions
@@ -122258,6 +122945,7 @@ self: {
        sha256 = "1mm6ikiv6zj025yh5abq3f8mqkw9302mfzd01xcihbh74bsdpi9l";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base cmdargs filepath haskell-src-exts syb uu-parsinglib
        ];
@@ -122275,6 +122963,7 @@ self: {
        sha256 = "1cwvpn6cl0d5rs5x6q3c2pw4l4hpxz20sr717mggafzsj6j7cccv";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base directory filepath Glob ];
        description = "Compile lhs in bird style to md, html, hs";
        license = stdenv.lib.licenses.publicDomain;
@@ -122323,6 +123012,7 @@ self: {
        pname = "libGenI";
        version = "0.16.1";
        sha256 = "1n37pccmx0466425zcbdfpgivsrnqzwsm0nwcjv8lkg8jxjxrwmz";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary containers HUnit mtl parsec process QuickCheck
        ];
@@ -122560,6 +123250,7 @@ self: {
        pname = "liblawless";
        version = "0.24.0";
        sha256 = "1dqz2d8zgwb8i176fhga5637y8mfxiq0vq1ws0lsy9ijlpyiikmp";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base base-unicode-symbols binary boomerang bytestring
          concurrent-machines containers containers-unicode-symbols
@@ -122930,6 +123621,7 @@ self: {
        pname = "libtagc";
        version = "0.12.0";
        sha256 = "1f7r82cfrkxrqcrxk92y6zhk79qwpack2g67crww5q8hs7438vja";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring glib ];
        librarySystemDepends = [ taglib ];
        libraryPkgconfigDepends = [ taglib ];
@@ -123104,6 +123796,7 @@ self: {
        sha256 = "0drsv1d0318yr7a0aa2j6kvsiyl8jj8h4z6wpdnrcyxw6z4qlssq";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ array base GLUT OpenGL random ];
        homepage = "http://github.com/sproingie/haskell-cells/";
        description = "Conway's Life cellular automaton";
@@ -123219,6 +123912,7 @@ self: {
        sha256 = "11c0j2mdrp4rvinl4iym9mfsqzh101yb5sf710vm8n7qih1fzcpc";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base bitmap bytestring directory filepath gloss mtl stb-image
        ];
@@ -123399,6 +124093,7 @@ self: {
        editedCabalFile = "0bvcyh2mryg78kd2yrxz0g67ry4bb23xvrg7pnl0jla49wzg8pjf";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bifunctors bytestring containers deepseq delay
          exceptions filepath hashable hedis http-types lens monad-supply mtl
@@ -123641,6 +124336,7 @@ self: {
        sha256 = "0671px94wvqg2yyc8qhjcwrv5k2ifwp5mrj7fkcwlwvg8w1bp19k";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers HUnit ];
        description = "Finite maps for linear use";
        license = stdenv.lib.licenses.bsd3;
@@ -123795,6 +124491,7 @@ self: {
        sha256 = "0fzszn8nb5kglg4s5hk9k51vdkarlc08bdp67rbrj0cwfxpkn6wd";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base gtk haskell98 popenhs regex-compat unix
        ];
@@ -123812,6 +124509,7 @@ self: {
        sha256 = "0m1jwqa3vbiyzcdrn1h63dm0709j5xijm00j2x7dpwgn8k92iq81";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers extcore filepath process
        ];
@@ -124036,6 +124734,7 @@ self: {
        sha256 = "18akjagbqw2fswrnp4ifzivwdwsbny28kvnm0hfc1ysyy9id8511";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary bytestring containers mtl pretty
        ];
@@ -124157,6 +124856,7 @@ self: {
        sha256 = "1nddiakk6b9biay6ijnc48dxcfgpi9vx4g6a8r9vz6cjh6mh0154";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base base64-bytestring bytestring conduit filepath http-types lio
          simple simple-templates text wai wai-extra warp
@@ -124260,6 +124960,7 @@ self: {
        sha256 = "1rj6c46laylds149d11yyw79vn0nls9gmxnc9fakyl4qg0d97d75";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson array base bifunctors binary bytestring Cabal cereal cmdargs
          containers data-default deepseq Diff directory exceptions filepath
@@ -124670,6 +125371,7 @@ self: {
        sha256 = "0gsbixz0cmy9cajqj4s8iaf8mjk42162sd39bpcdp4xqyxfj5g63";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base event-list non-negative ];
        executableHaskellDepends = [
          alsa-core alsa-seq base bytestring cgi concurrent-split containers
@@ -124820,6 +125522,7 @@ self: {
        pname = "llvm-base-types";
        version = "0.3.0";
        sha256 = "142xc7w250y0nx60qnm4gc5hrqjm1bxk0nhgsp669g5kvxqcd3bn";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers deepseq dwarf failure GenericPretty graphviz
          hashable pretty regex-tdfa text transformers unordered-containers
@@ -125093,6 +125796,7 @@ self: {
        sha256 = "1ynxkdaanw3nxpsgfcjg6wsz6jgxszp239xhssyzasz59qhw64rr";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base Cabal explicit-exception process transformers utility-ht
        ];
@@ -125171,6 +125875,7 @@ self: {
        sha256 = "1nyp0sgdqsaa2f2v7xgmm3s8mf2a170mzz2h3wwsi163ggvxwvhd";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base blaze-html blaze-markup bytestring directory filemanip
          filepath graphviz llvm-analysis llvm-data-interop parallel-io xml
@@ -125343,6 +126048,7 @@ self: {
        pname = "local-search";
        version = "0.0.7";
        sha256 = "0xrp34m2qfbz458g7bxdkp2lvsm0hskwxfcrm1d8n8g150ddn2xf";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base combinatorial-problems containers erf random
        ];
@@ -126316,6 +127022,7 @@ self: {
        pname = "loli";
        version = "2011.6.24";
        sha256 = "1m23dkxh2vah7d47arpqx5zdpwczm8k4jixzslmqbdizm9h933ja";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers data-default hack hack-contrib mps mtl
          template utf8-string
@@ -126435,6 +127142,7 @@ self: {
        sha256 = "0kzvi4310mbz51zkgmm84qyxxpi4m5ww2bsrfkj73a45bn7z198j";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson ansi-terminal attoparsec-conduit base bytestring
          case-insensitive conduit conduit-extra data-default directory
@@ -126946,6 +127654,7 @@ self: {
        sha256 = "1dcvax756cqpqg6rrrjrd4sfr3ggvqdiwp42rb8fdrsi3v2skwrj";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base base64-bytestring blaze-html bson bytestring
          compact-string-fix feed happstack happstack-server HTTP mongoDB mtl
@@ -127006,6 +127715,7 @@ self: {
        pname = "luka";
        version = "2012.8.29";
        sha256 = "00g7a80nlw1bgw6x2pqg1qn4786ra3bwbwbfm9b7iyhb101b7s9s";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ air base bytestring libffi ];
        librarySystemDepends = [ objc ];
        homepage = "https://github.com/nfjinjing/luka";
@@ -127568,6 +128278,7 @@ self: {
        pname = "macho";
        version = "0.22";
        sha256 = "13i8bap38ha8j0259kw4gfx18jxc4860awp3s9rz16i4q2vik0v2";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base binary bytestring ];
        homepage = "http://github.com/erikcharlebois/macho";
        description = "Parser for Mach-O object format";
@@ -127679,6 +128390,7 @@ self: {
        sha256 = "0fknvy48sanvq7vg5pxwbjsahpiby1hba5wf8w6rq2g3d0a1cjwz";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ array base containers mtl random ];
        executableSystemDepends = [ ncurses ];
        homepage = "http://www.scannedinavian.com/~shae/mage-1.0pre35.tar.gz";
@@ -127772,6 +128484,7 @@ self: {
        sha256 = "0fmhms0415wawd539ipdj47gf27h2jjq2gpzhb0s21r6z63ayp7f";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base ConfigFile containers curl directory happstack-state MissingH
          mtl network old-time regex-posix tagsoup utf8-string XMPP
@@ -127793,6 +128506,7 @@ self: {
        sha256 = "1gss86263pzwvm14yx5lqzskrwc3z6521z9yp0mg8780qgr8h9sr";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          air air-th base bytestring containers data-default directory
          filepath hack2 hack2-contrib hack2-handler-snap-server moe process
@@ -127992,6 +128706,7 @@ self: {
        sha256 = "1502pggc0gcmsj6fhzkjcrbqydaxz4qivsmv57jm6cxpbypkyin3";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          async base bytestring configurator containers directory filepath
          github haskeline lens lens-datetime mtl process text time
@@ -128134,6 +128849,7 @@ self: {
        sha256 = "01blfcfynfbshznrz4arn89j7s063s7xhlkqnzbv42wqk04i083h";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary containers dbus-client derive filepath gtk manatee-core
          mtl stm text utf8-string webkit
@@ -128179,6 +128895,7 @@ self: {
        sha256 = "0v525dcg6cs8mfrcbaxk9vx86gnd37c2z8gp9q8fck11616vckvn";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary bytestring containers curl dbus-client dbus-core derive
          directory filepath gio glib gtk manatee-core mtl network old-locale
@@ -128200,6 +128917,7 @@ self: {
        sha256 = "0rd6xjc1hmvfchwjh32ij4sa36z0v6b1k81gnx7278qqsscmgl9y";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary bytestring containers dbus-client dbus-core derive
          filepath gtk gtksourceview2 manatee-core regex-tdfa stm text
@@ -128220,6 +128938,7 @@ self: {
        sha256 = "06zrhycpsnfi8r3a071p6qlrqidddv004h10zcglb9ryhw0sh2p1";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary containers dbus-client derive filepath gio glib gtk
          manatee-core mtl old-locale old-time stm text utf8-string
@@ -128240,6 +128959,7 @@ self: {
        sha256 = "0yn32xsckvw96kxskfhgcqg98rffl07hkwfjzyd7cm221hwd9s0g";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary containers dbus-client derive filepath gio glib gtk
          gtkimageview manatee-core regex-tdfa stm text utf8-string
@@ -128262,6 +128982,7 @@ self: {
        sha256 = "0l14r4mw5bwyjzs5m49sp3vdi2lzfgyjwhsb0q94l3937wb4abgy";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base binary bytestring Cabal containers curl dbus-client
          dbus-core derive fastirc filepath ghc GoogleTranslate groom gtk
@@ -128284,6 +129005,7 @@ self: {
        sha256 = "1jg9ikshscpjyq73g125acqndd049ry8zw7h0gglsi63xbqpldz4";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary bytestring containers dbus-client dbus-core derive
          filepath gio gtk libtagc manatee-core process random regex-tdfa stm
@@ -128305,6 +129027,7 @@ self: {
        sha256 = "0k00drrk7mpbc8ak5cwzx245xf968186dkc12cxp7n2h2mccb456";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary cairo containers dbus-client derive filepath gtk
          manatee-core mtl poppler stm text utf8-string
@@ -128324,6 +129047,7 @@ self: {
        sha256 = "1zxkfil6anh2v692ky9l6gf40784y2czbx8853xmypnhnvgr95ll";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary containers dbus-client derive filepath gtk manatee-core
          proc stm text
@@ -128344,6 +129068,7 @@ self: {
        sha256 = "07zkjg1q3gdqiw1pp0325pyvh84740mxvlf8k6sc6l1l258zpk90";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary containers curl dbus-client derive download-curl feed
          filepath gtk manatee-core stm text utf8-string webkit
@@ -128383,6 +129108,7 @@ self: {
        sha256 = "1aj1pghad0jdm3biy9f4caahvpyby0ia3clrl8lg2rmp2j703wkd";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary containers dbus-client derive filepath gtk manatee-core
          stm text unix vte
@@ -128460,6 +129186,7 @@ self: {
        sha256 = "1wrpzai3482c9g7zfacmjszi6h073ip00fbq17nyc22z2zw4908s";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base bytestring containers directory filepath GLUT hslua time
        ];
@@ -128605,6 +129332,7 @@ self: {
        sha256 = "0ic6jcdsx71qnclv1xvpk812n1fvwm1mvwlj7b2jx5qwvbibvpci";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-terminal base containers directory haskeline parsec
        ];
@@ -128822,6 +129550,7 @@ self: {
        sha256 = "09gfmh9hdzyjijkv2h5a6gfa9rfmba2642rhhh80wsw9y4rg8ns1";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base cmdargs directory glib gtk gtk2hs-buildtools MissingH mtl
          pandoc temporary text transformers webkit
@@ -128931,6 +129660,7 @@ self: {
        editedCabalFile = "1aszssi82ap0y6bkviv3vn6cdh3vb0pv1znvs2z5k52r4wwa8h55";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring conduit configurator deepseq hashable
          haskeline http-client http-client-tls http-types irc-conduit lens
@@ -128978,6 +129708,7 @@ self: {
        sha256 = "0bszb1czqm7pvz8m24z06irzfrw4ch8bm8g59apdgvmp8y0yvp91";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers directory filepath haskell-src-exts labeled-tree
          lens lp-diagrams mtl process text
@@ -129094,6 +129825,7 @@ self: {
        sha256 = "1mbbf0fljaiakw0hw72wsyc1isvylrr7q7wjcyac250lflbkg9dv";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring ConfigFile containers data-default deepseq
          directory either filepath fsnotify HStringTemplate HTTP http-server
@@ -129307,6 +130039,7 @@ self: {
        pname = "matrix-market-attoparsec";
        version = "0.1.0.8";
        sha256 = "0xqa4q4wyjjh55lggsyjhsi0kb5rhk3afzk0qhnhdmnzmf0slhay";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base bytestring exceptions scientific
        ];
@@ -129340,6 +130073,7 @@ self: {
        sha256 = "15pjqyy9qs9bn2vfayl73h5maf01snv7rvq1acb3ly8pain36lh4";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base ConfigFile containers directory MissingH mtl network
          old-locale split time vty vty-ui XMPP
@@ -129362,8 +130096,8 @@ self: {
      }:
      mkDerivation {
        pname = "matterhorn";
-       version = "31000.0.0";
-       sha256 = "0kkyalrqfaq851lnj8vbrffyg2yjbr5mhqrh8a2y4hkd8yx1ji36";
+       version = "40000.0.0";
+       sha256 = "1cr4mnqqdwf137v4r6mgc7p1b20hm4pdvm6qs61zrhlgimy9zmln";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -129387,21 +130121,22 @@ self: {
      }) {};
 
   "mattermost-api" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, connection, containers
-     , gitrev, hashable, HTTP, HUnit, memory, microlens, microlens-th
-     , mtl, network-uri, pretty-show, process, stm, tasty, tasty-hunit
-     , template-haskell, text, time, unordered-containers, websockets
+    ({ mkDerivation, aeson, base, binary, bytestring, connection
+     , containers, gitrev, hashable, HTTP, HUnit, memory, microlens
+     , microlens-th, mtl, network-uri, pretty-show, process, stm, tasty
+     , tasty-hunit, template-haskell, text, time, unordered-containers
+     , websockets
      }:
      mkDerivation {
        pname = "mattermost-api";
-       version = "31000.0.0";
-       sha256 = "1v5m57qsd155rr6nz3y1yzvs2imia4ld3xb2ccha0cnbki6hw6wb";
+       version = "40000.0.0";
+       sha256 = "0c2c09hmq8n44na0i20hqj57cv5wr9yy4apvhdn0xvgfs155wgp9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring connection containers gitrev hashable HTTP
-         memory microlens microlens-th network-uri pretty-show process stm
-         template-haskell text time unordered-containers websockets
+         aeson base binary bytestring connection containers gitrev hashable
+         HTTP memory microlens microlens-th network-uri pretty-show process
+         stm template-haskell text time unordered-containers websockets
        ];
        executableHaskellDepends = [
          aeson base connection pretty-show process text unordered-containers
@@ -129421,8 +130156,8 @@ self: {
      }:
      mkDerivation {
        pname = "mattermost-api-qc";
-       version = "31000.0.0";
-       sha256 = "1sjw31vg02ygxb61m2cvhl435zgsk6w5gnl4v34qd9ihbq4laa9r";
+       version = "40000.0.0";
+       sha256 = "0pnwzay7w9jmdrq26sj3in127c5dywbzhwi12vcf09q4mi43zqwb";
        libraryHaskellDepends = [
          base containers mattermost-api QuickCheck text time
        ];
@@ -129540,6 +130275,7 @@ self: {
        sha256 = "0vv4y1a0z2vsg7jakqphn9z4agyir8m3l90a680bm549zkw7blhw";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base base-unicode-symbols boxes containers
          containers-unicode-symbols fgl HaLeX indentparser mtl parsec
@@ -130290,6 +131026,7 @@ self: {
        pname = "meldable-heap";
        version = "2.0.3";
        sha256 = "1p75zjlls38sd1lma7w95mpmb9kdff19s2as6pz1ki1g20nnxdk3";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        homepage = "http://code.google.com/p/priority-queues/";
        description = "Asymptotically optimal, Coq-verified meldable heaps, AKA priority queues";
@@ -130675,6 +131412,7 @@ self: {
        sha256 = "1xcisngfsw5fd5h7idvni85fap2yh85q01615spfr4y4ia5kq05r";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base haskeline transformers ];
        homepage = "http://hackage.haskell.org/cgi-bin/hackage-scripts/package/memscript";
        description = "Command line utility for memorizing scriptures or any other text";
@@ -131305,6 +132043,7 @@ self: {
        sha256 = "1xvmyjv72v2cd9h4qkq5vxa6ylzdnkf4pk7afs316mzvx68fab4h";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers exceptions haskeline HCodecs megaparsec mtl
          QuickCheck random text tf-random transformers
@@ -131443,6 +132182,7 @@ self: {
        pname = "midi-utils";
        version = "0.1.0.0";
        sha256 = "1dlxihyjx1s1vj57j0fnalav8kq5yxlwlaz0ixmx4aj6glgzp8iz";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring directory event-list midi parsec process
        ];
@@ -131500,6 +132240,7 @@ self: {
        sha256 = "0xl6x4755x8sz2igqfp3mr5n29q7hb4v5b1mycah9vffk1bhi0yf";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring c10k directory filepath haskell98 hdaemonize
          hslogger network parsec time unix webserver
@@ -131525,6 +132266,7 @@ self: {
        sha256 = "1mfqpmvypr67f7kxlagbqydf45lji59zyvwmflyhwjmyc8kcf90g";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array async auto-update base blaze-builder byteorder bytestring
          case-insensitive conduit conduit-extra directory filepath http-date
@@ -131762,6 +132504,7 @@ self: {
        sha256 = "16s98hwskycl2bqv1n2bnivh8w8q3xhhj687hk8flcg9s9ny4s8k";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base directory mtl random ];
        homepage = "http://finder.homelinux.org/haskell/Mines";
        description = "Minesweeper simulation using neural networks";
@@ -131778,6 +132521,7 @@ self: {
        sha256 = "1cbw136wl9rdcl4vbbz9i5w1mw33qhr0gzbww0qf63zfz2lg4gs2";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base binary binary-generic bytestring cairo containers directory
          filepath glade gtk random time
@@ -132176,6 +132920,7 @@ self: {
        sha256 = "0j93zqgqskrj2zc0vwsmwldidr6nkcxq2v3mmzv7l7l1bwhl8jxf";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring cereal directory filepath knob random-fu semigroups
          text utf8-string vector
@@ -132306,6 +133051,7 @@ self: {
        sha256 = "1qzfmf92sx5vq5jxrqhln1a6y8kayrip36izf5m8hryymxd4dard";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base directory filepath haskell98 ];
        description = "Makes an OS X .app bundle from a binary.";
        license = "GPL";
@@ -132787,6 +133533,7 @@ self: {
        sha256 = "1xkkkb1ili45icvlmz2r5i42qf1fib01ywqywgq4n53cyx1ncqa9";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers data-accessor directory
          explicit-exception filepath html HTTP network network-uri
@@ -132835,6 +133582,7 @@ self: {
        pname = "mollie-api-haskell";
        version = "0.2.0.0";
        sha256 = "1k2sx65d486dzb9xs2byi3p4ppacj2qjknhqx2kd0020zi7w9s5n";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring HsOpenSSL http-client http-client-openssl
          http-types mtl text time
@@ -133982,6 +134730,7 @@ self: {
        pname = "monadiccp";
        version = "0.7.6";
        sha256 = "083ppr53ac85r5ybndngsfwxgalj63giz32aa7wpcm629b9g4lxc";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers mtl parsec pretty random
        ];
@@ -133999,6 +134748,7 @@ self: {
        pname = "monadiccp-gecode";
        version = "0.1.2";
        sha256 = "1ylyzklcb37khrq8a11fzlyd0sa1nrhpd7cv470m23v7l1hc1wg0";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers monadiccp mtl ];
        librarySystemDepends = [
          gecodeint gecodekernel gecodesearch gecodeset gecodesupport
@@ -134437,6 +135187,7 @@ self: {
        pname = "monoid-owns";
        version = "2010.5.29";
        sha256 = "1n05f95yhn6jp7rdnlx686k1lsls4iilxdxnp41ds4afsypaclfk";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring containers ];
        homepage = "http://github.com/nfjinjing/monoid-owns";
        description = "a practical monoid implementation";
@@ -134712,6 +135463,7 @@ self: {
        sha256 = "064wgdk0yrrjh8b7xnpmhk541fwqh24pg7hq1rh28vf2fbv6blcy";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base binary bytestring containers directory filepath mtl
          pretty QuickCheck text utf8-string vector
@@ -134730,6 +135482,7 @@ self: {
        pname = "morfeusz";
        version = "0.4.2";
        sha256 = "1lzl5ks7px1xibfa6y0wnfv2mk2w39hscrrynqn7a3gjnca00sx0";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers directory mtl text
        ];
@@ -134773,6 +135526,7 @@ self: {
        sha256 = "1a0s0hj09rhgixs09ay7fjk12d3wrlhm2w957md7pkan412vx200";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base binary containers deepseq Earley http-client
          http-client-tls microlens microlens-mtl pipes system-fileio
@@ -134873,6 +135627,7 @@ self: {
        editedCabalFile = "1cc85zdja69m16h32ii1jw1qkfz7jq3gp0m0m6pfaj146l8qcmwc";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base binary bytestring ConfigFile daemons directory filepath glib
          gstreamer hgettext MissingH mtl network random setlocale text unix
@@ -135002,6 +135757,7 @@ self: {
        pname = "mps";
        version = "2010.11.28";
        sha256 = "1xhflvgwrjzj7qb69dn149lh32c7q9161zrzfs07ncs233y0w4lg";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring containers directory filepath monoid-owns
          old-locale old-time parallel parsec regexpr template-haskell time
@@ -135023,6 +135779,7 @@ self: {
        sha256 = "1nmc03s8h3khmvajyhwaniczq0r4wrinq2sjjp1c6gyc2nggxzyx";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base directory filepath gtk mtl process template-haskell unix
        ];
@@ -135575,6 +136332,7 @@ self: {
        sha256 = "1xqydvz8riz40d4q542akyxfhfq7hbhi306pcxdvbbpczyx8napp";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base Cabal containers directory extensible-exceptions filepath hint
          mtl process QuickCheck show simple-reflect unix
@@ -135835,6 +136593,7 @@ self: {
        pname = "multiplate";
        version = "0.0.3";
        sha256 = "1gsfmw7dzsxycixqqrh5wr1g3izn7rm2a4a20nh8pp6fgn21c01c";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base transformers ];
        homepage = "http://haskell.org/haskellwiki/Multiplate";
        description = "Lightweight generic library for mutually recursive data types";
@@ -135848,6 +136607,7 @@ self: {
        pname = "multiplate-simplified";
        version = "0.0.0.2";
        sha256 = "0xzjl3nsm6wgbqd6rjn0bf9jhiw6l6ql5gj5m8xqccv8363i5v2r";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base multiplate transformers ];
        description = "Shorter, more generic functions for Multiplate";
        license = stdenv.lib.licenses.mit;
@@ -135862,6 +136622,7 @@ self: {
        sha256 = "1y0v06qnpna8sa0aw24i4s29yc49m3a7d8yrl6xiv1jrgycjcafc";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers fez-conf mtl process
        ];
@@ -135943,6 +136704,7 @@ self: {
        pname = "multisetrewrite";
        version = "0.6";
        sha256 = "1chgdikgp70rkzw2k3wy7i276j5vb435vq26yl37lkh0im1bg5ay";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base haskell98 stm ];
        homepage = "http://sulzmann.blogspot.com/2008/10/multi-set-rewrite-rules-with-guards-and.html";
        description = "Multi-set rewrite rules with guards and a parallel execution scheme";
@@ -136015,6 +136777,7 @@ self: {
        sha256 = "0s11xvhawwrcr31f0khp0q6fimwjps12n992z35ldnh0kk3dmk9z";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base blaze-html ConfigFile directory Glob happstack-server
          HStringTemplate markdown MissingH process text
@@ -136158,6 +136921,7 @@ self: {
        pname = "music-diatonic";
        version = "0.1.2";
        sha256 = "0r4ha5hv0nvfp6r142fklfnqgf0vp77fxmj7z39690l7h1ckq634";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        description = "Implementation of basic western musical theory objects";
        license = stdenv.lib.licenses.bsd3;
@@ -136215,6 +136979,7 @@ self: {
        pname = "music-parts";
        version = "1.9.0";
        sha256 = "1kiz968kcwcyczxg5gl40c7bwgkn86l7qi0ak8p68bm4rmsw9id4";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          adjunctions aeson base bytestring cassava containers data-default
          lens monadplus music-dynamics music-pitch roman-numerals semigroups
@@ -136379,6 +137144,7 @@ self: {
        sha256 = "10salrdl4vfdy3x26564i8kdv6lx8py697v5n8q9ywqsd05dcrv2";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson amqp base ghc-prim mime-mail optparse-applicative text
        ];
@@ -136856,6 +137622,7 @@ self: {
        sha256 = "0lxzn8fn97f1j3fx97f46m16y25w7m1w84l59r75xisr662gc9lz";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring clientsession heist mtl mysnapsession snap
          snap-core snap-server text time
@@ -137071,6 +137838,7 @@ self: {
        sha256 = "1a7fqyn0pvnbxzn9fiaib4pj7hq5p2qgnbdwryg70lkgnjm4y0h4";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson base bytestring ConfigFile data-default-class docopt
          fast-logger filepath http-types interpolatedstring-perl6 MissingH
@@ -137573,6 +138341,7 @@ self: {
        sha256 = "1bzccvp7g0z90jm7xd2vydjkha0960bv4s0p9w9vn7dgcc6mj63z";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring directory filepath process shelly text
        ];
@@ -137726,6 +138495,7 @@ self: {
        pname = "nbt";
        version = "0.6";
        sha256 = "0lcnxlj0cfrw840saay3lxyjmc00rxhksqa6ccyhg8119y20gcjd";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base bytestring cereal text ];
        testHaskellDepends = [
          array base bytestring cereal HUnit QuickCheck test-framework
@@ -137866,6 +138636,7 @@ self: {
        sha256 = "00zll88gk44l22lqxv47v4j5ipfapy5599ld8fcsvhk57nfcm2r0";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base bytestring cereal directory GLFW-b GLURaw OpenGLRaw
          random
@@ -137953,6 +138724,7 @@ self: {
        pname = "nemesis-titan";
        version = "2014.5.19";
        sha256 = "183m6wz52lrf5kfwxz11ad7v5zazv4gcf1c2rcylh2ys6zda4xmd";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          air air-th base bytestring directory filepath hspec HStringTemplate
          nemesis random uuid
@@ -138198,6 +138970,7 @@ self: {
        sha256 = "1dmaac0b22nycq4mar0grb2dzfff08rh9qk075h73r0an1vjh1d9";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson async base base64-bytestring bytestring cryptonite
          data-default-class directory exceptions http-client http-client-tls
@@ -138501,6 +139274,7 @@ self: {
        sha256 = "16n03lpmvf715yi9kpf3nypllvipm58jq63lya619h45b2r8i5n9";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base bytestring containers directory filepath GLFW-b GLUtil
          lens linear mtl netwire netwire-input netwire-input-glfw OpenGL
@@ -138578,6 +139352,7 @@ self: {
        pname = "network-anonymous-i2p";
        version = "0.10.0";
        sha256 = "0b7z7w105l1yd3xpnnl2z779m5zknf756cslksbbpsy16rn7kxfg";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base bytestring exceptions mtl network
          network-attoparsec network-simple text transformers uuid
@@ -138604,6 +139379,7 @@ self: {
        sha256 = "0jbm29795dznmrdkvl95v9xhj8pcmwgsdk2ngaj6zv5a9arybbj1";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base base32string bytestring exceptions hexstring
          network network-attoparsec network-simple socks text transformers
@@ -138649,6 +139425,7 @@ self: {
        pname = "network-attoparsec";
        version = "0.12.2";
        sha256 = "1w08py367mmwfg5lff6y9s6hdpg1nbjf7v6vv9s19aw6saxak44p";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base bytestring enclosed-exceptions exceptions
          lifted-base monad-control mtl network transformers
@@ -139691,6 +140468,7 @@ self: {
        pname = "newtype-th";
        version = "0.3.3";
        sha256 = "1slgphymjxzbxxgsilfijkhiwapfy2gkhkby2dxqj107v4s0788k";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base haskell-src-meta newtype syb template-haskell
        ];
@@ -140019,6 +140797,7 @@ self: {
        pname = "nix-eval";
        version = "0.3.3.0";
        sha256 = "1c8hg66s66hkn7f31ynw0km4bpdzhv0zdslzkpycvd36m3jm1wjb";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base hindent process strict ];
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        homepage = "http://chriswarbo.net/git/nix-eval";
@@ -140056,6 +140835,7 @@ self: {
        sha256 = "1zjak2py3q59mafh68ds5b9yai425hylc7p0x9ccrhid0y3rpl5y";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson ansi-terminal base bytestring classy-prelude containers curl
          data-default data-fix directory hnix lifted-base MissingH
@@ -140331,6 +141111,7 @@ self: {
        pname = "nomyx-core";
        version = "1.0.0";
        sha256 = "0cdr4k2919a8bjmqm4agpiqp9jiijldwya28ql8bg345ypfh91d2";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          acid-state aeson base blaze-html blaze-markup bytestring
          DebugTraceHelpers deepseq directory either-unwrap exceptions
@@ -140356,6 +141137,7 @@ self: {
        pname = "nomyx-language";
        version = "1.0.0";
        sha256 = "1g9rg0h2nfyc4i1hvlmmnfchz3hhh0pax5x654yqkcdhqbsh04hk";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base Boolean containers DebugTraceHelpers ghc imprevu lens
          monad-loops mtl old-locale random safe shortcut text time
@@ -140375,6 +141157,7 @@ self: {
        pname = "nomyx-library";
        version = "1.0.0";
        sha256 = "1sb47asxrqg510kgh9mxpkcmczwzcbzd90bm7nmbaas9cn1wxmql";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers ghc lens mtl nomyx-language old-locale safe
          shortcut time time-recurrence
@@ -140420,6 +141203,7 @@ self: {
        pname = "nomyx-web";
        version = "1.0.0";
        sha256 = "1nmckv3mv3zj14l7l3485lx8bw5g40psv8kn4ldg2grdsrf26z9q";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          acid-state base blaze-html blaze-markup bytestring filepath
          happstack-authenticate happstack-server hscolour HTTP http-types
@@ -140731,6 +141515,7 @@ self: {
        sha256 = "1jjk3fhzhpf9wrgk980rgp55kji5zjzdl0xyi4wgz3xvn1k8hrhs";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson attoparsec attoparsec-conduit base blaze-builder blaze-html
          blaze-markup bytestring case-insensitive conduit containers
@@ -140862,6 +141647,7 @@ self: {
        sha256 = "0gp7032dgchm3mwlzj66cpcdgndi0mj2l4xxq4k4ayflfpcwrg3a";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base containers monad-loops mtl pretty z3
        ];
@@ -140934,6 +141720,7 @@ self: {
        pname = "null-canvas";
        version = "0.2.7";
        sha256 = "1i6krgxlbdmv5md1p3n5mcw3sk24f5sk6y7yiznx8glxncxmfdll";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base containers filepath scotty split stm text transformers
          wai-extra warp
@@ -141190,6 +141977,7 @@ self: {
        sha256 = "110v2frn085pggjzl3l8wqgr4vcdd5h29x2wak2a59x16ngjg7ga";
        revision = "1";
        editedCabalFile = "0bh9zzya42dbpc5c7j7fnyphm5nndib1ycbmanplgx0b707x1sda";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base ];
        homepage = "http://www.haskell.org/haskellwiki/Numeric_Quest";
        description = "Math and quantum mechanics";
@@ -141484,6 +142272,7 @@ self: {
        sha256 = "1nlnz7mvdkhcqp4v1fyfb6r6v18xpxi0ddqqp84dsqg6ahdypc13";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base cairo containers glade glib gtk mtl parsec random
        ];
@@ -142099,6 +142888,7 @@ self: {
        sha256 = "0v11j2gz98g5ng9dsfbr7k3a2xhw2xqa1qi1q8ad53sx2yhjv0ly";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base containers directory filepath pretty time
        ];
@@ -142381,6 +143171,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "opaleye_0_5_3_1" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
+     , bytestring, case-insensitive, containers, contravariant, dotenv
+     , hspec, hspec-discover, multiset, postgresql-simple, pretty
+     , product-profunctors, profunctors, QuickCheck, semigroups, text
+     , time, time-locale-compat, transformers, uuid, void
+     }:
+     mkDerivation {
+       pname = "opaleye";
+       version = "0.5.3.1";
+       sha256 = "0hgkvvl3pn9bhiy21jxmcvvbzbsywpavwxcmvcwwnkkcdv679rvx";
+       libraryHaskellDepends = [
+         aeson attoparsec base base16-bytestring bytestring case-insensitive
+         contravariant postgresql-simple pretty product-profunctors
+         profunctors semigroups text time time-locale-compat transformers
+         uuid void
+       ];
+       testHaskellDepends = [
+         aeson base containers contravariant dotenv hspec hspec-discover
+         multiset postgresql-simple product-profunctors profunctors
+         QuickCheck semigroups text time transformers
+       ];
+       homepage = "https://github.com/tomjaguarpaw/haskell-opaleye";
+       description = "An SQL-generating DSL targeting PostgreSQL";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "opaleye-classy" = callPackage
     ({ mkDerivation, base, bytestring, lens, mtl, opaleye
      , postgresql-simple, product-profunctors, transformers
@@ -142490,6 +143308,7 @@ self: {
        sha256 = "1k9d1r1z7q6lm8fha630rg2qfmwwnr9dv2ajvqwvrki2m6i9sczn";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers directory extensible-exceptions filepath
          HTTP mtl network old-time parsec pretty process syb texmath
@@ -143360,6 +144179,7 @@ self: {
        pname = "opml-conduit";
        version = "0.6.0.1";
        sha256 = "0mc3qymh6i8w79s6spm0dnndr7aydny6fy3krfxzfm6qch4nw3yb";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base case-insensitive conduit conduit-combinators containers
          lens-simple mono-traversable monoid-subclasses safe-exceptions
@@ -143388,6 +144208,7 @@ self: {
        pname = "opml-conduit";
        version = "0.6.0.3";
        sha256 = "1flzv6v1mds7w9v3ap3g7gfwlvq54z0j1w7g2b07d17x334lyhgb";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base case-insensitive conduit conduit-combinators containers
          lens-simple mono-traversable monoid-subclasses safe-exceptions
@@ -143756,6 +144577,7 @@ self: {
        pname = "orchid";
        version = "0.0.8";
        sha256 = "1d3cfhhsv1qpiiin4cs9wxx2a6vwcj0iad746z7l1qzyxrhg4dkm";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers encoding extensible-exceptions fclabels
          filestore hscolour mtl nano-md5 parsec process QuickCheck salvia
@@ -143776,6 +144598,7 @@ self: {
        sha256 = "1gfjmakfx8244q1yqbgp2ji9bh45ll8ixvxbdd961my30j7gh29z";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base extensible-exceptions mtl network orchid Pipe salvia
          salvia-extras stm
@@ -144179,6 +145002,7 @@ self: {
        pname = "osx-ar";
        version = "0.11";
        sha256 = "1d2lna7gvygiq062p2y1zy182wv3vkr0lda49y502ad6jf483xdn";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base binary bytestring containers ];
        description = "Parser for OS X static archive format";
        license = stdenv.lib.licenses.bsd3;
@@ -144392,6 +145216,7 @@ self: {
        pname = "packed-dawg";
        version = "0.2.0.8";
        sha256 = "1z6a75i0ma7cs8hsiqz9pqwycrw61ph4rvc1w6iczbjmmjgns13r";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary deepseq mtl unordered-containers vector
          vector-binary-instances
@@ -144546,6 +145371,7 @@ self: {
        sha256 = "1wzfsindjxx61nca36hhldy0y33pgagg506ls9ldvrkvl4n4y7iy";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring conduit conduit-extra directory process resourcet
          safe terminfo text transformers unix
@@ -144685,6 +145511,7 @@ self: {
        pname = "panda";
        version = "2009.4.1";
        sha256 = "0yn6ia1pql5fvj784a57ym74n5sd08n1g9djgapllw9lkf6r7hv7";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base cgi containers data-default directory filepath gravatar
          haskell98 hcheat kibro MissingH mps network old-locale old-time
@@ -144718,6 +145545,7 @@ self: {
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson array base base64-bytestring binary blaze-html blaze-markup
          bytestring cmark containers data-default deepseq directory
@@ -144762,6 +145590,7 @@ self: {
        editedCabalFile = "00cvvdiwpl8cw840smdfxbdnmmjf4m86nck344a797iv9rmvdq0j";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring containers data-default directory filepath
          hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051
@@ -144796,6 +145625,7 @@ self: {
        sha256 = "10x7rpz48611696fw7h9m62qm1y9qxzvrc2jk0b9h840mn08n0s9";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring containers data-default directory filepath
          hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051
@@ -144847,6 +145677,7 @@ self: {
        sha256 = "14c4nbibx4qbi7pvycaf3q12hpj4s02wdg5pl23z2b4f8jz3pnfl";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers data-accessor data-accessor-template
          data-accessor-transformers data-default directory filepath mtl
@@ -144872,6 +145703,7 @@ self: {
        sha256 = "12692c1lpp4pz08x1b9yxanpki5sxb5h9373vjp9af88rykqykl1";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base csv pandoc pandoc-types text ];
        executableHaskellDepends = [ base csv pandoc pandoc-types ];
        homepage = "https://github.com/baig/pandoc-csv2table-filter";
@@ -144908,6 +145740,7 @@ self: {
        sha256 = "1hv8jw6aymlx6hvm1xq9ccsh2vi1y340xnhrysglpggvarim3dnd";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base directory pandoc pandoc-types text
        ];
@@ -144982,6 +145815,7 @@ self: {
        sha256 = "0y8mz2jgnfzr8ib7w4bfwwdsljs3a2qpq3pxgvl2jwi7wdrcslai";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson base bytestring explicit-exception http-conduit pandoc-types
          spreadsheet utf8-string
@@ -145098,6 +145932,7 @@ self: {
        sha256 = "0cnz4n2vywj4w9cnj7kh6jml6k29li9wnaifnwn69b6883043iwm";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring containers IfElse mtl SDL SDL-gfx SDL-ttf
          transformers Yampa
@@ -145116,6 +145951,7 @@ self: {
        pname = "pango";
        version = "0.13.3.1";
        sha256 = "1frzcgqa1f1i3bk0q229vy8y6gsi423s8hfqvnr56h7ys8blysih";
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal filepath gtk2hs-buildtools ];
        libraryHaskellDepends = [
          array base cairo containers directory glib mtl pretty process text
@@ -146481,6 +147317,7 @@ self: {
        pname = "passage";
        version = "0.1";
        sha256 = "11qrm27a1fn8p8z0q1400nd30sblm8pcn6znz4syg9jkmqhpn8ig";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base containers directory filepath GraphSCC monadLib
          mwc-random pretty primitive process random
@@ -146575,6 +147412,7 @@ self: {
        pname = "patch-combinators";
        version = "0.2.2";
        sha256 = "007bxr6xfqjmbx4b9k3n3qw7jmrn298v8cqxvycfhy5924l9jyi6";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        description = "A library for patching functions and data structures";
        license = stdenv.lib.licenses.bsd3;
@@ -147077,6 +147915,7 @@ self: {
        pname = "pcf";
        version = "0.1.0.1";
        sha256 = "1dmp9afylsf4n7gxa23wn25w8h89lqyhjlxa5g7gshrbwxkx7c55";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bound c-dsl containers monad-gen mtl prelude-extras
          transformers void
@@ -147421,6 +148260,7 @@ self: {
        pname = "pdynload";
        version = "0.0.3";
        sha256 = "0949nzk85fp9vs6v90cd6kxgg52pcaz2mfahv7416qpgp65hpw93";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base directory filepath ghc ghc-paths old-time process
        ];
@@ -147481,6 +148321,7 @@ self: {
        sha256 = "110i4y93gm6b76and12vra8nr5q2dz20dvgpbpdgic3sv2ds16k0";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base Cabal cmdargs containers deepseq derive grm mtl shake
          syb uniplate wl-pprint
@@ -147500,6 +148341,7 @@ self: {
        pname = "pecoff";
        version = "0.11";
        sha256 = "0vb22jfl309k4a6b80015cyrs5cxls7vyf8faz7lrm7i0vj0vz1q";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base binary bytestring containers ];
        description = "Parser for PE/COFF format";
        license = stdenv.lib.licenses.bsd3;
@@ -147573,6 +148415,7 @@ self: {
        pname = "pem";
        version = "0.2.2";
        sha256 = "162sk5sg22w21wqz5qv8kx6ibxp99v5p20g3nknhm1kddk3hha1p";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base base64-bytestring bytestring mtl ];
        testHaskellDepends = [
          base bytestring HUnit QuickCheck test-framework
@@ -148549,6 +149392,7 @@ self: {
        sha256 = "12cwmjszbbqrd1f21jvwvp026ja3377c3p0wfrbrl34g23gnysgp";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base process ];
        homepage = "http://www.cs.chalmers.se/~aarne/pesca/";
        description = "Proof Editor for Sequent Calculus";
@@ -148567,6 +149411,7 @@ self: {
        pname = "peyotls";
        version = "0.1.6.10";
        sha256 = "0x1qrh1nz3fr662701d8r7l23flwiv6az2wwcx48bp0vrk08lwww";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          asn1-encoding asn1-types base bytable bytestring cipher-aes
          crypto-numbers crypto-pubkey crypto-pubkey-types crypto-random
@@ -148630,6 +149475,7 @@ self: {
        sha256 = "0ax6ch87jqbcy5il17n0kppy8pn44rj6ljksamh61sg438vcdhqf";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring HTTP ];
        executableHaskellDepends = [
          async base ini postgresql-simple random scotty text transformers
@@ -148662,6 +149508,7 @@ self: {
        sha256 = "0cfyjczs29qksh8kiyq256wv26yvw4ph7p0cvz5hnfjfjpj6r963";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          async base ini postgresql-simple random scotty text transformers
        ];
@@ -148934,6 +149781,7 @@ self: {
        sha256 = "0s2m9y7zb0219dz547z5d4plgrnaqvwzsbvm5cw7mv8dq043zdf3";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring Cabal cmdargs conduit conduit-extra ConfigFile
          containers directory filepath gtk3 hslogger HStringTemplate
@@ -148973,6 +149821,7 @@ self: {
        pname = "phone-metadata";
        version = "0.0.1.5";
        sha256 = "0zn98kf23rn9ay9n4gd2v2jpafppz6r2kxk5m9na6xm437gx5xmb";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers hxt regex-pcre text ];
        testHaskellDepends = [ base hspec ];
        description = "Phonenumber Metadata - NOTE: this is now deprecated!";
@@ -149125,6 +149974,7 @@ self: {
        sha256 = "1w5krkss2qzzcqqmgqs369p5xnqyrm76vvsxd7mlhcdqaaj06n2q";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          AES base binary byteable bytestring containers cryptohash HTTP
          io-streams mtl network parsec RSA transformers
@@ -149170,6 +150020,7 @@ self: {
        sha256 = "0120zkza698ww8ng6svp54qywkrvn35pylvcgplfldw4ajln00vn";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring clock deepseq text unix unordered-containers
        ];
@@ -149372,6 +150223,7 @@ self: {
        sha256 = "0rsc2anh20hlr2dfyh07dyrrfns0l1pibz6w129fp5l8m6h3xjin";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base mtl parsec text ];
        homepage = "http://www.mew.org/~kazu/proj/piki/";
        description = "Yet another text-to-html converter";
@@ -149466,6 +150318,7 @@ self: {
        sha256 = "1hmbhgnrq894jnm7gy6yc812nysvkrbjk6qqjmk7g7fsj46xpdfg";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring editor-open Hclip safe
        ];
@@ -149658,6 +150511,7 @@ self: {
        pname = "pipes-bzip";
        version = "0.2.0.4";
        sha256 = "12mhs3ylqqkp4dvir67lgwg3izma88j5xpi7fc7jlvlka24vbnkp";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bindings-DSL bytestring data-default mtl pipes pipes-safe
        ];
@@ -150572,6 +151426,7 @@ self: {
        sha256 = "1mz4cfhg8y7cv38ir2lzl7b2p1nfm8c4syvgzz4b9j98dxg694xz";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring containers haskeline haskeline-class mpppc
          mtl parsec text utf8-string
@@ -150914,6 +151769,7 @@ self: {
        pname = "plist";
        version = "0.0.6";
        sha256 = "0xsx1pvlnqyidpvswisir9p9054r7fczi81nccflazijn3pr9rgb";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base base64-bytestring bytestring hxt ];
        description = "Generate and parse Mac OS X property list format";
        license = stdenv.lib.licenses.bsd3;
@@ -151014,6 +151870,7 @@ self: {
        pname = "plot-gtk-ui";
        version = "0.3.0.2";
        sha256 = "1nhq0l687dhphnxkd0zh3z96551b91d7js625l4fyn40g5099s77";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base cairo colour fixed-vector gtk hmatrix plot text vector
        ];
@@ -151045,6 +151902,7 @@ self: {
        sha256 = "1qa5mxq9j5m5zbvzsmrzg8jb9w9v8ik50c8w5ffddcrrqb9b8mcq";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base colour gtk hmatrix plot text vector
        ];
@@ -151064,6 +151922,7 @@ self: {
        sha256 = "0zwp8n9xx1ljh65as4s6lqj4a3nrz3hfg53x8zcba96ic9jkadn0";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base blaze-svg colour palette scientific text time
        ];
@@ -151272,6 +152131,7 @@ self: {
        pname = "pngload";
        version = "0.1";
        sha256 = "1j8zagi5xcb4spvq1r0wcnn211y2pryzf0r8z7h70ypqak7sy6ps";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring haskell98 mtl parsec zlib
        ];
@@ -151286,6 +152146,7 @@ self: {
        pname = "pngload-fixed";
        version = "1.0";
        sha256 = "02ikfn7kl8jx5iffa2pv0n1z1c75qcg9aq94nrccfdp532wxr7bx";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base bytestring mtl parsec zlib ];
        description = "Pure Haskell loader for PNG images";
        license = stdenv.lib.licenses.bsd3;
@@ -152083,6 +152944,7 @@ self: {
        pname = "pop3-client";
        version = "0.1.4";
        sha256 = "0kfcfxfwg5rjm7qx9r0ssdvkrvca95hflahrip1hi5wbplf224xv";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base mtl network ];
        homepage = "https://github.com/tmrudick/haskell-pop3-client/";
        description = "POP3 Client Library";
@@ -152095,6 +152957,7 @@ self: {
        pname = "popenhs";
        version = "1.0.0";
        sha256 = "01pb8g5zl99zccnjnkwklfgaz1pqjp1xrgz5b3qy45nclyln0bm4";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory haskell98 unix ];
        homepage = "http://www.haskell.org/~petersen/haskell/popenhs/";
        description = "popenhs is a popen-like library for Haskell";
@@ -152111,6 +152974,7 @@ self: {
        pname = "poppler";
        version = "0.14.1";
        sha256 = "1djx8qj68md11kdgcljd7mq3bidw6ynh9mwfxm9bj7kr2h57lmsv";
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          array base bytestring cairo containers glib gtk mtl
@@ -152606,6 +153470,7 @@ self: {
        sha256 = "0kxg5z0s82ipcmynpxisq0a3rbhg630rk0xgyrqjcimxh7094n2y";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring bytestring-builder directory
          filepath ghc-prim mtl old-locale postgresql-simple process text
@@ -152663,6 +153528,7 @@ self: {
        sha256 = "1xhaqxc389dghf77hlz6zy6pa6phxv8by42lzs91ymjhvwhnb7bl";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base basic-prelude postgresql-simple shelly text
        ];
@@ -153314,6 +154180,7 @@ self: {
        sha256 = "071arrk0wir2lwziw6p3cbq6ybjdf3gfc4d25sh21gpnk10ighp2";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring data-default directory json mps
        ];
@@ -153930,6 +154797,7 @@ self: {
        sha256 = "1kbx72ybrpw0kh5zsd2kdw143qykbmd9lgmsvj57659y0k5l7fjm";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base filepath ghc-prim haskell-lexer pretty
        ];
@@ -154242,6 +155110,7 @@ self: {
        sha256 = "0hh13i0idpwv509zavg92wwvp3s20vc1ivz7vfwa4kxp0h21phs9";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base ConfigFile containers directory happstack happstack-helpers
          happstack-server happstack-state hsp MissingH mtl old-locale
@@ -154263,6 +155132,7 @@ self: {
        sha256 = "0j3xjlwvix81zxd38540jwb3vp438d72gmfxdhbypyi5f1qgx01x";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base ConfigFile directory HTTP mtl network parsec utf8-string XMPP
        ];
@@ -154431,6 +155301,7 @@ self: {
        pname = "probability";
        version = "0.2.5.1";
        sha256 = "0bgdyx562x91a3s79p293pz4qimwd2k35mfxap23ia6x6a5prrnk";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers random transformers utility-ht
        ];
@@ -154834,6 +155705,7 @@ self: {
        sha256 = "104frg0czfk4rgjxyf0xz7100j3y9ndvf01jgv3yibaq98v2h64r";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers filepath haskell-src-exts semigroups uniplate zenc
        ];
@@ -154873,6 +155745,7 @@ self: {
        sha256 = "1swsy006axh06f1nwvfbvs3rsd1y1733n6b3xyncnc6vifnf7gz2";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson base bytestring containers filepath ghc-prof js-jquery
          scientific text unordered-containers vector
@@ -155364,8 +156237,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "4.5.2";
-       sha256 = "15bs8l7i7m4s0h3mb3cc1frq60s96qnfmmvb0blyvjk6ydsi5qrx";
+       version = "4.6.0";
+       sha256 = "1m5i9fbvckrrl26pirh776pfyg7a0ih42vrxqh6bsxyrfjqhzv11";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -155722,6 +156595,7 @@ self: {
        pname = "protocol-buffers-descriptor";
        version = "2.4.2";
        sha256 = "0r7n1pnkabzksik9zrqif490g135hcjgvc40zm5c0b3dpq64r4lb";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers protocol-buffers
        ];
@@ -155738,6 +156612,7 @@ self: {
        pname = "protocol-buffers-descriptor-fork";
        version = "2.0.16";
        sha256 = "1wn6yqs70n26j6z44yfmz4j4rwj2h1zfpysn56wzaq7bwsdb0bqb";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers protocol-buffers-fork
        ];
@@ -155806,6 +156681,7 @@ self: {
        pname = "proton-haskell";
        version = "0.7";
        sha256 = "1gn4h8xprq8gkngccyqbbqn8nidwlczlwckxzjgnb190yy3kd7hi";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers directory filepath ];
        testHaskellDepends = [
          base containers directory filepath HUnit test-framework
@@ -156041,6 +156917,7 @@ self: {
        sha256 = "1svyfvpqarmfy634s61l1pg7wc9y35bn753zq3vs1rvbw9lmxpj5";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring hedis optparse-generic pipes pipes-bytestring text
        ];
@@ -156187,6 +157064,7 @@ self: {
        sha256 = "0pqqcs3plrhq6474j29lnwvc6fhr1wskb0ph8x64gzv9ly52dc9i";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring containers directory MissingH
          random-fu safe text time vector
@@ -156233,6 +157111,7 @@ self: {
        sha256 = "0y1y2fbawbypzzrqdj66vh7f7xc6a9bb82bhdmrj5axmi6c5nn0h";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers hashable hashtables HsSyck mtl old-time
          pretty random stm utf8-string
@@ -156252,6 +157131,7 @@ self: {
        pname = "pugs-HsSyck";
        version = "0.41";
        sha256 = "108dfhd83yzmlhbgff6j0a40r6vx9aq9dcdd8swk4yib9gbvsrp1";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring ];
        description = "Fast, lightweight YAML loader and dumper";
        license = "unknown";
@@ -156907,6 +157787,7 @@ self: {
        sha256 = "04sibf7rpr2dyxn943nbl8jzzy7zcf5ic0najgy1kmrl5n4v7p02";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base containers diagrams-lib diagrams-svg filepath hashable
          linear mtl optparse-applicative parsec SVGFonts text
@@ -157053,6 +157934,7 @@ self: {
        sha256 = "1q45l1grcja0mf1g90yxsdlr49gqrx27ycr6vln4hsqb5c0iqcfw";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base containers mtl parsec ];
        homepage = "http://community.moertel.com/ss/space/PXSL";
        description = "Parsimonious XML Shorthand Language--to-XML compiler";
@@ -157167,6 +158049,7 @@ self: {
        pname = "qed";
        version = "0.0";
        sha256 = "1klsh6hvbvphhf3nr21856hqfcc4ysbrl6sz2z9rvvvpwbl24918";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base deepseq directory exceptions extra filepath haskell-src-exts
          transformers uniplate
@@ -157279,6 +158162,7 @@ self: {
        pname = "qrcode";
        version = "0.1.2";
        sha256 = "1wfnxlz6rqjcgnkaqq0wdn75jsh3b9hagb84c1ljnwqaw98n3a9d";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base containers mtl vector ];
        description = "QR Code library in pure Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -157510,6 +158394,7 @@ self: {
        sha256 = "16qk4m6jgf4phmc0zxw11as9rlvspxpqza5k318bra9f9ybn253y";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson ansi-terminal ansigraph base bytestring directory
          http-conduit terminal-size text
@@ -157553,6 +158438,7 @@ self: {
        sha256 = "0zw15qym8r00m7kir9h9cys1rmszdqihfcvy6dw52f1pb6cp5vsx";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring cmdargs cond containers directory iproute
          MissingH network safe scotty text transformers wai wai-extra
@@ -158427,6 +159313,7 @@ self: {
        sha256 = "1yha2rsphq2ar8c7p15dlg621d4ym46xgv70fga9mlq2r4zwy2lv";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-terminal async base bytestring containers directory dlist
          exceptions filepath hex mtl network network-simple parsec process
@@ -158638,6 +159525,7 @@ self: {
        sha256 = "0jjsa21a7f4hysbk9qvcxyyc2ncrmmjh02n7yyhjnfjgdp4sclwb";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers llvm-general llvm-general-pure mtl
        ];
@@ -158813,6 +159701,7 @@ self: {
        pname = "rallod";
        version = "0.0.1";
        sha256 = "14fnk2q702qm0mh30r9kznbh4ikpv4fsd5mrnwphm5d06vmq6hq9";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base haskell98 ];
        homepage = "http://github.com/moonmaster9000/rallod";
        description = "'$' in reverse";
@@ -159944,6 +160833,7 @@ self: {
        sha256 = "0q7b990k3ijjjwhnm1283k9vzmvypyg7mhvbzagvi74q0sgwyac7";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base bio bytestring containers ];
        homepage = "http://malde.org/~ketil/";
        description = "Mask nucleotide (EST) sequences in Fasta format";
@@ -160145,6 +161035,7 @@ self: {
        pname = "react-haskell";
        version = "2.0.1";
        sha256 = "0kjbicrvriliy50gy82b7rsrfk5p3iv20wwnhiaq9i16mbh2zj8j";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base deepseq lens-family monads-tf text transformers
          unordered-containers void
@@ -160322,6 +161213,7 @@ self: {
        sha256 = "1fb0bq7rcxsnga2hxh94h2rpp4kjh383z06qgk36m49pyvnbnl9a";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base reactive-banana threepenny-gui ];
        homepage = "http://haskell.org/haskellwiki/Reactive-banana";
        description = "Examples for the reactive-banana library, using threepenny-gui";
@@ -160338,6 +161230,7 @@ self: {
        configureFlags = [ "-f-buildexamples" ];
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base cabal-macosx reactive-banana wx wxcore
        ];
@@ -161407,6 +162300,7 @@ self: {
        pname = "reflection-without-remorse";
        version = "0.9.5";
        sha256 = "1iz4k42hc8f11a6kg2db847zmq5qpfiwns1448s62jswc2xm0x0r";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base type-aligned ];
        homepage = "https://github.com/atzeus/reflection-without-remorse";
        description = "Efficient free and operational monads";
@@ -162105,6 +162999,7 @@ self: {
        sha256 = "0kcxsdn5lgmpfrkpkygr54jrnjqd93b12shb00n6j00rg7p755vx";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base bytestring containers mtl regex-base regex-posix
        ];
@@ -162195,6 +163090,7 @@ self: {
        sha256 = "1b9cca3l46qxvc5ck3z27dg6w1888pabkk0q752bzjqr3fc4nidc";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base bytestring containers mtl regex-base regex-tdfa
        ];
@@ -162291,6 +163187,7 @@ self: {
        sha256 = "0hjj4p44zhl4iazw8ivaxldvrghbdfqabkf8d6shb4mw4r0xdqbx";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base containers data-default parsec regex-base regexdot
          toolshed
@@ -162358,6 +163255,7 @@ self: {
        pname = "regexpr-symbolic";
        version = "0.5";
        sha256 = "1cpwvb5mmcaqwy617m6cr25pcb4v4yxwzxng82bcrwkhjfdklsdr";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        homepage = "http://sulzmann.blogspot.com/2008/12/equality-containment-and-intersection.html";
        description = "Regular expressions via symbolic manipulation";
@@ -162615,6 +163513,7 @@ self: {
        sha256 = "1bl4yv77i8c4w1y5lqr6b8xi1m4ym2phvdjwc9l95rx1vrxkqpk1";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ghc ];
        executableHaskellDepends = [ base ghc ];
        homepage = "http://www.cs.mu.oz.au/~bjpop/code.html";
@@ -162929,6 +163828,7 @@ self: {
        editedCabalFile = "10d2p9pdplwhavfimsa893wzcps7fhfaxgcqwblrqm5xmybc3825";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson async base bytestring Cabal containers data-default directory
          filepath ghcid http-types mime-types process scotty text
@@ -163721,6 +164621,7 @@ self: {
        sha256 = "1g7b431hq6cqmckq3hlnf56qn1a9zbpid19c7vw6vh0y5xi5ckp6";
        revision = "3";
        editedCabalFile = "1lqspa275mq04chvz6pvjkrlxkd9gscaxy2rcsj5wy0123x1azxp";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson authenticate-oauth base blaze-builder bytestring
          case-insensitive connection data-default-class http-api-data
@@ -163748,6 +164649,7 @@ self: {
        pname = "req";
        version = "0.3.1";
        sha256 = "0qg2773h247ahicz1051zrpc6aqf6zdqyrlp8q274l3qg5q1l03a";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson authenticate-oauth base blaze-builder bytestring
          case-insensitive connection data-default-class http-api-data
@@ -164214,6 +165116,7 @@ self: {
        sha256 = "0hnmd37c6n61gkqi3assspkmh15q93id7yaq30vp65zr6rhliac1";
        revision = "8";
        editedCabalFile = "1x18sva575kcg9gg4brf17zbvvkzs0qi2rgkab5ijr4pnmhpwc62";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base base-compat blaze-html Cabal code-builder directory
          fclabels filepath hashable haskell-src-exts HStringTemplate hxt
@@ -164644,6 +165547,7 @@ self: {
        pname = "rex";
        version = "0.5.2";
        sha256 = "0xliw2glqyfr9cvi50rvb0frhmp3ysri9glx3c8x96rkf0xg27kf";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers haskell-src-exts haskell-src-meta
          pcre-light template-haskell
@@ -164663,6 +165567,7 @@ self: {
        sha256 = "122hca6whzxqk3x7207k4clrrl2awy96pafq0gjwddqicny41jza";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring containers datetime HTTP json mtl nano-md5 xhtml
        ];
@@ -164731,6 +165636,7 @@ self: {
        sha256 = "08ddm1pxi7qdjz2mgvjvwdgxyskvac4ahi3jp2fd8z1sh68c7x7s";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base call containers lens mtl objective split
        ];
@@ -164813,6 +165719,7 @@ self: {
        pname = "ridley";
        version = "0.3.1.2";
        sha256 = "15hc1j0bkdb0wbivxl73rgrk4hl598d96yv0fhpsgls74alarniq";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          async base containers ekg-core ekg-prometheus-adapter inline-c
          katip microlens microlens-th mtl process prometheus raw-strings-qq
@@ -165987,6 +166894,7 @@ self: {
        sha256 = "0x40j5rk8v61wzhcj730g75a97ikki7j22dfrh4z873b6mxwfh4k";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          appar base blaze-builder bytestring c10k containers dns domain-auth
          hslogger iproute parsec unix
@@ -166557,6 +167465,7 @@ self: {
        sha256 = "1ildbmnpdh8x25m6kjdc6506cjgngjmjhvrdfkrcwg5cdqcqs266";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base binary bytestring parsec ];
        testHaskellDepends = [
          base binary bytestring parsec QuickCheck test-framework
@@ -166751,6 +167660,7 @@ self: {
        pname = "safe-length";
        version = "0.1.0.0";
        sha256 = "0yc9q5p7w955ywglvz6mhbpgqd3d39j91v994y3k25xrlbj5a494";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base hspec hspec-core QuickCheck should-not-typecheck
@@ -167092,6 +168002,7 @@ self: {
        sha256 = "0sfvx7hj0z2g57gs6l1s078z3a34hfgm4pfcb1qr1pvbc8lj3f1h";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base c10k fclabels filestore monads-fd network salvia salvia-extras
          salvia-protocol salvia-sessions salvia-websocket stm threadmanager
@@ -167632,6 +168543,7 @@ self: {
        sha256 = "0zlf683rgpn8dcm1wrwy01s2i35px0rlhprw713jl5kic2wp3p4j";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array async base base-compat containers crackNum
          data-binary-ieee754 deepseq directory filepath ghc mtl old-time
@@ -167659,6 +168571,7 @@ self: {
        pname = "sbv";
        version = "7.0";
        sha256 = "1jqgzqhmcx015ja8nwpswq6akw9vrabmhhf709vfirgd9q8pgnjc";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array async base containers crackNum data-binary-ieee754 deepseq
          directory filepath generic-deriving ghc mtl pretty process
@@ -167702,6 +168615,7 @@ self: {
        pname = "sc3-rdu";
        version = "0.15";
        sha256 = "0zrd9w3s535b2dpnmmrfg4i6jd9f4nh338x1cbggcw3pjyv8gk30";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base hsc3 hsc3-db ];
        homepage = "http://rd.slavepianos.org/t/sc3-rdu";
        description = "Haskell bindings to sc3-rdu (sc3 rd ugens)";
@@ -167873,6 +168787,7 @@ self: {
        sha256 = "0dh23v8kx2qnf392afznv3iixvwr4220my9nnlxgz1mhn77d51ln";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          ansi-terminal base bytestring mtl optparse-applicative scrypt
          vector
@@ -168059,6 +168974,7 @@ self: {
        editedCabalFile = "0ddlmg6f7y70f1yi351q1d46mgxzs8h53969jmhdhj6al860grxv";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base base64-bytestring binary blaze-html blaze-markup
          bytestring containers data-default directory extensible-exceptions
@@ -168099,6 +169015,7 @@ self: {
        editedCabalFile = "065ij08gi9ymyqqa7lmj5d57zqk4rax72kzhm2qbvn00h3g6d81k";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring containers data-default directory filepath
          hs-bibutils mtl old-locale parsec rfc5051 scholdoc scholdoc-types
@@ -168246,6 +169163,7 @@ self: {
        sha256 = "1ihq538ym6hh099p0h9p1ngjsq3a9h9k5ssnwyr4bqhlmv8xam0i";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base Cabal containers directory filepath ghc ghc-paths ghc-syb
          hslogger json multiset time uniplate
@@ -168339,6 +169257,7 @@ self: {
        sha256 = "0dhpyf0kh6qrrcyr3iwp3i3rkj5vcl7k7aa9qmxq2qq1f6dhw4p6";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base cairo gtk MonadCatchIO-transformers mtl old-locale scope time
          zoom-cache
@@ -168613,6 +169532,7 @@ self: {
        editedCabalFile = "0aasfcbs8cc729xvwnk8hgskv2sxg6c928gf8jifadgwgsqwahfr";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base scotty text transformers ];
        executableHaskellDepends = [ base scotty text transformers ];
        license = stdenv.lib.licenses.mit;
@@ -168652,6 +169572,7 @@ self: {
        sha256 = "035jpwp58l70jd0dklx5rg0sm8b2bd5r1m726dbhhlv60w6bdfn3";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base binary containers deepseq directory mtl packed-dawg
          parallel split
@@ -168788,6 +169709,7 @@ self: {
        sha256 = "0c4djdr2lq6kbi726zmjicscsc2ksj4l787pzyj5lfbl9c11fb6j";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base cmdargs containers directory filepath json mtl parsec
          pretty process safe tagsoup time uniplate utf8-string
@@ -168845,6 +169767,7 @@ self: {
        sha256 = "1164g29vb77kn5xdl71fsv95kf1h59gq8jhszyj3jrckv3x86fjs";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring exceptions linear StateVar text transformers vector
        ];
@@ -168858,8 +169781,8 @@ self: {
     ({ mkDerivation, base, cairo, linear, mtl, random, sdl2, time }:
      mkDerivation {
        pname = "sdl2-cairo";
-       version = "0.1.0.2";
-       sha256 = "11jaf13wklxbd5ndbwpbimnjwgf8k4wd7dbc979ng4j3qb0asdp5";
+       version = "0.1.0.3";
+       sha256 = "1lw5d8hk97h26sxq1bq0ha56s1pi0zsyw60di41w92a4xrx8z2nf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base cairo linear mtl random sdl2 time ];
@@ -169194,6 +170117,7 @@ self: {
        sha256 = "0qrb2g7dfhh2m3hwp39xlimbc3kinww279a58pah738gqnhmayrs";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers ];
        executableHaskellDepends = [ base containers ];
        homepage = "http://github.com/pgavin/secdh";
@@ -170099,6 +171023,7 @@ self: {
        pname = "sequence";
        version = "0.9.8";
        sha256 = "0ayxy0lbkah90kpyjac0llv6lrbwymvfz2d3pdfrz1079si65jsh";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers transformers ];
        homepage = "https://github.com/atzeus/sequence";
        description = "A type class for sequences and various sequence data structures";
@@ -170145,6 +171070,7 @@ self: {
        sha256 = "1dcinp03kbj94kw1lkkyz0gh4k7nw96l9c9782v0sdq0v5i525j9";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base binary bytestring containers mtl nlp-scores pretty split
          text vector
@@ -172664,6 +173590,7 @@ self: {
        sha256 = "19blk6nzbsm9syx45zzlmqxq1mi2prv0jq12cf83b4kf4pvwk32n";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base bytestring containers dlist ghc-prim mtl vector
        ];
@@ -172927,6 +173854,7 @@ self: {
        sha256 = "0z43hlgzklynb0y9b6bz2qmr2590v5nfp241i8b3rq7flb5lhlmp";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson async base binary bytestring conduit-combinators
          conduit-extra containers cryptohash HsOpenSSL iproute network
@@ -172991,6 +173919,7 @@ self: {
        sha256 = "1fxi4vl6fffq0h84rxd9cqik58mj8jk7gmspm9vkjmp97j1hslh5";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary bytestring deepseq directory extra filepath hashable
          js-flot js-jquery process random time transformers unix
@@ -173287,6 +174216,7 @@ self: {
        pname = "shana";
        version = "2009.12.1";
        sha256 = "0fg16nbi0r0pdd3sfabzdz1f4595x3hz3b4pxfwy8l78p8lppv0y";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory regex-posix ];
        homepage = "http://github.com/nfjinjing/hack/tree/master";
        description = "treat haskell functions as unix pipes";
@@ -173528,6 +174458,7 @@ self: {
        sha256 = "0xyarxm2hs8yypmz8w4zbnjvv5xl9dd657j7j3a82gbghsb93vyy";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        homepage = "http://gnu.rtin.bz/directory/devel/prog/other/shell-haskell.html";
@@ -173948,6 +174879,7 @@ self: {
        sha256 = "1gpjb8lw5zmnsd8ic739j91iqsv9a707nd9j5mbnhq6gilk61nrh";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base glade gtk random ];
        description = "A simple gtk based Russian Roulette game";
        license = stdenv.lib.licenses.bsd3;
@@ -174108,6 +175040,7 @@ self: {
        sha256 = "1m0f5n2dz02mvd2hlsv3gdq8y4xqba7dmyqn2x123sbvm9yvj584";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base cairo containers directory fgl filepath glib gtk hxt mtl
          parsec process text unix
@@ -174130,6 +175063,7 @@ self: {
        pname = "sifflet-lib";
        version = "2.2.1";
        sha256 = "1snaq0vlsk4r2lbg2sk389ppwnz22mqwhf1lgwjh3cg91ab905n4";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base cairo containers directory fgl filepath glib gtk hxt mtl
          parsec process unix
@@ -174286,6 +175220,7 @@ self: {
        sha256 = "05069qjgzm4j22p0q6i75qpsvzpw52b7bh2x2b6jcxnlvqp6flzg";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base base64-bytestring blaze-builder bytestring directory
          filepath http-types mime-types monad-control mtl simple-templates
@@ -175057,6 +175992,7 @@ self: {
        pname = "simpleargs";
        version = "0.2.1";
        sha256 = "1grjjpb3397wnr6sd0bn679k9pfg1zlm61350zd2gj5yq6pshl6p";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        homepage = "http://malde.org/~ketil/simpleargs";
        description = "Provides a more flexible getArgs function with better error reporting";
@@ -175222,6 +176158,7 @@ self: {
        sha256 = "0i60ksi5xc0d0rg5xzhbdjv2f3b5jr6rl9khn9i2b1n9sh1lv36m";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base bio bytestring random ];
        homepage = "http://malde.org/~ketil/";
        description = "Simulate sequencing with different models for priming and errors";
@@ -175379,6 +176316,7 @@ self: {
        sha256 = "1wq5dan30ggjgmravy92ylqjvjv1q7mxrmddr7zc8h6aqr0wx0fg";
        revision = "1";
        editedCabalFile = "1q2dy0ywngm9iv7k6d9gnf860m9hpf62q5qvdzmxw5s629gk4afn";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring cpu ];
        testHaskellDepends = [
          base bytestring QuickCheck test-framework
@@ -176341,6 +177279,7 @@ self: {
        sha256 = "0dxw4jgmwcz92n2rymdrfaz1v8lc2wknql9ca5p98jc14l8c2bl3";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base haskell98 pretty unix utf8-string
        ];
@@ -176400,6 +177339,7 @@ self: {
        pname = "smoothie";
        version = "0.4.2.7";
        sha256 = "1cnyckmwqj0caw2vcbmvzha8hs1207pq11mlmwpk2w6qccs1qml4";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ aeson base linear text vector ];
        homepage = "https://github.com/phaazon/smoothie";
        description = "Smooth curves via several interpolation modes";
@@ -176858,6 +177798,7 @@ self: {
        sha256 = "15744qmp48qn67n8w2nxxqxfh5rjlg328psl58whb8q5m6grgv3n";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base blaze-builder blaze-html bytestring case-insensitive
          configurator containers data-default digestive-functors
@@ -177071,6 +178012,7 @@ self: {
        pname = "snap-utils";
        version = "0.1.2";
        sha256 = "1kr09fj1jfs6sfmca51k0gwn4acya70s9irzay9yf5b9yyvka391";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring heist http-types MonadCatchIO-transformers mtl snap
          snap-core text xmlhtml
@@ -177125,6 +178067,7 @@ self: {
        pname = "snaplet-actionlog";
        version = "0.2.0.1";
        sha256 = "177a1b9fvlqh59hd9b5y92lq8yxv14jh79aadkyhxb4i0l5rl9vv";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base blaze-builder bytestring digestive-functors
          digestive-functors-heist digestive-functors-snap errors heist
@@ -177146,6 +178089,7 @@ self: {
        pname = "snaplet-amqp";
        version = "1.1.0.0";
        sha256 = "01qw28paifysk402lpb7y8dyhf401ls1l0dcn6fiigvczwxzmk91";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          amqp base bytestring configurator lens monad-control mtl network
          resource-pool snap transformers
@@ -177185,6 +178129,7 @@ self: {
        pname = "snaplet-coffee";
        version = "0.1.0.2";
        sha256 = "1kxxnk8m9154sallhy3rf8nmz0qkvchh8m761jgzhfbnnwlznpnf";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring configurator directory filepath haskell-coffee mtl
          snap snap-core
@@ -177240,6 +178185,7 @@ self: {
        sha256 = "01s2mj5vml5k9q0x291snhzhdpilb37ksvhavxjf0fz0j3na7acp";
        revision = "1";
        editedCabalFile = "06c6psa499aiz4nqwps1q6nw6imgkbcn0vird2b20kzi79lj7wsq";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring configurator directory fay filepath mtl snap
          snap-core transformers
@@ -177275,6 +178221,7 @@ self: {
        pname = "snaplet-hasql";
        version = "1.0.2";
        sha256 = "08gx096vg0swjc7z10nzlqsnjlr43cp190q4krkf08jb54ln3kcv";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring clientsession configurator hasql
          hasql-backend lens mtl snap text time
@@ -177332,6 +178279,7 @@ self: {
        pname = "snaplet-hslogger";
        version = "1.0.0.2";
        sha256 = "15cvpiz3p1qhb80sgz61mabvkb8h6j713jrny6mbg6qj945jbb0x";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base configurator hslogger mtl snap transformers
        ];
@@ -177375,6 +178323,7 @@ self: {
        pname = "snaplet-influxdb";
        version = "1.0.1.1";
        sha256 = "1dv800rclzl0b251bixksfl7jf28z82ql7nikf5dvginfpm71j7j";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring configurator http-client influxdb lens
          monad-control mtl network snap text transformers
@@ -177410,6 +178359,7 @@ self: {
        pname = "snaplet-mandrill";
        version = "0.1.0.3";
        sha256 = "0yyb0qbd14v6xw5vix08pv40w9l8p2vwvmh67sa9b4q9wkvwv962";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base configurator mandrill mtl network snap transformers
        ];
@@ -177465,6 +178415,7 @@ self: {
        pname = "snaplet-mysql-simple";
        version = "0.2.2.0";
        sha256 = "0n2hjchcr3hh7hb5cpz2ahsffsyhiavp3gizr19pjwslgmq484a3";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring clientsession configurator containers errors lens
          MonadCatchIO-transformers mtl mysql mysql-simple
@@ -177514,6 +178465,7 @@ self: {
        pname = "snaplet-persistent";
        version = "0.5";
        sha256 = "1zbxknmsg9q6jwbxr4nh8nkfgkjmxb7pr2wwqa7rgr0wvh8ipx5k";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring clientsession configurator errors heist lens
          monad-logger MonadCatchIO-transformers mtl persistent
@@ -177536,6 +178488,7 @@ self: {
        pname = "snaplet-postgresql-simple";
        version = "1.0.2.0";
        sha256 = "1agykln1mr08bh5yp8xf5nhjirbvwc9kgl4k3rkl700hfjhdpbb7";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring clientsession configurator lens lifted-base
          monad-control mtl postgresql-simple resource-pool snap text
@@ -177555,6 +178508,7 @@ self: {
        pname = "snaplet-postmark";
        version = "0.2.0";
        sha256 = "0006i88ssgh6z9g967wlw0km8abxmxdjjs7aalsddzla6xdp8wnx";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base configurator mtl postmark snap text transformers
        ];
@@ -177684,6 +178638,7 @@ self: {
        pname = "snaplet-sass";
        version = "0.1.2.0";
        sha256 = "1aiznsi54lxzwxnilckspvp6rdfmksxppa3964kqxh93a9gvkr9z";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring configurator directory filepath mtl process snap
          snap-core transformers
@@ -177760,6 +178715,7 @@ self: {
        sha256 = "1mv0sfz2dqhl82wbsb11c5brw3jadh9sliinlj3xb5m7n42z84id";
        revision = "1";
        editedCabalFile = "0gj934nif3h3695ckwi457zjih2zfmbjsbsh884v3dp4qlfz6jcw";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring clientsession configurator direct-sqlite lens
          lifted-base monad-control mtl snap sqlite-simple text transformers
@@ -177807,6 +178763,7 @@ self: {
        pname = "snaplet-stripe";
        version = "0.3.0";
        sha256 = "0j85vzfmw6skag8rfww4gsg1lyfc7qbxiqhmwbsh4vfjiagrc9wp";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring configurator heist lens-family-core mtl snap stripe
          text text-format transformers xmlhtml
@@ -178085,6 +179042,7 @@ self: {
        pname = "snow-white";
        version = "2009.12.1";
        sha256 = "007hzr8dpj0mhvmnpdg0gi296q3mlicnx36s6hmgifzmyaa8kssi";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base binary bytestring mps ];
        homepage = "http://github.com/nfjinjing/snow-white";
        description = "encode any binary instance to white space";
@@ -178499,6 +179457,7 @@ self: {
        pname = "soegtk";
        version = "0.12.1";
        sha256 = "01f49hwxc5h85iwzgnddxlh1lmb3s27zddmghxrlq958gcrr2iar";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base cairo gtk old-time stm ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "GUI functions as used in the book \"The Haskell School of Expression\"";
@@ -178636,6 +179595,7 @@ self: {
        pname = "sort-by-pinyin";
        version = "2014.5.19";
        sha256 = "1ksfx5zhagg2y8virg8am1w8ljrzc9ddmf7xgvi5gx88zibi32fd";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          air air-extra air-th base bytestring containers text
        ];
@@ -178746,6 +179706,7 @@ self: {
        sha256 = "1934awipc837mdhkfa3ghmljxk0vb16wd4f31qdl4q9nxgwfv6c8";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring containers curl data-default directory filepath
          hack hack-contrib hack-handler-happstack haskell98 HDBC
@@ -178980,6 +179941,7 @@ self: {
        sha256 = "1bygwg1kadfhlphlsh8r05lxsdb5lzz3z37lny2zd00llmc4i33p";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary bytestring choice distributed-closure jni jvm
          jvm-streaming singletons streaming text vector
@@ -179004,6 +179966,7 @@ self: {
        sha256 = "0cyihfhxry3jrwyqrki14s6nw652w39m32ramg0nf1c85ahmhd3b";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary bytestring choice distributed-closure jni jvm
          jvm-streaming singletons streaming text vector
@@ -179073,6 +180036,7 @@ self: {
        pname = "sparse-linear-algebra";
        version = "0.2.9.7";
        sha256 = "0sskv1bbn1q19jh508wk1d898jwzlsf7662v4crrppmb6k6cq1zq";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers exceptions mtl transformers vector
          vector-algorithms vector-space
@@ -179133,6 +180097,7 @@ self: {
        pname = "spata";
        version = "2010.10.10";
        sha256 = "1cr0d82l2b96jvszca4yavdgwq450yzigcyrrlddrf9m9908kkzy";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base dlist mps mtl ];
        homepage = "http://github.com/nfjinjing/spata";
        description = "brainless form validation";
@@ -179336,6 +180301,7 @@ self: {
        sha256 = "0n0b2lbvj3pjg841pdw7pb09cpkz2d186dd4pmabjnm6r6wabm2n";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base edit-distance phonetic-code sqlite
        ];
@@ -179859,6 +180825,7 @@ self: {
        sha256 = "027vn7xqk7r15130hc6xikg2hyliqmg14y7n3wrrqaxvd4saa6qn";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson attoparsec base base64-bytestring bytestring containers
          data-default docopt entropy http-conduit http-kit http-types
@@ -179882,6 +180849,7 @@ self: {
        sha256 = "0jvkvk5yqp4gibg61q67iczaqvfszikxvvgf04fg6xs23gjkpihp";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson base blaze-html blaze-markup bytestring data-default-class
          directory docopt fast-logger filepath http-types
@@ -180380,6 +181348,7 @@ self: {
        sha256 = "1zhhqam6y5ckh6i145mr0irm17dmlam2k730rpqiyw4mwgmcp4qa";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base iproute text ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
@@ -180422,6 +181391,7 @@ self: {
        sha256 = "0794vsv043ppydzyjxnh06m4l3gbnga7x8nwsamh8skrzjfwn6jq";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers curl directory hdaemonize hslogger mtl process
          regex-compat stm unix
@@ -180591,6 +181561,7 @@ self: {
        sha256 = "0vmqfs956cziwb3q2v4nzn4b9d87062z9pixwfr7iiwd0ypmmiv6";
        revision = "2";
        editedCabalFile = "1bwdg0y98bw8p1857isjcg3f51d0nv52zbfc0s6f9syq70ahbhz9";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq directory exceptions
          filepath megaparsec mtl template-haskell text unordered-containers
@@ -181235,6 +182206,7 @@ self: {
        sha256 = "0rdkxyhy62h87vdq08znqpjhg4wriwvbmn0pwak9nqsd5xk6slka";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring directory EdisonCore FTGL haskell98 mtl OpenGL
          random SDL
@@ -182212,6 +183184,7 @@ self: {
        pname = "stmcontrol";
        version = "0.1";
        sha256 = "0m42pgnvzqadqycq0qbml5da0zw7myc24y5vka1qydz7rdfyaa24";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base haskell98 mtl stm ];
        homepage = "http://sulzmann.blogspot.com/2008/12/stm-with-control-communication-for.html";
        description = "Control communication among retrying transactions";
@@ -183414,6 +184387,7 @@ self: {
        pname = "string-qq";
        version = "0.0.2";
        sha256 = "0662m3i5xrdrr95w829bszkhp88mj9iy1zya54vk2sl5hz9wlmwp";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base template-haskell ];
        description = "QuasiQuoter for non-interpolated strings, texts and bytestrings";
        license = stdenv.lib.licenses.publicDomain;
@@ -183425,6 +184399,7 @@ self: {
        pname = "string-quote";
        version = "0.0.1";
        sha256 = "1pfkd3lwdphvl00gly7zbpvsmlw6b2d5568rxyqmq2qw6vzf9134";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base template-haskell ];
        description = "QuasiQuoter for non-interpolated strings, texts and bytestrings";
        license = stdenv.lib.licenses.bsd3;
@@ -183795,6 +184770,7 @@ self: {
        sha256 = "1d1qv9d8qifcxbxqb6a6j0fsi65lg8sndn7hn2s38hgnxdb7llf5";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base descriptive ghc-prim haskell-src-exts text
        ];
@@ -183905,6 +184881,7 @@ self: {
        sha256 = "075rbdhlrz88qkwx54jrmb4h4jq8q5wk4ncb858llaswcbsfgl8w";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base binary bullet bytestring containers directory elerea GLFW-b
          lambdacube-bullet lambdacube-engine mtl random vector
@@ -183954,6 +184931,7 @@ self: {
        sha256 = "1g011ip26yn9ixsa5bzb8gnjj58www2p0d8b7fj9b2brwqx682jp";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring containers directory filepath
          haskell-src-exts mtl syb yaml
@@ -183983,6 +184961,7 @@ self: {
        sha256 = "08qzplmzpnfyl8zaskimx91xij723mim11k552a7yl3p0i0cfmw7";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring containers directory filepath
          haskell-src-exts mtl syb yaml
@@ -184345,6 +185324,7 @@ self: {
        sha256 = "0bcxai3gq1akbcxqkkj0n52a43zqcnw865bnngy9b4z26b43kj5k";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base Boolean containers data-default directory filepath parallel-io
          process QuickCheck random semigroups shake stm sunroof-compiler
@@ -184699,6 +185679,7 @@ self: {
        pname = "svgcairo";
        version = "0.13.1.1";
        sha256 = "0kx5qc2snrpml2figrq1f74fzj81zbibv1x9dp8z2kh8z6n659nd";
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base cairo glib mtl text ];
        libraryPkgconfigDepends = [ librsvg ];
@@ -184913,6 +185894,7 @@ self: {
        sha256 = "173qvx46als9ar63j6hqynnwnkvs12pb2qv3gbfjm8mla5i7sjym";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers directory filepath hashable intern mtl network-uri
          old-locale polyparse semigroups text time
@@ -186326,6 +187308,7 @@ self: {
        pname = "tablestorage";
        version = "0.2.1.0";
        sha256 = "03j8cqq85i9wikw772swazbvyv1dcw0mnhmqq3slydl0axi12yr8";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base base64-bytestring bytestring conduit crypto-api cryptohash
          HTTP http-conduit http-types mtl network old-locale resourcet SHA
@@ -186401,6 +187384,7 @@ self: {
        sha256 = "1xfaw32yq17a6wm6gzvpdnpabxfnskwbs541h1kk1lvrkm31h2b2";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base cairo containers dbus dyre enclosed-exceptions filepath gtk
          gtk-traymanager HStringTemplate HTTP mtl network network-uri
@@ -186458,6 +187442,7 @@ self: {
        sha256 = "1h14xvbn5idc37zkxlkf1g9zr54l4kn4889mnfcbxg56fdfrfb0j";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers data-accessor explicit-exception
          non-empty transformers utility-ht xml-basic
@@ -186621,6 +187606,7 @@ self: {
        editedCabalFile = "02xmvs9m977szhf5cgy31rbadi662g194giq3djzvsd41c1sshq3";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base blaze-html blaze-markup text unordered-containers
          vector
@@ -186841,6 +187827,7 @@ self: {
        pname = "tai64";
        version = "0.2.0";
        sha256 = "0pk8qfla4iv8yryfxpz5nf2ijhdg7svbcikg3pik2psir6igj3sw";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base base16-bytestring binary bytestring QuickCheck text
          time vector
@@ -186919,6 +187906,7 @@ self: {
        pname = "takahashi";
        version = "0.2.2.0";
        sha256 = "0flr87m1yjxcv1r64bvrx1gm9dpp6xvj2lj14pi99pipywgw4kgs";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base lens monad-skeleton mtl ];
        description = "create slide for presentation";
        license = stdenv.lib.licenses.mit;
@@ -186977,6 +187965,7 @@ self: {
        sha256 = "1x2d3vlwwssdj0jhnvrm1h0qaajxyns25b9azhf9k8q8xqxi7r32";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson array base binary blaze-builder blaze-html bytestring cmdargs
          conduit containers deepseq derive directory dlist fclabels filepath
@@ -187528,6 +188517,7 @@ self: {
        pname = "tasty-html";
        version = "0.4.1.1";
        sha256 = "06hzb4y98aqmcn3zl6mr1gwmkkl73phqc4419fwsxwqyrygirshf";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base blaze-html bytestring containers filepath generic-deriving mtl
          stm tagged tasty text transformers
@@ -187965,6 +188955,7 @@ self: {
        pname = "tcp-streams";
        version = "0.6.0.0";
        sha256 = "1g0g9r62gklsn99ncqkyxlk8qwmxd7iyhshq03k7ghdlsj9linfg";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring data-default-class io-streams network pem tls x509
          x509-store x509-system
@@ -187988,6 +188979,7 @@ self: {
        pname = "tcp-streams";
        version = "1.0.1.0";
        sha256 = "0qa8dvlxg6r7f6qxq46xj1fq5ksbvznjqs624v57ay2nvgji5n3p";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring data-default-class io-streams network pem tls x509
          x509-store x509-system
@@ -188217,6 +189209,7 @@ self: {
        pname = "telegram-api";
        version = "0.6.3.0";
        sha256 = "0fp8ryh9pdpfycyknd9d1r9z1v0p06r87nf19x7azv4i1yl5msia";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring http-api-data http-client http-media
          http-types mime-types mtl servant servant-client string-conversions
@@ -188625,6 +189618,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "temporary_1_2_1_1" = callPackage
+    ({ mkDerivation, base, base-compat, directory, exceptions, filepath
+     , tasty, tasty-hunit, transformers, unix
+     }:
+     mkDerivation {
+       pname = "temporary";
+       version = "1.2.1.1";
+       sha256 = "1wq0rc71mp0lw7pkpcbhglf636ni46xnlpsmx6yz8acmwmqj8xsm";
+       libraryHaskellDepends = [
+         base directory exceptions filepath transformers unix
+       ];
+       testHaskellDepends = [
+         base base-compat directory filepath tasty tasty-hunit unix
+       ];
+       homepage = "https://github.com/feuerbach/temporary";
+       description = "Portable temporary file and directory support";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "temporary-rc" = callPackage
     ({ mkDerivation, base, directory, exceptions, filepath
      , transformers, unix
@@ -188671,6 +189684,7 @@ self: {
        sha256 = "0hv5b09vly9zakjfgi4bnjx503ny334dhg13g5ma85rp3dbsjvsn";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base directory executable-path filepath haskeline mtl
          uniplate utf8-string
@@ -189091,6 +190105,7 @@ self: {
        sha256 = "10bq2b3nhnpy566i1gbf8iz10nq0z0x4xdi4kr5nlbzrih86ih4n";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers mtl process syb transformers
        ];
@@ -189599,6 +190614,7 @@ self: {
        sha256 = "0a0kw5546z5jydk6dq2p16p2kpwv7fnmy1m907m3x6n580i1vh3l";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base filepath gtk ];
        homepage = "http://code.haskell.org/~dons/code/testpattern";
        description = "Display a monitor test pattern";
@@ -189629,6 +190645,7 @@ self: {
        sha256 = "10wlw1frkaa3j8mb8lxgpvxcx87m8wdpca3mli9c5kirdm51vjgw";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base GLUT random ];
        homepage = "http://d.hatena.ne.jp/mokehehe/20080921/tetris";
        description = "A 2-D clone of Tetris";
@@ -189941,6 +190958,7 @@ self: {
        pname = "text-icu-normalized";
        version = "0.4.1";
        sha256 = "0nwma8yvfkmy0zzl3kb9xwmpp3z74aj33mdp7kr036baqvxini04";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base base-unicode-symbols bytestring lens text text-icu
        ];
@@ -190107,6 +191125,7 @@ self: {
        pname = "text-markup";
        version = "0.1";
        sha256 = "1nn0h61cvaydawrc4d0bizyqnssbhmgvsb0s59fvxcwk9zlw10xh";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers text ];
        testHaskellDepends = [
          base QuickCheck quickcheck-text tasty tasty-quickcheck text
@@ -190587,6 +191606,7 @@ self: {
        pname = "text-zipper";
        version = "0.10";
        sha256 = "0vhp707irmyqdix4clnjphnly8zyph4brpjb41n05rxlaybn96n5";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base deepseq text vector ];
        testHaskellDepends = [ base hspec QuickCheck text ];
        homepage = "https://github.com/jtdaugherty/text-zipper/";
@@ -191103,6 +192123,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "th-orphans_0_13_4" = callPackage
+    ({ mkDerivation, base, hspec, mtl, template-haskell, th-lift
+     , th-lift-instances, th-reify-many
+     }:
+     mkDerivation {
+       pname = "th-orphans";
+       version = "0.13.4";
+       sha256 = "0cab6hmyii42p157jhm0sd5jzdlxms4ip2ncrmcmc47dl3pxk5gk";
+       libraryHaskellDepends = [
+         base mtl template-haskell th-lift th-lift-instances th-reify-many
+       ];
+       testHaskellDepends = [ base hspec template-haskell ];
+       description = "Orphan instances for TH datatypes";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "th-printf" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, hspec, HUnit
      , QuickCheck, template-haskell, text, transformers
@@ -191151,6 +192188,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "th-reify-many_0_1_8" = callPackage
+    ({ mkDerivation, base, containers, mtl, safe, template-haskell
+     , th-expand-syns
+     }:
+     mkDerivation {
+       pname = "th-reify-many";
+       version = "0.1.8";
+       sha256 = "0hzy6hvhvcd6i60vx5cp2b7ggmnnjh9rx4h8bm8xw4grglcaxjnf";
+       libraryHaskellDepends = [
+         base containers mtl safe template-haskell th-expand-syns
+       ];
+       testHaskellDepends = [ base template-haskell ];
+       homepage = "http://github.com/mgsloan/th-reify-many";
+       description = "Recurseively reify template haskell datatype info";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "th-sccs" = callPackage
     ({ mkDerivation, base, containers, template-haskell }:
      mkDerivation {
@@ -191423,6 +192478,7 @@ self: {
        sha256 = "0ir8z7al3fxjwq5nb05l136k7vp82ag6khcyf9bvjcymlra4cs0m";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base pretty ];
        homepage = "http://web.cecs.pdx.edu/~mpj/thih/";
        description = "Typing Haskell In Haskell";
@@ -191440,6 +192496,7 @@ self: {
        sha256 = "1pjz6rnbm1llxgp47fasv40w2vg197z582vf9mm7rhm5qjp25zi0";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base edit-distance parseargs phonetic-code sqlite
        ];
@@ -191616,6 +192673,7 @@ self: {
        sha256 = "067jwdh0xbv02mh9narwnw36wvz0d1v5wwhysmzbfc263l0iazn2";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base binary cairo containers deepseq filepath ghc-events glib
          gtk mtl pango text time unix
@@ -191674,6 +192732,7 @@ self: {
        sha256 = "0yc4n9b3my7mfq4w28yk4pjh14wqg116gqgx3w8wr26j0yn3y8j0";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson async base bytestring containers data-default deepseq
          filepath hashable network-uri safe snap-core snap-server stm
@@ -191699,6 +192758,7 @@ self: {
        sha256 = "1jg18gmm4f3aamwz9vr3h8nc3axlxf2440zf0ff6h8dlp20al7zk";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson async base bytestring containers data-default deepseq
          exceptions filepath hashable network-uri safe snap-core snap-server
@@ -191932,6 +192992,7 @@ self: {
        sha256 = "1il31vwcl3lag1nz9a9j8i7g160djbdbfcd58qi7d9sw9mcjk361";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base blaze-html blaze-markup dbus utf8-string xmonad xmonad-contrib
        ];
@@ -191983,6 +193044,7 @@ self: {
        sha256 = "0bdls2xz281zdxq5z6vbkahmf6bpiqr0ra823j21783jwiyh8j01";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base glade gtk haskell98 ];
        homepage = "http://ecks.homeunix.net";
        description = "Useful if reading \"Why FP matters\" by John Hughes";
@@ -192221,6 +193283,7 @@ self: {
        sha256 = "0x2yc57g9g5ii14l65xkly55rhx44nfjqnbl4bqf286mqsgz191j";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base binary bytestring bzlib filepath haskell98 mtl pretty
        ];
@@ -193266,6 +194329,7 @@ self: {
        sha256 = "1xyy1aagbjyjs9d52jmf7xch0831v7hvsb0mfrxpahvqsdac6h7a";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson attoparsec base blaze-builder bytestring cmdargs conduit
          conduit-extra containers data-default directory exceptions filepath
@@ -193845,6 +194909,7 @@ self: {
        sha256 = "06b938i2362c4jcd0923lwrcf6hqgxdscizj91ns51wx73nm8fxi";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          ALUT array base filepath GLFW-b OpenAL OpenGL parseargs random
        ];
@@ -194694,6 +195759,7 @@ self: {
        pname = "translate";
        version = "2010.1.24";
        sha256 = "0vcqw0x7c9nb8yigvk35x72rds50kvma02rwkb757y1sk80q0mzf";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base curl json network utf8-string ];
        homepage = "http://github.com/nfjinjing/translate";
        description = "Haskell binding to Google's AJAX Language API for Translation and Detection";
@@ -194898,6 +195964,7 @@ self: {
        sha256 = "0g7x1jj3x58jgbg6zcakyakc5jskcas03jakj7v5pfwdmk8kbc4m";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base gtk process ];
        homepage = "http://projects.haskell.org/traypoweroff";
        description = "Tray Icon application to PowerOff / Reboot computer";
@@ -196221,6 +197288,7 @@ self: {
        pname = "twiml";
        version = "0.2.0.0";
        sha256 = "12vavc02rpdrgdcnbd1jzn9lllzx4fghczdrpjr2icn8bkrgkqi5";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base data-default deepseq lens network-uri parsec template-haskell
          text void xml
@@ -196506,6 +197574,7 @@ self: {
        sha256 = "1wc1z7ps1rcbws2snci64hxddjd3bi3kbi4iwvbfaac0dz52085m";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring directory filepath ghc process
        ];
@@ -196521,6 +197590,7 @@ self: {
        pname = "type-aligned";
        version = "0.9.6";
        sha256 = "0mfyd9w13kd3ha43220p9qabw828xv19sxywy9imadpwrdqp51qv";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/atzeus/type-aligned";
        description = "Various type-aligned sequence data structures";
@@ -197087,6 +198157,7 @@ self: {
        sha256 = "1s84bw7fxxsqixy03892zb1s261fc0c8h5srsifs5mzgvhxkn20l";
        revision = "1";
        editedCabalFile = "03lz4iprlfl2bnh4isa2k7ddv1wxz8mqb7x1nmhjqbx34apbqi11";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          applicative-numbers base constraints newtype ty vector-space
        ];
@@ -197524,6 +198595,7 @@ self: {
        pname = "tzdata";
        version = "0.1.20161123.0";
        sha256 = "1dnc9m3396bxps84xgxfzrx928yh7vxd8pdim63a5xrydcfp16fb";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers deepseq vector
        ];
@@ -197545,6 +198617,7 @@ self: {
        pname = "tzdata";
        version = "0.1.20170320.0";
        sha256 = "11ffj8ipcvvsm811w1jm23ry7vrmvj2q487640ic4ghq39dx91is";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers deepseq vector
        ];
@@ -197588,6 +198661,7 @@ self: {
        sha256 = "01a1h6pflvid5zcd8wy3px7cz4pxwy5pw354v9rp8k7sx4q82am8";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base BNFC-meta cmdargs containers mtl parsec pretty split
          transformers
@@ -197606,6 +198680,7 @@ self: {
        pname = "ua-parser";
        version = "0.7.4";
        sha256 = "1maph5na307ih1qx2ziww3mhc9c0a5rxqj2jfc4w404hisby947i";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring data-default file-embed pcre-light text yaml
        ];
@@ -197632,6 +198707,7 @@ self: {
        sha256 = "1ml02xap95vxvzwqlqp68hfk7yjncf3xc1h13gga0nlhby9rjv14";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers directory filepath hslogger mtl network process
          regex-compat time time-locale-compat unix
@@ -197691,6 +198767,7 @@ self: {
        sha256 = "0a7kksh99nll91q41z4xgrcwc8pnfm0p71bxw6yymcd7yb0v09fk";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary bytestring cereal containers ghc-prim mtl network unix
          utf8-string
@@ -197786,6 +198863,7 @@ self: {
        sha256 = "07b8hvam9n801ldwrm6jjds691gxjw4yp33zsg4bbbv2mk6z7fpa";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base binary bytestring containers directory fgl filepath
          hashable mtl network old-locale primitive process syb transformers
@@ -198460,6 +199538,7 @@ self: {
        sha256 = "1974birppkd49jwq31x8bcbmgnximh233salnyq47ikgxfp6x4c6";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base directory filepath text
        ];
@@ -198525,6 +199604,7 @@ self: {
        pname = "uniform-pair";
        version = "0.1.13";
        sha256 = "17dz0car02w2x5m23hlqlgjnpl86darc8vvr4axpsc9xim4sf7nk";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base deepseq prelude-extras ];
        homepage = "https://github.com/conal/uniform-pair/";
        description = "Uniform pairs with class instances";
@@ -198834,6 +199914,7 @@ self: {
        pname = "universal-binary";
        version = "0.11";
        sha256 = "1gnrq6s7pipjqfyispkxib3xfzii1ss6a9iwv07mvb5a93hc45cw";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base binary bytestring ];
        description = "Parser for OS X Universal Binary format";
        license = stdenv.lib.licenses.bsd3;
@@ -199060,6 +200141,7 @@ self: {
        pname = "unix-memory";
        version = "0.1.2";
        sha256 = "1r8s7z39d31h1n7rcincy156lbsvamr6jicx52kv8simb9gvarpp";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base mtl QuickCheck tasty tasty-hunit tasty-quickcheck unix
@@ -199324,6 +200406,7 @@ self: {
        pname = "unsafe";
        version = "0.0";
        sha256 = "0hc6xr1i3hkz25gdgfx1jqgpsc9mwa05bkfynp0mcfdlyz6782nz";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        homepage = "http://code.haskell.org/~thielema/unsafe/";
        description = "Unified interface to unsafe functions";
@@ -199364,6 +200447,7 @@ self: {
        pname = "unsafeperformst";
        version = "0.9.2";
        sha256 = "0l268mzlmswm0p9cybjvi6krsgic706av9kf90fx3ylyvhgzygvc";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/atzeus/unsafeperformst";
        description = "Like unsafeperformIO, but for the ST monad";
@@ -199380,6 +200464,7 @@ self: {
        sha256 = "1zlf9dw3yid6s9p0q837h3qs2wnd9wr9kh282j4j4m0gpv9dcrrf";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base optparse-applicative stream-fusion unordered-containers
        ];
@@ -199434,6 +200519,7 @@ self: {
        sha256 = "1bs87ii03dydrcyx70drmbd1nrb5z1xj5bzrrqgbq2fzhh7rmb1n";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-terminal base bytestring cassava containers directory
          file-embed filepath inflections megaparsec mtl parallel-io process
@@ -199612,6 +200698,7 @@ self: {
        sha256 = "0fnr3xskzwxxxk7iv5bmqa18zbr612pn27jjiac0l4wzv33lisik";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring cake3 directory filepath language-javascript
          mime-types mtl optparse-applicative process syb text
@@ -200039,6 +201126,7 @@ self: {
        sha256 = "1ji6zrglmlkhv743w4d4lrqvhva4yl5kqxb420z44l1wymvgg1s1";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base base-unicode-symbols bytestring containers
          containers-unicode-symbols parsimony
@@ -200239,6 +201327,7 @@ self: {
        sha256 = "156kjn3da02z060srlsm8kqwbxzcscjzxdkp4lmv8zq5zscha5v6";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base utf8-string ];
        description = "Variants of Prelude and System.IO with UTF8 text I/O operations";
        license = stdenv.lib.licenses.bsd3;
@@ -200453,6 +201542,7 @@ self: {
        sha256 = "1gcznzb8hr2x5mr5pgfqhnvjjrll96g855g4niacw5bd52wdvsla";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base blaze-html ];
        executableHaskellDepends = [ base process ];
        homepage = "https://github.com/matthijssteen/uuagd";
@@ -200984,6 +202074,7 @@ self: {
        sha256 = "16f1mdsyyfdgjcp3rzf3p1qj3d6la01i9y1yyp97m5nmd2jxsn1q";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base deepseq dlist fgl graphviz haskell-src-exts mtl uniplate
        ];
@@ -201284,6 +202375,7 @@ self: {
        sha256 = "1qf5insiqgl3p9bg6m1igl24lghzbb3y50acwxgcpbcbdcaw13z5";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base directory filepath gi-gtk gi-gtk-hs haskell-gi-base mtl
          process text vcswrapper
@@ -201308,6 +202400,7 @@ self: {
        sha256 = "0yzin613nzvnklkb3j29vzy4rfladb3cy3sy6ic0mi6lxhilan2n";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers directory filepath hxt mtl parsec process split
          text
@@ -201553,6 +202646,7 @@ self: {
        pname = "vector-clock";
        version = "0.2.2";
        sha256 = "0ndp25w61rcj4sadvhxlirrk1dhk7rmdzv9kha7kyqa41whr9629";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base binary ghc-prim hashable ];
        testHaskellDepends = [
          array base binary ghc-prim HUnit QuickCheck test-framework
@@ -202018,6 +203112,7 @@ self: {
        sha256 = "0z7a17j0rd06kvn3v4qr0fhxg0xw6n3579477y2lvx4mcc3qyrvw";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base byteable bytestring cereal cipher-aes cryptohash directory
          filepath mmap random storable-endian text time
@@ -202172,6 +203267,7 @@ self: {
        sha256 = "0j4j4rsngp76pvssg6kisqqwr9d95fcmxp21yq4483vvc1cv78g2";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers data-default deepseq directory filepath
          libmpd mtl old-locale process template-haskell time
@@ -202343,6 +203439,7 @@ self: {
        sha256 = "08z6dvhv4k6a71dvqhvcfl8s5aq7qcg8aj5xbym3931yykl0gxc2";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base bytestring Cabal directory file-embed filepath mtl process
          safe split
@@ -202376,6 +203473,7 @@ self: {
        sha256 = "1235zclhg4nkd387df4gg3q88hvsqwsdj1j20lnfnclxfah0qxa2";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base containers directory filepath glib gtk json
          MonadCatchIO-transformers mtl parsec PSQueue stm url utf8-string
@@ -202398,6 +203496,7 @@ self: {
        sha256 = "0myppx9bd8bfhii91lqdp00ckp20bq82754mr01s87l1d01gb4wp";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base cairo containers directory fgl glade graphviz gtk haskell-src
          ipprint isevaluated lazysmallcheck parallel pretty process
@@ -202578,6 +203677,7 @@ self: {
        pname = "vte";
        version = "0.13.1.1";
        sha256 = "0cajvmnbkbqvkm3kngp7zscrjnzyf287rk6x2lnbwixg4sk9k1n3";
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base glib gtk pango ];
        libraryPkgconfigDepends = [ vte ];
@@ -202595,6 +203695,7 @@ self: {
        pname = "vtegtk3";
        version = "0.13.1.1";
        sha256 = "0rrhca2850dc84sg5gn8dghsn8yk02da1rj7xzjazpmd9lkgwqas";
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base glib gtk3 pango ];
        libraryPkgconfigDepends = [ vte ];
@@ -202724,6 +203825,7 @@ self: {
        sha256 = "1mvs2224slnkswcag6knnj9ydkfgvw6nhaiy71bijjd2wwln4fq2";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base containers data-default directory filepath mtl
          regex-base stm text unix vector vty
@@ -202823,6 +203925,7 @@ self: {
        sha256 = "0x7yh4g4jprc34pr6i50c8xyx9w6rjl6i2y6zwnkzydv7msf0d76";
        revision = "1";
        editedCabalFile = "1kdszyxp0i4f8yi7831x7vc4q55677ab2rj4fign77m0xk6cnphl";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base data-default-class kansas-comet natural-transformation
          remote-monad scotty semigroups stm text wai-middleware-static
@@ -202983,6 +204086,7 @@ self: {
        pname = "wai-cors";
        version = "0.2.5";
        sha256 = "0vkn5nws9vcjn809qv2jfhf9ckfcgvfhs1v3xx1b03iy0j59n215";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base base-unicode-symbols bytestring case-insensitive
          http-types mtl transformers wai
@@ -204467,6 +205571,7 @@ self: {
        sha256 = "0r0lqy3vqs3ypxf0v6xwyarj5rxjf9f19x6b48rhj32z8x9d0isq";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson aeson-pretty attoparsec base blaze-builder browscap
          bytestring case-insensitive conduit conduit-extra deepseq directory
@@ -204733,6 +205838,7 @@ self: {
        pname = "wave";
        version = "0.1.5";
        sha256 = "03zycmwrchhqvi37fdvlzz2d1vl4hy0i8xyys1zznw38qfq0h2i5";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring cereal containers data-default-class transformers
        ];
@@ -205515,6 +206621,7 @@ self: {
        pname = "webkit";
        version = "0.14.2.1";
        sha256 = "0l7ml6pfx63fz3gaay9krbksz7y15zv6aq2zr1g29x6yv6kz43mq";
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          base bytestring cairo glib gtk mtl pango text transformers
@@ -205563,6 +206670,7 @@ self: {
        pname = "webkitgtk3";
        version = "0.14.2.1";
        sha256 = "1xml39120yng7pgdpaz114zc2vcq7kxi5v1gdlfarzdvxxsw8wba";
+       enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          base bytestring cairo glib gtk3 mtl pango text transformers
@@ -206115,6 +207223,7 @@ self: {
        sha256 = "0fgasnviqmz8ifkb8ikvj721f9j1xzvix5va0jxi81gh6f400ij6";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers GLUT mtl OpenGL process random X11
        ];
@@ -206144,6 +207253,7 @@ self: {
        sha256 = "1y89bayaccz8qqzsfmpr917dczgbn5srskja6f2dab3ipxhk24z9";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ haskell98 random ];
        homepage = "https://github.com/haroldl/whitespace-nd";
        description = "Whitespace, an esoteric programming language";
@@ -206299,6 +207409,7 @@ self: {
        pname = "wild-bind-indicator";
        version = "0.1.0.1";
        sha256 = "0lvhczw0ah8kb1hd9k7rnjcs1pmn0qg1i2v0szvhh2ji8iznjznm";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers gtk text transformers wild-bind
        ];
@@ -206723,6 +207834,7 @@ self: {
        pname = "wl-pprint-terminfo";
        version = "3.7.1.4";
        sha256 = "084d70plp3d9629aznrk5nxkg0hg7yr76iyi74gcby633xbvmniw";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers nats semigroups terminfo text
          transformers wl-pprint-extras
@@ -207015,6 +208127,7 @@ self: {
        pname = "words";
        version = "0.1.2";
        sha256 = "0najaqi9fkqdkfks1c6w3fz4qf7dnr4h4brzgglg1h9ik8x5a910";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory text ];
        description = "Cross-platform access to a list of words";
        license = stdenv.lib.licenses.bsd3;
@@ -207379,6 +208492,7 @@ self: {
        pname = "wright";
        version = "0.1.0.2";
        sha256 = "180012vyslprj06npavh44fmii1813w22sws9zwxzlb4r4jdm4zi";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bed-and-breakfast containers ];
        testHaskellDepends = [
          assertions base bed-and-breakfast containers filepath lens
@@ -207731,6 +208845,7 @@ self: {
        pname = "wx";
        version = "0.92.3.0";
        sha256 = "04ccw9g8a08ipp4r1282jzgmx0lvxsbwgiasxq7ivij133mspjxx";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base stm time wxcore ];
        homepage = "https://wiki.haskell.org/WxHaskell";
        description = "wxHaskell";
@@ -207746,6 +208861,7 @@ self: {
        sha256 = "16rixql7ixcdmxcayzrqswc4fcj6wdq513cl8qr66hwqyq2k0525";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base directory random wx wxcore ];
        homepage = "https://wiki.haskell.org/WxAsteroids";
        description = "Try to avoid the asteroids with your space ship";
@@ -207853,6 +208969,7 @@ self: {
        sha256 = "10897yb7mkc9hy2037r9yb4192n65lz997fd5apksra1rifrazyp";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base wx wxcore ];
        homepage = "http://github.com/elbrujohalcon/wxhnotepad";
        description = "An example of how to implement a basic notepad with wxHaskell";
@@ -208248,6 +209365,7 @@ self: {
        sha256 = "0rjpj6i4fn504m7s3hwqbydn0m0ryih0hw4xnc409338sval6xj6";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory filepath process unix ];
        executableHaskellDepends = [
          base directory filepath process unix
@@ -209221,6 +210339,7 @@ self: {
        pname = "xml-push";
        version = "0.0.0.18";
        sha256 = "1i8qmz7mr8rfspkn4wwyq7f7fi1grpggmqmfsmx6l7bjsjv15n3y";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring crypto-random handle-like monad-control monads-tf
          peyotls random sasl simple-pipe stm tighttp transformers-base uuid
@@ -209425,6 +210544,7 @@ self: {
        sha256 = "0cp21xzzqczb49mpnsxlgc4fyhmmgyy4mfczqnz85h383js5sbia";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base bio bytestring containers directory xhtml
        ];
@@ -209487,6 +210607,7 @@ self: {
        sha256 = "15i0a28svafjsziz1h3px0qys81xw0bs5bpq66hcwzxdv3s15lv9";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base old-locale time xml ];
        executableHaskellDepends = [
          base bytestring configurator filepath http-client network-uri
@@ -209570,6 +210691,7 @@ self: {
        sha256 = "1jh3lcs20qpna36fa5a0r174xqrsxhj10x1rm5vwf64zariipy7r";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers data-default directory extensible-exceptions
          filepath mtl process setlocale unix utf8-string X11
@@ -209580,8 +210702,9 @@ self: {
        ];
        postInstall = ''
          shopt -s globstar
-         mkdir -p $out/share/man/man1
-         mv "$out/"**"/man/"*.1 $out/share/man/man1/
+         mkdir -p $doc/share/man/man1
+         mv "$data/"**"/man/"*[0-9] $doc/share/man/man1/
+         rm "$data/"**"/man/"*
        '';
        homepage = "http://xmonad.org";
        description = "A tiling window manager";
@@ -209598,6 +210721,7 @@ self: {
        sha256 = "1ymn56rc9kkzvdla9bpj3aq2z6rnz669xbj7n87z1b42aj74s8gn";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers directory extensible-exceptions filepath mtl
          process unix X11
@@ -209843,6 +210967,7 @@ self: {
        pname = "xournal-builder";
        version = "0.1.1.1";
        sha256 = "0v7lfhyr28gmsbzizhbw4lddhhhv74y3vb8kb9z06b32lg5wm591";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base blaze-builder bytestring double-conversion strict
          xournal-types
@@ -209863,6 +210988,7 @@ self: {
        sha256 = "1vyykx5kbq8jja6cxy38j905b23ndj73xsg0hirz0sq4pw36shmi";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring cairo cmdargs directory filepath HStringTemplate
          mtl xournal-parser xournal-render xournal-types
@@ -209902,6 +211028,7 @@ self: {
        pname = "xournal-render";
        version = "0.6.0";
        sha256 = "0fsijjzxizhb7dx1pc83rsini8xzqj21mmkqj1x0ysyzh78siaf3";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring cairo containers fclabels mtl poppler strict
          TypeCompose xournal-types
@@ -210033,6 +211160,7 @@ self: {
        pname = "xtc";
        version = "1.0.1";
        sha256 = "0jfs3qbcx5h26irkq73dyc2m84qyrlj5dvy6d1s6p6520vhnqfal";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base wx wxcore ];
        homepage = "http://github.com/alanz/xtc";
        description = "eXtended & Typed Controls for wxHaskell";
@@ -210264,6 +211392,7 @@ self: {
        pname = "yamemo";
        version = "0.6.0";
        sha256 = "12qh9fi5dj4i5lprm24gc2b66qzc3mf59m22sxf93sx3dsf7rygn";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers mtl ];
        description = "Simple memoisation function";
        license = stdenv.lib.licenses.bsd3;
@@ -210434,6 +211563,7 @@ self: {
        sha256 = "1lmlrf3x4icx0ikl02k00hv1wibvy0n3lmxdgjrh0vbq89sbx55a";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring directory filepath text unix
          unordered-containers vector yaml
@@ -210692,6 +211822,7 @@ self: {
        sha256 = "0h2gd0k8vbz8rl34j42ayvcqp0ksz6642k9pznrd28h145wk8gz5";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base event-driven filepath monads-tf regexpr
        ];
@@ -210707,6 +211838,7 @@ self: {
        pname = "ycextra";
        version = "0.1";
        sha256 = "0aa0g2r7ck052wqkqqxzvkdqv9d7x3v7rqqd8iajwys9cvqny4m5";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers csv mtl uniplate yhccore
        ];
@@ -211082,6 +212214,7 @@ self: {
        pname = "yesod-auth-hmac-keccak";
        version = "0.0.0.3";
        sha256 = "1x5qnhdhy0n6kf9gljkig2q4dsfay1rv8gg3xc5ly5dvbbmy4zp8";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring cryptonite mtl persistent random shakespeare
          text yesod-auth yesod-core yesod-form yesod-persistent yesod-static
@@ -211688,6 +212821,7 @@ self: {
        sha256 = "1z56y5l6mgwi7ghcn1ycxhgpzximg0fbs652jlaxdy03rzxizv29";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          ansi-terminal base bytestring directory filepath fsnotify Glob
          optparse-applicative process pureMD5 stm system-filepath temporary
@@ -213098,6 +214232,7 @@ self: {
        pname = "yi-frontend-pango";
        version = "0.14.0";
        sha256 = "0zwpy1lbkw8lkxk4p162xs181n9xsp9x8h6yknklqd79lnxs4zd5";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers filepath glib gtk microlens-platform mtl
          oo-prototypes pango pointedlist text transformers-base yi-core
@@ -213314,6 +214449,7 @@ self: {
        pname = "yi-keymap-vim";
        version = "0.13.7";
        sha256 = "0d91lpcrsbwwacqycmkdmxkwnx7rn116cj76ddb7wrnikaj6vv1j";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base binary containers data-default directory filepath
          Hclip microlens-platform mtl oo-prototypes pointedlist safe
@@ -213343,6 +214479,7 @@ self: {
        pname = "yi-keymap-vim";
        version = "0.14.0";
        sha256 = "1hy36q69a0yhkg5v0n2f2gkmbf85a9y6k5b38gdg18kdnil974q4";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base binary containers data-default directory filepath
          Hclip microlens-platform mtl oo-prototypes pointedlist safe
@@ -213689,6 +214826,7 @@ self: {
        pname = "yices";
        version = "0.0.0.12";
        sha256 = "1k3q789dapk0c311x72w4r008rnbfz3cvajahxq208gy8iyjx9iz";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base parsec process ];
        description = "Haskell programming interface to Yices SMT solver";
        license = stdenv.lib.licenses.bsd3;
@@ -213738,6 +214876,7 @@ self: {
        sha256 = "11iwz7mrx3f72i3d4l9zvqb8g0722aj00s7h7wa06y4l69rfnj6m";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base directory ftphs haskeline mtl process unix
        ];
@@ -213872,6 +215011,7 @@ self: {
        sha256 = "1lb50xpz032nrxbcfihj08cwbw2cn22sf8f4xlpfqnp36jvn1rvx";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base bytestring process utility-ht ];
        description = "Upload video to YouTube via YouTube API";
        license = stdenv.lib.licenses.bsd3;
@@ -213917,6 +215057,7 @@ self: {
        sha256 = "1b33q6k76bwg5614b670mvls0iwyp2yqfdqc9r86m95x7ar7brq8";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson base containers csv directory filepath HDBC HDBC-sqlite3
          HStringTemplate lucid old-locale old-time pandoc parsec scientific
@@ -213950,6 +215091,7 @@ self: {
        sha256 = "01pf0mg6lgm34src1mfz3qj41vyhmvi50yjyv72zwamd0g7sx374";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers curl deepseq directory filepath
          haskell98 mtl network parsec
@@ -214149,6 +215291,7 @@ self: {
        sha256 = "03jwhgi9n9iv7zpn8nwkdyvsybsksnhsji8k2ma9rzayk36aba6v";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base containers directory ghc ghc-paths mtl parallel process
          random text transformers
@@ -214595,6 +215738,7 @@ self: {
        pname = "zipedit";
        version = "0.2.3";
        sha256 = "17msh3gwylmsiabyz5x05ir2xh8h904kbp5isnvbf0z4kzfv33cr";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory mtl process ];
        homepage = "http://code.haskell.org/~byorgey/code/zipedit";
        description = "Create simple list editor interfaces";
@@ -214991,6 +216135,7 @@ self: {
        editedCabalFile = "04gsbs6fvwpjjg1f6g1j17dxlfzsci9vmirk7mwqwmm9ha0a4hxm";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [ base monads-tf ];
        description = "Zot language";
        license = stdenv.lib.licenses.bsd3;

From 073b30563d42d767bc3403e02413305c26b1a49c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 11 Jul 2017 14:44:41 +0200
Subject: [PATCH 034/122] ghc-mod: fix build to cope with new split-output work

---
 pkgs/development/haskell-modules/configuration-common.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 85a2d0f665e..9026e3aa3a6 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -594,10 +594,10 @@ self: super: {
     doCheck = false;            # https://github.com/kazu-yamamoto/ghc-mod/issues/335
     executableToolDepends = drv.executableToolDepends or [] ++ [pkgs.emacs];
     postInstall = ''
-      local lispdir=( "$out/share/"*"-${self.ghc.name}/${drv.pname}-${drv.version}/elisp" )
+      local lispdir=( "$data/share/${self.ghc.name}/*/${drv.pname}-${drv.version}/elisp" )
       make -C $lispdir
-      mkdir -p $out/share/emacs/site-lisp
-      ln -s "$lispdir/"*.el{,c} $out/share/emacs/site-lisp/
+      mkdir -p $data/share/emacs/site-lisp
+      ln -s "$lispdir/"*.el{,c} $data/share/emacs/site-lisp/
     '';
   });
 

From 529f8095646f5d51a3b444a5eaa40ebd726bf46c Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Thu, 27 Jul 2017 09:51:01 +0200
Subject: [PATCH 035/122] oraclejdk: updated arm checksums

---
 pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix | 2 +-
 pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
index 7dc0d7158f1..0d12b3ac89b 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
@@ -4,7 +4,7 @@ import ./jdk-linux-base.nix {
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
   sha256_i686 = "1i5pginc65xl5vxzwid21ykakmfkqn59v3g01vpr94v28w30jk32";
   sha256_x86_64 = "1r5axvr8dg2qmr4zjanj73sk9x50m7p0w3vddz8c6ckgav7438z8";
-  sha256_armv7l = "0ja97nqn4x0ji16c7r6i9nnnj3745br7qlbj97jg1s8m2wk7f9jd";
+  sha256_armv7l = "10r3nyssx8piyjaspravwgj2bnq4537041pn0lz4fk5b3473kgfb";
   jceName = "jce_policy-8.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
   sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
index 7dc0d7158f1..0d12b3ac89b 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
@@ -4,7 +4,7 @@ import ./jdk-linux-base.nix {
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
   sha256_i686 = "1i5pginc65xl5vxzwid21ykakmfkqn59v3g01vpr94v28w30jk32";
   sha256_x86_64 = "1r5axvr8dg2qmr4zjanj73sk9x50m7p0w3vddz8c6ckgav7438z8";
-  sha256_armv7l = "0ja97nqn4x0ji16c7r6i9nnnj3745br7qlbj97jg1s8m2wk7f9jd";
+  sha256_armv7l = "10r3nyssx8piyjaspravwgj2bnq4537041pn0lz4fk5b3473kgfb";
   jceName = "jce_policy-8.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
   sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";

From 798ad28134868afeea8ce543af0153c8fb87be09 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 27 Jul 2017 10:31:50 +0200
Subject: [PATCH 036/122] gnuchess: 6.2.4 -> 6.2.5

See http://lists.gnu.org/archive/html/info-gnu/2017-07/msg00012.html
---
 pkgs/games/gnuchess/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/gnuchess/default.nix b/pkgs/games/gnuchess/default.nix
index c61d46e9d33..62c5ee80304 100644
--- a/pkgs/games/gnuchess/default.nix
+++ b/pkgs/games/gnuchess/default.nix
@@ -3,10 +3,10 @@ let
   s = # Generated upstream information
   rec {
     baseName="gnuchess";
-    version="6.2.4";
+    version="6.2.5";
     name="${baseName}-${version}";
     url="mirror://gnu/chess/${name}.tar.gz";
-    sha256="1vw2w3jwnmn44d5vsw47f8y70xvxcsz9m5msq9fgqlzjch15qhiw";
+    sha256="00j8s0npgfdi41a0mr5w9qbdxagdk2v41lcr42rwl1jp6miyk6cs";
   };
   buildInputs = [
     flex

From 128430cd3ea900111c1ad4af6b3152aabcb3e038 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 27 Jul 2017 11:21:48 +0200
Subject: [PATCH 037/122] pythonPackages.django_1_10: drop

Drop django_1_10 ahead of `release-17.09`[1] branch off. Django-1.10
will not be maintained for the entire lifetime of 17.09 so only the 1.8
and 1.11 branches are maintained (both are LTS versions[2]).

[1] https://groups.google.com/forum/#!topic/nix-devel/vILGXXbeCPg
[2] https://www.djangoproject.com/download/
---
 .../python-modules/django/1_10.nix            | 36 -------------------
 pkgs/top-level/python-packages.nix            |  7 ----
 2 files changed, 43 deletions(-)
 delete mode 100644 pkgs/development/python-modules/django/1_10.nix

diff --git a/pkgs/development/python-modules/django/1_10.nix b/pkgs/development/python-modules/django/1_10.nix
deleted file mode 100644
index 52b62e8d8b8..00000000000
--- a/pkgs/development/python-modules/django/1_10.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, buildPythonPackage, fetchurl, substituteAll,
-  pythonOlder,
-  geos, gdal
-}:
-buildPythonPackage rec {
-  pname = "Django";
-  name = "${pname}-${version}";
-  version = "1.10.7";
-  disabled = pythonOlder "2.7";
-
-  src = fetchurl {
-    url = "http://www.djangoproject.com/m/releases/1.10/${name}.tar.gz";
-    sha256 = "1f5hnn2dzfr5szk4yc47bs4kk2nmrayjcvgpqi2s4l13pjfpfgar";
-  };
-
-  patches = [
-    (substituteAll {
-      src = ./1.10-gis-libs.template.patch;
-      geos = geos;
-      gdal = gdal;
-    })
-  ];
-
-  # patch only $out/bin to avoid problems with starter templates (see #3134)
-  postFixup = ''
-    wrapPythonProgramsIn $out/bin "$out $pythonPath"
-  '';
-
-  # too complicated to setup
-  doCheck = false;
-
-  meta = {
-    description = "A high-level Python Web framework";
-    homepage = https://www.djangoproject.com/;
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5a817b75292..8f0d061ed1c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9343,13 +9343,6 @@ in {
     gdal = self.gdal;
   };
 
-  # TODO: Django 1.10 will be maintained until the end of the year. Therefore,
-  # it will be dropped before 17.09.
-  # https://github.com/NixOS/nixpkgs/issues/25375#issuecomment-298522597
-  django_1_10 = callPackage ../development/python-modules/django/1_10.nix {
-    gdal = self.gdal;
-  };
-
   django_1_8 = buildPythonPackage rec {
     name = "Django-${version}";
     version = "1.8.18";

From 5a3c35cce5f80ee5421702266c4f6817203305eb Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 12:43:28 +0300
Subject: [PATCH 038/122] beignet: 1.2.1 -> 1.3.1

---
 pkgs/development/libraries/beignet/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/beignet/default.nix b/pkgs/development/libraries/beignet/default.nix
index 7f127522f05..5a17f379b01 100644
--- a/pkgs/development/libraries/beignet/default.nix
+++ b/pkgs/development/libraries/beignet/default.nix
@@ -19,11 +19,11 @@
 
 stdenv.mkDerivation rec {
   name = "beignet-${version}";
-  version = "1.2.1";
+  version = "1.3.1";
 
   src = fetchurl {
     url = "https://01.org/sites/default/files/${name}-source.tar.gz"; 
-    sha256 = "07y8ga545654jdbijmplga7a7j3jn04q5gfdjsl8cax16hsv0kmp";
+    sha256 = "07snrgjlhwl5fxz82dyqp632cnf5hp0gfqrjd2930jv79p37p6rr";
   };  
 
   patches = [ ./clang_llvm.patch ]; 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7c26ba7c826..31175f3372e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7456,7 +7456,7 @@ with pkgs;
   beecrypt = callPackage ../development/libraries/beecrypt { };
 
   beignet = callPackage ../development/libraries/beignet {
-    inherit (llvmPackages) llvm clang-unwrapped;
+    inherit (llvmPackages_39) llvm clang-unwrapped;
   };
 
   belle-sip = callPackage ../development/libraries/belle-sip { };

From 94adf8d17dba9c67aba471fc781a53ec6905fe24 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 12:43:51 +0300
Subject: [PATCH 039/122] haskellPackages.threadscope: fix build

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 9026e3aa3a6..6b9e7f071c5 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -874,4 +874,7 @@ self: super: {
   # https://github.com/diagrams/diagrams-solve/issues/4
   diagrams-solve = dontCheck super.diagrams-solve;
 
+  # Needs a newer version of ghc-events.
+  threadscope = super.threadscope.override { ghc-events = self.ghc-events_0_6_0; };
+
 }

From 519b987e7013e0f95628012d8d22e235a8b404ca Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Thu, 27 Jul 2017 13:21:59 +0100
Subject: [PATCH 040/122] jenkins: 2.66 -> 2.71

---
 .../tools/continuous-integration/jenkins/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index 8be5c6ebe85..8f545df2d8b 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jenkins-${version}";
-  version = "2.66";
+  version = "2.71";
 
   src = fetchurl {
     url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
-    sha256 = "05n03rm5vjzcz1f36829hwviw7i8l8d728nvr4cnf6mcl3rxciyl";
+    sha256 = "0b3mxbcv7afj8ksr2y33rvprj7003679j545igf5dsal82i7swhl";
   };
 
   buildCommand = ''

From 93d364f4f50ce54cd216361e4a4dd683c1933a10 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Thu, 1 Jun 2017 16:18:15 +0100
Subject: [PATCH 041/122] mongodb: we already set quiet in config

---
 nixos/modules/services/databases/mongodb.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/databases/mongodb.nix b/nixos/modules/services/databases/mongodb.nix
index c56564f57f3..78dbf0d784c 100644
--- a/nixos/modules/services/databases/mongodb.nix
+++ b/nixos/modules/services/databases/mongodb.nix
@@ -108,7 +108,7 @@ in
         after = [ "network.target" ];
 
         serviceConfig = {
-          ExecStart = "${mongodb}/bin/mongod --quiet --config ${mongoCnf} --fork --pidfilepath ${cfg.pidFile}";
+          ExecStart = "${mongodb}/bin/mongod --config ${mongoCnf} --fork --pidfilepath ${cfg.pidFile}";
           User = cfg.user;
           PIDFile = cfg.pidFile;
           Type = "forking";

From 86b230efd919c6713fe6cb36eb3d98d575934728 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Jul 2017 11:49:22 +0200
Subject: [PATCH 042/122] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.4 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/3fd8431bf5d2767b4e99a2f0ec7d06f0cdd412d6.
---
 .../haskell-modules/hackage-packages.nix      | 142 ++++++++++--------
 1 file changed, 83 insertions(+), 59 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 3902e436a78..70362f3b093 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -21689,15 +21689,17 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-flowtyped";
-       version = "0.7.1";
-       sha256 = "1b0dqscd7dz14flmjzinzdck99sqpjg4qnhy0wdl9bjajf7bfbhb";
+       version = "0.7.2";
+       sha256 = "065iw6a6bbm36yzph1f5gg8xzkaj4kkfqcak74lsdp9a60grgv87";
        libraryHaskellDepends = [
          aeson base containers free recursion-schemes reflection scientific
          text time unordered-containers vector wl-pprint
        ];
        testHaskellDepends = [
-         aeson base recursion-schemes tasty tasty-hunit text vector
+         aeson base recursion-schemes tasty tasty-hunit text
+         unordered-containers vector
        ];
+       homepage = "https://github.com/mikeplus64/aeson-flowtyped#readme";
        description = "Create Flow type definitions from Haskell data types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -33812,23 +33814,24 @@ self: {
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring
      , bytestring-lexing, case-insensitive, clustering, conduit
      , conduit-combinators, containers, criterion, data-default-class
-     , double-conversion, hexpat, HsHTSLib, http-conduit, IntervalMap
-     , math-functions, matrices, mtl, parallel, primitive, random, split
-     , statistics, tasty, tasty-golden, tasty-hunit, text, transformers
-     , unordered-containers, vector, vector-algorithms, word8
+     , data-ordlist, double-conversion, hexpat, HsHTSLib, http-conduit
+     , IntervalMap, math-functions, matrices, mtl, parallel, primitive
+     , random, split, statistics, tasty, tasty-golden, tasty-hunit, text
+     , transformers, unordered-containers, vector, vector-algorithms
+     , word8
      }:
      mkDerivation {
        pname = "bioinformatics-toolkit";
-       version = "0.3.1";
-       sha256 = "0hymk1lk26mla5al22bbj582vg96bwky6vwyqfy9b97q64w50lzl";
+       version = "0.3.2";
+       sha256 = "1zgvn1zkajslg221fk345vfgbi9pi9lr5ki3m4qpwgr3pvlz2h10";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring bytestring-lexing
          case-insensitive clustering conduit-combinators containers
-         data-default-class double-conversion hexpat HsHTSLib http-conduit
-         IntervalMap math-functions matrices mtl parallel primitive split
-         statistics text transformers unordered-containers vector
-         vector-algorithms word8
+         data-default-class data-ordlist double-conversion hexpat HsHTSLib
+         http-conduit IntervalMap math-functions matrices mtl parallel
+         primitive split statistics text transformers unordered-containers
+         vector vector-algorithms word8
        ];
        testHaskellDepends = [
          base bytestring conduit conduit-combinators data-default-class
@@ -37170,29 +37173,29 @@ self: {
      }) {};
 
   "bustle" = callPackage
-    ({ mkDerivation, base, bytestring, cairo, containers, dbus
+    ({ mkDerivation, base, bytestring, Cabal, cairo, containers, dbus
      , directory, filepath, gio, glib, gtk3, hgettext, HUnit, mtl, pango
-     , parsec, pcap, process, QuickCheck, setlocale, system-glib
-     , test-framework, test-framework-hunit, text, time
+     , pcap, process, QuickCheck, setlocale, system-glib, test-framework
+     , test-framework-hunit, text, time
      }:
      mkDerivation {
        pname = "bustle";
-       version = "0.5.4";
-       sha256 = "051z39s1xb86ab1a3v4yz8vv8k2kygpixzd878nb1p2pp6xjq74j";
+       version = "0.6.1";
+       sha256 = "18qg8fwmdq0lrfz7gyyzv6f4ch24sm925ykxb68rr996wxnmlbm2";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal directory filepath process ];
        libraryPkgconfigDepends = [ system-glib ];
        executableHaskellDepends = [
          base bytestring cairo containers dbus directory filepath gio glib
-         gtk3 hgettext mtl pango parsec pcap process setlocale text time
+         gtk3 hgettext mtl pango pcap process setlocale text time
        ];
        testHaskellDepends = [
-         base bytestring cairo containers dbus directory filepath gtk3
-         hgettext HUnit mtl pango pcap QuickCheck setlocale test-framework
-         test-framework-hunit text
+         base bytestring cairo containers dbus directory filepath gtk3 HUnit
+         mtl pango pcap QuickCheck test-framework test-framework-hunit text
        ];
-       homepage = "http://www.freedesktop.org/wiki/Software/Bustle/";
+       homepage = "https://www.freedesktop.org/wiki/Software/Bustle/";
        description = "Draw sequence diagrams of D-Bus traffic";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -38914,8 +38917,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal2nix";
-       version = "2.3.1";
-       sha256 = "0xi4mj8gyb2k9a43dp49wc84sbxpv9sfa8cmzfp0mkak0alwqahj";
+       version = "2.4";
+       sha256 = "0nmvfg1fdmkibr7c0jk68mbinvqjr91c0lh1xzrd0g1kz576y703";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -49968,10 +49971,8 @@ self: {
      }:
      mkDerivation {
        pname = "creatur";
-       version = "5.9.16";
-       sha256 = "03ipmz55cw6d8d79zv0m7cg8r6izdgy2v50xc8s7hk1sln86qbmx";
-       revision = "1";
-       editedCabalFile = "0vna37j7y2bzvhizizi69gghqqpz32w0aasy9xdaxpwq4y8wc83c";
+       version = "5.9.17";
+       sha256 = "0nlbx1pp9hzy51v9q35gqnwpwkh6lmwzxp42mql6rddbx0svp1m6";
        libraryHaskellDepends = [
          array base bytestring cereal cond directory exceptions filepath
          gray-extended hdaemonize hsyslog MonadRandom mtl old-locale process
@@ -79522,8 +79523,8 @@ self: {
      }:
      mkDerivation {
        pname = "gnss-converters";
-       version = "0.2.10";
-       sha256 = "1x5libj6rwrf39m1ksz5gzqldd7xy07glgk47cvjlszs9l5cq5i2";
+       version = "0.3.3";
+       sha256 = "1rhy280c6dx5s31maia9la6j3y62v4fjwbwhr26n5cg4xl1n3p5g";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -130996,24 +130997,25 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
-  "megaparsec_5_3_1" = callPackage
-    ({ mkDerivation, base, bytestring, containers, criterion, deepseq
-     , exceptions, hspec, hspec-expectations, mtl, QuickCheck
-     , scientific, text, transformers, weigh
+  "megaparsec_6_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, case-insensitive, containers
+     , criterion, deepseq, hspec, hspec-expectations, mtl
+     , parser-combinators, QuickCheck, scientific, text, transformers
+     , weigh
      }:
      mkDerivation {
        pname = "megaparsec";
-       version = "5.3.1";
-       sha256 = "06myn8l6jcbd494i3wr6q27npbbxd6c2gfkd2jdzwbjqjqbpv0j8";
+       version = "6.0.0";
+       sha256 = "182xvni3ambq6j7m377fpaj2cf6119dxxr5f0h88yc5jw8r9780c";
        libraryHaskellDepends = [
-         base bytestring containers deepseq exceptions mtl QuickCheck
-         scientific text transformers
+         base bytestring case-insensitive containers deepseq mtl
+         parser-combinators scientific text transformers
        ];
        testHaskellDepends = [
-         base bytestring containers exceptions hspec hspec-expectations mtl
-         QuickCheck scientific text transformers
+         base bytestring containers hspec hspec-expectations mtl QuickCheck
+         scientific text transformers
        ];
-       benchmarkHaskellDepends = [ base criterion deepseq weigh ];
+       benchmarkHaskellDepends = [ base criterion deepseq text weigh ];
        homepage = "https://github.com/mrkkrp/megaparsec";
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd2;
@@ -133996,6 +133998,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "monad-logger_0_3_25" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, conduit
+     , conduit-extra, exceptions, fast-logger, lifted-base
+     , monad-control, monad-loops, mtl, resourcet, stm, stm-chans
+     , template-haskell, text, transformers, transformers-base
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "monad-logger";
+       version = "0.3.25";
+       sha256 = "1ai55mk3n72qcdh7b6n4sv8bh5wqf2nznpzldimrwxg3m2b6g88g";
+       libraryHaskellDepends = [
+         base blaze-builder bytestring conduit conduit-extra exceptions
+         fast-logger lifted-base monad-control monad-loops mtl resourcet stm
+         stm-chans template-haskell text transformers transformers-base
+         transformers-compat
+       ];
+       homepage = "https://github.com/kazu-yamamoto/logger";
+       description = "A class of monads which can log messages";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monad-logger-json" = callPackage
     ({ mkDerivation, aeson, base, monad-logger, template-haskell, text
      }:
@@ -154897,8 +154922,8 @@ self: {
        pname = "prettyprinter";
        version = "1.1";
        sha256 = "0bksn65rvnc0f59mfzhyl9yaccfh5ap6jxj1r477izlnkfs0k03y";
-       revision = "1";
-       editedCabalFile = "0b3f3b55h49pini9fv01km1ydqwp6l687qmy193y8lcmrygnzbdy";
+       revision = "2";
+       editedCabalFile = "0gfxgc3jrnxa54arih1ys1qbswyx7waxp06ib8ifd3rw64yjn16j";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base text ];
@@ -167087,19 +167112,19 @@ self: {
   "rtcm" = callPackage
     ({ mkDerivation, aeson, array, base, base64-bytestring
      , basic-prelude, binary, binary-bits, binary-conduit, bytestring
-     , conduit, conduit-combinators, conduit-extra, lens, random
-     , resourcet, tasty, tasty-hunit, tasty-quickcheck, template-haskell
-     , text, word24
+     , conduit, conduit-combinators, conduit-extra, lens, lens-aeson
+     , random, resourcet, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell, text, word24
      }:
      mkDerivation {
        pname = "rtcm";
-       version = "0.1.12";
-       sha256 = "1pscz3a7n8a3337zh4xh44gf00hd86d4dnh059sj60gx6dac7zxh";
+       version = "0.2.2";
+       sha256 = "1fh6hvz3isv8zzmw94lkr354lm7805pr8sg5rj859skh2h49mzbb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson array base base64-bytestring basic-prelude binary binary-bits
-         bytestring lens template-haskell text word24
+         bytestring lens lens-aeson template-haskell text word24
        ];
        executableHaskellDepends = [
          aeson base basic-prelude binary-conduit bytestring conduit
@@ -168481,25 +168506,24 @@ self: {
   "sbp" = callPackage
     ({ mkDerivation, aeson, array, base, base64-bytestring
      , basic-prelude, binary, binary-conduit, bytestring, conduit
-     , conduit-combinators, conduit-extra, data-binary-ieee754, lens
-     , monad-loops, QuickCheck, resourcet, tasty, tasty-hunit
-     , tasty-quickcheck, template-haskell, text, unordered-containers
-     , yaml
+     , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops
+     , QuickCheck, resourcet, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell, text, unordered-containers, yaml
      }:
      mkDerivation {
        pname = "sbp";
-       version = "2.2.9";
-       sha256 = "0cs9gdb24s7yvrhphjwlazqbmcmc5f3a7rk39svdijh31aagd5aj";
+       version = "2.2.11";
+       sha256 = "1fdwsqh3mr90w6k4f4y8cbshx8divhfwhc06cfbdh64k8wckl27x";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson array base base64-bytestring basic-prelude binary bytestring
-         data-binary-ieee754 lens monad-loops template-haskell text
-         unordered-containers
+         data-binary-ieee754 lens lens-aeson monad-loops template-haskell
+         text unordered-containers
        ];
        executableHaskellDepends = [
          aeson base basic-prelude binary-conduit bytestring conduit
-         conduit-combinators conduit-extra resourcet yaml
+         conduit-extra resourcet yaml
        ];
        testHaskellDepends = [
          aeson base base64-bytestring basic-prelude bytestring QuickCheck

From 382db8a9ad01a933e6839fe5cab42dd6df91aac6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Jul 2017 12:54:18 +0200
Subject: [PATCH 043/122] cabal2nix: version 2.4 needs Cabal 2.x

---
 .../development/haskell-modules/configuration-ghc-8.0.x.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
index 83efa6b0b5a..bc72ec031ad 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -47,8 +47,6 @@ self: super: {
     sha256 = "026vv2k3ks73jngwifszv8l59clg88pcdr4mz0wr0gamivkfa1zy";
   });
 
-  ## GHC 8.0.2
-
   # http://hub.darcs.net/dolio/vector-algorithms/issue/9#comment-20170112T145715
   vector-algorithms = dontCheck super.vector-algorithms;
 
@@ -60,4 +58,8 @@ self: super: {
 
   # Newer versions require ghc>=8.2
   apply-refact = super.apply-refact_0_3_0_1;
+
+  # This builds needs the latest Cabal version.
+  cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_2_0_0_2; });
+
 }

From 2647ef05d48ee3bef165dc1b221371fd67ffd41d Mon Sep 17 00:00:00 2001
From: Eric Litak <elitak@gmail.com>
Date: Thu, 27 Jul 2017 07:05:05 -0700
Subject: [PATCH 044/122] factorio: 0.15.30 -> 0.15.31

---
 pkgs/games/factorio/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix
index 5c24c3ec807..fc1e0ee535b 100644
--- a/pkgs/games/factorio/default.nix
+++ b/pkgs/games/factorio/default.nix
@@ -10,7 +10,7 @@ assert releaseType == "alpha" || releaseType == "headless" || releaseType == "de
 
 with stdenv.lib;
 let
-  version = if releaseType != "demo" then "0.15.30" else "0.15.25";
+  version = if releaseType != "demo" then "0.15.31" else "0.15.31";
 
   arch = if stdenv.system == "x86_64-linux" then {
     inUrl = "linux64";
@@ -26,9 +26,9 @@ let
     url = "https://www.factorio.com/get-download/${version}/${releaseType}/${arch.inUrl}";
     name = "factorio_${releaseType}_${arch.inTar}-${version}.tar.xz";
     x64 = {
-      headless =           fetchurl { inherit name url; sha256 = "0nmr73i9acnqgphfmsps7f8jlw0f2gyal9l8pldlp4rk0cjgvszy"; };
-      alpha    = authenticatedFetch { inherit name url; sha256 = "1ydh44na2lbvdv4anrblym7d6wxwapfbwap40n3722llrsad0zsz"; };
-      demo     =           fetchurl { inherit name url; sha256 = "1qz6g8mf221ic663zk92l6rs77ggfydaw2d8g2s7wy0j9097qbsl"; };
+      headless =           fetchurl { inherit name url; sha256 = "1kbf6pj0rdiydx7g3xaqhnvvjr01g1afys2flw8x5myanffhql9x"; };
+      alpha    = authenticatedFetch { inherit name url; sha256 = "0mz7x0hc3kvs6l1isnryld08sfy8gkgq81vvmmssa3ayp5y67rh4"; };
+      demo     =           fetchurl { inherit name url; sha256 = "0zsjlgys96qlqs79m634wh36vx5d7faq4749i9lsxm88b6fylfaf"; };
     };
     i386 = {
       headless = abort "Factorio 32-bit headless binaries are not available for download.";

From bba6ba2bdd807183bc53cd799a64697fdb0feb35 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:49:32 +0300
Subject: [PATCH 045/122] svox: 2016-10-20 -> 2017-07-18

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

diff --git a/pkgs/applications/audio/svox/default.nix b/pkgs/applications/audio/svox/default.nix
index d7072e96163..a1d80c9113b 100644
--- a/pkgs/applications/audio/svox/default.nix
+++ b/pkgs/applications/audio/svox/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "svox-${version}";
-  version = "2016-10-20";
+  version = "2017-07-18";
 
   src = fetchgit {
     url = "https://android.googlesource.com/platform/external/svox";
-    rev = "2dd8f16e4436520b93e93aa72b92acad92c0127d";
-    sha256 = "064h3zb9bn1z6xbv15iy6l4rlxx8fqzy54s898qvafjhz6kawj9g";
+    rev = "7e68d0e9aac1b5d2ad15e92ddaa3bceb27973fcb";
+    sha256 = "1bqj12w23nn27x64ianm2flrqvkskpvgrnly7ah8gv6k8s8chh3r";
   };
 
   postPatch = ''

From a14ebe50c1cabf40478b4ab62369210b646fbf10 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:50:07 +0300
Subject: [PATCH 046/122] python.pkgs.libarcus: 2.4.0 -> 2.6.1

---
 pkgs/development/python-modules/libarcus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix
index bfe3b7bbb66..1e9434e3193 100644
--- a/pkgs/development/python-modules/libarcus/default.nix
+++ b/pkgs/development/python-modules/libarcus/default.nix
@@ -7,13 +7,13 @@ else
 stdenv.mkDerivation rec {
   pname = "libarcus";
   name = "${pname}-${version}";
-  version = "2.4.0";
+  version = "2.6.1";
   
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "libArcus";
     rev = version;
-    sha256 = "07lf5d42pnx0h9lgldplfdj142rbcsxx23njdblnq04di7a4937h";
+    sha256 = "1arh0gkwcjv0j3arh1w04gbwkn5glrs7gbli0b1ak7dalnicmn7c";
   };
   
   propagatedBuildInputs = [ sip protobuf ];

From 85faf94cb9fe60f6a1104dd31a3c740c0d997a17 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:50:44 +0300
Subject: [PATCH 047/122] python.pkgs.uranium: 2.4.0 -> 2.6.1

---
 pkgs/development/python-modules/uranium/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix
index 066230d0a1f..a80a09f0e64 100644
--- a/pkgs/development/python-modules/uranium/default.nix
+++ b/pkgs/development/python-modules/uranium/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, lib, fetchFromGitHub, python, cmake, pyqt5, numpy, scipy, libarcus }:
+{ stdenv, lib, fetchFromGitHub, python, cmake, pyqt5, numpy, scipy, libarcus, doxygen, gettext }:
 
 if lib.versionOlder python.version "3.5.0"
 then throw "Uranium not supported for interpreter ${python.executable}"
 else
 
 stdenv.mkDerivation rec {
-  version = "2.4.0";
+  version = "2.6.1";
   pname = "uranium";
   name = "${pname}-${version}";
   
@@ -13,12 +13,12 @@ stdenv.mkDerivation rec {
     owner = "Ultimaker";
     repo = "Uranium";
     rev = version;
-    sha256 = "1jpl0ryk8xdppillk5wzr2415n50cpa09shn1xqj6y96fg22l2il";
+    sha256 = "1682xwxf6xs1d1cfv1s7xnabqv58jjdb6szz8624b3k9rsj5l2yq";
   };
   
-  buildInputs = [ python ];
+  buildInputs = [ python gettext ];
   propagatedBuildInputs = [ pyqt5 numpy scipy libarcus ];
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake doxygen ];
 
   postPatch = ''
     sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt

From b16b8444c810d626543d098f8d1491dc5945a7c6 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:50:53 +0300
Subject: [PATCH 048/122] curaengine: 2.4.0 -> 2.6.1

---
 pkgs/applications/misc/curaengine/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix
index 08df0cc3e90..26cdb0ed3f9 100644
--- a/pkgs/applications/misc/curaengine/default.nix
+++ b/pkgs/applications/misc/curaengine/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "curaengine-${version}";
-  version = "2.4.0";
+  version = "2.6.1";
 
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "CuraEngine";
     rev = version;
-    sha256 = "1n587cqm310kzb2zbc31199x7ybgxzjq91hslb1zcb8qg8qqmixm";
+    sha256 = "1vixxxpwrprcrma0v5ckjvcy45pj32rkf5pk4w7rans9k2ig66ic";
   };
 
   nativeBuildInputs = [ cmake ];

From 3e1a1f86d1a6379c210297f856a828df256f5d99 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:51:00 +0300
Subject: [PATCH 049/122] cura: 2.4.0 -> 2.6.1

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

diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix
index e33edfb0a44..a5b17d4be9a 100644
--- a/pkgs/applications/misc/cura/default.nix
+++ b/pkgs/applications/misc/cura/default.nix
@@ -2,20 +2,20 @@
 
 mkDerivation rec {
   name = "cura-${version}";
-  version = "2.4.0";
+  version = "2.6.1";
 
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "Cura";
     rev = version;
-    sha256 = "04iglmjg9rzmlfrll6g7bcckkla327938xh8qmbdfrh215aivdlp";
+    sha256 = "03rsw6nafg3y9if2dlnzsj6c9x3x7cv6gs4a1w84jaq4p1f8fcsd";
   };
 
   buildInputs = [ qtbase ];
   propagatedBuildInputs = with python3.pkgs; [ uranium zeroconf pyserial ];
   nativeBuildInputs = [ cmake python3.pkgs.wrapPython ];
 
-  cmakeFlags = [ "-DCMAKE_MODULE_PATH=${python3.pkgs.uranium}/share/cmake-${cmake.majorVersion}/Modules" ];
+  cmakeFlags = [ "-DURANIUM_DIR=${python3.pkgs.uranium.src}" ];
 
   postPatch = ''
     sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt

From 6908d1ac7a4d10d42c6b9a15349c8d996127260c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:51:12 +0300
Subject: [PATCH 050/122] octoprint: 1.3.2 -> 1.3.4

---
 pkgs/applications/misc/octoprint/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix
index 45b704a5f47..c1c87a6db39 100644
--- a/pkgs/applications/misc/octoprint/default.nix
+++ b/pkgs/applications/misc/octoprint/default.nix
@@ -54,13 +54,13 @@ let
 
 in pythonPackages.buildPythonApplication rec {
   name = "OctoPrint-${version}";
-  version = "1.3.2";
+  version = "1.3.4";
 
   src = fetchFromGitHub {
     owner = "foosel";
     repo = "OctoPrint";
     rev = version;
-    sha256 = "0wyrxi754xa111b88fqvaw2s5ib2a925dlrgym5mn93i027m50wk";
+    sha256 = "06l8khbq3waaaa4cqpv6056w1ziylkfgzlb28v30i1h234rlkknq";
   };
 
   # We need old Tornado
@@ -69,7 +69,7 @@ in pythonPackages.buildPythonApplication rec {
     semantic-version flask_principal werkzeug flaskbabel tornado
     psutil pyserial flask_login netaddr markdown sockjs-tornado
     pylru pyyaml sarge feedparser netifaces click websocket_client
-    scandir chainmap future
+    scandir chainmap future dateutil
   ];
 
   buildInputs = with pythonPackages; [ nose mock ddt ];
@@ -90,6 +90,7 @@ in pythonPackages.buildPythonApplication rec {
       -e 's,werkzeug>=[^"]*,werkzeug,g' \
       -e 's,psutil>=[^"]*,psutil,g' \
       -e 's,requests>=[^"]*,requests,g' \
+      -e 's,future>=[^"]*,future,g' \
       setup.py
   '';
 

From 61cdadb0a8afbe01d5132f2230b060630febeff1 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:51:25 +0300
Subject: [PATCH 051/122] octoprint-plugins.m33-fio: 1.17 -> 1.20

---
 pkgs/applications/misc/octoprint/plugins.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix
index 8bc4a22bc92..46875f617a5 100644
--- a/pkgs/applications/misc/octoprint/plugins.nix
+++ b/pkgs/applications/misc/octoprint/plugins.nix
@@ -12,22 +12,17 @@ let
 
     m33-fio = buildPlugin rec {
       name = "M33-Fio-${version}";
-      version = "1.17";
+      version = "1.20";
 
       src = fetchFromGitHub {
         owner = "donovan6000";
         repo = "M33-Fio";
         rev = "V${version}";
-        sha256 = "19r860hqax09a79s9bl181ab7jsgx0pa8fvnr62lbgkwhis7m8mh";
+        sha256 = "1ng7lzlkqsjcr1w7wgzwsqkkvcvpajcj2cwqlffh95916sw8n767";
       };
 
       patches = [
         ./m33-fio-one-library.patch
-        # Fix incompatibility with new OctoPrint
-        (fetchpatch {
-          url = "https://github.com/foosel/M33-Fio/commit/bdf2422dee3fb8e53b33f087f734956c3b209d72.patch";
-          sha256 = "0jm415sx6d3m0z4gfhbnxlasg08zf3f3mslaj4amn9wbvsik9s5d";
-        })
       ];
 
       postPatch = ''

From 86e80adebb4999cc3525db2301c7c11d33ac8c45 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:51:35 +0300
Subject: [PATCH 052/122] octoprint-plugins.stlviewer: 0.3.0 -> 0.4.1

---
 pkgs/applications/misc/octoprint/plugins.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix
index 46875f617a5..81b7445ad18 100644
--- a/pkgs/applications/misc/octoprint/plugins.nix
+++ b/pkgs/applications/misc/octoprint/plugins.nix
@@ -64,13 +64,13 @@ let
 
     stlviewer = buildPlugin rec {
       name = "OctoPrint-STLViewer-${version}";
-      version = "0.3.0";
+      version = "0.4.1";
 
       src = fetchFromGitHub {
         owner = "jneilliii";
         repo = "OctoPrint-STLViewer";
         rev = "v${version}";
-        sha256 = "1a6sa8pw9ay7x27pfwr3nzb22x3jaw0c9vwyz4mrj76zkiw6svfi";
+        sha256 = "1f64s37g2d79g76v0vjnjrc2jp2gwrsnfgx7w3n0hkf1lz1pjkm0";
       };
 
       meta = with stdenv.lib; {

From 2803d0ddd7b9f5ac67acf32126a77bfb96e2762e Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:51:47 +0300
Subject: [PATCH 053/122] avidemux: 2.6.18 -> 2.6.20

---
 pkgs/applications/video/avidemux/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix
index 79e3cfbde1b..0caeed499f8 100644
--- a/pkgs/applications/video/avidemux/default.nix
+++ b/pkgs/applications/video/avidemux/default.nix
@@ -14,11 +14,11 @@
 }:
 
 let
-  version = "2.6.18";
+  version = "2.6.20";
 
   src = fetchurl {
     url = "mirror://sourceforge/avidemux/avidemux/${version}/avidemux_${version}.tar.gz";
-    sha256 = "1zmacx8wdhbjc8hpf8hmdmbh2pbkdkcyb23cl3j1mx7vkw06c31l";
+    sha256 = "17zgqz6i0bcan04wqwksf7y4z73vxmabcpnd9y5nhx7br5zwpih3";
   };
 
   common = {
@@ -88,6 +88,8 @@ let
 
       fixupPhase
     '';
+
+    meta = common.meta // args.meta or {};
   });
 
 in {
@@ -114,6 +116,8 @@ in {
     pluginUi = "GTK";
     isUi = true;
     buildDirs = [ "avidemux/gtk" ];
+    # Code seems unmaintained.
+    meta.broken = true;
   };
 
   avidemux_common = buildPlugin {

From 77ebac7ba94359540ad8d9aef1f63f971414bccb Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:52:02 +0300
Subject: [PATCH 054/122] zeromq: build with cmake

This way CMake config modules are installed.
---
 pkgs/development/libraries/zeromq/4.x.nix | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix
index 4352e7f05c2..a797960b2f0 100644
--- a/pkgs/development/libraries/zeromq/4.x.nix
+++ b/pkgs/development/libraries/zeromq/4.x.nix
@@ -1,16 +1,23 @@
-{ stdenv, fetchurl, libuuid, pkgconfig, libsodium }:
+{ stdenv, fetchFromGitHub, cmake, asciidoc }:
 
 stdenv.mkDerivation rec {
   name = "zeromq-${version}";
   version = "4.2.2";
 
-  src = fetchurl {
-    url = "https://github.com/zeromq/libzmq/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "0syzwsiqblimfjb32fr6hswhdvp3cmbk0pgm7ayxaigmkv5g88sv";
+  src = fetchFromGitHub {
+    owner = "zeromq";
+    repo = "libzmq";
+    rev = "v${version}";
+    sha256 = "09317g4zkalp3k11x6vbidcm4qf02ciml1wxgp3742lrlgcblgxy";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libuuid libsodium ];
+  nativeBuildInputs = [ cmake asciidoc ];
+
+  enableParallelBuilding = true;
+
+  postPatch = ''
+    sed -i 's,''${PACKAGE_PREFIX_DIR}/,,g' ZeroMQConfig.cmake.in
+  '';
 
   meta = with stdenv.lib; {
     branch = "4";

From bf01fc7b35094c9a6595c05980928b46d4a2ebb4 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:52:30 +0300
Subject: [PATCH 055/122] cppzmq: 2016-11-16 -> 4.2.1

---
 pkgs/development/libraries/cppzmq/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix
index b1860872df3..7361dc45db7 100644
--- a/pkgs/development/libraries/cppzmq/default.nix
+++ b/pkgs/development/libraries/cppzmq/default.nix
@@ -1,19 +1,18 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, cmake, zeromq }:
 
 stdenv.mkDerivation rec {
   name = "cppzmq-${version}";
-  version = "2016-11-16";
+  version = "4.2.1";
 
   src = fetchFromGitHub {
     owner = "zeromq";
     repo = "cppzmq";
-    rev = "8b52a6ffacce27bac9b81c852b81539a77b0a6e5";
-    sha256 = "12accjyjzfw1wqzbj1qn6q99bj5ba05flsvbanyzflr3b4971s4p";
+    rev = "v${version}";
+    sha256 = "0hy8yxb22siimq0pf6jq6kdp9lvi5f6al1xd12c9i1jyajhp1lhk";
   };
 
-  installPhase = ''
-    install -Dm644 zmq.hpp $out/include/zmq.hpp
-  '';
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ zeromq ];
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/zeromq/cppzmq";

From 147d6f7ac3090ddfd07bde75cadc97336adfdd36 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:52:39 +0300
Subject: [PATCH 056/122] folly: 2016.12.19.00 -> 2017.07.24.00

---
 pkgs/development/libraries/folly/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index 1e8d7ce543f..927e11dac9e 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -3,15 +3,23 @@
 
 stdenv.mkDerivation rec {
   name = "folly-${version}";
-  version = "2016.12.19.00";
+  version = "2017.07.24.00";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "folly";
     rev = "v${version}";
-    sha256 = "1q5nh84sxkdi4x0gwr0x7bgk33pq6071vxz5vnjkznwywhgw2hnn";
+    sha256 = "1cmqrm9yjxrw4xr1kcgzl0s7vcvp125wcgb0cz7whssgj11mf169";
   };
 
+  patches = [
+    # Fix compilation
+    (fetchpatch {
+      url = "https://github.com/facebook/folly/commit/9fc87c83d93f092859823ec32289ed1b6abeb683.patch";
+      sha256 = "0ix0grqlzm16hwa4rjbajjck8kr9lksh6c3gn7p3ihbbchsmlhvl";
+    })
+  ];
+
   nativeBuildInputs = [ autoreconfHook python pkgconfig ];
   buildInputs = [ libiberty boost libevent double_conversion glog google-gflags openssl ];
 

From f0ed27264ee1e04d3dfcf99522d05d70dcf002b5 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:52:47 +0300
Subject: [PATCH 057/122] gbenchmark: 1.1.0 -> 1.2.0

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

diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix
index 8f532ae8e0b..cf216ffcc56 100644
--- a/pkgs/development/libraries/gbenchmark/default.nix
+++ b/pkgs/development/libraries/gbenchmark/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "gbenchmark-${version}";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "benchmark";
     rev = "v${version}";
-    sha256 = "1y7k73kyxx1jlph23csnhdac76px6ghhwwxbcf0133m4rg0wmpn5";
+    sha256 = "1gld3zdxgc0c0466qvnsi70h2ksx8qprjrx008rypdhzp6660m48";
   };
 
   buildInputs = [ cmake ];

From 908a2e44da7849d435079752378f0dae1c63bbd6 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:52:54 +0300
Subject: [PATCH 058/122] libaacs: 0.8.1 -> 0.9.0

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

diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/development/libraries/libaacs/default.nix
index fc27f3a2c6b..ff184984f70 100644
--- a/pkgs/development/libraries/libaacs/default.nix
+++ b/pkgs/development/libraries/libaacs/default.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   name = "libaacs-${version}";
-  version  = "0.8.1";
+  version  = "0.9.0";
 
   src = fetchurl {
     url = "http://get.videolan.org/libaacs/${version}/${name}.tar.bz2";
-    sha256 = "1s5v075hnbs57995r6lljm79wgrip3gnyf55a0y7bja75jh49hwm";
+    sha256 = "1kms92i0c7i1yl659kqjf19lm8172pnpik5lsxp19xphr74vvq27";
   };
 
   buildInputs = [ libgcrypt libgpgerror ];

From c719f8bf0957e29efa750793bad968901278ba1e Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:53:04 +0300
Subject: [PATCH 059/122] libbluray: quote homepage

---
 pkgs/development/libraries/libbluray/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix
index 8b67d52b875..68ea7f777a2 100644
--- a/pkgs/development/libraries/libbluray/default.nix
+++ b/pkgs/development/libraries/libbluray/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
                  ;
 
   meta = with stdenv.lib; {
-    homepage = http://www.videolan.org/developers/libbluray.html;
+    homepage = "http://www.videolan.org/developers/libbluray.html";
     description = "Library to access Blu-Ray disks for video playback";
     license = licenses.lgpl21;
     maintainers = with maintainers; [ abbradar ];

From bc578738f23feb683f572fba1f8e4c6d350ec2d5 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:53:17 +0300
Subject: [PATCH 060/122] libfprint: 0.6.0 -> 0.7.0

---
 pkgs/development/libraries/libfprint/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix
index aad6214f2d4..42044f050f2 100644
--- a/pkgs/development/libraries/libfprint/default.nix
+++ b/pkgs/development/libraries/libfprint/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libusb, pixman, glib, nss, nspr, gdk_pixbuf }:
 
 stdenv.mkDerivation rec {
-  name = "libfprint-0.6.0";
+  name = "libfprint-0.7.0";
 
   src = fetchurl {
-    url = "http://people.freedesktop.org/~hadess/${name}.tar.xz";
-    sha256 = "1giwh2z63mn45galsjb59rhyrvgwcy01hvvp4g01iaa2snvzr0r5";
+    url = "https://people.freedesktop.org/~anarsoul/${name}.tar.xz";
+    sha256 = "1wzi12zvdp8sw3w5pfbd9cwz6c71627bkr88rxv6gifbyj6fwgl6";
   };
 
   buildInputs = [ libusb pixman glib nss nspr gdk_pixbuf ];

From 5fdc1e763f7b94445d10c75f94b482646a16dcc0 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:53:26 +0300
Subject: [PATCH 061/122] ipopt: 3.12.6 -> 2.12.8

---
 pkgs/development/libraries/science/math/ipopt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix
index 5e16fcb1b54..9b9f8104c95 100644
--- a/pkgs/development/libraries/science/math/ipopt/default.nix
+++ b/pkgs/development/libraries/science/math/ipopt/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ipopt-${version}";
-  version = "3.12.6";
+  version = "3.12.8";
 
   src = fetchurl {
     url = "http://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip";
-    sha256 = "0lx09h1757s5jppwnxwblcjk0biqjxy7yaf3z4vfqbl4rl93avs0";
+    sha256 = "1lyhgashyk2wswv0z2qnkxng32pim80kzf9jfgxi07wl09x753w1";
   };
 
   CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ];

From 0c5c853dcbf1a4713441f40bfc71228f306a479c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:53:35 +0300
Subject: [PATCH 062/122] libtirpc: 1.0.1 -> 1.0.2

---
 pkgs/development/libraries/ti-rpc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix
index 7a58f4c8cff..7bff890eb0b 100644
--- a/pkgs/development/libraries/ti-rpc/default.nix
+++ b/pkgs/development/libraries/ti-rpc/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, autoreconfHook, libkrb5 }:
 
 stdenv.mkDerivation rec {
-  name = "libtirpc-1.0.1";
+  name = "libtirpc-1.0.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/libtirpc/${name}.tar.bz2";
-    sha256 = "17mqrdgsgp9m92pmq7bvr119svdg753prqqxmg4cnz5y657rfmji";
+    sha256 = "1xchbxy0xql7yl7z4n1icj8r7dmly46i22fvm00vdjq64zlmqg3j";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From a762ca75d3fc751498f0a037a55023bddf06f9e7 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:53:43 +0300
Subject: [PATCH 063/122] vc: 1.3.0 -> 1.3.2

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

diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix
index c37ff733111..6bf4ab9bdab 100644
--- a/pkgs/development/libraries/vc/default.nix
+++ b/pkgs/development/libraries/vc/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "Vc-${version}";
-  version = "1.3.0";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "VcDevel";
     repo = "Vc";
     rev = version;
-    sha256 = "18vi92xxg0ly0fw4v06fwls11rahmg5z8xf65jxxrbgf37vc1wxi";
+    sha256 = "119sm0kldr5j163ff04fra35420cvpj040hs7n0mnfbcgyx4nxq9";
   };
 
   nativeBuildInputs = [ cmake ];

From 8655259bfe22b97686598345377062601480e615 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:53:54 +0300
Subject: [PATCH 064/122] python.pkgs.zeroconf: 0.18.0 -> 0.19.1

---
 pkgs/development/python-modules/zeroconf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix
index 487f657680c..28e4b0435a5 100644
--- a/pkgs/development/python-modules/zeroconf/default.nix
+++ b/pkgs/development/python-modules/zeroconf/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "zeroconf";
-  version = "0.18.0";
+  version = "0.19.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0s1840v2h4h19ad8lfadbm3dhzs8bw9c5c3slkxql1zsaiycvjy2";
+    sha256 = "0ykzg730n915qbrq9bn5pn06bv6rb5zawal4sqjyfnjjm66snkj3";
   };
 
   propagatedBuildInputs = [ netifaces six enum-compat ];

From f4312a30241fd88c3b4bb38ba62999865073ad94 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:54:02 +0300
Subject: [PATCH 065/122] crawl: 0.19.0 -> 0.20.1

---
 pkgs/games/crawl/crawl_purify.patch | 22 ++++++++++++++--------
 pkgs/games/crawl/default.nix        |  4 ++--
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/pkgs/games/crawl/crawl_purify.patch b/pkgs/games/crawl/crawl_purify.patch
index 766b633057d..808a4109f7b 100644
--- a/pkgs/games/crawl/crawl_purify.patch
+++ b/pkgs/games/crawl/crawl_purify.patch
@@ -1,18 +1,24 @@
-diff -ru3 crawl-ref-0.19.1-src-old/crawl-ref/source/Makefile crawl-ref-0.19.1-src/crawl-ref/source/Makefile
---- crawl-ref-0.19.1-src-old/crawl-ref/source/Makefile	1970-01-01 03:00:01.000000000 +0300
-+++ crawl-ref-0.19.1-src/crawl-ref/source/Makefile	2016-11-23 15:37:15.303077886 +0300
-@@ -285,7 +285,7 @@
+diff -ru3 crawl-ref-0.20.1-src-old/crawl-ref/source/Makefile crawl-ref-0.20.1-src-new/crawl-ref/source/Makefile
+--- crawl-ref-0.20.1-src-old/crawl-ref/source/Makefile	1970-01-01 03:00:01.000000000 +0300
++++ crawl-ref-0.20.1-src-new/crawl-ref/source/Makefile	2017-07-27 14:45:34.611221571 +0300
+@@ -286,13 +286,7 @@
  LIBZ := contrib/install/$(ARCH)/lib/libz.a
  
  ifndef CROSSHOST
--	SQLITE_INCLUDE_DIR := /usr/include
+-	# FreeBSD keeps all of its userland includes in /usr/local so
+-	# look there
+-	ifeq ($(uname_S),FreeBSD)
+-		SQLITE_INCLUDE_DIR := /usr/local/include
+-	else
+-		SQLITE_INCLUDE_DIR := /usr/include
+-	endif
 +	SQLITE_INCLUDE_DIR := ${sqlite}/include
  else
  	# This is totally wrong, works only with some old-style setups, and
  	# on some architectures of Debian/new FHS multiarch -- excluding, for
-diff -ru3 crawl-ref-0.19.1-src-old/crawl-ref/source/util/find_font crawl-ref-0.19.1-src/crawl-ref/source/util/find_font
---- crawl-ref-0.19.1-src-old/crawl-ref/source/util/find_font	1970-01-01 03:00:01.000000000 +0300
-+++ crawl-ref-0.19.1-src/crawl-ref/source/util/find_font	2016-11-23 15:39:04.044031141 +0300
+diff -ru3 crawl-ref-0.20.1-src-old/crawl-ref/source/util/find_font crawl-ref-0.20.1-src-new/crawl-ref/source/util/find_font
+--- crawl-ref-0.20.1-src-old/crawl-ref/source/util/find_font	1970-01-01 03:00:01.000000000 +0300
++++ crawl-ref-0.20.1-src-new/crawl-ref/source/util/find_font	2017-07-27 14:44:29.784235540 +0300
 @@ -1,6 +1,6 @@
  #! /bin/sh
  
diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix
index b6259c033af..9d6f6b33e69 100644
--- a/pkgs/games/crawl/default.nix
+++ b/pkgs/games/crawl/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "crawl-${version}${lib.optionalString tileMode "-tiles"}";
-  version = "0.19.3";
+  version = "0.20.1";
 
   src = fetchFromGitHub {
     owner = "crawl-ref";
     repo = "crawl-ref";
     rev = version;
-    sha256 = "1qn6r5pg568pk8zgp2ijn04h4brvw675q4nxkkvzyf76ljbpzif7";
+    sha256 = "1ic3prvydmw753lasrvzgndcw0k4329pnafpphfpxwvdfsmhbi26";
   };
 
   patches = [ ./crawl_purify.patch ];

From 342b987b195a15819d0547239ece34cb421f48b3 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:54:23 +0300
Subject: [PATCH 066/122] dwarf-fortress-packages.dfhack: 0.43.05-r1 ->
 0.43.05-r2

---
 pkgs/games/dwarf-fortress/dfhack/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix
index ba9cd1e5805..0247d69bb56 100644
--- a/pkgs/games/dwarf-fortress/dfhack/default.nix
+++ b/pkgs/games/dwarf-fortress/dfhack/default.nix
@@ -5,14 +5,12 @@
 
 let
   dfVersion = "0.43.05";
-  # version = "${dfVersion}-r1";
-  # rev = "refs/tags/${version}";
-  version = "${dfVersion}-r1";
+  version = "${dfVersion}-r2";
   rev = "refs/tags/${version}";
-  sha256 = "1hw0miimzx52p36jm9bimsm5j68rb7dd9kw0yivcwbwixbajsi1w";
+  sha256 = "18zbxri5rch750m431pdmlk4xi7nc14iif3i7glxrgy2h5nfaw5c";
 
   # revision of library/xml submodule
-  xmlRev = "a8e80088b9cc934da993dc244ece2d0ae14143da";
+  xmlRev = "3322beb2e7f4b28ff8e573e9bec738c77026b8e9";
 
   arch =
     if stdenv.system == "x86_64-linux" then "64"
@@ -51,6 +49,12 @@ in stdenv.mkDerivation rec {
   # We don't use system libraries because dfhack needs old C++ ABI.
   buildInputs = [ zlib ];
 
+  preConfigure = ''
+    # Trick build system into believing we have .git
+    mkdir -p .git/modules/library/xml
+    touch .git/index .git/modules/library/xml/index
+  '';
+
   preBuild = ''
     export LD_LIBRARY_PATH="$PWD/depends/protobuf:$LD_LIBRARY_PATH"
   '';

From 679d7f563a2610e2b16a481ade3a308a655a04a3 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:54:34 +0300
Subject: [PATCH 067/122] ioquake3-git: 2017-01-27 -> 2017-07-25

---
 pkgs/games/quake3/ioquake/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix
index 734f9daa970..47dd6a130e8 100644
--- a/pkgs/games/quake3/ioquake/default.nix
+++ b/pkgs/games/quake3/ioquake/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "ioquake3-git-${version}";
-  version = "2017-01-27";
+  version = "2017-07-25";
 
   src = fetchFromGitHub {
     owner = "ioquake";
     repo = "ioq3";
-    rev = "468da0fabca2f21b811a501c184b986e270c5113";
-    sha256 = "14mhkqn6h2mbmz90j4ns1wp72ca5w9481sbyw2ving8xpw376i58";
+    rev = "356ae10ef65d4401958d50f03288dcb22d957c96";
+    sha256 = "0dz4zqlb9n3skaicj0vfvq4nr3ig80s8nwj9m87b39wc9wq34c5j";
   };
 
   nativeBuildInputs = [ which pkgconfig ];

From 861a75a64cf308179d375b88ebe46872cb2f7a5e Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:54:45 +0300
Subject: [PATCH 068/122] the-powder-toy: 91.5.330 -> 92.0.331

---
 pkgs/games/the-powder-toy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix
index f72307e0172..d28608be9c2 100644
--- a/pkgs/games/the-powder-toy/default.nix
+++ b/pkgs/games/the-powder-toy/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "the-powder-toy-${version}";
-  version = "91.5.330";
+  version = "92.0.331";
 
   src = fetchFromGitHub {
     owner = "simtr";
     repo = "The-Powder-Toy";
     rev = "v${version}";
-    sha256 = "19m7jyg3pnppymvr6lz454mjiw18hvldpdhi33596m9ji3nrq8x7";
+    sha256 = "185zlg20qk6ic9llyf4xka923snqrpdazg568raz0jiafzzsirax";
   };
 
   patches = [ ./fix-env.patch ];

From 81bb5856eb961ebc8a3515741a8204e29786317a Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:54:53 +0300
Subject: [PATCH 069/122] bbswitch: quote homepage

---
 pkgs/os-specific/linux/bbswitch/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix
index 67b843fac4d..4489a94f1ed 100644
--- a/pkgs/os-specific/linux/bbswitch/default.nix
+++ b/pkgs/os-specific/linux/bbswitch/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     description = "A module for powering off hybrid GPUs";
     platforms = platforms.linux;
-    homepage = https://github.com/Bumblebee-Project/bbswitch;
+    homepage = "https://github.com/Bumblebee-Project/bbswitch";
     maintainers = with maintainers; [ abbradar ];
   };
 }

From e9520bab01623fa2ec83e7a5fe3ad9a919748ccc Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:55:02 +0300
Subject: [PATCH 070/122] ejabberd: 17.01 -> 17.07

---
 pkgs/servers/xmpp/ejabberd/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix
index b898abc9778..2799241fa99 100644
--- a/pkgs/servers/xmpp/ejabberd/default.nix
+++ b/pkgs/servers/xmpp/ejabberd/default.nix
@@ -23,12 +23,12 @@ let
   ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ];
 
 in stdenv.mkDerivation rec {
-  version = "17.01";
+  version = "17.07";
   name = "ejabberd-${version}";
 
   src = fetchurl {
     url = "http://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz";
-    sha256 = "02y9f1zxqvqrhapfay3avkys0llpyjsag6rpz5vfig01zqjqzyky";
+    sha256 = "1p8ppp2czjgnq8xnhyksd82npvvx99fwr0g3rrq1wvnwh2vgb8km";
   };
 
   nativeBuildInputs = [ fakegit ];
@@ -74,7 +74,7 @@ in stdenv.mkDerivation rec {
 
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash = "0flybfhq6qv1ihsjfg9p7191bffip7gpizg29wdbf1x6qgxhpz5r";
+    outputHash = "1q9yzccn4zf5i4hibq1r0i34q4986a93ph4792l1ph07aiisc8p7";
   };
 
   configureFlags =

From 21ad2a163157f98ff12ede2584710ad89f9aa6dd Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:55:12 +0300
Subject: [PATCH 071/122] virtualglLib: 2.5.1 -> 2.5.2

---
 pkgs/tools/X11/virtualgl/lib.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix
index c9530a5cdd9..b0c1dd3c444 100644
--- a/pkgs/tools/X11/virtualgl/lib.nix
+++ b/pkgs/tools/X11/virtualgl/lib.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "virtualgl-lib-${version}";
-  version = "2.5.1";
+  version = "2.5.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/virtualgl/VirtualGL-${version}.tar.gz";
-    sha256 = "0n9ngwji9k0hqy81ridndf7z4lwq5dzmqw66r6vxfz15aw0jwd6s";
+    sha256 = "0f1jp7r4vajiksbiq08hkxd5bjj0jxlw7dy5750s52djg1v3hhsg";
   };
 
   cmakeFlags = [ "-DVGL_SYSTEMFLTK=1" "-DTJPEG_LIBRARY=${libjpeg_turbo.out}/lib/libturbojpeg.so" ];

From a90fb0f55087f99e104142610ccd1ea7de9e8e48 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:55:38 +0300
Subject: [PATCH 072/122] dropbear: 2016.74 -> 2017.75

---
 pkgs/tools/networking/dropbear/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix
index a918aa6375f..2b50e320c38 100644
--- a/pkgs/tools/networking/dropbear/default.nix
+++ b/pkgs/tools/networking/dropbear/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "dropbear-2016.74";
+  name = "dropbear-2017.75";
 
   src = fetchurl {
     url = "http://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2";
-    sha256 = "14c8f4gzixf0j9fkx68jgl85q7b05852kk0vf09gi6h0xmafl817";
+    sha256 = "1309cm2aw62n9m3h38prvgsqr8bj85hfasgnvwkd42cp3k5ivg3c";
   };
 
   dontDisableStatic = enableStatic;

From 9ffdbe38531e539021f13c2242be562f2754d868 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:56:48 +0300
Subject: [PATCH 073/122] update-resolv-conf: 2016-09-30 -> 2017-06-21

---
 pkgs/tools/networking/openvpn/update-resolv-conf.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/openvpn/update-resolv-conf.nix b/pkgs/tools/networking/openvpn/update-resolv-conf.nix
index 186d5109b94..2f9c0aae3b8 100644
--- a/pkgs/tools/networking/openvpn/update-resolv-conf.nix
+++ b/pkgs/tools/networking/openvpn/update-resolv-conf.nix
@@ -4,13 +4,13 @@ let
   binPath = lib.makeBinPath [ coreutils openresolv systemd ];
 
 in stdenv.mkDerivation rec {
-  name = "update-resolv-conf-2016-09-30";
+  name = "update-resolv-conf-2017-06-21";
 
   src = fetchFromGitHub {
     owner = "masterkorp";
     repo = "openvpn-update-resolv-conf";
-    rev = "09cb5ab5a50dfd6e77e852749d80bef52d7a6b34";
-    sha256 = "0s5cilph0p0wiixj7nlc7f3hqmr1mhvbfyapd0060n3y6xgps9y9";
+    rev = "43093c2f970bf84cd374e18ec05ac6d9cae444b8";
+    sha256 = "1lf66bsgv2w6nzg1iqf25zpjf4ckcr45adkpgdq9gvhkfnvlp8av";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From bc52bf2cfe3dd19fe65095f8b60dd880db38ca4d Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:57:12 +0300
Subject: [PATCH 074/122] citra: init at 2017-07-26

---
 pkgs/misc/emulators/citra/default.nix | 33 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  4 ++++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/misc/emulators/citra/default.nix

diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/misc/emulators/citra/default.nix
new file mode 100644
index 00000000000..ae380f3cc54
--- /dev/null
+++ b/pkgs/misc/emulators/citra/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchgit, cmake, SDL2, qtbase, boost, curl, gtest }:
+
+stdenv.mkDerivation rec { 
+  name = "citra-2017-07-26";
+
+  # Submodules
+  src = fetchgit {
+    url = "https://github.com/citra-emu/citra";
+    rev = "a724fb365787718f9e44adedc14e59d0854905a6";
+    sha256 = "0lkrwhxvq85c0smix27xvj8m463bxa67qhy8m8r43g39n0h8d5sf";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ SDL2 qtbase boost curl gtest ];
+  cmakeFlags = [ "-DUSE_SYSTEM_CURL=ON" "-DUSE_SYSTEM_GTEST=ON" ];
+
+  preConfigure = ''
+    # Trick configure system.
+    sed -n 's,^ *path = \(.*\),\1,p' .gitmodules | while read path; do
+      mkdir "$path/.git"
+    done
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = "https://citra-emu.org/";
+    description = "An open-source emulator for the Nintendo 3DS capable of playing many of your favorite games.";
+    platforms = platforms.linux;
+    license = licenses.gpl20;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 31175f3372e..532175fb161 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1331,6 +1331,10 @@ with pkgs;
 
   citrix_receiver = callPackage ../applications/networking/remote/citrix-receiver { };
 
+  citra = libsForQt5.callPackage ../misc/emulators/citra {
+    boost = boost163;
+  };
+
   cmst = libsForQt5.callPackage ../tools/networking/cmst { };
 
   colord = callPackage ../tools/misc/colord { };

From a91cb71a839ff7fa9f431ef0d34c2938d9309846 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:57:28 +0300
Subject: [PATCH 075/122] python.pkgs.python-axolotl: 0.1.35 -> 0.1.39

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8f0d061ed1c..dab241f6e8a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8201,11 +8201,11 @@ in {
 
   python-axolotl = buildPythonPackage rec {
     name = "python-axolotl-${version}";
-    version = "0.1.35";
+    version = "0.1.39";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/python-axolotl/${name}.tar.gz";
-      sha256 = "0ch2d5wqfgxy22dkbxwzilq91wkqy9ficrjy39qhal8g8rdc4jr0";
+      sha256 = "09bf5gfip9x2wr0ij43p39ac6z2iqzn7kgpi2jjbwpnhs0vwkycs";
     };
 
     propagatedBuildInputs = with self; [ python-axolotl-curve25519 protobuf3_0 pycrypto ];
@@ -8231,7 +8231,7 @@ in {
     };
 
     meta = {
-      homepage = "https://github.com/tgalal/python-axolotl";
+      homepage = "https://github.com/tgalal/python-axolotl-curve25519";
       description = "Curve25519 with ed25519 signatures";
       maintainers = with maintainers; [ abbradar ];
       license = licenses.gpl3;

From 411fe648bdac72b7aaf85c1c1a2d5e2bd2006a0e Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:57:52 +0300
Subject: [PATCH 076/122] python.pkgs.pydns: use py3dns 3.1.1a for python3

---
 pkgs/top-level/python-packages.nix | 41 +++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 9 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dab241f6e8a..73d35645ff0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22220,18 +22220,41 @@ in {
     doCheck = false;
   };
 
-  pydns = buildPythonPackage rec {
-    name = "pydns-2.3.6";
-    disabled = isPy3k;
+  pydns =
+    let
+      py3 = buildPythonPackage rec {
+        name = "${pname}-${version}";
+        pname = "py3dns";
+        version = "3.1.1a";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pydns/${name}.tar.gz";
-      sha256 = "0qnv7i9824nb5h9psj0rwzjyprwgfiwh5s5raa9avbqazy5hv5pi";
-    };
+        src = fetchPypi {
+          inherit pname version;
+          sha256 = "0z0qmx9j1ivpgg54gqqmh42ljnzxaychc5inz2gbgv0vls765smz";
+        };
 
-    doCheck = false;
+        preConfigure = ''
+          sed -i \
+            -e '/import DNS/d' \
+            -e 's/DNS.__version__/"${version}"/g' \
+            setup.py
+        '';
 
-  };
+        doCheck = false;
+      };
+
+      py2 = buildPythonPackage rec {
+        name = "${pname}-${version}";
+        pname = "pydns";
+        version = "2.3.6";
+
+        src = fetchPypi {
+          inherit pname version;
+          sha256 = "0qnv7i9824nb5h9psj0rwzjyprwgfiwh5s5raa9avbqazy5hv5pi";
+        };
+
+        doCheck = false;
+      };
+    in if isPy3k then py3 else py2;
 
   pythondaemon = buildPythonPackage rec {
     name = "python-daemon-${version}";

From c10cf27589669920f4c2a33e03fabc83d3fcb223 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:58:24 +0300
Subject: [PATCH 077/122] python.pkgs.ipaddr: 2.1.10 -> 2.1.11

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 73d35645ff0..7783f23a38d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11846,12 +11846,13 @@ in {
   ipywidgets = callPackage ../development/python-modules/ipywidgets { };
 
   ipaddr = buildPythonPackage rec {
-    name = "ipaddr-2.1.10";
+    name = "ipaddr-${version}";
+    version = "2.1.11";
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/i/ipaddr/${name}.tar.gz";
-      sha256 = "18ycwkfk3ypb1yd09wg20r7j7zq2a73d7j6j10qpgra7a7abzhyj";
+      sha256 = "1dwq3ngsapjc93fw61rp17fvzggmab5x1drjzvd4y4q0i255nm8v";
     };
 
     meta = {

From 53c3e5ee979ed71c5a6750b0880ddbfe9e179627 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:58:38 +0300
Subject: [PATCH 078/122] python.pkgs.netifaces: 0.10.5 -> 0.10.6

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7783f23a38d..a39249bab5f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14220,12 +14220,12 @@ in {
   };
 
   netifaces = buildPythonPackage rec {
-    version = "0.10.5";
+    version = "0.10.6";
     name = "netifaces-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/n/netifaces/${name}.tar.gz";
-      sha256 = "12v2bm77dgaqjm9vmb8in0zpip2hn98mf5sycfvgq5iivm9avn2r";
+      sha256 = "1q7bi5k2r955rlcpspx4salvkkpk28jky67fjbpz2dkdycisak8c";
     };
 
     meta = {

From 3a04b2c318be9133e6880732ce9c7d41ad6c5ea8 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:59:00 +0300
Subject: [PATCH 079/122] python.pkgs.pypolicyd-spf: 1.3 -> 2.0

---
 pkgs/top-level/python-packages.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a39249bab5f..2087ec506f3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8241,15 +8241,16 @@ in {
 
   pypolicyd-spf = buildPythonPackage rec {
     name = "pypolicyd-spf-${version}";
-    majorVersion = "1.3";
-    version = "${majorVersion}.2";
+    majorVersion = "2.0";
+    version = "${majorVersion}.1";
+    disabled = !isPy3k;
 
     src = pkgs.fetchurl {
       url = "https://launchpad.net/pypolicyd-spf/${majorVersion}/${version}/+download/${name}.tar.gz";
-      sha256 = "0ri9bdwn1k8xlyfhrgzns7wjvp5h08dq5fnxcq6mphy94rmc8x3i";
+      sha256 = "09yi8y7pij5vzzrkc9sdw01x8w5n758d0qg7wv5hxd1l6if8c94i";
     };
 
-    propagatedBuildInputs = with self; [ pyspf pydns ipaddr ];
+    propagatedBuildInputs = with self; [ pyspf ];
 
     preBuild = ''
       substituteInPlace setup.py --replace "'/etc'" "'$out/etc'"

From 4907e58a02a052f7b5f01bda54904ae6beafdc30 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 15:59:10 +0300
Subject: [PATCH 080/122] python.pkgs.pyspf: add pydns to dependencies

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2087ec506f3..a34dfa5719d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8460,6 +8460,8 @@ in {
       sha256 = "18j1rmbmhih7q6y12grcj169q7sx1986qn4gmpla9y5gwfh1p8la";
     };
 
+    propagatedBuildInputs = with self; [ pydns ];
+
     meta = {
       homepage = "http://bmsi.com/python/milter.html";
       description = "Python API for Sendmail Milters (SPF)";

From 732207f456fdf9b20771af01721abe7771ec2d60 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 27 Jul 2017 17:28:13 +0300
Subject: [PATCH 081/122] citra: fix license field

---
 pkgs/misc/emulators/citra/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/misc/emulators/citra/default.nix
index ae380f3cc54..669935c281c 100644
--- a/pkgs/misc/emulators/citra/default.nix
+++ b/pkgs/misc/emulators/citra/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     homepage = "https://citra-emu.org/";
     description = "An open-source emulator for the Nintendo 3DS capable of playing many of your favorite games.";
     platforms = platforms.linux;
-    license = licenses.gpl20;
+    license = licenses.gpl2;
     maintainers = with maintainers; [ abbradar ];
   };
 }

From d31e7ee1bdddde42fcc7f38b9c88b485a1760efb Mon Sep 17 00:00:00 2001
From: Muhammad Herdiansyah <herdiansyah@openmailbox.org>
Date: Thu, 27 Jul 2017 21:06:01 +0700
Subject: [PATCH 082/122] nawk: init at 20121220

---
 lib/maintainers.nix              |  1 +
 pkgs/tools/text/nawk/default.nix | 41 ++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 3 files changed, 44 insertions(+)
 create mode 100644 pkgs/tools/text/nawk/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index a80b7c41a00..fc558b64abd 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -291,6 +291,7 @@
   kierdavis = "Kier Davis <kierdavis@gmail.com>";
   kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
   knedlsepp = "Josef Kemetmüller <josef.kemetmueller@gmail.com>";
+  konimex = "Muhammad Herdiansyah <herdiansyah@openmailbox.org>";
   koral = "Koral <koral@mailoo.org>";
   kovirobi = "Kovacsics Robert <kovirobi@gmail.com>";
   kragniz = "Louis Taylor <louis@kragniz.eu>";
diff --git a/pkgs/tools/text/nawk/default.nix b/pkgs/tools/text/nawk/default.nix
new file mode 100644
index 00000000000..d3056735b8d
--- /dev/null
+++ b/pkgs/tools/text/nawk/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, yacc }:
+
+stdenv.mkDerivation rec {
+  name = "nawk-20121220";
+
+  src = fetchurl {
+    url = "https://www.cs.princeton.edu/~bwk/btl.mirror/awk.tar.gz";
+    sha256 = "10wvdn7xwc5bbp5h7l0b9fxby3bds21n8a34z54i8kjsbhb95h4d";
+  };
+
+  nativeBuildInputs = [ yacc ];
+
+  unpackPhase = ''
+    mkdir build
+    cd build
+    tar xvf ${src}
+  '';
+
+  patchPhase = ''
+    substituteInPlace ./makefile \
+    --replace "YACC = yacc -d -S" ""
+  '';
+
+  installPhase = ''
+    install -Dm755 a.out "$out/bin/nawk"
+    install -Dm644 awk.1 "$out/share/man/man1/nawk.1"
+  '';
+
+  meta = {
+    description = "The one, true implementation of AWK";
+    longDescription = ''
+       This is the version of awk described in "The AWK Programming
+       Language", by Al Aho, Brian Kernighan, and Peter Weinberger
+       (Addison-Wesley, 1988, ISBN 0-201-07981-X).
+    '';
+    homepage = https://www.cs.princeton.edu/~bwk/btl.mirror/;
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.konimex ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7c26ba7c826..431b441b549 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3288,6 +3288,8 @@ with pkgs;
 
   nasty = callPackage ../tools/security/nasty { };
 
+  nawk = callPackage ../tools/text/nawk { };
+
   nbd = callPackage ../tools/networking/nbd { };
 
   ndjbdns = callPackage ../tools/networking/ndjbdns { };

From 4456076bc72c8be3e425a0349e4bd768e474130d Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 27 Jul 2017 18:54:05 +0300
Subject: [PATCH 083/122] keyutils: 1.5.9 -> 1.5.10

---
 pkgs/os-specific/linux/keyutils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/os-specific/linux/keyutils/default.nix
index 2aba3ef9112..c7915ace7ca 100644
--- a/pkgs/os-specific/linux/keyutils/default.nix
+++ b/pkgs/os-specific/linux/keyutils/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "keyutils-${version}";
-  version = "1.5.9";
+  version = "1.5.10";
 
   src = fetchurl {
     url = "http://people.redhat.com/dhowells/keyutils/${name}.tar.bz2";
-    sha256 = "1bl3w03ygxhc0hz69klfdlwqn33jvzxl1zfl2jmnb2v85iawb8jd";
+    sha256 = "1dmgjcf7mnwc6h72xkvpaqpzxw8vmlnsmzz0s27pg0giwzm3sp0i";
   };
 
   outputs = [ "out" "lib" "dev" ];

From 688dc4e4c3fd76cc77c75839082631d88c942794 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Thu, 27 Jul 2017 13:17:13 +0000
Subject: [PATCH 084/122] tinc_pre: avoid infinite loop with EBADFD on network
 restart

---
 nixos/modules/services/networking/tinc.nix |  3 ++-
 pkgs/tools/networking/tinc/pre.nix         | 10 +++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix
index 42341b2d412..31a588318f6 100644
--- a/nixos/modules/services/networking/tinc.nix
+++ b/nixos/modules/services/networking/tinc.nix
@@ -169,7 +169,8 @@ in
         serviceConfig = {
           Type = "simple";
           PIDFile = "/run/tinc.${network}.pid";
-          Restart = "on-failure";
+          Restart = "always";
+          RestartSec = "3";
         };
         preStart = ''
           mkdir -p /etc/tinc/${network}/hosts
diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix
index c09c9a45756..1d80db68991 100644
--- a/pkgs/tools/networking/tinc/pre.nix
+++ b/pkgs/tools/networking/tinc/pre.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }:
+{ stdenv, fetchgit, fetchpatch, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }:
 
 stdenv.mkDerivation rec {
   name = "tinc-${version}";
@@ -19,6 +19,14 @@ stdenv.mkDerivation rec {
     substituteInPlace configure.ac --replace UNKNOWN ${version}
   '';
 
+  patches = [
+    # Avoid infinite loop with "Error while reading from Linux tun/tap device (tun mode) /dev/net/tun: File descriptor in bad state" on network restart
+    (fetchpatch {
+      url = https://github.com/gsliepen/tinc/compare/acefa66...e4544db.patch;
+      sha256 = "1jz7anqqzk7j96l5ifggc2knp14fmbsjdzfrbncxx0qhb6ihdcvn";
+    })
+  ];
+
   postInstall = ''
     rm $out/bin/tinc-gui
   '';

From 2799a94963aaf37f059b5ed4c0d2b0cf98ba445e Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 27 Jul 2017 19:00:54 +0200
Subject: [PATCH 085/122] zfs, spl: 0.6.5.11 -> 0.7.0

---
 nixos/doc/manual/release-notes/rl-1709.xml |   6 +
 nixos/modules/rename.nix                   |   1 +
 nixos/modules/tasks/filesystems/zfs.nix    |  19 +-
 pkgs/os-specific/linux/spl/default.nix     | 106 +++++-----
 pkgs/os-specific/linux/zfs/default.nix     | 214 +++++++++------------
 pkgs/top-level/all-packages.nix            |  18 +-
 6 files changed, 149 insertions(+), 215 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index 72dfd60bedd..77ee9052fe5 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -157,6 +157,12 @@ rmdir /var/lib/ipfs/.ipfs
       module where user Fontconfig settings are available.
     </para>
   </listitem>
+  <listitem>
+    <para>
+      ZFS/SPL have been updated to 0.7.0, <literal>zfsUnstable, splUnstable</literal>
+      have therefore been removed.
+    </para>
+  </listitem>
 
 </itemizedlist>
 
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index c3fb5758ede..08146d1f568 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -204,6 +204,7 @@ with lib;
       "Set the option `services.xserver.displayManager.sddm.package' instead.")
     (mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "")
     (mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "")
+    (mkRemovedOptionModule [ "boot" "zfs" "enableUnstable" ] "0.7.0 is now the default")
 
     # ZSH
     (mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ])
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index 2de3a3d8a33..f300091b11e 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -24,11 +24,7 @@ let
 
   kernel = config.boot.kernelPackages;
 
-  packages = if config.boot.zfs.enableUnstable then {
-    spl = kernel.splUnstable;
-    zfs = kernel.zfsUnstable;
-    zfsUser = pkgs.zfsUnstable;
-  } else {
+  packages = {
     spl = kernel.spl;
     zfs = kernel.zfs;
     zfsUser = pkgs.zfs;
@@ -62,19 +58,6 @@ in
 
   options = {
     boot.zfs = {
-      enableUnstable = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Use the unstable zfs package. This might be an option, if the latest
-          kernel is not yet supported by a published release of ZFS. Enabling
-          this option will install a development version of ZFS on Linux. The
-          version will have already passed an extensive test suite, but it is
-          more likely to hit an undiscovered bug compared to running a released
-          version of ZFS on Linux.
-        '';
-      };
-
       extraPools = mkOption {
         type = types.listOf types.str;
         default = [];
diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index 941bd8a8671..865be70f34d 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -6,67 +6,57 @@
 }:
 
 with stdenv.lib;
+
 let
   buildKernel = any (n: n == configFile) [ "kernel" "all" ];
   buildUser = any (n: n == configFile) [ "user" "all" ];
-
-  common = { version, sha256 } @ args : stdenv.mkDerivation rec {
-    name = "spl-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
-
-    src = fetchFromGitHub {
-      owner = "zfsonlinux";
-      repo = "spl";
-      rev = "spl-${version}";
-      inherit sha256;
-    };
-
-    patches = [ ./const.patch ./install_prefix.patch ];
-
-    nativeBuildInputs = [ autoreconfHook ];
-
-    hardeningDisable = [ "pic" ];
-
-    preConfigure = ''
-      substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid
-      substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin"
-      substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"
-      substituteInPlace ./module/splat/splat-linux.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"
-    '';
-
-    configureFlags = [
-      "--with-config=${configFile}"
-    ] ++ optionals buildKernel [
-      "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
-      "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
-    ];
-
-    enableParallelBuilding = true;
-
-    meta = {
-      description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)";
-
-      longDescription = ''
-          This kernel module is a porting layer for ZFS to work inside the linux
-          kernel.
-      '';
-
-      homepage = http://zfsonlinux.org/;
-      platforms = platforms.linux;
-      license = licenses.gpl2Plus;
-      maintainers = with maintainers; [ jcumming wizeman wkennington fpletz ];
-    };
-  };
-
 in
   assert any (n: n == configFile) [ "kernel" "user" "all" ];
   assert buildKernel -> kernel != null;
-  {
-    splStable = common {
-      version = "0.6.5.11";
-      sha256 = "192val8035pj2rryi3fwb134avzirhv5ifaj5021vh8bbjx75pd5";
-    };
-    splUnstable = common {
-      version = "0.7.0-rc5";
-      sha256 = "17y25g02c9swi3n90lhjvazcnsr69nh50dz3b8g1c08zlz9n2akp";
-    };
-  }
+stdenv.mkDerivation rec {
+  name = "spl-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
+  version = "0.7.0";
+
+  src = fetchFromGitHub {
+    owner = "zfsonlinux";
+    repo = "spl";
+    rev = "spl-${version}";
+    sha256 = "05qqwhxc9nj94y28c97iwfz8gkjwicrhnkj425yb47gqa8rafazk";
+  };
+
+  patches = [ ./const.patch ./install_prefix.patch ];
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  hardeningDisable = [ "pic" ];
+
+  preConfigure = ''
+    substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid
+    substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin"
+    substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"
+    substituteInPlace ./module/splat/splat-linux.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"
+  '';
+
+  configureFlags = [
+    "--with-config=${configFile}"
+  ] ++ optionals buildKernel [
+    "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
+    "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)";
+
+    longDescription = ''
+      This kernel module is a porting layer for ZFS to work inside the linux
+      kernel.
+    '';
+
+    homepage = http://zfsonlinux.org/;
+    platforms = platforms.linux;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ jcumming wizeman wkennington fpletz globin ];
+  };
+}
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index f281e5b590e..45f1788bf63 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -12,145 +12,105 @@ with stdenv.lib;
 let
   buildKernel = any (n: n == configFile) [ "kernel" "all" ];
   buildUser = any (n: n == configFile) [ "user" "all" ];
+in stdenv.mkDerivation rec {
+  name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
+  version = "0.7.0";
 
-  common = { version, sha256, extraPatches, spl, incompatibleKernelVersion ? null } @ args:
-    if buildKernel &&
-       (incompatibleKernelVersion != null) &&
-       versionAtLeast kernel.version incompatibleKernelVersion then
-      throw "Linux v${kernel.version} is not yet supported by zfsonlinux v${version}. Try zfsUnstable or set the NixOS option boot.zfs.enableUnstable."
-    else stdenv.mkDerivation rec {
-      name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
+  src = fetchFromGitHub {
+    owner = "zfsonlinux";
+    repo = "zfs";
+    rev = "zfs-${version}";
+    sha256 = "16z0fl282rsmvgk608ii7n410swivkrisp112n2fhhjc1fs0zall";
+  };
 
-      src = fetchFromGitHub {
-        owner = "zfsonlinux";
-        repo = "zfs";
-        rev = "zfs-${version}";
-        inherit sha256;
-      };
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/Mic92/zfs/compare/zfs-0.7.0-rc3...nixos-zfs-0.7.0-rc3.patch";
+      sha256 = "1vlw98v8xvi8qapzl1jwm69qmfslwnbg3ry1lmacndaxnyckkvhh";
+    })
+  ];
 
-      patches = extraPatches;
+  buildInputs = [ autoreconfHook nukeReferences ]
+  ++ optionals buildKernel [ spl ]
+  ++ optionals buildUser [ zlib libuuid python attr ];
 
-      buildInputs = [ autoreconfHook nukeReferences ]
-      ++ optionals buildKernel [ spl ]
-      ++ optionals buildUser [ zlib libuuid python attr ];
+  # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work
+  NIX_CFLAGS_LINK = "-lgcc_s";
 
-      # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work
-      NIX_CFLAGS_LINK = "-lgcc_s";
+  hardeningDisable = [ "pic" ];
 
-      hardeningDisable = [ "pic" ];
+  preConfigure = ''
+    substituteInPlace ./module/zfs/zfs_ctldir.c   --replace "umount -t zfs"           "${utillinux}/bin/umount -t zfs"
+    substituteInPlace ./module/zfs/zfs_ctldir.c   --replace "mount -t zfs"            "${utillinux}/bin/mount -t zfs"
+    substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount"             "${utillinux}/bin/umount"
+    substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/mount"              "${utillinux}/bin/mount"
+    substituteInPlace ./udev/rules.d/*            --replace "/lib/udev/vdev_id"       "$out/lib/udev/vdev_id"
+    substituteInPlace ./cmd/ztest/ztest.c         --replace "/usr/sbin/ztest"         "$out/sbin/ztest"
+    substituteInPlace ./cmd/ztest/ztest.c         --replace "/usr/sbin/zdb"           "$out/sbin/zdb"
+    substituteInPlace ./config/user-systemd.m4    --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d"
+    substituteInPlace ./config/zfs-build.m4       --replace "\$sysconfdir/init.d"     "$out/etc/init.d"
+    substituteInPlace ./etc/zfs/Makefile.am       --replace "\$(sysconfdir)"          "$out/etc"
+    substituteInPlace ./cmd/zed/Makefile.am       --replace "\$(sysconfdir)"          "$out/etc"
+    substituteInPlace ./module/Makefile.in        --replace "/bin/cp"                 "cp"
+    substituteInPlace ./etc/systemd/system/zfs-share.service.in \
+      --replace "@bindir@/rm " "${coreutils}/bin/rm "
+    ./autogen.sh
+  '';
 
-      preConfigure = ''
-        substituteInPlace ./module/zfs/zfs_ctldir.c   --replace "umount -t zfs"           "${utillinux}/bin/umount -t zfs"
-        substituteInPlace ./module/zfs/zfs_ctldir.c   --replace "mount -t zfs"            "${utillinux}/bin/mount -t zfs"
-        substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount"             "${utillinux}/bin/umount"
-        substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/mount"              "${utillinux}/bin/mount"
-        substituteInPlace ./udev/rules.d/*            --replace "/lib/udev/vdev_id"       "$out/lib/udev/vdev_id"
-        substituteInPlace ./cmd/ztest/ztest.c         --replace "/usr/sbin/ztest"         "$out/sbin/ztest"
-        substituteInPlace ./cmd/ztest/ztest.c         --replace "/usr/sbin/zdb"           "$out/sbin/zdb"
-        substituteInPlace ./config/user-systemd.m4    --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d"
-        substituteInPlace ./config/zfs-build.m4       --replace "\$sysconfdir/init.d"     "$out/etc/init.d"
-        substituteInPlace ./etc/zfs/Makefile.am       --replace "\$(sysconfdir)"          "$out/etc"
-        substituteInPlace ./cmd/zed/Makefile.am       --replace "\$(sysconfdir)"          "$out/etc"
-        substituteInPlace ./module/Makefile.in        --replace "/bin/cp"                 "cp"
-        substituteInPlace ./etc/systemd/system/zfs-share.service.in \
-          --replace "@bindir@/rm " "${coreutils}/bin/rm "
-        ./autogen.sh
-      '';
+  configureFlags = [
+    "--with-config=${configFile}"
+    ] ++ optionals buildUser [
+    "--with-dracutdir=$(out)/lib/dracut"
+    "--with-udevdir=$(out)/lib/udev"
+    "--with-systemdunitdir=$(out)/etc/systemd/system"
+    "--with-systemdpresetdir=$(out)/etc/systemd/system-preset"
+    "--with-mounthelperdir=$(out)/bin"
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+    "--enable-systemd"
+    ] ++ optionals buildKernel [
+    "--with-spl=${spl}/libexec/spl"
+    "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
+    "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+  ];
 
-      configureFlags = [
-        "--with-config=${configFile}"
-        ] ++ optionals buildUser [
-        "--with-dracutdir=$(out)/lib/dracut"
-        "--with-udevdir=$(out)/lib/udev"
-        "--with-systemdunitdir=$(out)/etc/systemd/system"
-        "--with-systemdpresetdir=$(out)/etc/systemd/system-preset"
-        "--with-mounthelperdir=$(out)/bin"
-        "--sysconfdir=/etc"
-        "--localstatedir=/var"
-        "--enable-systemd"
-        ] ++ optionals buildKernel [
-        "--with-spl=${spl}/libexec/spl"
-        "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
-        "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
-      ];
+  enableParallelBuilding = true;
 
-      enableParallelBuilding = true;
+  installFlags = [
+    "sysconfdir=\${out}/etc"
+    "DEFAULT_INITCONF_DIR=\${out}/default"
+  ];
 
-      installFlags = [
-        "sysconfdir=\${out}/etc"
-        "DEFAULT_INITCONF_DIR=\${out}/default"
-      ];
+  postInstall = ''
+    # Prevent kernel modules from depending on the Linux -dev output.
+    nuke-refs $(find $out -name "*.ko")
+  '' + optionalString buildUser ''
+    # Remove provided services as they are buggy
+    rm $out/etc/systemd/system/zfs-import-*.service
 
-      postInstall = ''
-        # Prevent kernel modules from depending on the Linux -dev output.
-        nuke-refs $(find $out -name "*.ko")
-      '' + optionalString buildUser ''
-        # Remove provided services as they are buggy
-        rm $out/etc/systemd/system/zfs-import-*.service
+    sed -i '/zfs-import-scan.service/d' $out/etc/systemd/system/*
 
-        sed -i '/zfs-import-scan.service/d' $out/etc/systemd/system/*
+    for i in $out/etc/systemd/system/*; do
+    substituteInPlace $i --replace "zfs-import-cache.service" "zfs-import.target"
+    done
 
-        for i in $out/etc/systemd/system/*; do
-        substituteInPlace $i --replace "zfs-import-cache.service" "zfs-import.target"
-        done
+    # Fix pkgconfig.
+    ln -s ../share/pkgconfig $out/lib/pkgconfig
 
-        # Fix pkgconfig.
-        ln -s ../share/pkgconfig $out/lib/pkgconfig
+    # Remove tests because they add a runtime dependency on gcc
+    rm -rf $out/share/zfs/zfs-tests
+  '';
 
-        # Remove tests because they add a runtime dependency on gcc
-        rm -rf $out/share/zfs/zfs-tests
-      '';
-
-      meta = {
-        description = "ZFS Filesystem Linux Kernel module";
-        longDescription = ''
-          ZFS is a filesystem that combines a logical volume manager with a
-          Copy-On-Write filesystem with data integrity detection and repair,
-          snapshotting, cloning, block devices, deduplication, and more.
-        '';
-        homepage = http://zfsonlinux.org/;
-        license = licenses.cddl;
-        platforms = platforms.linux;
-        maintainers = with maintainers; [ jcumming wizeman wkennington fpletz ];
-      };
-    };
-in
-  assert any (n: n == configFile) [ "kernel" "user" "all" ];
-  assert buildKernel -> kernel != null && spl != null;
-  {
-    # also check if kernel version constraints in
-    # ./nixos/modules/tasks/filesystems/zfs.nix needs
-    # to be adapted
-    zfsStable = common {
-      # comment/uncomment if breaking kernel versions are known
-      incompatibleKernelVersion = "4.12";
-
-      version = "0.6.5.11";
-
-      # this package should point to the latest release.
-      sha256 = "1wqz43cjr21m3f52ahcikl2798pbzj5sfy16zqxwiqpv7iy09kr3";
-      extraPatches = [
-        (fetchpatch {
-          url = "https://github.com/Mic92/zfs/compare/zfs-0.6.5.8...nixos-zfs-0.6.5.8.patch";
-          sha256 = "14kqqphzg02m9a7qncdhff8958cfzdrvsid3vsrm9k75lqv1w08z";
-        })
-      ];
-      inherit spl;
-    };
-    zfsUnstable = common {
-      # comment/uncomment if breaking kernel versions are known
-      incompatibleKernelVersion = null;
-
-      version = "0.7.0-rc5";
-
-      # this package should point to a version / git revision compatible with the latest kernel release
-      sha256 = "1k0fl6lbi5winri58v26k7gngd560hbj0247rnwcbc6j01ixsr5n";
-      extraPatches = [
-        (fetchpatch {
-          url = "https://github.com/Mic92/zfs/compare/zfs-0.7.0-rc3...nixos-zfs-0.7.0-rc3.patch";
-          sha256 = "1vlw98v8xvi8qapzl1jwm69qmfslwnbg3ry1lmacndaxnyckkvhh";
-        })
-      ];
-      spl = splUnstable;
-    };
-  }
+  meta = {
+    description = "ZFS Filesystem Linux Kernel module";
+    longDescription = ''
+      ZFS is a filesystem that combines a logical volume manager with a
+      Copy-On-Write filesystem with data integrity detection and repair,
+      snapshotting, cloning, block devices, deduplication, and more.
+    '';
+    homepage = http://zfsonlinux.org/;
+    license = licenses.cddl;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ jcumming wizeman wkennington fpletz globin ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aad6bdf26c8..a65f39cb8bc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12250,12 +12250,10 @@ with pkgs;
 
     sch_cake = callPackage ../os-specific/linux/sch_cake { };
 
-    inherit (callPackage ../os-specific/linux/spl {
+    spl = callPackage ../os-specific/linux/spl {
       configFile = "kernel";
       inherit kernel;
-    }) splStable splUnstable;
-
-    spl = splStable;
+    };
 
     sysdig = callPackage ../os-specific/linux/sysdig {};
 
@@ -12279,12 +12277,10 @@ with pkgs;
 
     x86_energy_perf_policy = callPackage ../os-specific/linux/x86_energy_perf_policy { };
 
-    inherit (callPackage ../os-specific/linux/zfs {
+    zfs = callPackage ../os-specific/linux/zfs {
       configFile = "kernel";
       inherit kernel spl;
-    }) zfsStable zfsUnstable;
-
-    zfs = zfsStable;
+    };
   });
 
   # The current default kernel / kernel modules.
@@ -12593,11 +12589,9 @@ with pkgs;
 
   statifier = callPackage ../os-specific/linux/statifier { };
 
-  inherit (callPackage ../os-specific/linux/spl {
+  spl = callPackage ../os-specific/linux/spl {
     configFile = "user";
-  }) splStable splUnstable;
-
-  spl = splStable;
+  };
 
   sysdig = callPackage ../os-specific/linux/sysdig {
     kernel = null;

From 63d7b6ee291999b257018950b11d530ae43ead4b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 27 Jul 2017 20:24:42 +0200
Subject: [PATCH 086/122] makeImageFromDebDist: Add extraDebs arguments

This allows adding packages that are not part of the distribution, e.g.g

  extraDebs = [
    (pkgs.fetchurl {
      name = "openjdk.deb";
      url = http://ppa.launchpad.net/openjdk-r/ppa/ubuntu/pool/main/o/openjdk-8/openjdk-8-jdk-headless_8u111-b14-3~14.04.1_amd64.deb;
      sha256 = "1n5ibpkx9pjmc4nr052rls1yqbq7ckav2rabixjhd4yxbyhjl0ap";
    })
  ];
---
 pkgs/build-support/vm/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 8ec82214964..d886e9a56fa 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -750,6 +750,7 @@ rec {
     { name, fullName, size ? 4096, urlPrefix
     , packagesList ? "", packagesLists ? [packagesList]
     , packages, extraPackages ? [], postInstall ? ""
+    , extraDebs ? []
     , QEMU_OPTS ? "", memSize ? 512 }:
 
     let
@@ -760,7 +761,7 @@ rec {
     in
       (fillDiskWithDebs {
         inherit name fullName size postInstall QEMU_OPTS memSize;
-        debs = import expr {inherit fetchurl;};
+        debs = import expr {inherit fetchurl;} ++ extraDebs;
       }) // {inherit expr;};
 
 

From 664bbed4122ecd931d73ee12bde2c9001f7fe67c Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 27 Jul 2017 21:11:15 +0200
Subject: [PATCH 087/122] all-packages.nix: Fix evaluation error for zfs

Regression introduced by 2799a94963aaf37f059b5ed4c0d2b0cf98ba445e.

Attribute zfsStable and zfsUnstable are now gone for the package
expression itself.

The mentioned commit however only changed the reference in
all-packages.nix for the kernel module, but not the userland package.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @globin
---
 pkgs/top-level/all-packages.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a65f39cb8bc..8d4e407dde7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12796,11 +12796,9 @@ with pkgs;
 
   zd1211fw = callPackage ../os-specific/linux/firmware/zd1211 { };
 
-  inherit (callPackage ../os-specific/linux/zfs {
+  zfs = callPackage ../os-specific/linux/zfs {
     configFile = "user";
-  }) zfsStable zfsUnstable;
-
-  zfs = zfsStable;
+  };
 
   ### DATA
 

From 946cabd5a1932cdb6c481bf3a9b62abf0185de2f Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 27 Jul 2017 14:43:02 -0500
Subject: [PATCH 088/122] skype: Remove old Linux version, deprecated July 1st
 2017.

As reported on various news sites, and currently
on the skype linux download page it contains:

"Important notice: All Skype for Linux clients version 4.3 and older
will be retired on July 1, 2017. To keep chatting, please install the
latest version of Skype for Linux."
---
 .../instant-messengers/skype/default.nix      | 70 -------------------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 72 deletions(-)
 delete mode 100644 pkgs/applications/networking/instant-messengers/skype/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/skype/default.nix b/pkgs/applications/networking/instant-messengers/skype/default.nix
deleted file mode 100644
index a84b9cbf31c..00000000000
--- a/pkgs/applications/networking/instant-messengers/skype/default.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-{ stdenv, fetchurl, libXv, libXi, libXrender, libXrandr, zlib, glib
-, libXext, libX11, libXScrnSaver, libSM, qt4, libICE, freetype, fontconfig
-, libpulseaudio, lib, ... }:
-
-assert stdenv.system == "i686-linux";
-
-stdenv.mkDerivation rec {
-  name = "skype-4.3.0.37";
-
-  src = fetchurl {
-    url = "http://download.skype.com/linux/${name}.tar.bz2";
-    sha256 = "0bc9kck99rcsqzxzw3j6vnw5byvr8c9wixrx609zp255g0wxr6cc";
-  };
-
-  buildInputs = [
-    stdenv.glibc
-    stdenv.cc.cc
-    libXv
-    libXext
-    libX11
-    qt4
-    libXScrnSaver
-    libSM
-    libICE
-    libXi
-    libXrender
-    libXrandr
-    libpulseaudio
-    freetype
-    fontconfig
-    zlib
-    glib
-  ];
-
-  phases = "unpackPhase installPhase";
-
-  installPhase = ''
-    mkdir -p $out/{libexec/skype/,bin}
-    cp -r * $out/libexec/skype/
-
-    # Fix execution on PaX-enabled kernels
-    paxmark m $out/libexec/skype/skype
-
-    patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-        --set-rpath "${lib.makeLibraryPath buildInputs}" $out/libexec/skype/skype
-
-    cat > $out/bin/skype << EOF
-    #!${stdenv.shell}
-    export PULSE_LATENCY_MSEC=60  # workaround for pulseaudio glitches
-    exec $out/libexec/skype/skype --resources=$out/libexec/skype "\$@"
-    EOF
-
-    chmod +x $out/bin/skype
-
-    # Fixup desktop file
-    substituteInPlace skype.desktop --replace \
-      "Icon=skype.png" "Icon=$out/libexec/skype/icons/SkypeBlue_128x128.png"
-    substituteInPlace skype.desktop --replace \
-      "Terminal=0" "Terminal=false"
-    mkdir -p $out/share/applications
-    mv skype.desktop $out/share/applications
-  '';
-
-  meta = {
-    description = "A proprietary voice-over-IP (VoIP) client";
-    homepage = http://www.skype.com/;
-    license = stdenv.lib.licenses.unfree;
-    platforms = [ "i686-linux" ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8d4e407dde7..f628658c0ef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15980,8 +15980,6 @@ with pkgs;
 
   siproxd = callPackage ../applications/networking/siproxd { };
 
-  skype = callPackage_i686 ../applications/networking/instant-messengers/skype { };
-
   skypeforlinux = callPackage ../applications/networking/instant-messengers/skypeforlinux { };
 
   skype4pidgin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/skype4pidgin { };

From 916c64416e8f60e15a040905331fc92ce9ec0ecb Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 27 Jul 2017 14:57:46 -0500
Subject: [PATCH 089/122] aliases: add 'skype' -> 'skypeforlinux' for backwards
 compat

---
 pkgs/top-level/aliases.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index c47e3fe325b..49ba2d0ccdf 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -129,6 +129,7 @@ mapAliases (rec {
   saneFrontends = sane-frontends; # added 2016-01-02
   scim = sc-im; # added 2016-01-22
   skrooge2 = skrooge; # added 2017-02-18
+  skype = skypeforlinux; # added 2017-07-27
   spaceOrbit = space-orbit; # addewd 2016-05-23
   speedtest_cli = speedtest-cli;  # added 2015-02-17
   sqliteInteractive = sqlite-interactive;  # added 2014-12-06

From 19425c78e2e2ab871187e2d52af372c5e781c7b4 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 27 Jul 2017 22:53:32 +0200
Subject: [PATCH 090/122] python-PyICU: 1.9.6 -> 1.9.7

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a34dfa5719d..fcc81d80663 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18810,14 +18810,16 @@ in {
   };
 
   PyICU = buildPythonPackage rec {
-    name = "PyICU-1.9.6";
+    name = "PyICU-1.9.7";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/P/PyICU/${name}.tar.gz";
-      sha256 = "0l151zhhyiazzdz8skpxgrw1x4nqa9pq2cwni6d97anmg97i7hn5";
+      sha256 = "0qavhngmn7c90fz25a8a2k50wd5gzp3vwwjq8v2pkf2hq4fcs9yv";
     };
 
-    buildInputs = [ pkgs.icu ];
+    buildInputs = [ pkgs.icu self.pytest ];
+
+    propagatedBuildInputs = [ self.six ];
 
     meta = {
       homepage = https://pypi.python.org/pypi/PyICU/;

From 78815d0c5159d70db330fea66c0beb13ba3bc204 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 27 Jul 2017 22:53:55 +0200
Subject: [PATCH 091/122] mimeo: 2017.2.9 -> 2017.6.6

---
 pkgs/tools/misc/mimeo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/mimeo/default.nix b/pkgs/tools/misc/mimeo/default.nix
index 2333a6576e4..81d6d29b2bf 100644
--- a/pkgs/tools/misc/mimeo/default.nix
+++ b/pkgs/tools/misc/mimeo/default.nix
@@ -2,11 +2,11 @@
 
 python3Packages.buildPythonApplication rec {
   name = "mimeo-${version}";
-  version = "2017.2.9";
+  version = "2017.6.6";
 
   src = fetchurl {
     url = "http://xyne.archlinux.ca/projects/mimeo/src/${name}.tar.xz";
-    sha256 = "1xbhz08aanix4bibz5jla58cmi6rnf946pf64wb0ka3s8jx0l5a0";
+    sha256 = "126g3frks6zn6yc1r005qpmxg1pvvvf06ivpyvd9xribn2mwki2z";
   };
 
   buildInputs = [ file desktop_file_utils ];

From fc75595236ec6791a905b5916afc627dd11fae6c Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 27 Jul 2017 22:54:53 +0200
Subject: [PATCH 092/122] gmic: remove myself as maintainer

---
 pkgs/tools/graphics/gmic/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix
index edcfc67ee29..6ac152cb7b8 100644
--- a/pkgs/tools/graphics/gmic/default.nix
+++ b/pkgs/tools/graphics/gmic/default.nix
@@ -37,7 +37,6 @@ stdenv.mkDerivation rec {
     description = "G'MIC is an open and full-featured framework for image processing";
     homepage = http://gmic.eu/;
     license = licenses.cecill20;
-    maintainers = [ maintainers.rycee ];
     platforms = platforms.unix;
   };
 }

From dd108013b693e8c99f145d3783bd7926e38402ee Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 27 Jul 2017 22:55:03 +0200
Subject: [PATCH 093/122] josm: 12275 -> 12450

---
 pkgs/applications/misc/josm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index b53a49d584d..2431e7b7cbb 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "josm-${version}";
-  version = "12275";
+  version = "12450";
 
   src = fetchurl {
     url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
-    sha256 = "14y8ga1g3s9234zcgan16sw6va19jlwhfq39z0ayqmzna0fxi88a";
+    sha256 = "1l817mclbzyin9yh16q9jcqi31cz0qy6yi31hc8jp5ablknk979j";
   };
 
   phases = [ "installPhase" ];

From 03f6edf75009d6992249a856cf3f4a2aa7479b99 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 27 Jul 2017 22:57:14 +0200
Subject: [PATCH 094/122] eclipse-plugin-anyedittools: 2.6.0 -> 2.7.0

---
 pkgs/applications/editors/eclipse/plugins.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index c0c96d9e1a4..151f6045584 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -106,16 +106,16 @@ rec {
 
   anyedittools = buildEclipsePlugin rec {
     name = "anyedit-${version}";
-    version = "2.6.0.201511291145";
+    version = "2.7.0.201705171641";
 
     srcFeature = fetchurl {
       url = "http://andrei.gmxhome.de/eclipse/features/AnyEditTools_${version}.jar";
-      sha256 = "1vllci75qcd28b6hn2jz29l6cabxx9ql5i6l9cwq9rxp49dhc96b";
+      sha256 = "07k029nw5ibxpjc0siy06ihylbqrxllf59yz8c544gra8lc079c9";
     };
 
     srcPlugin = fetchurl {
-      url = "https://github.com/iloveeclipse/anyedittools/releases/download/2.6.0/de.loskutov.anyedit.AnyEditTools_${version}.jar";
-      sha256 = "0mgq0ylfa7srjf7azyx0kbahlsjf0sdpazqphzx4f0bfn1l328s4";
+      url = "https://github.com/iloveeclipse/anyedittools/releases/download/2.7.0/de.loskutov.anyedit.AnyEditTools_${version}.jar";
+      sha256 = "0wbm8zfjh7gxrw5sy9m3siddiazh5czgxp7zyzxwzkdqyqzqs70h";
     };
 
     meta = with stdenv.lib; {

From 229b2492819ff01f1b758d485813b7ebc91914b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 27 Jul 2017 18:08:22 +0100
Subject: [PATCH 095/122] sysdig: 0.16.0 -> 0.17.0

---
 pkgs/os-specific/linux/sysdig/default.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index ed0e0849721..71a7acab0e1 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -3,23 +3,15 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "sysdig-${version}";
-  version = "0.16.0";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     owner = "draios";
     repo = "sysdig";
     rev = version;
-    sha256 = "1h3f9nkc5fkvks6va0maq377m9qxnsf4q3f2dc14rdzfvnzidy06";
+    sha256 = "0xw4in2yb3ynpc8jwl95j92kbyr7fzda3mab8nyxcyld7gshrlvd";
   };
 
-  patches = [
-    (fetchpatch {
-       # Sysdig fails to run on linux kernels with unified cgroups enabled
-       url = https://github.com/draios/sysdig/files/909689/0001-Fix-for-linux-kernels-with-cgroup-v2-API-enabled.patch.txt;
-       sha256 = "10nmisifa500hzpa3899rs837bcal72pnqidxmrnr1js187z8j84";
-    })
-  ];
-
   buildInputs = [
     cmake zlib luajit ncurses perl jsoncpp libb64 openssl curl jq gcc
   ];

From 127b2624b75b34a2d0be4f29f17b6dfd8141d34a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 25 Jul 2017 14:05:23 +0100
Subject: [PATCH 096/122] vim-yapf: init at 2017-03-21

---
 pkgs/misc/vim-plugins/default.nix                  | 14 ++++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names             |  1 +
 .../vim2nix/additional-nix-code/vim-yapf           |  4 ++++
 3 files changed, 19 insertions(+)
 create mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-yapf

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index be22b71d2b2..598608420d4 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1173,6 +1173,20 @@ rec {
 
   };
 
+  vim-yapf = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-yapf-2017-03-21";
+    src = fetchgit {
+      url = "https://github.com/mindriot101/vim-yapf";
+      rev = "324380d77c9cf8e46e22b2e4391702273a53f563";
+      sha256 = "0vsd53k5k8absc60qka8nlj2ij6k4zgff2a65ixc7vqcmawxr3nw";
+    };
+    dependencies = [];
+    buildPhase = ''
+      substituteInPlace ftplugin/python_yapf.vim \
+        --replace '"yapf"' '"${pkgs.yapf}/bin/yapf"'
+    '';
+  };
+
   lushtags = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "lushtags-2017-04-19";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 10630636b89..608e14ef946 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -92,6 +92,7 @@
 "github:mhinz/vim-startify"
 "github:michaeljsmith/vim-indent-object"
 "github:mileszs/ack.vim"
+"github:mindriot101/vim-yapf"
 "github:mkasa/lushtags"
 "github:mpickering/hlint-refactor-vim"
 "github:nathanaelkane/vim-indent-guides"
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-yapf b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-yapf
new file mode 100644
index 00000000000..63b54b22e0e
--- /dev/null
+++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-yapf
@@ -0,0 +1,4 @@
+    buildPhase = ''
+      substituteInPlace ftplugin/python_yapf.vim \
+        --replace '"yapf"' '"${pkgs.yapf}/bin/yapf"'
+    '';

From 147477b0480be42e1909e13b121b8c736bd9091a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 27 Jul 2017 22:14:17 -0400
Subject: [PATCH 097/122] virtualbox: 5.1.24 -> 5.1.26

Fix #27666
---
 pkgs/applications/virtualization/virtualbox/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index a67663d56df..fbc0cc5ded0 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -18,10 +18,11 @@ with stdenv.lib;
 let
   python = python2;
   buildType = "release";
-  extpack = "1952ikz4xsjgdd0pzdx1riwaingyhkxp0ind31yzqc4d0hp8l6b5";
-  extpackRev = "117012";
-  main = "0q5vjsih4ndn1b0s9l1ppxng6dljld5bin5nqfrhvgr2ldlv2bgf";
-  version = "5.1.24";
+  # Manually sha256sum the extensionPack file, must be hex!
+  extpack = "14f152228495a715f526eb74134d43c960919cc534d2bc67cfe34a63e6cf7721";
+  extpackRev = "117224";
+  main = "1af8h3d3sdpcxcp5g75qfq10z81l7m8gk0sz8zqix8c1wqsm0wdm";
+  version = "5.1.26";
 
   # See https://github.com/NixOS/nixpkgs/issues/672 for details
   extensionPack = requireFile rec {

From 80a0c5c2fe0f79bf3e0f77c3d09cf545b5f54d9f Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Fri, 28 Jul 2017 05:55:35 +0200
Subject: [PATCH 098/122] bspwm: fix package

---
 pkgs/applications/window-managers/bspwm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix
index dc9d2f35965..83e1ea3e88d 100644
--- a/pkgs/applications/window-managers/bspwm/default.nix
+++ b/pkgs/applications/window-managers/bspwm/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libxcb libXinerama xcbutil xcbutilkeysyms xcbutilwm ];
 
-  PREFIX = "$out";
+  makeFlags = [ "PREFIX=$(out)" ];
 
   meta = with stdenv.lib; {
     description = "A tiling window manager based on binary space partitioning";

From 8e1a2250e1d343fb8bf4e37f19be2f0b074876b0 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Fri, 28 Jul 2017 13:25:36 +0700
Subject: [PATCH 099/122] python.pkgs.amqplib: move to separate expression

---
 .../python-modules/amqplib/default.nix        | 20 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 17 +---------------
 2 files changed, 21 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/development/python-modules/amqplib/default.nix

diff --git a/pkgs/development/python-modules/amqplib/default.nix b/pkgs/development/python-modules/amqplib/default.nix
new file mode 100644
index 00000000000..7c4ef99b0a2
--- /dev/null
+++ b/pkgs/development/python-modules/amqplib/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "amqplib";
+  version = "0.6.1";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0f2618b74d95cd360a6d46a309a3fb1c37d881a237e269ac195a69a34e0e2f62";
+  };
+
+  # error: invalid command 'test'
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = http://code.google.com/p/py-amqplib/;
+    description = "Python client for the Advanced Message Queuing Procotol (AMQP)";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fcc81d80663..3fc7871fbe6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -543,22 +543,7 @@ in {
   };
 
 
-  amqplib = buildPythonPackage rec {
-    name = "amqplib-0.6.1";
-
-    src = pkgs.fetchurl {
-      url = "http://py-amqplib.googlecode.com/files/${name}.tgz";
-      sha256 = "0f2618b74d95cd360a6d46a309a3fb1c37d881a237e269ac195a69a34e0e2f62";
-    };
-
-    # error: invalid command 'test'
-    doCheck = false;
-
-    meta = {
-      homepage = http://code.google.com/p/py-amqplib/;
-      description = "Python client for the Advanced Message Queuing Procotol (AMQP)";
-    };
-  };
+  amqplib = callPackage ../development/python-modules/amqplib {};
 
   ansible  = self.ansible2;
   ansible2 = self.ansible_2_3;

From 01c8e4fe81120a121432b24dc5bf46b814b7da64 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 28 Jul 2017 06:36:59 +0000
Subject: [PATCH 100/122] mplayer: adds dvdread support

---
 pkgs/applications/video/mplayer/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix
index 9ae1b99f86f..89ac0b91b44 100644
--- a/pkgs/applications/video/mplayer/default.nix
+++ b/pkgs/applications/video/mplayer/default.nix
@@ -10,6 +10,7 @@
 , vdpauSupport ? false, libvdpau ? null
 , cddaSupport ? !stdenv.isDarwin, cdparanoia ? null
 , dvdnavSupport ? !stdenv.isDarwin, libdvdnav ? null
+, dvdreadSupport ? true, libdvdread ? null
 , bluraySupport ? true, libbluray ? null
 , amrSupport ? false, amrnb ? null, amrwb ? null
 , cacaSupport ? true, libcaca ? null
@@ -39,6 +40,7 @@ assert screenSaverSupport -> libXScrnSaver != null;
 assert vdpauSupport -> libvdpau != null;
 assert cddaSupport -> cdparanoia != null;
 assert dvdnavSupport -> libdvdnav != null;
+assert dvdreadSupport -> libdvdread != null;
 assert bluraySupport -> libbluray != null;
 assert amrSupport -> (amrnb != null && amrwb != null);
 assert cacaSupport -> libcaca != null;
@@ -110,6 +112,7 @@ stdenv.mkDerivation rec {
     ++ optional cacaSupport libcaca
     ++ optional xineramaSupport libXinerama
     ++ optional dvdnavSupport libdvdnav
+    ++ optional dvdreadSupport libdvdread
     ++ optional bluraySupport libbluray
     ++ optional cddaSupport cdparanoia
     ++ optional jackaudioSupport libjack2

From 0f94ac9296a687f6c8cc2cacc14a99f2db8ae9c1 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 28 Jul 2017 06:45:31 +0000
Subject: [PATCH 101/122] coqPackages.autosubst: fix hash

---
 pkgs/development/coq-modules/autosubst/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/coq-modules/autosubst/default.nix b/pkgs/development/coq-modules/autosubst/default.nix
index d27ba005299..a27a247c9d0 100644
--- a/pkgs/development/coq-modules/autosubst/default.nix
+++ b/pkgs/development/coq-modules/autosubst/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   src = fetchgit {
     url = git://github.com/uds-psl/autosubst.git;
     rev = "1c3bb3bbf5477e3b33533a0fc090399f45fe3034";
-    sha256 = "1wqfzc9az85fvx71xxfii502jgc3mp0r3xwfb8vnb03vkk625ln0";
+    sha256 = "06pcjbngzwqyncvfwzz88j33wvdj9kizxyg5adp7y6186h8an341";
   };
 
   propagatedBuildInputs = [ mathcomp ];

From e10d7655dcc1f4d6ddc97b740ba4de83d345d3bf Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 13 Jul 2017 13:59:23 +0800
Subject: [PATCH 102/122] anydesk: init at 2.9.4

---
 .../networking/remote/anydesk/default.nix     | 59 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 61 insertions(+)
 create mode 100644 pkgs/applications/networking/remote/anydesk/default.nix

diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix
new file mode 100644
index 00000000000..a6858a7b5fd
--- /dev/null
+++ b/pkgs/applications/networking/remote/anydesk/default.nix
@@ -0,0 +1,59 @@
+{ stdenv, fetchurl, makeWrapper
+, cairo, gdk_pixbuf, glib, gnome2, gtk2, pango, xorg
+, lsb-release }:
+
+let
+  sha256 = {
+    "x86_64-linux" = "0g19sac4j3m1nf400vn6qcww7prqg2p4k4zsj74i109kk1396aa2";
+    "i686-linux"   = "1dd4ai2pclav9g872xil3x67bxy32gvz9pb3w76383pcsdh5zh45";
+  }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
+
+  arch = {
+    "x86_64-linux" = "amd64";
+    "i686-linux"   = "i686";
+  }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
+
+in stdenv.mkDerivation rec {
+  name = "anydesk-${version}";
+  version = "2.9.4";
+
+  src = fetchurl {
+    url = "https://download.anydesk.com/linux/${name}-${arch}.tar.gz";
+    inherit sha256;
+  };
+
+  libPath = stdenv.lib.makeLibraryPath ([
+    cairo gdk_pixbuf glib gtk2 stdenv.cc.cc pango
+    gnome2.gtkglext
+  ] ++ (with xorg; [
+    libxcb libX11 libXdamage libXext libXfixes libXi
+    libXrandr libXtst
+  ]));
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/{bin,share/icons/hicolor,share/doc/anydesk}
+    install -m755 anydesk $out/bin/anydesk
+    cp changelog copyright README $out/share/doc/anydesk
+    cp -r icons/* $out/share/icons/hicolor/
+  '';
+
+  postFixup = ''
+    patchelf \
+      --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+      --set-rpath "${libPath}" \
+      $out/bin/anydesk
+
+    wrapProgram $out/bin/anydesk \
+      --prefix PATH : ${stdenv.lib.makeBinPath [ lsb-release ]}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Desktop sharing application, providing remote support and online meetings";
+    homepage = http://www.anydesk.com;
+    license = licenses.unfree;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f628658c0ef..7aaddf8a643 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1252,6 +1252,8 @@ with pkgs;
 
   ori = callPackage ../tools/backup/ori { };
 
+  anydesk = callPackage ../applications/networking/remote/anydesk { };
+
   atool = callPackage ../tools/archivers/atool { };
 
   bsc = callPackage ../tools/compression/bsc { };

From 1d72b7345fdd8ed9522535d0c61db9713019f5d6 Mon Sep 17 00:00:00 2001
From: Alexey Lebedeff <alebedev@mirantis.com>
Date: Fri, 28 Jul 2017 11:20:56 +0300
Subject: [PATCH 103/122] dosbox-unstable: init at 2017-07-02

As current stable version segfaults when playing HoMM2, as described at
https://www.reddit.com/r/linux_gaming/comments/4dxfei/dosbox_segmentation_fault_core_dumped/

Also some missing dependencies (compared to stable version) were added:
- SDL_sound - for mounting .cue files with compressed sound
- SDL_net - for IPX support
- libpng - for making screenshots
---
 lib/maintainers.nix                     |  1 +
 pkgs/misc/emulators/dosbox/unstable.nix | 39 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  1 +
 3 files changed, 41 insertions(+)
 create mode 100644 pkgs/misc/emulators/dosbox/unstable.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index fc558b64abd..31299006083 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -75,6 +75,7 @@
   berdario = "Dario Bertini <berdario@gmail.com>";
   bergey = "Daniel Bergey <bergey@teallabs.org>";
   bhipple = "Benjamin Hipple <bhipple@protonmail.com>";
+  binarin = "Alexey Lebedeff <binarin@binarin.ru>";
   bjg = "Brian Gough <bjg@gnu.org>";
   bjornfor = "Bjørn Forsman <bjorn.forsman@gmail.com>";
   bluescreen303 = "Mathijs Kwik <mathijs@bluescreen303.nl>";
diff --git a/pkgs/misc/emulators/dosbox/unstable.nix b/pkgs/misc/emulators/dosbox/unstable.nix
new file mode 100644
index 00000000000..95d03c425e3
--- /dev/null
+++ b/pkgs/misc/emulators/dosbox/unstable.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, fetchsvn, SDL, SDL_net, SDL_sound, libpng, makeDesktopItem, mesa, autoreconfHook }:
+
+let revision = "4025";
+    revisionDate = "2017-07-02";
+    revisionSha = "0hbghdlvm6qibp0df35qxq35km4nza3sm301x380ghamxq2vgy6a";
+in stdenv.mkDerivation rec {
+  name = "dosbox-unstable-${revisionDate}";
+
+  src = fetchsvn {
+    url = "https://dosbox.svn.sourceforge.net/svnroot/dosbox/dosbox/trunk";
+    rev = revision;
+    sha256 = revisionSha;
+  };
+
+  hardeningDisable = [ "format" ];
+
+  buildInputs = [ SDL SDL_net SDL_sound libpng mesa autoreconfHook ];
+
+  desktopItem = makeDesktopItem {
+    name = "dosbox";
+    exec = "dosbox";
+    comment = "x86 emulator with internal DOS";
+    desktopName = "DOSBox (SVN)";
+    genericName = "DOS emulator";
+    categories = "Application;Emulator;";
+  };
+
+  postInstall = ''
+     mkdir -p $out/share/applications
+     cp ${desktopItem}/share/applications/* $out/share/applications
+  '';
+
+  meta = {
+    homepage = http://www.dosbox.com/;
+    description = "A DOS emulator";
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ binarin ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7aaddf8a643..e890a4ba197 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18537,6 +18537,7 @@ with pkgs;
   dell-530cdn = callPackage ../misc/drivers/dell-530cdn {};
 
   dosbox = callPackage ../misc/emulators/dosbox { };
+  dosbox-unstable = callPackage ../misc/emulators/dosbox/unstable.nix { };
 
   dpkg = callPackage ../tools/package-management/dpkg { };
 

From 4cae4418e9c3297a0ab8b707bd5ad408d5fc8056 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Fri, 28 Jul 2017 13:35:30 +0700
Subject: [PATCH 104/122] python.pkgs.apipkg: move to separate expression

---
 .../python-modules/apipkg/default.nix         | 25 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 21 +---------------
 2 files changed, 26 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/development/python-modules/apipkg/default.nix

diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix
new file mode 100644
index 00000000000..be86eddc2ae
--- /dev/null
+++ b/pkgs/development/python-modules/apipkg/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, pytest }:
+
+buildPythonPackage rec {
+  pname = "apipkg";
+  version = "1.4";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "2e38399dbe842891fe85392601aab8f40a8f4cc5a9053c326de35a1cc0297ac6";
+  };
+
+  buildInputs = [ pytest ];
+
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Namespace control and lazy-import mechanism";
+    homepage = "http://bitbucket.org/hpk42/apipkg";
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3fc7871fbe6..127f5b16f0c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -552,26 +552,7 @@ in {
   ansible_2_2 = callPackage ../development/python-modules/ansible/2.2.nix {};
   ansible_2_3 = callPackage ../development/python-modules/ansible/2.3.nix {};
 
-  apipkg = buildPythonPackage rec {
-    name = "apipkg-1.4";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/a/apipkg/${name}.tar.gz";
-      sha256 = "2e38399dbe842891fe85392601aab8f40a8f4cc5a9053c326de35a1cc0297ac6";
-    };
-
-    buildInputs = with self; [ pytest ];
-
-    checkPhase = ''
-      py.test
-    '';
-
-    meta = {
-      description = "Namespace control and lazy-import mechanism";
-      homepage = "http://bitbucket.org/hpk42/apipkg";
-      license = licenses.mit;
-    };
-  };
+  apipkg = callPackage ../development/python-modules/apipkg {};
 
   appdirs = callPackage ../development/python-modules/appdirs { };
 

From 6d09e0c9bea3944e9c7dfa4601d2454886afb257 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Fri, 28 Jul 2017 14:05:23 +0700
Subject: [PATCH 105/122] python.pkgs.apsw: move to separate expression

---
 .../python-modules/apsw/default.nix           | 25 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 20 +--------------
 2 files changed, 26 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/python-modules/apsw/default.nix

diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix
new file mode 100644
index 00000000000..3e7e970da6c
--- /dev/null
+++ b/pkgs/development/python-modules/apsw/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildPythonPackage, fetchurl
+, sqlite, isPyPy }:
+
+buildPythonPackage rec {
+  pname = "apsw";
+  version = "3.7.6.2-r1";
+  name = "${pname}-${version}";
+
+  disabled = isPyPy;
+
+  src = fetchurl {
+    url = "http://apsw.googlecode.com/files/${name}.zip";
+    sha256 = "cb121b2bce052609570a2f6def914c0aa526ede07b7096dddb78624d77f013eb";
+  };
+
+  buildInputs = [ sqlite ];
+
+  # python: double free or corruption (fasttop): 0x0000000002fd4660 ***
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "A Python wrapper for the SQLite embedded relational database engine";
+    homepage = http://code.google.com/p/apsw/;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 127f5b16f0c..34861b0289b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -588,25 +588,7 @@ in {
     };
   };
 
-  apsw = buildPythonPackage rec {
-    name = "apsw-3.7.6.2-r1";
-    disabled = isPyPy;
-
-    src = pkgs.fetchurl {
-      url = "http://apsw.googlecode.com/files/${name}.zip";
-      sha256 = "cb121b2bce052609570a2f6def914c0aa526ede07b7096dddb78624d77f013eb";
-    };
-
-    buildInputs = with self; [ pkgs.sqlite ];
-
-    # python: double free or corruption (fasttop): 0x0000000002fd4660 ***
-    doCheck = false;
-
-    meta = {
-      description = "A Python wrapper for the SQLite embedded relational database engine";
-      homepage = http://code.google.com/p/apsw/;
-    };
-  };
+  apsw = callPackage ../development/python-modules/apsw {};
 
   astor = buildPythonPackage rec {
     name = "astor-${version}";

From f970ee8e7e923b18c2bfe6f36594fbedaaaeaf70 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Fri, 28 Jul 2017 14:26:20 +0700
Subject: [PATCH 106/122] python.pkgs.astor: move to separate expression

---
 .../python-modules/astor/default.nix          | 19 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 17 +----------------
 2 files changed, 20 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/development/python-modules/astor/default.nix

diff --git a/pkgs/development/python-modules/astor/default.nix b/pkgs/development/python-modules/astor/default.nix
new file mode 100644
index 00000000000..965bf37d520
--- /dev/null
+++ b/pkgs/development/python-modules/astor/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "astor";
+  version = "0.5";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1fdafq5hkis1fxqlmhw0sn44zp2ar46nxhbc22cvwg7hsd8z5gsa";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Library for reading, writing and rewriting python AST";
+    homepage = https://github.com/berkerpeksag/astor;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ nixy ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 34861b0289b..239579bb59e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -590,22 +590,7 @@ in {
 
   apsw = callPackage ../development/python-modules/apsw {};
 
-  astor = buildPythonPackage rec {
-    name = "astor-${version}";
-    version = "0.5";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/a/astor/${name}.tar.gz";
-      sha256 = "1fdafq5hkis1fxqlmhw0sn44zp2ar46nxhbc22cvwg7hsd8z5gsa";
-    };
-
-    meta = with pkgs.stdenv.lib; {
-      description = "Library for reading, writing and rewriting python AST";
-      homepage = https://github.com/berkerpeksag/astor;
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ nixy ];
-    };
-  };
+  astor = callPackage ../development/python-modules/astor {};
 
   asyncio = if (pythonAtLeast "3.3") then buildPythonPackage rec {
     name = "asyncio-${version}";

From e77f62df0fcbc118c539501a0b286d09e8bd8897 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Fri, 28 Jul 2017 14:32:38 +0700
Subject: [PATCH 107/122] python.pkgs.funcsigs: move to separate expression

---
 .../python-modules/funcsigs/default.nix       | 22 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 20 +----------------
 2 files changed, 23 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/python-modules/funcsigs/default.nix

diff --git a/pkgs/development/python-modules/funcsigs/default.nix b/pkgs/development/python-modules/funcsigs/default.nix
new file mode 100644
index 00000000000..67ee9779073
--- /dev/null
+++ b/pkgs/development/python-modules/funcsigs/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, unittest2 }:
+
+buildPythonPackage rec {
+  pname = "funcsigs";
+  version = "1.0.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0l4g5818ffyfmfs1a924811azhjj8ax9xd1cffr1mzd3ycn0zfx7";
+  };
+
+  buildInputs = [ unittest2 ];
+
+  meta = with stdenv.lib; {
+    description = "Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+";
+    homepage = "https://github.com/aliles/funcsigs";
+    maintainers = with maintainers; [ garbas ];
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 239579bb59e..e78698438f4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -609,25 +609,7 @@ in {
     };
   } else null;
 
-  funcsigs = buildPythonPackage rec {
-    name = "funcsigs-1.0.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/f/funcsigs/${name}.tar.gz";
-      sha256 = "0l4g5818ffyfmfs1a924811azhjj8ax9xd1cffr1mzd3ycn0zfx7";
-    };
-
-    buildInputs = with self; [
-      unittest2
-    ];
-
-    meta = with pkgs.stdenv.lib; {
-      description = "Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+";
-      homepage = "https://github.com/aliles/funcsigs";
-      maintainers = with maintainers; [ garbas ];
-      license = licenses.asl20;
-    };
-  };
+  funcsigs = callPackage ../development/python-modules/funcsigs { };
 
   APScheduler = callPackage ../development/python-modules/APScheduler { };
 

From ff0e08c015ea3bf788ef2b2bb0a44df7fef445da Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Fri, 28 Jul 2017 14:49:14 +0700
Subject: [PATCH 108/122] python.pkgs.args: move to separate expression

---
 .../development/python-modules/args/default.nix | 17 +++++++++++++++++
 pkgs/top-level/python-packages.nix              | 14 +-------------
 2 files changed, 18 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/development/python-modules/args/default.nix

diff --git a/pkgs/development/python-modules/args/default.nix b/pkgs/development/python-modules/args/default.nix
new file mode 100644
index 00000000000..7431f4f478f
--- /dev/null
+++ b/pkgs/development/python-modules/args/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "args";
+  version = "0.1.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "a785b8d837625e9b61c39108532d95b85274acd679693b71ebb5156848fcf814";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Command Arguments for Humans";
+    homepage = "https://github.com/kennethreitz/args";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e78698438f4..a9ac5fda804 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -613,19 +613,7 @@ in {
 
   APScheduler = callPackage ../development/python-modules/APScheduler { };
 
-  args = buildPythonPackage rec {
-    name = "args-0.1.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/a/args/${name}.tar.gz";
-      sha256 = "a785b8d837625e9b61c39108532d95b85274acd679693b71ebb5156848fcf814";
-    };
-
-    meta = {
-      description = "Command Arguments for Humans";
-      homepage = "https://github.com/kennethreitz/args";
-    };
-  };
+  args = callPackage ../development/python-modules/args { };
 
   argcomplete = callPackage ../development/python-modules/argcomplete { };
 

From 76c4ec75190c924e90fe6b28ba9bd0e4f00c9c31 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Fri, 28 Jul 2017 14:59:17 +0700
Subject: [PATCH 109/122] python.pkgs.area53: move to separate expression

---
 .../python-modules/area53/default.nix          | 18 ++++++++++++++++++
 pkgs/top-level/python-packages.nix             | 15 +--------------
 2 files changed, 19 insertions(+), 14 deletions(-)
 create mode 100644 pkgs/development/python-modules/area53/default.nix

diff --git a/pkgs/development/python-modules/area53/default.nix b/pkgs/development/python-modules/area53/default.nix
new file mode 100644
index 00000000000..1f0b95d8785
--- /dev/null
+++ b/pkgs/development/python-modules/area53/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, boto }:
+
+buildPythonPackage rec {
+  pname = "Area53";
+  version = "0.94";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0v9b7f8b6v21y410anx5sr52k2ac8jrzdf19q6m6p0zsdsf9vr42";
+  };
+
+  # error: invalid command 'test'
+  doCheck = false;
+
+  propagatedBuildInputs = [ boto ];
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a9ac5fda804..3d38ff7b220 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -617,20 +617,7 @@ in {
 
   argcomplete = callPackage ../development/python-modules/argcomplete { };
 
-  area53 = buildPythonPackage (rec {
-    name = "Area53-0.94";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/A/Area53/${name}.tar.gz";
-      sha256 = "0v9b7f8b6v21y410anx5sr52k2ac8jrzdf19q6m6p0zsdsf9vr42";
-    };
-
-    # error: invalid command 'test'
-    doCheck = false;
-
-    propagatedBuildInputs = with self; [ self.boto ];
-
-  });
+  area53 = callPackage ../development/python-modules/area53 { };
 
   chai = buildPythonPackage rec {
     name = "chai-${version}";

From 3182658a4f3a225ecfaaabf41b73e0a0a13e0ef4 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Fri, 28 Jul 2017 15:45:24 +0700
Subject: [PATCH 110/122] python.pkgs.chai: move to separate expression

---
 pkgs/development/python-modules/chai/default.nix | 16 ++++++++++++++++
 pkgs/top-level/python-packages.nix               | 14 +-------------
 2 files changed, 17 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/development/python-modules/chai/default.nix

diff --git a/pkgs/development/python-modules/chai/default.nix b/pkgs/development/python-modules/chai/default.nix
new file mode 100644
index 00000000000..f5440004ebd
--- /dev/null
+++ b/pkgs/development/python-modules/chai/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "chai";
+  version = "1.1.1";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "016kf3irrclpkpvcm7q0gmkfibq7jgy30a9v73pp42bq9h9a32bl";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Mocking, stubbing and spying framework for python";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3d38ff7b220..0ab149f0f88 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -619,19 +619,7 @@ in {
 
   area53 = callPackage ../development/python-modules/area53 { };
 
-  chai = buildPythonPackage rec {
-    name = "chai-${version}";
-    version = "1.1.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/c/chai/${name}.tar.gz";
-      sha256 = "016kf3irrclpkpvcm7q0gmkfibq7jgy30a9v73pp42bq9h9a32bl";
-    };
-
-    meta = {
-      description = "Mocking, stubbing and spying framework for python";
-    };
-  };
+  chai = callPackage ../development/python-modules/chai { };
 
   chainmap = buildPythonPackage rec {
     name = "chainmap-1.0.2";

From b01adce061a5e446549bddecb1c75d2e422867e7 Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Fri, 28 Jul 2017 15:51:59 +0700
Subject: [PATCH 111/122] python.pkgs.chainmap: move to separate expression

---
 .../python-modules/chainmap/default.nix       | 22 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 19 +---------------
 2 files changed, 23 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/development/python-modules/chainmap/default.nix

diff --git a/pkgs/development/python-modules/chainmap/default.nix b/pkgs/development/python-modules/chainmap/default.nix
new file mode 100644
index 00000000000..8eb18db08f9
--- /dev/null
+++ b/pkgs/development/python-modules/chainmap/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "chainmap";
+  version = "1.0.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "09h5gq43w516fqswlca0nhmd2q3v8hxq15z4wqrznfwix6ya6pa0";
+  };
+
+  # Requires tox
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Backport/clone of ChainMap";
+    homepage = "https://bitbucket.org/jeunice/chainmap";
+    license = licenses.psfl;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0ab149f0f88..d46838dddbf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -621,24 +621,7 @@ in {
 
   chai = callPackage ../development/python-modules/chai { };
 
-  chainmap = buildPythonPackage rec {
-    name = "chainmap-1.0.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/c/chainmap/${name}.tar.gz";
-      sha256 = "09h5gq43w516fqswlca0nhmd2q3v8hxq15z4wqrznfwix6ya6pa0";
-    };
-
-    # Requires tox
-    doCheck = false;
-
-    meta = {
-      description = "Backport/clone of ChainMap";
-      homepage = "https://bitbucket.org/jeunice/chainmap";
-      license = licenses.psfl;
-      maintainers = with maintainers; [ abbradar ];
-    };
-  };
+  chainmap = callPackage ../development/python-modules/chainmap { };
 
   arelle = callPackage ../development/python-modules/arelle {
     gui = true;

From f1ef53286d4e06ee3c53316ece702f9f5f0a3feb Mon Sep 17 00:00:00 2001
From: wisut hantanong <wizzup@gmail.com>
Date: Fri, 28 Jul 2017 15:58:39 +0700
Subject: [PATCH 112/122] python.pkgs.asn1ate: move to separate expression

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

diff --git a/pkgs/development/python-modules/asn1ate/default.nix b/pkgs/development/python-modules/asn1ate/default.nix
new file mode 100644
index 00000000000..ce07c237624
--- /dev/null
+++ b/pkgs/development/python-modules/asn1ate/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub
+, pyparsing }:
+
+buildPythonPackage rec {
+  pname = "asn1ate";
+  date = "20160810";
+  name = "${pname}-unstable-${date}";
+
+  src = fetchFromGitHub {
+    sha256 = "04pddr1mh2v9qq8fg60czwvjny5qwh4nyxszr3qc4bipiiv2xk9w";
+    rev = "c56104e8912400135509b584d84423ee05a5af6b";
+    owner = "kimgr";
+    repo = pname;
+  };
+
+  propagatedBuildInputs = [ pyparsing ];
+
+  meta = with stdenv.lib; {
+    description = "Python library for translating ASN.1 into other forms";
+    license = licenses.bsd3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ leenaars ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d46838dddbf..e87630212ce 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -650,27 +650,7 @@ in {
 
   async-timeout = callPackage ../development/python-modules/async_timeout { };
 
- asn1ate = buildPythonPackage rec {
-  pname = "asn1ate";
-  date = "20160810";
-  name = "${pname}-unstable-${date}";
-
-  src = pkgs.fetchFromGitHub {
-    sha256 = "04pddr1mh2v9qq8fg60czwvjny5qwh4nyxszr3qc4bipiiv2xk9w";
-    rev = "c56104e8912400135509b584d84423ee05a5af6b";
-    owner = "kimgr";
-    repo = pname;
-  };
-
-  propagatedBuildInputs = with self; [ pyparsing ];
-
-  meta = with stdenv.lib; {
-    description = "Python library for translating ASN.1 into other forms";
-    license = licenses.bsd3;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ leenaars ];
-  };
-};
+  asn1ate = callPackage ../development/python-modules/asn1ate { };
 
   atomiclong = buildPythonPackage rec {
     version = "0.1.1";

From dbefaeaab2b25f9ec40be9cb3e4eb505ec1c3847 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Fri, 28 Jul 2017 11:25:17 +0200
Subject: [PATCH 113/122] vim-yapf: fix evaluation

/cc @Mic92
---
 pkgs/misc/vim-plugins/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 598608420d4..cd105793a9a 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1183,7 +1183,7 @@ rec {
     dependencies = [];
     buildPhase = ''
       substituteInPlace ftplugin/python_yapf.vim \
-        --replace '"yapf"' '"${pkgs.yapf}/bin/yapf"'
+        --replace '"yapf"' '"${pythonPackages.yapf}/bin/yapf"'
     '';
   };
 

From 159be2e4f576041a0553a0ddd8e98aa753832745 Mon Sep 17 00:00:00 2001
From: Muhammad Herdiansyah <herdiansyah@openmailbox.org>
Date: Fri, 28 Jul 2017 01:04:56 +0700
Subject: [PATCH 114/122] bubblewrap: init at 0.1.8

---
 pkgs/tools/admin/bubblewrap/default.nix | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/tools/admin/bubblewrap/default.nix

diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix
new file mode 100644
index 00000000000..5b75657e325
--- /dev/null
+++ b/pkgs/tools/admin/bubblewrap/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, libxslt, docbook_xsl, libcap }:
+
+stdenv.mkDerivation rec {
+  name = "bubblewrap-${version}";
+  version = "0.1.8";
+
+  src = fetchurl {
+    url = "https://github.com/projectatomic/bubblewrap/releases/download/v${version}/${name}.tar.xz";
+    sha256 = "1gyy7paqwdrfgxamxya991588ryj9q9c3rhdh31qldqyh9qpy72c";
+  };
+
+  nativeBuildInputs = [ libcap libxslt docbook_xsl ];
+
+  meta = with stdenv.lib; {
+    description = "Unprivileged sandboxing tool";
+    homepage = "https://github.com/projectatomic/bubblewrap";
+    license = licenses.lgpl2Plus;
+    maintainers = with maintainers; [ konimex ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a65f39cb8bc..f1ffba57a0f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -722,6 +722,8 @@ with pkgs;
 
   bochs = callPackage ../applications/virtualization/bochs { };
 
+  bubblewrap = callPackage ../tools/admin/bubblewrap { };
+
   borgbackup = callPackage ../tools/backup/borg {
     python3Packages = python34Packages;
   };

From 805467bb5a03db607145dd7aae2ef08e1c1ee746 Mon Sep 17 00:00:00 2001
From: dywedir <dywedir@protonmail.ch>
Date: Fri, 28 Jul 2017 00:55:26 +0300
Subject: [PATCH 115/122] rustracer: 2.0.6 -> 2.0.9

---
 pkgs/development/tools/rust/racer/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix
index b79d7e0670d..89c384eb6ec 100644
--- a/pkgs/development/tools/rust/racer/default.nix
+++ b/pkgs/development/tools/rust/racer/default.nix
@@ -2,21 +2,21 @@
 
 rustPlatform.buildRustPackage rec {
   name = "racer-${version}";
-  version = "2.0.6";
+  version = "2.0.9";
 
   src = fetchFromGitHub {
-    owner = "phildawes";
+    owner = "racer-rust";
     repo = "racer";
     rev = version;
-    sha256 = "09wgfrb0z2d2icfk11f1jal5p93sqjv3jzmzcgw0pgw3zvffhni3";
+    sha256 = "06k50f2vj2w08afh3nrlhs0amcvw2i45bhfwr70sgs395xicjswp";
   };
 
-  depsSha256 = "0mnq7dk9wz2k9jhzciknybwc471sy8f71cd15m752b5ng6v1f5kn";
+  depsSha256 = "1gywnjbjl9jalbq6wkfmbczav4qbhgw2h8lyxkyppnhw9y4j0nc1";
 
   buildInputs = [ makeWrapper ];
 
   preCheck = ''
-    export RUST_SRC_PATH="${rustPlatform.rust.rustc.src}/src"
+    export RUST_SRC_PATH="${rustPlatform.rustcSrc}"
   '';
 
   doCheck = true;
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
 
   meta = with stdenv.lib; {
     description = "A utility intended to provide Rust code completion for editors and IDEs";
-    homepage = https://github.com/phildawes/racer;
+    homepage = https://github.com/racer-rust/racer;
     license = licenses.mit;
     maintainers = with maintainers; [ jagajaga globin ];
     platforms = platforms.all;

From 6e5d2f896365fa6737d0c336b7edbc6b6a15fcb9 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 28 Jul 2017 12:36:48 +0200
Subject: [PATCH 116/122] nixos/xserver: Properly validate XKB options

Checking the keyboard layout has been a long set of hurdles so far, with
several attempts. Originally, the checking was introduced by @lheckemann
in #23709.

The initial implementation just was trying to check whether the symbols/
directory contained the layout name.

Unfortunately, that wasn't enough and keyboard variants weren't
recognized, so if you set layout to eg. "dvorak" it will fail with an
error (#25526).

So my improvement on that was to use sed to filter rules/base.lst and
match the layout against that. I fucked up twice with this, first
because layout can be a comma-separated list which I didn't account for
and second because I ran into a Nix issue (NixOS/nix#1426).

After fixing this, it still wasn't enough (and this is btw. what
localectl also does), because we were *only* matching rules but not
symbols, so using "eu" as a layout won't work either.

I decided now it's the time to actually use libxkbcommon to try
compiling the keyboard options and see whether it succeeds. This comes
in the form of a helper tool called xkbvalidate.

IMHO this approach is a lot less error-prone and we can be sure that we
don't forget about anything because that's what the X server itself uses
to compile the keymap.

Another advantage of this is that we now validate the full set of XKB
options rather than just the layout.

Tested this against a variety of wrong and correct keyboard
configurations and against the "keymap" NixOS VM tests.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @lheckemann, @peti, @7c6f434c, @tohl, @vcunat, @lluchs
Fixes: #27597
---
 nixos/modules/services/x11/xserver.nix   |  48 +-------
 pkgs/tools/X11/xkbvalidate/default.nix   |  15 +++
 pkgs/tools/X11/xkbvalidate/xkbvalidate.c | 135 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |   2 +
 4 files changed, 156 insertions(+), 44 deletions(-)
 create mode 100644 pkgs/tools/X11/xkbvalidate/default.nix
 create mode 100644 pkgs/tools/X11/xkbvalidate/xkbvalidate.c

diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 638509e710b..3ce124d3da2 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -648,51 +648,11 @@ in
 
     services.xserver.xkbDir = mkDefault "${pkgs.xkeyboard_config}/etc/X11/xkb";
 
-    system.extraDependencies = singleton (pkgs.runCommand "xkb-layouts-exist" {
-      inherit (cfg) layout xkbDir;
+    system.extraDependencies = singleton (pkgs.runCommand "xkb-validated" {
+      inherit (cfg) xkbModel layout xkbVariant xkbOptions;
+      nativeBuildInputs = [ pkgs.xkbvalidate ];
     } ''
-      # We can use the default IFS here, because the layouts won't contain
-      # spaces or tabs and are ruled out by the sed expression below.
-      availableLayouts="$(
-        sed -n -e ':i /^! \(layout\|variant\) *$/ {
-          # Loop through all of the layouts/variants until we hit another ! at
-          # the start of the line or the line is empty ('t' branches only if
-          # the last substitution was successful, so if the line is empty the
-          # substition will fail).
-          :l; n; /^!/bi; s/^ *\([^ ]\+\).*/\1/p; tl
-        }' "$xkbDir/rules/base.lst" | sort -u
-      )"
-
-      layoutNotFound() {
-        echo >&2
-        echo "The following layouts and variants are available:" >&2
-        echo >&2
-
-        # While an output width of 80 is more desirable for small terminals, we
-        # really don't know the amount of columns of the terminal from within
-        # the builder. The content in $availableLayouts however is pretty
-        # large, so let's opt for a larger width here, because it will print a
-        # smaller amount of lines on modern KMS/framebuffer terminals and won't
-        # lose information even in smaller terminals (it only will look a bit
-        # ugly).
-        echo "$availableLayouts" | ${pkgs.utillinux}/bin/column -c 150 >&2
-
-        echo >&2
-        echo "However, the keyboard layout definition in" \
-             "\`services.xserver.layout' contains the layout \`$1', which" \
-             "isn't a valid layout or variant." >&2
-        echo >&2
-        exit 1
-      }
-
-      # Again, we don't need to take care of IFS, see the comment for
-      # $availableLayouts.
-      for l in ''${layout//,/ }; do
-        if ! echo "$availableLayouts" | grep -qxF "$l"; then
-          layoutNotFound "$l"
-        fi
-      done
-
+      validate "$xkbModel" "$layout" "$xkbVariant" "$xkbOptions"
       touch "$out"
     '');
 
diff --git a/pkgs/tools/X11/xkbvalidate/default.nix b/pkgs/tools/X11/xkbvalidate/default.nix
new file mode 100644
index 00000000000..f5a26410835
--- /dev/null
+++ b/pkgs/tools/X11/xkbvalidate/default.nix
@@ -0,0 +1,15 @@
+{ lib, runCommandCC, libxkbcommon }:
+
+runCommandCC "xkbvalidate" {
+  buildInputs = [ libxkbcommon ];
+  meta = {
+    description = "NixOS tool to validate X keyboard configuration";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.aszlig ];
+  };
+} ''
+  mkdir -p "$out/bin"
+  gcc -std=gnu11 -Wall -pedantic -lxkbcommon ${./xkbvalidate.c} \
+    -o "$out/bin/validate"
+''
diff --git a/pkgs/tools/X11/xkbvalidate/xkbvalidate.c b/pkgs/tools/X11/xkbvalidate/xkbvalidate.c
new file mode 100644
index 00000000000..d9c9042467c
--- /dev/null
+++ b/pkgs/tools/X11/xkbvalidate/xkbvalidate.c
@@ -0,0 +1,135 @@
+#define _GNU_SOURCE
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <xkbcommon/xkbcommon.h>
+
+static char **log_buffer = NULL;
+static int log_buffer_size = 0;
+static bool log_alloc_success = true;
+
+static void add_log(struct xkb_context *ctx, enum xkb_log_level level,
+                    const char *fmt, va_list args)
+{
+    log_buffer_size++;
+
+    if (log_buffer == NULL)
+        log_buffer = malloc(sizeof(char *));
+    else
+        log_buffer = realloc(log_buffer, sizeof(char *) * log_buffer_size);
+
+    if (log_buffer == NULL) {
+        perror("buffer alloc");
+        log_alloc_success = false;
+        log_buffer_size--;
+        return;
+    }
+
+    if (vasprintf(&log_buffer[log_buffer_size - 1], fmt, args) == -1) {
+        perror("log line alloc");
+        log_alloc_success = false;
+        return;
+    }
+}
+
+static void print_logs(void)
+{
+    for (int i = 0; i < log_buffer_size; ++i)
+        fprintf(stderr, "    %s", log_buffer[i]);
+}
+
+static void free_logs(void)
+{
+    if (log_buffer == NULL)
+        return;
+    for (int i = 0; i < log_buffer_size; ++i)
+        free(log_buffer[i]);
+    free(log_buffer);
+    log_buffer = NULL;
+    log_buffer_size = 0;
+}
+
+static bool try_keymap(struct xkb_context *ctx, struct xkb_rule_names *rdef)
+{
+    struct xkb_keymap *keymap;
+    bool result = true;
+
+    if ((keymap = xkb_keymap_new_from_names(ctx, rdef, 0)) == NULL)
+        result = false;
+    else
+        xkb_keymap_unref(keymap);
+
+    return result;
+}
+
+static void print_error(const char *name, const char *value,
+                        const char *nixos_option)
+{
+    fprintf(stderr, "\nThe value `%s' for keyboard %s is invalid.\n\n"
+                    "Please check the definition in `services.xserver.%s'.\n",
+            value, name, nixos_option);
+    fputs("\nDetailed XKB compiler errors:\n\n", stderr);
+    print_logs();
+    putc('\n', stderr);
+}
+
+#define TRY_KEYMAP(name, value, nixos_option) \
+    *rdef = (struct xkb_rule_names) {0}; \
+    free_logs(); \
+    rdef->name = value; \
+    result = try_keymap(ctx, rdef); \
+    if (!log_alloc_success) \
+        goto out; \
+    if (!result) { \
+        print_error(#name, value, nixos_option); \
+        exit_code = EXIT_FAILURE; \
+        goto out; \
+    }
+
+int main(int argc, char **argv)
+{
+    int exit_code = EXIT_SUCCESS;
+    bool result;
+    struct xkb_context *ctx;
+    struct xkb_rule_names *rdef;
+
+    if (argc != 5) {
+        fprintf(stderr, "Usage: %s model layout variant options\n", argv[0]);
+        return EXIT_FAILURE;
+    }
+
+    ctx = xkb_context_new(XKB_CONTEXT_NO_ENVIRONMENT_NAMES);
+    xkb_context_set_log_fn(ctx, add_log);
+
+    rdef = malloc(sizeof(struct xkb_rule_names));
+
+    TRY_KEYMAP(model,   argv[1], "xkbModel");
+    TRY_KEYMAP(layout,  argv[2], "layout");
+    TRY_KEYMAP(variant, argv[3], "xkbVariant");
+    TRY_KEYMAP(options, argv[4], "xkbOptions");
+
+    free_logs();
+    rdef->model = argv[1];
+    rdef->layout = argv[2];
+    rdef->variant = argv[3];
+    rdef->options = argv[4];
+
+    result = try_keymap(ctx, rdef);
+    if (!log_alloc_success)
+        goto out;
+
+    if (!result) {
+        fputs("The XKB keyboard definition failed to compile:\n", stderr);
+        print_logs();
+        exit_code = EXIT_FAILURE;
+    }
+
+out:
+    free_logs();
+    free(rdef);
+    xkb_context_unref(ctx);
+    return exit_code;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e890a4ba197..6fea60980f6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4805,6 +4805,8 @@ with pkgs;
 
   xbrightness = callPackage ../tools/X11/xbrightness { };
 
+  xkbvalidate = callPackage ../tools/X11/xkbvalidate { };
+
   xfstests = callPackage ../tools/misc/xfstests { };
 
   xprintidle-ng = callPackage ../tools/X11/xprintidle-ng {};

From 11e13306f7084c0b60a62dc5dd6a3cff92d41e79 Mon Sep 17 00:00:00 2001
From: Ollie Charles <ollie@ocharles.org.uk>
Date: Fri, 28 Jul 2017 11:50:47 +0100
Subject: [PATCH 117/122] ephemeralpg: init at 2.2

---
 pkgs/applications/misc/ephemeralpg/default.nix | 15 +++++++++++++++
 pkgs/top-level/all-packages.nix                |  2 ++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/applications/misc/ephemeralpg/default.nix

diff --git a/pkgs/applications/misc/ephemeralpg/default.nix b/pkgs/applications/misc/ephemeralpg/default.nix
new file mode 100644
index 00000000000..104192f7e61
--- /dev/null
+++ b/pkgs/applications/misc/ephemeralpg/default.nix
@@ -0,0 +1,15 @@
+{ stdenv, fetchurl, postgresql, makeWrapper }:
+stdenv.mkDerivation rec {
+  name = "ephemeralpg-${version}";
+  version = "2.2";
+  src = fetchurl {
+    url = "http://ephemeralpg.org/code/${name}.tar.gz";
+    sha256 = "1v48bcmc23zzqbha80p3spxd5l347qnjzs4z44wl80i2s8fdzlyz";
+  };
+  buildInputs = [ makeWrapper ];
+  installPhase = ''
+    mkdir -p $out
+    PREFIX=$out make install
+    wrapProgram $out/bin/pg_tmp --prefix PATH : ${postgresql}/bin
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6fea60980f6..31471fee634 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -989,6 +989,8 @@ with pkgs;
 
   esptool-ck = callPackage ../tools/misc/esptool-ck { };
 
+  ephemeralpg = callPackage ../applications/misc/ephemeralpg {};
+
   f3 = callPackage ../tools/filesystems/f3 { };
 
   facter = callPackage ../tools/system/facter {

From 548033285c8f32a0a54a5bb4b3d6737d4c1e7097 Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <guillaume.maudoux@uclouvain.be>
Date: Fri, 28 Jul 2017 14:01:49 +0200
Subject: [PATCH 118/122] cups-filters: 0.15.0 -> 0.16.0

---
 pkgs/misc/cups/filters.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix
index 375afcecf70..be788f9add4 100644
--- a/pkgs/misc/cups/filters.nix
+++ b/pkgs/misc/cups/filters.nix
@@ -9,11 +9,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "cups-filters-${version}";
-  version = "1.15.0";
+  version = "1.16.0";
 
   src = fetchurl {
     url = "http://openprinting.org/download/cups-filters/${name}.tar.xz";
-    sha256 = "0g6jmbzgvsq4dq6jaczr6fslpv3692v8yvvmqgw08sb3aly7kgd3";
+    sha256 = "1kcndzpbbcaxafnz1wa6acy3p3r5likfqmf057i5q0q6i176lz5k";
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];

From 69c67371dbfff4ad72cb2ae61eac78e978a2e9fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 28 Jul 2017 15:12:07 +0200
Subject: [PATCH 119/122] knot-dns: maintenance 2.5.2 -> 2.5.3

---
 pkgs/servers/dns/knot-dns/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index f1ae382aa38..d9b47e06ae4 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in
 # Note: ATM only the libraries have been tested in nixpkgs.
 stdenv.mkDerivation rec {
   name = "knot-dns-${version}";
-  version = "2.5.2";
+  version = "2.5.3";
 
   src = fetchurl {
     url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
-    sha256 = "286671a4ee35a5207b2e45fd0812962b481b1b543bf3d5df3a8c319c26e2f5e9";
+    sha256 = "d78ae231a68ace264f5738c8e57481923bcad7413f3f440c06fa6cc0aded9d8e";
   };
 
   outputs = [ "bin" "out" "dev" ];

From 62e4e3301b1e53d2873f3f2b3430262a232b458b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 28 Jul 2017 15:12:23 +0200
Subject: [PATCH 120/122] knot-resolver: maintenance 1.3.1 -> 1.3.2

---
 pkgs/servers/dns/knot-resolver/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index 441e1f1ab0f..383ad85cfa5 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -10,11 +10,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "knot-resolver-${version}";
-  version = "1.3.1";
+  version = "1.3.2";
 
   src = fetchurl {
     url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz";
-    sha256 = "cc9631fe1a92628e81e74b324a7f70c0b29840d426de05d7d045fdf85ab01117";
+    sha256 = "846b7496cb6273b831fd52eca09078c0454b06a8a6b792e2125c7b6818246edb";
   };
 
   outputs = [ "out" "dev" ];

From d2f45babe34de2b4da0056089b32bb086cca5989 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Fri, 28 Jul 2017 16:24:44 +0300
Subject: [PATCH 121/122] xfstests: Use keyutils

---
 pkgs/tools/misc/xfstests/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix
index a28614e2a26..c9ed6411c68 100644
--- a/pkgs/tools/misc/xfstests/default.nix
+++ b/pkgs/tools/misc/xfstests/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, acl, attr, autoconf, automake, bash, bc, coreutils, e2fsprogs, fetchgit, fio, gawk
+{ stdenv, acl, attr, autoconf, automake, bash, bc, coreutils, e2fsprogs, fetchgit, fio, gawk, keyutils
 , lib, libaio, libcap, libtool, libuuid, libxfs, lvm2, openssl, perl, procps, psmisc, quota, su
 , time, utillinux, which, writeScript, xfsprogs }:
 
@@ -86,7 +86,7 @@ stdenv.mkDerivation {
       ln -s @out@/lib/xfstests/$f $f
     done
 
-    export PATH=${lib.makeBinPath [acl attr bc e2fsprogs fio gawk libcap lvm2 perl procps psmisc quota utillinux which xfsprogs]}:$PATH
+    export PATH=${lib.makeBinPath [acl attr bc e2fsprogs fio gawk keyutils libcap lvm2 perl procps psmisc quota utillinux which xfsprogs]}:$PATH
     exec ./check "$@"
   '';
 

From 20d2bfa4ff247a49f50fc0cf4d509fbd48723290 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 28 Jul 2017 15:33:40 +0200
Subject: [PATCH 122/122] knot-resolver: remove unused inputs

---
 pkgs/servers/dns/knot-resolver/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index 383ad85cfa5..d4210c31eb8 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, utillinux, hexdump, which
+{ stdenv, fetchurl, pkgconfig, hexdump, which
 , knot-dns, luajit, libuv, lmdb
 , cmocka, systemd, hiredis, libmemcached
 , gnutls, nettle